Commit 3da4c57a authored by Dennis Willers's avatar Dennis Willers
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/app/app.module.ts
#	src/app/select-game/select-game.component.html
parents 7c37a2d1 db0b9168

src/app/app-routing.module.ts

+5 −0
Original line number Original line Diff line number Diff line
@@ -3,12 +3,17 @@ import { Routes, RouterModule } from '@angular/router'; 
import {OverviewComponent} from './overview/overview.component';

import {OverviewComponent} from './overview/overview.component';

import {SelectGameComponent} from './select-game/select-game.component';

import {SelectGameComponent} from './select-game/select-game.component';

import {ErrorComponent} from './error/error.component';

import {ErrorComponent} from './error/error.component';

import {GameComponent} from './game/game.component';





const routes: Routes = [

const routes: Routes = [

  {

  {

    path: 'overview',

    path: 'overview',

    component: OverviewComponent,

    component: OverviewComponent,

  },

  },

  {

    path: 'game',

    component: GameComponent,

  },

  {

  {

    path: '',

    path: '',

    component: SelectGameComponent,

    component: SelectGameComponent,

src/app/app.module.ts

+2 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ import { OverviewComponent } from './overview/overview.component'; 
import { ErrorComponent } from './error/error.component';

import { ErrorComponent } from './error/error.component';

import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';

import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';

import { FormsModule } from '@angular/forms';

import { FormsModule } from '@angular/forms';

import { GameComponent } from './game/game.component';





@NgModule({

@NgModule({

  declarations: [

  declarations: [
@@ -27,6 +28,7 @@ import { FormsModule } from '@angular/forms'; 
    SelectGameComponent,

    SelectGameComponent,

    OverviewComponent,

    OverviewComponent,

    ErrorComponent,

    ErrorComponent,

    GameComponent,

  ],

  ],

  imports: [

  imports: [

    HttpClientModule,

    HttpClientModule,

src/app/error/error.component.html

+3 −1
Original line number Original line Diff line number Diff line 
<div style="text-align: center; margin-left: 15em; margin-right: 15em; margin-top: 5em;">

<div style="text-align: center; margin-left: 15em; margin-right: 15em; margin-top: 5em;">

  <mat-card class="transparent">

    <h3>

    <h3>

    Leider konnte die Seite nicht erreicht werden, bitte überprüfen Sie den Link oder kehren Sie auf die <a href="router.navigate(['/overview'])">Startseite</a>  zurück

      Leider konnte die Seite nicht erreicht werden, bitte überprüfen Sie den Link oder kehren Sie auf die <a (click)="toStartpage()">Startseite</a>  zurück

    </h3>

    </h3>

  </mat-card>

  <br>

  <br>

  <mat-progress-spinner color="primary" mode="determinate" value="value">

  <mat-progress-spinner color="primary" mode="determinate" value="value">

  </mat-progress-spinner>

  </mat-progress-spinner>

src/app/error/error.component.scss

+3 −0
Original line number Original line Diff line number Diff line 
.transparent {

  opacity: 0.9;

}

src/app/error/error.component.ts

+6 −1
Original line number Original line Diff line number Diff line 
import { Component, OnInit } from '@angular/core';

import { Component, OnInit } from '@angular/core';

import {Router} from '@angular/router';





@Component({

@Component({

  selector: 'app-error',

  selector: 'app-error',
@@ -7,8 +8,12 @@ import { Component, OnInit } from '@angular/core'; 
})

})

export class ErrorComponent implements OnInit {

export class ErrorComponent implements OnInit {





  constructor() { }

  constructor(private router: Router) { }





  ngOnInit(): void {

  ngOnInit(): void {

  }

  }



  toStartpage(): void {

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

  }

}
 
}