From 1c90d841bbb43bf3a9b48ef3a4f81db72e067b4d Mon Sep 17 00:00:00 2001
From: arnaucode <idoctnef@openmailbox.org>
Date: Tue, 31 Jan 2017 18:19:17 +0100
Subject: [PATCH] user travels visualization and other updates

---
 www/css/style.css              |  4 +++
 www/index.html                 |  1 +
 www/js/app.js                  | 10 ++++++++
 www/js/menu.js                 |  4 +--
 www/js/userTravels.js          | 23 +++++++++++++++++
 www/templates/login.html       | 11 ++++++--
 www/templates/user.html        |  8 +++---
 www/templates/userTravels.html | 46 ++++++++++++++++++++++++++++++++++
 8 files changed, 99 insertions(+), 8 deletions(-)
 create mode 100644 www/js/userTravels.js
 create mode 100644 www/templates/userTravels.html

diff --git a/www/css/style.css b/www/css/style.css
index 8164b0e..d4b0ac1 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -60,6 +60,10 @@
     font-weight: bold;
     margin: 10%;
 }
+.o_signupLink{
+    text-decoration: none;
+    color: #ffffff;
+}
 .o_transparentBackground{
     background: rgba(255, 255, 255, 0);
     color: #ffffff;
diff --git a/www/index.html b/www/index.html
index b846f4d..0c157e7 100644
--- a/www/index.html
+++ b/www/index.html
@@ -54,6 +54,7 @@
     <script src="js/askPackage.js"></script>-->
     <script src="js/users.js"></script>
     <script src="js/user.js"></script>
+    <script src="js/userTravels.js"></script>
     <script src="js/editUser.js"></script>
     <script src="js/notifications.js"></script>
     <script src="js/settings.js"></script>
diff --git a/www/js/app.js b/www/js/app.js
index 2012b4f..ab47441 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -30,6 +30,7 @@ angular.module('starter', [
     'app.askPackage',*/
     'app.users',
     'app.user',
+    'app.userTravels',
     'app.editUser',
     'app.notifications',
     'app.settings',
@@ -153,6 +154,15 @@ angular.module('starter', [
           }
         }
       })
+      .state('app.userTravels', {
+        url: '/users/userTravels/:userid',
+        views: {
+          'menuContent': {
+            templateUrl: 'templates/userTravels.html',
+            controller: 'UserTravelsCtrl'
+          }
+        }
+      })
       .state('app.editUser', {
         url: '/editUser',
         views: {
diff --git a/www/js/menu.js b/www/js/menu.js
index bc0eab6..c3052dc 100644
--- a/www/js/menu.js
+++ b/www/js/menu.js
@@ -1,7 +1,7 @@
 angular.module('app.menu', ['pascalprecht.translate'])
 
 
-  .controller('MenuCtrl', function($scope) {
+  .controller('MenuCtrl', function($scope, $window) {
     if (localStorage.getItem("cim_app_userdata")) {
       $scope.storageuser = JSON.parse(localStorage.getItem("cim_app_userdata"));
       console.log($scope.storageuser);
@@ -10,6 +10,6 @@ angular.module('app.menu', ['pascalprecht.translate'])
     $scope.logout = function() {
       localStorage.removeItem("cim_app_token");
       localStorage.removeItem("cim_app_userdata");
-      window.location = "/";
+      $window.location.reload(true);
     };
   });
diff --git a/www/js/userTravels.js b/www/js/userTravels.js
new file mode 100644
index 0000000..034d039
--- /dev/null
+++ b/www/js/userTravels.js
@@ -0,0 +1,23 @@
+angular.module('app.userTravels', ['pascalprecht.translate'])
+
+.controller('UserTravelsCtrl', function($scope, $http, $ionicModal,
+                        $timeout, $ionicLoading, $filter, $stateParams) {
+
+    $scope.storageuser = JSON.parse(localStorage.getItem("cim_app_userdata"));
+    $scope.travels=[];
+    $scope.joins=[];
+    $scope.doRefresh = function(){
+        $http.get(urlapi + 'users/id/travels/'+$stateParams.userid)
+        .then(function(data, status, headers,config){
+            console.log('data success');
+            console.log(data);
+            $scope.travels = data.data.travels;
+            $scope.joins = data.data.joins;
+            $scope.$broadcast('scroll.refreshComplete');//refresher stop
+        },function(data, status, headers,config){
+            console.log('data error');
+            $scope.$broadcast('scroll.refreshComplete');//refresher stop
+        });
+    };
+    $scope.doRefresh();
+});
diff --git a/www/templates/login.html b/www/templates/login.html
index 71666c2..1d09bfe 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -23,17 +23,24 @@
                 {{'LOG IN' | translate}}
             </a>
         </p>
+        <br>
+        <p>
+
+            <a class="o_signupLink" ng-href="#/app/signup">
+                Not account yet? {{'Create one' | translate}}
+            </a>
+        </p>
         <!--<p>
             <a class="o_loginButton button button-block" ng-href="#/app/signup">
                 {{'Signup' | translate}}
             </a>
-        </p>-->
+        </p>
         <div class="bar bar-footer o_transparentBackground">
             <a class="button o_purple300 pull-right" ng-href="#/app/signup">
                 <i class="icon ion-android-person-add"></i>
                 {{'SIGN UP' | translate}}
             </a>
-        </div>
+        </div>-->
       </div>
     </div>
   </ion-content>
diff --git a/www/templates/user.html b/www/templates/user.html
index fc3f7d5..6b27f4c 100644
--- a/www/templates/user.html
+++ b/www/templates/user.html
@@ -20,13 +20,13 @@
               <i class="icon ion-paper-airplane"></i>
               @{{user.telegram}}
           </a>
-          <a class="tab-item">
+          <a class="tab-item" ng-href="#/app/users/userTravels/{{user._id}}">
               <i class="icon ion-android-car"></i>
               {{user.travels.length}} Travels
           </a>
           <a class="tab-item">
               <i class="icon ion-ios-heart"></i>
-              {{user.favs.length}} favs
+              {{user.favs.length}} favs<br>(not yet)
           </a>
         </div>
 
@@ -47,7 +47,7 @@
     <div class="item">
         <img src="{{user.faircoin}}" style="width: 100%;" />
     </div>
-    <div class="item item-body">
+    <!--<div class="item item-body">
         {{'current_publications_of' | translate}} {{user.username}}:
         <div class="o_text_purple600">{{user.travels.length}} {{'publications' | translate}}</div>
 
@@ -68,6 +68,6 @@
               {{travel.description}}
           </p>
         </a>
-    </div>
+    </div>-->
   </ion-content>
 </ion-view>
diff --git a/www/templates/userTravels.html b/www/templates/userTravels.html
new file mode 100644
index 0000000..b8b7a32
--- /dev/null
+++ b/www/templates/userTravels.html
@@ -0,0 +1,46 @@
+<ion-view view-title="{{' travels' | translate}}">
+  <ion-content class="has-footer">
+      <ion-refresher
+        pulling-text="{{'Pull_to_refresh' | translate}}..."
+        on-refresh="doRefresh()">
+      </ion-refresher>
+    <div class="list">
+        <div class="item item-divider o_purple300" ng-show="travels[0]">
+            Travels offering
+        </div>
+        <a ng-repeat="travel in travels | orderBy: 'date'"
+        class="item item-icon-left" href="#/app/travels/{{travel._id}}">
+          <i class="icon ion-android-car o_text_grey700"></i>
+          <h2 class="o_text_grey800">{{travel.title}}</h2>
+          <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:"HH:mm"}}h</div>
+          </div>
+          <p>
+              {{travel.from.name}}
+          </p>
+          <p>
+              {{travel.to.name}}
+          </p>
+        </a>
+        <div class="item item-divider o_purple300" ng-show="joins[0]">
+            Travels joining
+        </div>
+        <a ng-repeat="travel in joins | orderBy: 'date'"
+        class="item item-icon-left" href="#/app/travels/{{travel._id}}">
+          <i class="icon ion-android-car o_text_grey700"></i>
+          <h2 class="o_text_grey800">{{travel.title}}</h2>
+          <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:"HH:mm"}}h</div>
+          </div>
+          <p>
+              {{travel.from.name}}
+          </p>
+          <p>
+              {{travel.to.name}}
+          </p>
+        </a>
+    </div>
+  </ion-content>
+</ion-view>