prealpha01

README.md

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

bower.json

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

comandesUtils.txt

@@ -5,9 +5,9 @@ PATH=$PATH:$ANDROID_HOME/platform-tools
 
 ** cal estar amb sudo **
 #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:
@@ -17,3 +17,5 @@ cd /home/nau/Android/Sdk/tools
 
 ionic serve
 ionic build android
+ionic run android //obsolete
+ionic cordova run android

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">
-  <name>CarsInCommon</name>
+    <name>CommonRoutes</name>
     <description>
         CarSharing app, for collective use.
     </description>
     <author email="mail@mail.com" href="http://arnaucode.com/">
       ArnauCode
     </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"/>
+    <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"/>
+        <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"/>
+        <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"/>
+    <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>

ionic.config.json

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

package.json

@@ -3,11 +3,18 @@
   "version": "1.1.1",
   "description": "app: commonroutes",
   "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-sass": "^2.0.4",
     "gulp-concat": "^2.2.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": {
     "bower": "^1.3.3",
@@ -22,5 +29,18 @@
     "cordova-plugin-statusbar",
     "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"
+    ]
+  }
 }

resources/icon.png.md5

@@ -0,0 +1 @@
+086b2812df795c55bb670ae800e14562

resources/splash.png.md5

@@ -0,0 +1 @@
+971d61c626ea175727ec88fa064006d8

www/js/app.js

@@ -8,7 +8,8 @@
 
 //var urlapi = "http://localhost: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', [
     'ionic',

www/js/translations.js

@@ -73,7 +73,7 @@ var translations = {
         "Home": "Home",
         "Offer_Car": "Offer 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",
         "version": "version",
         "package": "package",
@@ -153,7 +153,7 @@ var translations = {
         "Home": "Home",
         "Offer_Car": "Oferir 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",
         "version": "versió",
         "package": "paquet",
@@ -233,7 +233,7 @@ var translations = {
         "Home": "Home",
         "Offer_Car": "Offer 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",
         "version": "version",
         "package": "package",
@@ -313,7 +313,7 @@ var translations = {
         "Home": "Home",
         "Offer_Car": "Offer 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",
         "version": "version",
         "package": "package",
@@ -393,7 +393,7 @@ var translations = {
         "Home": "Home",
         "Offer_Car": "Offer 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",
         "version": "version",
         "package": "package",

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>
       <div class="padding">
           <label class="item item-input">

www/templates/editUser.html

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

www/templates/newTravel.html

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

www/templates/settings.html

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

www/templates/signup.html

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

www/templates/user.html

@@ -13,6 +13,9 @@
           <i ng-show="user.validated" class="ion-checkmark-circled ct_blue300"></i>
       </h3>
       <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><a class="button button-small" ng-href="#/app/users/userLikes/{{user._id}}">