Commit a3ca0359 authored by Priyanka Vivekanand Upadhye's avatar Priyanka Vivekanand Upadhye
Browse files

Merge branch '56-create-dummy-page-or-menu-for-hotline-contact' into 'master'

Resolve "Create Dummy Page or menu for Hotline Contact"

Closes #56

See merge request 92khra1mst/hft_awado_app!38
parents 71e61580 9bf15b87
......@@ -88,4 +88,4 @@
"browser"
]
}
}
\ No newline at end of file
}
......@@ -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)
}
......
......@@ -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',
......
......@@ -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() {
......
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 {}
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 {}
<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
.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%);
}
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();
});
});
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() {
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment