commonroutesApp · arnaucube's git mirror

favsList implemented, show user by username filter bug fixed

idoctnef idoctnef@openmailbox.org

Mon, 10 Oct 2016 13:14:41 +0200

commit

ceef406be9fa8b94c92d3eb74dac14c1ebdaf51a

parent

999c2c025cf22b92880183f4b43abee5453c3cb6

10 files changed, 64 insertions(+), 18 deletions(-)

jump to

config.xml

www/js/controllers.js

www/js/translations.js

www/templates/favsList.html

www/templates/help.html

www/templates/settings.html

www/templates/travel.html

www/templates/travels.html

www/templates/user.html

www/templates/users.html

M config.xml → config.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="com.ionicframework.app751563" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>collectiveCar</name>
+    <name>CarsInCommon</name>
     <description>
         CarSharing app, for collective use.
     </description>

M www/js/controllers.js → www/js/controllers.js

@@ -648,13 +648,13 @@ });
     };
 })
 
-.controller('UserCtrl', function($scope, $stateParams, $http, $filter) {
+.controller('UserCtrl', function($scope, $stateParams, $http, $filter, $ionicModal) {
     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, $stateParams.username, true)[0];
+    $scope.user = $filter('filter')($scope.users, {username: $stateParams.username}, true)[0];
     //$scope.user="";
     console.log($stateParams.username);
     /*$http.get(urlapi + 'users/byusername/'+$stateParams.username)
@@ -706,7 +706,7 @@ console.log(response);
 
                 $scope.users=response.data;
                 localStorage.setItem('c_users', JSON.stringify($scope.users));
-                $scope.user = $filter('filter')($scope.users, $stateParams.username, true)[0];
+                $scope.user = $filter('filter')($scope.users, {username: $stateParams.username}, true)[0];
 
         },
         function(response) { // optional
@@ -733,12 +733,27 @@ console.log(response);
 
                 $scope.users=response.data;
                 localStorage.setItem('c_users', JSON.stringify($scope.users));
-                $scope.user = $filter('filter')($scope.users, $stateParams.username, true)[0];
+                $scope.user = $filter('filter')($scope.users, {username: $stateParams.username}, true)[0];
 
         },
         function(response) { // optional
                 // failed
         });
+    };
+
+    $ionicModal.fromTemplateUrl('templates/favsList.html', {
+      scope: $scope
+    }).then(function(modal) {
+      $scope.modalFavsList = modal;
+    });
+    $scope.closeModalFavsList = function() {
+      $scope.modalFavsList.hide();
+    };
+    $scope.showFavsList = function(){
+      $scope.modalFavsList.show();
+    };
+    $scope.closeModalAndGoUser = function(){
+      $scope.modalFavsList.hide();
     };
 
     $scope.arrayObjectIndexOf = function(myArray, searchTerm, property) {

M www/js/translations.js → www/js/translations.js

@@ -53,6 +53,7 @@ "No_data_in_memory": "No data in memory",
 		"Pull_from_top_to_refresh": "Pull from top to refresh",
 		"User": "User",
 		"history_of": "history of",
+		"current_publications_of": "current publications of",
 		"publications": "publications",
 
 	},

A www/templates/favsList.html

@@ -0,0 +1,24 @@
+<ion-modal-view view-title="{{'User' | translate}}">
+  <ion-content>
+
+    <h4 class="padding">
+        <img class='o-imgTitle' src="img/like.png" />
+        {{'Likes' | translate}} {{newtravel.title}}
+        <div class="item-note">
+          <button class="button button-small button-dark" ng-click="closeModalFavsList()">X</button>
+        </div>
+
+    </h4>
+
+    <div class="list">
+        <a ng-repeat="fav in user.favs | orderBy: 'date'" class="item item-avatar" ng-click="closeModalAndGoUser()" ng-href="#/app/users/{{fav.username}}">
+          <img ng-src="img/avatars/{{fav.avatar}}.png">
+          <h2>{{fav.username}}</h2>
+        </a>
+    </div>
+    <div class="item-note">
+      <button class="button button-small button-dark" ng-click="closeModalFavsList()">{{'Close' | translate}}</button>
+    </div>
+
+  </ion-content>
+</ion-modal-view>

M www/templates/help.html → www/templates/help.html

@@ -1,6 +1,5 @@
 <ion-view view-title="{{'Help' | translate}}">
   <ion-content>
-    <h1>{{'Help' | translate}}</h1>
     <p>
       help instructions here
     </p>
@@ -14,5 +13,7 @@ <img ng-src="img/package.png" class="o-img-new"/>
       <img ng-src="img/asking.png" class="o-img-new"/>
       <img ng-src="img/offering.png" class="o-img-new"/>
     </p>
+    <br><br>
+    <p>not yet</p>
   </ion-content>
 </ion-view>

M www/templates/settings.html → www/templates/settings.html

@@ -1,6 +1,5 @@
 <ion-view view-title="{{'Settings' | translate}}">
   <ion-content>
-    <h1>{{'Settings' | translate}}</h1>
     <label class="item item-input item-select">
     <div class="input-label">
       {{'Actual_language' | translate}}

M www/templates/travel.html → www/templates/travel.html

@@ -15,8 +15,10 @@ <div class="">{{travel.date | date:"dd/MM HH:mm a"}}</div>
     </div>
     <div class="item item-body">
       <div class='row'>
-
           <p class="o-bold">{{travel.description}}</p>
+      </div>
+      <div class="row">
+        <p><img class='o-imgTitle' src="img/from-to.png" />{{travel.from}} --> {{travel.to}}</p>
       </div>
       <div class='row'>
         <div class='col'>
@@ -24,10 +26,10 @@ <p ng-show="travel.phone">
               <img class='o-imgMenu' src="img/smartphone.png" /> {{travel.phone}}
           </p>
           <p ng-show="travel.telegram">
+            <a ng-href="https://telegram.me/{{travel.telegram}}" target="_blank" class="button">
               <img class='o-imgMenu' src="img/telegram.png" /> @{{travel.telegram}}
+            </a>
           </p>
-
-          <p><img class='o-imgTitle' src="img/from-to.png" />{{travel.from}} - {{travel.to}}</p>
         </div>
         <div class='col o-text-right'>
           <p ng-show="travel.collectivized">
@@ -49,7 +51,7 @@ </div>
         <br>
 
 
-        <div ng-show="storageusername && storageusername!=travel.owner">
+        <div ng-show="storageusername && storageusername!=travel.owner" class="text-right">
             <p class='text-right'>
               <div ng-show="arrayObjectIndexOf(travel.joins, storageusername, 'joinedUsername')==-1">
                 <a ng-show="travel.modality=='offering'" ng-click="joinTravel()" class="button button-calm o-pull-right">{{'Ask_to_join' | translate}}</a>
@@ -90,7 +92,7 @@
             <button ng-click="closeNewComment()" class="button button-small button-assertive">
                {{'Cancel' | translate}}
             </button>
-            <button ng-click="doNewComment()" class="button button-small button-calm">
+            <button ng-click="doNewComment()" ng-show="newComment.comment" class="button button-small button-calm">
                {{'Post_comment' | translate}}
             </button>
         </form>

M www/templates/travels.html → www/templates/travels.html

@@ -36,7 +36,7 @@ {{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>-->
-          <p class="">{{travel.from}} - {{travel.to}}</p>
+          <p class="">{{travel.from}} --> {{travel.to}}</p>
         </a>
     </div>
   </ion-content>

M www/templates/user.html → www/templates/user.html

@@ -8,13 +8,17 @@ <div class="item item-body">
         <p class="o-bold">{{user.description}}</p>
         <p>{{user.mail}}</p>
         <p>
+          <a ng-href="https://telegram.me/{{user.telegram}}" target="_blank" class="button">
             <img class='o-imgMenu' src="img/telegram.png" /> @{{user.telegram}}
+          </a>
         </p>
 
         <div class="o-text-right">
-          <b>favs:</b>
-          <span class="">{{user.favs.length}}</span>
-          <br><br>
+          <div ng-click="showFavsList()">
+            <b>favs:</b>
+            <span class="">{{user.favs.length}}</span>
+          </div>
+          <br>
           <div ng-show="storageusername && storageusername!=user.username">
             <a ng-show="arrayObjectIndexOf(user.favs, storageusername, 'username')==-1" ng-click="favUser()">
               <img class="o-imgMenu" src="img/unlike.png" />
@@ -29,7 +33,7 @@ </a>-->
         </div>
     </div>
     <div class="item item-body">
-        {{'history_of' | translate}} {{user.username}}:
+        {{'current_publications_of' | translate}} {{user.username}}:
         <div class="positive">{{travels.length}} {{'publications' | translate}}</div>
 
         <a ng-repeat="travel in travels | orderBy: 'date'" class="item item-avatar" href="#/app/travels/{{travel._id}}">

M www/templates/users.html → www/templates/users.html

@@ -12,7 +12,7 @@ {{'Pull_from_top_to_refresh' | translate}}
         </div>
       </div>
 
-        <a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" href="#/app/users/{{user.username}}">
+        <a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" ng-href="#/app/users/{{user.username}}">
           <img ng-src="img/avatars/{{user.avatar}}.png">
           <h2>{{user.username}}</h2>
           <p>