diff --git a/src/Turnierplan.App/Client/src/app/core/components/small-spinner/small-spinner.component.html b/src/Turnierplan.App/Client/src/app/core/components/small-spinner/small-spinner.component.html index e2d150f3..1498fc1d 100644 --- a/src/Turnierplan.App/Client/src/app/core/components/small-spinner/small-spinner.component.html +++ b/src/Turnierplan.App/Client/src/app/core/components/small-spinner/small-spinner.component.html @@ -1 +1 @@ -
+
diff --git a/src/Turnierplan.App/Client/src/app/core/components/small-spinner/small-spinner.component.ts b/src/Turnierplan.App/Client/src/app/core/components/small-spinner/small-spinner.component.ts index 33567a21..5a7434a8 100644 --- a/src/Turnierplan.App/Client/src/app/core/components/small-spinner/small-spinner.component.ts +++ b/src/Turnierplan.App/Client/src/app/core/components/small-spinner/small-spinner.component.ts @@ -1,7 +1,10 @@ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; @Component({ selector: 'tp-small-spinner', templateUrl: './small-spinner.component.html' }) -export class SmallSpinnerComponent {} +export class SmallSpinnerComponent { + @Input() + public color: string = 'secondary'; +} diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts index 140b5aab..e32ef191 100644 --- a/src/Turnierplan.App/Client/src/app/i18n/de.ts +++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts @@ -80,9 +80,6 @@ export const de = { }, LandingPage: { Title: 'Startseite', - Pages: { - Organizations: 'Organisationen' - }, Badges: { OrganizationCount: 'Organisationen' }, @@ -1477,7 +1474,7 @@ export const de = { Error: 'Beim Laden der Release-Information von GitHub ist ein Fehler aufgetreten', UpToDate: 'Die neuste Version {{version}} ist installiert', Outdated: 'Es ist eine neue Version verfügbar: {{version}}', - ShowOnGitHub: 'Release auf GitHub öffnen' + ShowOnGitHub: 'Release auf GitHub anzeigen' } } }; diff --git a/src/Turnierplan.App/Client/src/app/portal/components/updates-check/updates-check.component.html b/src/Turnierplan.App/Client/src/app/portal/components/updates-check/updates-check.component.html index 08ede6f1..68196688 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/updates-check/updates-check.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/components/updates-check/updates-check.component.html @@ -1,11 +1,11 @@ @if (isInitializing) {
- +
} @else if (latestVersion === undefined) {
- +
} @else if (latestVersion === currentVersion) { diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/landing-page/landing-page.component.html b/src/Turnierplan.App/Client/src/app/portal/pages/landing-page/landing-page.component.html index 87c8770b..9d88dfb4 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/landing-page/landing-page.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/pages/landing-page/landing-page.component.html @@ -1,6 +1,10 @@ - - +
+ + +
+ +
- - - - - +
+ +
@if (organizations.length === 0) {
@@ -53,6 +55,6 @@
}
- - +
+
diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/landing-page/landing-page.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/landing-page/landing-page.component.ts index 54992e00..fb75a91d 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/landing-page/landing-page.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/landing-page/landing-page.component.ts @@ -1,14 +1,13 @@ import { Component, OnInit } from '@angular/core'; import { take } from 'rxjs'; -import { PageFrameNavigationTab, PageFrameComponent } from '../../components/page-frame/page-frame.component'; import { LoadingState, LoadingStateDirective } from '../../directives/loading-state.directive'; import { TitleService } from '../../services/title.service'; import { IsAdministratorDirective } from '../../directives/is-administrator.directive'; import { ActionButtonComponent } from '../../components/action-button/action-button.component'; import { RouterLink } from '@angular/router'; import { IllustrationComponent } from '../../components/illustration/illustration.component'; -import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'; +import { TranslateDirective } from '@ngx-translate/core'; import { BadgeComponent } from '../../components/badge/badge.component'; import { E2eDirective } from '../../../core/directives/e2e.directive'; import { UpdatesCheckComponent } from '../../components/updates-check/updates-check.component'; @@ -21,14 +20,12 @@ import { AllowCreateOrganizationDirective } from '../../directives/allow-create- templateUrl: './landing-page.component.html', imports: [ LoadingStateDirective, - PageFrameComponent, IsAdministratorDirective, ActionButtonComponent, RouterLink, IllustrationComponent, TranslateDirective, BadgeComponent, - TranslatePipe, E2eDirective, UpdatesCheckComponent, AllowCreateOrganizationDirective @@ -38,14 +35,6 @@ export class LandingPageComponent implements OnInit { protected loadingState: LoadingState = { isLoading: true }; protected organizations: OrganizationDto[] = []; - protected pages: PageFrameNavigationTab[] = [ - { - id: 0, - title: 'Portal.LandingPage.Pages.Organizations', - icon: 'bi-boxes' - } - ]; - constructor( private readonly turnierplanApi: TurnierplanApi, private readonly titleService: TitleService