updated

www/templates/login.html

@@ -3,6 +3,7 @@
       <img src="img/header.png" style="width:100%;"/>
     <form ng-submit="doLogin()">
       <div class="list padding">
+          <span class="item-note">v0.0.1</span>
           <md-input-container class="md-block" flex-gt-sm>
             <label>{{'Username' | translate}}</label>
             <input ng-model="loginData.username">

www/templates/main.html

@@ -1,32 +1,40 @@
 <ion-view view-title="Main">
-  <ion-content>
+  <ion-content class="has-footer">
       <a ng-href="#/app/users/{{storageuser._id}}" class="item item-icon-left o_purpleG300to500">
         <i class="icon ion-person"></i>
         {{storageuser.username}} profile
       </a>
-      <a ng-href="#/app/newPublication" class="item item-icon-left o_purpleG300to500">
-        <i class="icon ion-paper-airplane"></i>
-        New publication
+      <a ng-href="#/app/newTravel" class="item item-icon-left o_purpleG300to500">
+        <i class="icon ion-map"></i>
+        New travel
+      </a>
+      <a ng-href="#/app/search" class="item item-icon-left o_purpleG300to500">
+        <i class="icon ion-search"></i>
+        {{'Search' | translate }}
       </a>
       <a ng-href="#/app/travels" class="item item-icon-left o_purpleG300to500">
         <i class="icon ion-android-car"></i>
-        Travels
+        {{'Travels_feed' | translate }}
       </a>
       <a href="#/app/users" class="item item-icon-left o_purpleG300to500">
         <i class="icon ion-person-stalker"></i>
-        Users
+        {{'Users' | translate }}
       </a>
       <a href="#/app/notifications" class="item item-icon-left o_purpleG300to500">
         <i class="icon ion-android-notifications"></i>
-        Notifications
+        {{'Notifications' | translate }}
       </a>
       <a href="#/app/settings" class="item item-icon-left o_purpleG300to500">
       <i class="icon ion-settings"></i>
-        Settings
+        {{'Settings' | translate }}
+      </a>
+      <a href="#/app/help" class="item item-icon-left o_purpleG300to500">
+      <i class="icon ion-ios-paper-outline"></i>
+        F.A.Q.
       </a>
       <a href="#/app/help" class="item item-icon-left o_purpleG300to500">
         <i class="icon ion-ios-help-outline"></i>
-        Help
+        {{'Help' | translate }}
       </a>
   </ion-content>
 </ion-view>

www/templates/menu.html

@@ -11,15 +11,16 @@
     </ion-nav-bar>
     <ion-nav-view name="menuContent"></ion-nav-view>
     <!-- menu footer -->
-    <div class="tabs tabs-icon-left" ng-controller="FooterMenuCtrl" ng-show="storageuser">
+    <div class="tabs tabs-icon-left" style="position:absolute;"
+    ng-controller="FooterMenuCtrl" ng-show="storageuser">
       <a class="tab-item" ng-href="#/app/notifications">
         <i class="icon ion-android-notifications-none"></i> Notifications
       </a>
       <a class="tab-item" ng-href="#/app/main">
         <i class="icon ion-home"></i> Home
       </a>
-      <a ng-href="#/app/newPublication" class="tab-item">
-        <i class="icon ion-paper-airplane"></i> New publication
+      <a ng-href="#/app/newTravel" class="tab-item">
+        <i class="icon ion-map"></i> New travel
       </a>
     </div>
     <!-- /menu footer -->
@@ -37,8 +38,11 @@
         <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/users/{{storageuser._id}}">
           <i class="icon ion-person"></i> {{storageuser.username}}
         </a>
+        <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/search">
+          <i class="icon ion-search"></i> {{'Search' | translate }}
+        </a>
         <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/travels">
-          <i class="icon ion-android-car"></i> {{'Travels' | translate }}
+          <i class="icon ion-android-car"></i> {{'Travels_feed' | translate }}
         </a>
         <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/users">
           <i class="icon ion-person-stalker"></i> {{'Users' | translate }}

www/templates/newTravel.html

@@ -1,5 +1,5 @@
-<ion-view view-title="New Publication">
-  <ion-content>
+<ion-view view-title="New Travel">
+  <ion-content class="has-footer">
       <a ng-href="#/app/offerCar" class="item item-icon-left o_purple500">
         <i class="icon ion-android-car"></i>
         Offer Car

www/templates/notifications.html

@@ -1,14 +1,17 @@
-<ion-view view-title="{{'Notifications' | translate}} {{user.username}}">
-  <ion-content>
-    <div class="item item-body">
-      <a ng-repeat="notification in notifications | orderBy: '-date'" class="item item-avatar" href="#/app/{{notification.link}}">
-        <img ng-src="img/{{notification.type}}.png"/>
-        <h2>{{notification.description}}</h2>
+<ion-view view-title="{{'Notifications' | translate}}">
+  <ion-content class="has-footer">
+      <ion-refresher
+        pulling-text="{{'Pull_to_refresh' | translate}}..."
+        on-refresh="doRefresh()">
+      </ion-refresher>
+      <a ng-repeat="notification in notifications | orderBy: '-date'"
+      class="item item-icon-left" href="#/app/{{notification.link}}">
+        <i class="icon ion-android-notifications-none"></i>
+        <h2>{{notification.message}}</h2>
         <div class="item-note text-right">
-            <div class="positive">{{notification.date | date:"dd/MM"}}</div>
-            <div class="positive">{{notification.date | date:"HH:mm:ss"}}</div>
+            <div class="o_text_purple600">{{notification.date | date:"dd/MM"}}</div>
+            <div class="o_text_purple600">{{notification.date | date:"HH:mm:ss"}}</div>
         </div>
       </a>
-    </div>
   </ion-content>
 </ion-view>

www/templates/offerCar.html

@@ -1,42 +1,33 @@
 <ion-view view-title="Offer Car">
-  <ion-content>
-      <div class="list">
-          <label class="item item-input">
-              <span class="input-label">{{'Title' | translate}}</span>
-              <input ng-model="newtravel.title" class="positive" type="text" placeholder="">
-          </label>
+  <ion-content class="has-footer">
+      <div class="padding">
+          <md-input-container class="md-block" flex-gt-sm>
+            <label>{{'Title' | translate}}</label>
+            <input ng-model="newtravel.title">
+          </md-input-container>
+          <div layout="row">
+              <md-input-container>
+                <label>{{'From' | translate}}</label>
+                <input ng-model="newtravel.from">
+              </md-input-container>
+              <md-input-container>
+                <label>{{'To' | translate}}</label>
+                <input ng-model="newtravel.to">
+              </md-input-container>
+          </div>
+          <md-input-container class="md-block" flex-gt-sm>
+            <label>{{'n_Seats' | translate}}</label>
+            <input ng-model="newtravel.seats" type="number">
+          </md-input-container>
 
-          <label class="item item-input">
-              <img class='o-imgMenu' src="img/localization.png" />
-              <span class="input-label">{{'From' | translate}}</span>
-              <input ng-model="newtravel.from" type="text" placeholder="">
-          </label>
-          <label class="item item-input">
-              <img class='o-imgMenu' src="img/localization.png" />
-              <span class="input-label">{{'To' | translate}}</span>
-              <input ng-model="newtravel.to" type="text" placeholder="">
-          </label>
-
-          <label class="item item-input">
-              <span class="input-label">{{'n_Seats' | translate}}</span>
-              <input ng-model="newtravel.seats" type="number" placeholder="">
-          </label>
-          <label class="item item-input">
+          <label class="item-input">
               <span class="input-label">{{'Date' | translate}}</span>
               <input ng-model="newtravel.date" type="date" placeholder="">
           </label>
-          <label class="item item-input">
+          <label class="item-input">
               <span class="input-label">{{'Hour' | translate}}</span>
               <input ng-model="newtravel.date" type="time" placeholder="">
           </label>
-          <!--<label class="item item-input">
-              <span class="input-label"><i class="icon ion-iphone"></i> {{'Phone_contact' | translate}}</span>
-              <input ng-model="newtravel.phone" type="number" placeholder="">
-          </label>
-          <label class="item item-input">
-              <span class="input-label">{{'Telegram_user' | translate}}</span>
-              <input ng-model="newtravel.telegram" type="text" placeholder="">
-          </label>-->
           <ion-toggle ng-model="newtravel.package" toggle-class="toggle-calm">
               <img class='o-imgMenu' src="img/package.png" />
               {{'Can_carry_package' | translate}}
@@ -44,11 +35,10 @@
           <ion-toggle ng-model="newtravel.collectivized" toggle-class="toggle-calm">
               {{'Collectivized_car' | translate}}
           </ion-toggle>
-
-          <label class="item item-input item-floating-label">
-              <span class="input-label">{{'Description' | translate}}</span>
-              <input ng-model="newtravel.description" type="text" placeholder="Description">
-          </label>
+          <md-input-container class="md-block" flex-gt-sm>
+            <label>{{'Description' | translate}}</label>
+            <input ng-model="newtravel.description">
+          </md-input-container>
           <p class="padding">
             <md-button ng-click="createTravel()" class="o_purple400 o_floatRight">
                {{'Create_travel' | translate}}

www/templates/search.html

@@ -0,0 +1,40 @@
+<ion-view view-title="{{'Search' | translate}}">
+  <ion-content class="has-footer">
+    <div class="list">
+        <div class="item item-input">
+            <i class="icon ion-search placeholder-icon"></i>
+            <input type="search" placeholder="{{'search' | translate}}..." ng-model="search.word">
+            <md-button class="o_purple300" ng-click="doSearch()"><i class="icon ion-search"></i></md-button>
+        </div>
+        <div class="item item-divider o_purple300" ng-show="travels[0]">
+            Travels
+        </div>
+        <a ng-repeat="travel in travels | orderBy: 'date'"
+        class="item item-avatar" href="#/app/travels/{{travel._id}}">
+          <img ng-src="img/{{travel.type}}.png"/>
+          <h2 class="o_text_purple600">{{travel.title}}</h2>
+          <div class="item-note text-right">
+              <div class="o_text_purple400">{{travel.date | date:"dd/MM"}}</div>
+              <div class="o_text_purple400">{{travel.date | date:"HH:mm"}}h</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>-->
+          <p class="">{{travel.from}} --> {{travel.to}}</p>
+        </a>
+        <div class="item item-divider o_purple300" ng-show="users[0]">
+            Users
+        </div>
+        <a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" ng-href="#/app/users/{{user._id}}">
+          <img ng-src="{{user.avatar}}">
+          <h2 class="o_text_purple600">{{user.username}}</h2>
+          <p>
+              {{user.description}}
+          </p>
+        </a>
+    </div>
+  </ion-content>
+</ion-view>

www/templates/settings.html

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

www/templates/travel.html

@@ -1,11 +1,11 @@
 <ion-view view-title="{{'Travel' | translate}}">
-  <ion-content>
+  <ion-content class="has-footer">
     <div class="item item-avatar">
       <img ng-src="img/{{travel.type}}.png" />
       <div class="item-note o-text-right">
         <p>
-            <md-button class="md-raised" ng-href="#/app/users/{{travel.user._id}}">
-                <img class="mdl-chip__contact" style="width: 30px;" ng-src="{{travel.user.avatar}}"></img>
+            <md-button ng-href="#/app/users/{{travel.user._id}}">
+                <img style="width: 30px;" ng-src="{{travel.user.avatar}}"></img>
                 {{travel.user.username}}
             </md-button>
         </p>
@@ -40,14 +40,14 @@
           </p>
           <p ng-show="travel.package">
             <div class="o-mini-text">
-              <div ng-show="travel.modality=='offering'">{{'Can_carry_package' | translate}} <img src="img/package.png" class="o-imgMenu" /></div>
-              <div ng-show="travel.modality=='asking'">{{'Need_to_carry_package' | translate}} <img src="img/package.png" class="o-imgMenu" /></div>
+              <div ng-show="travel.type=='offering'">{{'Can_carry_package' | translate}} <img src="img/package.png" class="o-imgMenu" /></div>
+              <div ng-show="travel.type=='asking'">{{'Need_to_carry_package' | translate}} <img src="img/package.png" class="o-imgMenu" /></div>
             </div>
           </p>
 
           <p>
-            <div ng-show="travel.modality=='offering'">{{'n_Seats' | translate}}: {{travel.seats}}</div>
-            <div ng-show="travel.modality=='asking'">{{'n_People' | translate}}: {{travel.seats}}</div>
+            <div ng-show="travel.type=='offering'">{{'n_Seats' | translate}}: {{travel.seats}}</div>
+            <div ng-show="travel.type=='asking'">{{'n_People' | translate}}: {{travel.seats}}</div>
           </p>
         </div>
       </div>
@@ -56,16 +56,16 @@
 
       <div ng-show="storageuser._id!=travel.user._id" class="text-right">
         <p class='text-right'>
-          <div ng-show="arrayObjectIndexOf(travel.joins, storageuser.username, 'joinPetitions')==-1">
-            <a ng-show="travel.modality=='offering'" ng-click="joinTravel()" class="button button-calm o-pull-right">{{'Ask_to_join' | translate}}</a>
-            <a ng-show="travel.modality=='asking'" ng-click="joinTravel()" class="button button-calm o-pull-right">{{'Offer_car' | translate}}</a>
-            <a ng-show="travel.modality=='package'" ng-click="joinTravel()" class="button button-calm o-pull-right">{{'Offer_car' | translate}}</a>
+          <div ng-show="userHasJoined(travel.joinPetitions, storageuser._id)==-1">
+            <md-button ng-show="travel.type=='offering'" ng-click="joinTravel()" class="o_purple300">{{'Ask_to_join' | translate}}</md-button>
+            <md-button ng-show="travel.type=='asking'" ng-click="joinTravel()" class="o_purple300">{{'Offer_car' | translate}}</md-button>
+            <md-button ng-show="travel.type=='package'" ng-click="joinTravel()" class="o_purple300">{{'Offer_car' | translate}}</md-button>
           </div>
 
-          <div ng-show="arrayObjectIndexOf(travel.joins, storageuser.username, 'joinPetitions')!=-1">
-            <a ng-show="travel.modality=='offering'" ng-click="unjoinTravel()" class="button button-assertive o-pull-right">{{'Unjoin' | translate}}</a>
-            <a ng-show="travel.modality=='asking'" ng-click="unjoinTravel()" class="button button-assertive o-pull-right">{{'Unoffer_car' | translate}}</a>
-            <a ng-show="travel.modality=='package'" ng-click="unjoinTravel()" class="button button-assertive o-pull-right">{{'Unoffer_car' | translate}}</a>
+          <div ng-show="userHasJoined(travel.joinPetitions, storageuser._id)>-1">
+            <md-button ng-show="travel.type=='offering'" ng-click="unjoinTravel()" class="o_purple100">{{'Unjoin' | translate}}</md-button>
+            <md-button ng-show="travel.type=='asking'" ng-click="unjoinTravel()" class="o_purple100">{{'Unoffer_car' | translate}}</md-button>
+            <md-button ng-show="travel.type=='package'" ng-click="unjoinTravel()" class="o_purple100">{{'Unoffer_car' | translate}}</md-button>
           </div>
         </p>
       </div>

www/templates/travels.html

@@ -1,19 +1,14 @@
 <ion-view view-title="{{'Travels' | translate}}">
-  <ion-content>
+  <ion-content class="has-footer">
       <ion-refresher
         pulling-text="{{'Pull_to_refresh' | translate}}..."
         on-refresh="doRefresh()">
       </ion-refresher>
     <div class="list">
         <div>
-            <div class="o-float-right" ng-show="storageusername">
-                <a ng-click="showNewAskingPackage()" class="button"><img ng-src="img/newpackage.png" class="o-img-new"/></a>
-                <a ng-click="showNewAskingTravel()" class="button"><img ng-src="img/newasking.png" class="o-img-new"/></a>
-                <a ng-click="showNewOfferingTravel()" class="button"><img ng-src="img/newoffering.png" class="o-img-new"/></a>
-            </div>
             <label class="item item-input">
                 <i class="icon ion-search placeholder-icon"></i>
-                <input type="search" placeholder="{{'search' | translate}}..." ng-model="search">
+                <input type="search" placeholder="{{'filter' | translate}}..." ng-model="search">
             </label>
         </div>
 

www/templates/user.html

@@ -1,26 +1,28 @@
 <ion-view view-title="{{'User' | translate}} {{user.username}}">
-  <ion-content>
+  <ion-content class="has-footer">
     <div class="o_userProfileBackground">
         <img ng-src="{{user.avatar}}" class="o_userImgCircular" />
-        <h3>{{user.username}}</h3>
+        <h3 class="o_text_white">{{user.username}}</h3>
         <p>{{user.description}}</p>
         <p>{{user.email}}</p>
     </div>
     <div class="">
-
-
-        <p ng-show="user.telegram">
-          <!--<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="row">
+          <a class="tab-item" ng-show="user.telegram">
+              <i class="icon ion-paper-airplane"></i>
+              @{{user.telegram}}
+          </a>
+          <a class="tab-item">
+              <i class="icon ion-android-car"></i>
+              {{user.travels.length}} Travels
+          </a>
+          <a class="tab-item">
+              <i class="icon ion-ios-heart"></i>
+              {{user.favs.length}} favs
+          </a>
+        </div>
 
         <div class="o-text-right">
-          <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" />

www/templates/users.html

@@ -1,5 +1,5 @@
 <ion-view view-title="{{'Users' | translate}}">
-  <ion-content>
+  <ion-content class="has-footer">
       <ion-refresher
         pulling-text="Pull to refresh..."
         on-refresh="doRefresh()">