Changes to include an install and uninstall page

Author: maeisabelle08

quick-start/src/main/webapp/WEB-INF/static/app/directives/header.html

@@ -5,7 +5,6 @@
         </div>
         <div id="sitemenu" class="col-xs-6 col-sm-6 col-md-6 dropdown" ng-if="status != null">
         	<button type="submit" name="installUserModules" class="btn btn-primary" ng-if="status.installed" ng-click="installUserModules()">Deploy to server</button>
-			<button type="submit" name="install" class="btn btn-default" ng-if="!status.installed" ng-click="install()">Install</button>
 			<button type="submit" name="uninstall" class="btn btn-primary" ng-if="status.installed" ng-click="uninstall()">Uninstall</button>
 			<button class="btn btn-default dropdown-toggle" type="button" id="headerDropdownMenu" data-toggle="dropdown" aria-expanded="true">
 			    Welcome {{status.mlUsername}}! <span class="caret"></span>
@@ -15,7 +14,7 @@
 			</ul>
 		</div>
     </div>
-    <div id="message" class="alert alert-info" ng-if="status != null">
+    <div id="message" class="alert alert-info" ng-if="status != null && action.type !== 'Uninstall'">
 		<a href="dismiss" class="close" data-dismiss="alert" aria-label="close">&times;</a>
         <ul>
             <li ng-if="status.serverVersionAccepted">ML version is acceptable.</li>

quick-start/src/main/webapp/WEB-INF/static/app/directives/headerDirective.js

@@ -17,22 +17,15 @@ module.directive('header', [
             }
             ,link : function(scope, element, attrs) {
             	scope.logout = function () {
-            		DataHub.logout();
-            		$location.path('/login');
-            	},
-            	scope.install = function () {
             		scope.loading = true;
-                    DataHub.install()
-                    .finally(function () {
-                    	scope.loading = false;
-                    });
-                },
-                scope.uninstall = function () {
-                	scope.loading = true;
-                    DataHub.uninstall()
-                    .finally(function () {
-                    	scope.loading = false;
+            		DataHub.logout()
+            		.finally(function () {
+            			scope.loading = false;
+            			$location.path('/login');
                     });
+            	},
+            	scope.uninstall = function () {
+            		DataHub.preUninstall();
                 },
                 scope.installUserModules = function () {
                 	scope.loading = true;

quick-start/src/main/webapp/WEB-INF/static/app/quickStartApp.js

@@ -6,6 +6,8 @@ var dependencies = [
     ,'dhib.quickstart.directives.footer'
     ,'dhib.quickstart.directives.spinner'
     ,'angularBootstrapNavTree'
+    ,'ngAnimate'
+    ,'ui.bootstrap'
 ];
 var module = angular.module('quickStartApp', dependencies);
 

quick-start/src/main/webapp/WEB-INF/static/app/services/dataHubService.js

@@ -12,12 +12,19 @@ module.factory('DataHub', [
         ,$route
     ) {
         var service = {
+        		
+        	action : {}
 
-        	login : function (loginForm) {
+        	,login : function (loginForm) {
                 var promise = $http
                 .post('api/data-hub/login', loginForm)
                 .success(function (data) {
                     service.status = data;
+                    if(!service.status.installed) {
+                    	service.action.type = "Install";
+                    	service.action.message = "Install in progress...";
+                    	service.action.progressType = "success";
+                    }
                 })
                 .error(function () {
                     service.status = null;
@@ -59,25 +66,39 @@ module.factory('DataHub', [
                 var promise = $http.post('api/data-hub/install')
                 .success(function (status) {
                 	service.status = status;
+                	service.action.type = null;
                 	service.displayMessage('Install is successful.', 'success', 'notification', false);
                 	service.reloadRoute();
                 })
                 .error(function () {
-                	service.displayMessage('Install is unsuccessful.', 'error', 'notification', false);
+                	service.action.message = "Install is unsuccessful.";
+                	service.action.progressType = "danger";
+                	//service.displayMessage('Install is unsuccessful.', 'error', 'notification', false);
                 });
 
                 return promise;
             }
 
+            ,preUninstall : function() {
+            	service.action.type = 'Uninstall';
+            	service.action.progressType = 'success';
+            	service.action.message = 'Uninstall is in progress';
+            	service.reloadRoute();
+            }
+            
             ,uninstall : function () {
                 var promise = $http.post('api/data-hub/uninstall')
                 .success(function (status) {
                 	service.status = status;
-                	service.displayMessage('Uninstall is successful.', 'success', 'notification', false);
-                	service.reloadRoute();
+                	service.action.type = "Uninstall";
+                	service.action.message = "Uninstall is successful.";
+                	//service.displayMessage('Uninstall is successful.', 'success', 'notification', false);
+                	//service.reloadRoute();
                 })
                 .error(function () {
-                	service.displayMessage('Uninstall is unsuccessful.', 'error', 'notification', false);
+                	service.action.message = "Uninstall is unsuccessful.";
+                	service.action.progressType = "danger";
+                	//service.displayMessage('Uninstall is unsuccessful.', 'error', 'notification', false);
                 });
 
                 return promise;

quick-start/src/main/webapp/WEB-INF/static/css/quick-start.css

@@ -211,4 +211,48 @@ ul.nav.abn-tree i {
 .spinner > .child {
     position: relative;
     left: 50%;
+    float: right;
+    z-index: 1000;
+}
+
+.fa-spin {
+	font-size: 80px;
+	margin: 0px;
+	float: right;
+    z-index: 1000;
+}
+
+.nav, .pagination, .carousel, .panel-title a { 
+	cursor: pointer; 
+}
+
+#progressBar {
+	background-color: #444547;
+	display: table;
+    height: 450px;
+    width: 100%;
+}
+
+#progressBar > div {
+	display: table-cell;
+    vertical-align: middle;
+}
+
+#progressBar > div {
+	margin-left: auto;
+    margin-right: auto; 
+    width: 200px;
+}
+
+.progress {
+    height: 30px;
+}
+
+.progress span {
+    font-size: 25px;
+    line-height: 20px;
+}
+
+.progress-bar {
+    padding: 3px;
 }

quick-start/src/main/webapp/WEB-INF/static/index.html

@@ -12,6 +12,8 @@
     <!-- Angular -->
     <script src="lib/angular.js/js/angular.js"></script>
     <script src="lib/angular.js/js/angular-route.js"></script>
+    <script src="lib/angular.js/js/angular-animate.js"></script>
+    <script src="lib/angular.js/js/ui-bootstrap-tpls-1.1.2.js"></script>
 
     <!-- Angular Dependencies -->
     <script src="lib/jquery/js/jquery.min.js"></script>