diff --git a/README.md b/README.md index bbf6693..7195a28 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,4 @@ server code: https://github.com/arnaucode/carsincommonServer - -**ToDos:** -``` --page for user to view joins that has done --allow travel crator to accept join petitions and reject people --add to travel the date of destination --user comments and system to profile, to valorate users --notifications system syncronized - -``` +![carsincommon](https://raw.githubusercontent.com/arnaucode/carsincommonApp/master/carsincommon.png "carsincommon") diff --git a/carsincommon.png b/carsincommon.png new file mode 100644 index 0000000..a47aaec Binary files /dev/null and b/carsincommon.png differ diff --git a/www/js/offerCar.js b/www/js/offerCar.js index 2e8199b..4f0ec7a 100644 --- a/www/js/offerCar.js +++ b/www/js/offerCar.js @@ -33,7 +33,7 @@ angular.module('app.offerCar', ['pascalprecht.translate', 'ui-leaflet']) }) .then(function(data) { console.log(data); - window.location="#app/travels" + window.location="#app/travels"; }, function(data) { // optional // failed diff --git a/www/js/translations.js b/www/js/translations.js index 6d27a92..289930a 100644 --- a/www/js/translations.js +++ b/www/js/translations.js @@ -5,6 +5,8 @@ var translations = { "Signup": "Signup", "Login": "Login", "Travels": "Travels", + "travels": "travels", + "likes": "likes", "Travels_feed": "Travels feed", "Users": "Users", "Notifications": "Notifications", @@ -76,7 +78,7 @@ var translations = { "load_more": "load more", "view_likes": "view likes", "Edit_profile": "Edit profile", - "Travels_offering": "Travels offering", + "Travels_publicated": "Travels publicated", "Travels_joining": "Travels joining" }, "catalan": { diff --git a/www/js/travel.js b/www/js/travel.js index 32a2d19..1315c18 100644 --- a/www/js/travel.js +++ b/www/js/travel.js @@ -79,6 +79,7 @@ angular.module('app.travel', ['pascalprecht.translate', 'ui-leaflet']) localStorage.setItem('c_travels', JSON.stringify($scope.travels)); localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date())); + window.location="#app/users/userTravels/" + $scope.storageuser._id; }, function(response) { // optional // failed diff --git a/www/js/users.js b/www/js/users.js index 4995260..a3e9255 100644 --- a/www/js/users.js +++ b/www/js/users.js @@ -1,34 +1,60 @@ angular.module('app.users', ['pascalprecht.translate']) -.controller('UsersCtrl', function($scope, $http, $ionicModal, $timeout, $ionicLoading, $filter) { - $scope.users=""; + .controller('UsersCtrl', function($scope, $http, $ionicModal, $timeout, $ionicLoading, $filter) { + $scope.users = []; + $scope.loadMorePagination = true; + $scope.page = 0; - $scope.users=JSON.parse(localStorage.getItem('c_users')); + //$scope.users = JSON.parse(localStorage.getItem('c_users')); $scope.doRefresh = function() { - /* users refresh: */ - $http.get(urlapi + 'users') - .success(function(data, status, headers, config){ - console.log('data success'); - console.log(data); // for browser console - $scope.users = data; // for UI - localStorage.setItem('c_users', JSON.stringify($scope.users)); - $scope.$broadcast('scroll.refreshComplete');//refresher stop - - //set userdata - $scope.userdata = $filter('filter')($scope.users, {username: $scope.storageusername}, true)[0]; - console.log("userdata"); - console.log($scope.userdata); - localStorage.setItem("c_userdata", JSON.stringify($scope.userdata)); - }) - .error(function(data, status, headers,config){ - console.log('data error'); - $scope.$broadcast('scroll.refreshComplete');//refresher stop - }) - .then(function(result){ - users = result.data; + /* users refresh: */ + $http.get(urlapi + 'users?page=' + $scope.page) + .then(function(data) { + console.log('data success'); + console.log(data); + + $scope.users = $scope.users.concat(data.data); + $scope.$broadcast('scroll.refreshComplete'); //refresher stop + $scope.$broadcast('scroll.infiniteScrollComplete'); + if (data.data.length < 1) { + console.log("setting loadMorePagination to false"); + $scope.loadMorePagination = false; + $scope.$broadcast('scroll.infiniteScrollComplete'); + } + + + /*localStorage.setItem('c_users', JSON.stringify($scope.users)); + $scope.$broadcast('scroll.refreshComplete'); //refresher stop + + //set userdata + $scope.userdata = $filter('filter')($scope.users, { + username: $scope.storageusername + }, true)[0]; + console.log("userdata"); + console.log($scope.userdata); + localStorage.setItem("c_userdata", JSON.stringify($scope.userdata));*/ + }, function(data) { + console.log('data error'); + $scope.$broadcast('scroll.refreshComplete'); //refresher stop + $ionicLoading.show({ + template: 'Error connecting server', + noBackdrop: true, + duration: 2000 + }); }); }; $scope.doRefresh(); -}); + + $scope.paginationNext = function() { + if ($scope.loadMorePagination == true) { + $scope.page++; + console.log($scope.page); + $scope.doRefresh(); + } else { + console.log("limit pagination reached"); + $scope.$broadcast('scroll.infiniteScrollComplete'); + } + }; + }); diff --git a/www/templates/main.html b/www/templates/main.html index dfdcede..52b3d6f 100644 --- a/www/templates/main.html +++ b/www/templates/main.html @@ -1,8 +1,13 @@ - - + + + {{storageuser.username}} {{'profile' | translate}} +

+ {{storageuser.travels.length}} {{'travels' | translate }}, + {{storageuser.likes.length}} {{'likes' | translate }} +

diff --git a/www/templates/userTravels.html b/www/templates/userTravels.html index 59ebe32..4f55219 100644 --- a/www/templates/userTravels.html +++ b/www/templates/userTravels.html @@ -6,7 +6,7 @@
- {{'Travels_offering' | translate}} + {{'Travels_publicated' | translate}}
diff --git a/www/templates/users.html b/www/templates/users.html index 4b0a1ef..30e4358 100644 --- a/www/templates/users.html +++ b/www/templates/users.html @@ -1,5 +1,5 @@ - + @@ -20,5 +20,10 @@

+ +