diff --git a/package.json b/package.json index 01025e7a896de2a0ce3f087a03a6566498c6724b..15a835ffd2f18fcbacc82937187f05ff2e185526 100644 --- a/package.json +++ b/package.json @@ -88,4 +88,4 @@ "browser" ] } -} \ No newline at end of file +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 1c655ac1ee577ae9d623e7bb6f265a84f6770ee1..8d2f42f1eb3e384a7a260fbecc829047fdee9b4e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -33,6 +33,10 @@ const routes: Routes = [ { path: 'ridehistory', loadChildren: () => import('./ridehistory/ridehistory.module').then( m => m.RidehistoryPageModule) + }, + { + path: 'help-line', + loadChildren: () => import('./help-line/help-line.module').then( m => m.HelpLinePageModule) } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index e94be3cbafda9a2979d9c4f208fa8d88212de7a3..39fccb2320eb5866961931152d278a765248213f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -27,17 +27,22 @@ export class AppComponent { { title: 'My Reservation', url: '/myreservation', - icon: 'clipboard' + icon: 'cart' }, { title: 'My Rides', url: '/hirebike', - icon: 'clipboard' + icon: 'bicycle' }, { title: 'Ride History', url: '/ridehistory', icon: 'clipboard' }, + { + title: 'Help', + url: '/help-line', + icon: 'call' + }, { title: 'Logout', url: '/login', diff --git a/src/app/auth/login/login.page.ts b/src/app/auth/login/login.page.ts index 3435cc7954c3c5e525e0ffc4a3a1db81ded71d8e..1f73808ff44a633f24c4c119ea04653cfe948cd9 100644 --- a/src/app/auth/login/login.page.ts +++ b/src/app/auth/login/login.page.ts @@ -42,7 +42,7 @@ export class LoginPage implements OnInit { "email": this.username, "password": this.password }); - this.loadingService.showLoader(); + //this.loadingService.showLoader(); this.loginApi .subscribe((data) => { //console.log('my data: ', data); @@ -50,11 +50,11 @@ export class LoginPage implements OnInit { this.restService.isLoginPage = false; this.userService.setUsername(this.username); this.router.navigateByUrl('/home'); - this.loadingService.hideLoader(); + //this.loadingService.hideLoader(); }, (error) => { console.log(JSON.stringify(error)); this.correctCredentials = true; - this.loadingService.hideLoader(); + //this.loadingService.hideLoader(); }); } register() { diff --git a/src/app/help-line/help-line-routing.module.ts b/src/app/help-line/help-line-routing.module.ts new file mode 100644 index 0000000000000000000000000000000000000000..048c67d0f83404beb0fa6336f0c44b3b3bcd0148 --- /dev/null +++ b/src/app/help-line/help-line-routing.module.ts @@ -0,0 +1,17 @@ +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 {} diff --git a/src/app/help-line/help-line.module.ts b/src/app/help-line/help-line.module.ts new file mode 100644 index 0000000000000000000000000000000000000000..3cc0b579c2ff90db1b2a3db0a3f7b0424e81d76a --- /dev/null +++ b/src/app/help-line/help-line.module.ts @@ -0,0 +1,20 @@ +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 {} diff --git a/src/app/help-line/help-line.page.html b/src/app/help-line/help-line.page.html new file mode 100644 index 0000000000000000000000000000000000000000..fade6f311a80810915a5732ad884f52f41509ba7 --- /dev/null +++ b/src/app/help-line/help-line.page.html @@ -0,0 +1,46 @@ + <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 > + <div class="help-container"> + <ion-grid> + <ion-row> + <ion-col> + Contact Person: + </ion-col> + <ion-col> + Priyanaka Upadhye + </ion-col> + </ion-row> + <ion-row> + <ion-col> + Contact Email: + </ion-col> + <ion-col> + priya.upadhye@gmail.com + </ion-col> + </ion-row> + + <ion-row> + <ion-col> + Contact Number: + </ion-col> + <ion-col> + +4917665211145 + </ion-col> + + </ion-row> + </ion-grid> + </div> + </div > + </ion-content> \ No newline at end of file diff --git a/src/app/help-line/help-line.page.scss b/src/app/help-line/help-line.page.scss new file mode 100644 index 0000000000000000000000000000000000000000..11b44ef34d38ebaaaf3d2b1b3c331ddd30cb411e --- /dev/null +++ b/src/app/help-line/help-line.page.scss @@ -0,0 +1,19 @@ +.help-container{ + height: 191px; + width: 100%; + + border: 1px solid #aaaaaa; + border-radius: 5px; + box-sizing: border-box; + float: left; + width: 100%; + height: 80%; + clear: both; + + div { + height: inherit; + float: left; + + } + +} diff --git a/src/app/help-line/help-line.page.spec.ts b/src/app/help-line/help-line.page.spec.ts new file mode 100644 index 0000000000000000000000000000000000000000..f9171335714773c0cf02df9af71c1e3d14b8ddb1 --- /dev/null +++ b/src/app/help-line/help-line.page.spec.ts @@ -0,0 +1,24 @@ +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(); + }); +}); diff --git a/src/app/help-line/help-line.page.ts b/src/app/help-line/help-line.page.ts new file mode 100644 index 0000000000000000000000000000000000000000..e8038b784652a4f786e4cdc39901168391f7e9a3 --- /dev/null +++ b/src/app/help-line/help-line.page.ts @@ -0,0 +1,15 @@ +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() { + } + +}