moving and renaming

README.md

@@ -1,6 +1,6 @@
-# carsincommonAdminWeb
+# commonroutesAdminWeb
 
-- server code: https://github.com/arnaucode/carsincommonServer
+- server code: https://github.com/arnaucode/commonroutesServer
-- frontend app code: https://github.com/arnaucode/carsincommonApp
+- frontend app code: https://github.com/arnaucode/commonroutesApp
 - images server: https://github.com/arnaucode/goImgServer
-- admin web: https://github.com/arnaucode/carsincommonAdminWeb
+- admin web: https://github.com/arnaucode/commonroutesAdminWeb

bower.json

@@ -1,8 +1,8 @@
 {
-    "name": "carsincommonAdminWeb",
+    "name": "commonroutesAdminWeb",
-    "description": "carsincommonAdminWeb",
+    "description": "commonroutesAdminWeb",
     "version": "0.0.0",
-    "homepage": "https://github.com/arnaucode/carsincommonAdmin",
+    "homepage": "https://github.com/arnaucode/commonroutesAdminWeb",
     "license": "MIT",
     "private": true,
     "dependencies": {

package.json

@@ -1,9 +1,9 @@
 {
-  "name": "carsincommonAdminWeb",
+  "name": "commonroutesAdminWeb",
   "private": true,
   "version": "0.0.0",
-  "description": "carsincommonAdminWeb",
+  "description": "commonroutesAdminWeb",
-  "repository": "https://github.com/arnaucode/carsincommonAdmin",
+  "repository": "https://github.com/arnaucode/commonroutesAdminWeb",
   "license": "MIT",
   "devDependencies": {
     "bower": "^1.7.7",

views/main/main.html

@@ -3,7 +3,10 @@
         <div class="col-sm-4">
             <div class="panel">
                 <div class="panel-heading c_deepPurple300">
-                    <h3 class="panel-title">All users</h3>
+                    <h3 class="panel-title">
+                        All users
+                        <span class="badge badge-secondary pull-right c_deepPurple300">{{users.length}}</span>
+                    </h3>
                 </div>
                 <div class="panel-body" style="max-height: 500px;overflow-y: scroll;">
                     <div class="list-group">
@@ -30,7 +33,10 @@
         <div class="col-sm-6">
             <div class="panel">
                 <div class="panel-heading c_deepPurple300">
-                    <h3 class="panel-title">All travels</h3>
+                    <h3 class="panel-title">
+                        All travels
+                        <span class="badge badge-secondary pull-right c_deepPurple300">{{travels.length}}</span>
+                    </h3>
                 </div>
                 <div class="panel-body" style="max-height: 500px;overflow-y: scroll;">
                     <table class="table table-striped table-hover ">

views/main/main.js

@@ -11,11 +11,9 @@ angular.module('app.main', ['ngRoute'])
 
     .controller('MainCtrl', function($scope, $http) {
         $scope.users = [];
-        $scope.travels = [];
         $scope.loadMorePagination = true;
-        $scope.page = 0;
+        $scope.pageUsers = 0;
-
+        $http.get(urlapi + 'users?page=' + $scope.pageUsers)
-        $http.get(urlapi + 'users?page=' + $scope.page)
             .then(function(data) {
                 console.log('data success');
                 console.log(data);
@@ -24,7 +22,10 @@ angular.module('app.main', ['ngRoute'])
             }, function(data) {
                 console.log('data error');
             });
-        $http.get(urlapi + 'travels?page=' + $scope.page)
+
+        $scope.travels = [];
+        $scope.pageTravels = 0;
+        $http.get(urlapi + 'travels?page=' + $scope.pageTravels)
             .then(function(data) {
                 console.log('data success');
                 console.log(data);
@@ -33,4 +34,16 @@ angular.module('app.main', ['ngRoute'])
             }, function(data) {
                 console.log('data error');
             });
+
+        $scope.admins=[];
+        $scope.pageAdmins = 0;
+        $http.get(urlapi + 'admins?page=' + $scope.pageAdmins)
+            .then(function(data) {
+                console.log('data success');
+                console.log(data);
+                $scope.admins = data.data;
+
+            }, function(data) {
+                console.log('data error');
+            });
     });

views/navbar.html

@@ -1,5 +1,5 @@
 <div ng-controller="NavbarCtrl">
-<div class="navbar c_grey700">
+<div ng-show="storageuser" class="navbar c_grey700">
     <div class="container-fluid">
         <div class="navbar-header">
             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
@@ -24,7 +24,7 @@
             <ul class="nav navbar-nav navbar-right">
                 <li><a href="javascript:void(0)">Info</a></li>
                 <li class="dropdown">
-                    <a href="bootstrap-elements.html" data-target="#" class="dropdown-toggle" data-toggle="dropdown">Settings
+                    <a href="" data-target="#" class="dropdown-toggle" data-toggle="dropdown">Settings
             <b class="caret"></b></a>
                     <ul class="dropdown-menu">
                         <li><a href="javascript:void(0)">Action</a></li>
@@ -34,7 +34,7 @@
                         <li><a href="javascript:void(0)">Separated link</a></li>
                     </ul>
                 </li>
-                <li><a ng-click="logout()">Logout</a></li>
+                <li><a href="" ng-click="logout()">Logout</a></li>
             </ul>
         </div>
     </div>

views/navbar.js

@@ -22,6 +22,11 @@ angular.module('app.navbar', ['ngRoute'])
             console.log($scope.searchString);
             window.location.href = "#!/search/" + $scope.searchString;
         };
+        if (localStorage.getItem("cic_admin_userdata")) {
+          $scope.storageuser = JSON.parse(localStorage.getItem("cic_admin_userdata"));
+          console.log($scope.storageuser);
+        }
+
         $scope.logout = function() {
             localStorage.removeItem("cic_admin_token");
             localStorage.removeItem("cic_admin_userdata");

views/user/user.html

@@ -102,6 +102,7 @@
                 <div class="panel-body">
                     <!--<div class="btn btn-block btn-sm c_orange300">Ban user</div>-->
                     <div ng-show="!user.validated" ng-click="validateUser()" class="btn btn-block btn-sm c_deepPurple300">Validate User</div>
+                    <div ng-show="user.validated">Validated by: {{user.validatedBy.username}}</div>
                     <div ng-show="user.validated" ng-click="unvalidateUser()" class="btn btn-block btn-sm c_red200">Unvalidate User</div>
                     <div ng-click="deleteUser()" class="btn btn-block btn-sm c_red300">Delete user</div>
                 </div>