Merge branch '20-ride-history-2' into 'master'

Resolve "Ride History"

Closes #20

See merge request 92khra1mst/hft_awado_app!35

src/app/app.component.ts

@@ -28,9 +28,13 @@ export class AppComponent {
       title: 'My Reservation',
       url: '/myreservation',
       icon: 'clipboard'
+    }, {
+      title: 'My Rides',
+      url: '/hirebike',
+      icon: 'clipboard'
     },
     {
-      title: 'My Rides',
+      title: 'Ride History',
       url: '/ridehistory',
       icon: 'clipboard'
     },

src/app/ridehistory/ridehistory.page.html

@@ -10,9 +10,8 @@
     </ion-toolbar>
   </ion-header>
 <ion-content>
-  <div class="ride-list-container" *ngIf="isRideActive">
+  <div class="ride-list-container" >
       <div class="ride-container" *ngFor="let ride of rides">
-          <div class="inner" (click)="showRideDetails(bike)">
     <ion-grid>
       <ion-row  >
         <ion-col>
@@ -67,65 +66,7 @@
     </ion-grid>
     </div>
   </div>
-  </div>
-  <div class="ride-list-container" *ngIf="!isRideActive">
-      <div class="ride-container" *ngFor="let ride of rides">
-          <div class="inner" (click)="showRideDetails()">
-    <ion-grid>
-      <ion-row  >
-        <ion-col>
-          Bike ID
-
-        </ion-col>
-        <ion-col>
-          {{ride.bikeId}}
-        </ion-col>
 
-      </ion-row>
-      <ion-row>
-          <ion-col>
-           Price
-  
-          </ion-col>
-          <ion-col>
-            {{ride.price}}
-          </ion-col>
-          
-        </ion-row>
-        <ion-row>
-            <ion-col>
-           Distance
-    
-            </ion-col>
-            <ion-col>
-              {{ride.distance}}
-            </ion-col>
-            
-          </ion-row>
-          <ion-row>
-              <ion-col>
-                Start-Date
-      
-              </ion-col>
-              <ion-col>
-                {{ride.startDate}}
-              </ion-col>
-              
-            </ion-row>
-            <ion-row>
-                <ion-col>
-                 End-Date
-        
-                </ion-col>
-                <ion-col>
-                  {{ride.endDate}}
-                </ion-col>
-                
-              </ion-row>
-    </ion-grid>
-    </div>
-  </div>
 
-</div>
 
 </ion-content>
\ No newline at end of file

src/app/ridehistory/ridehistory.page.ts

@@ -47,7 +47,5 @@ export class RidehistoryPage implements OnInit {
       //alert('Error getting location - ' + JSON.stringify(error));
     });
   }
-  showRideDetails() {
-    //this.router.navigateByUrl('/myreservation');
-  }
+
 }