summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/index.html4
-rwxr-xr-x[-rw-r--r--]client/js/controllers/home/home.js19
-rw-r--r--client/js/controllers/home/machineDetails.js7
-rw-r--r--client/js/controllers/image/image.js26
-rw-r--r--client/js/controllers/status.js1
-rw-r--r--client/js/services/Identity.js9
-rw-r--r--client/js/services/Image.js20
-rw-r--r--client/partials/image/image.html36
-rw-r--r--client/partials/image/upload.html25
9 files changed, 124 insertions, 23 deletions
diff --git a/client/index.html b/client/index.html
index a06994c..08be038 100644
--- a/client/index.html
+++ b/client/index.html
@@ -23,7 +23,7 @@
<div ng-include="'./partials/login.html'"></div>
<div ng-include="'./partials/home/machineDetails.html'"></div>
<div ng-include="'./partials/loading.html'"></div>
-
+<div ng-include="'./partials/image/upload.html'"></div>
<!-- MAIN GRID -->
@@ -66,7 +66,7 @@
<!-- Include JQuery -->
<script src="./vendors/jquery/jquery-2.2.0.min.js"></script>
-
+
<!-- Include Bootstrap -->
<script src="./vendors/bootstrap/js/bootstrap.min.js"></script>
diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index d20779b..3332a10 100644..100755
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -8,7 +8,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
var callMeAfterPullData=function(data){
$scope.machines=Compute.getData().machines;
- Loading.stop();
+ Loading.stop();
}
;
@@ -26,6 +26,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
Image.getImages(function(){});
+
$scope.raiseShowMachineDetailsEvent=function(id){
var callback=function(){
@@ -39,4 +40,20 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
}
+
+
+
+ if(Identity.isAlreadyLogin()){
+ if(Compute.getData().machines == null{
+ Loading.start();
+ Compute.pullData(callMeAfterPullData);
+ }
+ else{
+ if(Identity.isAlreadyLogin()){
+ callMeAfterPullData();
+ }
+ }
+ Image.getImages(function(){});
+ }
+
}]);
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index c015eaa..371310b 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -3,9 +3,10 @@
*
* @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
$scope.machine={};
$scope.machineIsStarting=false; // For loading icon
@@ -27,7 +28,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
$scope.machineIsStarting=false;
}, 3000);
$timeout(function(){
- $scope.machine.online=!$scope.machine.online;
+ $scope.machine.online=!$scope.machine.online;
}, 3000);
@@ -37,7 +38,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
$scope.applyModifications=function(){
//Todo
}
-
+
}]);
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index e298fcc..b0b162b 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -3,19 +3,27 @@
*
* @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(){
$scope.images=Image.getData().images;
- Loading.stop();
+ Loading.stop();
};
- if(Image.getData().images==null){
- Loading.start();
- Image.getImages(callbackTest);
- }
- else{
- callbackTest();
- }
+ $scope.doUpload = function () {
+ Image.uploadImage($scope.myFile,function(){});
+ };
+ if(Identity.isAlreadyLogin()){
+
+ if(Image.getData().images==null){
+ Loading.start();
+ Image.getImages(callbackTest);
+ }
+ else{
+ callbackTest();
+ }
+
+ }
}]);
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 6f398ad..b4a5dd9 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -9,6 +9,7 @@
mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($scope, Identity, $rootScope)
{
+
// Give profile to model
$scope.profile=Identity.getProfile();
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index db93e97..f9d1df4 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -27,9 +27,12 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
&& typeof tokenPart_1InCookie !== 'undefined'
){
- // If yes, put it into variables
- angular.extend(profile, profileInCookie);
- token=tokenPart_0InCookie+tokenPart_1InCookie;
+ if(token!==null){
+ // If yes, put it into variables
+ angular.extend(profile, profileInCookie);
+ token=tokenPart_0InCookie+tokenPart_1InCookie;
+
+ }
// Return I'm Login
return true;
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index 2e8c56f..decb5b2 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -44,6 +44,23 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
};
+ var uploadImage=function(fileToUpload, callback) {
+
+
+ var result=$http.post('../server/index.php',
+ $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'filename':fileToUpload, 'id':'6564'}));
+
+ // 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;
@@ -52,7 +69,8 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
// Return services objects
return {
getImages:getImages,
- getData:getData
+ getData:getData,
+ uploadImage:uploadImage
};
diff --git a/client/partials/image/image.html b/client/partials/image/image.html
index 8af8af5..886a11d 100644
--- a/client/partials/image/image.html
+++ b/client/partials/image/image.html
@@ -1,10 +1,38 @@
- <div class="panel panel-default" ng-controller="imageCtrl">
+
+
+<div class="panel panel-default" ng-controller="imageCtrl">
<div class="panel-heading">
- Images disponibles
+ Image Manager
</div>
<div class="panel-body">
- <div ng-repeat="image in images">
- {{image.name}}
+
+
+ <div class="btn-group btn-group-md" role="group" aria-label="...">
+ <button type="button" class="btn btn-default" data-toggle="modal" data-target="#uploadImageModal"">Upload</button>
+ <button type="button" class="btn btn-default">Download</button>
</div>
+ <p></p>
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Size</th>
+ <th>Action</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="image in images">
+ <td>{{ image.name }}</td>
+ <td>{{ (image.size / 1048576).toFixed(2) }} MB</td>
+ <td><button type="button" class="btn btn-danger">Remove</button></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
</div>
</div>
diff --git a/client/partials/image/upload.html b/client/partials/image/upload.html
new file mode 100644
index 0000000..9049abf
--- /dev/null
+++ b/client/partials/image/upload.html
@@ -0,0 +1,25 @@
+<div class="modal fade" id="uploadImageModal" ng-controller="loginCtrl">
+ <div class="modal-dialog">
+ <div class="modal-content"></div>
+ </div>
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>-->
+ <h4 class="modal-title">Upload Image</h4>
+
+ </div>
+
+ <div class="modal-body">
+
+ <label class="control-label">Select File</label>
+ <input id="input-1" type="file" class="file">
+ <p></p>
+ <div class="modal-footer">
+ <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
+
+ <a href="#" class="btn btn-lg btn-primary btn-block" id="loginButton">Upload</a>
+ </div>
+ </div>
+ </div>
+</div>
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-17 19:34:36 +0000