From 3c385be6a47d7be3a885d82c15765b855d5ef962 Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Mon, 18 Dec 2017 12:05:27 -0800
Subject: [PATCH] rebuild and fixed some placeholders

---
 app-backend/dist/js/dashboard.min.js       | 240 ++++++++++-----------
 app-backend/dist/templates/apps.html       |  17 +-
 app-backend/dist/templates/dashboard.html  |  11 +-
 app-backend/dist/templates/login.html      |   5 +-
 app-backend/dist/templates/monitoring.html |   5 +-
 app-backend/dist/templates/nodes.html      |  23 +-
 app-backend/dist/templates/settings.html   |   8 +-
 app-frontend/src/js/captain/apiManager.js  |   2 +-
 app-frontend/src/templates/apps.html       |   6 +-
 9 files changed, 150 insertions(+), 167 deletions(-)

diff --git a/app-backend/dist/js/dashboard.min.js b/app-backend/dist/js/dashboard.min.js
index 0dff67d..d9c776b 100644
--- a/app-backend/dist/js/dashboard.min.js
+++ b/app-backend/dist/js/dashboard.min.js
@@ -93,7 +93,7 @@ angular
     // Uncomment the following line if you have dnsmasq installed
     // BASE_API = 'http://captain.captain.x/api/v1/';
     // Uncomment the following line if you don't have dnsmasq installed
-    // BASE_API = 'http://127.0.0.1:3000/api/v1/';
+    BASE_API = 'http://127.0.0.1:3000/api/v1/';
 
     function ApiManager(captainLogger, $http, $timeout) {
 
@@ -652,6 +652,124 @@ angular.module('RDash')
             }
     
         });
+/**
+ * File Upload Read Directive
+ */
+
+angular
+    .module('RDash')
+    .directive("fileread", [function () {
+        return {
+            scope: {
+                fileread: "="
+            },
+            link: function (scope, element, attributes) {
+                element.bind("change", function (changeEvent) {
+                    scope.$apply(function () {
+                        scope.fileread = changeEvent.target.files[0];
+                        // or all selected files:
+                        // scope.fileread = changeEvent.target.files;
+                    });
+                });
+            }
+        }
+    }]);
+/**
+ * Loading Directive
+ * @see http://tobiasahlin.com/spinkit/
+ */
+
+angular
+    .module('RDash')
+    .directive('rdLoading', rdLoading);
+
+function rdLoading() {
+    var directive = {
+        restrict: 'AE',
+        template: '<div class="loading"><div class="double-bounce1"></div><div class="double-bounce2"></div></div>'
+    };
+    return directive;
+};
+/**
+ * Widget Body Directive
+ */
+
+angular
+    .module('RDash')
+    .directive('rdWidgetBody', rdWidgetBody);
+
+function rdWidgetBody() {
+    var directive = {
+        requires: '^rdWidget',
+        scope: {
+            loading: '=?',
+            classes: '@?'
+        },
+        transclude: true,
+        template: '<div class="widget-body" ng-class="classes"><rd-loading ng-show="loading"></rd-loading><div ng-hide="loading" class="widget-content" ng-transclude></div></div>',
+        restrict: 'E'
+    };
+    return directive;
+};
+
+/**
+ * Widget Footer Directive
+ */
+
+angular
+    .module('RDash')
+    .directive('rdWidgetFooter', rdWidgetFooter);
+
+function rdWidgetFooter() {
+    var directive = {
+        requires: '^rdWidget',
+        transclude: true,
+        template: '<div class="widget-footer" ng-transclude></div>',
+        restrict: 'E'
+    };
+    return directive;
+};
+/**
+ * Widget Header Directive
+ */
+
+angular
+    .module('RDash')
+    .directive('rdWidgetHeader', rdWidgetTitle);
+
+function rdWidgetTitle() {
+    var directive = {
+        requires: '^rdWidget',
+        scope: {
+            title: '@',
+            icon: '@'
+        },
+        transclude: true,
+        template: '<div class="widget-header"><div class="row"><div class="pull-left"><i class="fa" ng-class="icon"></i> {{title}} </div><div class="pull-right col-xs-6 col-sm-4" ng-transclude></div></div></div>',
+        restrict: 'E'
+    };
+    return directive;
+};
+/**
+ * Widget Directive
+ */
+
+angular
+    .module('RDash')
+    .directive('rdWidget', rdWidget);
+
+function rdWidget() {
+    var directive = {
+        transclude: true,
+        template: '<div class="widget" ng-transclude></div>',
+        restrict: 'EA'
+    };
+    return directive;
+
+    function link(scope, element, attrs) {
+        /* */
+    }
+};
 /**
  * Alerts Controller
  */
@@ -1531,122 +1649,4 @@ function SettingsCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
 
     }());
 
-}
-/**
- * File Upload Read Directive
- */
-
-angular
-    .module('RDash')
-    .directive("fileread", [function () {
-        return {
-            scope: {
-                fileread: "="
-            },
-            link: function (scope, element, attributes) {
-                element.bind("change", function (changeEvent) {
-                    scope.$apply(function () {
-                        scope.fileread = changeEvent.target.files[0];
-                        // or all selected files:
-                        // scope.fileread = changeEvent.target.files;
-                    });
-                });
-            }
-        }
-    }]);
-/**
- * Loading Directive
- * @see http://tobiasahlin.com/spinkit/
- */
-
-angular
-    .module('RDash')
-    .directive('rdLoading', rdLoading);
-
-function rdLoading() {
-    var directive = {
-        restrict: 'AE',
-        template: '<div class="loading"><div class="double-bounce1"></div><div class="double-bounce2"></div></div>'
-    };
-    return directive;
-};
-/**
- * Widget Body Directive
- */
-
-angular
-    .module('RDash')
-    .directive('rdWidgetBody', rdWidgetBody);
-
-function rdWidgetBody() {
-    var directive = {
-        requires: '^rdWidget',
-        scope: {
-            loading: '=?',
-            classes: '@?'
-        },
-        transclude: true,
-        template: '<div class="widget-body" ng-class="classes"><rd-loading ng-show="loading"></rd-loading><div ng-hide="loading" class="widget-content" ng-transclude></div></div>',
-        restrict: 'E'
-    };
-    return directive;
-};
-
-/**
- * Widget Footer Directive
- */
-
-angular
-    .module('RDash')
-    .directive('rdWidgetFooter', rdWidgetFooter);
-
-function rdWidgetFooter() {
-    var directive = {
-        requires: '^rdWidget',
-        transclude: true,
-        template: '<div class="widget-footer" ng-transclude></div>',
-        restrict: 'E'
-    };
-    return directive;
-};
-/**
- * Widget Header Directive
- */
-
-angular
-    .module('RDash')
-    .directive('rdWidgetHeader', rdWidgetTitle);
-
-function rdWidgetTitle() {
-    var directive = {
-        requires: '^rdWidget',
-        scope: {
-            title: '@',
-            icon: '@'
-        },
-        transclude: true,
-        template: '<div class="widget-header"><div class="row"><div class="pull-left"><i class="fa" ng-class="icon"></i> {{title}} </div><div class="pull-right col-xs-6 col-sm-4" ng-transclude></div></div></div>',
-        restrict: 'E'
-    };
-    return directive;
-};
-/**
- * Widget Directive
- */
-
-angular
-    .module('RDash')
-    .directive('rdWidget', rdWidget);
-
-function rdWidget() {
-    var directive = {
-        transclude: true,
-        template: '<div class="widget" ng-transclude></div>',
-        restrict: 'EA'
-    };
-    return directive;
-
-    function link(scope, element, attrs) {
-        /* */
-    }
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app-backend/dist/templates/apps.html b/app-backend/dist/templates/apps.html
index 2995465..9ead8d4 100644
--- a/app-backend/dist/templates/apps.html
+++ b/app-backend/dist/templates/apps.html
@@ -3,8 +3,7 @@
 
 <div ng-show="!loadingState.enabled">
   <div class="row" ng-show="!editContent.appsToEdit.length">
-    <div class="col-md-4"></div>
-    <div class="col-md-4">
+    <div class="col-md-4 col-md-offset-4">
 
       <rd-widget>
         <rd-widget-header icon="fa-plus" title="Create A New App">
@@ -48,8 +47,7 @@
   </div>
 
   <div class="row" ng-show="!editContent.appsToEdit.length && allApps && !!allApps.length">
-    <div class="col-md-2"></div>
-    <div class="col-md-8">
+    <div class="col-md-8 col-md-offset-2">
       <br>
       <br>
 
@@ -106,8 +104,7 @@
 
 
   <div class="row" ng-repeat="app in editContent.appsToEdit" ng-show="editContent.appsToEdit.length">
-    <div class="col-md-3"></div>
-    <div class="col-md-6">
+    <div class="col-md-6 col-md-offset-3">
       <br>
       <br>
 
@@ -268,11 +265,11 @@
                   <div class="form-group col-sm-6">
                     <div class="input-group">
                       <span class="input-group-addon">Username:</span>
-                      <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.user" placeholder="githubusername">
+                      <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.user" placeholder="myemail@gmail.com">
                     </div>
                   </div>
                   <div class="col-sm-6 form-group">
-                    <div class="input-group">
+                    <div class="input-group" uib-tooltip="Enter 123123 (or anything else!) for public repos">
                       <span class="input-group-addon">Password:</span>
                       <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.password" placeholder="githubpassword">
                     </div>
@@ -282,7 +279,7 @@
                   <div class="form-group col-sm-6">
                     <div class="input-group">
                       <span class="input-group-addon">Repository:</span>
-                      <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.repo" placeholder="githubusername">
+                      <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.repo" placeholder="github.com/someone/something">
                     </div>
                   </div>
                   <div class="col-sm-6 form-group">
@@ -450,4 +447,4 @@
       </rd-widget>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app-backend/dist/templates/dashboard.html b/app-backend/dist/templates/dashboard.html
index 51899e6..45af7a3 100644
--- a/app-backend/dist/templates/dashboard.html
+++ b/app-backend/dist/templates/dashboard.html
@@ -1,6 +1,5 @@
 <div class="row">
-	<div class="col-lg-2"></div>
-	<div class="col-lg-8">
+	<div class="col-lg-8 col-lg-offset-2">
 		<rd-widget>
 			<rd-widget-header icon="fa-tasks" title="Captain Root Domain Configurations">
 			</rd-widget-header>
@@ -19,8 +18,7 @@
 				<hr>
 
 				<div class="row">
-					<div class="col-lg-1"></div>
-					<div class="col-lg-10">
+					<div class="col-lg-10 col-lg-offset-1">
 						<form class="row">
 							<div class="form-group col-md-12">
 								<label for="rootDomainId">Captain Root Domain</label>
@@ -54,8 +52,7 @@
 <hr>
 
 <div class="row">
-	<div class="col-lg-2"></div>
-	<div class="col-lg-8">
+	<div class="col-lg-8 col-lg-offset-2">
 		<rd-widget>
 			<rd-widget-header icon="fa-tasks" title="Docker Registry Configuration">
 			</rd-widget-header>
@@ -116,4 +113,4 @@
 			</rd-widget-body>
 		</rd-widget>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app-backend/dist/templates/login.html b/app-backend/dist/templates/login.html
index 073c0e6..f41f7e1 100644
--- a/app-backend/dist/templates/login.html
+++ b/app-backend/dist/templates/login.html
@@ -1,7 +1,6 @@
 <div class="full-page-content">
 	<div class="row">
-		<div class="col-lg-4"></div>
-		<div class="col-lg-4">
+		<div class="col-lg-4 col-lg-offset-4">
 
 			<rd-widget>
 				<rd-widget-header icon="fa-key" title="Login">
@@ -29,4 +28,4 @@
 
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app-backend/dist/templates/monitoring.html b/app-backend/dist/templates/monitoring.html
index 0ec2b78..a2e49ff 100644
--- a/app-backend/dist/templates/monitoring.html
+++ b/app-backend/dist/templates/monitoring.html
@@ -66,8 +66,7 @@
 <hr>
 
 <div class="row">
-	<div class="col-lg-2"></div>
-	<div class="col-lg-8">
+	<div class="col-lg-8 col-lg-offset-2">
 		<rd-widget>
 			<rd-widget-header icon="fa-tasks" title="NetData Monitoring Tool">
 			</rd-widget-header>
@@ -294,4 +293,4 @@
 </rd-widget-body>
 </rd-widget>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app-backend/dist/templates/nodes.html b/app-backend/dist/templates/nodes.html
index bfc9b9e..4fcd8e8 100644
--- a/app-backend/dist/templates/nodes.html
+++ b/app-backend/dist/templates/nodes.html
@@ -3,8 +3,7 @@
 
 <div ng-show="!loadingState.enabled">
   <div class="row">
-    <div class="col-md-2"></div>
-    <div class="col-md-8">
+    <div class="col-md-8 col-md-offset-2">
 
       <rd-widget>
         <rd-widget-header icon="fa-link" title="Attach a New Node">
@@ -12,15 +11,13 @@
         <rd-widget-body>
 
           <div class="row">
-            <div class="col-sm-1"></div>
-            <div class="col-sm-4">
+            <div class="col-sm-4 col-sm-offset-1">
               <div class="form-group">
                 <label for="inputFirstName">Remote IP Address (as seen by Captain)</label>
                 <input type="text" class="form-control" id="inputFirstName" placeholder="Remote IP Address" ng-model="nodeToAdd.remoteNodeIpAddress">
               </div>
             </div>
-            <div class="col-sm-2"></div>
-            <div class="col-sm-4">
+            <div class="col-sm-4 col-sm-offset-2">
               <div class="form-group">
                 <label for="inputLastName">Remote Username</label>
                 <input type="text" class="form-control" id="inputLastName" ng-model="nodeToAdd.remoteUserName">
@@ -28,15 +25,13 @@
             </div>
           </div>
           <div class="row">
-            <div class="col-sm-1"></div>
-            <div class="col-sm-4">
+            <div class="col-sm-4 col-sm-offset-1">
               <div class="form-group">
                 <label for="inputFirstName">Captain IP Address (as seen by remote)</label>
                 <input type="text" class="form-control" ng-model="nodeToAdd.captainIpAddress" id="captainIpAddress" placeholder="Captain IP Address">
               </div>
             </div>
-            <div class="col-sm-2"></div>
-            <div class="col-sm-4">
+            <div class="col-sm-4 col-sm-offset-2">
               <div class="form-group">
                 <label for="inputWebsite">Node Type</label>
                 <input type="text" class="form-control" ng-model="nodeToAdd.nodeType" id="inputWebsite" placeholder="worker/manager">
@@ -44,8 +39,7 @@
             </div>
           </div>
           <div class="row">
-            <div class="col-sm-1"></div>
-            <div class="col-sm-10">
+            <div class="col-sm-10 col-sm-offset-1">
               <div class="form-group">
                 <label for="textarea01">SSH Private Key</label>
                 <textarea style="font-family: monospace" ng-model="nodeToAdd.privateKey" placeholder="-----BEGIN RSA PRIVATE KEY-----&#10;MIICWwIBAAKBgQDArfs81aizq8ckg16e+ewFgJg7J..." class="form-control" id="textarea01"></textarea>
@@ -72,8 +66,7 @@
 
   <div ng-repeat="node in allNodes">
     <div class="row">
-      <div class="col-md-3"></div>
-      <div class="col-md-6">
+      <div class="col-md-6 col-md-offset-3">
 
         <rd-widget>
           <rd-widget-header icon="fa-server" title="{{node.ip}} {{node.state=='down'?'** DOWN **':''}}">
@@ -104,4 +97,4 @@
   </div>
   <br>
   <br>
-</div>
\ No newline at end of file
+</div>
diff --git a/app-backend/dist/templates/settings.html b/app-backend/dist/templates/settings.html
index fa33914..5b6d0af 100644
--- a/app-backend/dist/templates/settings.html
+++ b/app-backend/dist/templates/settings.html
@@ -1,6 +1,5 @@
 <div class="row">
-	<div class="col-md-4"></div>
-	<div class="col-md-4">
+	<div class="col-md-4 col-md-offset-4">
 
 		<rd-widget>
 			<rd-widget-header icon="fa-key" title="Change Password">
@@ -44,8 +43,7 @@
 <hr>
 
 <div class="row">
-	<div class="col-md-4"></div>
-	<div class="col-md-4">
+	<div class="col-md-4 col-md-offset-4">
 
 		<rd-widget>
 
@@ -85,4 +83,4 @@
 			</rd-widget-body>
 		</rd-widget>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app-frontend/src/js/captain/apiManager.js b/app-frontend/src/js/captain/apiManager.js
index fc1a755..eff1d53 100644
--- a/app-frontend/src/js/captain/apiManager.js
+++ b/app-frontend/src/js/captain/apiManager.js
@@ -11,7 +11,7 @@
     // Uncomment the following line if you have dnsmasq installed
     // BASE_API = 'http://captain.captain.x/api/v1/';
     // Uncomment the following line if you don't have dnsmasq installed
-    // BASE_API = 'http://127.0.0.1:3000/api/v1/';
+    BASE_API = 'http://127.0.0.1:3000/api/v1/';
 
     function ApiManager(captainLogger, $http, $timeout) {
 
diff --git a/app-frontend/src/templates/apps.html b/app-frontend/src/templates/apps.html
index cbc036c..eeb64ed 100644
--- a/app-frontend/src/templates/apps.html
+++ b/app-frontend/src/templates/apps.html
@@ -266,11 +266,11 @@
                   <div class="form-group col-sm-6">
                     <div class="input-group">
                       <span class="input-group-addon">Username:</span>
-                      <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.user" placeholder="githubusername">
+                      <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.user" placeholder="myemail@gmail.com">
                     </div>
                   </div>
                   <div class="col-sm-6 form-group">
-                    <div class="input-group">
+                    <div class="input-group" uib-tooltip="Enter 123123 (or anything else!) for public repos">
                       <span class="input-group-addon">Password:</span>
                       <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.password" placeholder="githubpassword">
                     </div>
@@ -280,7 +280,7 @@
                   <div class="form-group col-sm-6">
                     <div class="input-group">
                       <span class="input-group-addon">Repository:</span>
-                      <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.repo" placeholder="githubusername">
+                      <input type="text" class="form-control" ng-model="app.appPushWebhook.repoInfo.repo" placeholder="github.com/someone/something">
                     </div>
                   </div>
                   <div class="col-sm-6 form-group">