Browse Source

added accounts verification

master
arnaucode 7 years ago
parent
commit
fd2067bd2d
11 changed files with 30 additions and 12 deletions
  1. +4
    -0
      www/css/colors.css
  2. +2
    -2
      www/js/app.js
  3. +1
    -1
      www/js/translations.js
  4. +4
    -1
      www/templates/menu.html
  5. +4
    -1
      www/templates/password.html
  6. +4
    -4
      www/templates/signup.html
  7. +1
    -0
      www/templates/travel.html
  8. +1
    -0
      www/templates/travelListTemplate.html
  9. +4
    -1
      www/templates/user.html
  10. +1
    -1
      www/templates/userTravels.html
  11. +4
    -1
      www/templates/users.html

+ 4
- 0
www/css/colors.css

@ -224,6 +224,10 @@
} }
.ct_blue300{
color: #64B5F6;
}
/* cyan */ /* cyan */
.c_cyan50{ .c_cyan50{
background: #E0F7FA; background: #E0F7FA;

+ 2
- 2
www/js/app.js

@ -6,9 +6,9 @@
// 'starter.controllers' is found in controllers.js // '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://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', [ angular.module('starter', [
'ionic', 'ionic',

+ 1
- 1
www/js/translations.js

@ -82,7 +82,7 @@ var translations = {
"load_more": "load more", "load_more": "load more",
"view_likes": "view likes", "view_likes": "view likes",
"Edit_profile": "Edit profile", "Edit_profile": "Edit profile",
"Travels_publicated": "Travels publicated",
"Travels_published": "Travels published",
"Travels_joining": "Travels joining" "Travels_joining": "Travels joining"
}, },
"catalan": { "catalan": {

+ 4
- 1
www/templates/menu.html

@ -42,7 +42,10 @@
<ion-list> <ion-list>
<a class="item item-icon-left item-avatar o_bSidenav" menu-close ng-href="#/app/users/{{storageuser._id}}"> <a class="item item-icon-left item-avatar o_bSidenav" menu-close ng-href="#/app/users/{{storageuser._id}}">
<img src="{{storageuser.avatar}}" /> <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> <p>{{storageuser.description}}</p>
</a> </a>
<a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/main"> <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/main">

+ 4
- 1
www/templates/password.html

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

+ 4
- 4
www/templates/signup.html

@ -5,15 +5,15 @@
<ion-content> <ion-content>
<div class="list"> <div class="list">
<label class="item item-input"> <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"> <input type="text" ng-model="signupData.username">
</label> </label>
<label class="item item-input"> <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"> <input type="password" ng-model="signupData.password">
</label> </label>
<label class="item item-input"> <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"> <input type="text" ng-model="signupData.email">
</label> </label>
<label class="item item-input"> <label class="item item-input">
@ -25,7 +25,7 @@
<input type="text" ng-model="signupData.telegram"> <input type="text" ng-model="signupData.telegram">
</label> </label>
<label class="item item-input"> <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"> <input type="text" ng-model="signupData.description">
</label> </label>
<div> <div>

+ 1
- 0
www/templates/travel.html

@ -10,6 +10,7 @@
<a class="button" ng-href="#/app/users/{{travel.user._id}}"> <a class="button" ng-href="#/app/users/{{travel.user._id}}">
<img class="o_userImgCircularMini" ng-src="{{travel.user.avatar}}"></img> <img class="o_userImgCircularMini" ng-src="{{travel.user.avatar}}"></img>
{{travel.user.username}} {{travel.user.username}}
<i ng-show="travel.user.validated" class="ion-checkmark-circled ct_blue300"></i>
</a> </a>
<p class="text-right"> <p class="text-right">
<a ng-click="deleteTravel()" class="button button-small o_bRed" <a ng-click="deleteTravel()" class="button button-small o_bRed"

+ 1
- 0
www/templates/travelListTemplate.html

@ -1,5 +1,6 @@
<div class="item-note text-right"> <div class="item-note text-right">
{{travel.user.username}} {{travel.user.username}}
<i ng-show="travel.user.validated" class="ion-checkmark-circled ct_blue300"></i>
</div> </div>
<i ng-show="travel.type=='offering'" class="icon ion-android-car o_text_grey700"></i> <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> <i ng-show="travel.type=='asking'" class="icon ion-help o_text_grey700"></i>

+ 4
- 1
www/templates/user.html

@ -8,7 +8,10 @@
show image disabled, here the code prepared to enable show image: show image disabled, here the code prepared to enable show image:
<img ng-click="showImg()" ng-src="{{user.avatar}}" class="o_userImgCircular" /> <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.description}}</p>
<p>{{user.email}}</p> <p>{{user.email}}</p>

+ 1
- 1
www/templates/userTravels.html

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

+ 4
- 1
www/templates/users.html

@ -14,7 +14,10 @@
<a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" ng-href="#/app/users/{{user._id}}"> <a ng-repeat="user in users | orderBy: 'date'" class="item item-avatar" ng-href="#/app/users/{{user._id}}">
<img ng-src="{{user.avatar}}"> <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> <p>
{{user.description}} {{user.description}}
</p> </p>

Loading…
Cancel
Save