Commit 1de125ca authored by Dennis Willers's avatar Dennis Willers
Browse files

Change Router Logik 

Prepare Tabu.csv for MariaDB
parent c6123ac8

Tabu.csv

+2 −1
Original line number Original line Diff line number Diff line 
1;Elefant;Rüssel;Dickhäuter;Tier;Afrika;grau

RoundID;Solution;Tabu1;Tabu2;Tabu3;Tabu4;Tabu5

1;Elefant;Rüssel;Dickhäuter;Tier;Afrika;grau

2;Küche;Koch;Essen;Kühlschrank;Herd;Arbeitsplatte

2;Küche;Koch;Essen;Kühlschrank;Herd;Arbeitsplatte

3;Taschengeld;Ausgeben;Sparen;Jacke;Euro;Eltern

3;Taschengeld;Ausgeben;Sparen;Jacke;Euro;Eltern

4;Schwimmen;Sport;Verein;Wasser;Baden;Kraul

4;Schwimmen;Sport;Verein;Wasser;Baden;Kraul

src/app/app-routing.module.ts

+14 −2
Original line number Original line Diff line number Diff line
@@ -7,11 +7,23 @@ import {GameComponent} from './game/game.component'; 




const routes: Routes = [

const routes: Routes = [

  {

  {

    path: 'game/:sessionName/overview',

    path: ':sessionName',

    component: OverviewComponent,

    component: OverviewComponent,

  },

  },

  {

  {

    path: 'game',

    path: ':sessionName/:team',

    component: OverviewComponent,

  },

  {

    path: ':sessionName/:team/watchdog',

    component: GameComponent,

  },

  {

    path: ':sessionName/:team/explainer',

    component: GameComponent,

  },

  {

    path: ':sessionName/:team/guesser',

    component: GameComponent,

    component: GameComponent,

  },

  },

  {

  {

src/app/overview/overview.component.ts

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,6 +13,6 @@ export class OverviewComponent implements OnInit { 
  ngOnInit(): void {

  ngOnInit(): void {

  }

  }

  startGame(): void {

  startGame(): void {

    this.router.navigate(['/game']);

    this.router.navigate([this.router.url+'/red/watchdog']);

  }

  }

}
 
}

src/app/select-game/select-game.component.ts

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ export class SelectGameComponent implements OnInit { 
      console.log(value);

      console.log(value);

      const status = JSON.parse(value.status);

      const status = JSON.parse(value.status);

      if (status) {

      if (status) {

        this.router.navigate(['/game/' + spielname + '/overview']);

        this.router.navigate([spielname]);

      }

      }

    }).catch(reason => {

    }).catch(reason => {

      console.log(reason);

      console.log(reason);
@@ -37,7 +37,7 @@ export class SelectGameComponent implements OnInit { 
  }

  }





  joinGame(spielname: string): void {

  joinGame(spielname: string): void {

    this.router.navigate(['/game/' + spielname + '/overview']);

    this.router.navigate([spielname]);

  }

  }





  keyPressAlphaNumeric(event: KeyboardEvent): boolean {

  keyPressAlphaNumeric(event: KeyboardEvent): boolean {