Merge branch 'develop' into Eole

6 files changed, 106 insertions, 23 deletions

diff --git a/client/js/app.js b/client/js/app.js
index 90fae89..e2d5b9b 100644
--- a/client/js/app.js
+++ b/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']);
+var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize', 'ngCookies']);
 
 /**
  * Configure routeProvider
@@ -29,6 +29,5 @@ mainApp.config(['$routeProvider', function($routeProvider){
  */
 mainApp.config(['$httpProvider', function($httpProvider){
     $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
- 
 }]);
 
diff --git a/client/js/controllers/.#status.js b/client/js/controllers/.#status.js
new file mode 120000
index 0000000..e6c258f
--- /dev/null
+++ b/client/js/controllers/.#status.js
@@ -0,0 +1 @@
+loic@Manzerbredes.home.30343:1455008378
\ No newline at end of file
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 6358a6d..829fc1d 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -9,14 +9,20 @@
  */
 mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$sce, Identity)
 {
-    // Define default states
-    $('#loginModal').modal({backdrop: 'static', keyboard: false});
+	// Check for login and define default states
+	if(!Identity.isAlreadyLogin()){
+		$('#loginModal').modal({backdrop: 'static', keyboard: false});
+	}
+	$scope.$on('logoutEvent', function(){
+		$('#loginModal').modal({backdrop: 'static', keyboard: false});
+	});
+	
     $('#loadingLoginButton').hide();
     $('#failedToLoginAlert').hide();
 
      
-    $('#loginButton').click(function(){
-
+    $scope.loginAction=function(){
+		
 		// Begin login state for template
         $('#loginButton').hide();
         $('#loadingLoginButton').show();
@@ -49,6 +55,6 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
 		
 		// Try to login
         Identity.login(username, password, projectname, responseCallback);
-    });
+    };
 	
 }]);
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 2930e34..6bc602a 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -6,9 +6,14 @@
  * @param {$scope} $scope The $scope service from angular
  * @param {Identity} The Identity service
  */
-mainApp.controller('statusCtrl', ['$scope','Identity', function ($scope, Identity)
+mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($scope, Identity, $rootScope)
 {
     $scope.profile=Identity.profile;
-    
-     
+      
+    $scope.logout=function(){
+		Identity.logout();
+		$rootScope.$broadcast('logoutEvent');
+
+	};
+
 }]);
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index 4c8919c..d96b3ab 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -1,5 +1,5 @@
 
-mainApp.factory('Identity',[ '$http', function($http){
+mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 
 	/* Create profile structure to store informations
 	 * about current session
@@ -9,7 +9,72 @@ mainApp.factory('Identity',[ '$http', function($http){
     profile.projectname=null;
 	profile.token=null;
 
+/*	var tokenFragment=9;
+	
+	var saveTokenInCookies=function(){
+		var i=0;
+		var currentStart=0;
+		var currentEnd=parseInt(profile.token.length/tokenFragment);
+		var facto=currentEnd;
+		
+		alert("current ren" + currentEnd);
+		for(i=0;i<tokenFragment-1;i++){
+			
+			$cookies.put("token-"+i, profile.token.substring(currentStart, currentEnd));
+
+			
+			currentStart=currentEnd+1;
+			currentEnd=currentEnd+facto;
+
+			
+		}
 
+		$cookies.put("token-"+(i+1), profile.token.substring(currentEnd, profile.token.length));
+	};
+	
+	var loadTokenInCookies=function(){
+		var i=0;
+		
+		profile.token=$cookies.get("token-0");
+		for(i=1;i<tokenFragment;i++){
+			
+			profile.token=profile.token+$cookies.get("token-"+i)
+
+			
+
+			
+		}
+
+				
+	};*/
+
+	
+		
+	var saveCookieForSession=function(){
+		$cookies.putObject('profile', 5);
+		//saveTokenInCookies();
+	};
+
+
+	
+
+	
+	var isAlreadyLogin=function(){
+		var profileInCookie=$cookies.getObject('profile');
+		console.log(profileInCookie);
+		
+		if(typeof profileInCookie !== 'undefined'){
+			angular.extend(profile, profileInCookie);
+			return true;
+		}
+
+		return false;
+	}
+
+	var logout=function(){
+		$cookies.remove('profile');
+	}
+	
 	/**
 	 * 
 	 * @param {string} response The response to parse
@@ -17,6 +82,7 @@ mainApp.factory('Identity',[ '$http', function($http){
 	 * @returns {requestParserResult} Formated data
 	 */
 	var parseLoginAnswer=function(response, failedToSendRequest){
+		
 
 		var requestParserResult={};
 		requestParserResult.status=1;
@@ -24,7 +90,8 @@ mainApp.factory('Identity',[ '$http', function($http){
 
 		if (typeof response.data.token !== 'undefined') {
 			requestParserResult.status=0;
-			profile.token=response.data.token;			
+			profile.token=response.data.token;
+			saveCookieForSession();
 		}
 		else if(failedToSendRequest){
 			requestParserResult.failReason="Failed to send request";
@@ -48,7 +115,7 @@ mainApp.factory('Identity',[ '$http', function($http){
 	 * @param {function} function to call when data is avalaible
 	 */
 	var login=function(username, password,projectname, callback){    
-
+		
 		// Set profile information (early)
 		profile.username=username;
 		profile.projectname=projectname;
@@ -67,7 +134,9 @@ mainApp.factory('Identity',[ '$http', function($http){
 	// Return services objects
 	return {
 		login: login,
-		profile: profile	
+		profile: profile,
+		isAlreadyLogin: isAlreadyLogin,
+		logout:logout
 	};
 
 	
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index 4cb3590..23b33a8 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -1,24 +1,27 @@
 
 mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
 
-	var httpResponse;
 
-	var uploadImage=function(image){
+
+	var parseUploadImageAnswer=function(response, failedToSendRequest){
 		
 	};
 
-	var parseUploadImageRequest=function(){
+
+	var getImages=function(callback){
+
+		var result=$http.post('../server/index.php',
+						  $.param({"token" : Identity.profile.token, "task" : "Image"}));  
+
+		
 		
 	};
 
-	var getResponse=function(){
-		return parseUploadImageRequest(httpResponse);
-	};
-	
+
+		
 	// Return services objects
 	return {
-		uploadImage: uploadImage,
-		getResponse: getResponse
+		uploadImage: uploadImage
 	};