Merge branch 'backend_implementation'

app/app.js

@@ -31,7 +31,7 @@ var app = angular.module(
     config(['$ocLazyLoadProvider', function ($ocLazyLoadProvider) {
         $ocLazyLoadProvider.config({
             // todo: turn debug false on prod
-            debug: true
+            debug: false
         });
     }]).
 /**
@@ -66,16 +66,16 @@ var app = angular.module(
 
 
     // todo: not working properly, get it done!
-    directive('activeLink', ['$location', function($location) {
+    directive('activeLink', ['$location', function ($location) {
         return {
             restrict: 'A',
-            link: function($scope, $element, $attrs) {
+            link: function ($scope, $element, $attrs) {
                 var clazz = $attrs.activeLink;
                 var path = $location.path();
                 path = path //hack because path does not
                 // return including hashbang
                 $scope.location = $location;
-                $scope.$watch('location.path()', function(newPath) {
+                $scope.$watch('location.path()', function (newPath) {
                     if (path === newPath) {
                         console.log(path, newPath);
                         $element.addClass(clazz);
@@ -86,7 +86,23 @@ var app = angular.module(
                 });
             }
         };
-    }]);
+    }]).
+
+/**
+ * logout directive
+ */
+    directive('logout', function($http, $location){
+        return {
+            link: function($scope, $element, $rootScope){
+                $element.on('click', function(){
+                    $http.post('http://127.0.0.1:9001/logout', {}).then(function () {
+                        $rootScope.loggedInUser = false;
+                        $location.path("/login");
+                    });
+                });
+            }
+        }
+    });
 
 // test the code with strict di mode to see if it works when minified
 //angular.bootstrap(document, ['zaerp'], {

app/app_routes.js

@@ -180,4 +180,7 @@ app.config(['$routeProvider', function ($routeProvider) {
             }
         }
     });
-});
+}).config(['$httpProvider', function($httpProvider) {
\ No newline at end of file
+    // to send cookies CORS
+    $httpProvider.defaults.withCredentials = true;
+}]);
\ No newline at end of file

app/components/auth/auth_service.js

@@ -17,13 +17,13 @@ auth.factory('LoginService', function ($http, $rootScope, $location, $log, $cook
         return $http
             .post(RESTURL.url + url, credentials)
             .success(function (data, status, headers, config) {
-                $window.sessionStorage.token = data.token;
+                //$window.sessionStorage.token = data.token;
                 $rootScope.loggedInUser = true;
                 $location.path("/dashboard");
             })
             .error(function (data, status, headers, config) {
                 // Erase the token if the user fails to log in
-                delete $window.sessionStorage.token;
+                //delete $window.sessionStorage.token;
 
                 // Handle login errors here
                 $scope.message = 'Error: Invalid user or password';
@@ -44,6 +44,16 @@ auth.factory('LoginService', function ($http, $rootScope, $location, $log, $cook
             //});
     };
 
+    loginService.logout = function() {
+        console.log("logout");
+        $http.post(RESTURL.url + 'logout', {}).then(function(){
+            $rootScope.loggedInUser = false;
+            $location.path("/login");
+        });
+        console.log("loggedout");
+
+    };
+
     loginService.isAuthenticated = function () {
         return !!Session.userId;
     };

app/components/auth/login.html

-<div ng-app="zaerp.login">
-    <div class="col-md-6" ng-controller="LoginCtrl">
-        <h1>Zaerp Login Form</h1>
+<div ng-app="zaerp.auth">
+    <div class="col-md-6">
+        <h1>Ulakbüs Login Form</h1>
         <form name="loginForm" sf-schema="schema" sf-form="form" sf-model="model" ng-submit="onSubmit(loginForm)"></form>
     </div>
 </div>
\ No newline at end of file

app/components/staff/staff_controller.js

@@ -12,7 +12,7 @@ var staff = angular.module('zaerp.staff', ['ngRoute', 'schemaForm', 'formService
 
 
 /**
- * StaffCtrl is a controller
+ * StaffAddEditCtrl is a controller
  * which provide a form with form generator.
  */
 
@@ -40,6 +40,7 @@ var staff = angular.module('zaerp.staff', ['ngRoute', 'schemaForm', 'formService
 //});
 
 staff.controller('StaffAddEditCtrl', function ($scope, $http, $log, Generator, $routeParams) {
+    $scope.url = 'personel_duzenle_basitlestirilmis';
     var form_params = {};
     if ($routeParams.id){
         form_params['id'] = $routeParams.id;
@@ -48,11 +49,11 @@ staff.controller('StaffAddEditCtrl', function ($scope, $http, $log, Generator, $
     else {
         form_params['cmd'] = 'add_object';
     }
-    Generator.get_form('personel_duzenle_basitlestirilmis', form_params).then(function (data) {
+    Generator.get_form($scope.url, form_params).then(function (data) {
         var d = data.data.forms;
         $scope.schema = d.schema;
         $scope.form = d.form;
-        $scope.form.push({"key": "birth_date", "format": "yyyy-mm-dd"});
+        //$scope.form.push({"key": "birth_date", "format": "yyyy-mm-dd"});
         $scope.model = d.model ? d.model : {};
         $scope.initialModel = angular.copy(d.model);
         //$scope.form.push($asyncValidators: Generator.asyncValidators);
@@ -68,17 +69,20 @@ staff.controller('StaffAddEditCtrl', function ($scope, $http, $log, Generator, $
     $scope.onSubmit = function (form) {
         $scope.$broadcast('schemaFormValidate');
         if (form.$valid) {
-            Generator.submit('edit_staff', $scope);
+            Generator.submit($scope);
         }
     }
 });
 
+// todo: for single point of failure code a "get item" service and use it to
+// retrieve list and single item
+
 /**
  * Staff List Controller
  */
 
 staff.controller('StaffListCtrl', function($scope, $http){
-    $http.get('personel_duzenle_basitlestirilmis').then(function(res){
+    $http.post('personel_duzenle_basitlestirilmis').then(function(res){
         $scope.staffs = res.data;
     })
 });
@@ -87,7 +91,7 @@ staff.controller('StaffListCtrl', function($scope, $http){
  * Staff Show Controller
  */
 staff.controller('StaffShowCtrl', function($scope, $http, $routeParams){
-    $http.get('http://127.0.0.1:3000/api/list_staff/').then(function(res){
+    $http.post('personel_duzenle_basitlestirilmis').then(function(res){
         $scope.staff = res.data[0];
     })
 });
\ No newline at end of file

app/index.html

@@ -37,6 +37,8 @@
             <ul class="nav navbar-nav navbar-right">
                 <li><a href="#/dashboard">Dashboard</a></li>
                 <li><a href="#/login">Login</a></li>
+                <li><a href="javascript:void(0);" logout>Logout
+                </a></li>
             </ul>
             <form class="navbar-form navbar-right">
                 <input type="text" class="form-control" placeholder="Search...">

app/zetalib/forms/form_service.js

@@ -42,10 +42,10 @@ form_generator.factory('Generator', function ($http, $q, $log, $timeout, RESTURL
             return deferred.promise;
         }
     };
-    generator.submit = function (url, $scope) {
+    generator.submit = function ($scope) {
         var get_diff = FormDiff.get_diff($scope.model,$scope.initialModel);
         $log.info(get_diff);
-        $http.post(RESTURL.url + url, get_diff).then(function (res) {
+        $http.post(RESTURL.url + $scope.url, get_diff).then(function (res) {
             // todo: for now fake rest api returns 'ok' no data to
             // manipulate on ui. therefor used just a log
             $log.info(res);

app/zetalib/interceptors.js

@@ -5,12 +5,12 @@
  * (GPLv3).  See LICENSE.txt for details.
  */
 
-app.config(['$httpProvider', function ($httpProvider, $rootScope) {
+app.config(['$httpProvider', function ($httpProvider) {
     /**
      * the interceptor for all requests to check response
      * 4xx - 5xx errors will be handled here
      */
-    $httpProvider.interceptors.push(function ($q) {
+    $httpProvider.interceptors.push(function ($q, $rootScope, $location) {
         return {
             'request': function(config){
                 // todo: delete console logs
@@ -23,23 +23,26 @@ app.config(['$httpProvider', function ($httpProvider, $rootScope) {
             },
             'response': function (response) {
                 //Will only be called for HTTP up to 300
-                if(response.is_login){
-                    $rootScope.loggedInUser = response.is_login;
-                    console.log("login", response.is_login);
+                if(response.data.is_login){
+                    $rootScope.loggedInUser = response.data.is_login;
+                    //$location.path("/dashboard");
                 }
-                if(response.screen) {
-                    location.path(response.screen);
+                if(response.data.screen) {
+                    $location.path(response.data.screen);
                 }
-                console.log(response);
                 return response;
             },
             'responseError': function (rejection) {
                 // if unauthorized then redirect to login page
                 if(rejection.status === 400) {
-                    location.reload();
+                    $location.reload();
                 }
                 if(rejection.status === 401) {
-                    location.path('#/login');
+                    if($location.path()==="/login"){
+                        console.log("show errors on login form");
+                    } else{
+                        $location.path('/login');
+                    }
                 }
                 return $q.reject(rejection);
             }

bower.json

@@ -6,7 +6,7 @@
   "license": "GPL",
   "private": false,
   "dependencies": {
-    "angular": "1.4.x",
+    "angular": "1.4.1",
     "angular-mocks": "1.4.x",
     "angular-route": "1.4.x",
     "angular-resource": "1.4.x",