From 2b694290f21810462e3b3a23a8531cb4582cce2a Mon Sep 17 00:00:00 2001 From: Linux User Date: Tue, 26 Dec 2023 22:50:38 +0000 Subject: [PATCH] +stores readable --- backend/heats.go | 4 +- backend/http.go | 3 ++ frontend/src/lib/header-setup.svelte | 29 ++++++++++ frontend/src/lib/stores/categories.js | 12 +++++ frontend/src/lib/stores/rounds.js | 13 +++++ frontend/src/routes/+page.svelte | 8 ++- frontend/src/routes/setup/+page.svelte | 69 +++++------------------- frontend/src/routes/surfers/+page.svelte | 43 +++++++-------- 8 files changed, 100 insertions(+), 81 deletions(-) create mode 100644 frontend/src/lib/header-setup.svelte create mode 100644 frontend/src/lib/stores/categories.js create mode 100644 frontend/src/lib/stores/rounds.js diff --git a/backend/heats.go b/backend/heats.go index b62e39f..fb53b03 100644 --- a/backend/heats.go +++ b/backend/heats.go @@ -17,7 +17,7 @@ type Surfer struct { } type Heat struct { - Name string `json:"name"` + Round string `json:"round"` Category string `json:"category"` Number int `json:"number"` Timer int `json:"timer"` @@ -26,7 +26,7 @@ type Heat struct { } func heatName(heat Heat) string { - str := fmt.Sprintf("%s.%d.%s", heat.Name, heat.Number, heat.Category) + str := fmt.Sprintf("%s.%d.%s", heat.Round, heat.Number, heat.Category) strings.ReplaceAll(str, " ", "_") return str } diff --git a/backend/http.go b/backend/http.go index 515a67c..20effca 100644 --- a/backend/http.go +++ b/backend/http.go @@ -58,6 +58,9 @@ func (app *App) RegisterWebRoutes() { setup := app.Engine.Group("/setup") setup.Static("/", "./static/setup") + surfers := app.Engine.Group("/surfers") + surfers.Static("/", "./static/surfers") + draws := app.Engine.Group("/draws") draws.Static("/", "./static/draws") diff --git a/frontend/src/lib/header-setup.svelte b/frontend/src/lib/header-setup.svelte new file mode 100644 index 0000000..8d51bfd --- /dev/null +++ b/frontend/src/lib/header-setup.svelte @@ -0,0 +1,29 @@ + + +
+ logo + {title} +
+ + \ No newline at end of file diff --git a/frontend/src/lib/stores/categories.js b/frontend/src/lib/stores/categories.js new file mode 100644 index 0000000..0442ffa --- /dev/null +++ b/frontend/src/lib/stores/categories.js @@ -0,0 +1,12 @@ + import {readable} from "svelte/store" + + export const categories = readable([ + "Under 12 Women", + "Under 12 Men", + "Under 14 Women", + "Under 14 Men", + "Under 16 Women", + "Under 16 Men", + "Under 18 Women", + "Under 18 Men", + ]); \ No newline at end of file diff --git a/frontend/src/lib/stores/rounds.js b/frontend/src/lib/stores/rounds.js new file mode 100644 index 0000000..8210b74 --- /dev/null +++ b/frontend/src/lib/stores/rounds.js @@ -0,0 +1,13 @@ +import {readable} from "svelte/store" + +export const rounds = readable([ + "Qualifying", + "Opening", + "Elimination", + "Round of 48", + "Round of 32", + "Round of 16", + "Quarterfinal", + "Semifinal", + "Final", +]); \ No newline at end of file diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index 5982b0a..18bc6b1 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -1,2 +1,8 @@

Welcome to SvelteKit

-

Visit kit.svelte.dev to read the documentation

+ +priority +
+setup +
+surfers + diff --git a/frontend/src/routes/setup/+page.svelte b/frontend/src/routes/setup/+page.svelte index 339846f..1b76397 100644 --- a/frontend/src/routes/setup/+page.svelte +++ b/frontend/src/routes/setup/+page.svelte @@ -1,6 +1,9 @@ -
- logo - Heat setup -
+
- - + {#each $rounds as round} {/each} - -
@@ -263,7 +238,7 @@
{#each heats as h, id}
- +
{/each} @@ -274,22 +249,6 @@ \ No newline at end of file +
+ + + + +
\ No newline at end of file