summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/index.html5
-rw-r--r--client/js/app.js8
-rw-r--r--client/js/controllers/home/home.js34
-rw-r--r--client/js/controllers/home/machineDetails.js7
-rw-r--r--client/js/controllers/image/image.js29
-rw-r--r--client/js/controllers/status.js1
-rw-r--r--client/js/services/Identity.js9
-rw-r--r--client/js/services/Image.js55
-rw-r--r--client/partials/home/home.html (renamed from client/partials/home/main.html)0
-rw-r--r--client/partials/image/image.html38
-rw-r--r--client/partials/image/upload.html25
-rw-r--r--client/partials/menu.html3
-rw-r--r--client/partials/network/network.html (renamed from client/partials/network/main.html)0
13 files changed, 187 insertions, 27 deletions
diff --git a/client/index.html b/client/index.html
index 48ea4a0..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>
@@ -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..2b355b1 100644
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -3,22 +3,14 @@
*
* @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){
$scope.machines=Compute.getData().machines;
- Loading.stop();
- }
-
- ;
- if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
- Loading.start();
- Compute.pullData(callMeAfterPullData);
- }
-
-
-
+ Loading.stop();
+ };
+
$scope.raiseShowMachineDetailsEvent=function(id){
@@ -26,11 +18,27 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
Loading.stop();
var data=Compute.getData();
$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);
-
+
}
Loading.start();
Compute.pullMachines(callback);
}
+
+
+
+ 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
new file mode 100644
index 0000000..b0b162b
--- /dev/null
+++ b/client/js/controllers/image/image.js
@@ -0,0 +1,29 @@
+/**
+ * The image controller
+ *
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity)
+{
+
+ var callbackTest=function(){
+ $scope.images=Image.getData().images;
+ Loading.stop();
+ };
+
+ $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 23b33a8..decb5b2 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -1,27 +1,76 @@
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 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;
+ };
// Return services objects
return {
- uploadImage: uploadImage
+ getImages:getImages,
+ getData:getData,
+ uploadImage:uploadImage
};
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..886a11d
--- /dev/null
+++ b/client/partials/image/image.html
@@ -0,0 +1,38 @@
+
+
+<div class="panel panel-default" ng-controller="imageCtrl">
+ <div class="panel-heading">
+ Image Manager
+ </div>
+ <div class="panel-body">
+
+
+ <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>
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
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-18 11:33:29 +0000