arnaucube
arnaucube/commonroutesAppPublic Self-hosted repository
added accounts verification
arnaucode idoctnef@openmailbox.org
Fri, 01 Sep 2017 11:37:00 +0200
commit

fd2067bd2dea17dc5c6463f9553dff555549ec63

parent

1e26b86597284cff54fd59da8937e54b25e7cf52

M www/css/colors.css → www/css/colors.css

@@ -224,6 +224,10 @@ color: #ffffff;

} +.ct_blue300{ + color: #64B5F6; +} + /* cyan */ .c_cyan50{ background: #E0F7FA;
M www/js/app.js → www/js/app.js

@@ -6,9 +6,9 @@ // the 2nd parameter is an array of 'requires'

// 'starter.controllers' is found in controllers.js -var urlapi = "http://localhost:3000/api/"; +//var urlapi = "http://localhost:3000/api/"; //var urlapi = "http://192.168.1.36:3000/api/"; -//var urlapi = "http://51.255.193.106:3000/api/"; +var urlapi = "http://37.59.123.45:3000/api/"; angular.module('starter', [ 'ionic',
M www/js/translations.js → www/js/translations.js

@@ -82,7 +82,7 @@ "Pendent_petitions": "Pendent petitions",

"load_more": "load more", "view_likes": "view likes", "Edit_profile": "Edit profile", - "Travels_publicated": "Travels publicated", + "Travels_published": "Travels published", "Travels_joining": "Travels joining" }, "catalan": {
M www/templates/menu.html → www/templates/menu.html

@@ -42,7 +42,10 @@ <ion-content>

<ion-list> <a class="item item-icon-left item-avatar o_bSidenav" menu-close ng-href="#/app/users/{{storageuser._id}}"> <img src="{{storageuser.avatar}}" /> - <h2>{{storageuser.username}}</h2> + <h2> + {{storageuser.username}} + <i ng-show="storageuser.validated" class="ion-checkmark-circled ct_blue300"></i> + </h2> <p>{{storageuser.description}}</p> </a> <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/main">
M www/templates/password.html → www/templates/password.html

@@ -14,8 +14,11 @@ <span class="input-label">{{'New_Password' | translate}}</span>

<input ng-model="newPassword.new2" type="password" placeholder="{{'Repeat_New_Password' | translate}}" style="-webkit-text-security: disc;"> </label> </div> - <div ng-click="changePassword()" class="button button-block c_deepPurple200"> + <!--<div ng-click="changePassword()" class="button button-block c_deepPurple200"> {{'Change_password' | translate}} + </div>--> + <div class="button button-block c_deepPurple200"> + Feature not ready yet </div> </ion-content> </ion-view>
M www/templates/signup.html → www/templates/signup.html

@@ -5,15 +5,15 @@ </ion-header-bar>

<ion-content> <div class="list"> <label class="item item-input"> - <span class="input-label">{{'Username' | translate}}</span> + <span class="input-label">{{'Username' | translate}}*</span> <input type="text" ng-model="signupData.username"> </label> <label class="item item-input"> - <span class="input-label">{{'Password' | translate}}</span> + <span class="input-label">{{'Password' | translate}}*</span> <input type="password" ng-model="signupData.password"> </label> <label class="item item-input"> - <span class="input-label">{{'Email' | translate}}</span> + <span class="input-label">{{'Email' | translate}}*</span> <input type="text" ng-model="signupData.email"> </label> <label class="item item-input">

@@ -25,7 +25,7 @@ <span class="input-label">{{'Telegram' | translate}}</span>

<input type="text" ng-model="signupData.telegram"> </label> <label class="item item-input"> - <span class="input-label">{{'Description' | translate}}</span> + <span class="input-label">{{'Description' | translate}}*</span> <input type="text" ng-model="signupData.description"> </label> <div>
M www/templates/travel.html → www/templates/travel.html

@@ -10,6 +10,7 @@ <p>

<a class="button" ng-href="#/app/users/{{travel.user._id}}"> <img class="o_userImgCircularMini" ng-src="{{travel.user.avatar}}"></img> {{travel.user.username}} + <i ng-show="travel.user.validated" class="ion-checkmark-circled ct_blue300"></i> </a> <p class="text-right"> <a ng-click="deleteTravel()" class="button button-small o_bRed"
M www/templates/travelListTemplate.html → www/templates/travelListTemplate.html

@@ -1,5 +1,6 @@

<div class="item-note text-right"> {{travel.user.username}} + <i ng-show="travel.user.validated" class="ion-checkmark-circled ct_blue300"></i> </div> <i ng-show="travel.type=='offering'" class="icon ion-android-car o_text_grey700"></i> <i ng-show="travel.type=='asking'" class="icon ion-help o_text_grey700"></i>
M www/templates/user.html → www/templates/user.html

@@ -8,7 +8,10 @@ <!--

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> + <h3 class="o_text_white"> + {{user.username}} + <i ng-show="user.validated" class="ion-checkmark-circled ct_blue300"></i> + </h3> <p>{{user.description}}</p> <p>{{user.email}}</p>
M www/templates/userTravels.html → www/templates/userTravels.html

@@ -6,7 +6,7 @@ on-refresh="doRefresh()">

</ion-refresher> <div class="list"> <div class="item item-divider o_purple300" ng-show="travels[0]"> - {{'Travels_publicated' | translate}} + {{'Travels_published' | translate}} </div> <a ng-repeat="travel in travels | orderBy: 'date'" class="item item-icon-left" href="#/app/travels/{{travel._id}}">
M www/templates/users.html → www/templates/users.html

@@ -14,7 +14,10 @@ </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> + <h2 class="o_text_purple600"> + {{user.username}} + <i ng-show="user.validated" class="ion-checkmark-circled ct_blue300"></i> + </h2> <p> {{user.description}} </p>