arnaucube/commonroutesApp
1
0
Fork 0
mirror of https://github.com/arnaucube/commonroutesApp.git synced 2026-02-07 03:26:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugs fixed

Browse Source
This commit is contained in:
arnaucode
2017-01-31 16:08:46 +01:00
parent 842ad87d70
commit d85a3e06a7
5 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/js/travel.js
View File

@@ -95,7 +95,7 @@ angular.module('app.travel', ['pascalprecht.translate', 'ui-leaflet'])
.then(function(data) { .then(function(data) {
console.log("data: "); console.log("data: ");
console.log(data); console.log(data);
if(data.success==false){ if(data.data.success==false){
$ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000}); $ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000});
}else{ }else{
$scope.travel=data.data; $scope.travel=data.data;
@@ -114,7 +114,7 @@ angular.module('app.travel', ['pascalprecht.translate', 'ui-leaflet'])
.then(function(data) { .then(function(data) {
console.log("data: "); console.log("data: ");
console.log(data); console.log(data);
if(data.success==false){ if(data.data.success==false){
$ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000}); $ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000});
}else{ }else{
$scope.travel=data.data; $scope.travel=data.data;
@@ -134,8 +134,8 @@ angular.module('app.travel', ['pascalprecht.translate', 'ui-leaflet'])
.then(function(data) { .then(function(data) {
console.log("data: "); console.log("data: ");
console.log(data); console.log(data);
if(data.success==false){ if(data.data.success==false){
$ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000}); $ionicLoading.show({template: 'Error on declining', noBackdrop: true, duration: 2000});
}else{ }else{
$scope.travel=data.data; $scope.travel=data.data;
console.log("success"); console.log("success");
@@ -155,8 +155,8 @@ angular.module('app.travel', ['pascalprecht.translate', 'ui-leaflet'])
.then(function(data) { .then(function(data) {
console.log("data: "); console.log("data: ");
console.log(data); console.log(data);
if(data.success==false){ if(data.data.success==false){
$ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000}); $ionicLoading.show({template: 'Error on accepting', noBackdrop: true, duration: 2000});
}else{ }else{
$scope.travel=data.data; $scope.travel=data.data;
console.log("success"); console.log("success");
@@ -176,7 +176,7 @@ angular.module('app.travel', ['pascalprecht.translate', 'ui-leaflet'])
.then(function(data) { .then(function(data) {
console.log("data: "); console.log("data: ");
console.log(data); console.log(data);
if(data.success==false){ if(data.data.success==false){
$ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000}); $ionicLoading.show({template: 'Error on unjoin', noBackdrop: true, duration: 2000});
}else{ }else{
$scope.travel=data.data; $scope.travel=data.data;

1
www/templates/login.html
View File

@@ -30,6 +30,7 @@
</p>--> </p>-->
<div class="bar bar-footer o_transparentBackground"> <div class="bar bar-footer o_transparentBackground">
<a class="button o_purple300 pull-right" ng-href="#/app/signup"> <a class="button o_purple300 pull-right" ng-href="#/app/signup">
<i class="icon ion-android-person-add"></i>
{{'SIGN UP' | translate}} {{'SIGN UP' | translate}}
</a> </a>
</div> </div>

19
www/templates/search.html
View File

@@ -10,20 +10,19 @@
Travels Travels
</div> </div>
<a ng-repeat="travel in travels | orderBy: 'date'" <a ng-repeat="travel in travels | orderBy: 'date'"
class="item item-avatar" href="#/app/travels/{{travel._id}}"> class="item item-icon-left" href="#/app/travels/{{travel._id}}">
<img ng-src="img/{{travel.type}}.png"/> <i class="icon ion-android-car o_text_grey700"></i>
<h2 class="o_text_purple600">{{travel.title}}</h2> <h2 class="o_text_grey800">{{travel.title}}</h2>
<div class="item-note text-right"> <div class="item-note text-right">
<div class="o_text_purple400">{{travel.date | date:"dd/MM"}}</div> <div class="o_text_purple300">{{travel.date | date:"dd/MM"}}</div>
<div class="o_text_purple400">{{travel.date | date:"HH:mm"}}h</div> <div class="o_text_purple300">{{travel.date | date:"HH:mm"}}h</div>
<!--<div class="badge badge-calm">{{travel.owner}}</div>-->
</div> </div>
<p> <p>
{{travel.description}} {{travel.from.name}}
</p>
<p>
{{travel.to.name}}
</p> </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> </a>
<div class="item item-divider o_purple300" ng-show="users[0]"> <div class="item item-divider o_purple300" ng-show="users[0]">
Users Users

16
www/templates/travel.html
View File

@@ -101,12 +101,12 @@
</a> </a>
</div> </div>
<div class="col" ng-show="travel.user._id==storageuser._id"> <div class="col" ng-show="travel.user._id==storageuser._id">
<button class="button button-small o_grey600" ng-click="declineJoin(joinPetition)"> <div class="button button-small o_grey600" ng-click="declineJoin(joinPetition)">
<i class="icon ion-close"></i> <i class="icon ion-close"></i>
</button><br> </div><br>
<button class="button button-small o_purple400" ng-click="acceptJoin(joinPetition)"> <div class="button button-small o_purple400" ng-click="acceptJoin(joinPetition)">
<i class="icon ion-checkmark"></i> <i class="icon ion-checkmark"></i>
</button><br> </div><br>
</div> </div>
</div> </div>
</div> </div>
@@ -133,12 +133,12 @@
<input ng-model="newComment.comment" type="text" placeholder="Comment"> <input ng-model="newComment.comment" type="text" placeholder="Comment">
</label> </label>
<button ng-click="closeNewComment()" class="button button-small button-assertive"> <div ng-click="closeNewComment()" class="button button-small button-assertive">
{{'Cancel' | translate}} {{'Cancel' | translate}}
</button> </div>
<button ng-click="doNewComment()" ng-show="newComment.comment" class="button button-small button-calm"> <div ng-click="doNewComment()" ng-show="newComment.comment" class="button button-small button-calm">
{{'Post_comment' | translate}} {{'Post_comment' | translate}}
</button> </div>
</form> </form>
</div> </div>
</ion-content> </ion-content>

8
www/templates/travels.html
View File

@@ -26,8 +26,12 @@
<div class="o_text_purple300">{{travel.date | date:"dd/MM"}}</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 class="o_text_purple300">{{travel.date | date:"HH:mm"}}h</div>
</div> </div>
<p>{{travel.from.name}}</p> <p>
<p>{{travel.to.name}}</p> {{travel.from.name}}
</p>
<p>
{{travel.to.name}}
</p>
</a> </a>
</div> </div>
</ion-content> </ion-content>