Merge branch 'master' into '18-design-feedback-page-2'

# Conflicts:
#   src/app/app-routing.module.ts
#   src/app/app.component.ts
#   src/app/hirebike/hirebike.page.ts

package.json

@@ -88,4 +88,4 @@
       "browser"
     ]
   }
-}
+}
\ No newline at end of file

src/app/app-routing.module.ts

@@ -35,12 +35,12 @@ const routes: Routes = [
     loadChildren: () => import('./ridehistory/ridehistory.module').then( m => m.RidehistoryPageModule)
   },
   {
-    path: 'feedback',
-    loadChildren: () => import('./feedback/feedback.module').then( m => m.FeedbackPageModule)
+    path: 'help-line',
+    loadChildren: () => import('./help-line/help-line.module').then( m => m.HelpLinePageModule)
   },
   {
-    path: 'feedback',
-    loadChildren: () => import('./feedback/feedback.module').then( m => m.FeedbackPageModule)
+    path: 'reset-password',
+    loadChildren: () => import('./reset-password/reset-password.module').then( m => m.ResetPasswordPageModule)
   }
 
   

src/app/app.component.ts

@@ -27,11 +27,11 @@ export class AppComponent {
     {
       title: 'My Reservation',
       url: '/myreservation',
-      icon: 'clipboard'
+      icon: 'cart'
     }, {
       title: 'My Rides',
       url: '/hirebike',
-      icon: 'clipboard'
+      icon: 'bicycle'
     },
     {
       title: 'Ride History',
@@ -39,9 +39,9 @@ export class AppComponent {
       icon: 'clipboard'
     },
     {
-      title: 'Feedback',
-      url: '/feedback',
-      icon: 'clipboard'
+      title: 'Help',
+      url: '/help-line',
+      icon: 'call'
     },
     {
       title: 'Logout',

src/app/auth/login/login.page.html

@@ -31,7 +31,10 @@
 
         <div padding>
           <ion-button size="large" expand="block" (click)="login()">Login</ion-button>
+          <a href="../../reset-password">Forgot your Password?</a>
+
         </div>
+    
         <div padding>
           <ion-button size="large" expand="block" (click)="register()">Click here to Register</ion-button>
         </div>

src/app/help-line/help-line-routing.module.ts

+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { HelpLinePage } from './help-line.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: HelpLinePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class HelpLinePageRoutingModule {}

src/app/help-line/help-line.module.ts

+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { HelpLinePageRoutingModule } from './help-line-routing.module';
+
+import { HelpLinePage } from './help-line.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    HelpLinePageRoutingModule
+  ],
+  declarations: [HelpLinePage]
+})
+export class HelpLinePageModule {}

src/app/help-line/help-line.page.html

+ <ion-header>
+    <ion-toolbar>
+      <ion-buttons slot="start">
+        <ion-menu-button></ion-menu-button>
+      </ion-buttons>
+      <ion-title slot="start">
+        Help
+      </ion-title>
+
+    </ion-toolbar>
+  </ion-header>
+
+  <ion-content>
+    <div class="container">
+      <div><img src="../../../assets/images/Questions.png"></div>
+      <div class="help-container">
+        <ion-grid>
+          <ion-row>
+            <ion-col>
+              <ion-icon name="contact"></ion-icon>  Contact Person:
+            </ion-col>
+            <ion-col>
+              Priyanaka Upadhye
+            </ion-col>
+          </ion-row>
+          <ion-row>
+
+
+
+          </ion-row>
+          <ion-row>
+            <ion-col>
+              <ion-icon name="Mail"></ion-icon> Contact Email:
+            </ion-col>
+            <ion-col>
+              Admin@mail.com
+            </ion-col>
+          </ion-row>
+
+          <ion-row>
+            <ion-col>
+              <ion-icon name="call"></ion-icon> Contact Number:
+            </ion-col>
+
+            <ion-col>
+              +4917665211145
+            </ion-col>
+
+          </ion-row>
+        </ion-grid>
+      </div>
+
+    
+    </div >
+  </ion-content>
+  <ion-footer>
+    <ion-button expand="block" (click)="CallHelpLine()">Help</ion-button>
+</ion-footer>
\ No newline at end of file

src/app/help-line/help-line.page.scss

+.help-container{
+    height: 191px;
+    width: 100%;
+    
+    border: 1px solid #aaaaaa;
+    border-radius: 5px;
+    box-sizing: border-box;
+    float: left;
+      width: 100%;
+      height: 20%;
+      clear: both;
+      margin: 0;
+    position: absolute;
+    top: 80%;
+    left: 50%;
+    -ms-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+      
+    div {
+      height: inherit;
+      float: left;
+      
+    }
+    
+}
+.container {
+    height: 100%;
+    position: relative;
+   
+  }
+.center {
+    margin: 0;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    -ms-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+  }

src/app/help-line/help-line.page.spec.ts

+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { HelpLinePage } from './help-line.page';
+
+describe('HelpLinePage', () => {
+  let component: HelpLinePage;
+  let fixture: ComponentFixture<HelpLinePage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HelpLinePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(HelpLinePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/help-line/help-line.page.ts

+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-help-line',
+  templateUrl: './help-line.page.html',
+  styleUrls: ['./help-line.page.scss'],
+})
+export class HelpLinePage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/hirebike/hirebike.page.html

@@ -20,15 +20,20 @@
   </div-->
   <!--div #mapElement style="width: 100%; height: 100%" id="mapContainer"></div-->
   <!--app-here-map [startRideSubject]="startRideSubject" [gotReservedBikeSubject]="gotReservedBikeSubject"></app-here-map-->
-  <div #mapElement style="width: 100%; height: 100%" id="mapContainer" *ngIf="!is3DChecked"></div>
-  <ion-fab class="get-position" vertical="bottom" horizontal="end" (click)="getCurrentPosition()" slot="fixed">
+  <ion-card *ngIf="!isBikeReserved">
+    <ion-card-content>
+      No ride found
+    </ion-card-content>
+  </ion-card>
+  <div #mapElement style="width: 100%; height: 100%" id="mapContainer" *ngIf="isBikeReserved"></div>
+  <ion-fab *ngIf="isBikeReserved" class="get-position" vertical="bottom" horizontal="end" (click)="getCurrentPosition()" slot="fixed">
     <ion-fab-button>
       <ion-icon name="locate"></ion-icon>
     </ion-fab-button>
   </ion-fab>
 </ion-content>
 <ion-footer>
-  <div class="bike-details-container">
+  <div class="bike-details-container" *ngIf="isBikeReserved">
     <div class="inner">
       <div class="button-container">
 

src/app/hirebike/hirebike.page.ts

@@ -28,6 +28,8 @@ export class HirebikePage implements OnInit {
   isBikeHired = false;
   noReservation = true;
 
+  isBikeReserved = true;
+
   currentRoute: any;
   routeSummary: any;
   wayPointsInfo:any;
@@ -163,7 +165,7 @@ export class HirebikePage implements OnInit {
   }
 
   getReservedBike() {
-    //this.loadingService.showLoader();
+    this.loadingService.showLoader();
     this.storage.get('token').then((token) => {
       const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
       //call reserved bike api
@@ -182,23 +184,32 @@ export class HirebikePage implements OnInit {
             this.bikeDetails = resp.data;
             this.noReservation = false;
             this.reverseGeocode(this.platform, this.bikeDetails.lat, this.bikeDetails.lon);
+            this.isBikeReserved = true;
 
             //pass reserved bike subject here map
             this.gotReservedBikeSubject.next(resp.data);
-            //this.loadingService.hideLoader();
+            this.loadingService.hideLoader();
           }, (reservedBikeError) => {
             console.log(reservedBikeError);
-            //this.loadingService.hideLoader();
+            this.loadingService.hideLoader();
+            this.isBikeReserved = false;
           });
+        } else {
+          this.loadingService.hideLoader();
+          this.isBikeReserved = false;
         }
       }, (bikeDetailsError) => {
         console.log(bikeDetailsError);
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
+        this.isBikeReserved = false;
       });
     });
   }
 
   startTrip() {
+    this.isBikeHired = true;
+    this.startRideSubject.next('some value');
+    this.loadingService.showLoader();
     this.storage.get('token').then((token) => {
       const bikeId=this.bikeDetails.id;
       let url = 'http://193.196.52.237:8081/rent' + '?bikeId=' + this.bikeDetails.id;
@@ -206,13 +217,12 @@ export class HirebikePage implements OnInit {
       let bikeApi = this.httpClient.get(url, { headers });
       bikeApi.subscribe((resp) => {
         console.log('my data: ', resp);
-        this.feedbackService.setBikeid(this.bikeDetails.id);
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
         this.toastService.showToast("Trip Started");
         this.isBikeHired = true;
       }, (error) => {
         console.log(error);
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
         this.toastService.showToast("This is ongoing Trip");
       });
     });
@@ -225,19 +235,19 @@ export class HirebikePage implements OnInit {
   }
 
   CancelTrip() {
-    //this.loadingService.showLoader();
+    this.loadingService.showLoader();
     this.storage.get('token').then((token) => {
       let url = 'http://193.196.52.237:8081/rent' + '?bikeId=' + this.bikeDetails.id;
       const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
       let bikeApi = this.httpClient.delete(url, { headers });
       bikeApi.subscribe((resp) => {
         console.log('my data: ', resp);
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
         this.toastService.showToast("Trip Ended!");
         this.router.navigateByUrl('/feedback');
       }, (error) => {
         console.log(error);
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
         this.toastService.showToast("No Ongong Trip to End")
       });
     });

src/app/home/home.page.ts

@@ -145,7 +145,7 @@ export class HomePage implements OnInit, OnDestroy {
   }
 
   getBikesList() {
-    //this.loadingService.showLoader();
+    this.loadingService.showLoader();
     this.storage.get('token').then((token) => {
       let url = 'http://193.196.52.237:8081/bikes' + '?lat=' + this.currentUserPosition.lat + '&lng=' + this.currentUserPosition.lng;
       const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
@@ -158,9 +158,9 @@ export class HomePage implements OnInit, OnDestroy {
           this.reverseGeocode(this.platform, this.bikes[i].lat, this.bikes[i].lon, i);
         }
         this.showBikesOnMap();
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
       }, (error) => {console.log(error)
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
       });
     });
   }
@@ -261,7 +261,7 @@ export class HomePage implements OnInit, OnDestroy {
 
   reserveBike() {
     //this.selectedBike=bikeS;
-    //this.loadingService.showLoader();
+    this.loadingService.showLoader();
     this.storage.get('token').then((token) => {
       let url = 'http://193.196.52.237:8081/reservation' + '?bikeId=' + this.selectedBike.id;
       const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
@@ -271,10 +271,10 @@ export class HomePage implements OnInit, OnDestroy {
         this.isBikeReserved = true;
         this.toastService.showToast("Reservation Successful!");
         this.router.navigateByUrl('/myreservation');
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
       }, (error) => {
         console.log(error);
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
         this.toastService.showToast("Only one bike may be reserved or rented at a time");
       });
     });

src/app/myreservation/myreservation.page.html

@@ -16,7 +16,7 @@
     </ion-card-content>
   </ion-card>
   <div #mapElement style="width: 100%; height: 100%" id="mapContainer" *ngIf="isBikeReserved"></div>
-  <ion-fab class="get-position" vertical="bottom" horizontal="end" (click)="getCurrentPosition()" slot="fixed">
+  <ion-fab *ngIf="isBikeReserved" class="get-position" vertical="bottom" horizontal="end" (click)="getCurrentPosition()" slot="fixed">
     <ion-fab-button>
       <ion-icon name="locate"></ion-icon>
     </ion-fab-button>

src/app/myreservation/myreservation.page.ts

@@ -131,7 +131,7 @@ export class MyreservationPage implements OnInit {
   }
 
   getReservedBike() {
-    //this.loadingService.showLoader();
+    this.loadingService.showLoader();
     this.storage.get('token').then((token) => {
       const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
       //call reserved bike api
@@ -147,7 +147,7 @@ export class MyreservationPage implements OnInit {
           let bikeDetailsApi = this.httpClient.get(bikeDetailsUrl, { headers });
           bikeDetailsApi.subscribe((resp: any) => {
             console.log('Bike Details', resp);
-            //this.loadingService.hideLoader();
+            this.loadingService.hideLoader();
             this.bikeDetails = resp.data;
             this.reverseGeocode(this.platform, this.bikeDetails.lat, this.bikeDetails.lon);
             this.isBikeReserved = true;
@@ -163,13 +163,16 @@ export class MyreservationPage implements OnInit {
                 console.log(error.message);
               });
           }, (reservedBikeError) => {
-            //this.loadingService.hideLoader();
+            this.loadingService.hideLoader();
             console.log(reservedBikeError);
             this.isBikeReserved = false;
           });
+        } else {
+          this.loadingService.hideLoader();
+          this.isBikeReserved = false;
         }
       }, (bikeDetailsError) => {
-        //this.loadingService.hideLoader();
+        this.loadingService.hideLoader();
         console.log(bikeDetailsError)
         this.isBikeReserved = false;
       });

src/app/reset-password/reset-password-routing.module.ts

+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ResetPasswordPage } from './reset-password.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ResetPasswordPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ResetPasswordPageRoutingModule {}