arnaucube
arnaucube/commonroutesAppPublic Self-hosted repository
added travel link to the webapp view
arnaucode arnaucode@gmail.com
Sat, 16 Jun 2018 21:30:39 +0200
commit

2c6be8748f8ca36b9b5af21e59d30433c93d1a1d

parent

e1059a478ce432feec586cd05d0fb10a98efa15a

6 files changed, 20 insertions(+), 10 deletions(-)

jump to
M www/js/app.js → www/js/app.js 
@@ -6,7 +6,7 @@ // the 2nd parameter is an array of 'requires'
 // '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://37.59.123.45:3000/api/";
 var urlapi = "http://routes.fair.coop:3000/api/";
M www/js/askForCar.js → www/js/askForCar.js 
@@ -47,7 +47,7 @@
         $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')
+        $http.get('https://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.from.name + '&format=json&limit=1')
         .then(function(data) {
             console.log(data);
             if(data.data[0])

@@ -61,7 +61,7 @@ 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')
+            $http.get('https://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.to.name + '&format=json&limit=1')
             .then(function(data) {
                 if(data.data[0])
                 {
M www/js/askForPackage.js → www/js/askForPackage.js 
@@ -47,7 +47,7 @@
         $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')
+        $http.get('https://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.from.name + '&format=json&limit=1')
         .then(function(data) {
             console.log(data);
             if(data.data[0])

@@ -61,7 +61,7 @@ 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')
+            $http.get('https://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.to.name + '&format=json&limit=1')
             .then(function(data) {
                 if(data.data[0])
                 {
M www/js/offerCar.js → www/js/offerCar.js 
@@ -47,7 +47,7 @@
         $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')
+        $http.get('https://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.from.name + '&format=json&limit=1')
         .then(function(data) {
             console.log(data);
             if(data.data[0])

@@ -61,7 +61,7 @@ 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')
+            $http.get('https://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.to.name + '&format=json&limit=1')
             .then(function(data) {
                 if(data.data[0])
                 {
M www/js/travel.js → www/js/travel.js 
@@ -289,4 +289,11 @@ $scope.openTelegram = function(telegramuser) {
       window.open('http://telegram.me/' + telegramuser, '_system', 'location=yes');
       return false;
     };
+    $scope.copyTravelLink = function(link) {
+      $cordovaClipboard.copy("Text To Copy").then(function() {
+          // success
+      }, function() {
+          // error
+      });
+    };
   });
M www/templates/travel.html → www/templates/travel.html 
@@ -13,9 +13,12 @@ {{travel.user.username}}
                 <i ng-show="travel.user.validated" class="ion-checkmark-circled ct_blue300"></i>
             </a>
             <p class="text-right">
+              <a target="_blank" ng-href="http://routes.fair.coop/app/#!/travel/{{travel._id}}" class="button button-small o_grey300">
+                  <i class="icon ion-share" style="margin-left:-14px;"></i>
+              </a>
               <a ng-click="deleteTravel()" class="button button-small o_bRed"
               ng-show="storageuser._id==travel.user._id">
-                  <i class="icon ion-trash-a"></i>
+                  <i class="icon ion-trash-a" style="margin-left:-14px;"></i>
               </a>
             </p>
         </p>

@@ -45,8 +48,8 @@ <div class="item item-icon-left" ng-show="travel.package">
         <i class="icon ion-ios-box"></i> {{'package' | translate}}
     </div>
     <a class="item item-icon-left" ng-show="travel.user.telegram"
-     ng-click="openTelegram(user.telegram)">
-        <i class="icon ion-paper-airplane"></i> @{{travel.user.telegram}}
+     ng-click="openTelegram(travel.user.telegram)">
+        <i class="icon ion-paper-airplane"></i> Telegram: @{{travel.user.telegram}}
     </a>
     <div class="item item-icon-left" ng-show="travel.user.phone">
         <i class="icon ion-ios-telephone"></i> {{travel.user.phone}}