Make admin creation on first time a independent setup step

2014-08-09 21:33:55 -07:00
parent 471291261b
commit dd232e17ea
3 changed files with 175 additions and 1 deletions
@@ -32,7 +32,7 @@ var MainController = function ($scope, $route, Client) {
        }

        if (isFirstTime) {
-            window.location.href = '#/usercreate?admin=1';
+            window.location.href = '/setup.html';
            return;
        }

@@ -0,0 +1,65 @@
+'use strict';
+
+var SetupController = function ($scope, Client) {
+    $scope.disabled = false;
+
+    $scope.username = '';
+    $scope.password = '';
+    $scope.passwordRepeat = '';
+    // TODO do we really need this?
+    $scope.email = 'xx@xx.xx';
+
+    $scope.error = {};
+
+    $scope.submit = function () {
+        console.debug('Try to create admin %s.', $scope.username);
+
+        $scope.error.name = null;
+        $scope.error.password = null;
+        $scope.error.passwordRepeat = null;
+
+        if (!$scope.username) {
+            console.error('Username must not be empty');
+            $scope.error.name = 'Username must not be empty';
+            $scope.error.password = '';
+            $scope.error.passwordRepeat = '';
+            return;
+        }
+
+        if ($scope.password !== $scope.passwordRepeat) {
+            console.error('Passwords dont match.');
+            $scope.error.name = '';
+            $scope.error.passwordRepeat = 'Passwords do not match';
+            $scope.passwordRepeat = '';
+            return;
+        }
+
+        $scope.disabled = true;
+        Client.createAdmin($scope.username, $scope.password, $scope.email, function (error, result) {
+            if (error) {
+                console.error('Unable to create user.', error);
+                if (error.statusCode === 409) {
+                    $scope.error.name = 'Username already exists';
+                    $scope.disabled = false;
+                }
+                return;
+            }
+
+            console.debug('Successfully create user', $scope.username);
+            window.location.href = '/';
+        });
+    };
+
+    Client.setClientCredentials('cid-webadmin', 'unused');
+    Client.isServerFirstTime(function (error, isFirstTime) {
+        if (error) {
+            console.error('Unable to connect.', error);
+            return;
+        }
+
+        if (!isFirstTime) {
+            window.location.href = '/';
+            return;
+        }
+    });
+};
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
+
+    <title> YellowTent </title>
+
+    <!-- Bootstrap Core CSS -->
+    <link href="3rdparty/sb-admin-2/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- MetisMenu CSS -->
+    <link href="3rdparty/sb-admin-2/css/plugins/metisMenu/metisMenu.min.css" rel="stylesheet">
+
+    <!-- Timeline CSS -->
+    <link href="3rdparty/sb-admin-2/css/plugins/timeline.css" rel="stylesheet">
+
+    <!-- Custom CSS -->
+    <link href="3rdparty/sb-admin-2/css/sb-admin-2.css" rel="stylesheet">
+
+    <!-- Morris Charts CSS -->
+    <link href="3rdparty/sb-admin-2/css/plugins/morris.css" rel="stylesheet">
+
+    <!-- Custom Fonts -->
+    <link href="3rdparty/sb-admin-2/font-awesome-4.1.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+
+
+
+    <!-- application stylesheets -->
+    <!-- <link href="css/index.css" rel="stylesheet" media="screen"> -->
+
+  </head>
+
+<body ng-app="YellowTent" ng-controller="SetupController">
+
+    <div class="container">
+        <div class="row">
+            <div class="col-md-3"></div>
+            <div class="col-md-6">
+
+            <h1>Create Owner</h1>
+            <form class="form-signin" role="form" ng-submit="submit()">
+                <div class="form-group">
+                    <label class="control-label" for="inputUsername">Username</label>
+                    <input type="text" class="form-control" ng-model="username" id="inputUsername" required autofocus>
+                </div>
+                <div class="form-group">
+                    <label class="control-label" for="inputPassword">Password</label>
+                    <input type="password" class="form-control" ng-model="password" id="inputPassword" required>
+                </div>
+                <div class="form-group">
+                    <label class="control-label" for="inputPasswordRepeat">Password Repeat</label>
+                    <input type="password" class="form-control" ng-model="passwordRepeat" id="inputPasswordRepeat" required>
+                </div>
+                <input class="btn btn-primary btn-outline pull-right" type="submit" ng-disabled="{{disabled}}" value="Create User"/>
+            </form>
+
+            </div>
+            <div class="col-md-3"></div>
+        </div>
+    </div>
+
+    <!-- angularjs scripts -->
+    <script src="3rdparty/js/angular.js"></script>
+    <script src="3rdparty/js/angular-loader.min.js"></script>
+    <script src="3rdparty/js/angular-route.min.js"></script>
+    <script src="3rdparty/js/angular-animate.min.js"></script>
+    <script src="3rdparty/js/angular-base64.min.js"></script>
+    <script src="3rdparty/js/autofill-event.js"></script>
+
+    <!-- jQuery Version 1.11.0 -->
+    <script src="3rdparty/sb-admin-2/js/jquery-1.11.0.js"></script>
+
+    <!-- Bootstrap Core JavaScript -->
+    <script src="3rdparty/sb-admin-2/js/bootstrap.min.js"></script>
+
+    <!-- Metis Menu Plugin JavaScript -->
+    <script src="3rdparty/sb-admin-2/js/plugins/metisMenu/metisMenu.min.js"></script>
+
+    <!-- Custom Theme JavaScript -->
+    <script src="3rdparty/sb-admin-2/js/sb-admin-2.js"></script>
+
+    <!-- yellowtent -->
+    <script src="/api/v1/oauth/yellowtent.js"></script>
+
+    <!-- angular bootstrap -->
+    <script src="3rdparty/js/ui-bootstrap-tpls-0.10.0.js"></script>
+
+    <!-- spinner -->
+    <script src="3rdparty/js/spin.min.js"></script>
+
+    <!-- actute comboboxes -->
+    <script src="3rdparty/js/acute.select.js"></script>
+    <link href="3rdparty/css/acute.select.css" rel="stylesheet" media="screen"/>
+
+    <!-- application routes -->
+    <script src="js/index.js"></script>
+
+    <!-- yellowtent -->
+    <script src="/api/v1/oauth/yellowtent.js"></script>
+
+    <!-- services and factories -->
+    <script src="js/client.js"></script>
+
+    <!-- views -->
+    <script src="js/setup.js"></script>
+
+</body>
+</html>