loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add login check

Browse source
This commit is contained in:
manzerbredes 2016-03-20 11:23:06 +01:00
parent 0ce2b2fa30
commit 57006dba22
5 changed files with 44 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
client/js/controllers/home/home.js
View file

@ -8,23 +8,9 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
var callMeAfterPullData=function(data){ var callMeAfterPullData=function(data){
$scope.machines=Compute.getData().machines; $scope.machines=Compute.getData().machines;
Loading.stop(); Loading.stop();
} };
;
if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
Loading.start();
Compute.pullData(callMeAfterPullData);
}
else{
if(Identity.isAlreadyLogin()){
callMeAfterPullData();
}
}
Image.getImages(function(){});
$scope.raiseShowMachineDetailsEvent=function(id){ $scope.raiseShowMachineDetailsEvent=function(id){
@ -32,11 +18,27 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
Loading.stop(); Loading.stop();
var data=Compute.getData(); var data=Compute.getData();
$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms); $rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);
} }
Loading.start(); Loading.start();
Compute.pullMachines(callback); Compute.pullMachines(callback);
} }
if(Identity.isAlreadyLogin()){
if(Compute.getData().machines == null{
Loading.start();
Compute.pullData(callMeAfterPullData);
}
else{
if(Identity.isAlreadyLogin()){
callMeAfterPullData();
}
}
Image.getImages(function(){});
}
}]); }]);

7
client/js/controllers/home/machineDetails.js
View file

@ -3,9 +3,10 @@
* *
* @param {$scope} $scope The $scope service from angular * @param {$scope} $scope The $scope service from angular
*/ */
mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', function ($scope, Compute, $rootScope, $timeout) mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
{ {
// Init scope // Init scope
$scope.machine={}; $scope.machine={};
$scope.machineIsStarting=false; // For loading icon $scope.machineIsStarting=false; // For loading icon
@ -27,7 +28,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
$scope.machineIsStarting=false; $scope.machineIsStarting=false;
}, 3000); }, 3000);
$timeout(function(){ $timeout(function(){
$scope.machine.online=!$scope.machine.online; $scope.machine.online=!$scope.machine.online;
}, 3000); }, 3000);
@ -37,7 +38,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
$scope.applyModifications=function(){ $scope.applyModifications=function(){
//Todo //Todo
} }
}]); }]);

24
client/js/controllers/image/image.js
View file

@ -3,23 +3,27 @@
* *
* @param {$scope} $scope The $scope service from angular * @param {$scope} $scope The $scope service from angular
*/ */
mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading',function ($scope, Image, Loading) mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity)
{ {
var callbackTest=function(){ var callbackTest=function(){
$scope.images=Image.getData().images; $scope.images=Image.getData().images;
Loading.stop(); Loading.stop();
}; };
if(Image.getData().images==null){
Loading.start();
Image.getImages(callbackTest);
}
else{
callbackTest();
}
$scope.doUpload = function () { $scope.doUpload = function () {
Image.uploadImage($scope.myFile,function(){}); Image.uploadImage($scope.myFile,function(){});
}; };
if(Identity.isAlreadyLogin()){
if(Image.getData().images==null){
Loading.start();
Image.getImages(callbackTest);
}
else{
callbackTest();
}
}
}]); }]);

1
client/js/controllers/status.js
View file

@ -9,6 +9,7 @@
mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($scope, Identity, $rootScope) mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($scope, Identity, $rootScope)
{ {
// Give profile to model // Give profile to model
$scope.profile=Identity.getProfile(); $scope.profile=Identity.getProfile();

9
client/js/services/Identity.js
View file

@ -27,9 +27,12 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
&& typeof tokenPart_1InCookie !== 'undefined' && typeof tokenPart_1InCookie !== 'undefined'
){ ){
// If yes, put it into variables if(token!==null){
angular.extend(profile, profileInCookie); // If yes, put it into variables
token=tokenPart_0InCookie+tokenPart_1InCookie; angular.extend(profile, profileInCookie);
token=tokenPart_0InCookie+tokenPart_1InCookie;
}
// Return I'm Login // Return I'm Login
return true; return true;