adding new auth service with logout

vishivish18 · Mar 12, 2016 · 81f548f · 81f548f
1 parent 39f3a10
commit 81f548f
Show file tree

Hide file tree

Showing 16 changed files with 130 additions and 125 deletions.
diff --git a/app/controllers/api/stockists.js b/app/controllers/api/stockists.js
@@ -67,4 +67,28 @@ router.get('/count', function(req, res, next) {
 
 })
 
+
+
+router.delete('/:_id', function(req, res, next) {
+
+    console.log(req.params._id)
+
+    Stockist.findById(req.params._id, function(err, stockist) {
+        if (err) {
+            // handle error
+        }
+
+        stockist.remove(function(err) {
+            if (err) {
+                res.send(err)
+            }
+            res.json({
+                message: 'Stockist Deleted'
+            })
+        }); //Removes the document
+    })
+
+
+});
+
 module.exports = router
diff --git a/gulp/scripts.js b/gulp/scripts.js
@@ -4,11 +4,11 @@ var uglify = require('gulp-uglify')
 var ngAnnotate = require('gulp-ng-annotate')
 var sourcemaps = require('gulp-sourcemaps')
 
-gulp.task('js', function() {
-    return gulp.src(['public/app/controllers/module.js', 'public/app/controllers/**/*.js'])
+gulp.task('js', function() {    
+    return gulp.src(['public/app/controllers/module.js', 'public/app/**/*.js'])
         .pipe(sourcemaps.init())
         .pipe(concat('app.js'))
-        .pipe(ngAnnotate())  // ngAnnotate  is causing trouble sunddenly , so skipping uglifying for a while
+        .pipe(ngAnnotate())
         .pipe(uglify())
         .pipe(sourcemaps.write())
         .pipe(gulp.dest('public/assets'))

diff --git a/public/app/controllers/error.ctrl.js b/public/app/controllers/error.ctrl.js
diff --git a/public/app/controllers/homeCtrl.js b/public/app/controllers/homeCtrl.js
@@ -1,5 +1,5 @@
 angular.module('app')
-    .controller('HomeCtrl', function($scope, $http) {
+    .controller('homeCtrl', function($scope, $http) {
         $scope.model = "";
 
 

diff --git a/public/app/controllers/login.ctrl.js b/public/app/controllers/login.ctrl.js
diff --git a/public/app/controllers/register.ctrl.js b/public/app/controllers/register.ctrl.js
diff --git a/public/app/controllers/resources/employeesCtrl.js b/public/app/controllers/resources/employeesCtrl.js
@@ -16,6 +16,19 @@ angular.module('app')
 
         $scope.setup();
 
+         $scope.deleteEmployee = function(employee_id) {          
+            if (!confirm('Are you sure?')) return;
+            $http.delete('/api/employees/'+ employee_id)
+                .then(function(response) {
+                    console.log(response)                    
+                    $scope.setup();
+
+                }, function(response) {
+                    console.log(response)
+                    // if error occurs
+                });
+
+        }
 
 
     })

diff --git a/public/app/controllers/resources/stockistsCtrl.js b/public/app/controllers/resources/stockistsCtrl.js
@@ -16,7 +16,19 @@ angular.module('app')
 
         $scope.setup();
 
+        $scope.deleteStockist = function(stockist_id) {          
+            if (!confirm('Are you sure?')) return;
+            $http.delete('/api/stockists/'+ stockist_id)
+                .then(function(response) {
+                    console.log(response)                    
+                    $scope.setup();
 
+                }, function(response) {
+                    console.log(response)
+                    // if error occurs
+                });
+
+        }
 
     })
 
diff --git a/public/app/controllers/routes.js b/public/app/controllers/routes.js
@@ -8,11 +8,12 @@ angular.module('app')
                 url: '/',
                 views: {
                     'header': {
-                        templateUrl: '/nav.html'
+                        templateUrl: '/nav.html',
+                        controller: 'navCtrl'
                     },
                     'content': {
                         templateUrl: '/login.html',
-                        controller: 'LoginCtrl'
+                        controller: 'loginCtrl'
                     }
                 }
             })
@@ -21,11 +22,12 @@ angular.module('app')
             url: 'login',
             views: {
                 'header': {
-                    templateUrl: '/nav.html'
+                    templateUrl: '/nav.html',
+                    controller: 'navCtrl'
                 },
                 'content': {
                     templateUrl: '/login.html',
-                    controller: 'LoginCtrl'
+                    controller: 'loginCtrl'
 
                 }
             }
@@ -36,7 +38,7 @@ angular.module('app')
             views: {
                 'content@': {
                     templateUrl: 'register.html',
-                    controller: 'RegisterCtrl'
+                    controller: 'registerCtrl'
                 }
             }
 
@@ -48,22 +50,12 @@ angular.module('app')
             views: {
                 'content@': {
                     templateUrl: 'users/home.html',
-                    controller: 'HomeCtrl'
-                }
-            }
-
-        })
-
-        .state('app.home.vehicles', {
-            url: '/vehicles/new',
-            views: {
-                'content@': {
-                    templateUrl: 'vehicles/newVehicle.html',
-                    controller: 'VehiclesNewInfoCtrl'
+                    controller: 'homeCtrl'
                 }
             }
 
         })
+
 
         .state('app.products', {
             url: 'products',
@@ -160,6 +152,18 @@ angular.module('app')
                 }
             }
 
+        })
+
+         .state('app.stockists.details', {
+            url: '/:id',
+
+            views: {
+                'content@': {
+                    templateUrl: 'resources/editStockst.html',
+                    controller: 'editStockistCtrl'
+                }
+            }
+
         })
 
 
@@ -187,6 +191,18 @@ angular.module('app')
 
         })
 
+        .state('app.employees.details', {
+            url: '/:id',
+
+            views: {
+                'content@': {
+                    templateUrl: 'resources/editEmployees.html',
+                    controller: 'editEmployeesCtrl'
+                }
+            }
+
+        })
+
 
         //  Sales Menu 
 
@@ -280,8 +296,7 @@ angular.module('app')
             url: 'about',
             views: {
                 'content@': {
-                    templateUrl: 'settings/about.html',
-                    controller: 'HomeCtrl'
+                    templateUrl: 'settings/about.html',                    
                 }
             }
 

diff --git a/public/app/controllers/user.svc.js b/public/app/controllers/user.svc.js
diff --git a/public/app/views/nav.html b/public/app/views/nav.html
@@ -65,7 +65,7 @@
                         <li><a ui-sref=".bug">Report A Bug</a></li>
                         <li><a ui-sref=".feedback">Feedback</a></li>
                         <li><a ui-sref=".about">About</a></li>
-                        <li ui-sref-active="active"><a ui-sref=".login">Logout</a></li>            
+                        <li ><a href="#" ng-click="logout()">Logout</a></li>            
                     </ul>
                 </li>
 

diff --git a/public/app/views/resources/employees.html b/public/app/views/resources/employees.html
@@ -1,33 +1,34 @@
-<div class="container">    
+<div class="container">
     <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12">
             <a class="btn btn-primary btn-sm pull-left" ui-sref=".new">+ Add New Employee</a>
         </div>
-        <br/><br/>
+        <br/>
+        <br/>
     </div>
     <table class="table table-hover table-striped table-bordered ">
         <thead>
             <tr>
                 <th>Code</th>
                 <th>Name</th>
-                <th>Area Code</th>                
+                <th>Area Code</th>
                 <th>Opening Balance</th>
-                <th>BST Code</th>                
-                <th>Date</th>                
-                <th>Edit</th>                
+                <th>BST Code</th>
+                <th>Date</th>
+                <th>Edit</th>
+                <th>Delete</th>
             </tr>
         </thead>
         <tbody>
             <tr ng-repeat="employee in model | filter:searchProducts">
                 <td>{{employee.employee_code}}</td>
-                <td>{{employee.employee_name}}</td>            
-                <td>{{employee.employee_areacode}}</td>            
-                <td>{{employee.employee_openingbalance}}</td>            
-                <td>{{employee.employee_bstcode}}</td>            
+                <td>{{employee.employee_name}}</td>
+                <td>{{employee.employee_areacode}}</td>
+                <td>{{employee.employee_openingbalance}}</td>
+                <td>{{employee.employee_bstcode}}</td>
                 <td>{{employee.date}}</td>
-
-                <td><a class="btn btn-default" ui-sref=".details({id:employee._id})"><span class="glyphicon glyphicon-pencil"></span>  Edit</a></td>
+                <td><a href="" ui-sref=".details({id:employee._id})"><span class="glyphicon glyphicon-pencil edit"></span></a></td>
+                <td><a href="" ng-click="deleteEmployee(employee._id)"><span class="glyphicon glyphicon-trash delete"></span></a></td>
         </tbody>
     </table>
 </div>
-
diff --git a/public/app/views/resources/stockists.html b/public/app/views/resources/stockists.html
@@ -1,33 +1,34 @@
-<div class="container">    
+<div class="container">
     <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12">
             <a class="btn btn-primary btn-sm pull-left" ui-sref=".new">+ Add New Stockist</a>
         </div>
-        <br/><br/>
+        <br/>
+        <br/>
     </div>
     <table class="table table-hover table-striped table-bordered ">
         <thead>
             <tr>
                 <th>Code</th>
                 <th>Name</th>
-                <th>Area Code</th>                
+                <th>Area Code</th>
                 <th>Opening Balance</th>
-                <th>BST Code</th>                
-                <th>Date</th>                
-                <th>Edit</th>                
+                <th>BST Code</th>
+                <th>Date</th>
+                <th>Edit</th>
+                <th>Delete</th>
             </tr>
         </thead>
         <tbody>
             <tr ng-repeat="stockist in model | filter:searchProducts">
                 <td>{{stockist.stockist_code}}</td>
-                <td>{{stockist.stockist_name}}</td>            
-                <td>{{stockist.stockist_areacode}}</td>            
-                <td>{{stockist.stockist_openingbalance}}</td>            
-                <td>{{stockist.stockist_bstcode}}</td>            
+                <td>{{stockist.stockist_name}}</td>
+                <td>{{stockist.stockist_areacode}}</td>
+                <td>{{stockist.stockist_openingbalance}}</td>
+                <td>{{stockist.stockist_bstcode}}</td>
                 <td>{{stockist.date}}</td>
-
-                <td><a class="btn btn-default" ui-sref=".details({id:value.device_id})"><span class="glyphicon glyphicon-pencil"></span>  Edit</a></td>
+                <td><a href="" ui-sref=".details({id:stockist._id})"><span class="glyphicon glyphicon-pencil edit"></span></a></td>
+                <td><a href="" ng-click="deleteStockist(stockist._id)"><span class="glyphicon glyphicon-trash delete"></span></a></td>
         </tbody>
     </table>
 </div>
-