Added ui-router, changed folder structure, using controller as, compl…

…eted, logout
backand · Mar 18, 2015 · 5ccc27a · 5ccc27a
1 parent d34ab34
commit 5ccc27a
Show file tree

Hide file tree

Showing 22 changed files with 233 additions and 262 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # general
 .idea
 .DS_Store
+.tmp/**
 
 # package control
 node_modules

diff --git a/.tmp/styles/main.css b/.tmp/styles/main.css
diff --git a/app/app.js b/app/app.js
@@ -0,0 +1,27 @@
+'use strict';
+
+angular.module('mytodoApp', [
+  'ngCookies',
+  'ngResource',
+  'ngSanitize',
+  'ui.router',
+  'ui.sortable',
+  'LocalStorageModule',
+  'common.interceptors.http',
+  'backand'
+])
+  .config(['$stateProvider','$httpProvider', '$urlRouterProvider', function($stateProvider, $httpProvider, $urlRouterProvider) {
+    $httpProvider.interceptors.push('httpInterceptor');
+    $urlRouterProvider.otherwise("/");
+    $stateProvider
+      .state('todos', {
+        url: '/',
+        templateUrl: 'views/main/main.html',
+        controller: 'MainCtrl as vm'
+      })
+      .state('login', {
+        url: '/login',
+        templateUrl: 'views/login/login.html',
+        controller: 'LoginCtrl as vm'
+      });
+  }]);
diff --git a/app/fonts/glyphicons-halflings-regular.eot → ...ts/fonts/glyphicons-halflings-regular.eot b/app/fonts/glyphicons-halflings-regular.eot → ...ts/fonts/glyphicons-halflings-regular.eot
diff --git a/app/fonts/glyphicons-halflings-regular.svg → ...ts/fonts/glyphicons-halflings-regular.svg b/app/fonts/glyphicons-halflings-regular.svg → ...ts/fonts/glyphicons-halflings-regular.svg
diff --git a/app/fonts/glyphicons-halflings-regular.ttf → ...ts/fonts/glyphicons-halflings-regular.ttf b/app/fonts/glyphicons-halflings-regular.ttf → ...ts/fonts/glyphicons-halflings-regular.ttf
diff --git a/app/fonts/glyphicons-halflings-regular.woff → ...s/fonts/glyphicons-halflings-regular.woff b/app/fonts/glyphicons-halflings-regular.woff → ...s/fonts/glyphicons-halflings-regular.woff
diff --git a/app/images/yeoman.png → app/assets/images/yeoman.png b/app/images/yeoman.png → app/assets/images/yeoman.png
diff --git a/app/styles/main.css → app/assets/styles/main.css b/app/styles/main.css → app/assets/styles/main.css
@@ -77,3 +77,7 @@ body {
     border-bottom: 0;
   }
 }
+
+.todo-completed, .todo-completed input {
+  text-decoration: line-through;
+}
diff --git a/...ts/common/interceptors/httpInterceptor.js → app/config/interceptors/httpInterceptor.js b/...ts/common/interceptors/httpInterceptor.js → app/config/interceptors/httpInterceptor.js
diff --git a/app/index.html b/app/index.html
@@ -15,7 +15,7 @@
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css({.tmp,app}) styles/main.css -->
-    <link rel="stylesheet" href="styles/main.css">
+    <link rel="stylesheet" href="assets/styles/main.css">
     <!-- endbuild -->
   </head>
   <body ng-app="mytodoApp">
@@ -24,7 +24,7 @@
     <![endif]-->
 
     <!-- Add your site or application content here -->
-    <div class="container" ng-view=""></div>
+    <div class="container" ui-view></div>
 
     <!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
      <script>
@@ -56,18 +56,19 @@
     <script src="bower_components/jquery-ui/jquery-ui.js"></script>
     <script src="bower_components/angular-ui-sortable/sortable.js"></script>
     <script src="bower_components/angular-local-storage/dist/angular-local-storage.js"></script>
+    <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 
     <!-- Backand SDK for Angular -->
     <script src="//cdn.backand.net/backand/dist/1.5.1/backand.min.js"></script>
 
     <!-- build:js({.tmp,app}) scripts/scripts.js -->
-    <script src="scripts/app.js"></script>
-    <script src="scripts/controllers/main.js"></script>
-    <script src="scripts/controllers/login.js"></script>
-    <script src="scripts/services/backand.js"></script>
-    <script src="scripts/common/interceptors/httpInterceptor.js"></script>
+    <script src="app.js"></script>
+    <script src="views/main/main.js"></script>
+    <script src="views/login/login.js"></script>
+    <script src="services/backand.js"></script>
+    <script src="config/interceptors/httpInterceptor.js"></script>
     <!-- endbuild -->
 
 </body>

diff --git a/app/scripts/app.js b/app/scripts/app.js
diff --git a/app/scripts/controllers/login.js b/app/scripts/controllers/login.js
diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
diff --git a/app/scripts/Services/backand.js → app/services/backand.js b/app/scripts/Services/backand.js → app/services/backand.js
@@ -14,13 +14,20 @@
             return $http({
                 method: 'GET',
                 url: Backand.configuration.apiUrl + baseUrl + self.tableName
+            }).then(function(response) {
+                return response.data.data.map(function(todo) {
+                    todo.id = parseInt(todo.id);
+                    return todo;
+                });
             });
         };
 
         self.readOne = function (id) {
             return $http({
                 method: 'GET',
                 url: Backand.configuration.apiUrl + baseUrl + self.tableName + '/' + id
+            }).then(function(response) {
+                return response.data;
             });
         };
 
@@ -32,15 +39,19 @@
                 params: {
                     returnObject: true
                 }
-            })
+            }).then(function(response) {
+                return response.data;
+            });
         };
 
         self.update = function (id, data) {
             return $http({
                 method: 'PUT',
                 url : Backand.configuration.apiUrl + baseUrl + self.tableName + '/' + id,
                 data: data
-            })
+            }).then(function(response) {
+                return response.data;
+            });
         };
 
         self.delete = function (id) {

diff --git a/app/views/login.html → app/views/login/login.html b/app/views/login.html → app/views/login/login.html
@@ -4,14 +4,14 @@ <h2>Backand Login</h2>
     <h4>Use your Backand username and password to login</h4>
 </div>
 <div class="body">
-        <form class="form" name="form" ng-submit="signIn()" >
+        <form class="form" name="form" ng-submit="vm.signIn()" >
             <fieldset>
                 <div class="form-group">
                     <input type="email"
                            class="form-control"
                            name = "username"
                            placeholder="Your Backand username"
-                           ng-model = "username"
+                           ng-model = "vm.username"
                            ng-model-options="{debounce: 200}"
                            required>
                     <div class="text-danger" ng-show="form.username.$error.email">This is not a valid email.</div>
@@ -21,7 +21,7 @@ <h4>Use your Backand username and password to login</h4>
                            class="form-control"
                            name = "password"
                            placeholder="Your Backand password"
-                           ng-model = "password"
+                           ng-model = "vm.password"
                            ng-model-options="{debounce: 200}"
                            required>
                 </div>
@@ -30,7 +30,7 @@ <h4>Use your Backand username and password to login</h4>
                            class="form-control"
                            name = "appName"
                            placeholder="Your Backand app name"
-                           ng-model = "appName"
+                           ng-model = "vm.appName"
                            ng-model-options="{debounce: 200}"
                            required>
                 </div>
@@ -42,7 +42,7 @@ <h4>Use your Backand username and password to login</h4>
                 </div>
             </fieldset>
         </form>
-    <div ng-show="error" class="alert alert-danger">{{error}}</div>
+    <div ng-show="error" class="alert alert-danger">{{vm.error}}</div>
     <div class="divider"></div>
         <section class="additional-info">
             <p class="text-center">