From 63f87f70a97f32c84962caecfb1fd3447a36d7a0 Mon Sep 17 00:00:00 2001
From: Priyanka Upadhye <92uppr1mst@hft-stuttgart.de>
Date: Mon, 6 Jan 2020 16:09:58 +0100
Subject: [PATCH] created settings menu
---
src/app/app-routing.module.ts | 122 +++++++++---------
src/app/app.component.ts | 5 +
.../settings-routing.module.ts} | 6 +-
.../settings.module.ts} | 10 +-
src/app/settings/settings.page.html | 25 ++++
.../settings.page.scss} | 0
.../settings.page.spec.ts} | 12 +-
src/app/settings/settings.page.ts | 22 ++++
8 files changed, 129 insertions(+), 73 deletions(-)
rename src/app/{reset-password/reset-password-routing.module.ts => settings/settings-routing.module.ts} (63%)
rename src/app/{reset-password/reset-password.module.ts => settings/settings.module.ts} (51%)
create mode 100644 src/app/settings/settings.page.html
rename src/app/{reset-password/reset-password.page.scss => settings/settings.page.scss} (100%)
rename src/app/{reset-password/reset-password.page.spec.ts => settings/settings.page.spec.ts} (58%)
create mode 100644 src/app/settings/settings.page.ts
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 15f5180..80fc3b9 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 9082ff6..3fc8a68 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 335ad77..59decc0 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 30e0cd0..c7dd28e 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 0000000..f03509b
--- /dev/null
+++ b/src/app/settings/settings.page.html
@@ -0,0 +1,25 @@
+<ion-header>
+ <ion-toolbar color="awPrimary">
+ <ion-buttons slot="start">
+ <ion-menu-button></ion-menu-button>
+ </ion-buttons>
+ <ion-title slot="start">
+ Settings
+ </ion-title>
+ </ion-toolbar>
+</ion-header>
+
+<ion-content>
+ <ion-item (click)="ChangePassword()">
+ <ion-label>
+ Change Password
+ </ion-label>
+ </ion-item>
+ <ion-item (click)="DeactivateUser()">
+ <ion-label>
+ Deactivate Account
+ </ion-label>
+ </ion-item>
+
+
+</ion-content>
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 5628db6..220f3e1 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<ResetPasswordPage>;
+describe('SettingsPage', () => {
+ let component: SettingsPage;
+ let fixture: ComponentFixture<SettingsPage>;
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 0000000..f8fa8c0
--- /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');
+ }
+}
--
GitLab