diff --git a/config.xml b/config.xml index 6db05d1..e9b8b0f 100644 --- a/config.xml +++ b/config.xml @@ -1,49 +1,49 @@ - + - CarsInCommon - + CarsInCommon + CarSharing app, for collective use. - + ArnauCode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable-land-hdpi/screen.png b/res/drawable-land-hdpi/screen.png index 09633f7..17c6c63 100644 Binary files a/res/drawable-land-hdpi/screen.png and b/res/drawable-land-hdpi/screen.png differ diff --git a/res/drawable-land-ldpi/screen.png b/res/drawable-land-ldpi/screen.png index c581782..cd55f08 100644 Binary files a/res/drawable-land-ldpi/screen.png and b/res/drawable-land-ldpi/screen.png differ diff --git a/res/drawable-land-mdpi/screen.png b/res/drawable-land-mdpi/screen.png index d4d6dc8..0ef9188 100644 Binary files a/res/drawable-land-mdpi/screen.png and b/res/drawable-land-mdpi/screen.png differ diff --git a/res/drawable-land-xhdpi/screen.png b/res/drawable-land-xhdpi/screen.png index 87c7a56..74a5474 100644 Binary files a/res/drawable-land-xhdpi/screen.png and b/res/drawable-land-xhdpi/screen.png differ diff --git a/res/drawable-land-xxhdpi/screen.png b/res/drawable-land-xxhdpi/screen.png index 90117fd..63e69c7 100644 Binary files a/res/drawable-land-xxhdpi/screen.png and b/res/drawable-land-xxhdpi/screen.png differ diff --git a/res/drawable-land-xxxhdpi/screen.png b/res/drawable-land-xxxhdpi/screen.png index 22f779d..bdef37e 100644 Binary files a/res/drawable-land-xxxhdpi/screen.png and b/res/drawable-land-xxxhdpi/screen.png differ diff --git a/res/drawable-port-hdpi/screen.png b/res/drawable-port-hdpi/screen.png index a32a6a0..400d4c8 100644 Binary files a/res/drawable-port-hdpi/screen.png and b/res/drawable-port-hdpi/screen.png differ diff --git a/res/drawable-port-ldpi/screen.png b/res/drawable-port-ldpi/screen.png index 0ff9f2f..a31f317 100644 Binary files a/res/drawable-port-ldpi/screen.png and b/res/drawable-port-ldpi/screen.png differ diff --git a/res/drawable-port-mdpi/screen.png b/res/drawable-port-mdpi/screen.png index 2397f52..2cd7429 100644 Binary files a/res/drawable-port-mdpi/screen.png and b/res/drawable-port-mdpi/screen.png differ diff --git a/res/drawable-port-xhdpi/screen.png b/res/drawable-port-xhdpi/screen.png index 50bd01e..e7b1e26 100644 Binary files a/res/drawable-port-xhdpi/screen.png and b/res/drawable-port-xhdpi/screen.png differ diff --git a/res/drawable-port-xxhdpi/screen.png b/res/drawable-port-xxhdpi/screen.png index 0d08d80..c6b0a69 100644 Binary files a/res/drawable-port-xxhdpi/screen.png and b/res/drawable-port-xxhdpi/screen.png differ diff --git a/res/drawable-port-xxxhdpi/screen.png b/res/drawable-port-xxxhdpi/screen.png index 73214c3..450af53 100644 Binary files a/res/drawable-port-xxxhdpi/screen.png and b/res/drawable-port-xxxhdpi/screen.png differ diff --git a/res/mipmap-hdpi/icon.png b/res/mipmap-hdpi/icon.png index 48cf44c..e342944 100644 Binary files a/res/mipmap-hdpi/icon.png and b/res/mipmap-hdpi/icon.png differ diff --git a/res/mipmap-ldpi/icon.png b/res/mipmap-ldpi/icon.png index 85b022d..8e18fef 100644 Binary files a/res/mipmap-ldpi/icon.png and b/res/mipmap-ldpi/icon.png differ diff --git a/res/mipmap-mdpi/icon.png b/res/mipmap-mdpi/icon.png index b40090a..07434b4 100644 Binary files a/res/mipmap-mdpi/icon.png and b/res/mipmap-mdpi/icon.png differ diff --git a/res/mipmap-xhdpi/icon.png b/res/mipmap-xhdpi/icon.png index 0210c55..435b640 100644 Binary files a/res/mipmap-xhdpi/icon.png and b/res/mipmap-xhdpi/icon.png differ diff --git a/res/mipmap-xxhdpi/icon.png b/res/mipmap-xxhdpi/icon.png index da8dc5a..d03377b 100644 Binary files a/res/mipmap-xxhdpi/icon.png and b/res/mipmap-xxhdpi/icon.png differ diff --git a/res/mipmap-xxxhdpi/icon.png b/res/mipmap-xxxhdpi/icon.png index 5c1a544..4bfe413 100644 Binary files a/res/mipmap-xxxhdpi/icon.png and b/res/mipmap-xxxhdpi/icon.png differ diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index 48cf44c..e342944 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index 85b022d..8e18fef 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index b40090a..07434b4 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index 0210c55..435b640 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index da8dc5a..d03377b 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index 5c1a544..4bfe413 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png index 09633f7..17c6c63 100644 Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png index c581782..cd55f08 100644 Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png index d4d6dc8..0ef9188 100644 Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png index 87c7a56..74a5474 100644 Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png index 90117fd..63e69c7 100644 Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png index 22f779d..bdef37e 100644 Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png index a32a6a0..400d4c8 100644 Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png index 0ff9f2f..a31f317 100644 Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png index 2397f52..2cd7429 100644 Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png index 50bd01e..e7b1e26 100644 Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png index 0d08d80..c6b0a69 100644 Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png index 73214c3..450af53 100644 Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/resources/icon.png b/resources/icon.png index 182add3..a06fc14 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/icon.xcf b/resources/icon.xcf new file mode 100644 index 0000000..b96cbbf Binary files /dev/null and b/resources/icon.xcf differ diff --git a/resources/icon_old.png b/resources/icon_old.png new file mode 100644 index 0000000..182add3 Binary files /dev/null and b/resources/icon_old.png differ diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png deleted file mode 100644 index 76cc53c..0000000 Binary files a/resources/ios/icon/icon-40.png and /dev/null differ diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png deleted file mode 100644 index 64b4906..0000000 Binary files a/resources/ios/icon/icon-40@2x.png and /dev/null differ diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png deleted file mode 100644 index 8bd51df..0000000 Binary files a/resources/ios/icon/icon-50.png and /dev/null differ diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png deleted file mode 100644 index 2676f8f..0000000 Binary files a/resources/ios/icon/icon-50@2x.png and /dev/null differ diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png deleted file mode 100644 index 11f3912..0000000 Binary files a/resources/ios/icon/icon-60.png and /dev/null differ diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png deleted file mode 100644 index b521048..0000000 Binary files a/resources/ios/icon/icon-60@2x.png and /dev/null differ diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png deleted file mode 100644 index dbc8303..0000000 Binary files a/resources/ios/icon/icon-60@3x.png and /dev/null differ diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png deleted file mode 100644 index 4e5a827..0000000 Binary files a/resources/ios/icon/icon-72.png and /dev/null differ diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png deleted file mode 100644 index 56fb29e..0000000 Binary files a/resources/ios/icon/icon-72@2x.png and /dev/null differ diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png deleted file mode 100644 index e66a90e..0000000 Binary files a/resources/ios/icon/icon-76.png and /dev/null differ diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png deleted file mode 100644 index 3f5c942..0000000 Binary files a/resources/ios/icon/icon-76@2x.png and /dev/null differ diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png deleted file mode 100644 index de3146d..0000000 Binary files a/resources/ios/icon/icon-small.png and /dev/null differ diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png deleted file mode 100644 index 916a02e..0000000 Binary files a/resources/ios/icon/icon-small@2x.png and /dev/null differ diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png deleted file mode 100644 index 0efa99d..0000000 Binary files a/resources/ios/icon/icon-small@3x.png and /dev/null differ diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png deleted file mode 100644 index 89f8c00..0000000 Binary files a/resources/ios/icon/icon.png and /dev/null differ diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png deleted file mode 100644 index a6687a1..0000000 Binary files a/resources/ios/icon/icon@2x.png and /dev/null differ diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png deleted file mode 100644 index d2128a6..0000000 Binary files a/resources/ios/splash/Default-568h@2x~iphone.png and /dev/null differ diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png deleted file mode 100644 index fc23e64..0000000 Binary files a/resources/ios/splash/Default-667h.png and /dev/null differ diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png deleted file mode 100644 index 71b16ca..0000000 Binary files a/resources/ios/splash/Default-736h.png and /dev/null differ diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png deleted file mode 100644 index aaff74a..0000000 Binary files a/resources/ios/splash/Default-Landscape-736h.png and /dev/null differ diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png deleted file mode 100644 index 19770a2..0000000 Binary files a/resources/ios/splash/Default-Landscape@2x~ipad.png and /dev/null differ diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png deleted file mode 100644 index 6fe8925..0000000 Binary files a/resources/ios/splash/Default-Landscape~ipad.png and /dev/null differ diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png deleted file mode 100644 index 3d06d86..0000000 Binary files a/resources/ios/splash/Default-Portrait@2x~ipad.png and /dev/null differ diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png deleted file mode 100644 index 53ad4c4..0000000 Binary files a/resources/ios/splash/Default-Portrait~ipad.png and /dev/null differ diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png deleted file mode 100644 index 6a13316..0000000 Binary files a/resources/ios/splash/Default@2x~iphone.png and /dev/null differ diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png deleted file mode 100644 index 0aaad62..0000000 Binary files a/resources/ios/splash/Default~iphone.png and /dev/null differ diff --git a/resources/splash.png b/resources/splash.png index 8015053..02edc90 100644 Binary files a/resources/splash.png and b/resources/splash.png differ diff --git a/resources/splash.xcf b/resources/splash.xcf new file mode 100644 index 0000000..1183c1f Binary files /dev/null and b/resources/splash.xcf differ diff --git a/resources/splash_old.png b/resources/splash_old.png new file mode 100644 index 0000000..8015053 Binary files /dev/null and b/resources/splash_old.png differ diff --git a/www/css/style.css b/www/css/style.css index d4b0ac1..69827c6 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -95,6 +95,12 @@ border: 0px; width: 80%; } +.o_transparentInputBlack{ + background: rgba(255, 255, 255, 0); + color: #000000; + border: 0px; + width: 100%; +} .o_userImgCircular { margin-top: 5%; background: #ffffff; diff --git a/www/index.html b/www/index.html index c77f4dd..b020dda 100644 --- a/www/index.html +++ b/www/index.html @@ -44,8 +44,8 @@ - + + diff --git a/www/js/app.js b/www/js/app.js index 3064e09..5729278 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -24,8 +24,8 @@ angular.module('starter', [ 'app.travel', 'app.newTravel', 'app.offerCar', - /* 'app.askCar', - 'app.askPackage',*/ + 'app.askForCar', + 'app.askForPackage', 'app.users', 'app.user', 'app.userTravels', @@ -137,6 +137,24 @@ angular.module('starter', [ } } }) + .state('app.askForCar', { + url: '/askForCar', + views: { + 'menuContent': { + templateUrl: 'templates/askForCar.html', + controller: 'AskForCarCtrl' + } + } + }) + .state('app.askForPackage', { + url: '/askForPackage', + views: { + 'menuContent': { + templateUrl: 'templates/askForPackage.html', + controller: 'AskForPackageCtrl' + } + } + }) .state('app.users', { url: '/users', views: { diff --git a/www/js/askForCar.js b/www/js/askForCar.js new file mode 100644 index 0000000..a34ece1 --- /dev/null +++ b/www/js/askForCar.js @@ -0,0 +1,81 @@ +angular.module('app.askForCar', ['pascalprecht.translate', 'ui-leaflet']) + +.controller('AskForCarCtrl', function($scope, $stateParams, $translate, + $http, $filter, $ionicLoading) { + + $scope.newtravel={}; + $scope.newtravel.from={ + lat: 0, + long:0 + }; + $scope.newtravel.to={ + lat: 0, + long:0 + }; + $scope.center= { + lat: 0, + lng: 0, + zoom: 1 + }; + $scope.markers=new Array(); + $scope.tiles= { + url: "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", + options: { + attribution: 'OpenStreetMap contributors' + } + }; + $scope.createTravel =function(){ + $scope.newtravel.type="asking"; + $http({ + url: urlapi + 'travels', + method: "POST", + data: $scope.newtravel + }) + .then(function(data) { + console.log(data); + window.location="#app/travels" + }, + function(data) { // optional + // failed + console.log(data); + $ionicLoading.show({ template: 'Complete all parameters first', noBackdrop: true, duration: 2000 }); + + }); + }; + $scope.getGeo = function(){ + + $scope.markers=[]; + console.log($scope.newtravel.from.name); + console.log($scope.newtravel.to.name); + $http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.from.name + '&format=json&limit=1') + .then(function(data) { + console.log(data); + if(data.data[0]) + { + $scope.newtravel.from.lat=data.data[0].lat; + $scope.newtravel.from.long=data.data[0].lon; + $scope.newtravel.from.name=data.data[0].display_name; + $scope.markers.push({ + lat: Number(data.data[0].lat), + lng: Number(data.data[0].lon), + message: data.data[0].display_name + }); + } + $http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.to.name + '&format=json&limit=1') + .then(function(data) { + if(data.data[0]) + { + $scope.newtravel.to.lat=data.data[0].lat; + $scope.newtravel.to.long=data.data[0].lon; + $scope.newtravel.to.name=data.data[0].display_name; + $scope.markers.push({ + lat: Number(data.data[0].lat), + lng: Number(data.data[0].lon), + message: data.data[0].display_name + }); + } + }); + }); + + }; +}); diff --git a/www/js/askForPackage.js b/www/js/askForPackage.js new file mode 100644 index 0000000..ac3079b --- /dev/null +++ b/www/js/askForPackage.js @@ -0,0 +1,81 @@ +angular.module('app.askForPackage', ['pascalprecht.translate', 'ui-leaflet']) + +.controller('AskForPackageCtrl', function($scope, $stateParams, $translate, + $http, $filter, $ionicLoading) { + + $scope.newtravel={}; + $scope.newtravel.from={ + lat: 0, + long:0 + }; + $scope.newtravel.to={ + lat: 0, + long:0 + }; + $scope.center= { + lat: 0, + lng: 0, + zoom: 1 + }; + $scope.markers=new Array(); + $scope.tiles= { + url: "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", + options: { + attribution: 'OpenStreetMap contributors' + } + }; + $scope.createTravel =function(){ + $scope.newtravel.type="package"; + $http({ + url: urlapi + 'travels', + method: "POST", + data: $scope.newtravel + }) + .then(function(data) { + console.log(data); + window.location="#app/travels" + }, + function(data) { // optional + // failed + console.log(data); + $ionicLoading.show({ template: 'Complete all parameters first', noBackdrop: true, duration: 2000 }); + + }); + }; + $scope.getGeo = function(){ + + $scope.markers=[]; + console.log($scope.newtravel.from.name); + console.log($scope.newtravel.to.name); + $http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.from.name + '&format=json&limit=1') + .then(function(data) { + console.log(data); + if(data.data[0]) + { + $scope.newtravel.from.lat=data.data[0].lat; + $scope.newtravel.from.long=data.data[0].lon; + $scope.newtravel.from.name=data.data[0].display_name; + $scope.markers.push({ + lat: Number(data.data[0].lat), + lng: Number(data.data[0].lon), + message: data.data[0].display_name + }); + } + $http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.to.name + '&format=json&limit=1') + .then(function(data) { + if(data.data[0]) + { + $scope.newtravel.to.lat=data.data[0].lat; + $scope.newtravel.to.long=data.data[0].lon; + $scope.newtravel.to.name=data.data[0].display_name; + $scope.markers.push({ + lat: Number(data.data[0].lat), + lng: Number(data.data[0].lon), + message: data.data[0].display_name + }); + } + }); + }); + + }; +}); diff --git a/www/templates/askForCar.html b/www/templates/askForCar.html new file mode 100644 index 0000000..d38a10b --- /dev/null +++ b/www/templates/askForCar.html @@ -0,0 +1,58 @@ + + +
+ +
+ + +
+
+ {{'Get_positions' | translate}} + + + +
+ + + + + + + {{'Want_to_carry_package' | translate}} + + + +

+ + {{'Post_asking_car' | translate}} + +

+
+ + diff --git a/www/templates/askForPackage.html b/www/templates/askForPackage.html new file mode 100644 index 0000000..8c54488 --- /dev/null +++ b/www/templates/askForPackage.html @@ -0,0 +1,58 @@ + + +
+ +
+ + +
+
+ {{'Get_positions' | translate}} + + + +
+ + + + + + +

+ + {{'Ask_for_package' | translate}} + +

+
+ + diff --git a/www/templates/editUser.html b/www/templates/editUser.html index e49ee4a..19d0b19 100644 --- a/www/templates/editUser.html +++ b/www/templates/editUser.html @@ -1,5 +1,5 @@ - +
@@ -24,6 +24,10 @@

+

+ +

diff --git a/www/templates/newTravel.html b/www/templates/newTravel.html index e0140a0..c73f46a 100644 --- a/www/templates/newTravel.html +++ b/www/templates/newTravel.html @@ -4,13 +4,13 @@ {{'Offer_Car' | translate}} - + - {{'Ask_for_Car' | translate}} (not yet) + {{'Ask_for_Car' | translate}} - + - {{'Ask_for_Package' | translate}} (not yet) + {{'Ask_for_Package' | translate}} diff --git a/www/templates/offerCar.html b/www/templates/offerCar.html index 7845c2e..dc896ca 100644 --- a/www/templates/offerCar.html +++ b/www/templates/offerCar.html @@ -1,5 +1,5 @@ - +

- {{travel.title}}

+ + + + {{travel.title}}
{{travel.date | date:"dd/MM HH:mm a"}}
diff --git a/www/templates/travels.html b/www/templates/travels.html index 01fc34b..f3779a6 100644 --- a/www/templates/travels.html +++ b/www/templates/travels.html @@ -23,7 +23,9 @@
{{travel.user.username}}
- + + +

{{travel.title}}

{{travel.date | date:"dd/MM"}}
diff --git a/www/templates/user.html b/www/templates/user.html index 1f753bd..794457a 100644 --- a/www/templates/user.html +++ b/www/templates/user.html @@ -44,6 +44,9 @@
+

+ {{user.faircoinString}} +