From 7318a57322a02de7908862e43520c650388684c1 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 3 Feb 2016 12:46:45 +0100 Subject: Edit login overlay --- client/partials/login.html | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 client/partials/login.html (limited to 'client/partials/login.html') diff --git a/client/partials/login.html b/client/partials/login.html new file mode 100644 index 0000000..8bbce52 --- /dev/null +++ b/client/partials/login.html @@ -0,0 +1,38 @@ + \ No newline at end of file -- cgit v1.2.3 From bf7556fb60e1ec8e96272a0a8df50c97e5f4d36b Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 3 Feb 2016 15:37:36 +0100 Subject: Edit modal name --- client/index.html | 2 +- client/partials/login.html | 2 +- client/partials/nav.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'client/partials/login.html') diff --git a/client/index.html b/client/index.html index 6bd2669..4ce693b 100644 --- a/client/index.html +++ b/client/index.html @@ -24,7 +24,7 @@
- +
diff --git a/client/partials/login.html b/client/partials/login.html index 8bbce52..e6a33f1 100644 --- a/client/partials/login.html +++ b/client/partials/login.html @@ -1,4 +1,4 @@ - -- cgit v1.2.3 From 07fbfa6ad1859e16f9f957c4a26d87b11fa089a5 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 3 Feb 2016 16:59:04 +0100 Subject: Add login controller, loading after click on login button and some stuff... --- client/index.html | 1 + client/js/controllers/home.js | 3 +-- client/js/controllers/login.js | 32 ++++++++++++++++++++++++++++++++ client/partials/home.html | 3 +-- client/partials/login.html | 7 ++++--- client/partials/network.html | 1 - 6 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 client/js/controllers/login.js (limited to 'client/partials/login.html') diff --git a/client/index.html b/client/index.html index 4ce693b..018def2 100644 --- a/client/index.html +++ b/client/index.html @@ -75,6 +75,7 @@ + diff --git a/client/js/controllers/home.js b/client/js/controllers/home.js index 4a9fb21..2898de2 100644 --- a/client/js/controllers/home.js +++ b/client/js/controllers/home.js @@ -7,6 +7,5 @@ mainApp.controller('homeCtrl', function ($scope) { - // Login before use App - //$('#loginModal').modal({backdrop: 'static', keyboard: false}); + }); \ No newline at end of file diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js new file mode 100644 index 0000000..4cd4bf4 --- /dev/null +++ b/client/js/controllers/login.js @@ -0,0 +1,32 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + + +mainApp.controller('loginCtrl', function ($scope,$interval,$sce) +{ + // Define default states + $('#loginModal').modal({backdrop: 'static', keyboard: false}); + $('#loadingLoginButton').hide(); + + + + $('#loginButton').click(function(){ + $('#loginButton').hide(); + $('#loadingLoginButton').show(); + + + + $interval( + function() + { + $('#loginButton').show(); + $('#loadingLoginButton').hide(); + }, 2000,1); + + + + }); +}) diff --git a/client/partials/home.html b/client/partials/home.html index 3882ada..7a5045a 100644 --- a/client/partials/home.html +++ b/client/partials/home.html @@ -1,9 +1,8 @@
- Home + Home
Main Content
-
\ No newline at end of file diff --git a/client/partials/login.html b/client/partials/login.html index 6f08f76..d9b7fee 100644 --- a/client/partials/login.html +++ b/client/partials/login.html @@ -1,4 +1,4 @@ -
diff --git a/client/partials/network.html b/client/partials/network.html index 341f1a0..8b779be 100644 --- a/client/partials/network.html +++ b/client/partials/network.html @@ -6,4 +6,3 @@ Main Content - -- cgit v1.2.3 From 313533d25d6821ac8887b8b00bac51d8a1f135c6 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 3 Feb 2016 17:01:09 +0100 Subject: Remove forget password because YOU CAN'T FORGET YOUR PASSWORD git add -Agit add -A! --- client/partials/login.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/partials/login.html') diff --git a/client/partials/login.html b/client/partials/login.html index d9b7fee..40680b3 100644 --- a/client/partials/login.html +++ b/client/partials/login.html @@ -27,8 +27,8 @@ placeholder="Password" type="password" ng-model="identityFormData.password"> -

Forgot password? -

+
-- cgit v1.2.3 From fe06bd586aa2af6ea6bfc426caadee429d100380 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 3 Feb 2016 17:16:36 +0100 Subject: Add Failed login message --- client/js/controllers/login.js | 10 +++++++--- client/partials/login.html | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'client/partials/login.html') diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 4cd4bf4..6de348c 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -10,23 +10,27 @@ mainApp.controller('loginCtrl', function ($scope,$interval,$sce) // Define default states $('#loginModal').modal({backdrop: 'static', keyboard: false}); $('#loadingLoginButton').hide(); - + $('#failedToLoginAlert').hide(); $('#loginButton').click(function(){ $('#loginButton').hide(); $('#loadingLoginButton').show(); - + $('#failedToLoginAlert').hide(); + $interval( function() { + $('#failedToLoginAlert').show(); + $('#loginButton').show(); $('#loadingLoginButton').hide(); - }, 2000,1); + }, 2000,1); + }); }) diff --git a/client/partials/login.html b/client/partials/login.html index 40680b3..8571e61 100644 --- a/client/partials/login.html +++ b/client/partials/login.html @@ -33,7 +33,7 @@
- + Login
-- cgit v1.2.3 From c6186b71c12dece6878ca457afa801f2a79bac0b Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 3 Feb 2016 18:57:20 +0100 Subject: Change folder architecture ! --- client/index.html | 5 +++-- client/js/app.js | 4 ++-- client/js/controllers/home.js | 11 ----------- client/js/controllers/home/main.js | 11 +++++++++++ client/js/controllers/login.js | 7 +++++-- client/js/controllers/network.js | 9 --------- client/js/controllers/network/main.js | 9 +++++++++ client/js/controllers/status.js | 3 ++- client/partials/home.html | 8 -------- client/partials/home/main.html | 8 ++++++++ client/partials/login.html | 4 ++-- client/partials/nav.html | 11 ++++++----- client/partials/network.html | 8 -------- client/partials/network/main.html | 8 ++++++++ 14 files changed, 56 insertions(+), 50 deletions(-) delete mode 100644 client/js/controllers/home.js create mode 100644 client/js/controllers/home/main.js delete mode 100644 client/js/controllers/network.js create mode 100644 client/js/controllers/network/main.js delete mode 100644 client/partials/home.html create mode 100644 client/partials/home/main.html delete mode 100644 client/partials/network.html create mode 100644 client/partials/network/main.html (limited to 'client/partials/login.html') diff --git a/client/index.html b/client/index.html index 018def2..b935137 100644 --- a/client/index.html +++ b/client/index.html @@ -74,10 +74,11 @@ - - + + + diff --git a/client/js/app.js b/client/js/app.js index c931d7e..0e9c423 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -6,11 +6,11 @@ var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize']); mainApp.config(['$routeProvider', function($routeProvider){ $routeProvider. when('/home',{ - templateUrl: 'partials/home.html', + templateUrl: 'partials/home/main.html', controller: 'homeCtrl' }). when('/network',{ - templateUrl: 'partials/network.html', + templateUrl: 'partials/network/main.html', controller: 'networkCtrl' }).otherwise({ redirectTo: '/home' diff --git a/client/js/controllers/home.js b/client/js/controllers/home.js deleted file mode 100644 index 2898de2..0000000 --- a/client/js/controllers/home.js +++ /dev/null @@ -1,11 +0,0 @@ -/* - * home Controller - */ - - - -mainApp.controller('homeCtrl', function ($scope) -{ - - -}); \ No newline at end of file diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js new file mode 100644 index 0000000..2898de2 --- /dev/null +++ b/client/js/controllers/home/main.js @@ -0,0 +1,11 @@ +/* + * home Controller + */ + + + +mainApp.controller('homeCtrl', function ($scope) +{ + + +}); \ No newline at end of file diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 6de348c..026ce36 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -4,11 +4,14 @@ * and open the template in the editor. */ - +/** + * Represents a book. + * @constructor + */ mainApp.controller('loginCtrl', function ($scope,$interval,$sce) { // Define default states - $('#loginModal').modal({backdrop: 'static', keyboard: false}); + //$('#loginModal').modal({backdrop: 'static', keyboard: false}); $('#loadingLoginButton').hide(); $('#failedToLoginAlert').hide(); diff --git a/client/js/controllers/network.js b/client/js/controllers/network.js deleted file mode 100644 index 6c916ae..0000000 --- a/client/js/controllers/network.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - * network Controller - */ - - - -mainApp.controller('networkCtrl', function ($scope) -{ -}); \ No newline at end of file diff --git a/client/js/controllers/network/main.js b/client/js/controllers/network/main.js new file mode 100644 index 0000000..6c916ae --- /dev/null +++ b/client/js/controllers/network/main.js @@ -0,0 +1,9 @@ +/* + * network Controller + */ + + + +mainApp.controller('networkCtrl', function ($scope) +{ +}); \ No newline at end of file diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index c24997e..42a54d4 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -6,7 +6,8 @@ mainApp.controller('statusCtrl', function ($scope,$interval,$sce) { - + $scope.username="John Doe"; + $scope.projectname="Web Server"; // Update status every 2 seconds /*$interval(function(){ var status=identity.fetchStatus(); diff --git a/client/partials/home.html b/client/partials/home.html deleted file mode 100644 index 7a5045a..0000000 --- a/client/partials/home.html +++ /dev/null @@ -1,8 +0,0 @@ -
-
- Home -
-
- Main Content -
-
\ No newline at end of file diff --git a/client/partials/home/main.html b/client/partials/home/main.html new file mode 100644 index 0000000..7a5045a --- /dev/null +++ b/client/partials/home/main.html @@ -0,0 +1,8 @@ +
+
+ Home +
+
+ Main Content +
+
\ No newline at end of file diff --git a/client/partials/login.html b/client/partials/login.html index 8571e61..387b075 100644 --- a/client/partials/login.html +++ b/client/partials/login.html @@ -14,12 +14,12 @@
+ placeholder="Email" type="text" ng-model="identityFormData.user">
+ placeholder="Project Name" type="password" ng-model="identityFormData.project">
diff --git a/client/partials/nav.html b/client/partials/nav.html index c52ba4d..f412597 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -17,10 +17,11 @@