Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/app/app.module.ts
This commit is contained in:
Patrick Müller 2022-09-10 13:39:23 +02:00
commit 5449cd7714
Signed by: Paddy
GPG Key ID: 37ABC11275CAABCE
7 changed files with 56 additions and 3 deletions

View File

@ -3,11 +3,13 @@ import {RouterModule, Routes} from '@angular/router';
import {GamenightComponent} from './pages/gamenight/gamenight.component';
import {HomeComponent} from './pages/home/home.component';
import {StatsComponent} from './pages/stats/stats.component';
import {MatchHistoryComponent} from "./pages/match-history/match-history.component";
const routes: Routes = [
{path: '', component: HomeComponent, pathMatch: 'full'},
{path: 'gamenight', component: GamenightComponent},
{path: 'stats', component: StatsComponent}
{path: 'stats', component: StatsComponent},
{path: 'match-history', component: MatchHistoryComponent}
];
@NgModule({

View File

@ -8,7 +8,8 @@ import {StatsComponent} from './pages/stats/stats.component';
import {GamenightComponent} from './pages/gamenight/gamenight.component';
import {HeaderComponent} from './components/header/header.component';
import {ProfileComponent} from './components/profile/profile.component';
import { AddGameComponent } from './components/add-game/add-game.component';
import {AddGameComponent} from './components/add-game/add-game.component';
import {MatchHistoryComponent} from './pages/match-history/match-history.component';
@NgModule({
declarations: [
@ -18,7 +19,8 @@ import { AddGameComponent } from './components/add-game/add-game.component';
GamenightComponent,
HeaderComponent,
ProfileComponent,
AddGameComponent
AddGameComponent,
MatchHistoryComponent
],
imports: [
BrowserModule,

View File

@ -4,6 +4,7 @@
<div id="menu-desktop">
<div (click)="navigate('/')">Home</div>
<div (click)="navigate('/gamenight')">Game night</div>
<div (click)="navigate('match-history')">Match History</div>
<div (click)="navigate('/stats')">Stats</div>
</div>
<div id="menu-mobile">
@ -11,6 +12,7 @@
<div id="menu-mobile-dropdown-content">
<div (click)="navigate('/')">Home</div>
<div (click)="navigate('/gamenight')">Game night</div>
<div (click)="navigate('match-history')">Match History</div>
<div (click)="navigate('/stats')">Stats</div>
</div>

View File

@ -0,0 +1,4 @@
<app-header></app-header>
<div id="match-history">
<p>match-history works!</p>
</div>

View File

@ -0,0 +1,5 @@
@import '../../../styles';
#match-history {
padding-top: $header_height;
}

View File

@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatchHistoryComponent } from './match-history.component';
describe('MatchHistoryComponent', () => {
let component: MatchHistoryComponent;
let fixture: ComponentFixture<MatchHistoryComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ MatchHistoryComponent ]
})
.compileComponents();
fixture = TestBed.createComponent(MatchHistoryComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-match-history',
templateUrl: './match-history.component.html',
styleUrls: ['./match-history.component.scss']
})
export class MatchHistoryComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}