Browse Source

open telegram link to user, resizing faircoin qr address to 300x300pixels, changed travel icon, copy faircoin address string

master
arnaucode 6 years ago
parent
commit
40111e6993
11 changed files with 41 additions and 13 deletions
  1. +1
    -0
      config.xml
  2. +5
    -0
      package-lock.json
  3. +3
    -1
      package.json
  4. +12
    -0
      version.md
  5. +2
    -2
      www/js/editUser.js
  6. +5
    -0
      www/js/user.js
  7. +5
    -4
      www/templates/editUser.html
  8. +1
    -1
      www/templates/main.html
  9. +1
    -1
      www/templates/menu.html
  10. +1
    -0
      www/templates/travelListTemplate.html
  11. +5
    -4
      www/templates/user.html

+ 1
- 0
config.xml

@ -48,5 +48,6 @@
<icon src="resources/android/icon/drawable-xhdpi-icon.png" /> <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
<preference name="SplashShowOnlyFirstTime" value="false" /> <preference name="SplashShowOnlyFirstTime" value="false" />
<plugin name="cordova-plugin-camera" spec="^4.0.2" /> <plugin name="cordova-plugin-camera" spec="^4.0.2" />
<plugin name="cordova-plugin-inappbrowser" spec="^2.0.2" />
<engine name="android" spec="7.0.0" /> <engine name="android" spec="7.0.0" />
</widget> </widget>

+ 5
- 0
package-lock.json

@ -750,6 +750,11 @@
"resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-1.1.7.tgz", "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-1.1.7.tgz",
"integrity": "sha1-/JQRG+aTJijGaGiTjd89yCyfv+Y=" "integrity": "sha1-/JQRG+aTJijGaGiTjd89yCyfv+Y="
}, },
"cordova-plugin-inappbrowser": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-2.0.2.tgz",
"integrity": "sha1-pEj8vpdMprQpiL00VRCdkj1sl2k="
},
"cordova-plugin-splashscreen": { "cordova-plugin-splashscreen": {
"version": "4.0.3", "version": "4.0.3",
"resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-4.0.3.tgz", "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-4.0.3.tgz",

+ 3
- 1
package.json

@ -7,6 +7,7 @@
"cordova-plugin-camera": "^4.0.2", "cordova-plugin-camera": "^4.0.2",
"cordova-plugin-console": "^1.0.7", "cordova-plugin-console": "^1.0.7",
"cordova-plugin-device": "^1.1.7", "cordova-plugin-device": "^1.1.7",
"cordova-plugin-inappbrowser": "^2.0.2",
"cordova-plugin-splashscreen": "^4.0.3", "cordova-plugin-splashscreen": "^4.0.3",
"cordova-plugin-whitelist": "^1.3.3", "cordova-plugin-whitelist": "^1.3.3",
"gulp": "^3.5.6", "gulp": "^3.5.6",
@ -37,7 +38,8 @@
"cordova-plugin-splashscreen": {}, "cordova-plugin-splashscreen": {},
"cordova-plugin-console": {}, "cordova-plugin-console": {},
"ionic-plugin-keyboard": {}, "ionic-plugin-keyboard": {},
"cordova-plugin-camera": {}
"cordova-plugin-camera": {},
"cordova-plugin-inappbrowser": {}
}, },
"platforms": [ "platforms": [
"android" "android"

+ 12
- 0
version.md

@ -0,0 +1,12 @@
### commonroutes-prealpha02
18 Feb 2018 update
- resizing faircoin qr address to 300x300 pixels
- open telegram link to user
- changed travel icon
- made more easy to copy the faircoin address
### commonroutes-prealpha01
14 Feb 2018
- first prealpha version

+ 2
- 2
www/js/editUser.js

@ -41,8 +41,8 @@ angular.module('app.editUser', ['pascalprecht.translate'])
sourceType: Camera.PictureSourceType.PHOTOLIBRARY, sourceType: Camera.PictureSourceType.PHOTOLIBRARY,
allowEdit: true, allowEdit: true,
encodingType: Camera.EncodingType.JPEG, encodingType: Camera.EncodingType.JPEG,
targetWidth: 100,
targetHeight: 100,
targetWidth: 300,
targetHeight: 300,
popoverOptions: CameraPopoverOptions, popoverOptions: CameraPopoverOptions,
saveToPhotoAlbum: false, saveToPhotoAlbum: false,
correctOrientation:true correctOrientation:true

+ 5
- 0
www/js/user.js

@ -187,4 +187,9 @@ angular.module('app.user', ['pascalprecht.translate'])
console.log("show image"); console.log("show image");
$scope.openModal(); $scope.openModal();
}; };
$scope.openTelegram = function(telegramuser) {
window.open('http://telegram.me/' + telegramuser, '_system', 'location=yes');
return false;
};
}); });

+ 5
- 4
www/templates/editUser.html

@ -28,10 +28,11 @@
</p> </p>
</div> </div>
<div class="item"> <div class="item">
<p>
<input ng-model="user.faircoinString" class="o_transparentInputBlack"
placeholder="{{'FaircoinWallet' | translate}}">
</p>
FairCoin Address:
<p>
<input ng-model="user.faircoinString" class="o_transparentInputBlack"
placeholder="{{'FaircoinWallet' | translate}}">
</p>
<img src="{{user.faircoin}}" style="width: 100%;" <img src="{{user.faircoin}}" style="width: 100%;"
ng-click="selectFaircoinPublicKey()" /> ng-click="selectFaircoinPublicKey()" />
</div> </div>

+ 1
- 1
www/templates/main.html

@ -18,7 +18,7 @@
{{'Search' | translate }} {{'Search' | translate }}
</a> </a>
<a ng-href="#/app/travels" class="item item-icon-left o_purpleG300to500"> <a ng-href="#/app/travels" class="item item-icon-left o_purpleG300to500">
<i class="icon ion-android-car"></i>
<i class="icon ion-android-pin"></i>
{{'Travels_feed' | translate }} {{'Travels_feed' | translate }}
</a> </a>
<a href="#/app/users" class="item item-icon-left o_purpleG300to500"> <a href="#/app/users" class="item item-icon-left o_purpleG300to500">

+ 1
- 1
www/templates/menu.html

@ -55,7 +55,7 @@
<i class="icon ion-search"></i> {{'Search' | translate }} <i class="icon ion-search"></i> {{'Search' | translate }}
</a> </a>
<a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/travels"> <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/travels">
<i class="icon ion-android-car"></i> {{'Travels_feed' | translate }}
<i class="icon ion-android-pin"></i> {{'Travels_feed' | translate }}
</a> </a>
<a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/users"> <a class="item item-icon-left o_bSidenav" menu-close ng-href="#/app/users">
<i class="icon ion-person-stalker"></i> {{'Users' | translate }} <i class="icon ion-person-stalker"></i> {{'Users' | translate }}

+ 1
- 0
www/templates/travelListTemplate.html

@ -9,6 +9,7 @@
<div class="item-note text-right"> <div class="item-note text-right">
<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>{{travel.joins.length}}/{{travel.seats}} seats</div>
</div> </div>
<p> <p>
{{travel.from.name}} {{travel.from.name}}

+ 5
- 4
www/templates/user.html

@ -27,7 +27,7 @@
</div> </div>
<div class=""> <div class="">
<div class="row"> <div class="row">
<a class="tab-item" ng-show="user.telegram" ng-href="http://telegram.me/{{user.telegram}}">
<a class="tab-item" ng-show="user.telegram" ng-click="openTelegram(user.telegram)">
<i class="icon ion-paper-airplane"></i> <i class="icon ion-paper-airplane"></i>
@{{user.telegram}} @{{user.telegram}}
</a> </a>
@ -50,9 +50,10 @@
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<p>
{{user.faircoinString}}
</p>
FairCoin Address:
<textarea ng-model="user.faircoinString" rows="1" style="width: 100%;"
onclick="this.focus();this.select()" readonly="readonly"
></textarea>
<img src="{{user.faircoin}}" style="width: 100%;" /> <img src="{{user.faircoin}}" style="width: 100%;" />
</div> </div>
<!--<div class="item item-body"> <!--<div class="item item-body">

Loading…
Cancel
Save