diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/index.html | 1 | ||||
| -rw-r--r-- | client/js/app.js | 8 | ||||
| -rw-r--r-- | client/js/controllers/home/home.js | 10 | ||||
| -rw-r--r-- | client/js/controllers/image/image.js | 21 | ||||
| -rw-r--r-- | client/js/services/Image.js | 37 | ||||
| -rw-r--r-- | client/partials/home/home.html (renamed from client/partials/home/main.html) | 0 | ||||
| -rw-r--r-- | client/partials/image/image.html | 10 | ||||
| -rw-r--r-- | client/partials/menu.html | 3 | ||||
| -rw-r--r-- | client/partials/network/network.html (renamed from client/partials/network/main.html) | 0 |
9 files changed, 82 insertions, 8 deletions
diff --git a/client/index.html b/client/index.html index 48ea4a0..a06994c 100644 --- a/client/index.html +++ b/client/index.html @@ -89,6 +89,7 @@ <script src="./js/controllers/home/home.js"></script> <script src="./js/controllers/home/machineDetails.js"></script> <script src="./js/controllers/network/network.js"></script> + <script src="./js/controllers/image/image.js"></script> diff --git a/client/js/app.js b/client/js/app.js index e2d5b9b..1602e65 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -13,12 +13,16 @@ mainApp.config(['$routeProvider', function($routeProvider){ $routeProvider. when('/home',{ - templateUrl: 'partials/home/main.html', + templateUrl: 'partials/home/home.html', controller: 'homeCtrl' }). when('/network',{ - templateUrl: 'partials/network/main.html', + templateUrl: 'partials/network/network.html', controller: 'networkCtrl' + }). + when('/image',{ + templateUrl: 'partials/image/image.html', + controller: 'imageCtrl' }).otherwise({ redirectTo: '/home' }); diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js index f84f625..4402e62 100644 --- a/client/js/controllers/home/home.js +++ b/client/js/controllers/home/home.js @@ -3,7 +3,7 @@ * * @param {$scope} $scope The $scope service from angular */ -mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity) +mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image) { var callMeAfterPullData=function(data){ @@ -16,8 +16,14 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I Loading.start(); Compute.pullData(callMeAfterPullData); } + else{ + if(Identity.isAlreadyLogin()){ + callMeAfterPullData(); + } + } - + + Image.getImages(function(){}); $scope.raiseShowMachineDetailsEvent=function(id){ diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js new file mode 100644 index 0000000..e298fcc --- /dev/null +++ b/client/js/controllers/image/image.js @@ -0,0 +1,21 @@ +/** + * The image controller + * + * @param {$scope} $scope The $scope service from angular + */ +mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', function ($scope, Image, Loading) +{ + var callbackTest=function(){ + $scope.images=Image.getData().images; + Loading.stop(); + }; + + if(Image.getData().images==null){ + Loading.start(); + Image.getImages(callbackTest); + } + else{ + callbackTest(); + } + +}]); diff --git a/client/js/services/Image.js b/client/js/services/Image.js index 23b33a8..2e8c56f 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -1,27 +1,58 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){ + var data={}; + data.images=null; var parseUploadImageAnswer=function(response, failedToSendRequest){ + + // Defined return object + var requestParserResult={}; + requestParserResult.status=1; + requestParserResult.failReason=null; + + if (typeof response.data.Images !== 'undefined') { + // Set status code + requestParserResult.status=0; + data.images=response.data.Images; + + } + else if(failedToSendRequest){ + requestParserResult.failReason="Failed to send request"; + } + else{ + requestParserResult.failReason="Error"; + } + return requestParserResult; }; var getImages=function(callback){ var result=$http.post('../server/index.php', - $.param({"token" : Identity.profile.token, "task" : "Image"})); + $.param({"token" : Identity.getToken(), "task" : "image", 'action':'listImage'})); + + // Wait and handle the response + result.then(function (response){ + callback(parseUploadImageAnswer(response, false)); + },function(response){ + callback(parseUploadImageAnswer(response, true)); + }); - }; + var getData=function(response){ + return data; + }; // Return services objects return { - uploadImage: uploadImage + getImages:getImages, + getData:getData }; diff --git a/client/partials/home/main.html b/client/partials/home/home.html index f9f8878..f9f8878 100644 --- a/client/partials/home/main.html +++ b/client/partials/home/home.html diff --git a/client/partials/image/image.html b/client/partials/image/image.html new file mode 100644 index 0000000..8af8af5 --- /dev/null +++ b/client/partials/image/image.html @@ -0,0 +1,10 @@ + <div class="panel panel-default" ng-controller="imageCtrl"> + <div class="panel-heading"> + Images disponibles + </div> + <div class="panel-body"> + <div ng-repeat="image in images"> + {{image.name}} + </div> + </div> +</div> diff --git a/client/partials/menu.html b/client/partials/menu.html index dfd5842..a473fd8 100644 --- a/client/partials/menu.html +++ b/client/partials/menu.html @@ -1,4 +1,5 @@ <div class="list-group"> <a href="#/home" class="list-group-item">Home</a> <a href="#/network" class="list-group-item">Network</a> -</div>
\ No newline at end of file + <a href="#/image" class="list-group-item">Images</a> +</div> diff --git a/client/partials/network/main.html b/client/partials/network/network.html index 8b779be..8b779be 100644 --- a/client/partials/network/main.html +++ b/client/partials/network/network.html |