From 20de2a1da3934ed1c17b8e911909fc8dedf16907 Mon Sep 17 00:00:00 2001 From: Toaster2 Date: Fri, 26 Dec 2025 12:35:40 +0100 Subject: [PATCH 01/27] Refactor vertical divider into a seperate file, allow divider color to be changed if wanted --- src/app/components/ui/divider.component.ts | 6 +++--- src/app/components/ui/header/header.component.ts | 15 +-------------- .../components/ui/vertical-divider.component.ts | 11 +++++++++++ 3 files changed, 15 insertions(+), 17 deletions(-) create mode 100644 src/app/components/ui/vertical-divider.component.ts diff --git a/src/app/components/ui/divider.component.ts b/src/app/components/ui/divider.component.ts index 9ce5fe5c..c4650ee6 100644 --- a/src/app/components/ui/divider.component.ts +++ b/src/app/components/ui/divider.component.ts @@ -1,12 +1,12 @@ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; @Component({ selector: 'app-divider', imports: [], template: ` -
+
` }) export class DividerComponent { - + @Input() color: String = "bg-divider"; } diff --git a/src/app/components/ui/header/header.component.ts b/src/app/components/ui/header/header.component.ts index 2a900da6..77d75daa 100644 --- a/src/app/components/ui/header/header.component.ts +++ b/src/app/components/ui/header/header.component.ts @@ -1,28 +1,15 @@ import { Component } from '@angular/core'; - import {NavbarItemComponent} from "./navbar-item.component"; import {Router} from "@angular/router"; import {faSignInAlt} from "@fortawesome/free-solid-svg-icons"; - - - +import {VerticalDividerComponent} from "../vertical-divider.component"; import {LayoutService} from "../../../services/layout.service"; import {NavbarCategoryComponent} from "./navbar-category.component"; - import {SearchComponent} from "../../../overlays/search.component"; - - import {HeaderMeComponent} from "./header-me.component"; import {HeaderLogoComponent} from "./header-logo.component"; import {navTree, rightNavTree} from './navtypes'; -@Component({ - selector: 'header-vertical-divider', - imports: [], - template: `
` -}) -class VerticalDividerComponent {} - @Component({ selector: 'app-header', imports: [ diff --git a/src/app/components/ui/vertical-divider.component.ts b/src/app/components/ui/vertical-divider.component.ts new file mode 100644 index 00000000..3ee6d940 --- /dev/null +++ b/src/app/components/ui/vertical-divider.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from "@angular/core"; + +@Component({ + selector: 'header-vertical-divider', + imports: [], + template: `
` +}) + +export class VerticalDividerComponent { + @Input() color: String = "bg-divider"; +} \ No newline at end of file From ca526ee67d5518768ede2b076074a20b0043f5be Mon Sep 17 00:00:00 2001 From: Toaster2 Date: Fri, 26 Dec 2025 12:36:13 +0100 Subject: [PATCH 02/27] Allow client to request instance statistics --- src/app/api/client.service.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/api/client.service.ts b/src/app/api/client.service.ts index 425dfcd5..b1cd81aa 100644 --- a/src/app/api/client.service.ts +++ b/src/app/api/client.service.ts @@ -16,6 +16,7 @@ import {Contest} from "./types/contests/contest"; import {Score} from "./types/levels/score"; import { LevelRelations } from './types/levels/level-relations'; import { Asset } from './types/asset'; +import { Statistics } from './types/statistics'; export const defaultPageSize: number = 40; @@ -44,6 +45,10 @@ export class ClientService extends ApiImplementation { return this.categories.asObservable(); } + getStatistics() { + return this.http.get("/statistics"); + } + getRoomListing() { return this.http.get>("/rooms"); } From 4f40e19d6122240dcae10f15c0d1d04279e95b13 Mon Sep 17 00:00:00 2001 From: Toaster2 Date: Fri, 26 Dec 2025 13:08:29 +0100 Subject: [PATCH 03/27] typo correction --- src/app/components/ui/header/header.component.ts | 4 ++-- src/app/components/ui/vertical-divider.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/components/ui/header/header.component.ts b/src/app/components/ui/header/header.component.ts index 77d75daa..c7616765 100644 --- a/src/app/components/ui/header/header.component.ts +++ b/src/app/components/ui/header/header.component.ts @@ -25,7 +25,7 @@ import {navTree, rightNavTree} from './navtypes'; class="flex items-center bg-header-background gap-x-2.5 sm:gap-x-1 px-5 leading-none sticky top-0 left-0 w-full z-1000"> - +