mirror of
https://github.com/arnaucube/commonroutesApp.git
synced 2026-02-07 03:26:44 +01:00
implemented infinite scroll on travels, user avatar show image, added username on travels list
This commit is contained in:
arnaucode
9
www/templates/imgView.html
Normal file
9
www/templates/imgView.html
Normal file
@@ -0,0 +1,9 @@
|
||||
<ion-view view-title="{{'Users' | translate}}">
|
||||
<ion-content>
|
||||
<ion-header-bar class="bar bar-header">
|
||||
<a class="button" ng-click="modal.hide()">Back</a>
|
||||
<h1 class="title">{{user.username}} profile image</h1>
|
||||
</ion-header-bar>
|
||||
<img ng-click="modal.hide()" ng-src="{{user.avatar}}" style="width:100%;" />
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
@@ -3,25 +3,23 @@
|
||||
<ion-refresher pulling-text="{{'Pull_to_refresh' | translate}}..." on-refresh="doRefresh()">
|
||||
</ion-refresher>
|
||||
<div ng-show="!notifications[0]" class="item">
|
||||
No notifications yet
|
||||
No notifications yet
|
||||
</div>
|
||||
<a ng-repeat="notification in notifications | orderBy: '-date'" ng-show="notification.state=='pendent'"
|
||||
class="item item-icon-left c_deepPurple100" href="#/app/{{notification.link}}">
|
||||
<i ng-show="notification.state=='pendent'" class="icon ion-android-notifications-none o_text_purple600"></i>
|
||||
<h2>{{notification.message}}</h2>
|
||||
<div class="item-note text-right">
|
||||
<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>
|
||||
<a ng-repeat="notification in notifications | orderBy: '-date'" ng-show="notification.state=='viewed'"
|
||||
class="item item-icon-left" href="#/app/{{notification.link}}">
|
||||
<i ng-show="notification.state=='viewed'" class="icon ion-android-notifications-none"></i>
|
||||
<h2>{{notification.message}}</h2>
|
||||
<div class="item-note text-right">
|
||||
<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>
|
||||
<a ng-repeat="notification in notifications | orderBy: '-date'" ng-show="notification.state=='pendent'" class="item item-icon-left item-text-wrap c_deepPurple100" href="#/app/{{notification.link}}">
|
||||
<div class="item-note text-right">
|
||||
<div class="o_text_purple600">{{notification.date | date:"dd/MM"}}</div>
|
||||
<div class="o_text_purple600">{{notification.date | date:"HH:mm:ss"}}</div>
|
||||
</div>
|
||||
<i ng-show="notification.state=='pendent'" class="icon ion-android-notifications-none o_text_purple600"></i>
|
||||
<h2>{{notification.message}}</h2>
|
||||
</a>
|
||||
<a ng-repeat="notification in notifications | orderBy: '-date'" ng-show="notification.state=='viewed'" class="item item-icon-left item-text-wrap" href="#/app/{{notification.link}}">
|
||||
<div class="item-note text-right">
|
||||
<div class="o_text_purple600">{{notification.date | date:"dd/MM"}}</div>
|
||||
<div class="o_text_purple600">{{notification.date | date:"HH:mm:ss"}}</div>
|
||||
</div>
|
||||
<i ng-show="notification.state=='viewed'" class="icon ion-android-notifications-none"></i>
|
||||
<h2>{{notification.message}}</h2>
|
||||
</a>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
||||
@@ -51,22 +51,23 @@
|
||||
<p class='text-right'>
|
||||
<div ng-show="userHasJoined(travel.joinPetitions, storageuser._id)==-1">
|
||||
<div ng-show="userHasJoined(travel.joins, storageuser._id)==-1">
|
||||
<a ng-show="travel.type=='offering'" ng-click="joinTravel()" class="button o_purple300">{{'Ask_to_join' | translate}}</a>
|
||||
<a ng-show="travel.type=='asking'" ng-click="joinTravel()" class="button o_purple300">{{'Offer_car' | translate}}</a>
|
||||
<a ng-show="travel.type=='package'" ng-click="joinTravel()" class="button o_purple300">{{'Offer_car' | translate}}</a>
|
||||
<a ng-show="travel.type=='offering'" ng-click="joinTravel()" class="button button-small o_purple300">{{'Ask_to_join' | translate}}</a>
|
||||
<a ng-show="travel.type=='asking'" ng-click="joinTravel()" class="button button-small o_purple300">{{'Offer_car' | translate}}</a>
|
||||
<a ng-show="travel.type=='package'" ng-click="joinTravel()" class="button button-small o_purple300">{{'Offer_car' | translate}}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-show="userHasJoined(travel.joinPetitions, storageuser._id)>-1">
|
||||
<a ng-show="travel.type=='offering'" ng-click="unjoinTravel()" class="button o_purple100">{{'Unjoin' | translate}}</a>
|
||||
<a ng-show="travel.type=='asking'" ng-click="unjoinTravel()" class="button o_purple100">{{'Unoffer_car' | translate}}</a>
|
||||
<a ng-show="travel.type=='package'" ng-click="unjoinTravel()" class="button o_purple100">{{'Unoffer_car' | translate}}</a>
|
||||
<a ng-show="travel.type=='offering'" ng-click="unjoinTravel()" class="button button-small o_purple100">{{'Unjoin' | translate}}</a>
|
||||
<a ng-show="travel.type=='asking'" ng-click="unjoinTravel()" class="button button-small o_purple100">{{'Unoffer_car' | translate}}</a>
|
||||
<a ng-show="travel.type=='package'" ng-click="unjoinTravel()" class="button button-small o_purple100">{{'Unoffer_car' | translate}}</a>
|
||||
</div>
|
||||
|
||||
<div ng-show="userHasJoined(travel.joins, storageuser._id)>-1">
|
||||
<a ng-show="travel.type=='offering'" ng-click="leaveTravel()" class="button o_bRed">{{'Leave' | translate}}</a>
|
||||
<a ng-show="travel.type=='asking'" ng-click="" class="button o_purple100">{{'Leave' | translate}}</a>
|
||||
<a ng-show="travel.type=='package'" ng-click="" class="button o_purple100">{{'Leave' | translate}}</a>
|
||||
You have been accepted!
|
||||
<a ng-show="travel.type=='offering'" ng-click="leaveTravel()" class="button button-small o_bRed">{{'Leave' | translate}}</a>
|
||||
<a ng-show="travel.type=='asking'" ng-click="" class="button button-small o_purple100">{{'Leave' | translate}}</a>
|
||||
<a ng-show="travel.type=='package'" ng-click="" class="button button-small o_purple100">{{'Leave' | translate}}</a>
|
||||
</div>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -20,6 +20,9 @@
|
||||
</div>
|
||||
<a ng-repeat="travel in travels | orderBy: 'date' | filter: search"
|
||||
class="item item-icon-left" href="#/app/travels/{{travel._id}}">
|
||||
<div class="item-note text-right">
|
||||
{{travel.user.username}}
|
||||
</div>
|
||||
<i class="icon ion-android-car o_text_grey700"></i>
|
||||
<h2 class="o_text_grey800">{{travel.title}}</h2>
|
||||
<div class="item-note text-right">
|
||||
@@ -34,8 +37,13 @@
|
||||
</p>
|
||||
</a>
|
||||
</div>
|
||||
<div class="button" ng-click="paginationNext()">
|
||||
<!--<div class="button" ng-click="paginationNext()">
|
||||
{{'load_more' | translate}}
|
||||
</div>
|
||||
</div>-->
|
||||
<ion-infinite-scroll
|
||||
ng-if="loadMorePagination"
|
||||
on-infinite="paginationNext()"
|
||||
distance="1%">
|
||||
</ion-infinite-scroll>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
||||
@@ -1,49 +1,50 @@
|
||||
<ion-view view-title="{{'User' | translate}} {{user.username}}">
|
||||
<ion-content class="has-footer">
|
||||
<ion-refresher
|
||||
pulling-text="{{'Pull_to_refresh' | translate}}..."
|
||||
on-refresh="doRefresh()">
|
||||
</ion-refresher>
|
||||
<ion-content>
|
||||
<ion-refresher pulling-text="{{'Pull_to_refresh' | translate}}..." on-refresh="doRefresh()">
|
||||
</ion-refresher>
|
||||
<div class="o_userProfileBackground">
|
||||
<img ng-src="{{user.avatar}}" class="o_userImgCircular" />
|
||||
<h3 class="o_text_white">{{user.username}}</h3>
|
||||
<p>{{user.description}}</p>
|
||||
<p>{{user.email}}</p>
|
||||
<img ng-click="showImg()" ng-src="{{user.avatar}}" class="o_userImgCircular" />
|
||||
<!--
|
||||
show image disabled, here the code prepared to enable show image:
|
||||
<img ng-click="showImg()" ng-src="{{user.avatar}}" class="o_userImgCircular" />
|
||||
-->
|
||||
<h3 class="o_text_white">{{user.username}}</h3>
|
||||
<p>{{user.description}}</p>
|
||||
<p>{{user.email}}</p>
|
||||
|
||||
<p><a class="button button-small" ng-href="#/app/users/userLikes/{{user._id}}">
|
||||
<p><a class="button button-small" ng-href="#/app/users/userLikes/{{user._id}}">
|
||||
{{'view_likes' | translate}}
|
||||
</a></p>
|
||||
<p ng-show="storageuser._id==user._id">
|
||||
<a class="button button-small o_grey500" ng-href="#/app/editUser">{{'Edit_profile' | translate}}</a>
|
||||
</p>
|
||||
<p ng-show="storageuser._id==user._id">
|
||||
<a class="button button-small o_grey500" ng-href="#/app/editUser">{{'Edit_profile' | translate}}</a>
|
||||
</p>
|
||||
</div>
|
||||
<div class="">
|
||||
<div class="row">
|
||||
<a class="tab-item" ng-show="user.telegram"
|
||||
ng-href="http://telegram.me/{{user.telegram}}">
|
||||
<div class="row">
|
||||
<a class="tab-item" ng-show="user.telegram" ng-href="http://telegram.me/{{user.telegram}}">
|
||||
<i class="icon ion-paper-airplane"></i>
|
||||
@{{user.telegram}}
|
||||
</a>
|
||||
<a class="tab-item" ng-href="#/app/users/userTravels/{{user._id}}">
|
||||
<a class="tab-item" ng-href="#/app/users/userTravels/{{user._id}}">
|
||||
<i class="icon ion-android-car"></i>
|
||||
{{user.travels.length}} {{'Travels' | translate}}
|
||||
</a>
|
||||
<a class="tab-item" ng-show="arrayObjectIndexOf(user.likes, storageuser._id)==-1">
|
||||
<a class="tab-item" ng-show="arrayObjectIndexOf(user.likes, storageuser._id)==-1">
|
||||
<i class="icon ion-heart" ng-click="likeUser()"></i>
|
||||
<i ng-href="#/app/users/userLikes/{{user._id}}">
|
||||
{{user.likes.length}} {{'likes' | translate}}
|
||||
</i>
|
||||
</a>
|
||||
<a class="tab-item" ng-show="arrayObjectIndexOf(user.likes, storageuser._id)>-1">
|
||||
<a class="tab-item" ng-show="arrayObjectIndexOf(user.likes, storageuser._id)>-1">
|
||||
<i class="icon ion-heart ctext_red600" ng-click="unlikeUser()"></i>
|
||||
<i ng-href="#/app/users/userLikes/{{user._id}}">
|
||||
{{user.likes.length}} {{'likes' | translate}}
|
||||
</i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item">
|
||||
<img src="{{user.faircoin}}" style="width: 100%;" />
|
||||
<img src="{{user.faircoin}}" style="width: 100%;" />
|
||||
</div>
|
||||
<!--<div class="item item-body">
|
||||
{{'current_publications_of' | translate}} {{user.username}}:
|
||||
|
||||
Reference in New Issue
Block a user