v0.0.3.1 dist login logout fix

Gruntfile.js

@@ -88,31 +88,44 @@ module.exports = function (grunt) {
             },
             js: {
                 src: [
-                    'app/app.js',
-                    'app/app_routes.js',
-                    'app/zetalib/**/*service.js',
-                    'app/zetalib/general.js',
-                    'app/zetalib/interceptors.js',
-                    'app/shared/scripts/theme.js',
-                    'app/shared/directives.js',
-                    'app/components/**/*controller.js',
-                    'app/components/**/*service.js'
+                    //'app/app.js',
+                    //'app/app_routes.js',
+                    //'app/zetalib/**/*service.js',
+                    //'app/zetalib/general.js',
+                    //'app/zetalib/interceptors.js',
+                    //'app/shared/scripts/theme.js',
+                    //'app/shared/directives.js',
+                    //'app/components/**/*controller.js',
+                    //'app/components/**/*service.js',
+
+                    "app/app.js",
+                    "app/app_routes.js",
+                    "app/zetalib/interceptors.js",
+                    "app/zetalib/general.js",
+                    "app/zetalib/forms/form_service.js",
+                    "app/shared/scripts/theme.js",
+                    "app/shared/directives.js",
+                    "app/components/auth/auth_controller.js",
+                    "app/components/auth/auth_service.js",
+                    "app/components/dashboard/dashboard_controller.js",
+                    "app/components/crud/crud_controller.js",
                 ],
                 dest: 'dist/app.js'
             },
             components: {
                 src: [
+                    "app/bower_components/jquery/dist/jquery.min.js",
+                    "app/bower_components/bootstrap/dist/js/bootstrap.min.js",
                     "app/bower_components/angular-route/angular-route.min.js",
                     "app/bower_components/angular-cookies/angular-cookies.min.js",
                     "app/bower_components/angular-resource/angular-resource.min.js",
                     "app/bower_components/angular-bootstrap/ui-bootstrap.min.js",
-                    "app/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js",
+                    "app/bower_components/angular-bootstrap/ui-bootstrap-tpls.js",
                     "app/bower_components/angular-sanitize/angular-sanitize.min.js",
                     "app/bower_components/tv4/tv4.js",
                     "app/bower_components/objectpath/lib/ObjectPath.js",
                     "app/bower_components/angular-schema-form/dist/schema-form.min.js",
                     "app/bower_components/angular-schema-form/dist/bootstrap-decorator.min.js",
-                    "app/bower_components/angular-schema-form-datepicker/bootstrap-datepicker.min.js",
                     "app/bower_components/angular-gettext/dist/angular-gettext.min.js",
                     "app/bower_components/json3/lib/json3.min.js",
                     "app/bower_components/angular-loading-bar/build/loading-bar.min.js",

app/app.js

@@ -18,8 +18,8 @@ var app = angular.module(
         'formService',
         'ulakbus.dashboard',
         'ulakbus.auth',
-        'ulakbus.staff',
-        'ulakbus.student',
+        //'ulakbus.staff',
+        //'ulakbus.student',
         'ulakbus.crud',
         //'ulakbus.version',
         'schemaForm',

app/components/auth/auth_service.js

@@ -18,6 +18,7 @@ auth.factory('LoginService', function ($http, $rootScope, $location, $log, $cook
             .post(RESTURL.url + url, credentials)
             .success(function (data, status, headers, config) {
                 //$window.sessionStorage.token = data.token;
+
                 $rootScope.loggedInUser = true;
             })
             .error(function (data, status, headers, config) {

app/components/crud/templates/list.html

 <div class="starter-template">
     <h1>{{model}}</h1>
+    <div class="tablescroll">
         <table class="table table-bordered" style="background-color:#fff;">
             <thead>
             <tr>
@@ -20,7 +21,7 @@
                         <input type="checkbox" style="zoom:1.5; margin:5px 0 0 8px;">
                     </label>
                 </td>
-            <th scope="row" style="text-align:center">1</th>
+                <th scope="row" style="text-align:center">{{$index + 1}}</th>
                 <td ng-repeat="(key,value) in object.data">{{value}}</td>
                 <td>
                     <a ng-href="#/{{model}}/edit/{{object.key}}">Edit</a><br>
@@ -29,6 +30,7 @@
             </tr>
             </tbody>
         </table>
+    </div>
 
     <div class="btn-group">
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"

app/shared/directives.js

@@ -8,11 +8,11 @@
 /**
  * logout directive
  */
-app.directive('logout', function ($http, $location) {
+app.directive('logout', function ($http, $location, RESTURL) {
     return {
         link: function ($scope, $element, $rootScope) {
             $element.on('click', function () {
-                $http.post('http://' + window.location.hostname + ':9001/logout', {}).then(function () {
+                $http.post(RESTURL.url + 'logout', {}).then(function () {
                     $rootScope.loggedInUser = false;
                     console.log($rootScope.loggedInUser);
                     $location.path("/login");

app/zetalib/interceptors.js

@@ -50,6 +50,13 @@ app.config(['$httpProvider', function ($httpProvider) {
                         $location.path('/login');
                     }
                 }
+                if(rejection.status === 403) {
+                    if (rejection.data.is_login == true){
+                        if($location.path()==="/login"){
+                            $location.path("/dashboard");
+                        }
+                    }
+                }
                 return $q.reject(rejection);
             }
         };

dist/index.html

@@ -59,7 +59,7 @@
 
 
 <script src="bower_components/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.17/angular.min.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.18/angular.min.js"></script>
 <script src="bower_components/components.js"></script>
 <script src="shared/translations.js"></script>
 <script src="templates.js"></script>

dist/templates.js

@@ -40,6 +40,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
   $templateCache.put("components/crud/templates/list.html",
     "<div class=\"starter-template\">\n" +
     "    <h1>{{model}}</h1>\n" +
+    "    <div class=\"tablescroll\">\n" +
     "        <table class=\"table table-bordered\" style=\"background-color:#fff;\">\n" +
     "            <thead>\n" +
     "            <tr>\n" +
@@ -60,7 +61,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
     "                        <input type=\"checkbox\" style=\"zoom:1.5; margin:5px 0 0 8px;\">\n" +
     "                    </label>\n" +
     "                </td>\n" +
-    "            <th scope=\"row\" style=\"text-align:center\">1</th>\n" +
+    "                <th scope=\"row\" style=\"text-align:center\">{{$index + 1}}</th>\n" +
     "                <td ng-repeat=\"(key,value) in object.data\">{{value}}</td>\n" +
     "                <td>\n" +
     "                    <a ng-href=\"#/{{model}}/edit/{{object.key}}\">Edit</a><br>\n" +
@@ -69,6 +70,7 @@ angular.module("components/crud/templates/list.html", []).run(["$templateCache",
     "            </tr>\n" +
     "            </tbody>\n" +
     "        </table>\n" +
+    "    </div>\n" +
     "\n" +
     "    <div class=\"btn-group\">\n" +
     "        <button type=\"button\" class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\" aria-haspopup=\"true\"\n" +

index.html

@@ -115,7 +115,7 @@
 
 <!-- @if NODE_ENV == 'PRODUCTION' -->
 <script src="bower_components/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.17/angular.min.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.18/angular.min.js"></script>
 <script src="bower_components/components.js"></script>
 <script src="shared/translations.js"></script>
 <script src="templates.js"></script>