From 2389ceb38fd8b54720ced8c0379152c657da422b Mon Sep 17 00:00:00 2001
From: Priyanka Upadhye <92uppr1mst@hft-stuttgart.de>
Date: Sat, 14 Dec 2019 20:07:31 +0100
Subject: [PATCH] Help Page
---
package.json | 2 +-
src/app/app-routing.module.ts | 4 ++
src/app/app.component.ts | 9 +++-
src/app/auth/login/login.page.ts | 6 +--
src/app/help-line/help-line-routing.module.ts | 17 +++++++
src/app/help-line/help-line.module.ts | 20 ++++++++
src/app/help-line/help-line.page.html | 46 +++++++++++++++++++
src/app/help-line/help-line.page.scss | 19 ++++++++
src/app/help-line/help-line.page.spec.ts | 24 ++++++++++
src/app/help-line/help-line.page.ts | 15 ++++++
10 files changed, 156 insertions(+), 6 deletions(-)
create mode 100644 src/app/help-line/help-line-routing.module.ts
create mode 100644 src/app/help-line/help-line.module.ts
create mode 100644 src/app/help-line/help-line.page.html
create mode 100644 src/app/help-line/help-line.page.scss
create mode 100644 src/app/help-line/help-line.page.spec.ts
create mode 100644 src/app/help-line/help-line.page.ts
diff --git a/package.json b/package.json
index 01025e7..15a835f 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 1c655ac..8d2f42f 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 e94be3c..39fccb2 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 3435cc7..1f73808 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 0000000..048c67d
--- /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 0000000..3cc0b57
--- /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 0000000..fade6f3
--- /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 0000000..11b44ef
--- /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 0000000..f917133
--- /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 0000000..e8038b7
--- /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() {
+ }
+
+}
--
GitLab