Browse Source

prealpha01

master
arnaucode 6 years ago
parent
commit
9c3d3eff8d
40 changed files with 4380 additions and 62 deletions
  1. +8
    -0
      README.md
  2. +2
    -1
      bower.json
  3. +5
    -3
      comandesUtils.txt
  4. +47
    -44
      config.xml
  5. +3
    -1
      ionic.config.json
  6. +4268
    -0
      package-lock.json
  7. +24
    -4
      package.json
  8. BIN
      resources/android/icon/drawable-hdpi-icon.png
  9. BIN
      resources/android/icon/drawable-ldpi-icon.png
  10. BIN
      resources/android/icon/drawable-mdpi-icon.png
  11. BIN
      resources/android/icon/drawable-xhdpi-icon.png
  12. BIN
      resources/android/icon/drawable-xxhdpi-icon.png
  13. BIN
      resources/android/icon/drawable-xxxhdpi-icon.png
  14. BIN
      resources/android/splash/drawable-land-hdpi-screen.png
  15. BIN
      resources/android/splash/drawable-land-ldpi-screen.png
  16. BIN
      resources/android/splash/drawable-land-mdpi-screen.png
  17. BIN
      resources/android/splash/drawable-land-xhdpi-screen.png
  18. BIN
      resources/android/splash/drawable-land-xxhdpi-screen.png
  19. BIN
      resources/android/splash/drawable-land-xxxhdpi-screen.png
  20. BIN
      resources/android/splash/drawable-port-hdpi-screen.png
  21. BIN
      resources/android/splash/drawable-port-ldpi-screen.png
  22. BIN
      resources/android/splash/drawable-port-mdpi-screen.png
  23. BIN
      resources/android/splash/drawable-port-xhdpi-screen.png
  24. BIN
      resources/android/splash/drawable-port-xxhdpi-screen.png
  25. BIN
      resources/android/splash/drawable-port-xxxhdpi-screen.png
  26. BIN
      resources/icon.png
  27. +1
    -0
      resources/icon.png.md5
  28. BIN
      resources/icon.xcf
  29. BIN
      resources/splash.png
  30. +1
    -0
      resources/splash.png.md5
  31. BIN
      resources/splash.xcf
  32. BIN
      www/img/faircoop_logo.png
  33. +2
    -1
      www/js/app.js
  34. +5
    -5
      www/js/translations.js
  35. +1
    -1
      www/templates/askForPackage.html
  36. +4
    -0
      www/templates/editUser.html
  37. +1
    -1
      www/templates/newTravel.html
  38. +1
    -1
      www/templates/settings.html
  39. +4
    -0
      www/templates/signup.html
  40. +3
    -0
      www/templates/user.html

+ 8
- 0
README.md

@ -6,3 +6,11 @@
- admin web: https://github.com/arnaucode/commonroutesAdminWeb - admin web: https://github.com/arnaucode/commonroutesAdminWeb
![commonroutes](https://raw.githubusercontent.com/arnaucode/commonroutesApp/master/commonroutes.png "commonroutes") ![commonroutes](https://raw.githubusercontent.com/arnaucode/commonroutesApp/master/commonroutes.png "commonroutes")
## Build
Add cordova camera plugin
```
cordova plugin add cordova-plugin-camera --save
```

+ 2
- 1
bower.json

@ -6,6 +6,7 @@
}, },
"dependencies": { "dependencies": {
"ui-leaflet": "^2.0.0", "ui-leaflet": "^2.0.0",
"ngCordova": "0.1.27-alpha"
"ngCordova": "0.1.27-alpha",
"angular-translate": "^2.17.0"
} }
} }

+ 5
- 3
comandesUtils.txt

@ -5,9 +5,9 @@ PATH=$PATH:$ANDROID_HOME/platform-tools
** cal estar amb sudo ** ** cal estar amb sudo **
#current path: #current path:
export ANDROID_HOME=home/nau/sourceProgramsToInstall/android-sdk-linux/
export PATH=$PATH:$ANDROID_HOME:/home/nau/sourceProgramsToInstall/android-sdk-linux/tools
export PATH=$PATH:$ANDROID_HOME/home/nau/sourceProgramsToInstall/android-sdk-linux/platform-tools
export ANDROID_HOME=/home/asus/Android/Sdk/
export PATH=$PATH:$ANDROID_HOME:/home/asus/Android/Sdk/tools
export PATH=$PATH:$ANDROID_HOME/home/asus/Android/Sdk/platform-tools
#run android sdk manager tools: #run android sdk manager tools:
@ -17,3 +17,5 @@ cd /home/nau/Android/Sdk/tools
ionic serve ionic serve
ionic build android ionic build android
ionic run android //obsolete
ionic cordova run android

+ 47
- 44
config.xml

@ -1,49 +1,52 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.ionicframework.app751563" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="com.ionicframework.app751563" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>CarsInCommon</name>
<description>
<name>CommonRoutes</name>
<description>
CarSharing app, for collective use. CarSharing app, for collective use.
</description> </description>
<author email="mail@mail.com" href="http://arnaucode.com/">
<author email="mail@mail.com" href="http://arnaucode.com/">
ArnauCode ArnauCode
</author> </author>
<content src="index.html"/>
<access origin="*"/>
<preference name="webviewbounce" value="false"/>
<preference name="UIWebViewBounce" value="false"/>
<preference name="DisallowOverscroll" value="true"/>
<preference name="SplashScreenDelay" value="3000"/>
<preference name="FadeSplashScreenDuration" value="500"/>
<preference name="android-minSdkVersion" value="16"/>
<preference name="BackupWebStorage" value="none"/>
<preference name="SplashScreen" value="screen"/>
<feature name="StatusBar">
<param name="ios-package" onload="true" value="CDVStatusBar"/>
</feature>
<platform name="android">
<icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
<icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
<icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
<icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
<icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
<icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
<splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
<splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
<splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
<splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
<splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
<splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
<splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
<splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
<splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
<splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
<splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
<splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
</platform>
<plugin name="cordova-plugin-whitelist" spec="~1.3.1"/>
<plugin name="cordova-plugin-device" spec="~1.1.4"/>
<plugin name="cordova-plugin-splashscreen" spec="~4.0.1"/>
<plugin name="cordova-plugin-console" spec="~1.0.5"/>
<plugin name="ionic-plugin-keyboard" spec="~2.2.1"/>
<icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
</widget>
<content src="index.html" />
<access origin="*" />
<preference name="webviewbounce" value="false" />
<preference name="UIWebViewBounce" value="false" />
<preference name="DisallowOverscroll" value="true" />
<preference name="SplashScreenDelay" value="3000" />
<preference name="FadeSplashScreenDuration" value="500" />
<preference name="android-minSdkVersion" value="16" />
<preference name="BackupWebStorage" value="none" />
<preference name="SplashScreen" value="screen" />
<feature name="StatusBar">
<param name="ios-package" onload="true" value="CDVStatusBar" />
</feature>
<platform name="android">
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
<icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
<icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
<icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
<icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
<splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
<splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
<splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
<splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
<splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
<splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
<splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
<splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
<splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
<splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
<splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
</platform>
<plugin name="cordova-plugin-whitelist" spec="~1.3.1" />
<plugin name="cordova-plugin-device" spec="~1.1.4" />
<plugin name="cordova-plugin-splashscreen" spec="~4.0.1" />
<plugin name="cordova-plugin-console" spec="~1.0.5" />
<plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
<icon src="resources/android/icon/drawable-xhdpi-icon.png" />
<preference name="SplashShowOnlyFirstTime" value="false" />
<plugin name="cordova-plugin-camera" spec="^4.0.2" />
<engine name="android" spec="7.0.0" />
</widget>

+ 3
- 1
ionic.config.json

@ -1,7 +1,9 @@
{ {
"name": "app", "name": "app",
"app_id": "0f46f512", "app_id": "0f46f512",
"integrations": {},
"integrations": {
"cordova": {}
},
"type": "ionic1", "type": "ionic1",
"watchPatterns": [] "watchPatterns": []
} }

+ 4268
- 0
package-lock.json
File diff suppressed because it is too large
View File


+ 24
- 4
package.json

@ -3,11 +3,18 @@
"version": "1.1.1", "version": "1.1.1",
"description": "app: commonroutes", "description": "app: commonroutes",
"dependencies": { "dependencies": {
"cordova-android": "7.0.0",
"cordova-plugin-camera": "^4.0.2",
"cordova-plugin-console": "^1.0.7",
"cordova-plugin-device": "^1.1.7",
"cordova-plugin-splashscreen": "^4.0.3",
"cordova-plugin-whitelist": "^1.3.3",
"gulp": "^3.5.6", "gulp": "^3.5.6",
"gulp-sass": "^2.0.4",
"gulp-concat": "^2.2.0", "gulp-concat": "^2.2.0",
"gulp-minify-css": "^0.3.0", "gulp-minify-css": "^0.3.0",
"gulp-rename": "^1.2.0"
"gulp-rename": "^1.2.0",
"gulp-sass": "^2.0.4",
"ionic-plugin-keyboard": "^2.2.1"
}, },
"devDependencies": { "devDependencies": {
"bower": "^1.3.3", "bower": "^1.3.3",
@ -22,5 +29,18 @@
"cordova-plugin-statusbar", "cordova-plugin-statusbar",
"ionic-plugin-keyboard" "ionic-plugin-keyboard"
], ],
"cordovaPlatforms": []
}
"cordovaPlatforms": [],
"cordova": {
"plugins": {
"cordova-plugin-whitelist": {},
"cordova-plugin-device": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-console": {},
"ionic-plugin-keyboard": {},
"cordova-plugin-camera": {}
},
"platforms": [
"android"
]
}
}

BIN
resources/android/icon/drawable-hdpi-icon.png

Before After
Width: 72  |  Height: 72  |  Size: 7.3 KiB Width: 72  |  Height: 72  |  Size: 7.3 KiB

BIN
resources/android/icon/drawable-ldpi-icon.png

Before After
Width: 36  |  Height: 36  |  Size: 2.7 KiB Width: 36  |  Height: 36  |  Size: 2.7 KiB

BIN
resources/android/icon/drawable-mdpi-icon.png

Before After
Width: 48  |  Height: 48  |  Size: 4.0 KiB Width: 48  |  Height: 48  |  Size: 4.1 KiB

BIN
resources/android/icon/drawable-xhdpi-icon.png

Before After
Width: 96  |  Height: 96  |  Size: 11 KiB Width: 96  |  Height: 96  |  Size: 11 KiB

BIN
resources/android/icon/drawable-xxhdpi-icon.png

Before After
Width: 144  |  Height: 144  |  Size: 21 KiB Width: 144  |  Height: 144  |  Size: 21 KiB

BIN
resources/android/icon/drawable-xxxhdpi-icon.png

Before After
Width: 192  |  Height: 192  |  Size: 33 KiB Width: 192  |  Height: 192  |  Size: 34 KiB

BIN
resources/android/splash/drawable-land-hdpi-screen.png

Before After
Width: 800  |  Height: 480  |  Size: 258 KiB Width: 800  |  Height: 480  |  Size: 259 KiB

BIN
resources/android/splash/drawable-land-ldpi-screen.png

Before After
Width: 320  |  Height: 240  |  Size: 77 KiB Width: 320  |  Height: 240  |  Size: 78 KiB

BIN
resources/android/splash/drawable-land-mdpi-screen.png

Before After
Width: 480  |  Height: 320  |  Size: 138 KiB Width: 480  |  Height: 320  |  Size: 138 KiB

BIN
resources/android/splash/drawable-land-xhdpi-screen.png

Before After
Width: 1280  |  Height: 720  |  Size: 462 KiB Width: 1280  |  Height: 720  |  Size: 464 KiB

BIN
resources/android/splash/drawable-land-xxhdpi-screen.png

Before After
Width: 1600  |  Height: 960  |  Size: 687 KiB Width: 1600  |  Height: 960  |  Size: 690 KiB

BIN
resources/android/splash/drawable-land-xxxhdpi-screen.png

Before After
Width: 1920  |  Height: 1280  |  Size: 1022 KiB Width: 1920  |  Height: 1280  |  Size: 1.0 MiB

BIN
resources/android/splash/drawable-port-hdpi-screen.png

Before After
Width: 480  |  Height: 800  |  Size: 280 KiB Width: 480  |  Height: 800  |  Size: 282 KiB

BIN
resources/android/splash/drawable-port-ldpi-screen.png

Before After
Width: 240  |  Height: 320  |  Size: 79 KiB Width: 240  |  Height: 320  |  Size: 80 KiB

BIN
resources/android/splash/drawable-port-mdpi-screen.png

Before After
Width: 320  |  Height: 480  |  Size: 144 KiB Width: 320  |  Height: 480  |  Size: 145 KiB

BIN
resources/android/splash/drawable-port-xhdpi-screen.png

Before After
Width: 720  |  Height: 1280  |  Size: 516 KiB Width: 720  |  Height: 1280  |  Size: 518 KiB

BIN
resources/android/splash/drawable-port-xxhdpi-screen.png

Before After
Width: 960  |  Height: 1600  |  Size: 756 KiB Width: 960  |  Height: 1600  |  Size: 758 KiB

BIN
resources/android/splash/drawable-port-xxxhdpi-screen.png

Before After
Width: 1280  |  Height: 1920  |  Size: 1.1 MiB Width: 1280  |  Height: 1920  |  Size: 1.1 MiB

BIN
resources/icon.png

Before After
Width: 411  |  Height: 411  |  Size: 100 KiB Width: 411  |  Height: 411  |  Size: 102 KiB

+ 1
- 0
resources/icon.png.md5

@ -0,0 +1 @@
086b2812df795c55bb670ae800e14562

BIN
resources/icon.xcf


BIN
resources/splash.png

Before After
Width: 2208  |  Height: 2208  |  Size: 1.6 MiB Width: 2208  |  Height: 2208  |  Size: 1.6 MiB

+ 1
- 0
resources/splash.png.md5

@ -0,0 +1 @@
971d61c626ea175727ec88fa064006d8

BIN
resources/splash.xcf


BIN
www/img/faircoop_logo.png

Before After
Width: 415  |  Height: 399  |  Size: 32 KiB

+ 2
- 1
www/js/app.js

@ -8,7 +8,8 @@
//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://37.59.123.45:3000/api/";
//var urlapi = "http://37.59.123.45:3000/api/";
var urlapi = "http://routes.fair.coop:3000/api/";
angular.module('starter', [ angular.module('starter', [
'ionic', 'ionic',

+ 5
- 5
www/js/translations.js

@ -73,7 +73,7 @@ var translations = {
"Home": "Home", "Home": "Home",
"Offer_Car": "Offer Car", "Offer_Car": "Offer Car",
"Ask_for_Car": "Ask for Car", "Ask_for_Car": "Ask for Car",
"Ask_for_Package": "Ask for Package",
"Ask_for_Package_transport": "Ask for Package transport",
"Get_positions": "Get positions", "Get_positions": "Get positions",
"version": "version", "version": "version",
"package": "package", "package": "package",
@ -153,7 +153,7 @@ var translations = {
"Home": "Home", "Home": "Home",
"Offer_Car": "Oferir Cotxe", "Offer_Car": "Oferir Cotxe",
"Ask_for_Car": "Demanar Cotxe", "Ask_for_Car": "Demanar Cotxe",
"Ask_for_Package": "Demanar transport de paquet",
"Ask_for_Package_transport": "Demanar transport de paquet",
"Get_positions": "Obtenir posicions", "Get_positions": "Obtenir posicions",
"version": "versió", "version": "versió",
"package": "paquet", "package": "paquet",
@ -233,7 +233,7 @@ var translations = {
"Home": "Home", "Home": "Home",
"Offer_Car": "Offer Car", "Offer_Car": "Offer Car",
"Ask_for_Car": "Ask for Car", "Ask_for_Car": "Ask for Car",
"Ask_for_Package": "Ask for Package",
"Ask_for_Package_transport": "Ask for Package transport",
"Get_positions": "Get positions", "Get_positions": "Get positions",
"version": "version", "version": "version",
"package": "package", "package": "package",
@ -313,7 +313,7 @@ var translations = {
"Home": "Home", "Home": "Home",
"Offer_Car": "Offer Car", "Offer_Car": "Offer Car",
"Ask_for_Car": "Ask for Car", "Ask_for_Car": "Ask for Car",
"Ask_for_Package": "Ask for Package",
"Ask_for_Package_transport": "Ask for Package transport",
"Get_positions": "Get positions", "Get_positions": "Get positions",
"version": "version", "version": "version",
"package": "package", "package": "package",
@ -393,7 +393,7 @@ var translations = {
"Home": "Home", "Home": "Home",
"Offer_Car": "Offer Car", "Offer_Car": "Offer Car",
"Ask_for_Car": "Ask for Car", "Ask_for_Car": "Ask for Car",
"Ask_for_Package": "Ask for Package",
"Ask_for_Package_transport": "Ask for Package transport",
"Get_positions": "Get positions", "Get_positions": "Get positions",
"version": "version", "version": "version",
"package": "package", "package": "package",

+ 1
- 1
www/templates/askForPackage.html

@ -1,4 +1,4 @@
<ion-view view-title="{{'Ask_for_Package' | translate}}">
<ion-view view-title="{{'Ask_for_Package_transport' | translate}}">
<ion-content> <ion-content>
<div class="padding"> <div class="padding">
<label class="item item-input"> <label class="item item-input">

+ 4
- 0
www/templates/editUser.html

@ -16,6 +16,10 @@
@<input ng-model="user.telegram" class="o_transparentInput" @<input ng-model="user.telegram" class="o_transparentInput"
placeholder="{{'Telegram' | translate}}"> placeholder="{{'Telegram' | translate}}">
</p> </p>
<p>
<input ng-model="user.localNode" class="o_transparentInput"
placeholder="{{'LocalNode' | translate}}">
</p>
<p ng-show="storageuser._id==user._id"> <p ng-show="storageuser._id==user._id">
<a class="button o_purple300" ng-click="update()"> <a class="button o_purple300" ng-click="update()">

+ 1
- 1
www/templates/newTravel.html

@ -10,7 +10,7 @@
</a> </a>
<a href="#/app/askForPackage" class="item item-icon-left o_purple300"> <a href="#/app/askForPackage" class="item item-icon-left o_purple300">
<i class="icon ion-ios-box"></i> <i class="icon ion-ios-box"></i>
{{'Ask_for_Package' | translate}}
{{'Ask_for_Package_transport' | translate}}
</a> </a>
</ion-content> </ion-content>
</ion-view> </ion-view>

+ 1
- 1
www/templates/settings.html

@ -10,7 +10,7 @@
</select> </select>
</label> </label>
<p> <p>
{{'version' | translate}}: CarsInCommon-v0.1
{{'version' | translate}}: CommonRoutes-v0.1
</p> </p>
Security: Security:
<a ng-href="#/app/password" class="button button-small c_deepPurple200"> <a ng-href="#/app/password" class="button button-small c_deepPurple200">

+ 4
- 0
www/templates/signup.html

@ -24,6 +24,10 @@
<span class="input-label">{{'Telegram' | translate}}</span> <span class="input-label">{{'Telegram' | translate}}</span>
@<input type="text" ng-model="signupData.telegram"> @<input type="text" ng-model="signupData.telegram">
</label> </label>
<label class="item item-input">
<span class="input-label">{{'LocalNode' | translate}}*</span>
<input type="text" ng-model="signupData.localNode">
</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">

+ 3
- 0
www/templates/user.html

@ -13,6 +13,9 @@
<i ng-show="user.validated" class="ion-checkmark-circled ct_blue300"></i> <i ng-show="user.validated" class="ion-checkmark-circled ct_blue300"></i>
</h3> </h3>
<p>{{user.description}}</p> <p>{{user.description}}</p>
<p ng-show="user.localNode">
FairCoop Local Node:<br>
<img style="max-width:20px;" src="img/faircoop_logo.png"/> <b>{{user.localNode}}</b></p>
<p>{{user.email}}</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}}">

Loading…
Cancel
Save