Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Tabu
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
9
Issues
9
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dennis Willers
Tabu
Commits
228fa59e
Commit
228fa59e
authored
Feb 15, 2021
by
Dennis Willers
🏀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Deisgn and Connect To Socket Bug
parent
acae53e1
Pipeline
#388
passed with stages
in 5 minutes and 42 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
game.component.html
src/app/game/game.component.html
+3
-3
overview.component.ts
src/app/overview/overview.component.ts
+2
-0
No files found.
src/app/game/game.component.html
View file @
228fa59e
...
@@ -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.25
em; margin-right: -11.5em; margin-left: auto"
>
<div
*ngIf=
"view === 'desktopView'"
class=
"TimerLeft"
style=
"margin-top: -
1.9
em; 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
✔
</button>
<button
class=
"marginButtonRight"
*ngIf=
"isExplainer"
mat-raised-button
color=
"primary"
(click)=
"rightAnswer()"
>
Richtig
✔
</button>
<button
class=
"marginButtonLeft marginButtonRight"
*ngIf=
"isExplainer"
mat-raised-button
color=
"accent"
(click)=
"skipCard()"
>
Überspringen
»
</button>
<button
class=
"marginButtonLeft marginButtonRight"
*ngIf=
"isExplainer"
mat-raised-button
color=
"accent"
(click)=
"skipCard()"
>
Überspringen
»
</button>
<
a
*ngIf=
"!isExplainer"
class=
"marginButtonRight"
></a
>
<
button
*ngIf=
"isExplainer"
class=
"marginButtonLeft"
mat-raised-button
color=
"warn"
[disabled]=
"PressTaboohDisabled"
(click)=
"wrongAnswer()"
>
Tabooh
✘
</button
>
<button
class=
"marginButtonLeft
"
mat-raised-button
color=
"warn"
[disabled]=
"PressTaboohDisabled"
(click)=
"wrongAnswer()"
>
Tabooh
✘
</button>
<button
*ngIf=
"!isExplainer
"
mat-raised-button
color=
"warn"
[disabled]=
"PressTaboohDisabled"
(click)=
"wrongAnswer()"
>
Tabooh
✘
</button>
</div>
</div>
<br>
<br>
<br>
<br>
...
...
src/app/overview/overview.component.ts
View file @
228fa59e
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment