From 5d702098c542e801ddf345da6c293df4291c98ec Mon Sep 17 00:00:00 2001 From: arnaucode Date: Fri, 22 Sep 2017 19:22:36 +0200 Subject: [PATCH] moving and renaming --- .gitignore | 0 LICENSE | 0 README.md | 8 ++++---- app.js | 0 bower.json | 6 +++--- css/colors.css | 0 css/style.css | 0 img/asking.png | Bin img/avatars/chameleon.png | Bin img/avatars/clown-fish.png | Bin img/avatars/duck.png | Bin img/avatars/owl.png | Bin img/avatars/penguin.png | Bin img/avatars/racoon.png | Bin img/avatars/siberian-husky.png | Bin img/avatars/sloth.png | Bin img/avatars/tiger.png | Bin img/avatars/toucan.png | Bin img/faircoinpublickey_sample.png | Bin img/offering.png | Bin img/package.png | Bin img/userProfileBackground.png | Bin index.html | 0 package.json | 6 +++--- views/login/login.html | 0 views/login/login.js | 0 views/main/main.html | 10 ++++++++-- views/main/main.js | 23 ++++++++++++++++++----- views/navbar.html | 6 +++--- views/navbar.js | 5 +++++ views/network/network.html | 0 views/network/network.js | 0 views/search/search.html | 0 views/search/search.js | 0 views/signup/signup.html | 0 views/signup/signup.js | 0 views/travel/travel.html | 0 views/travel/travel.js | 0 views/travels/travels.html | 0 views/travels/travels.js | 0 views/user/user.html | 1 + views/user/user.js | 0 views/userNetwork/userNetwork.html | 0 views/userNetwork/userNetwork.js | 0 44 files changed, 45 insertions(+), 20 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 app.js mode change 100644 => 100755 bower.json mode change 100644 => 100755 css/colors.css mode change 100644 => 100755 css/style.css mode change 100644 => 100755 img/asking.png mode change 100644 => 100755 img/avatars/chameleon.png mode change 100644 => 100755 img/avatars/clown-fish.png mode change 100644 => 100755 img/avatars/duck.png mode change 100644 => 100755 img/avatars/owl.png mode change 100644 => 100755 img/avatars/penguin.png mode change 100644 => 100755 img/avatars/racoon.png mode change 100644 => 100755 img/avatars/siberian-husky.png mode change 100644 => 100755 img/avatars/sloth.png mode change 100644 => 100755 img/avatars/tiger.png mode change 100644 => 100755 img/avatars/toucan.png mode change 100644 => 100755 img/faircoinpublickey_sample.png mode change 100644 => 100755 img/offering.png mode change 100644 => 100755 img/package.png mode change 100644 => 100755 img/userProfileBackground.png mode change 100644 => 100755 index.html mode change 100644 => 100755 package.json mode change 100644 => 100755 views/login/login.html mode change 100644 => 100755 views/login/login.js mode change 100644 => 100755 views/main/main.html mode change 100644 => 100755 views/main/main.js mode change 100644 => 100755 views/navbar.html mode change 100644 => 100755 views/navbar.js mode change 100644 => 100755 views/network/network.html mode change 100644 => 100755 views/network/network.js mode change 100644 => 100755 views/search/search.html mode change 100644 => 100755 views/search/search.js mode change 100644 => 100755 views/signup/signup.html mode change 100644 => 100755 views/signup/signup.js mode change 100644 => 100755 views/travel/travel.html mode change 100644 => 100755 views/travel/travel.js mode change 100644 => 100755 views/travels/travels.html mode change 100644 => 100755 views/travels/travels.js mode change 100644 => 100755 views/user/user.html mode change 100644 => 100755 views/user/user.js mode change 100644 => 100755 views/userNetwork/userNetwork.html mode change 100644 => 100755 views/userNetwork/userNetwork.js diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 804867f..1ac96de --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# carsincommonAdminWeb +# commonroutesAdminWeb -- server code: https://github.com/arnaucode/carsincommonServer -- frontend app code: https://github.com/arnaucode/carsincommonApp +- server code: https://github.com/arnaucode/commonroutesServer +- 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 diff --git a/app.js b/app.js old mode 100644 new mode 100755 diff --git a/bower.json b/bower.json old mode 100644 new mode 100755 index bb49372..f2a6ffb --- a/bower.json +++ b/bower.json @@ -1,8 +1,8 @@ { - "name": "carsincommonAdminWeb", - "description": "carsincommonAdminWeb", + "name": "commonroutesAdminWeb", + "description": "commonroutesAdminWeb", "version": "0.0.0", - "homepage": "https://github.com/arnaucode/carsincommonAdmin", + "homepage": "https://github.com/arnaucode/commonroutesAdminWeb", "license": "MIT", "private": true, "dependencies": { diff --git a/css/colors.css b/css/colors.css old mode 100644 new mode 100755 diff --git a/css/style.css b/css/style.css old mode 100644 new mode 100755 diff --git a/img/asking.png b/img/asking.png old mode 100644 new mode 100755 diff --git a/img/avatars/chameleon.png b/img/avatars/chameleon.png old mode 100644 new mode 100755 diff --git a/img/avatars/clown-fish.png b/img/avatars/clown-fish.png old mode 100644 new mode 100755 diff --git a/img/avatars/duck.png b/img/avatars/duck.png old mode 100644 new mode 100755 diff --git a/img/avatars/owl.png b/img/avatars/owl.png old mode 100644 new mode 100755 diff --git a/img/avatars/penguin.png b/img/avatars/penguin.png old mode 100644 new mode 100755 diff --git a/img/avatars/racoon.png b/img/avatars/racoon.png old mode 100644 new mode 100755 diff --git a/img/avatars/siberian-husky.png b/img/avatars/siberian-husky.png old mode 100644 new mode 100755 diff --git a/img/avatars/sloth.png b/img/avatars/sloth.png old mode 100644 new mode 100755 diff --git a/img/avatars/tiger.png b/img/avatars/tiger.png old mode 100644 new mode 100755 diff --git a/img/avatars/toucan.png b/img/avatars/toucan.png old mode 100644 new mode 100755 diff --git a/img/faircoinpublickey_sample.png b/img/faircoinpublickey_sample.png old mode 100644 new mode 100755 diff --git a/img/offering.png b/img/offering.png old mode 100644 new mode 100755 diff --git a/img/package.png b/img/package.png old mode 100644 new mode 100755 diff --git a/img/userProfileBackground.png b/img/userProfileBackground.png old mode 100644 new mode 100755 diff --git a/index.html b/index.html old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 657087e..1a77888 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "carsincommonAdminWeb", + "name": "commonroutesAdminWeb", "private": true, "version": "0.0.0", - "description": "carsincommonAdminWeb", - "repository": "https://github.com/arnaucode/carsincommonAdmin", + "description": "commonroutesAdminWeb", + "repository": "https://github.com/arnaucode/commonroutesAdminWeb", "license": "MIT", "devDependencies": { "bower": "^1.7.7", diff --git a/views/login/login.html b/views/login/login.html old mode 100644 new mode 100755 diff --git a/views/login/login.js b/views/login/login.js old mode 100644 new mode 100755 diff --git a/views/main/main.html b/views/main/main.html old mode 100644 new mode 100755 index 4e3557a..6a83b5d --- a/views/main/main.html +++ b/views/main/main.html @@ -3,7 +3,10 @@
-

All users

+

+ All users + {{users.length}} +

@@ -30,7 +33,10 @@
-

All travels

+

+ All travels + {{travels.length}} +

diff --git a/views/main/main.js b/views/main/main.js old mode 100644 new mode 100755 index 4f85af4..19c8cdc --- a/views/main/main.js +++ b/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; - - $http.get(urlapi + 'users?page=' + $scope.page) + $scope.pageUsers = 0; + $http.get(urlapi + 'users?page=' + $scope.pageUsers) .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'); + }); }); diff --git a/views/navbar.html b/views/navbar.html old mode 100644 new mode 100755 index 1d5dced..0c1ebae --- a/views/navbar.html +++ b/views/navbar.html @@ -1,5 +1,5 @@
-
+
diff --git a/views/navbar.js b/views/navbar.js old mode 100644 new mode 100755 index b85a339..59ad3be --- a/views/navbar.js +++ b/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"); diff --git a/views/network/network.html b/views/network/network.html old mode 100644 new mode 100755 diff --git a/views/network/network.js b/views/network/network.js old mode 100644 new mode 100755 diff --git a/views/search/search.html b/views/search/search.html old mode 100644 new mode 100755 diff --git a/views/search/search.js b/views/search/search.js old mode 100644 new mode 100755 diff --git a/views/signup/signup.html b/views/signup/signup.html old mode 100644 new mode 100755 diff --git a/views/signup/signup.js b/views/signup/signup.js old mode 100644 new mode 100755 diff --git a/views/travel/travel.html b/views/travel/travel.html old mode 100644 new mode 100755 diff --git a/views/travel/travel.js b/views/travel/travel.js old mode 100644 new mode 100755 diff --git a/views/travels/travels.html b/views/travels/travels.html old mode 100644 new mode 100755 diff --git a/views/travels/travels.js b/views/travels/travels.js old mode 100644 new mode 100755 diff --git a/views/user/user.html b/views/user/user.html old mode 100644 new mode 100755 index e77fc52..a55044e --- a/views/user/user.html +++ b/views/user/user.html @@ -102,6 +102,7 @@
Validate User
+
Validated by: {{user.validatedBy.username}}
Unvalidate User
Delete user
diff --git a/views/user/user.js b/views/user/user.js old mode 100644 new mode 100755 diff --git a/views/userNetwork/userNetwork.html b/views/userNetwork/userNetwork.html old mode 100644 new mode 100755 diff --git a/views/userNetwork/userNetwork.js b/views/userNetwork/userNetwork.js old mode 100644 new mode 100755