mirror of
https://github.com/arnaucube/commonroutesApp.git
synced 2026-02-07 03:26:44 +01:00
commit
This commit is contained in:
arnaucode
@@ -1,7 +1,7 @@
|
||||
<ion-view view-title="{{'Help' | translate}}">
|
||||
<ion-content class="padding">
|
||||
<p>
|
||||
(help instructions here)
|
||||
(not ready yet)
|
||||
</p>
|
||||
<p>
|
||||
This is a car sharing App.
|
||||
@@ -11,30 +11,51 @@
|
||||
<br>
|
||||
There are <b>3 types of publication</b>:
|
||||
</p>
|
||||
<md-tabs md-dynamic-height md-border-bottom>
|
||||
<md-tab label="Offer">
|
||||
<md-content class="md-padding">
|
||||
<div class="card">
|
||||
<div class="item item-divider o_purple500">
|
||||
<i class="icon ion-android-car"></i> Travel offer
|
||||
</div>
|
||||
<div class="item item-text-wrap">
|
||||
For example: I'm going with my car to a place, in my car can go more people.
|
||||
</div>
|
||||
</div>
|
||||
</md-content>
|
||||
</md-tab>
|
||||
<md-tab label="Ask">
|
||||
<md-content class="md-padding">
|
||||
<div class="card">
|
||||
<div class="item item-divider o_purple400">
|
||||
<i class="icon ion-help"></i> Travel ask
|
||||
</div>
|
||||
<div class="item item-text-wrap">
|
||||
For example: I need to travel a place, can somebody take me there?
|
||||
</div>
|
||||
</div>
|
||||
</md-content>
|
||||
</md-tab>
|
||||
<md-tab label="Package">
|
||||
<md-content class="md-padding">
|
||||
<div class="card">
|
||||
<div class="item item-divider o_purple300">
|
||||
<i class="icon ion-ios-box"></i> Package send ask
|
||||
</div>
|
||||
<div class="item item-text-wrap">
|
||||
For example: I need to send some package to a place, can somebody carry it to there?
|
||||
</div>
|
||||
</div>
|
||||
</md-content>
|
||||
</md-tab>
|
||||
</md-tabs>
|
||||
|
||||
|
||||
|
||||
<p>
|
||||
<ul class="list">
|
||||
<li class="item">
|
||||
<h4>Travel offer</h4>
|
||||
<img ng-src="img/offering.png" class="o-img-new"/>
|
||||
For example: I'm going with my car to a place, in my car can go more people.
|
||||
</li>
|
||||
<li class="item">
|
||||
<h4>Travel ask</h4>
|
||||
<img ng-src="img/package.png" class="o-img-new"/>
|
||||
For example: I need to travel a place, can somebody take me there?
|
||||
</li>
|
||||
<li class="item">
|
||||
<h4>Package send ask</h4>
|
||||
<img ng-src="img/asking.png" class="o-img-new"/>
|
||||
For example: I need to send some package to a place, can somebody carry it to there?
|
||||
</li>
|
||||
</ul>
|
||||
</p>
|
||||
<p>
|
||||
To <b>create a new publication</b>, just need to go in to 'Travels' section in the main menu, and select one of the 3 top buttons:
|
||||
<img ng-src="img/newpackage.png" class="o-img-new"/>
|
||||
<img ng-src="img/newasking.png" class="o-img-new"/>
|
||||
<img ng-src="img/newoffering.png" class="o-img-new"/>
|
||||
To <b>create a new publication</b>, just need to click the 'New Travel' button on the right of footer menu,
|
||||
and select wich type of publication is.
|
||||
|
||||
</p>
|
||||
<br><br>
|
||||
<p>(not finished yet)...</p>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<a href="#/app/notifications" class="item item-icon-left o_purpleG300to500">
|
||||
<i class="icon ion-android-notifications"></i>
|
||||
{{'Notifications' | translate }}
|
||||
<span class="badge o_purple300">{{storageuser.notifications.length}}</span>
|
||||
</a>
|
||||
<a href="#/app/settings" class="item item-icon-left o_purpleG300to500">
|
||||
<i class="icon ion-settings"></i>
|
||||
|
||||
@@ -49,8 +49,8 @@
|
||||
</a>
|
||||
<a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/notifications">
|
||||
<i class="icon ion-android-notifications-none"></i>
|
||||
<span class="mdl-badge" data-badge="4">{{'Notifications' | translate }}</span>
|
||||
<span class="badge badge-positive">{{userdata.notifications.length}}</span>
|
||||
{{'Notifications' | translate }}
|
||||
<span class="badge o_purple300">{{storageuser.notifications.length}}</span>
|
||||
</a>
|
||||
<a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/settings">
|
||||
<i class="icon ion-settings"></i> {{'Settings' | translate }}
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
<ion-view view-title="{{'Travel' | translate}}">
|
||||
<ion-content class="has-footer">
|
||||
<div class="item item-icon-left">
|
||||
<div class="item-note o-text-right">
|
||||
<div class="item-note">
|
||||
<p>
|
||||
<md-button ng-href="#/app/users/{{travel.user._id}}">
|
||||
<img class="o_userImgCircularMini" ng-src="{{travel.user.avatar}}"></img>
|
||||
{{travel.user.username}}
|
||||
</md-button>
|
||||
</p>
|
||||
<p ng-show="storageuser._id==travel.user._id" class="text-right">
|
||||
<a ng-click="deleteTravel()" class="button button-small o_bRed"><i class="icon ion-trash-a"></i></a>
|
||||
<p class="text-right">
|
||||
<a ng-click="deleteTravel()" class="button button-small o_bRed"
|
||||
ng-show="storageuser._id==travel.user._id">
|
||||
<i class="icon ion-trash-a"></i>
|
||||
</a>
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
<h2>
|
||||
@@ -19,6 +22,7 @@
|
||||
|
||||
<leaflet width="100%" height="40%" markers="markers" center="center"
|
||||
tiles="tiles" id="map-simple-map"></leaflet>
|
||||
|
||||
<div ng-show="storageuser._id!=travel.user._id" class="text-right">
|
||||
<p class='text-right'>
|
||||
<div ng-show="userHasJoined(travel.joinPetitions, storageuser._id)==-1">
|
||||
@@ -35,8 +39,12 @@
|
||||
</p>
|
||||
</div>
|
||||
<div class="item item-icon-left">
|
||||
<i class="icon ion-ios-location"></i>{{travel.from.name}} --> {{travel.to.name}}
|
||||
<i class="icon ion-ios-location-outline"></i>From: {{travel.from.name}}
|
||||
</div>
|
||||
<div class="item item-icon-left">
|
||||
<i class="icon ion-ios-location"></i>To: {{travel.to.name}}
|
||||
</div>
|
||||
|
||||
<div class="item item-icon-left">
|
||||
<i class="icon ion-clipboard"></i> {{travel.description}}
|
||||
</div>
|
||||
@@ -44,28 +52,50 @@
|
||||
<i class="icon ion-ios-box"></i> package
|
||||
</div>
|
||||
<div class="item item-icon-left" ng-show="travel.user.telegram">
|
||||
<i class="icon ion-paper-airplane"></i> @{{user.telegram}}
|
||||
<i class="icon ion-paper-airplane"></i> @{{travel.user.telegram}}
|
||||
</div>
|
||||
<div class="item item-icon-left" ng-show="travel.user.phone">
|
||||
<i class="icon ion-ios-telephone"></i> {{travel.user.phone}}
|
||||
</div>
|
||||
<div class="item item-icon-left">
|
||||
<i class="icon ion-ios-people"></i> {{travel.seats}} seats
|
||||
</div>
|
||||
|
||||
<div class="item item-body">
|
||||
<div class="item item-body" ng-show="travel.collectivized">
|
||||
<div class='row'>
|
||||
<div class='col o-text-right'>
|
||||
<p ng-show="travel.collectivized">
|
||||
<p>
|
||||
<span class="o-badgeCollectivized">{{'Collectivized' | translate}}</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="item item-icon-left">
|
||||
<i class="icon ion-ios-people"></i>
|
||||
<p>0/{{travel.seats}} seats</p>
|
||||
<a ng-repeat="join in travel.joins" ng-href="#/app/users/{{join._id}}">
|
||||
<img class="o_userImgCircularMini" ng-src="{{join.avatar}}"></img>
|
||||
</a>
|
||||
</div>
|
||||
<div class="">
|
||||
<p>Pendent petitions</p>
|
||||
<div class="row" ng-repeat="joinPetition in travel.joinPetitions">
|
||||
<div class="col col-90">
|
||||
<a class="item item-avatar" ng-href="#/app/users/{{joinPetition._id}}">
|
||||
<img class="o_userImgCircularMini" ng-src="{{joinPetition.avatar}}"></img>
|
||||
<h2>{{joinPetition.username}}</h2>
|
||||
</a>
|
||||
</div>
|
||||
<div class="col">
|
||||
<button class="button button-small o_grey600">
|
||||
<i class="icon ion-close"></i>
|
||||
</button><br>
|
||||
<button class="button button-small o_purple400">
|
||||
<i class="icon ion-checkmark"></i>
|
||||
</button><br>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item item-body" ng-show="travel.joins[0]">
|
||||
{{'Joined_users' | translate}}:<br>
|
||||
<a ng-repeat="join in travel.joins" ng-href="#/app/users/{{join.joinedUsername}}" class="button button-small button-dark">
|
||||
|
||||
@@ -19,20 +19,15 @@
|
||||
</div>
|
||||
</div>
|
||||
<a ng-repeat="travel in travels | orderBy: 'date' | filter: search"
|
||||
class="item item-avatar" href="#/app/travels/{{travel._id}}">
|
||||
<img ng-src="img/{{travel.type}}.png"/>
|
||||
<h2 class="o_text_purple600">{{travel.title}}</h2>
|
||||
class="item item-icon-left" href="#/app/travels/{{travel._id}}">
|
||||
<i class="icon ion-android-car o_text_grey700"></i>
|
||||
<h2 class="o_text_grey800">{{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 class="o_text_purple300">{{travel.date | date:"dd/MM"}}</div>
|
||||
<div class="o_text_purple300">{{travel.date | date:"HH:mm"}}h</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.name}} --> {{travel.to.name}}</p>
|
||||
<p>{{travel.from.name}}</p>
|
||||
<p>{{travel.to.name}}</p>
|
||||
</a>
|
||||
</div>
|
||||
</ion-content>
|
||||
|
||||
Reference in New Issue
Block a user