Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

162 visual improvements #163

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions src/client/src/app/components/app/menu/menu.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,19 @@ export class MenuComponent {
routerLink: '/home',
},
{
label: this.translations.nav_manage(),
icon: 'i-[mdi--table-edit]',
items: [
{
label: this.translations.nav_maps(),
icon: 'i-[mdi--golf]',
routerLink: '/manage/maps',
},
{
label: this.translations.nav_users(),
icon: 'i-[mdi--account-multiple]',
routerLink: '/manage/users',
},
{
label: this.translations.nav_events(),
icon: 'i-[mdi--calendar]',
routerLink: '/manage/events',
},
],
label: this.translations.nav_maps(),
icon: 'i-[mdi--golf]',
routerLink: '/manage/maps',
},
{
label: this.translations.nav_users(),
icon: 'i-[mdi--account-multiple]',
routerLink: '/manage/users',
},
{
label: this.translations.nav_events(),
icon: 'i-[mdi--calendar]',
routerLink: '/manage/events',
},
{
label: this.translations.nav_settings(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</p-card>

<div class="mt-4 flex flex-row flex-wrap items-center gap-2">
<h2 class="grow">{{ translations.events_facebookLink() }}</h2>
<h2 class="ml-4 grow">{{ translations.events_facebookLink() }}</h2>
<p-inputGroup class="w-auto">
<button
type="button"
Expand Down Expand Up @@ -101,7 +101,7 @@ <h2 class="grow">{{ translations.events_facebookLink() }}</h2>
</div>

<div class="mt-4 flex flex-row items-center gap-2">
<h2 class="grow">{{ translations.events_timeslots() }}</h2>
<h2 class="ml-4 grow">{{ translations.events_timeslots() }}</h2>
<span
class="inline-block rounded-full bg-primary px-2 text-center font-bold text-primary-text"
>
Expand All @@ -118,29 +118,49 @@ <h2 class="grow">{{ translations.events_timeslots() }}</h2>

<div class="rounded-lg border-[1px] border-solid border-surface-d bg-surface-a">
@for (timeslot of timeslots(); track timeslot.id; let index = $index) {
<a
class="block min-w-0 truncate border-0 border-solid border-surface-d px-4 py-2 leading-8 text-text-color no-underline hover:bg-surface-c"
<div
class="items-centertruncate flex min-w-0 flex-row border-0 border-solid border-surface-d px-4 py-2 leading-8 text-text-color no-underline hover:bg-surface-c"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
class="items-centertruncate flex min-w-0 flex-row border-0 border-solid border-surface-d px-4 py-2 leading-8 text-text-color no-underline hover:bg-surface-c"
class="items-center truncate flex min-w-0 flex-row border-0 border-solid border-surface-d px-4 py-2 leading-8 text-text-color no-underline hover:bg-surface-c"

[class.border-t-[1px]]="index > 0"
[routerLink]="['timeslots', timeslot.id]"
pRipple
>
<div class="flex flex-row items-center gap-2">
<span class="i-[mdi--clock-time-four-outline]"></span>
<span class="grow">
{{ timeslot.time.hour | number: '2.0-0' }}:{{
timeslot.time.minute | number: '2.0-0'
}}</span
>
@if (timeslot.mapId) {
@if (maps()[timeslot.mapId]; as map) {
<span class="i-[mdi--golf] ml-4"></span>
<span class="truncate">{{ map.name }}</span>
<a
class="min-w-0 grow gap-4 text-text-color no-underline"
[routerLink]="['timeslots', timeslot.id]"
>
<div class="flex flex-row items-center gap-2">
<span class="i-[mdi--clock-time-four-outline]"></span>
@if (timeslot.isFallbackAllowed) {
<span class="i-[mdi--arrow-up-down] -mx-2"></span>
}
}
<span class="i-[mdi--account] ml-2"></span>
<span>{{ timeslot.playerIds.length }}</span>
</div>
</a>
<span class="grow">
{{ timeslot.time.hour | number: '2.0-0' }}:{{
timeslot.time.minute | number: '2.0-0'
}}</span
>
@if (timeslot.mapId) {
@if (maps()[timeslot.mapId]; as map) {
<span class="i-[mdi--golf]"></span>
<span class="truncate">{{ map.name }}</span>
}
}
<span
class="inline-block min-w-fit rounded-full bg-primary px-2 text-center font-bold text-primary-text"
>
<span class="i-[mdi--account]"></span> {{ timeslot.playerIds.length }}
</span>
</div>
</a>
<p-button
class="-mr-2"
icon="i-[mdi--pencil]"
[text]="true"
[rounded]="true"
size="small"
[pTooltip]="translations.shared_edit()"
(onClick)="editTimeslotDialog.open()"
/>
</div>
<app-event-timeslot-dialog #editTimeslotDialog [event]="event" [timeslot]="timeslot" />
}
@if (event.timeslots.length === 0) {
<div class="px-4 py-2 text-center leading-8">
Expand All @@ -151,7 +171,7 @@ <h2 class="grow">{{ translations.events_timeslots() }}</h2>

@if (canBuildInstances()) {
<div class="flex flex-row items-center pt-4">
<h2 class="grow">{{ translations.events_groups() }}</h2>
<h2 class="ml-4 grow">{{ translations.events_groups() }}</h2>
<p-inputGroup class="w-auto">
@if (!event.startedAt) {
<button
Expand Down
1 change: 0 additions & 1 deletion src/client/src/app/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
},
"nav": {
"home": "Startseite",
"manage": "Verwalten",
"events": "Veranstaltungen",
"event": "Veranstaltung",
"eventTimeslot": "Zeitslot",
Expand Down
1 change: 0 additions & 1 deletion src/client/src/app/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
},
"nav": {
"home": "Home",
"manage": "Manage",
"events": "Events",
"event": "Event",
"eventTimeslot": "Timeslot",
Expand Down
Loading