diff --git a/REMEMBER.txt b/REMEMBER.txt index 1623a8e..f1d9ec3 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -22,6 +22,8 @@ ionic generate component suggestedlist ionic generate component familypending +ionic generate page logout + npm install angularx-qrcode@14.0.0 --save diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index cb86514..c351d8e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -230,6 +230,10 @@ const routes: Routes = [ path: 'playground', loadChildren: () => import('./pages-family/playground/playground.module').then(m => m.PlaygroundPageModule) }, + { + path: 'logout', + loadChildren: () => import('./pages/logout/logout.module').then(m => m.LogoutPageModule) + }, ]; @NgModule({ diff --git a/src/app/pages/logout/logout-routing.module.ts b/src/app/pages/logout/logout-routing.module.ts new file mode 100644 index 0000000..6354441 --- /dev/null +++ b/src/app/pages/logout/logout-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { LogoutPage } from './logout.page'; + +const routes: Routes = [ + { + path: '', + component: LogoutPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class LogoutPageRoutingModule {} diff --git a/src/app/pages/logout/logout.module.ts b/src/app/pages/logout/logout.module.ts new file mode 100644 index 0000000..9315c4f --- /dev/null +++ b/src/app/pages/logout/logout.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 { LogoutPageRoutingModule } from './logout-routing.module'; + +import { LogoutPage } from './logout.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + LogoutPageRoutingModule + ], + declarations: [LogoutPage] +}) +export class LogoutPageModule {} diff --git a/src/app/pages/logout/logout.page.html b/src/app/pages/logout/logout.page.html new file mode 100644 index 0000000..dc637e8 --- /dev/null +++ b/src/app/pages/logout/logout.page.html @@ -0,0 +1,24 @@ + + + + WrenchBoard + + + Thanks for visiting + + + + + You are now logged out of your account. + + + + + +
+ Login +
+
+
\ No newline at end of file diff --git a/src/app/pages/logout/logout.page.scss b/src/app/pages/logout/logout.page.scss new file mode 100644 index 0000000..19294b5 --- /dev/null +++ b/src/app/pages/logout/logout.page.scss @@ -0,0 +1,37 @@ +ion-content{ + --background: white; + ion-card{ + margin-right: 0px; + margin-left: 0px; + margin: 0px; + } +} + +ion-footer { + --background: white; + + ion-toolbar { + --border-width: 0px; + padding: 10px; + align-items: center; + + ion-icon { + color: white; + font-size: 25px; + } + + .button { + background-color: var(--ion-color-primary); + display: flex; + align-items: center; + justify-content: space-around; + border-radius: 30px; + padding: 12px 0; + + .text { + color: white; + } + } + } +} + diff --git a/src/app/pages/logout/logout.page.spec.ts b/src/app/pages/logout/logout.page.spec.ts new file mode 100644 index 0000000..0c4f7f8 --- /dev/null +++ b/src/app/pages/logout/logout.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { LogoutPage } from './logout.page'; + +describe('LogoutPage', () => { + let component: LogoutPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ LogoutPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(LogoutPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/logout/logout.page.ts b/src/app/pages/logout/logout.page.ts new file mode 100644 index 0000000..dbb371a --- /dev/null +++ b/src/app/pages/logout/logout.page.ts @@ -0,0 +1,23 @@ +import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; + +@Component({ + selector: 'app-logout', + templateUrl: './logout.page.html', + styleUrls: ['./logout.page.scss'], +}) +export class LogoutPage implements OnInit { + + constructor( + private navctr: NavController, + private router: Router + ) { } + + ngOnInit() { + } + + onBack() { + this.router.navigate(['login']); + } +} diff --git a/src/app/pages/profile/profile.page.ts b/src/app/pages/profile/profile.page.ts index d36801f..9bad6f0 100644 --- a/src/app/pages/profile/profile.page.ts +++ b/src/app/pages/profile/profile.page.ts @@ -87,7 +87,7 @@ export class ProfilePage implements OnInit { text: "Log out", handler: () => { this.sessionDataProviderService.DestroySessionOnLogout(); - this.router.navigate(['login']); + this.router.navigate(['logout']); }, }, ], @@ -95,27 +95,27 @@ export class ProfilePage implements OnInit { await alert.present(); } - async requestLogout() { - const alert = await this.alertController.create({ - header: "Log out", - message: "Confirm you are ready to log out now.", - buttons: [ - { - text: "Cancel", - role: "cancel", - handler: () => { - // this.getMyOffersData(); - }, - }, - { - text: "Log out", - handler: () => { - this.sessionDataProviderService.DestroySessionOnLogout(); - this.router.navigate(['login']); - }, - }, - ], - }); - await alert.present(); - } + // async requestLogout() { + // const alert = await this.alertController.create({ + // header: "Log out", + // message: "Confirm you are ready to log out now.", + // buttons: [ + // { + // text: "Cancel", + // role: "cancel", + // handler: () => { + // // this.getMyOffersData(); + // }, + // }, + // { + // text: "Log out", + // handler: () => { + // this.sessionDataProviderService.DestroySessionOnLogout(); + // this.router.navigate(['logout']); + // }, + // }, + // ], + // }); + // await alert.present(); + // } }