Commit 228fa59e authored by Dennis Willers's avatar Dennis Willers 🏀

Fix Deisgn and Connect To Socket Bug

parent acae53e1
Pipeline #388 passed with stages
in 5 minutes and 42 seconds
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<mat-card-content class = "timer">{{timeRemaining}}</mat-card-content> <mat-card-content class = "timer">{{timeRemaining}}</mat-card-content>
<br> <br>
</div> </div>
<div *ngIf="view === 'desktopView'" class="TimerLeft" style="margin-top: -4.25em; margin-right: -11.5em; margin-left: auto"> <div *ngIf="view === 'desktopView'" class="TimerLeft" style="margin-top: -1.9em; margin-right: -11.5em; margin-left: auto">
<mat-progress-spinner style="border-radius: 50%;" class = "white transparent" color="primary" mode="determinate" value={{timeLeft}} aria-label="Rating"> <mat-progress-spinner style="border-radius: 50%;" class = "white transparent" color="primary" mode="determinate" value={{timeLeft}} aria-label="Rating">
</mat-progress-spinner> </mat-progress-spinner>
<mat-card-content class = "timer">{{timeRemaining}}</mat-card-content> <mat-card-content class = "timer">{{timeRemaining}}</mat-card-content>
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<div class="marginButtons" data-aos="zoom-out" data-aos-duration="1000"> <div class="marginButtons" data-aos="zoom-out" data-aos-duration="1000">
<button class="marginButtonRight" *ngIf="isExplainer" mat-raised-button color="primary" (click)="rightAnswer()">Richtig &#10004;</button> <button class="marginButtonRight" *ngIf="isExplainer" mat-raised-button color="primary" (click)="rightAnswer()">Richtig &#10004;</button>
<button class="marginButtonLeft marginButtonRight" *ngIf="isExplainer" mat-raised-button color="accent" (click)="skipCard()">Überspringen &#187;</button> <button class="marginButtonLeft marginButtonRight" *ngIf="isExplainer" mat-raised-button color="accent" (click)="skipCard()">Überspringen &#187;</button>
<a *ngIf="!isExplainer" class="marginButtonRight"></a> <button *ngIf="isExplainer" class="marginButtonLeft" mat-raised-button color="warn" [disabled]="PressTaboohDisabled" (click)="wrongAnswer()">Tabooh &#10008;</button>
<button class="marginButtonLeft" mat-raised-button color="warn" [disabled]="PressTaboohDisabled" (click)="wrongAnswer()">Tabooh &#10008;</button> <button *ngIf="!isExplainer" mat-raised-button color="warn" [disabled]="PressTaboohDisabled" (click)="wrongAnswer()">Tabooh &#10008;</button>
</div> </div>
<br> <br>
<br> <br>
......
...@@ -188,6 +188,8 @@ export class OverviewComponent implements OnInit, OnDestroy { ...@@ -188,6 +188,8 @@ export class OverviewComponent implements OnInit, OnDestroy {
this.location.replaceState(this.sessionName + '/' + team); this.location.replaceState(this.sessionName + '/' + team);
this.selectTeam(); this.selectTeam();
this.canStartGame(); this.canStartGame();
this.unsubscribeAll();
this.getSocketData();
} }
getGameStatus(): void { getGameStatus(): void {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment