diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 15f51808422d8000aaf52df363d1a7917a25763b..80fc3b901277150c608d4784e630da70c5d67de2 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,61 +1,65 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; - -const routes: Routes = [ - { - path: '', - redirectTo: 'login', - pathMatch: 'full' - }, - { - path: 'home', - loadChildren: () => import('./home/home.module').then(m => m.HomePageModule) - }, - { - path: 'list', - loadChildren: () => import('./list/list.module').then(m => m.ListPageModule) - }, - { - path: 'login', - loadChildren: () => import('./auth/login/login.module').then( m => m.LoginPageModule) - }, - { - path: 'register', - loadChildren: () => import('./auth/register/register.module').then( m => m.RegisterPageModule) - }, - { - path: 'myreservation', - loadChildren: () => import('./myreservation/myreservation.module').then( m => m.MyreservationPageModule) - }, - { - path: 'hirebike', - loadChildren: () => import('./hirebike/hirebike.module').then( m => m.HirebikePageModule) - }, - { - path: 'ridehistory', - 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: 'reset-password', - loadChildren: () => import('./reset-password/reset-password.module').then( m => m.ResetPasswordPageModule) +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; + +const routes: Routes = [ + { + path: '', + redirectTo: 'login', + pathMatch: 'full' + }, + { + path: 'home', + loadChildren: () => import('./home/home.module').then(m => m.HomePageModule) + }, + { + path: 'list', + loadChildren: () => import('./list/list.module').then(m => m.ListPageModule) + }, + { + path: 'login', + loadChildren: () => import('./auth/login/login.module').then( m => m.LoginPageModule) + }, + { + path: 'register', + loadChildren: () => import('./auth/register/register.module').then( m => m.RegisterPageModule) + }, + { + path: 'myreservation', + loadChildren: () => import('./myreservation/myreservation.module').then( m => m.MyreservationPageModule) + }, + { + path: 'hirebike', + loadChildren: () => import('./hirebike/hirebike.module').then( m => m.HirebikePageModule) + }, + { + path: 'ridehistory', + 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: 'reset-password', + loadChildren: () => import('./auth/reset-password/reset-password.module').then( m => m.ResetPasswordPageModule) + }, { + path: 'settings', + loadChildren: () => import('./settings/settings.module').then( m => m.SettingsPageModule) } - - -]; - -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + + + +]; + +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 9082ff62261196395a209604ed896623eca4c536..3fc8a689e993d2dbe4ea5d3f8a331f4687c1b4bb 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -48,6 +48,11 @@ export class AppComponent { url: '/help-line', icon: 'call' }, + { + title: 'Settings', + url: '/settings', + icon: 'settings' + }, { title: 'Logout', url: '/login', diff --git a/src/app/reset-password/reset-password-routing.module.ts b/src/app/settings/settings-routing.module.ts similarity index 63% rename from src/app/reset-password/reset-password-routing.module.ts rename to src/app/settings/settings-routing.module.ts index 335ad7782c9d13b507b11957c05fd623f4763194..59decc029132d2efe0047079a633bcc9dbc82325 100644 --- a/src/app/reset-password/reset-password-routing.module.ts +++ b/src/app/settings/settings-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { ResetPasswordPage } from './reset-password.page'; +import { SettingsPage } from './settings.page'; const routes: Routes = [ { path: '', - component: ResetPasswordPage + component: SettingsPage } ]; @@ -14,4 +14,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class ResetPasswordPageRoutingModule {} +export class SettingsPageRoutingModule {} diff --git a/src/app/reset-password/reset-password.module.ts b/src/app/settings/settings.module.ts similarity index 51% rename from src/app/reset-password/reset-password.module.ts rename to src/app/settings/settings.module.ts index 30e0cd0b2c4ce8007ab7f512c40435be967ea959..c7dd28ecdd5e17ae9d746141ecef8c173f341d9b 100644 --- a/src/app/reset-password/reset-password.module.ts +++ b/src/app/settings/settings.module.ts @@ -4,17 +4,17 @@ import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; -import { ResetPasswordPageRoutingModule } from './reset-password-routing.module'; +import { SettingsPageRoutingModule } from './settings-routing.module'; -import { ResetPasswordPage } from './reset-password.page'; +import { SettingsPage } from './settings.page'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - ResetPasswordPageRoutingModule + SettingsPageRoutingModule ], - declarations: [ResetPasswordPage] + declarations: [SettingsPage] }) -export class ResetPasswordPageModule {} +export class SettingsPageModule {} diff --git a/src/app/settings/settings.page.html b/src/app/settings/settings.page.html new file mode 100644 index 0000000000000000000000000000000000000000..f03509b79aef440945158c9e1b28a959cf432f43 --- /dev/null +++ b/src/app/settings/settings.page.html @@ -0,0 +1,25 @@ + + + + + + + Settings + + + + + + + + Change Password + + + + + Deactivate Account + + + + + diff --git a/src/app/reset-password/reset-password.page.scss b/src/app/settings/settings.page.scss similarity index 100% rename from src/app/reset-password/reset-password.page.scss rename to src/app/settings/settings.page.scss diff --git a/src/app/reset-password/reset-password.page.spec.ts b/src/app/settings/settings.page.spec.ts similarity index 58% rename from src/app/reset-password/reset-password.page.spec.ts rename to src/app/settings/settings.page.spec.ts index 5628db6d2b7cef64da8482e0a8764ec079d1c638..220f3e1a19deecb2969d0f904fe5629b523ceabb 100644 --- a/src/app/reset-password/reset-password.page.spec.ts +++ b/src/app/settings/settings.page.spec.ts @@ -1,19 +1,19 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { ResetPasswordPage } from './reset-password.page'; +import { SettingsPage } from './settings.page'; -describe('ResetPasswordPage', () => { - let component: ResetPasswordPage; - let fixture: ComponentFixture; +describe('SettingsPage', () => { + let component: SettingsPage; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ResetPasswordPage ], + declarations: [ SettingsPage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(ResetPasswordPage); + fixture = TestBed.createComponent(SettingsPage); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/settings/settings.page.ts b/src/app/settings/settings.page.ts new file mode 100644 index 0000000000000000000000000000000000000000..f8fa8c099b17abd0a2d64d7b17e178a7ddc32f5e --- /dev/null +++ b/src/app/settings/settings.page.ts @@ -0,0 +1,22 @@ +import { Component, OnInit } from '@angular/core'; +import { Router, LoadChildrenCallback } from '@angular/router'; +import { ToastService } from '../services/toast.service'; +@Component({ + selector: 'app-settings', + templateUrl: './settings.page.html', + styleUrls: ['./settings.page.scss'], +}) +export class SettingsPage implements OnInit { + + constructor(private router: Router,private toastService: ToastService) { } + + ngOnInit() { + } + ChangePassword() { + this.router.navigateByUrl('/reset-password'); + } + DeactivateUser(){ + this.toastService.showToast("Account Deactivated Sucessfully"); + this.router.navigateByUrl('/logout'); + } +}