Skip to content
Snippets Groups Projects
Commit a7daf475 authored by Kyle Doherty's avatar Kyle Doherty
Browse files

combine org and admin forms

parent 159fe02c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
resources/frontend_client/app/css/setup.css
+ 0
− 1
View file @ a7daf475
......@@ -15,7 +15,6 @@
}
.SetupIntro-heading {
margin: 2.5em 0 1em;
color: var(--brand-color);
}
......
resources/frontend_client/app/setup/setup.controllers.js
+ 29
− 73
View file @ a7daf475
var SetupControllers = angular.module('corvus.setup.controllers', ['corvus.metabase.services'])
SetupControllers.controller('SetupIntro', ['$scope', '$location', 'Organization', 'AppState', function ($scope, $location, Organization, AppState) {
window.scope = $scope
$scope.setOrgName = function (name) {
$scope.createOrgAndUser = function () {
// Create an organization
org = Organization.create({'name': name, 'slug': name}, function(result){
console.log('result', result)
org = Organization.create({'name': name, 'slug': name}, function(result) {
console.log('result', result);
// switch the org
// TODO - make sure this is up to snuff from a security standpoint
AppState.switchOrg(result.slug)
// now set the user to be a memeber of the org so we can use the current org
Organization.member_create({'orgId': result.id, email: $scope.user.email, first_name: 'lerp', last_name: 'derperson', admin: true}, function (result) {
console.log('result', result)
// now create an admin user for the org
Organization.admin_create({
orgId: result.id,
email: $scope.newUser.email,
first_name: $scope.newUser.firstName,
last_name: $scope.newUser.lastName,
},
function (result) {
$location.path('/setup/data/');
}, function (error) {
console.log('error', error)
})
$scope.error = error;
});
}, function(error){
$scope.error = error.data;
console.log(error);
})
}
......@@ -28,15 +33,15 @@ SetupControllers.controller('SetupConnection', ['$scope', '$routeParams', '$loca
var connectionEngines = {
'Postgres': "postgres",
}
};
$scope.engines = [
'Postgres',
'MySQl',
'H2'
]
];
$scope.connection = {}
$scope.connection = {};
// assume we have a new connection since this is the setup process
var newConnection = true
......@@ -67,15 +72,15 @@ SetupControllers.controller('SetupConnection', ['$scope', '$routeParams', '$loca
// connection strings take the form of
// 'host="<value>" post="<value" dbname="<value>" user="<value>" password="<value>"'
var parsedConnection = {}
var string = connectionString.split(" ")
var parsedConnection = {};
var string = connectionString.split(" ");
for(var s in string) {
var connectionDetail = string[s].split("=")
parsedConnection[connectionDetail[0]] = connectionDetail[1]
var connectionDetail = string[s].split("=");
parsedConnection[connectionDetail[0]] = connectionDetail[1];
}
return parsedConnection
return parsedConnection;
}
function buildConnectionString (values) {
......@@ -83,17 +88,17 @@ SetupControllers.controller('SetupConnection', ['$scope', '$routeParams', '$loca
// 'host="<value>" post="<value" dbname="<value>" user="<value>" password="<value>"'
var connectionStringElements = ['host', 'port', 'dbname', 'user', 'password'],
conn_str = ''
conn_str = '';
for(var element in connectionStringElements) {
conn_str = conn_str + ' ' + connectionStringElements[element] + '=' + values[connectionStringElements[element]]
conn_str = conn_str + ' ' + connectionStringElements[element] + '=' + values[connectionStringElements[element]];
}
return conn_str
return conn_str;
}
$scope.setConnectionEngine = function (engine) {
$scope.connection.engine = engine
$scope.connection.engine = engine;
}
$scope.submit = function () {
......@@ -106,11 +111,12 @@ SetupControllers.controller('SetupConnection', ['$scope', '$routeParams', '$loca
}
};
function success (result) {
$location.path('/setup/data')
$location.path('/setup/data');
}
function error (error) {
console.log('error', error)
$scope.error = error;
console.log('error', error);
}
// api needs a int
......@@ -147,53 +153,3 @@ SetupControllers.controller('SetupData', ['$scope', 'Metabase', function ($scope
)
})
}])
SetupControllers.controller('SetupProfile', ['$scope', '$location', 'Organization', function ($scope, $location, Organization) {
var newUser = {}
$scope.createAdmin = function (newUser) {
console.log(newUser)
if(newUser.password != newUser.repeated_password){
$scope.errors = "Passwords don't match";
} else{
Organization.admin_create({'orgId': $scope.setupState.currentOrg.id, 'first_name': newUser.firstName, 'last_name':newUser.lastName, 'email': newUser.email, 'password':newUser.password}, function(result){
$scope.adminCreated = true;
$location.path('/setup/team');
},function(error){
$scope.errors = error;
});
}
}
}]);
/*
not yet included in the flow but eventually
*/
SetupControllers.controller('SetupTeam', ['$scope', '$location', 'Organization', function ($scope, $location, Organization) {
$scope.$watch('currentOrg', function(org) {
Organization.members({
'orgId': org.id
}, function (result) {
$scope.users = result
}, function (error) {
console.log('error', error)
})
})
$scope.addInvitee = function (email) {
Organization.member_create({
'orgId': $scope.currentOrg.id,
'email': email
},
function(result){
listUsers($scope.setupState.org.id)
},
function(error){
console.log(error)
}
);
}
}]);
resources/frontend_client/app/setup/setup_intro.html
+ 28
− 16
View file @ a7daf475
......@@ -8,23 +8,35 @@
</div>
</section>
<section class="SetupOffset">
<div class="AdminContent AdminContent-shallow text-centered">
<h1 class="SetupIntro-heading">Welcome to Metabase</h1>
<p class="SetupIntro-subHeading">Let's get you connected to your data and invite your team.</p>
<div class="mt1">
<input class="Connection-input text-centered inline-block"
type="text"
placeholder="What's your company or organization called?"
ng-model="userOrgName"
autofocus
/>
<div class="py4">
<cv-step-button
ng-click="setOrgName(userOrgName)">
</cv-step-button>
<div class="AdminContent AdminContent-shallow">
<div class="p4">
<h1 class="SetupIntro-heading">Welcome to Metabase</h1>
<p class="SetupIntro-subHeading">Let's set up your profile and get you connected to your data.</p>
<div class="mt1">
<input class="Connection-input inline-block"
type="text"
placeholder="What's your company or organization called?"
ng-model="userOrgName"
autofocus
/>
<input class="Connection-input block" type="text" placeholder="Your first name" ng-model="newUser.firstName" autofocus>
<input class="Connection-input block" type="text" placeholder="Your last name" ng-model="newUser.lastName" autofocus>
<input class="Connection-input block" type="text" placeholder="Your company email address" ng-model="newUser.email">
<input class="Connection-input block" type="password" placeholder="Create a password." ng-model="newUser.password">
<input class="Connection-input block" type="password" placeholder="Confirm your new password" ng-model="newUser.repeated_password">
</div>
<div class="bg-error text-white p2 rounded" ng-show="error">
{{error}}
</div>
</div>
<div>{{error}}</div>
</div>
</section>
<div class="SetupBar">
<div>
<cv-step-button
text="Next"
ng-click="createOrgAndUser()">
</cv-step-button>
</div>
</div>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment