user historyon user profile added

app/www/js/controllers.js

@@ -1,7 +1,13 @@
+
+//var urlapi="http://localhost:3000/api/";
+var urlapi="http://192.168.1.40:3000/api/";
+localStorage.setItem("c_username", "user2");
+localStorage.setItem("c_token", "");
+
+
 angular.module('starter.controllers', [])
 
 .controller('AppCtrl', function($scope, $ionicModal, $timeout) {
-
   // With the new view caching in Ionic, Controllers are only called
   // when they are recreated or on app start, instead of every page change.
   // To listen for when this page is active (for example, to refresh data),
@@ -48,7 +54,7 @@ angular.module('starter.controllers', [])
     $scope.travels=JSON.parse(localStorage.getItem('c_travels'));
 
     $scope.doRefresh = function() {
-        $http.get('http://localhost:3000/api/travels')
+        $http.get(urlapi + 'travels')
         .success(function(data, status, headers,config){
             console.log('data success');
             console.log(data); // for browser console
@@ -116,12 +122,12 @@ angular.module('starter.controllers', [])
     console.log('Doing new travel', $scope.newtravel);
     $scope.newtravel.icon="lorry";
     $scope.newtravel.generateddate=$scope.newtravel.date;
-    $scope.newtravel.owner="user";
+    $scope.newtravel.owner=localStorage.getItem("c_username");
 
     $scope.newtravel.modality="offering";
     console.log($scope.newtravel);
     $http({
-        url: 'http://localhost:3000/api/travels',
+        url: urlapi + 'travels',
         method: "POST",
         data: $scope.newtravel
     })
@@ -148,12 +154,12 @@ angular.module('starter.controllers', [])
     console.log('Doing new travel', $scope.newtravel);
     $scope.newtravel.icon="lorry";
     $scope.newtravel.generateddate=$scope.newtravel.date;
-    $scope.newtravel.owner="user";
+    $scope.newtravel.owner=localStorage.getItem("c_username");
 
     $scope.newtravel.modality="asking";
     console.log($scope.newtravel);
     $http({
-        url: 'http://localhost:3000/api/travels',
+        url: urlapi + 'travels',
         method: "POST",
         data: $scope.newtravel
     })
@@ -179,13 +185,13 @@ angular.module('starter.controllers', [])
     console.log('Doing new package', $scope.newtravel);
     $scope.newtravel.icon="lorry";
     $scope.newtravel.generateddate=$scope.newtravel.date;
-    $scope.newtravel.owner="user";
+    $scope.newtravel.owner=localStorage.getItem("c_username");
     $scope.newtravel.package=true;
 
     $scope.newtravel.modality="package";
     console.log($scope.newtravel);
     $http({
-        url: 'http://localhost:3000/api/travels',
+        url: urlapi + 'travels',
         method: "POST",
         data: $scope.newtravel
     })
@@ -209,9 +215,10 @@ angular.module('starter.controllers', [])
 })
 
 .controller('TravelCtrl', function($scope, $stateParams, $http) {
+    $scope.storageusername=localStorage.getItem("c_username");
     $scope.travel="";
     console.log($stateParams.travelId);
-    $http.get('http://localhost:3000/api/travels/'+$stateParams.travelId)
+    $http.get(urlapi + 'travels/'+$stateParams.travelId)
         .success(function(data, status, headers,config){
             console.log('data success');
             console.log(data); // for browser console
@@ -231,7 +238,7 @@ angular.module('starter.controllers', [])
     $scope.users=JSON.parse(localStorage.getItem('c_users'));
 
     $scope.doRefresh = function() {
-        $http.get('http://localhost:3000/api/users')
+        $http.get(urlapi + 'users')
         .success(function(data, status, headers, config){
             console.log('data success');
             console.log(data); // for browser console
@@ -250,9 +257,9 @@ angular.module('starter.controllers', [])
 })
 
 .controller('UserCtrl', function($scope, $stateParams, $http) {
-    $scope.travel="";
+    //$scope.user="";
     console.log($stateParams.username);
-    $http.get('http://localhost:3000/api/users/byusername/'+$stateParams.username)
+    $http.get(urlapi + 'users/byusername/'+$stateParams.username)
         .success(function(data, status, headers,config){
             console.log('data success');
             console.log(data); // for browser console
@@ -261,6 +268,19 @@ angular.module('starter.controllers', [])
         .error(function(data, status, headers,config){
             console.log('data error');
         })
+        .then(function(result){
+            user = result.data;
+    });
+
+    $http.get(urlapi + 'travels/user/'+$stateParams.username)
+        .success(function(data, status, headers,config){
+            console.log('data success');
+            console.log(data); // for browser console
+            $scope.travels = data; // for UI
+        })
+        .error(function(data, status, headers,config){
+            console.log('data error');
+        })
         .then(function(result){
             travels = result.data;
     });

app/www/templates/newaskingtravel.html

@@ -2,7 +2,7 @@
   <ion-content>
 
     <h4>
-        <img class='o-imgTitle' src="img/road.png" />
+        <img class='o-imgTitle' src="img/asking.png" />
         New Asking Travel {{newtravel.title}}
     </h4>
     <form class="list">

app/www/templates/newofferingtravel.html

@@ -2,7 +2,7 @@
   <ion-content>
 
     <h4>
-        <img class='o-imgTitle' src="img/road.png" />
+        <img class='o-imgTitle' src="img/offering.png" />
         New Travel {{newtravel.title}}
     </h4>
     <form class="list">

app/www/templates/travel.html

@@ -32,9 +32,13 @@
             <img class='o-imgMenu' src="img/telegram.png" /> {{travel.telegram}}
         </p>
 
-        <p class='text-right'>
+        <p class='text-right' ng-show="storageusername!==travel.owner">
             <a ng-show="travel.modality=='offering'" href="#" class="button button-calm o-pull-right">Ask to join</a>
             <a ng-show="travel.modality=='asking'" href="#" class="button button-calm o-pull-right">Offer car</a>
+            <a ng-show="travel.modality=='package'" href="#" class="button button-calm o-pull-right">Offer car</a>
+        </p>
+        <p ng-show="storageusername==travel.owner" class="text-right">
+            <a href="#" class="button button-assertive o-pull-right">Delete</a>
         </p>
     </div>
   </ion-content>

app/www/templates/travels.html

@@ -14,15 +14,16 @@
         <a ng-repeat="travel in travels | orderBy: 'date'" class="item item-avatar" href="#/app/travels/{{travel._id}}">
           <img ng-src="img/{{travel.modality}}.png">
           <h2>{{travel.title}}</h2>
+          <div class="item-note">
+              <div class="positive">{{travel.date | date:"dd/MM HH:mm a"}}</div>
+              <div class="badge badge-calm">{{travel.owner}}</div>
+          </div>
           <p>
               {{travel.description}}
           </p>
           <p class="" ng-show="travel.modality=='offering'">nºseats: {{travel.seats}}</p>
           <p class="" ng-show="travel.modality=='asking'">nºpeople: {{travel.seats}}</p>
-          <div class="item-note">
-              <div class="positive">{{travel.date | date:"dd/MM HH:mm a"}}</div>
-              <div class="badge badge-calm">{{travel.owner}}</div>
-          </div>
+
         </a>
     </div>
   </ion-content>

app/www/templates/user.html

@@ -1,10 +1,7 @@
-<ion-view view-title="User">
+<ion-view view-title="User {{user.username}}">
   <ion-content>
     <div class="item item-avatar">
         <img ng-src="img/avatars/{{user.avatar}}.png" />
-        <div class="item-note o-text-right">
-            <a class="badge badge-calm" href="#/app/users/{{travel.owner}}">{{user.owner}}</a>
-        </div>
         <h2>{{user.username}}</h2>
     </div>
     <div class="item item-body">
@@ -14,5 +11,28 @@
             <img class='o-imgMenu' src="img/telegram.png" /> {{user.telegram}}
         </p>
     </div>
+    <div class="item item-body">
+        history of {{user.username}}:
+        <div class="positive">{{travels.length}} publications</div>
+
+        <a ng-repeat="travel in travels | orderBy: 'date'" class="item item-avatar" href="#/app/travels/{{travel._id}}">
+          <img ng-src="img/{{travel.modality}}.png">
+          <h2>{{travel.title}}
+              <div class="item-note">
+                  <div class="positive">{{travel.date | date:"dd/MM HH:mm a"}}</div>
+              </div>
+          </h2>
+
+          <div class="item-note">
+              <p class="" ng-show="travel.modality=='offering'">nºseats: {{travel.seats}}</p>
+              <p class="" ng-show="travel.modality=='asking'">nºpeople: {{travel.seats}}</p>
+          </div>
+          <p>
+              {{travel.description}}
+          </p>
+
+
+        </a>
+    </div>
   </ion-content>
 </ion-view>

app/www/templates/users.html

@@ -5,12 +5,6 @@
         on-refresh="doRefresh()">
       </ion-refresher>
     <div class="list">
-        <div class="o-float-right">
-            <a ng-click="showNewAskingTravel()" class="button icon ion-email"></a>
-            <a ng-click="showNewAskingTravel()" class="button icon ion-help"></a>
-            <a ng-click="showNewOfferingTravel()" class="button icon ion-plus"></a>
-        </div>
-
         <a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" href="#/app/users/{{user.username}}">
           <img ng-src="img/avatars/{{user.avatar}}.png">
           <h2>{{user.username}}</h2>

server/controllers/travelController.js

@@ -28,7 +28,7 @@ exports.findById = function(req, res) {
 
 exports.findAllTravelsFromUsername = function(req, res) {
     travelModel.find({
-      _id: req.params.userid
+      owner: req.params.username
   }, function(err, travels) {
 
       if (err) throw err;

server/server.js

@@ -59,7 +59,7 @@ apiRoutes.route('/users/:id')
     .get(userCtrl.findById);
 apiRoutes.route('/users/byusername/:username')
     .get(userCtrl.findUserByUsername);
-apiRoutes.route('/travels/user/:userid')
+apiRoutes.route('/travels/user/:username')
     .get(travelCtrl.findAllTravelsFromUsername);
 
 apiRoutes.route('/auth')