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
c2aa9d56
Commit
c2aa9d56
authored
Feb 15, 2021
by
Dennis Willers
🏀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style Bug fixes
parent
046a4c10
Pipeline
#384
passed with stage
in 5 minutes and 3 seconds
Changes
9
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
84 additions
and
27 deletions
+84
-27
footer.component.html
src/app/footer/footer.component.html
+2
-1
footer.component.scss
src/app/footer/footer.component.scss
+4
-0
footer.component.ts
src/app/footer/footer.component.ts
+10
-1
overview.component.html
src/app/overview/overview.component.html
+2
-0
overview.component.ts
src/app/overview/overview.component.ts
+10
-1
round-history.component.html
src/app/round-history/round-history.component.html
+23
-21
round-history.component.scss
src/app/round-history/round-history.component.scss
+30
-2
round-history.component.ts
src/app/round-history/round-history.component.ts
+0
-1
select-game.component.html
src/app/select-game/select-game.component.html
+3
-0
No files found.
src/app/footer/footer.component.html
View file @
c2aa9d56
<mat-toolbar
color=
"primary"
style=
"display: flex"
>
<mat-toolbar
color=
"primary"
style=
"display: flex"
>
<span
class=
"impressum"
(click)=
"toImpressum()"
>
Impressum
</span>
<span
class=
"impressum"
(click)=
"toImpressum()"
>
Impressum
</span>
<span
class=
"copyrightSize"
>
Mit Liebe designed von Dennis Willers und Isabell Heider
</span>
<span
*ngIf=
"view !== 'mobileView'"
class=
"copyrightSize"
>
Mit Liebe designed von Dennis Willers und Isabell Heider
</span>
<span
*ngIf=
"view === 'mobileView'"
class=
"copyrightSizeMobile"
>
Mit Liebe designed von Dennis Willers und Isabell Heider
</span>
</mat-toolbar>
</mat-toolbar>
src/app/footer/footer.component.scss
View file @
c2aa9d56
...
@@ -2,6 +2,10 @@
...
@@ -2,6 +2,10 @@
font-size
:
12px
;
font-size
:
12px
;
}
}
.copyrightSizeMobile
{
font-size
:
9px
;
}
.impressum
{
.impressum
{
font-size
:
12px
;
font-size
:
12px
;
cursor
:
pointer
;
cursor
:
pointer
;
...
...
src/app/footer/footer.component.ts
View file @
c2aa9d56
import
{
Component
,
OnInit
}
from
'
@angular/core
'
;
import
{
Component
,
OnInit
}
from
'
@angular/core
'
;
import
{
Router
}
from
'
@angular/router
'
;
import
{
Router
}
from
'
@angular/router
'
;
import
{
ViewModus
}
from
'
../dao/viewModus
'
;
@
Component
({
@
Component
({
selector
:
'
app-footer
'
,
selector
:
'
app-footer
'
,
...
@@ -7,10 +8,18 @@ import {Router} from '@angular/router';
...
@@ -7,10 +8,18 @@ import {Router} from '@angular/router';
styleUrls
:
[
'
./footer.component.scss
'
]
styleUrls
:
[
'
./footer.component.scss
'
]
})
})
export
class
FooterComponent
implements
OnInit
{
export
class
FooterComponent
implements
OnInit
{
view
=
'
desktopView
'
;
constructor
(
private
router
:
Router
)
{
}
constructor
(
private
router
:
Router
,
private
screen
:
ViewModus
)
{
screen
.
$view
.
subscribe
(
view
=>
{
this
.
view
=
view
;
});
}
ngOnInit
():
void
{
ngOnInit
():
void
{
this
.
view
=
this
.
screen
.
actuallView
;
}
}
toImpressum
():
void
{
toImpressum
():
void
{
...
...
src/app/overview/overview.component.html
View file @
c2aa9d56
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
<mat-icon
color =
"white"
aria-hidden=
"false"
>
autorenew
</mat-icon>
<mat-icon
color =
"white"
aria-hidden=
"false"
>
autorenew
</mat-icon>
</button>
</button>
</div>
</div>
<br
*ngIf=
"view === 'mobileView'"
>
<br
*ngIf=
"view === 'mobileView'"
>
<div
*ngIf=
"view !== 'mobileView'"
class=
"newStartButtonLeft"
>
<div
*ngIf=
"view !== 'mobileView'"
class=
"newStartButtonLeft"
>
<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>
...
...
src/app/overview/overview.component.ts
View file @
c2aa9d56
...
@@ -56,11 +56,13 @@ export class OverviewComponent implements OnInit, OnDestroy {
...
@@ -56,11 +56,13 @@ export class OverviewComponent implements OnInit, OnDestroy {
screen
.
$view
.
subscribe
(
screen
.
$view
.
subscribe
(
view
=>
{
view
=>
{
this
.
view
=
view
;
this
.
view
=
view
;
this
.
setScrollLimit
();
});
});
}
}
ngOnInit
():
void
{
ngOnInit
():
void
{
this
.
view
=
this
.
screen
.
actuallView
;
this
.
view
=
this
.
screen
.
actuallView
;
this
.
setScrollLimit
();
this
.
activatedRoute
.
paramMap
.
subscribe
(
params
=>
{
this
.
activatedRoute
.
paramMap
.
subscribe
(
params
=>
{
this
.
sessionName
=
String
(
params
.
get
(
'
sessionName
'
)).
toLowerCase
();
this
.
sessionName
=
String
(
params
.
get
(
'
sessionName
'
)).
toLowerCase
();
this
.
team
=
String
(
params
.
get
(
'
team
'
));
this
.
team
=
String
(
params
.
get
(
'
team
'
));
...
@@ -199,7 +201,6 @@ export class OverviewComponent implements OnInit, OnDestroy {
...
@@ -199,7 +201,6 @@ export class OverviewComponent implements OnInit, OnDestroy {
}
}
updateChangeHistory
(
value
:
boolean
):
void
{
updateChangeHistory
(
value
:
boolean
):
void
{
console
.
log
(
'
UPDATE:
'
,
value
);
this
.
canUpdateHistory
=
value
;
this
.
canUpdateHistory
=
value
;
}
}
...
@@ -216,6 +217,14 @@ export class OverviewComponent implements OnInit, OnDestroy {
...
@@ -216,6 +217,14 @@ export class OverviewComponent implements OnInit, OnDestroy {
});
});
}
}
setScrollLimit
():
void
{
if
(
this
.
view
===
'
mobileView
'
)
{
this
.
scrollLimit
=
325
;
}
else
{
this
.
scrollLimit
=
290
;
}
}
@
HostListener
(
'
window:scroll
'
,
[
'
$event
'
])
@
HostListener
(
'
window:scroll
'
,
[
'
$event
'
])
onWindowScroll
(
$event
:
any
):
void
{
onWindowScroll
(
$event
:
any
):
void
{
const
numb
=
window
.
scrollY
;
const
numb
=
window
.
scrollY
;
...
...
src/app/round-history/round-history.component.html
View file @
c2aa9d56
...
@@ -26,27 +26,27 @@
...
@@ -26,27 +26,27 @@
<!-- Tabu1 Column -->
<!-- Tabu1 Column -->
<ng-container
matColumnDef=
"tabu1"
>
<ng-container
matColumnDef=
"tabu1"
>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
>
{{element.tabu1}}
</a></mat-cell>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
class=
"tabuColor"
>
{{element.tabu1}}
</a></mat-cell>
</ng-container>
</ng-container>
<!-- Tabu2 Column -->
<!-- Tabu2 Column -->
<ng-container
matColumnDef=
"tabu2"
>
<ng-container
matColumnDef=
"tabu2"
>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
>
{{element.tabu2}}
</a></mat-cell>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
class=
"tabuColor"
>
{{element.tabu2}}
</a></mat-cell>
</ng-container>
</ng-container>
<!-- Tabu3 Column -->
<!-- Tabu3 Column -->
<ng-container
matColumnDef=
"tabu3"
>
<ng-container
matColumnDef=
"tabu3"
>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
>
{{element.tabu3}}
</a></mat-cell>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
class=
"tabuColor"
>
{{element.tabu3}}
</a></mat-cell>
</ng-container>
</ng-container>
<!-- Tabu4 Column -->
<!-- Tabu4 Column -->
<ng-container
matColumnDef=
"tabu4"
>
<ng-container
matColumnDef=
"tabu4"
>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
>
{{element.tabu4}}
</a></mat-cell>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
class=
"tabuColor"
>
{{element.tabu4}}
</a></mat-cell>
</ng-container>
</ng-container>
<!-- Tabu5 Column -->
<!-- Tabu5 Column -->
<ng-container
matColumnDef=
"tabu5"
>
<ng-container
matColumnDef=
"tabu5"
>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
>
{{element.tabu5}}
</a></mat-cell>
<mat-cell
*matCellDef=
"let element"
>
<a
*ngIf=
"element.answer !== answer.zeitLaueft"
class=
"tabuColor"
>
{{element.tabu5}}
</a></mat-cell>
</ng-container>
</ng-container>
<!-- Expanded Content Column - The detail row is made up of this one column -->
<!-- Expanded Content Column - The detail row is made up of this one column -->
...
@@ -84,6 +84,24 @@
...
@@ -84,6 +84,24 @@
>
>
Richtig
✔
Richtig
✔
</button>
</button>
<!-- Tabooh -->
<button
mat-stroked-button
*ngIf=
"detail.element.answer !== answer.tabooh"
color=
"warn"
class=
"marginButtonLeft"
(click)=
"updateAnswer(detail.element, answer.tabooh)"
>
Tabooh
✘
</button>
<button
mat-raised-button
*ngIf=
"detail.element.answer === answer.tabooh"
color=
"warn"
class=
"marginButtonLeft"
>
Tabooh
✘
</button>
</div>
<div
class=
"marginButtons marginButtonTopDown"
>
<!-- Zeit abgelaufen -->
<!-- Zeit abgelaufen -->
<button
<button
mat-stroked-button
mat-stroked-button
...
@@ -120,22 +138,6 @@
...
@@ -120,22 +138,6 @@
>
>
Überspringen
»
Überspringen
»
</button>
</button>
<!-- Tabooh -->
<button
mat-stroked-button
*ngIf=
"detail.element.answer !== answer.tabooh"
color=
"warn"
class=
"marginButtonLeft"
(click)=
"updateAnswer(detail.element, answer.tabooh)"
>
Tabooh
✘
</button>
<button
mat-raised-button
*ngIf=
"detail.element.answer === answer.tabooh"
color=
"warn"
class=
"marginButtonLeft"
>
Tabooh
✘
</button>
</div>
</div>
</div>
</div>
</mat-cell>
</mat-cell>
...
...
src/app/round-history/round-history.component.scss
View file @
c2aa9d56
...
@@ -12,8 +12,14 @@
...
@@ -12,8 +12,14 @@
font-size
:
small
;
font-size
:
small
;
}
}
.mat-cell
{
overflow
:
visible
;
margin-right
:
2px
;
}
.mat-column-answer
{
.mat-column-answer
{
flex
:
0
0
11em
;
flex
:
0
0
11
.5em
;
overflow
:
hidden
;
}
}
.expandStyle
{
.expandStyle
{
...
@@ -53,6 +59,11 @@
...
@@ -53,6 +59,11 @@
.marginButtonLeft
{
.marginButtonLeft
{
margin-left
:
clamp
(
7px
,
4%
,
25px
);
margin-left
:
clamp
(
7px
,
4%
,
25px
);
}
.marginButtonTopDown
{
margin-top
:
5px
;
margin-bottom
:
5px
;
}
}
.marginButtons
{
.marginButtons
{
...
@@ -63,3 +74,20 @@
...
@@ -63,3 +74,20 @@
.noSpaceWaste
{
.noSpaceWaste
{
width
:
100%
;
width
:
100%
;
}
}
.tabuColor
{
color
:
rgba
(
0
,
0
,
0
,.
54
);
overflow
:
visible
!
important
;
}
.overflowSHow
{
white-space
:
normal
;
overflow
:
visible
;
max-width
:
200px
;
}
td
,
th
{
white-space
:
normal
;
word-wrap
:
break-word
;
max-width
:
200px
;
}
src/app/round-history/round-history.component.ts
View file @
c2aa9d56
...
@@ -81,7 +81,6 @@ export class RoundHistoryComponent extends DataSource<any> implements OnInit, On
...
@@ -81,7 +81,6 @@ export class RoundHistoryComponent extends DataSource<any> implements OnInit, On
ngOnInit
():
void
{
ngOnInit
():
void
{
this
.
view
=
this
.
screen
.
actuallView
;
this
.
view
=
this
.
screen
.
actuallView
;
this
.
setDisplayColumns
();
this
.
setDisplayColumns
();
console
.
log
(
"
ACTUAL VIEW:
"
,
this
.
view
);
}
}
ngOnChanges
(
changes
:
SimpleChanges
):
void
{
ngOnChanges
(
changes
:
SimpleChanges
):
void
{
...
...
src/app/select-game/select-game.component.html
View file @
c2aa9d56
...
@@ -31,3 +31,6 @@
...
@@ -31,3 +31,6 @@
<button
mat-raised-button
color=
"primary"
(click)=
"goToRules()"
>
Zu den Spielregeln
</button>
<button
mat-raised-button
color=
"primary"
(click)=
"goToRules()"
>
Zu den Spielregeln
</button>
</mat-card-content>
</mat-card-content>
</mat-card>
</mat-card>
<br>
<br>
<br>
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