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
a968f272
Commit
a968f272
authored
Apr 11, 2021
by
Dennis Willers
🏀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Layout für mobile overview Ansicht
parent
68f49472
Pipeline
#397
passed with stages
in 5 minutes and 58 seconds
Changes
7
Pipelines
1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13782 additions
and
211 deletions
+13782
-211
Tabu.csv
Tabu.csv
+0
-200
package-lock.json
package-lock.json
+13765
-0
package.json
package.json
+1
-1
impressum.component.html
src/app/impressum/impressum.component.html
+1
-1
overview.component.html
src/app/overview/overview.component.html
+4
-4
overview.component.scss
src/app/overview/overview.component.scss
+9
-5
overview.component.ts
src/app/overview/overview.component.ts
+2
-0
No files found.
Tabu.csv
deleted
100644 → 0
View file @
68f49472
This diff is collapsed.
Click to expand it.
package-lock.json
0 → 100644
View file @
a968f272
This diff is collapsed.
Click to expand it.
package.json
View file @
a968f272
{
{
"name"
:
"tabooh"
,
"name"
:
"tabooh"
,
"version"
:
"2.2.
1
"
,
"version"
:
"2.2.
2
"
,
"scripts"
:
{
"scripts"
:
{
"ng"
:
"ng"
,
"ng"
:
"ng"
,
"start"
:
"ng serve"
,
"start"
:
"ng serve"
,
...
...
src/app/impressum/impressum.component.html
View file @
a968f272
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
<br>
<br>
<div
data-aos=
"zoom-out-right"
data-aos-duration=
"250"
>
<div
data-aos=
"zoom-out-right"
data-aos-duration=
"250"
>
<mat-card
class=
"transparent"
>
<mat-card
class=
"transparent"
>
<mat-card-subtitle>
Tabooh-Version: 2.2.
1
</mat-card-subtitle>
<mat-card-subtitle>
Tabooh-Version: 2.2.
2
</mat-card-subtitle>
<mat-card-subtitle>
Zuletzt geändert am: 11.04.2021
</mat-card-subtitle>
<mat-card-subtitle>
Zuletzt geändert am: 11.04.2021
</mat-card-subtitle>
<mat-card-content>
<mat-card-content>
<button
mat-raised-button
color=
"primary"
(click)=
"goToStartpage()"
>
Zur Startseite
</button>
<button
mat-raised-button
color=
"primary"
(click)=
"goToStartpage()"
>
Zur Startseite
</button>
...
...
src/app/overview/overview.component.html
View file @
a968f272
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<button
matTooltip=
"Neues Spiel starten"
[disabled]=
"buttonNewGameDisabled || gameStatus.activeExplainer == 1"
mat-raised-button
color=
"primary"
(click)=
"startGame()"
>
<button
matTooltip=
"Neues Spiel starten"
[disabled]=
"buttonNewGameDisabled || gameStatus.activeExplainer == 1"
mat-raised-button
color=
"primary"
(click)=
"startGame()"
>
<mat-icon
color =
"white"
aria-hidden=
"false"
>
autorenew
</mat-icon>
<mat-icon
color =
"white"
aria-hidden=
"false"
>
autorenew
</mat-icon>
</button>
</button>
<mat-icon
*ngIf=
"view === 'mobileView'"
class=
"peopleInSessionRight"
matBadge=
"{{totalPlayers}}"
matBadgeSize=
"small"
matBadgeColor=
"primary"
aria-hidden=
"false"
aria-label=
"home icon blue"
>
people
</mat-icon>
<mat-icon
*ngIf=
"view === 'mobileView'"
class=
"peopleInSessionRight"
matBadge
Hidden=
"{{disablePlayersOnlineBadges}}"
matBadge
=
"{{totalPlayers}}"
matBadgeSize=
"small"
matBadgeColor=
"primary"
aria-hidden=
"false"
aria-label=
"home icon blue"
>
people
</mat-icon>
</div>
</div>
<br
*ngIf=
"view === 'mobileView'"
>
<br
*ngIf=
"view === 'mobileView'"
>
<br
*ngIf=
"view === 'mobileView'"
>
<br
*ngIf=
"view === 'mobileView'"
>
...
@@ -30,17 +30,17 @@
...
@@ -30,17 +30,17 @@
<mat-icon
color =
"white"
aria-hidden=
"false"
>
autorenew
</mat-icon>
<mat-icon
color =
"white"
aria-hidden=
"false"
>
autorenew
</mat-icon>
</button>
</button>
</div>
</div>
<mat-icon
*ngIf=
"view !== 'mobileView'"
class=
"peopleInSessionRight"
matBadge=
"{{totalPlayers}}"
matBadgeSize=
"small"
matBadgeColor=
"primary"
aria-hidden=
"false"
aria-label=
"home icon blue"
>
people
</mat-icon>
<mat-icon
*ngIf=
"view !== 'mobileView'"
class=
"peopleInSessionRight"
matBadge
Hidden=
"{{disablePlayersOnlineBadges}}"
matBadge
=
"{{totalPlayers}}"
matBadgeSize=
"small"
matBadgeColor=
"primary"
aria-hidden=
"false"
aria-label=
"home icon blue"
>
people
</mat-icon>
<div
class=
"CenterText"
>
<div
class=
"CenterText"
>
<h2
*ngIf=
"view === 'mobileView'"
class=
"textMobileView"
>
{{membership}}
</h2>
<h2
*ngIf=
"view === 'mobileView'"
class=
"textMobileView"
>
{{membership}}
</h2>
<h2
*ngIf=
"view !== 'mobileView'"
>
{{membership}}
</h2>
<h2
*ngIf=
"view !== 'mobileView'"
>
{{membership}}
</h2>
</div>
</div>
</div>
</div>
<button
mat-raised-button
class =
"{{red}}"
(click)=
"joinTeam('red')"
>
<button
mat-raised-button
class =
"{{red}}"
(click)=
"joinTeam('red')"
>
<mat-icon
matBadge=
"{{redPlayers}}"
matBadgeSize=
"small"
matBadgeColor=
"primary"
color =
"warn"
aria-hidden=
"false"
aria-label=
"home icon red"
>
home
</mat-icon>
<mat-icon
matBadge=
"{{redPlayers}}"
matBadge
Hidden=
"{{disablePlayersOnlineBadges}}"
matBadge
Size=
"small"
matBadgeColor=
"primary"
color =
"warn"
aria-hidden=
"false"
aria-label=
"home icon red"
>
home
</mat-icon>
</button>
</button>
<button
mat-raised-button
class =
"{{blue}}"
(click)=
"joinTeam('blue')"
>
<button
mat-raised-button
class =
"{{blue}}"
(click)=
"joinTeam('blue')"
>
<mat-icon
style=
"color: darkblue"
matBadge=
"{{bluePlayers}}"
matBadgeSize=
"small"
aria-hidden=
"false"
aria-label=
"home icon blue"
>
home
</mat-icon>
<mat-icon
style=
"color: darkblue"
matBadge
Hidden=
"{{disablePlayersOnlineBadges}}"
matBadge
=
"{{bluePlayers}}"
matBadgeSize=
"small"
aria-hidden=
"false"
aria-label=
"home icon blue"
>
home
</mat-icon>
</button>
</button>
</mat-card>
</mat-card>
<br>
<br>
...
...
src/app/overview/overview.component.scss
View file @
a968f272
...
@@ -24,6 +24,10 @@ th{
...
@@ -24,6 +24,10 @@ th{
background-color
:
rgba
(
200
,
0
,
0
,
0
.3
);
background-color
:
rgba
(
200
,
0
,
0
,
0
.3
);
}
}
.floatLeft
{
float
:
left
;
}
.bluefont
{
.bluefont
{
margin
:
5px
;
margin
:
5px
;
color
:
rgba
(
0
,
0
,
139
);
color
:
rgba
(
0
,
0
,
139
);
...
@@ -50,7 +54,11 @@ th{
...
@@ -50,7 +54,11 @@ th{
align-items
:
center
;
align-items
:
center
;
}
}
.newStartButtonLeft
{
float
:left
;
width
:
100px
;}
.newStartButtonLeft
{
float
:left
;
width
:
100px
;}
.peopleInSessionRight
{
float
:right
;
margin-top
:
4px
}
.peopleInSessionRight
{
position
:
absolute
;
right
:
10px
;
margin-top
:
4px
;
}
.CenterText
{
margin
:
0
auto
;
width
:
250px
;}
.CenterText
{
margin
:
0
auto
;
width
:
250px
;}
.spinner-wrapper
{
.spinner-wrapper
{
...
@@ -74,7 +82,3 @@ th{
...
@@ -74,7 +82,3 @@ th{
.textMobileView
{
.textMobileView
{
display
:
inline
;
display
:
inline
;
}
}
.peopleRight
{
float
:
right
;
}
src/app/overview/overview.component.ts
View file @
a968f272
...
@@ -27,6 +27,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
...
@@ -27,6 +27,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
isActiveRound
=
false
;
isActiveRound
=
false
;
red
=
'
choose
'
;
red
=
'
choose
'
;
blue
=
'
choose
'
;
blue
=
'
choose
'
;
disablePlayersOnlineBadges
=
true
;
totalPlayers
=
1
;
totalPlayers
=
1
;
redPlayers
=
0
;
redPlayers
=
0
;
bluePlayers
=
0
;
bluePlayers
=
0
;
...
@@ -133,6 +134,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
...
@@ -133,6 +134,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
this
.
subSessionPlayers
=
this
.
socketDataService
.
getSessionPlayers
(
this
.
sessionName
)
this
.
subSessionPlayers
=
this
.
socketDataService
.
getSessionPlayers
(
this
.
sessionName
)
.
pipe
(
takeUntil
(
this
.
ngUnsubscribe
)).
subscribe
(
data
=>
{
.
pipe
(
takeUntil
(
this
.
ngUnsubscribe
)).
subscribe
(
data
=>
{
if
(
data
.
hasOwnProperty
(
'
total
'
))
{
if
(
data
.
hasOwnProperty
(
'
total
'
))
{
this
.
disablePlayersOnlineBadges
=
false
;
this
.
totalPlayers
=
data
.
total
;
this
.
totalPlayers
=
data
.
total
;
this
.
redPlayers
=
data
.
red
;
this
.
redPlayers
=
data
.
red
;
this
.
bluePlayers
=
data
.
blue
;
this
.
bluePlayers
=
data
.
blue
;
...
...
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