From 9a16c4b560248e0d6f1567d9b509ef2b2596bfe6 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Wed, 27 Dec 2023 19:16:54 +0100
Subject: [PATCH] Some Code Cleanup

---
 package.json                                  |  2 -
 pnpm-lock.yaml                                | 14 ------
 src/components/Dashboard.svelte               |  3 +-
 src/components/EloTable.svelte                |  2 +-
 src/components/FightStatistics.svelte         |  2 +-
 src/components/Login.svelte                   |  3 +-
 src/components/admin/pages/Edit.svelte        |  2 +-
 src/components/admin/pages/Event.svelte       |  2 +-
 src/components/admin/pages/Generate.svelte    |  2 +-
 src/components/admin/pages/Home.svelte        |  3 +-
 src/components/admin/pages/Perms.svelte       |  2 +-
 src/components/admin/pages/edit/Editor.svelte |  2 +-
 .../admin/pages/event/EventEdit.svelte        |  3 +-
 .../admin/pages/event/FightCard.svelte        |  2 +-
 .../admin/pages/event/FightList.svelte        |  3 +-
 .../event/modals/CreateFightModal.svelte      |  2 +-
 .../pages/event/modals/FightEditModal.svelte  |  3 +-
 .../pages/generate/GroupGenerator.svelte      |  2 +-
 .../admin/pages/home/CreateEventModal.svelte  |  2 +-
 src/components/dashboard/SchematicInfo.svelte |  2 +-
 .../dashboard/SchematicInfoModal.svelte       |  2 +-
 src/components/dashboard/Statistics.svelte    |  2 +-
 src/components/dashboard/UploadModal.svelte   |  2 +-
 src/components/dashboard/UserInfo.svelte      |  3 +-
 src/components/repo/auth.ts                   |  7 ++-
 src/components/repo/data.ts                   |  7 ++-
 src/components/repo/event.ts                  |  5 ++-
 src/components/repo/fight.ts                  |  9 ++--
 src/components/repo/page.ts                   |  7 ++-
 src/components/repo/perms.ts                  |  5 ++-
 src/components/repo/repo.ts                   | 44 +++++--------------
 src/components/repo/schem.ts                  |  7 ++-
 src/components/repo/stats.ts                  |  7 ++-
 src/components/stores/stores.ts               |  4 +-
 src/pages/announcements/[...slug].astro       |  4 +-
 src/pages/dashboard.astro                     |  5 +--
 src/pages/login.astro                         |  5 +--
 steamwarci.yml                                |  9 +---
 38 files changed, 87 insertions(+), 105 deletions(-)

diff --git a/package.json b/package.json
index 678a51f..3992b4c 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
 		"@astrojs/tailwind": "^5.0.4",
 		"@astropub/icons": "^0.2.0",
 		"@types/color": "^3.0.6",
-		"@types/crypto-js": "^4.2.1",
 		"@types/node": "^20.10.5",
 		"@typescript-eslint/eslint-plugin": "^6.15.0",
 		"@typescript-eslint/parser": "^6.15.0",
@@ -52,7 +51,6 @@
 		"chartjs-adapter-dayjs-4": "^1.0.4",
 		"chartjs-adapter-moment": "^1.0.1",
 		"color": "^4.2.3",
-		"crypto-js": "^4.2.0",
 		"dayjs": "^1.11.10",
 		"easymde": "^2.18.0",
 		"flowbite": "^1.8.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60e00df..d9b4e45 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -38,9 +38,6 @@ dependencies:
   color:
     specifier: ^4.2.3
     version: 4.2.3
-  crypto-js:
-    specifier: ^4.2.0
-    version: 4.2.0
   dayjs:
     specifier: ^1.11.10
     version: 1.11.10
@@ -85,9 +82,6 @@ devDependencies:
   '@types/color':
     specifier: ^3.0.6
     version: 3.0.6
-  '@types/crypto-js':
-    specifier: ^4.2.1
-    version: 4.2.1
   '@types/node':
     specifier: ^20.10.5
     version: 20.10.5
@@ -1083,10 +1077,6 @@ packages:
       '@types/color-convert': 2.0.3
     dev: true
 
-  /@types/crypto-js@4.2.1:
-    resolution: {integrity: sha512-FSPGd9+OcSok3RsM0UZ/9fcvMOXJ1ENE/ZbLfOPlBWj7BgXtEAM8VYfTtT760GiLbQIMoVozwVuisjvsVwqYWw==}
-    dev: true
-
   /@types/debug@4.1.12:
     resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
     dependencies:
@@ -1975,10 +1965,6 @@ packages:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  /crypto-js@4.2.0:
-    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
-    dev: false
-
   /css-declaration-sorter@7.1.1(postcss@8.4.32):
     resolution: {integrity: sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==}
     engines: {node: ^14 || ^16 || >=18}
diff --git a/src/components/Dashboard.svelte b/src/components/Dashboard.svelte
index 8331297..7d9ec38 100644
--- a/src/components/Dashboard.svelte
+++ b/src/components/Dashboard.svelte
@@ -19,9 +19,10 @@
 
 <script lang="ts">
     import {t} from "astro-i18n"
-    import {dataRepo, schemRepo} from "@repo/repo";
     import SchematicList from "./dashboard/SchematicList.svelte";
     import UserInfo from "./dashboard/UserInfo.svelte";
+    import {dataRepo} from "@repo/data.ts";
+    import {schemRepo} from "@repo/schem.ts";
 
     let userFetch = getUser();
     let schematicFetch = getSchematics();
diff --git a/src/components/EloTable.svelte b/src/components/EloTable.svelte
index 600bafa..18a9d3a 100644
--- a/src/components/EloTable.svelte
+++ b/src/components/EloTable.svelte
@@ -18,8 +18,8 @@
   -->
 
 <script lang="ts">
-    import {statsRepo} from "@repo/repo.ts";
     import {t} from "astro-i18n";
+    import {statsRepo} from "@repo/stats.ts";
 
     export let gamemode: string;
 
diff --git a/src/components/FightStatistics.svelte b/src/components/FightStatistics.svelte
index 70cfac6..87294af 100644
--- a/src/components/FightStatistics.svelte
+++ b/src/components/FightStatistics.svelte
@@ -18,9 +18,9 @@
   -->
 
 <script lang="ts">
-    import {statsRepo} from "@repo/repo.ts";
     import FightStatsChart from "./FightStatsChart.svelte";
     import {t} from "astro-i18n";
+    import {statsRepo} from "@repo/stats.ts";
 
     let request = getStats();
 
diff --git a/src/components/Login.svelte b/src/components/Login.svelte
index 17a07e4..94acc61 100644
--- a/src/components/Login.svelte
+++ b/src/components/Login.svelte
@@ -28,7 +28,8 @@
     let error: string = "";
 
     async function login() {
-        let {tokenStore, authRepo} = await import("./repo/repo.ts");
+        let {tokenStore} = await import("./repo/repo.ts");
+        let {authRepo} = await import("./repo/auth.ts");
         if (username === "" || pw === "") {
             pw = "";
             error = t("login.error");
diff --git a/src/components/admin/pages/Edit.svelte b/src/components/admin/pages/Edit.svelte
index b0a0a36..f8d0018 100644
--- a/src/components/admin/pages/Edit.svelte
+++ b/src/components/admin/pages/Edit.svelte
@@ -20,11 +20,11 @@
 <script lang="ts">
 import {ArrowLeftSolid} from "flowbite-svelte-icons";
 import {Button, Card, Navbar, NavBrand, Spinner} from "flowbite-svelte";
-import {pageRepo} from "@repo/repo.ts";
 import {mapToMap, nameRegex} from "../util.ts";
 import TypeAheadSearch from "../components/TypeAheadSearch.svelte";
 import {branches} from "@stores/stores.ts";
 import Editor from "./edit/Editor.svelte";
+import {pageRepo} from "@repo/page.ts";
 
 $: pagesFuture = $pageRepo.listPages(selectedBranch);
 
diff --git a/src/components/admin/pages/Event.svelte b/src/components/admin/pages/Event.svelte
index 2b76af8..1e31ec9 100644
--- a/src/components/admin/pages/Event.svelte
+++ b/src/components/admin/pages/Event.svelte
@@ -22,8 +22,8 @@
     import EventEdit from "./event/EventEdit.svelte";
     import {ArrowLeftSolid} from "flowbite-svelte-icons";
     import FightList from "./event/FightList.svelte";
-    import {eventRepo} from "@repo/repo.ts";
     import TeamList from "./event/TeamList.svelte";
+    import {eventRepo} from "@repo/event.ts";
 
     export let params: { id: number };
 
diff --git a/src/components/admin/pages/Generate.svelte b/src/components/admin/pages/Generate.svelte
index 0375e77..9bbb00b 100644
--- a/src/components/admin/pages/Generate.svelte
+++ b/src/components/admin/pages/Generate.svelte
@@ -20,8 +20,8 @@
 <script lang="ts">
     import {Navbar, NavBrand, Spinner, TabItem, Tabs} from "flowbite-svelte";
     import {ArrowLeftSolid} from "flowbite-svelte-icons";
-    import {eventRepo} from "@repo/repo.ts";
     import GroupGenerator from "./generate/GroupGenerator.svelte";
+    import {eventRepo} from "@repo/event.ts";
 
     export let params: { id: number };
 
diff --git a/src/components/admin/pages/Home.svelte b/src/components/admin/pages/Home.svelte
index 921a159..927ed61 100644
--- a/src/components/admin/pages/Home.svelte
+++ b/src/components/admin/pages/Home.svelte
@@ -23,7 +23,8 @@
     import {PlusSolid} from "flowbite-svelte-icons";
     import EventCard from "./home/EventCard.svelte";
     import CreateEventModal from "./home/CreateEventModal.svelte";
-    import {eventRepo, tokenStore} from "@repo/repo.ts";
+    import {eventRepo} from "@repo/event.ts";
+    import {tokenStore} from "@repo/repo.ts";
 
     let events = $eventRepo.listEvents()
     let showAdd = false
diff --git a/src/components/admin/pages/Perms.svelte b/src/components/admin/pages/Perms.svelte
index 1f07211..ae867a1 100644
--- a/src/components/admin/pages/Perms.svelte
+++ b/src/components/admin/pages/Perms.svelte
@@ -21,8 +21,8 @@
     import {Button, Card, Checkbox, Input, Label, Navbar, NavBrand, Radio, Spinner} from "flowbite-svelte";
     import {ArrowLeftSolid} from "flowbite-svelte-icons";
     import {players} from "@stores/stores.ts";
-    import {permsRepo} from "@repo/repo.ts";
     import {capitalize} from "../util.ts";
+    import {permsRepo} from "@repo/perms.ts";
 
     let search = "";
     $: lowerCaseSearch = search.toLowerCase();
diff --git a/src/components/admin/pages/edit/Editor.svelte b/src/components/admin/pages/edit/Editor.svelte
index 3512400..a155a37 100644
--- a/src/components/admin/pages/edit/Editor.svelte
+++ b/src/components/admin/pages/edit/Editor.svelte
@@ -21,12 +21,12 @@
     import {Spinner, Toolbar, ToolbarButton, ToolbarGroup} from "flowbite-svelte";
     import {json} from "@codemirror/lang-json";
     import CodeMirror from "svelte-codemirror-editor";
-    import {pageRepo} from "@repo/repo.ts";
     import {base64ToBytes} from "../../util.ts";
     import type {Page} from "@type/page.ts";
     import {materialDark} from '@ddietr/codemirror-themes/material-dark.js'
     import {createEventDispatcher} from "svelte";
     import MDEMarkdownEditor from "./MDEMarkdownEditor.svelte";
+    import {pageRepo} from "@repo/page.ts";
 
     export let pageId: number;
     export let branch: string;
diff --git a/src/components/admin/pages/event/EventEdit.svelte b/src/components/admin/pages/event/EventEdit.svelte
index 1396d75..d6a7b2a 100644
--- a/src/components/admin/pages/event/EventEdit.svelte
+++ b/src/components/admin/pages/event/EventEdit.svelte
@@ -23,8 +23,7 @@
     import {schemTypes} from "@stores/stores.ts";
     import dayjs from "dayjs";
     import utc from "dayjs/plugin/utc"
-    import type {UpdateEvent} from "@repo/event.ts";
-    import {eventRepo} from "@repo/repo.ts";
+    import {eventRepo, type UpdateEvent} from "@repo/event.ts";
     import ErrorModal from "../../components/ErrorModal.svelte";
     import {replace} from "svelte-spa-router";
     import {CheckCircleOutline} from "flowbite-svelte-icons";
diff --git a/src/components/admin/pages/event/FightCard.svelte b/src/components/admin/pages/event/FightCard.svelte
index 4b62958..54b8854 100644
--- a/src/components/admin/pages/event/FightCard.svelte
+++ b/src/components/admin/pages/event/FightCard.svelte
@@ -23,8 +23,8 @@
     import type {EventFight, ExtendedEvent} from "@type/event.ts";
     import FightEditModal from "./modals/FightEditModal.svelte";
     import {createEventDispatcher} from "svelte";
-    import {fightRepo} from "@repo/repo.ts";
     import {isWide} from "@stores/stores.ts";
+    import {fightRepo} from "@repo/fight.ts";
 
     export let fight: EventFight;
     export let data: ExtendedEvent;
diff --git a/src/components/admin/pages/event/FightList.svelte b/src/components/admin/pages/event/FightList.svelte
index c573593..1a94771 100644
--- a/src/components/admin/pages/event/FightList.svelte
+++ b/src/components/admin/pages/event/FightList.svelte
@@ -36,10 +36,9 @@
     } from "flowbite-svelte-icons";
     import FightCard from "./FightCard.svelte";
     import CreateFightModal from "./modals/CreateFightModal.svelte";
-    import {fightRepo} from "@repo/repo.ts";
     import {groups, players} from "@stores/stores.ts";
     import TypeAheadSearch from "../../components/TypeAheadSearch.svelte";
-    import type {UpdateFight} from "@repo/fight.ts";
+    import {fightRepo, type UpdateFight} from "@repo/fight.ts";
     import dayjs from "dayjs";
     import duration from "dayjs/plugin/duration"
     dayjs.extend(duration)
diff --git a/src/components/admin/pages/event/modals/CreateFightModal.svelte b/src/components/admin/pages/event/modals/CreateFightModal.svelte
index 3e47aae..0577ee1 100644
--- a/src/components/admin/pages/event/modals/CreateFightModal.svelte
+++ b/src/components/admin/pages/event/modals/CreateFightModal.svelte
@@ -21,10 +21,10 @@
     import {Button, Modal} from "flowbite-svelte";
     import type {ExtendedEvent} from "@type/event.ts";
     import FightEditPart from "../../../components/FightEditPart.svelte";
-    import {fightRepo} from "@repo/repo.ts";
     import ErrorModal from "../../../components/ErrorModal.svelte";
     import {createEventDispatcher} from "svelte";
     import dayjs from "dayjs";
+    import {fightRepo} from "@repo/fight.ts";
 
     let dispatch = createEventDispatcher();
 
diff --git a/src/components/admin/pages/event/modals/FightEditModal.svelte b/src/components/admin/pages/event/modals/FightEditModal.svelte
index 5c6eade..a8cbaa5 100644
--- a/src/components/admin/pages/event/modals/FightEditModal.svelte
+++ b/src/components/admin/pages/event/modals/FightEditModal.svelte
@@ -21,8 +21,7 @@
     import {Button, Modal} from "flowbite-svelte";
     import type {EventFight, ExtendedEvent} from "@type/event.ts";
     import FightEditPart from "../../../components/FightEditPart.svelte";
-    import type {UpdateFight} from "@repo/fight.ts";
-    import {fightRepo} from "@repo/repo.ts";
+    import {fightRepo, type UpdateFight} from "@repo/fight.ts";
     import ErrorModal from "../../../components/ErrorModal.svelte";
     import {createEventDispatcher} from "svelte";
     import dayjs from "dayjs";
diff --git a/src/components/admin/pages/generate/GroupGenerator.svelte b/src/components/admin/pages/generate/GroupGenerator.svelte
index c76837b..808baa1 100644
--- a/src/components/admin/pages/generate/GroupGenerator.svelte
+++ b/src/components/admin/pages/generate/GroupGenerator.svelte
@@ -25,9 +25,9 @@
     import {Button, Input, Label, Modal, Range, Select} from "flowbite-svelte";
     import {gamemodes, maps} from "@stores/stores.ts";
     import {PlusSolid} from "flowbite-svelte-icons";
-    import {fightRepo} from "@repo/repo.ts";
     import {replace} from "svelte-spa-router";
     import dayjs from "dayjs";
+    import {fightRepo} from "@repo/fight.ts";
 
     export let data: ExtendedEvent;
     $: teams = new Map<number, Team>(data.teams.map(team => [team.id, team]));
diff --git a/src/components/admin/pages/home/CreateEventModal.svelte b/src/components/admin/pages/home/CreateEventModal.svelte
index f6ecf39..81d55ac 100644
--- a/src/components/admin/pages/home/CreateEventModal.svelte
+++ b/src/components/admin/pages/home/CreateEventModal.svelte
@@ -21,8 +21,8 @@
     import {Button, Input, Label, Modal} from "flowbite-svelte";
     import {createEventDispatcher} from "svelte";
     import ErrorModal from "../../components/ErrorModal.svelte";
-    import {eventRepo} from "@repo/repo.ts";
     import dayjs from "dayjs";
+    import {eventRepo} from "@repo/event.ts";
 
     export let open = false;
     const dispatch = createEventDispatcher();
diff --git a/src/components/dashboard/SchematicInfo.svelte b/src/components/dashboard/SchematicInfo.svelte
index ec0f9aa..0b7bb9f 100644
--- a/src/components/dashboard/SchematicInfo.svelte
+++ b/src/components/dashboard/SchematicInfo.svelte
@@ -19,10 +19,10 @@
 
 <script lang="ts">
     import {createEventDispatcher} from "svelte";
-    import {schemRepo} from "@repo/repo";
     import {Modal, Spinner} from "flowbite-svelte";
     import SchematicInfoModal from "./SchematicInfoModal.svelte";
     import type {Player} from "@type/data.ts";
+    import {schemRepo} from "@repo/schem.ts";
 
     const dispatch = createEventDispatcher();
 
diff --git a/src/components/dashboard/SchematicInfoModal.svelte b/src/components/dashboard/SchematicInfoModal.svelte
index a709bf0..74e19b7 100644
--- a/src/components/dashboard/SchematicInfoModal.svelte
+++ b/src/components/dashboard/SchematicInfoModal.svelte
@@ -23,9 +23,9 @@
     import {Modal} from "flowbite-svelte";
     import type {SchematicInfo} from "@type/schem.ts";
     import {createEventDispatcher} from "svelte";
-    import {schemRepo} from "@repo/repo";
     import type {Player} from "@type/data.ts";
     import dayjs from "dayjs";
+    import {schemRepo} from "@repo/schem.ts";
 
     const dispatch = createEventDispatcher();
 
diff --git a/src/components/dashboard/Statistics.svelte b/src/components/dashboard/Statistics.svelte
index c80ec9e..059526c 100644
--- a/src/components/dashboard/Statistics.svelte
+++ b/src/components/dashboard/Statistics.svelte
@@ -19,8 +19,8 @@
 
 <script lang="ts">
     import type {Player} from "@type/data.ts";
-    import {statsRepo} from "@repo/repo.ts";
     import {astroI18n, t} from "astro-i18n"
+    import {statsRepo} from "@repo/stats.ts";
 
     export let user: Player;
 
diff --git a/src/components/dashboard/UploadModal.svelte b/src/components/dashboard/UploadModal.svelte
index bfab859..348981e 100644
--- a/src/components/dashboard/UploadModal.svelte
+++ b/src/components/dashboard/UploadModal.svelte
@@ -19,8 +19,8 @@
 
 <script lang="ts">
     import {Modal} from "flowbite-svelte";
-    import {schemRepo} from "@repo/repo.ts";
     import {createEventDispatcher} from "svelte";
+    import {schemRepo} from "@repo/schem.ts";
 
     const dispatch = createEventDispatcher();
 
diff --git a/src/components/dashboard/UserInfo.svelte b/src/components/dashboard/UserInfo.svelte
index 839e247..edef8ef 100644
--- a/src/components/dashboard/UserInfo.svelte
+++ b/src/components/dashboard/UserInfo.svelte
@@ -20,9 +20,10 @@
 <script lang="ts">
     import {t} from "astro-i18n";
     import type {Player} from "@type/data.ts";
-    import {authRepo, tokenStore} from "@repo/repo.ts";
     import {l} from "@utils/util.ts";
     import Statistics from "./Statistics.svelte";
+    import {authRepo} from "@repo/auth.ts";
+    import {tokenStore} from "@repo/repo.ts";
 
     export let user: Player;
 
diff --git a/src/components/repo/auth.ts b/src/components/repo/auth.ts
index 2fc84b6..893a7d6 100644
--- a/src/components/repo/auth.ts
+++ b/src/components/repo/auth.ts
@@ -17,7 +17,8 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {fetchWithToken} from "./repo.ts";
+import {fetchWithToken, tokenStore} from "./repo.ts";
+import {derived} from "svelte/store";
 
 export class AuthRepo {
     constructor(private token: string) {
@@ -38,4 +39,6 @@ export class AuthRepo {
             method: "POST"
         });
     }
-}
\ No newline at end of file
+}
+
+export const authRepo = derived(tokenStore, ($token) => new AuthRepo($token));
\ No newline at end of file
diff --git a/src/components/repo/data.ts b/src/components/repo/data.ts
index 1a26e09..8059378 100644
--- a/src/components/repo/data.ts
+++ b/src/components/repo/data.ts
@@ -19,7 +19,8 @@
 
 import type {Player, Server} from "@type/data.ts";
 import {PlayerSchema, ServerSchema} from "@type/data.ts";
-import {fetchWithToken} from "./repo.ts";
+import {fetchWithToken, tokenStore} from "./repo.ts";
+import {derived} from "svelte/store";
 
 export class DataRepo {
     constructor(private token: string) {}
@@ -31,4 +32,6 @@ export class DataRepo {
     public async getMe(): Promise<Player> {
         return await fetchWithToken(this.token, "/data/me").then(value => value.json()).then(PlayerSchema.parse);
     }
-}
\ No newline at end of file
+}
+
+export const dataRepo = derived(tokenStore, ($token) => new DataRepo($token));
\ No newline at end of file
diff --git a/src/components/repo/event.ts b/src/components/repo/event.ts
index f26f208..2c7f9b3 100644
--- a/src/components/repo/event.ts
+++ b/src/components/repo/event.ts
@@ -18,10 +18,11 @@
  */
 
 import type {ExtendedEvent, ShortEvent, SWEvent} from "@type/event";
-import {fetchWithToken} from "./repo";
+import {fetchWithToken, tokenStore} from "./repo";
 import {ExtendedEventSchema, ShortEventSchema, SWEventSchema} from "@type/event.js";
 import {z} from "zod";
 import type {Dayjs} from "dayjs";
+import {derived} from "svelte/store";
 
 export interface CreateEvent {
     name: string
@@ -95,3 +96,5 @@ export class EventRepo {
         return res.ok;
     }
 }
+
+export const eventRepo = derived(tokenStore, ($token) => new EventRepo($token));
diff --git a/src/components/repo/fight.ts b/src/components/repo/fight.ts
index 8899a61..4216917 100644
--- a/src/components/repo/fight.ts
+++ b/src/components/repo/fight.ts
@@ -18,10 +18,11 @@
  */
 
 import type {EventFight} from "@type/event.js";
-import {fetchWithToken} from "./repo";
+import {fetchWithToken, tokenStore} from "./repo";
 import {z} from "zod";
 import {EventFightSchema} from "@type/event.js";
 import type {Dayjs} from "dayjs";
+import {derived} from "svelte/store";
 
 export interface CreateFight {
     spielmodus: string
@@ -86,12 +87,14 @@ export class FightRepo {
     }
 
     public async deleteFight(fightId: number): Promise<void> {
-        let res = await fetchWithToken(this.token, `/fights/${fightId}`, {
+        const res = await fetchWithToken(this.token, `/fights/${fightId}`, {
             method: "DELETE"
-        })
+        });
 
         if (!res.ok) {
             throw new Error("Could not delete fight: " + res.statusText);
         }
     }
 }
+
+export const fightRepo = derived(tokenStore, ($token) => new FightRepo($token));
diff --git a/src/components/repo/page.ts b/src/components/repo/page.ts
index c921b06..50ae4fc 100644
--- a/src/components/repo/page.ts
+++ b/src/components/repo/page.ts
@@ -18,10 +18,11 @@
  */
 
 import type {Page, PageList} from "@type/page.ts";
-import {fetchWithToken} from "./repo.ts";
+import {fetchWithToken, tokenStore} from "./repo.ts";
 import {PageListSchema, PageSchema} from "@type/page.ts";
 import {bytesToBase64} from "../admin/util.ts";
 import {z} from "zod";
+import {derived} from "svelte/store";
 
 export class PageRepo {
     constructor(private token: string) {}
@@ -74,4 +75,6 @@ export class PageRepo {
     public async deletePage(id: number, message: string, sha: string, branch: string = "master"): Promise<void> {
         await fetchWithToken(this.token, `/page/${id}?branch=${branch}`, {method: "DELETE", body: JSON.stringify({message, sha})});
     }
-}
\ No newline at end of file
+}
+
+export const pageRepo = derived(tokenStore, ($token) => new PageRepo($token));
\ No newline at end of file
diff --git a/src/components/repo/perms.ts b/src/components/repo/perms.ts
index c5d7a88..6651ccb 100644
--- a/src/components/repo/perms.ts
+++ b/src/components/repo/perms.ts
@@ -18,8 +18,9 @@
  */
 
 import type {Perms, UserPerms} from "@type/perms.js";
-import {fetchWithToken} from "./repo";
+import {fetchWithToken, tokenStore} from "./repo";
 import {PermsSchema, UserPermsSchema} from "@type/perms.js";
+import {derived} from "svelte/store";
 
 export class PermsRepo {
     constructor(private token: string) {}
@@ -68,3 +69,5 @@ export class PermsRepo {
         }
     }
 }
+
+export const permsRepo = derived(tokenStore, ($token) => new PermsRepo($token));
diff --git a/src/components/repo/repo.ts b/src/components/repo/repo.ts
index ab8141d..0c856d5 100644
--- a/src/components/repo/repo.ts
+++ b/src/components/repo/repo.ts
@@ -17,38 +17,16 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {derived, writable} from "svelte/store";
-import {EventRepo} from "./event";
-import {FightRepo} from "./fight";
-import {PermsRepo} from "./perms";
-import {PageRepo} from "./page";
-import {DataRepo} from "./data";
-import {SchematicRepo} from "./schem";
-import {StatsRepo} from "./stats";
-import {AuthRepo} from "./auth";
+import {writable} from "svelte/store";
 
-import { AES, enc } from "crypto-js";
+export const fetchWithToken = (token: string, url: string, params: RequestInit = {}) =>
+    fetch(`${import.meta.env.PUBLIC_API_SERVER}${url}`, {...params, headers: {...(token !== "" ? {"Authorization": "Bearer " + (token)}:{}), "Content-Type": "application/json", ...params.headers}})
+        .then(value => {
+            if (value.status === 401) {
+                tokenStore.set("");
+            }
+            return value;
+        });
 
-export const apiUrl = import.meta.env.PUBLIC_API_SERVER;
-const secret = import.meta.env.PUBLIC_SECRET;
-
-function encryptToken(token: string): string {
-    return AES.encrypt(token, secret).toString();
-}
-
-function decryptToken(token: string): string {
-    return AES.decrypt(token, secret).toString(enc.Utf8);
-}
-
-export const fetchWithToken = (token: string, url: string, params: RequestInit = {}) => fetch(`${apiUrl}${url}`, {...params, headers: {...(token !== "" ? {"Authorization": "Bearer " + (token)}:{}), "Content-Type": "application/json", ...params.headers}});
-export const tokenStore = writable(decryptToken(localStorage.getItem("sw-session") ?? ""));
-tokenStore.subscribe((value) => localStorage.setItem("sw-session", encryptToken(value)));
-
-export const eventRepo = derived(tokenStore, ($token) => new EventRepo($token));
-export const fightRepo = derived(tokenStore, ($token) => new FightRepo($token));
-export const permsRepo = derived(tokenStore, ($token) => new PermsRepo($token));
-export const pageRepo = derived(tokenStore, ($token) => new PageRepo($token));
-export const dataRepo = derived(tokenStore, ($token) => new DataRepo($token));
-export const schemRepo = derived(tokenStore, ($token) => new SchematicRepo($token));
-export const statsRepo = derived(tokenStore, ($token) => new StatsRepo($token));
-export const authRepo = derived(tokenStore, ($token) => new AuthRepo($token));
+export const tokenStore = writable((localStorage.getItem("sw-session") ?? ""));
+tokenStore.subscribe((value) => localStorage.setItem("sw-session", value));
diff --git a/src/components/repo/schem.ts b/src/components/repo/schem.ts
index 5745459..b711fb1 100644
--- a/src/components/repo/schem.ts
+++ b/src/components/repo/schem.ts
@@ -17,9 +17,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {fetchWithToken} from "./repo.ts";
+import {fetchWithToken, tokenStore} from "./repo.ts";
 import type {SchematicCode, SchematicInfo, SchematicList} from "@type/schem.ts";
 import {SchematicCodeSchema, SchematicInfoSchema, SchematicListSchema} from "@type/schem.ts";
+import {derived} from "svelte/store";
 
 export class SchematicRepo {
     constructor(private token: string) {}
@@ -49,4 +50,6 @@ export class SchematicRepo {
             })
         });
     }
-}
\ No newline at end of file
+}
+
+export const schemRepo = derived(tokenStore, ($token) => new SchematicRepo($token));
\ No newline at end of file
diff --git a/src/components/repo/stats.ts b/src/components/repo/stats.ts
index 05555fa..2621757 100644
--- a/src/components/repo/stats.ts
+++ b/src/components/repo/stats.ts
@@ -18,8 +18,9 @@
  */
 
 import type {FightStats, Ranking, UserStats} from "@type/stats.ts";
-import {fetchWithToken} from "./repo.ts";
+import {fetchWithToken, tokenStore} from "./repo.ts";
 import {FightStatsSchema, RankingSchema, UserStatsSchema} from "@type/stats.ts";
+import {derived} from "svelte/store";
 
 export class StatsRepo {
 
@@ -36,4 +37,6 @@ export class StatsRepo {
     public async getUserStats(id: number): Promise<UserStats> {
         return await fetchWithToken(this.token, `/stats/user/${id}`).then(value => value.json()).then(UserStatsSchema.parse);
     }
-}
\ No newline at end of file
+}
+
+export const statsRepo = derived(tokenStore, ($token) => new StatsRepo($token));
\ No newline at end of file
diff --git a/src/components/stores/stores.ts b/src/components/stores/stores.ts
index 80cc52a..320906c 100644
--- a/src/components/stores/stores.ts
+++ b/src/components/stores/stores.ts
@@ -23,8 +23,10 @@ import {cached, cachedFamily} from "./cached";
 import type {Team} from "@type/team.ts";
 import {TeamSchema} from "@type/team";
 import {derived, get, writable} from "svelte/store";
-import {dataRepo, fetchWithToken, pageRepo, tokenStore} from "@repo/repo.ts";
 import {z} from "zod";
+import {fetchWithToken, tokenStore} from "@repo/repo.ts";
+import {pageRepo} from "@repo/page.ts";
+import {dataRepo} from "@repo/data.ts";
 
 export const schemTypes = cached<SchematicType[]>([], () =>
     fetchWithToken(get(tokenStore), "/data/schematicTypes")
diff --git a/src/pages/announcements/[...slug].astro b/src/pages/announcements/[...slug].astro
index f2525e0..9a33c0a 100644
--- a/src/pages/announcements/[...slug].astro
+++ b/src/pages/announcements/[...slug].astro
@@ -88,12 +88,12 @@ const ogImage = await getImage({
         )}
         <Content />
         <script>
-            import type {ExtendedEvent} from "@types/event";
             import FightTable from "@components/FightTable.svelte";
             // @ts-expect-error Import Schenanigans
             import {get} from "svelte/store";
-            import {eventRepo} from "@repo/repo";
             import GroupTable from "@components/GroupTable.svelte";
+            import {eventRepo} from "../../components/repo/event";
+            import type {ExtendedEvent} from "@type/event";
             const eventMounts: Map<string, ((ev: ExtendedEvent) => void)[]> = new Map();
 
             class FightTableElement extends HTMLElement {
diff --git a/src/pages/dashboard.astro b/src/pages/dashboard.astro
index 675440c..9a16857 100644
--- a/src/pages/dashboard.astro
+++ b/src/pages/dashboard.astro
@@ -5,10 +5,9 @@ import {t} from "astro-i18n";
 ---
 
 <PageLayout title={t("dashboard.page")}>
-    <script>
-        import {AES} from "crypto-js";
+    <script is:inline>
         import {l} from "../util/util";
-        if (AES.decrypt(localStorage.getItem("sw-session") ?? "", import.meta.env.PUBLIC_SECRET)?.toString() === "") {
+        if ((localStorage.getItem("sw-session") ?? "") === "") {
             window.location.href = l("/login");
         }
     </script>
diff --git a/src/pages/login.astro b/src/pages/login.astro
index 111149e..0c25b6a 100644
--- a/src/pages/login.astro
+++ b/src/pages/login.astro
@@ -7,11 +7,10 @@ import localBau from "@images/2023-10-08_20.43.43.png";
 ---
 
 <NavbarLayout title={t("login.page")}>
-    <script>
+    <script is:inline>
         import {l} from "../util/util";
-        import {AES} from "crypto-js";
 
-        if (AES.decrypt(localStorage.getItem("sw-session") ?? "", import.meta.env.PUBLIC_SECRET)?.toString() !== "") {
+        if ((localStorage.getItem("sw-session") ?? "") !== "") {
             window.location.href = l("/dashboard");
         }
     </script>
diff --git a/steamwarci.yml b/steamwarci.yml
index d87b428..9f5143e 100644
--- a/steamwarci.yml
+++ b/steamwarci.yml
@@ -1,8 +1,3 @@
-setup:
-  - "echo 'PUBLIC_API_SERVER=https://steamwar.de/eventplanner-api/
-PUBLIC_SECRET=mae6eeheeT4Quain' > .env"
-
 build:
-  - "pnpm run ci"
-
-artifacts:
+  - "echo 'PUBLIC_API_SERVER=https://steamwar.de/eventplanner-api/"
+  - "pnpm run ci"
\ No newline at end of file