From d76ea5ca19bf593ace13905b55077af3c7c4a0f9 Mon Sep 17 00:00:00 2001 From: arnaucode Date: Fri, 27 Jan 2017 11:26:43 +0100 Subject: [PATCH] updated --- www/css/style.css | 9 +++ www/img/faircoinpublickey_sample.png | Bin 17908 -> 21893 bytes www/index.html | 5 +- www/js/app.js | 23 +++++-- www/js/newPublication.js | 5 -- www/js/newTravel.js | 5 ++ www/js/notifications.js | 28 +++++--- www/js/search.js | 30 ++++++++ www/js/translations.js | 2 + www/js/travel.js | 64 +++++++----------- www/templates/login.html | 1 + www/templates/main.html | 26 ++++--- www/templates/menu.html | 12 ++-- .../{newPublication.html => newTravel.html} | 4 +- www/templates/notifications.html | 21 +++--- www/templates/offerCar.html | 62 +++++++---------- www/templates/search.html | 40 +++++++++++ www/templates/settings.html | 2 +- www/templates/travel.html | 30 ++++---- www/templates/travels.html | 9 +-- www/templates/user.html | 30 ++++---- www/templates/users.html | 2 +- 22 files changed, 248 insertions(+), 162 deletions(-) delete mode 100644 www/js/newPublication.js create mode 100644 www/js/newTravel.js create mode 100644 www/js/search.js rename www/templates/{newPublication.html => newTravel.html} (87%) create mode 100644 www/templates/search.html diff --git a/www/css/style.css b/www/css/style.css index fa65cc3..8d164d9 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -201,6 +201,9 @@ } +.o_text_white{ + color: #ffffff!important; +} .o_text_purple400{ color: #7E57C2!important; } @@ -210,3 +213,9 @@ .o_text_purple600{ color: #5E35B1!important; } +.o_text_purple700{ + color: #512DA8!important; +} +.o_text_purple800{ + color: #4527A0!important; +} diff --git a/www/img/faircoinpublickey_sample.png b/www/img/faircoinpublickey_sample.png index 8704a8bad26fae3e0bbec4ae46c6917030f7247e..69320434989935d3c513dfc008fd633e7cf9b840 100644 GIT binary patch literal 21893 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 literal 17908 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 - collectivecar + CarsInCommon @@ -38,9 +38,10 @@ + - + diff --git a/www/js/app.js b/www/js/app.js index 11962b0..01d28e7 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -6,8 +6,9 @@ // 'starter.controllers' is found in controllers.js -var urlapi = "http://localhost:3000/api/"; +//var urlapi = "http://localhost:3000/api/"; //var urlapi="https://collectivecar.paas.primustech.io/api/"; +var urlapi="http://147.83.7.158:3000/api/"; angular.module('starter', [ @@ -19,9 +20,10 @@ angular.module('starter', [ 'app.menu', 'app.footerMenu', 'app.main', + 'app.search', 'app.travels', 'app.travel', - 'app.newPublication', + 'app.newTravel', 'app.offerCar', /* 'app.askCar', 'app.askPackage',*/ @@ -84,6 +86,15 @@ angular.module('starter', [ } } }) + .state('app.search', { + url: '/search', + views: { + 'menuContent': { + templateUrl: 'templates/search.html', + controller: 'SearchCtrl' + } + } + }) .state('app.travels', { url: '/travels', views: { @@ -104,12 +115,12 @@ angular.module('starter', [ } }) - .state('app.newPublication', { - url: '/newPublication', + .state('app.newTravel', { + url: '/newTravel', views: { 'menuContent': { - templateUrl: 'templates/newPublication.html', - controller: 'NewPublicationCtrl' + templateUrl: 'templates/newTravel.html', + controller: 'NewTravelCtrl' } } }) diff --git a/www/js/newPublication.js b/www/js/newPublication.js deleted file mode 100644 index 1415c4d..0000000 --- a/www/js/newPublication.js +++ /dev/null @@ -1,5 +0,0 @@ -angular.module('app.newPublication', ['pascalprecht.translate']) - -.controller('NewPublicationCtrl', function($scope, $stateParams, $translate, $filter) { - -}); diff --git a/www/js/newTravel.js b/www/js/newTravel.js new file mode 100644 index 0000000..62a5c74 --- /dev/null +++ b/www/js/newTravel.js @@ -0,0 +1,5 @@ +angular.module('app.newTravel', ['pascalprecht.translate']) + +.controller('NewTravelCtrl', function($scope, $stateParams, $translate, $filter) { + +}); diff --git a/www/js/notifications.js b/www/js/notifications.js index 10f532b..d254751 100644 --- a/www/js/notifications.js +++ b/www/js/notifications.js @@ -1,15 +1,21 @@ angular.module('app.notifications', ['pascalprecht.translate']) -.controller('NotificationsCtrl', function($scope, $stateParams, $translate, $filter) { - if(localStorage.getItem('c_token')){// adding token to the headers - // $http.defaults.headers.common['X-Access-Token'] = localStorage.getItem('c_token'); - } - $scope.storageusername=localStorage.getItem("c_username"); - $scope.users= JSON.parse(localStorage.getItem('c_users')); - $scope.user = $filter('filter')($scope.users, {username: $stateParams.username}, true)[0]; - $scope.notifications=$scope.user.notifications; +.controller('NotificationsCtrl', function($scope, $http, $ionicLoading, + $stateParams, $translate, $filter) { + $scope.notifications=[]; + $scope.doRefresh = function(){ + $http.get(urlapi + 'notifications') + .then(function(data){ + console.log(data); // for browser console + $scope.notifications = data.data; // for UI + $scope.$broadcast('scroll.refreshComplete');//refresher stop - console.log($stateParams.username); - console.log($scope.notifications); - console.log("notifications page"); + }, function(data){ + console.log('data error'); + $scope.$broadcast('scroll.refreshComplete');//refresher stop + $ionicLoading.show({ template: 'Error connecting server', noBackdrop: true, duration: 2000 }); + + }); + }; + $scope.doRefresh(); }); diff --git a/www/js/search.js b/www/js/search.js new file mode 100644 index 0000000..3705013 --- /dev/null +++ b/www/js/search.js @@ -0,0 +1,30 @@ +angular.module('app.search', ['pascalprecht.translate']) + +.controller('SearchCtrl', function($scope, $http, $ionicModal, $timeout, $ionicLoading, $filter) { + + + $scope.users=[]; + $scope.travels=[]; + $scope.search={ + word:"" + }; + $scope.doSearch = function() { + console.log("doing search"); + console.log($scope.search.word); + /* travels refresh: */ + $http.get(urlapi + 'search/'+ $scope.search.word) + .then(function(data){ + console.log('data success travels'); + console.log(data); // for browser console + $scope.users = data.data.users; // for UI + $scope.travels = data.data.travels; // for UI + $scope.$broadcast('scroll.refreshComplete');//refresher stop + + }, function(data){ + console.log('data error'); + $scope.$broadcast('scroll.refreshComplete');//refresher stop + $ionicLoading.show({ template: 'Error connecting server', noBackdrop: true, duration: 2000 }); + + }); + }; +}); diff --git a/www/js/translations.js b/www/js/translations.js index faaaa11..4604d97 100644 --- a/www/js/translations.js +++ b/www/js/translations.js @@ -5,6 +5,7 @@ var translations = { "Signup": "Signup", "Login": "Login", "Travels": "Travels", + "Travels_feed": "Travels feed", "Users": "Users", "Notifications": "Notifications", "Logout": "Logout", @@ -50,6 +51,7 @@ var translations = { "Post_comment": "Post comment", "Pull_to_refresh": "Pull to refresh", "search": "search", + "filter": "filter", "No_data_in_memory": "No data in memory", "Pull_from_top_to_refresh": "Pull from top to refresh", "User": "User", diff --git a/www/js/travel.js b/www/js/travel.js index 478c28b..05c8892 100644 --- a/www/js/travel.js +++ b/www/js/travel.js @@ -1,6 +1,6 @@ angular.module('app.travel', ['pascalprecht.translate']) -.controller('TravelCtrl', function($scope, $stateParams, $http, $ionicModal, $ionicPopup, $filter) { +.controller('TravelCtrl', function($scope, $stateParams, $http, $ionicModal, $ionicLoading, $ionicPopup, $filter) { $scope.travel={}; $scope.doRefresh = function() { @@ -53,55 +53,38 @@ angular.module('app.travel', ['pascalprecht.translate']) }; $scope.joinTravel = function(){ - $scope.newjoin={ - //travelId: $stateParams.travelId, - /*joinedUserId: localStorage.getItem("c_userid"), - joinedUsername: localStorage.getItem("c_username"), - joinedAvatar: localStorage.getItem("c_avatar")*/ - }; $http({ - url: urlapi + 'travels/'+ $stateParams.travelId+'/join', + url: urlapi + 'travels/join/'+ $stateParams.travelid, method: "POST", - data: $scope.newjoin + data: {} }) - .then(function(response) { - // success - console.log("response: "); - console.log(response); - - $scope.travels=response.data; - localStorage.setItem('c_travels', JSON.stringify($scope.travels)); - localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date())); - $scope.travel = $filter('filter')($scope.travels, $stateParams.travelId, true)[0]; - + .then(function(data) { + console.log("data: "); + console.log(data); + if(data.success==false){ + $ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000}); + }else{ + $scope.travel=data.data; + } }, function(response) { // optional // failed }); }; $scope.unjoinTravel = function(){ - console.log("unjoin"); - $scope.unjoin={ - travelId: $stateParams.travelId, - /*joinedUserId: localStorage.getItem("c_userid"), - joinedUsername: localStorage.getItem("c_username"), - joinedAvatar: localStorage.getItem("c_avatar")*/ - }; $http({ - url: urlapi + 'travels/'+ $stateParams.travelId+'/unjoin', + url: urlapi + 'travels/unjoin/'+ $stateParams.travelid, method: "POST", - data: $scope.unjoin + data: {} }) - .then(function(response) { - // success - console.log("response: "); - console.log(response); - - $scope.travels=response.data; - localStorage.setItem('c_travels', JSON.stringify($scope.travels)); - localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date())); - $scope.travel = $filter('filter')($scope.travels, $stateParams.travelId, true)[0]; - + .then(function(data) { + console.log("data: "); + console.log(data); + if(data.success==false){ + $ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000}); + }else{ + $scope.travel=data.data; + } }, function(response) { // optional // failed @@ -149,12 +132,13 @@ console.log($scope.newComment); }; - $scope.arrayObjectIndexOf = function(myArray, searchTerm, property) { + $scope.userHasJoined = function(myArray, searchTerm) { //console.log(myArray+", "+searchTerm+", "+property); if(myArray) { for(var i = 0, len = myArray.length; i < len; i++) { - if (myArray[i][property] === searchTerm){ + //console.log(myArray[i] + " - " + searchTerm); + if (myArray[i] === searchTerm){ //console.log("i: " + i); return i; } diff --git a/www/templates/login.html b/www/templates/login.html index f441515..02856b3 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -3,6 +3,7 @@
+ v0.0.1 diff --git a/www/templates/main.html b/www/templates/main.html index be282e6..071ee38 100644 --- a/www/templates/main.html +++ b/www/templates/main.html @@ -1,32 +1,40 @@ - + {{storageuser.username}} profile - - - New publication + + + New travel + + + + {{'Search' | translate }} - Travels + {{'Travels_feed' | translate }} - Users + {{'Users' | translate }} - Notifications + {{'Notifications' | translate }} - Settings + {{'Settings' | translate }} + + + + F.A.Q. - Help + {{'Help' | translate }} diff --git a/www/templates/menu.html b/www/templates/menu.html index f3904ec..4d00e2d 100644 --- a/www/templates/menu.html +++ b/www/templates/menu.html @@ -11,15 +11,16 @@ -
+
Notifications Home - - New publication + + New travel
@@ -37,8 +38,11 @@ {{storageuser.username}} + + {{'Search' | translate }} + - {{'Travels' | translate }} + {{'Travels_feed' | translate }} {{'Users' | translate }} diff --git a/www/templates/newPublication.html b/www/templates/newTravel.html similarity index 87% rename from www/templates/newPublication.html rename to www/templates/newTravel.html index c8de767..ceb2210 100644 --- a/www/templates/newPublication.html +++ b/www/templates/newTravel.html @@ -1,5 +1,5 @@ - - + + Offer Car diff --git a/www/templates/notifications.html b/www/templates/notifications.html index e73d36f..a85b423 100644 --- a/www/templates/notifications.html +++ b/www/templates/notifications.html @@ -1,14 +1,17 @@ - - -
- - -

{{notification.description}}

+ + + + + + +

{{notification.message}}

-
{{notification.date | date:"dd/MM"}}
-
{{notification.date | date:"HH:mm:ss"}}
+
{{notification.date | date:"dd/MM"}}
+
{{notification.date | date:"HH:mm:ss"}}
 -
diff --git a/www/templates/offerCar.html b/www/templates/offerCar.html index 89f819d..9493700 100644 --- a/www/templates/offerCar.html +++ b/www/templates/offerCar.html @@ -1,42 +1,33 @@ - -
- - - - + +
+ + + + +
+ + + + + + + + +
+ + + + - -