Merge branch '63-password-reset-api-integration' into 'master'

Resolve "Password reset API integration"

Closes #63

See merge request 92khra1mst/hft_awado_app!48

src/app/app-routing.module.ts

-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 {}

src/app/app.component.ts

@@ -44,6 +44,11 @@ export class AppComponent {
       url: '/help-line',
       icon: 'call'
     },
+    {
+      title: 'Settings',
+      url: '/settings',
+      icon: 'settings'
+    },
     {
       title: 'Logout',
       url: '/login',

src/app/reset-password/reset-password-routing.module.ts → src/app/settings/settings-routing.module.ts

 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 {}

src/app/reset-password/reset-password.module.ts → 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 {}

src/app/settings/settings.page.html

+<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>

src/app/reset-password/reset-password.page.spec.ts → src/app/settings/settings.page.spec.ts

 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();
   }));

src/app/settings/settings.page.ts

+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');
+  }
+}