Add login check witouth reloading page

.gitignore

@@ -1 +1 @@
-/nbproject
+nbproject

client/index.html

@@ -66,7 +66,8 @@
     
     <!-- Include JQuery -->
     <script src="./vendors/jquery/jquery-2.2.0.min.js"></script>
-	
+	<script src="./vendors/jquery/dmuploader.min.js"></script>
+
     <!-- Include Bootstrap -->
     <script src="./vendors/bootstrap/js/bootstrap.min.js"></script>
     
@@ -75,6 +76,7 @@
     <script src="./vendors/angularjs/angular-route.min.js"></script>
     <script src="./vendors/angularjs/angular-sanitize.min.js"></script>
     <script src="./vendors/angularjs/angular-cookies.min.js"></script>
+	<script src="./vendors/angularjs/angular-upload.min.js"></script>
     <script src="./js/app.js"></script>
     
     <!-- Include services -->
@@ -90,6 +92,7 @@
     <script src="./js/controllers/home/machineDetails.js"></script>	
     <script src="./js/controllers/network/network.js"></script>
 	<script src="./js/controllers/image/image.js"></script>
+	<script src="./js/controllers/image/upload.js"></script>
 
     
     

client/js/app.js

@@ -3,7 +3,7 @@
  * The main app module instance
  * @type angular.module.angular-1_3_6_L1749.moduleInstance
  */
-var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize', 'ngCookies']);
+var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize', 'ngCookies','lr.upload']);
 
 /**
  * Configure routeProvider

client/js/controllers/home/home.js

@@ -29,7 +29,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 
 	
 	if(Identity.isAlreadyLogin()){
-		if(Compute.getData().machines == null{
+		if(Compute.getData().machines == null){
 			Loading.start();
 			Compute.pullData(callMeAfterPullData);		
 		}

client/js/controllers/image/image.js

@@ -11,9 +11,6 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', funct
 		Loading.stop();
 	};
 
-	$scope.doUpload = function () {
-		Image.uploadImage($scope.myFile,function(){});
-	};
 	
 	if(Identity.isAlreadyLogin()){
 

client/js/controllers/image/upload.js

@@ -0,0 +1,60 @@
+/**
+ * The image controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity,upload)
+{
+        /*$scope.uploader = new FileUploader({
+					"token" : Identity.getToken(),
+					"task" : "image",
+					'action':'uploadImage',
+					'id':'6564'
+				});
+        $scope.uploader.url='../server/index.php'
+        $scope.uploader.alias='file_name'
+        $scope.uploader.formData={
+					"token" : Identity.getToken(),
+					"task" : "image",
+					'action':'uploadImage',
+					'id':'6564'
+				}
+	*/
+
+	$scope.doUpload = function () {
+		console.log($('#imageToUpload').prop('files')[0]); 
+		Image.uploadImage($('#imageToUpload').prop('files')[0], function(){alert("done")})
+		/*$("#drop-area-div").dmUploader({
+				extraData: 	{
+				"token" : Identity.getToken(),
+				"task" : "image",
+				'action':'uploadImage',
+				'id':'6564'},
+				url:"../server/index.php"
+		});
+		*/
+		
+		/*upload({
+			url: '../server/index.php',
+			method: 'POST',
+			data: {
+			"token" : Identity.getToken(),
+			"task" : "image",
+			'action':'uploadImage',
+			'id':'6564',
+			"file_name": $scope.myFile, // a jqLite type="file" element, upload() will extract all the files from the input and put them into the FormData object before sending.
+			}
+		}).then(
+			  function (response) {
+				console.log(response.data); // will output whatever you choose to return from the server on a successful upload
+			  },
+			  function (response) {
+				  console.error(response); //  Will return if status code is above 200 and lower than 300, same as $http
+			  }
+		);*/
+    
+    
+	};
+	
+
+}]);

client/js/controllers/login.js

@@ -9,15 +9,15 @@
  */
 mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$sce, Identity)
 {
-	// Check for login and define default states
-	if(!Identity.isAlreadyLogin()){
-		$('#loginModal').modal({backdrop: 'static', keyboard: false});
-	}
+    // Check for login and define default states
+    if(!Identity.isAlreadyLogin()){
+        $('#loginModal').modal({backdrop: 'static', keyboard: false});
+    }
 
-	// Manager logout event
-	$scope.$on('logoutEvent', function(){
-		$('#loginModal').modal({backdrop: 'static', keyboard: false});
-	});
+    // Manager logout event
+    $scope.$on('logoutEvent', function(){
+        $('#loginModal').modal({backdrop: 'static', keyboard: false});
+    });
 
 
 	

client/js/controllers/status.js

@@ -15,7 +15,7 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($
 	
     // Function to logout
     $scope.logout=function(){
-		Identity.logout();
-	};
+        Identity.logout();
+    };
 
 }]);

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
@@ -27,17 +27,20 @@ mainApp.factory('Identity',[ '$http', '$cookies',  function($http, $cookies){
 		   && typeof tokenPart_1InCookie !== 'undefined'
 		  ){
 
-			if(token!==null){
+			//if(token!==null){
 				// If yes, put it into variables
 				angular.extend(profile, profileInCookie);
 				token=tokenPart_0InCookie+tokenPart_1InCookie;
 				
-			}
+			//}
 
 			// Return I'm Login
 			return true;
 		}
-
+                
+                // Show the login overlay
+                $rootScope.$broadcast("logoutEvent");
+                
 		// Return I'm not Login
 		return false;
 	}
@@ -56,7 +59,9 @@ mainApp.factory('Identity',[ '$http', '$cookies',  function($http, $cookies){
 		profile.projectname=null;
 
 		// Reload Page
-		location.reload();
+		//location.reload();
+                $rootScope.$broadcast("logoutEvent");
+
 	}
 
 	

client/js/services/Image.js

@@ -45,17 +45,42 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
 	};
 
 	var uploadImage=function(fileToUpload, callback) {
+		var form_data = new FormData();                  
+		form_data.append('file', fileToUpload);
+		console.log(fileToUpload)
+		form_data.append("task" , "image")
+		form_data.append("token" , Identity.getToken())
+		form_data.append('action',"uploadImage")
+		form_data.append('id','6564')
+		form_data.append('file_name', fileToUpload.name);
 
+		$.ajax({
+		url: "../server/index.php", // Url to which the request is send
+		type: "POST",             // Type of request to be send, called as method
+		data: form_data, // Data sent to server, a set of key/value pairs (i.e. form fields and values)
+		file_name:fileToUpload.name,
+		token : Identity.getToken(),
+		task : "image",
+		action:'uploadImage',
+		id:'6564',
+		contentType: false,       // The content type used when sending data to the server.
+		cache: false,             // To unable request pages to be cached
+		processData:false,        // To send DOMDocument or non processed data file it is set to false
+		success: function(data)   // A function to be called if request succeeds
+			{
+				alert("success")
+			}
+		});
 
-		var result=$http.post('../server/index.php',
-							  $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'filename':fileToUpload, 'id':'6564'}));  
+		//var result=$http.post('../server/index.php',
+			//				  $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'file_name':form_data, 'id':'6564'}));  
 
 		// Wait and handle the response
-        result.then(function (response){
+     /*   result.then(function (response){
 			callback(parseUploadImageAnswer(response, false));
         },function(response){
 			callback(parseUploadImageAnswer(response, true));
-        });
+        });*/
 
 
 		  

client/partials/image/upload.html

@@ -1,4 +1,4 @@
-<div class="modal fade" id="uploadImageModal" ng-controller="loginCtrl">
+<div class="modal fade" id="uploadImageModal" ng-controller="uploadImageCtrl">
     <div class="modal-dialog">
         <div class="modal-content"></div>
     </div>
@@ -12,13 +12,16 @@
 			
             <div class="modal-body">
 
-				<label class="control-label">Select File</label>
-				<input id="input-1" type="file" class="file">
-				<p></p>
+
+
+					Choose a file to upload: <input id="imageToUpload" name="uploaded_file" type="file" />
+					<input type="submit" value="Upload" />
+				
+				
 				<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>
+                <a class="btn btn-lg btn-primary btn-block" id="loginButton" ng-click="doUpload()">Upload</a>
             </div>
         </div>
     </div>

client/vendors/angularjs/angular-upload.min.js

@@ -0,0 +1 @@
+"use strict";angular.module("lr.upload",["lr.upload.formdata","lr.upload.iframe","lr.upload.directives"]),angular.module("lr.upload.directives",[]),angular.module("lr.upload.directives").directive("uploadButton",["upload",function(a){return{restrict:"EA",scope:{data:"=?data",url:"@",id:"@",param:"@",method:"@",onUpload:"&",onSuccess:"&",onError:"&",onComplete:"&"},link:function(b,c,d){var e=angular.element(c),f=angular.element('<input id="'+b.id+'" type="file" />');if(e.append(f),f.on("change",function(){var c=angular.element(this);if(!c[0].files||0!==c[0].files.length){var e={url:b.url,method:b.method||"POST",forceIFrameUpload:b.$eval(d.forceIframeUpload)||!1,data:b.data||{}};e.data[b.param||"file"]=c,b.$apply(function(){b.onUpload({files:c[0].files})}),a(e).then(function(a){b.onSuccess({response:a}),b.onComplete({response:a})},function(a){b.onError({response:a}),b.onComplete({response:a})})}}),"required"in d&&d.$observe("required",function(a){var d=""===a?!0:b.$eval(a);f.attr("required",d),c.toggleClass("ng-valid",!d),c.toggleClass("ng-invalid ng-invalid-required",d)}),"accept"in d&&d.$observe("accept",function(a){f.attr("accept",a)}),a.support.formData){var g=function(){f.attr("multiple",!(!b.$eval(d.multiple)||b.$eval(d.forceIframeUpload)))};d.$observe("multiple",g),d.$observe("forceIframeUpload",g)}}}}]),angular.module("lr.upload.formdata",[]).factory("formDataTransform",function(){return function(a){var b=new FormData;return angular.forEach(a,function(a,c){if(angular.isElement(a)){var d=[];angular.forEach(a,function(a){angular.forEach(a.files,function(a){d.push(a)}),a.value=""}),0!==d.length&&(d.length>1?angular.forEach(d,function(a,d){b.append(c+"["+d+"]",a)}):b.append(c,d[0]))}else b.append(c,a)}),b}}).factory("formDataUpload",["$http","formDataTransform",function(a,b){return function(c){return c.transformRequest=b,c.method=c.method||"POST",c.headers=angular.extend(c.headers||{},{"Content-Type":void 0}),a(c)}}]),angular.module("lr.upload.iframe",[]).factory("iFrameUpload",["$q","$http","$document","$rootScope",function(a,b,c,d){function e(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0;c<a.length;c++)if(b===a[c])return c;return-1}function f(f){var g=[],h=a.defer(),i=h.promise;angular.forEach(f.data||{},function(a,b){angular.isElement(a)&&(delete f.data[b],a.attr("name",b),g.push(a))});var j=/\?/.test(f.url)?"&":"?";"DELETE"===f.method?(f.url=f.url+j+"_method=DELETE",f.method="POST"):"PUT"===f.method?(f.url=f.url+j+"_method=PUT",f.method="POST"):"PATCH"===f.method&&(f.url=f.url+j+"_method=PATCH",f.method="POST");var k=angular.element(c[0].body),l=d.$new(),m="iframe-transport-"+l.$id;l.$destroy();var n=angular.element("<form></form>");n.attr("target",m),n.attr("action",f.url),n.attr("method",f.method||"POST"),n.css("display","none"),g.length&&(n.attr("enctype","multipart/form-data"),n.attr("encoding","multipart/form-data"));var o=angular.element('<iframe name="'+m+'" src="javascript:false;"></iframe>');return o.on("load",function(){function a(a,b){var c=[];return angular.isFunction(b)?b(a,c):(angular.forEach(b,function(b){a=b(a,c)}),a)}function c(){var a=e(b.pendingRequests,f);-1!==a&&(b.pendingRequests.splice(a,1),f.$iframeTransportForm.remove(),delete f.$iframeTransportForm)}o.off("load").on("load",function(){var c;try{var d=this.contentWindow?this.contentWindow.document:this.contentDocument;if(c=angular.element(d.body).text(),!c.length)throw new Error}catch(e){}n.append(angular.element('<iframe src="javascript:false;"></iframe>'));try{c=a(c,b.defaults.transformResponse)}catch(e){}h.resolve({data:c,status:200,headers:[],config:f})}),angular.forEach(f.data,function(a,b){var c=angular.element('<input type="hidden" />');c.attr("name",b),c.val(a),n.append(c)}),angular.forEach(g,function(a){var b=a.clone(!0);a.after(b),n.append(a)}),f.$iframeTransportForm=n,b.pendingRequests.push(f),n[0].submit(),i.then(c,c)}),n.append(o),k.append(n),i}return f}]),angular.module("lr.upload").factory("upload",["$window","formDataUpload","iFrameUpload",function(a,b,c){function d(a){return e.formData&&!a.forceIFrameUpload?b(a):c(a)}var e={fileInput:!(new RegExp("(Android (1\\.[0156]|2\\.[01]))|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)|(w(eb)?OSBrowser)|(webOS)|(Kindle/(1\\.0|2\\.[05]|3\\.0))").test(a.navigator.userAgent)||angular.element('<input type="file">').prop("disabled")),fileUpload:!(!a.XMLHttpRequestUpload||!a.FileReader),formData:!!a.FormData};return d.support=e,d}]);

client/vendors/jquery/dmuploader.min.js

@@ -0,0 +1,9 @@
+/*
+ * dmuploader.min.js - Jquery File Uploader - 0.1
+ * http://www.daniel.com.uy/projects/jquery-file-uploader/
+ * 
+ * Copyright (c) 2013 Daniel Morales
+ * Dual licensed under the MIT and GPL licenses.
+ * http://www.daniel.com.uy/doc/license/
+ */
+(function(t){var n="dmUploader";var r={url:document.URL,method:"POST",extraData:{},maxFileSize:0,allowedTypes:"*",extFilter:null,dataType:null,fileName:"file",onInit:function(){},onFallbackMode:function(){message},onNewFile:function(e,t){},onBeforeUpload:function(e){},onComplete:function(){},onUploadProgress:function(e,t){},onUploadSuccess:function(e,t){},onUploadError:function(e,t){},onFileTypeError:function(e){},onFileSizeError:function(e){},onFileExtError:function(e){}};var i=function(e,n){this.element=t(e);this.settings=t.extend({},r,n);if(!this.checkBrowser()){return false}this.init();return true};i.prototype.checkBrowser=function(){if(window.FormData===undefined){this.settings.onFallbackMode.call(this.element,"Browser doesn't support Form API");return false}if(this.element.find("input[type=file]").length>0){return true}if(!this.checkEvent("drop",this.element)||!this.checkEvent("dragstart",this.element)){this.settings.onFallbackMode.call(this.element,"Browser doesn't support Ajax Drag and Drop");return false}return true};i.prototype.checkEvent=function(e,t){var t=t||document.createElement("div");var e="on"+e;var n=e in t;if(!n){if(!t.setAttribute){t=document.createElement("div")}if(t.setAttribute&&t.removeAttribute){t.setAttribute(e,"");n=typeof t[e]=="function";if(typeof t[e]!="undefined"){t[e]=undefined}t.removeAttribute(e)}}t=null;return n};i.prototype.init=function(){var e=this;e.queue=new Array;e.queuePos=-1;e.queueRunning=false;e.element.on("drop",function(t){t.preventDefault();var n=t.originalEvent.dataTransfer.files;e.queueFiles(n)});e.element.find("input[type=file]").on("change",function(n){var r=n.target.files;e.queueFiles(r);t(this).val("")});this.settings.onInit.call(this.element)};i.prototype.queueFiles=function(e){var n=this.queue.length;for(var r=0;r<e.length;r++){var i=e[r];if(this.settings.maxFileSize>0&&i.size>this.settings.maxFileSize){this.settings.onFileSizeError.call(this.element,i);continue}if(this.settings.allowedTypes!="*"&&!i.type.match(this.settings.allowedTypes)){this.settings.onFileTypeError.call(this.element,i);continue}if(this.settings.extFilter!=null){var s=this.settings.extFilter.toLowerCase().split(";");var o=i.name.toLowerCase().split(".").pop();if(t.inArray(o,s)<0){this.settings.onFileExtError.call(this.element,i);continue}}this.queue.push(i);var u=this.queue.length-1;this.settings.onNewFile.call(this.element,u,i)}if(this.queueRunning){return false}if(this.queue.length==n){return false}this.processQueue();return true};i.prototype.processQueue=function(){var n=this;n.queuePos++;if(n.queuePos>=n.queue.length){n.settings.onComplete.call(n.element);n.queuePos=n.queue.length-1;n.queueRunning=false;return}var r=n.queue[n.queuePos];var i=new FormData;i.append(n.settings.fileName,r);n.settings.onBeforeUpload.call(n.element,n.queuePos);t.each(n.settings.extraData,function(e,t){i.append(e,t)});n.queueRunning=true;t.ajax({url:n.settings.url,type:n.settings.method,dataType:n.settings.dataType,data:i,cache:false,contentType:false,processData:false,forceSync:false,xhr:function(){var r=t.ajaxSettings.xhr();if(r.upload){r.upload.addEventListener("progress",function(t){var r=0;var i=t.loaded||t.position;var s=t.total||e.totalSize;if(t.lengthComputable){r=Math.ceil(i/s*100)}n.settings.onUploadProgress.call(n.element,n.queuePos,r)},false)}return r},success:function(e,t,r){n.settings.onUploadSuccess.call(n.element,n.queuePos,e)},error:function(e,t,r){n.settings.onUploadError.call(n.element,n.queuePos,r)},complete:function(e,t){n.processQueue()}})};t.fn.dmUploader=function(e){return this.each(function(){if(!t.data(this,n)){t.data(this,n,new i(this,e))}})};t(document).on("dragenter",function(e){e.stopPropagation();e.preventDefault()});t(document).on("dragover",function(e){e.stopPropagation();e.preventDefault()});t(document).on("drop",function(e){e.stopPropagation();e.preventDefault()})})(jQuery)