diff --git a/.gitignore b/.gitignore index ee5c9d8..d33e1a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ # See http://help.github.com/ignore-files/ for more about ignoring files. +src/reclame + # compiled output /dist /tmp diff --git a/angular.json b/angular.json index 869449d..7fb865f 100644 --- a/angular.json +++ b/angular.json @@ -21,7 +21,8 @@ "assets": [ "src/favicon.ico", "src/assets", - "src/assets/sounds" + "src/assets/sounds", + "src/reclame" ], "styles": [ "src/styles.scss", diff --git a/src/app/content/poule/poule.component.ts b/src/app/content/poule/poule.component.ts index 77722c3..2cf0be3 100644 --- a/src/app/content/poule/poule.component.ts +++ b/src/app/content/poule/poule.component.ts @@ -12,15 +12,15 @@ import {TopmenuService} from '../../topmenu.service'; }) export class PouleComponent implements OnInit { - protected teams: any[] = []; - protected times: any[] = []; - protected teamtotaltimes: {}; + public teams: any[] = []; + public times: any[] = []; + public teamtotaltimes: {}; - protected maxRaces = 0; + public maxRaces = 0; private timesIndexed: {}; // these are the best two times for each team, indexed by their id - protected bestTwo: {}; - protected maxLaps = 0; + public bestTwo: {}; + public maxLaps = 0; constructor(private championshipService: ChampionshipService, private route: ActivatedRoute, private topmenuService: TopmenuService) { } @@ -48,6 +48,13 @@ export class PouleComponent implements OnInit { } + get poule() { + return this.topmenuService.poule$.value; + } + get tier() { + return this.topmenuService.tier$.value; + } + private loadData() { this.teams = []; this.times = []; diff --git a/src/app/content/tier/tier.component.ts b/src/app/content/tier/tier.component.ts index 12719fa..55452ee 100644 --- a/src/app/content/tier/tier.component.ts +++ b/src/app/content/tier/tier.component.ts @@ -12,10 +12,10 @@ import {TopmenuService} from '../../topmenu.service'; }) export class TierComponent implements OnInit { - protected tier: number; - protected poules: number[] = []; - protected idChampionship: number; - protected tierTimes: any[]; + public tier: number; + public poules: number[] = []; + public idChampionship: number; + public tierTimes: any[]; constructor(private route: ActivatedRoute, private championshipService: ChampionshipService, private topmenuService: TopmenuService) { } diff --git a/src/app/reclamespinner/reclamespinner.component.html b/src/app/reclamespinner/reclamespinner.component.html index 1909518..8104895 100644 --- a/src/app/reclamespinner/reclamespinner.component.html +++ b/src/app/reclamespinner/reclamespinner.component.html @@ -1,7 +1,7 @@
- +
diff --git a/src/app/reclamespinner/reclamespinner.component.ts b/src/app/reclamespinner/reclamespinner.component.ts index b56bde0..19cc8eb 100644 --- a/src/app/reclamespinner/reclamespinner.component.ts +++ b/src/app/reclamespinner/reclamespinner.component.ts @@ -8,15 +8,12 @@ import {timer} from 'rxjs'; }) export class ReclamespinnerComponent implements OnInit { - protected images: string[] = []; + public images: string[] = []; constructor() { - this.images.push('Victoria.jpg'); - this.images.push('basta.png'); - this.images.push('Pasta Basta.png'); - this.images.push('stoked.png'); - this.images.push('VDV.jpg'); - this.images.push('Slagerij Pieters.jpg'); + for (let i = 1; i <= 14; i++) { + this.images.push(i + '.jpg'); + } } ngOnInit() { diff --git a/src/app/topmenu/topmenu.component.ts b/src/app/topmenu/topmenu.component.ts index d99e0e6..b39fe30 100644 --- a/src/app/topmenu/topmenu.component.ts +++ b/src/app/topmenu/topmenu.component.ts @@ -14,7 +14,7 @@ import {TopmenuService} from '../topmenu.service'; export class TopmenuComponent implements OnInit { private idChampionship: number; - protected tiers: number[] = []; + public tiers: number[] = []; constructor(private championshipService: ChampionshipService, private route: ActivatedRoute, diff --git a/src/assets/sounds/nature2.wav b/src/assets/sounds/nature2.wav new file mode 100644 index 0000000..035af3d Binary files /dev/null and b/src/assets/sounds/nature2.wav differ