From adbe142ffc605f0cffa7cb3b5d3594f7ba917c4c Mon Sep 17 00:00:00 2001 From: spekulaas Date: Tue, 4 Jan 2022 04:09:19 +0100 Subject: [PATCH] changed page names for automatic routing --- AuthentesApp/src/app/app-routing.module.ts | 4 ++-- AuthentesApp/src/app/modalsGame/modalsGame.page.ts | 6 ++++-- AuthentesApp/src/app/services/game.service.ts | 10 ++++++---- .../valuesSorting-routing.module.ts} | 6 +++--- .../valuesSorting.module.ts} | 10 +++++----- .../valuesSorting.page.html} | 0 .../valuesSorting.page.scss} | 0 .../valuesSorting.page.spec.ts} | 10 +++++----- .../valuesSorting.page.ts} | 6 +++--- 9 files changed, 28 insertions(+), 24 deletions(-) rename AuthentesApp/src/app/{values/values-routing.module.ts => valuesSorting/valuesSorting-routing.module.ts} (62%) rename AuthentesApp/src/app/{values/values.module.ts => valuesSorting/valuesSorting.module.ts} (51%) rename AuthentesApp/src/app/{values/values.page.html => valuesSorting/valuesSorting.page.html} (100%) rename AuthentesApp/src/app/{values/values.page.scss => valuesSorting/valuesSorting.page.scss} (100%) rename AuthentesApp/src/app/{values/values.page.spec.ts => valuesSorting/valuesSorting.page.spec.ts} (64%) rename AuthentesApp/src/app/{values/values.page.ts => valuesSorting/valuesSorting.page.ts} (98%) diff --git a/AuthentesApp/src/app/app-routing.module.ts b/AuthentesApp/src/app/app-routing.module.ts index 3f7b3f8..770625a 100644 --- a/AuthentesApp/src/app/app-routing.module.ts +++ b/AuthentesApp/src/app/app-routing.module.ts @@ -11,8 +11,8 @@ const routes: Routes = [ loadChildren: () => import('./beliefs/beliefs.module').then( m => m.BeliefsPageModule) }, { - path: 'values', - loadChildren: () => import('./values/values.module').then( m => m.ValuesPageModule) + path: 'valuesSorting', + loadChildren: () => import('./valuesSorting/valuesSorting.module').then( m => m.ValuesSortingPageModule) }, { path: 'valuesAlign', diff --git a/AuthentesApp/src/app/modalsGame/modalsGame.page.ts b/AuthentesApp/src/app/modalsGame/modalsGame.page.ts index 33b0044..0ff50cd 100644 --- a/AuthentesApp/src/app/modalsGame/modalsGame.page.ts +++ b/AuthentesApp/src/app/modalsGame/modalsGame.page.ts @@ -76,8 +76,10 @@ export class ModalsGamePage { break; case "Values": - await this.game.initValuesGame(); - break; + const status = await this.game.initValuesGame(); + console.log(`/${game.toLowerCase()}${status}`); + this.router.navigateByUrl(`/${game.toLowerCase()}${status}`); + return; } // routing is in lowercase, set text to lower diff --git a/AuthentesApp/src/app/services/game.service.ts b/AuthentesApp/src/app/services/game.service.ts index f5d99bf..a508cdd 100644 --- a/AuthentesApp/src/app/services/game.service.ts +++ b/AuthentesApp/src/app/services/game.service.ts @@ -43,7 +43,7 @@ export class GameService { // if (data["Status"] == "Success") { // console.log(data["Data"]); - await this.storage.set(`${game.toUpperCase()}GAME_TOKEN`, { status: "sorting", cards:[{"title":"Temp_card_1"}, {"title":"Temp_card_2"}, {"title":"Temp_card_3"}, {"title":"Temp_card_4"}, {"title":"Temp_card_5"}, {"title":"Temp_card_6"}, {"title":"Temp_card_7"}, {"title":"Temp_card_8"}]}); + await this.storage.set(`${game.toUpperCase()}GAME_TOKEN`, { status: "Sorting", cards:[{"title":"Temp_card_1"}, {"title":"Temp_card_2"}, {"title":"Temp_card_3"}, {"title":"Temp_card_4"}, {"title":"Temp_card_5"}, {"title":"Temp_card_6"}, {"title":"Temp_card_7"}, {"title":"Temp_card_8"}]}); // } // return data; // }), @@ -53,8 +53,10 @@ export class GameService { public async initValuesGame(){ console.log("[GameService] Initializing Value game..."); - this.cardset = await this.storage.get("VALUESGAME_TOKEN"); - console.log(this.cardset["cards"]); - this.cardset = this.cardset["cards"]; + const token = await this.storage.get("VALUESGAME_TOKEN"); + // console.log(this.cardset["cards"]); + this.cardset = token["cards"]; + + return token["status"]; } } \ No newline at end of file diff --git a/AuthentesApp/src/app/values/values-routing.module.ts b/AuthentesApp/src/app/valuesSorting/valuesSorting-routing.module.ts similarity index 62% rename from AuthentesApp/src/app/values/values-routing.module.ts rename to AuthentesApp/src/app/valuesSorting/valuesSorting-routing.module.ts index f765f2b..92738c8 100644 --- a/AuthentesApp/src/app/values/values-routing.module.ts +++ b/AuthentesApp/src/app/valuesSorting/valuesSorting-routing.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { ValuesPage } from './values.page'; +import { ValuesSortingPage } from './valuesSorting.page'; const routes: Routes = [ { path: '', - component: ValuesPage, + component: ValuesSortingPage, } ]; @@ -13,4 +13,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class ValuesPageRoutingModule {} +export class ValuesSortingPageRoutingModule {} diff --git a/AuthentesApp/src/app/values/values.module.ts b/AuthentesApp/src/app/valuesSorting/valuesSorting.module.ts similarity index 51% rename from AuthentesApp/src/app/values/values.module.ts rename to AuthentesApp/src/app/valuesSorting/valuesSorting.module.ts index d0d18af..0c7d72d 100644 --- a/AuthentesApp/src/app/values/values.module.ts +++ b/AuthentesApp/src/app/valuesSorting/valuesSorting.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; import { FormsModule } from '@angular/forms'; -import { ValuesPage } from './values.page'; +import { ValuesSortingPage } from './valuesSorting.page'; -import { ValuesPageRoutingModule } from './values-routing.module'; +import { ValuesSortingPageRoutingModule } from './valuesSorting-routing.module'; @NgModule({ @@ -12,8 +12,8 @@ import { ValuesPageRoutingModule } from './values-routing.module'; CommonModule, FormsModule, IonicModule, - ValuesPageRoutingModule + ValuesSortingPageRoutingModule ], - declarations: [ValuesPage] + declarations: [ValuesSortingPage] }) -export class ValuesPageModule {} +export class ValuesSortingPageModule {} diff --git a/AuthentesApp/src/app/values/values.page.html b/AuthentesApp/src/app/valuesSorting/valuesSorting.page.html similarity index 100% rename from AuthentesApp/src/app/values/values.page.html rename to AuthentesApp/src/app/valuesSorting/valuesSorting.page.html diff --git a/AuthentesApp/src/app/values/values.page.scss b/AuthentesApp/src/app/valuesSorting/valuesSorting.page.scss similarity index 100% rename from AuthentesApp/src/app/values/values.page.scss rename to AuthentesApp/src/app/valuesSorting/valuesSorting.page.scss diff --git a/AuthentesApp/src/app/values/values.page.spec.ts b/AuthentesApp/src/app/valuesSorting/valuesSorting.page.spec.ts similarity index 64% rename from AuthentesApp/src/app/values/values.page.spec.ts rename to AuthentesApp/src/app/valuesSorting/valuesSorting.page.spec.ts index 5c5c05d..a91482c 100644 --- a/AuthentesApp/src/app/values/values.page.spec.ts +++ b/AuthentesApp/src/app/valuesSorting/valuesSorting.page.spec.ts @@ -1,19 +1,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { ValuesPage } from './values.page'; +import { ValuesSortingPage } from './valuesSorting.page'; describe('HomePage', () => { - let component: ValuesPage; - let fixture: ComponentFixture; + let component: ValuesSortingPage; + let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ ValuesPage ], + declarations: [ ValuesSortingPage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(ValuesPage); + fixture = TestBed.createComponent(ValuesSortingPage); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/AuthentesApp/src/app/values/values.page.ts b/AuthentesApp/src/app/valuesSorting/valuesSorting.page.ts similarity index 98% rename from AuthentesApp/src/app/values/values.page.ts rename to AuthentesApp/src/app/valuesSorting/valuesSorting.page.ts index 429dfe6..984f463 100644 --- a/AuthentesApp/src/app/values/values.page.ts +++ b/AuthentesApp/src/app/valuesSorting/valuesSorting.page.ts @@ -6,10 +6,10 @@ import { GameService } from '../services/game.service'; @Component({ selector: 'app-home', - templateUrl: 'values.page.html', - styleUrls: ['values.page.scss'], + templateUrl: 'valuesSorting.page.html', + styleUrls: ['valuesSorting.page.scss'], }) -export class ValuesPage { +export class ValuesSortingPage { @ViewChildren('card') cards: QueryList; cardsArray: Array;