From d1991fca2b3e9517da9aff571494dbc1374344d9 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 28 Feb 2016 20:30:57 +0100 Subject: Erreur ! --- client/js/services/Compute.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'client/js/services') diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 70359ee..7e1764f 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -15,9 +15,18 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Get Machine var getMachines=function(callback){ - + var result=$http.post('../server/index.php', - $.param({"token" : Identity.profile.token, "task" : "Compute"})); + $.param({"token" : Identity.getToken(), "task" : "compute", action:"getImage", serverID:"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"})); + + // Wait and handle the response + result.then(function (response){ + alert(response); + callback(parseGetMachinesAnswer(response, false)); + },function(response){ + alert(response.status); + callback(parseGetMachinesAnswer(response, true)); + }); }; -- cgit v1.2.3 From ef28780fba689daefdb9e770d370deed14f2447e Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 28 Feb 2016 20:45:21 +0100 Subject: Test --- client/js/services/Compute.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/js/services') diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 7e1764f..43d13c4 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -17,7 +17,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ var getMachines=function(callback){ var result=$http.post('../server/index.php', - $.param({"token" : Identity.getToken(), "task" : "compute", action:"getImage", serverID:"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"})); + $.param({"token" : Identity.getToken(), "task" : "compute", "action":"getImage", "serverID":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"})); // Wait and handle the response result.then(function (response){ -- cgit v1.2.3 From 829c7ba8f3b65cd43f6a93e44028ad5cfe354d50 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 28 Feb 2016 21:14:06 +0100 Subject: Test --- client/js/services/Compute.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/js/services') diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 43d13c4..59f6291 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -17,11 +17,11 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ var getMachines=function(callback){ var result=$http.post('../server/index.php', - $.param({"token" : Identity.getToken(), "task" : "compute", "action":"getImage", "serverID":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"})); + $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listServers"})); // Wait and handle the response result.then(function (response){ - alert(response); + console.log(response.data.Servers); callback(parseGetMachinesAnswer(response, false)); },function(response){ alert(response.status); -- cgit v1.2.3 From 6a67f6ba9dce19b046a5fc86e7437fbaa873c1e8 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Mon, 29 Feb 2016 08:32:48 +0100 Subject: Test --- client/js/services/Compute.js | 2 +- client/js/services/Identity.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'client/js/services') diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 59f6291..9f404c4 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -17,7 +17,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ var getMachines=function(callback){ var result=$http.post('../server/index.php', - $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listServers"})); + $.param({"token" : Identity.getToken(), "task" : "compute", "action":"getServer", serverId:"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"})); // Wait and handle the response result.then(function (response){ diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js index 7604230..a13c457 100644 --- a/client/js/services/Identity.js +++ b/client/js/services/Identity.js @@ -117,9 +117,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ // Wait and handle the response result.then(function (response){ - callback(parseLoginAnswer(response), false); + callback(parseLoginAnswer(response, false)); },function(response){ - callback(parseLoginAnswer(response), true) + callback(parseLoginAnswer(response, true)); }); }; -- cgit v1.2.3 From 3656654077f505dd782678451760eba45b59707b Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Mon, 29 Feb 2016 08:54:04 +0100 Subject: Clean code --- client/js/services/Compute.js | 14 +++++++++++--- client/js/services/Identity.js | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 19 deletions(-) (limited to 'client/js/services') diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 9f404c4..8148948 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -2,11 +2,12 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ - + // Create data var data={}; data.machines={}; + // Parser var parseGetMachinesAnswer=function(response, failedToSendRequest){ @@ -15,9 +16,16 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Get Machine var getMachines=function(callback){ + + var params={ + "token" : Identity.getToken(), + "task" : "compute", + "action":"getServer", + "serverId":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd" + }; var result=$http.post('../server/index.php', - $.param({"token" : Identity.getToken(), "task" : "compute", "action":"getServer", serverId:"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"})); + $.param(params)); // Wait and handle the response result.then(function (response){ @@ -25,7 +33,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ callback(parseGetMachinesAnswer(response, false)); },function(response){ alert(response.status); - callback(parseGetMachinesAnswer(response, true)); + callback(parseGetMachinesAnswer(response, true)); }); diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js index a13c457..b1d2a48 100644 --- a/client/js/services/Identity.js +++ b/client/js/services/Identity.js @@ -9,42 +9,37 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ profile.projectname=null; var token=null; + /* * @returns {boolean} Return true if a cookie is found (and load it in profile) false else */ var isAlreadyLogin=function(){ + + // Load cookies var profileInCookie=$cookies.getObject('profile'); var tokenPart_0InCookie=$cookies.getObject('token.part_0'); var tokenPart_1InCookie=$cookies.getObject('token.part_1'); + // Check if cookie is defined if(typeof profileInCookie !== 'undefined' && typeof tokenPart_0InCookie !== 'undefined' && typeof tokenPart_1InCookie !== 'undefined' ){ + + // If yes, put it into variables angular.extend(profile, profileInCookie); token=tokenPart_0InCookie+tokenPart_1InCookie; - + + // Return I'm Login return true; } + // Return I'm not Login return false; } - /* - * Get the profile - */ - var getProfile=function(){ - return profile; - } - - /* - * Get the token - */ - var getToken=function(){ - return token; - } /* * Destroy profile cookies @@ -64,7 +59,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ */ var parseLoginAnswer=function(response, failedToSendRequest){ - + // Defined return object var requestParserResult={}; requestParserResult.status=1; requestParserResult.failReason=null; @@ -96,6 +91,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ return requestParserResult; }; + /** * Function to connect to OpenStack @@ -113,7 +109,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ profile.projectname=projectname; var result=$http.post('../server/index.php', - $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname})); + $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname})); // Wait and handle the response result.then(function (response){ @@ -124,6 +120,20 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ }; + /* + * Get the profile + */ + var getProfile=function(){ + return profile; + } + + /* + * Get the token + */ + var getToken=function(){ + return token; + } + // Return services objects return { -- cgit v1.2.3 From 24773559e2d6e6c418baf97a6e9d41917d4cb244 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Mon, 29 Feb 2016 09:32:12 +0100 Subject: Test --- client/js/services/Compute.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/js/services') diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 8148948..e0c28ae 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -21,7 +21,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ "token" : Identity.getToken(), "task" : "compute", "action":"getServer", - "serverId":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd" + "serverId":"a2926ce3-501b-4285-82ce-c6e451295599" }; var result=$http.post('../server/index.php', @@ -29,7 +29,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Wait and handle the response result.then(function (response){ - console.log(response.data.Servers); + console.log(response.data.MyServer.image); callback(parseGetMachinesAnswer(response, false)); },function(response){ alert(response.status); -- cgit v1.2.3 From 575b8ea4b611a5bd06c92471ecb8fb31d45c1c45 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Tue, 1 Mar 2016 15:50:57 +0100 Subject: Test --- client/js/controllers/home/main.js | 14 +++++++++----- client/js/services/Compute.js | 36 +++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 12 deletions(-) (limited to 'client/js/services') diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index 4e3bcda..805bc63 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -10,14 +10,18 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($s // TODO Update graph etc... } - // Retrieve all Data - Compute.pullData(updatePage); - Compute.getMachines(function(adzda){}); + + $scope.raiseShowMachineDetailsEvent=function(){ - var machine={name: "Machine 1", online:true}; - $rootScope.$broadcast("showMachineDetailsEvent", machine); + var callback=function(){ + var data=Compute.getData(); + console.log(data.machines[Object.keys(data.machines)[0]]); + $rootScope.$broadcast("showMachineDetailsEvent", data.machines[Object.keys(data.machines)[0]]); + + } + Compute.pullMachines(callback); } diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index e0c28ae..7c9df26 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -10,18 +10,36 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Parser var parseGetMachinesAnswer=function(response, failedToSendRequest){ + // Defined return object + var requestParserResult={}; + requestParserResult.status=1; + requestParserResult.failReason=null; + + if (typeof response.data.Servers !== 'undefined') { + // Set status code + requestParserResult.status=0; + data.machines=response.data.Servers; + } + else if(failedToSendRequest){ + requestParserResult.failReason="Failed to send request"; + } + else{ + requestParserResult.failReason="Error"; + } + + return requestParserResult; + }; // Get Machine - var getMachines=function(callback){ + var pullMachines=function(callback){ var params={ "token" : Identity.getToken(), "task" : "compute", - "action":"getServer", - "serverId":"a2926ce3-501b-4285-82ce-c6e451295599" + "action":"listServers" }; var result=$http.post('../server/index.php', @@ -29,7 +47,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Wait and handle the response result.then(function (response){ - console.log(response.data.MyServer.image); + callback(parseGetMachinesAnswer(response, false)); },function(response){ alert(response.status); @@ -45,12 +63,16 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // TODO call getMachines etc... } - + + var getData=function(){ + return data; + } + // Return services objects return { - getMachines: getMachines, + pullMachines: pullMachines, pullData: pullData, - data:data + getData: getData }; -- cgit v1.2.3 From bb8b3dd14060bbad8d4c1295c8395b5cb1108e59 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Tue, 1 Mar 2016 16:55:36 +0100 Subject: test --- client/js/controllers/home/main.js | 1 - client/js/services/Compute.js | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'client/js/services') diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index 805bc63..ee564b2 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -17,7 +17,6 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($s $scope.raiseShowMachineDetailsEvent=function(){ var callback=function(){ var data=Compute.getData(); - console.log(data.machines[Object.keys(data.machines)[0]]); $rootScope.$broadcast("showMachineDetailsEvent", data.machines[Object.keys(data.machines)[0]]); } diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 7c9df26..28f8a69 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -14,11 +14,12 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ var requestParserResult={}; requestParserResult.status=1; requestParserResult.failReason=null; - + console.log(response.data.Images[Object.keys(response.data.Images)[0]]) if (typeof response.data.Servers !== 'undefined') { // Set status code requestParserResult.status=0; data.machines=response.data.Servers; + } else if(failedToSendRequest){ requestParserResult.failReason="Failed to send request"; @@ -39,7 +40,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ var params={ "token" : Identity.getToken(), "task" : "compute", - "action":"listServers" + "action":"listImages" }; var result=$http.post('../server/index.php', -- cgit v1.2.3 From cdc3c2cdcb4fc863701afba9b48916857414208f Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Tue, 1 Mar 2016 19:08:30 +0100 Subject: test --- client/js/services/Compute.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/js/services') diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 28f8a69..f4e8fa8 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -14,7 +14,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ var requestParserResult={}; requestParserResult.status=1; requestParserResult.failReason=null; - console.log(response.data.Images[Object.keys(response.data.Images)[0]]) + console.log(response.data.Servers[Object.keys(response.data.Servers)[0]]) if (typeof response.data.Servers !== 'undefined') { // Set status code requestParserResult.status=0; @@ -40,7 +40,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ var params={ "token" : Identity.getToken(), "task" : "compute", - "action":"listImages" + "action":"listServers" }; var result=$http.post('../server/index.php', -- cgit v1.2.3 From f1628e280abaf47bfdcabc7d463ce6ad5d0f0752 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Tue, 1 Mar 2016 20:20:05 +0100 Subject: Clean Identity service --- client/js/services/Identity.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'client/js/services') diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js index b1d2a48..da85ecd 100644 --- a/client/js/services/Identity.js +++ b/client/js/services/Identity.js @@ -48,6 +48,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ $cookies.remove('profile'); $cookies.remove('token.part_0'); $cookies.remove('token.part_1'); + token=null; + profile.username=null; + profile.projectname=null; } @@ -81,6 +84,10 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ $cookies.putObject('token.part_0', response.data.token.substring(0, middle), {'expires': expireDate}); // Save second part of token $cookies.putObject('token.part_1', response.data.token.substring(middle, response.data.token.length), {'expires': expireDate}); + + // Put token in var + token=response.data.token; + } else if(failedToSendRequest){ requestParserResult.failReason="Failed to send request"; @@ -102,7 +109,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ * @param {string} projectname The user project name * @param {function} function to call when data is avalaible */ - var login=function(username, password,projectname, callback){ + var login=function(username, password,projectname,callback){ // Set profile information (early) profile.username=username; @@ -120,6 +127,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ }; + + + /* * Get the profile */ @@ -133,6 +143,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ var getToken=function(){ return token; } + // Return services objects -- cgit v1.2.3 From 5ef1c9b8b1ab47b659f512db86e51dacf1bec860 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Tue, 1 Mar 2016 20:51:08 +0100 Subject: Edit machineDetails --- client/js/controllers/home/machineDetails.js | 1 + client/js/controllers/home/main.js | 9 +++-- client/js/services/Compute.js | 55 +++++++++++++++------------- client/partials/home/machineDetails.html | 14 +++---- client/partials/home/main.html | 9 +++-- 5 files changed, 48 insertions(+), 40 deletions(-) (limited to 'client/js/services') diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js index f84a073..7476c69 100644 --- a/client/js/controllers/home/machineDetails.js +++ b/client/js/controllers/home/machineDetails.js @@ -11,6 +11,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$ $scope.$on('showMachineDetailsEvent', function(eventName ,machine){ $scope.machine=machine; + console.log(machine); $('#machineDetailsModal').modal({backdrop: false, keyboard: true}); }); diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index ee564b2..b44836b 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -6,18 +6,19 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope) { - var updatePage=function(){ - // TODO Update graph etc... + var callMeAfterGetMachines=function(data){ + $scope.machines=Compute.getData().machines; } + Compute.pullMachines(callMeAfterGetMachines); - $scope.raiseShowMachineDetailsEvent=function(){ + $scope.raiseShowMachineDetailsEvent=function(id){ var callback=function(){ var data=Compute.getData(); - $rootScope.$broadcast("showMachineDetailsEvent", data.machines[Object.keys(data.machines)[0]]); + $rootScope.$broadcast("showMachineDetailsEvent", data.machines[id]); } Compute.pullMachines(callback); diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index f4e8fa8..e2fb3df 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -2,19 +2,27 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ - // Create data + // Init data var data={}; - data.machines={}; + data.machines=null; - // Parser - var parseGetMachinesAnswer=function(response, failedToSendRequest){ + + /** + * Retrieve machine list + * @param {response} the server response + * @param {boolean} false if the request as been send true else + * @return {requestParserResult} the result of parsing + */ + var parsePullMachinesAnswer=function(response, failedToSendRequest){ + // Defined return object var requestParserResult={}; requestParserResult.status=1; requestParserResult.failReason=null; - console.log(response.data.Servers[Object.keys(response.data.Servers)[0]]) + + if (typeof response.data.Servers !== 'undefined') { // Set status code requestParserResult.status=0; @@ -27,44 +35,41 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ else{ requestParserResult.failReason="Error"; } - return requestParserResult; - - }; - // Get Machine + /** + * Retrieve machine list + * @param {callback} function to call after request complete + */ var pullMachines=function(callback){ - - var params={ - "token" : Identity.getToken(), - "task" : "compute", - "action":"listServers" - }; - + // Send listServers request var result=$http.post('../server/index.php', - $.param(params)); + $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listServers"})); // Wait and handle the response result.then(function (response){ - - callback(parseGetMachinesAnswer(response, false)); + callback(parsePullMachinesAnswer(response, false)); },function(response){ - alert(response.status); - callback(parseGetMachinesAnswer(response, true)); - }); - - + callback(parsePullMachinesAnswer(response, true)); + }); }; - + /** + * Retrieve all data + * @param {callback} function to call after request complete + */ var pullData=function(callback){ // TODO call getMachines etc... } + /** + * Get Data + * @return {data} return the data object + */ var getData=function(){ return data; } diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html index 606edcf..28c9165 100644 --- a/client/partials/home/machineDetails.html +++ b/client/partials/home/machineDetails.html @@ -21,11 +21,11 @@
- Online - Offline + Online + Offline   - - + +   @@ -34,7 +34,7 @@
- + @@ -60,7 +60,7 @@
- - - - - + + MB
-- cgit v1.2.3 From 2d99f1ecf2164431b03eff5bcbaa7abe67287602 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 2 Mar 2016 07:14:05 +0100 Subject: Create loading service --- client/index.html | 4 +++- client/js/controllers/home/main.js | 8 ++++++-- client/js/services/Loading.js | 22 ++++++++++++++++++++++ client/partials/loading.html | 18 ++++++++++++++++++ 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 client/js/services/Loading.js create mode 100644 client/partials/loading.html (limited to 'client/js/services') diff --git a/client/index.html b/client/index.html index 8d81ac3..8ca2b9f 100644 --- a/client/index.html +++ b/client/index.html @@ -28,8 +28,9 @@
+
- +
@@ -79,6 +80,7 @@ + diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index 9d7ddfc..2e9c00b 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -3,24 +3,28 @@ * * @param {$scope} $scope The $scope service from angular */ -mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope) +mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading', function ($scope, Compute, $rootScope, Loading) { var callMeAfterPullData=function(data){ $scope.machines=Compute.getData().machines; + Loading.stop(); } - + Loading.start(); Compute.pullData(callMeAfterPullData); $scope.raiseShowMachineDetailsEvent=function(id){ + var callback=function(){ + Loading.stop(); var data=Compute.getData(); $rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms); } + Loading.start(); Compute.pullMachines(callback); } diff --git a/client/js/services/Loading.js b/client/js/services/Loading.js new file mode 100644 index 0000000..b12aaa0 --- /dev/null +++ b/client/js/services/Loading.js @@ -0,0 +1,22 @@ + +mainApp.factory('Loading',[ '$http', 'Identity', function($http, Identity){ + + + + + var start=function(){ + $('#loadingModal').modal({backdrop: 'static', keyboard: false}); + }; + + var stop=function(){ + $('#loadingModal').modal('hide'); + } + + + return { + start:start, + stop:stop + }; + + +}]); diff --git a/client/partials/loading.html b/client/partials/loading.html new file mode 100644 index 0000000..c978190 --- /dev/null +++ b/client/partials/loading.html @@ -0,0 +1,18 @@ + -- cgit v1.2.3 From fa5a48bc3a76b109f6611620b6e56f3024def029 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 2 Mar 2016 17:41:04 +0100 Subject: Correct bugs --- client/js/controllers/login.js | 3 ++- client/js/controllers/status.js | 6 +++--- client/js/services/Identity.js | 6 +++++- client/partials/nav.html | 26 +++++++------------------- 4 files changed, 17 insertions(+), 24 deletions(-) (limited to 'client/js/services') diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 1a89563..63cb6d1 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -16,10 +16,11 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s // Manager logout event $scope.$on('logoutEvent', function(){ - Identity.logout(); $('#loginModal').modal({backdrop: 'static', keyboard: false}); }); + + // Hide loading button and message alert $('#loadingLoginButton').hide(); $('#failedToLoginAlert').hide(); diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index 940d794..6f398ad 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -11,10 +11,10 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($ // Give profile to model $scope.profile=Identity.getProfile(); - + // Function to logout - $scope.raiseLogoutEvent=function(){ - $rootScope.$broadcast('logoutEvent'); + $scope.logout=function(){ + Identity.logout(); }; }]); diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js index da85ecd..e6a9daf 100644 --- a/client/js/services/Identity.js +++ b/client/js/services/Identity.js @@ -1,5 +1,5 @@ -mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ +mainApp.factory('Identity',[ '$http', '$cookies', '$rootScope', function($http, $cookies, $rootScope){ /* Create profile structure to store informations * about current session @@ -51,6 +51,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ token=null; profile.username=null; profile.projectname=null; + + // Reload Page + location.reload(); } @@ -95,6 +98,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ else{ requestParserResult.failReason="Please check your username, password and project name !"; } + return requestParserResult; }; diff --git a/client/partials/nav.html b/client/partials/nav.html index b3ef76a..01b9079 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -8,7 +8,7 @@ - Status + Status
@@ -18,24 +18,12 @@ - +
  • User : {{ profile.username }}
    • +
  • Project Name : {{ profile.projectname }}
    • + - - + + -- cgit v1.2.3 From 824382b3ea5902d5e5343d2898232e1521565dff Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 2 Mar 2016 20:51:04 +0100 Subject: Clean file name --- client/index.html | 4 ++-- client/js/controllers/home/home.js | 36 ++++++++++++++++++++++++++++++++ client/js/controllers/home/main.js | 36 -------------------------------- client/js/controllers/network/main.js | 8 ------- client/js/controllers/network/network.js | 8 +++++++ client/js/services/Identity.js | 2 +- client/js/services/Loading.js | 15 ++++++------- 7 files changed, 55 insertions(+), 54 deletions(-) create mode 100644 client/js/controllers/home/home.js delete mode 100644 client/js/controllers/home/main.js delete mode 100644 client/js/controllers/network/main.js create mode 100644 client/js/controllers/network/network.js (limited to 'client/js/services') diff --git a/client/index.html b/client/index.html index ca6bbe6..48ea4a0 100644 --- a/client/index.html +++ b/client/index.html @@ -86,9 +86,9 @@ - + - + diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js new file mode 100644 index 0000000..f84f625 --- /dev/null +++ b/client/js/controllers/home/home.js @@ -0,0 +1,36 @@ +/** + * The home controller + * + * @param {$scope} $scope The $scope service from angular + */ +mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity) +{ + + var callMeAfterPullData=function(data){ + $scope.machines=Compute.getData().machines; + Loading.stop(); + } + + ; + if(Compute.getData().machines == null && Identity.isAlreadyLogin()){ + Loading.start(); + Compute.pullData(callMeAfterPullData); + } + + + + + $scope.raiseShowMachineDetailsEvent=function(id){ + + var callback=function(){ + Loading.stop(); + var data=Compute.getData(); + $rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms); + + } + Loading.start(); + Compute.pullMachines(callback); + } + + +}]); diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js deleted file mode 100644 index f84f625..0000000 --- a/client/js/controllers/home/main.js +++ /dev/null @@ -1,36 +0,0 @@ -/** - * The home controller - * - * @param {$scope} $scope The $scope service from angular - */ -mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity) -{ - - var callMeAfterPullData=function(data){ - $scope.machines=Compute.getData().machines; - Loading.stop(); - } - - ; - if(Compute.getData().machines == null && Identity.isAlreadyLogin()){ - Loading.start(); - Compute.pullData(callMeAfterPullData); - } - - - - - $scope.raiseShowMachineDetailsEvent=function(id){ - - var callback=function(){ - Loading.stop(); - var data=Compute.getData(); - $rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms); - - } - Loading.start(); - Compute.pullMachines(callback); - } - - -}]); diff --git a/client/js/controllers/network/main.js b/client/js/controllers/network/main.js deleted file mode 100644 index 7264aec..0000000 --- a/client/js/controllers/network/main.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * The network controller - * - * @param {$scope} $scope The $scope service from angular - */ -mainApp.controller('networkCtrl', function ($scope) -{ -}); \ No newline at end of file diff --git a/client/js/controllers/network/network.js b/client/js/controllers/network/network.js new file mode 100644 index 0000000..7264aec --- /dev/null +++ b/client/js/controllers/network/network.js @@ -0,0 +1,8 @@ +/** + * The network controller + * + * @param {$scope} $scope The $scope service from angular + */ +mainApp.controller('networkCtrl', function ($scope) +{ +}); \ No newline at end of file diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js index e6a9daf..db93e97 100644 --- a/client/js/services/Identity.js +++ b/client/js/services/Identity.js @@ -1,5 +1,5 @@ -mainApp.factory('Identity',[ '$http', '$cookies', '$rootScope', function($http, $cookies, $rootScope){ +mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ /* Create profile structure to store informations * about current session diff --git a/client/js/services/Loading.js b/client/js/services/Loading.js index b12aaa0..db06194 100644 --- a/client/js/services/Loading.js +++ b/client/js/services/Loading.js @@ -1,22 +1,23 @@ -mainApp.factory('Loading',[ '$http', 'Identity', function($http, Identity){ - - - - +mainApp.factory('Loading',[ function(){ + /** + * Display Loading modal + */ var start=function(){ $('#loadingModal').modal({backdrop: 'static', keyboard: false}); }; + /** + * Hide Loading modal + */ var stop=function(){ $('#loadingModal').modal('hide'); } + // Service returns return { start:start, stop:stop }; - - }]); -- cgit v1.2.3