From 50257d61f8c6596c7640df4430e7bf7feb1f71f5 Mon Sep 17 00:00:00 2001
From: sam <sam@sleepycat.moe>
Date: Sun, 9 Jun 2024 23:21:28 +0200
Subject: [PATCH] switch frontend css from bootstrap to bulma

---
 .../Controllers/UsersController.cs            |   1 -
 Foxnouns.Backend/Database/Models/Cache.cs     |  11 ++
 Foxnouns.Frontend/package.json                |   6 +-
 Foxnouns.Frontend/src/app.html                |   4 +-
 Foxnouns.Frontend/src/app.scss                |   7 ++
 Foxnouns.Frontend/src/lib/nav/Dropdown.svelte |  10 ++
 .../src/lib/nav/DropdownItem.svelte           |  10 ++
 Foxnouns.Frontend/src/lib/nav/Navbar.svelte   | 103 ++++++++++--------
 Foxnouns.Frontend/src/lib/store.ts            |   9 ++
 Foxnouns.Frontend/src/routes/+layout.svelte   |   5 +-
 Foxnouns.Frontend/src/routes/+page.svelte     |   2 +-
 .../src/routes/menu/+page.server.ts           |   0
 .../src/routes/menu/+page.svelte              |   0
 Foxnouns.Frontend/yarn.lock                   |  53 ++++++---
 14 files changed, 150 insertions(+), 71 deletions(-)
 create mode 100644 Foxnouns.Backend/Database/Models/Cache.cs
 create mode 100644 Foxnouns.Frontend/src/app.scss
 create mode 100644 Foxnouns.Frontend/src/lib/nav/Dropdown.svelte
 create mode 100644 Foxnouns.Frontend/src/lib/nav/DropdownItem.svelte
 create mode 100644 Foxnouns.Frontend/src/lib/store.ts
 create mode 100644 Foxnouns.Frontend/src/routes/menu/+page.server.ts
 create mode 100644 Foxnouns.Frontend/src/routes/menu/+page.svelte

diff --git a/Foxnouns.Backend/Controllers/UsersController.cs b/Foxnouns.Backend/Controllers/UsersController.cs
index 26ae497..c6101bb 100644
--- a/Foxnouns.Backend/Controllers/UsersController.cs
+++ b/Foxnouns.Backend/Controllers/UsersController.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using Foxnouns.Backend.Database;
 using Foxnouns.Backend.Middleware;
 using Foxnouns.Backend.Services;
diff --git a/Foxnouns.Backend/Database/Models/Cache.cs b/Foxnouns.Backend/Database/Models/Cache.cs
new file mode 100644
index 0000000..81d4b2b
--- /dev/null
+++ b/Foxnouns.Backend/Database/Models/Cache.cs
@@ -0,0 +1,11 @@
+using NodaTime;
+
+namespace Foxnouns.Backend.Database.Models;
+
+public class Cache
+{
+    public long Id { get; init; }
+    public required string Key { get; init; }
+    public required string Value { get; set; }
+    public Instant Expires { get; init; }
+}
\ No newline at end of file
diff --git a/Foxnouns.Frontend/package.json b/Foxnouns.Frontend/package.json
index fb3ce1f..5b9442e 100644
--- a/Foxnouns.Frontend/package.json
+++ b/Foxnouns.Frontend/package.json
@@ -12,18 +12,20 @@
 		"format": "prettier --write ."
 	},
 	"devDependencies": {
+		"@fontsource/firago": "^5.0.11",
 		"@sveltejs/adapter-node": "^5.0.1",
 		"@sveltejs/kit": "^2.0.0",
 		"@sveltejs/vite-plugin-svelte": "^3.0.0",
-		"@sveltestrap/sveltestrap": "^6.2.7",
+		"@tabler/icons-svelte": "^3.5.0",
 		"@types/eslint": "^8.56.7",
-		"bootstrap": "^5.3.3",
+		"bulma": "^1.0.1",
 		"eslint": "^9.0.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-svelte": "^2.36.0",
 		"globals": "^15.0.0",
 		"prettier": "^3.1.1",
 		"prettier-plugin-svelte": "^3.1.2",
+		"sass": "^1.77.4",
 		"svelte": "^4.2.7",
 		"svelte-check": "^3.6.0",
 		"tslib": "^2.4.1",
diff --git a/Foxnouns.Frontend/src/app.html b/Foxnouns.Frontend/src/app.html
index 562d998..1bf633d 100644
--- a/Foxnouns.Frontend/src/app.html
+++ b/Foxnouns.Frontend/src/app.html
@@ -6,10 +6,10 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<script>
 			let theme = localStorage.getItem("pronounscc-theme");
-			if (!theme || theme === "auto")
+			if (!theme)
 				theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
 
-			document.documentElement.setAttribute("data-bs-theme", theme);
+			document.documentElement.setAttribute("data-theme", theme);
 		</script>
 		%sveltekit.head%
 	</head>
diff --git a/Foxnouns.Frontend/src/app.scss b/Foxnouns.Frontend/src/app.scss
new file mode 100644
index 0000000..e8dcaf9
--- /dev/null
+++ b/Foxnouns.Frontend/src/app.scss
@@ -0,0 +1,7 @@
+@use "bulma/sass" with (
+	$family-primary: "FiraGO"
+);
+
+@import "@fontsource/firago/400.css";
+@import "@fontsource/firago/400-italic.css";
+@import "@fontsource/firago/700.css";
diff --git a/Foxnouns.Frontend/src/lib/nav/Dropdown.svelte b/Foxnouns.Frontend/src/lib/nav/Dropdown.svelte
new file mode 100644
index 0000000..00c70c5
--- /dev/null
+++ b/Foxnouns.Frontend/src/lib/nav/Dropdown.svelte
@@ -0,0 +1,10 @@
+<script lang="ts">
+	let isOpen = false;
+</script>
+
+<div class={"navbar-item has-dropdown" + (isOpen ? " is-active" : "")}>
+	<button class="navbar-link" on:click={() => (isOpen = !isOpen)}><slot name="label" /></button>
+	<div class="navbar-dropdown">
+		<slot />
+	</div>
+</div>
diff --git a/Foxnouns.Frontend/src/lib/nav/DropdownItem.svelte b/Foxnouns.Frontend/src/lib/nav/DropdownItem.svelte
new file mode 100644
index 0000000..be22533
--- /dev/null
+++ b/Foxnouns.Frontend/src/lib/nav/DropdownItem.svelte
@@ -0,0 +1,10 @@
+<script lang="ts">
+	export let divider = false;
+	export let href: string | undefined = undefined;
+</script>
+
+{#if divider}
+	<hr class="navbar-divider" />
+{:else}
+	<a {href} class="navbar-item"><slot /></a>
+{/if}
diff --git a/Foxnouns.Frontend/src/lib/nav/Navbar.svelte b/Foxnouns.Frontend/src/lib/nav/Navbar.svelte
index 588bb44..7effb19 100644
--- a/Foxnouns.Frontend/src/lib/nav/Navbar.svelte
+++ b/Foxnouns.Frontend/src/lib/nav/Navbar.svelte
@@ -1,57 +1,70 @@
 <script lang="ts">
-	import {
-		Navbar,
-		NavbarBrand,
-		NavbarToggler,
-		Collapse,
-		Nav,
-		Dropdown,
-		DropdownToggle,
-		DropdownMenu,
-		DropdownItem,
-		NavItem,
-	} from "@sveltestrap/sveltestrap";
+	import { IconSun, IconMoon } from "@tabler/icons-svelte";
+	import { onMount } from "svelte";
+	import Dropdown from "./Dropdown.svelte";
+	import DropdownItem from "./DropdownItem.svelte";
 	import Logo from "./Logo.svelte";
 	import type { User } from "$lib/api/user";
+	import { themeStore } from "$lib/store";
 
 	export let user: User | undefined;
+	let navIsOpen = false;
 
-	let showMenu = true;
-	const toggleMenu = () => {
-		showMenu = !showMenu;
+	onMount(() => {
+		let theme = localStorage.getItem("pronounscc-theme");
+		if (!theme)
+			theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+		themeStore.set(theme);
+	});
+
+	const toggleTheme = () => {
+		themeStore.set($themeStore === "dark" ? "light" : "dark");
+		document.documentElement.setAttribute("data-theme", $themeStore);
+		localStorage.setItem("pronounscc-theme", $themeStore);
 	};
-	let userMenuOpen = false;
 </script>
 
-<Navbar>
-	<NavbarBrand href="/" aria-label="pronouns.cc landing page">
-		<Logo />
-	</NavbarBrand>
-	<NavbarToggler on:click={toggleMenu} aria-label="Toggle menu" />
-	<Collapse isOpen={showMenu} navbar expand="lg">
-		<Nav class="ms-auto" navbar>
+<nav class="navbar is-transparent" aria-label="Main navigation">
+	<div class="navbar-brand">
+		<a href="/" class="navbar-item">
+			<Logo />
+		</a>
+		<button
+			class={"navbar-burger" + (navIsOpen ? " is-active" : "")}
+			aria-label="menu"
+			aria-expanded="false"
+			on:click={() => (navIsOpen = !navIsOpen)}
+		>
+			<span aria-hidden="true"></span>
+			<span aria-hidden="true"></span>
+			<span aria-hidden="true"></span>
+			<span aria-hidden="true"></span>
+		</button>
+	</div>
+	<div class={"navbar-menu" + (navIsOpen ? " is-active" : "")}>
+		<div class="navbar-end">
 			{#if user}
-				<NavItem>
-					<Dropdown nav isOpen={userMenuOpen} toggle={() => (userMenuOpen = !userMenuOpen)}>
-						<DropdownToggle nav caret>@{user.username}</DropdownToggle>
-						<DropdownMenu>
-							<DropdownItem href="/@{user.username}">View profile</DropdownItem>
-							<DropdownItem href="/settings">Settings</DropdownItem>
-							<DropdownItem divider />
-							<DropdownItem href="/logout">Log out</DropdownItem>
-						</DropdownMenu>
-					</Dropdown>
-				</NavItem>
+				<Dropdown>
+					<span slot="label">@{user.username}</span>
+					<DropdownItem href="/@{user.username}">View profile</DropdownItem>
+					<DropdownItem href="/settings">Settings</DropdownItem>
+					<DropdownItem divider />
+					<DropdownItem href="/logout">Log out</DropdownItem>
+				</Dropdown>
 			{:else}
-				<NavItem>
-					<Dropdown nav isOpen={userMenuOpen} toggle={() => (userMenuOpen = !userMenuOpen)}>
-						<DropdownToggle nav caret>Not logged in</DropdownToggle>
-						<DropdownMenu>
-							<DropdownItem href="/login">Log in</DropdownItem>
-						</DropdownMenu>
-					</Dropdown>
-				</NavItem>
+				<Dropdown>
+					<span slot="label">Not logged in</span>
+					<DropdownItem href="/login">Log in</DropdownItem>
+					<DropdownItem href="/register">Sign up</DropdownItem>
+				</Dropdown>
 			{/if}
-		</Nav>
-	</Collapse>
-</Navbar>
+			<button class="navbar-item" on:click={() => toggleTheme()}>
+				{#if $themeStore === "dark"}
+					<IconSun size={20} />&nbsp;Light theme
+				{:else}
+					<IconMoon size={20} />&nbsp;Dark theme
+				{/if}
+			</button>
+		</div>
+	</div>
+</nav>
diff --git a/Foxnouns.Frontend/src/lib/store.ts b/Foxnouns.Frontend/src/lib/store.ts
new file mode 100644
index 0000000..d4449ad
--- /dev/null
+++ b/Foxnouns.Frontend/src/lib/store.ts
@@ -0,0 +1,9 @@
+import { writable } from "svelte/store";
+import { browser } from "$app/environment";
+
+const defaultThemeValue = "light";
+const initialThemeValue = browser
+	? window.localStorage.getItem("pronouns-theme") ?? defaultThemeValue
+	: defaultThemeValue;
+
+export const themeStore = writable<string>(initialThemeValue);
diff --git a/Foxnouns.Frontend/src/routes/+layout.svelte b/Foxnouns.Frontend/src/routes/+layout.svelte
index 64a204f..608c9f3 100644
--- a/Foxnouns.Frontend/src/routes/+layout.svelte
+++ b/Foxnouns.Frontend/src/routes/+layout.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
-	import Navbar from "$lib/nav/Navbar.svelte";
-	import "bootstrap/dist/css/bootstrap.min.css";
 	import type { LayoutData } from "./$types";
+	import "../app.scss";
+	import Navbar from "$lib/nav/Navbar.svelte";
 
 	export let data: LayoutData;
 </script>
 
 <Navbar user={data.user} />
-
 <slot />
diff --git a/Foxnouns.Frontend/src/routes/+page.svelte b/Foxnouns.Frontend/src/routes/+page.svelte
index 0f5264b..88f5279 100644
--- a/Foxnouns.Frontend/src/routes/+page.svelte
+++ b/Foxnouns.Frontend/src/routes/+page.svelte
@@ -15,5 +15,5 @@
 </p>
 
 <p>
-    stats: {data.meta.users.total} users, {data.meta.members} members
+    <strong>stats:</strong> {data.meta.users.total} users, {data.meta.members} members
 </p>
diff --git a/Foxnouns.Frontend/src/routes/menu/+page.server.ts b/Foxnouns.Frontend/src/routes/menu/+page.server.ts
new file mode 100644
index 0000000..e69de29
diff --git a/Foxnouns.Frontend/src/routes/menu/+page.svelte b/Foxnouns.Frontend/src/routes/menu/+page.svelte
new file mode 100644
index 0000000..e69de29
diff --git a/Foxnouns.Frontend/yarn.lock b/Foxnouns.Frontend/yarn.lock
index 7eccad0..93fffb6 100644
--- a/Foxnouns.Frontend/yarn.lock
+++ b/Foxnouns.Frontend/yarn.lock
@@ -171,6 +171,11 @@
   resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.3.tgz#e65ae80ee2927b4fd8c5c26b15ecacc2b2a6cc2a"
   integrity sha512-HAbhAYKfsAC2EkTqve00ibWIZlaU74Z1EHwAjYr4PXF0YU2VEA1zSIKSSpKszRLRWwHzzRZXvK632u+uXzvsvw==
 
+"@fontsource/firago@^5.0.11":
+  version "5.0.11"
+  resolved "https://registry.yarnpkg.com/@fontsource/firago/-/firago-5.0.11.tgz#8fe3c8b47cc1d8148bc50c80189ed3aac8555cb7"
+  integrity sha512-XfFsLxSFMTbJTN+94yFTJyuFGmoxtykt+6rL0fj9unCeXslllirpH6KetIlbZO73NzTUmKYRvtOJdOgVbBGtaQ==
+
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
@@ -239,11 +244,6 @@
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817"
   integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==
 
-"@popperjs/core@^2.11.8":
-  version "2.11.8"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
-  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
-
 "@rollup/plugin-commonjs@^25.0.7":
   version "25.0.8"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.8.tgz#c77e608ab112a666b7f2a6bea625c73224f7dd34"
@@ -412,12 +412,17 @@
     svelte-hmr "^0.16.0"
     vitefu "^0.2.5"
 
-"@sveltestrap/sveltestrap@^6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@sveltestrap/sveltestrap/-/sveltestrap-6.2.7.tgz#5b2736cbee2db973f02b09d2e9d5bf819418f1f9"
-  integrity sha512-WwLLfAFUb42BGuRrf3Vbct30bQMzlEMMipN/MfxhjuLTmLQeW9muVJfPyvjtWS+mY+RjkSCoHvAp/ZobP1NLlQ==
+"@tabler/icons-svelte@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@tabler/icons-svelte/-/icons-svelte-3.5.0.tgz#02efede4ce0ed680e0835878c6c02cd63daf9d9a"
+  integrity sha512-mc5ardGEM7cnUA4/q6Mz5bmW9B6t28vAAOf4Wl6+KXiTwG00EjImfnIr3pS3Ihi9sFIiXvJPYRl4H5IHlgvJvQ==
   dependencies:
-    "@popperjs/core" "^2.11.8"
+    "@tabler/icons" "3.5.0"
+
+"@tabler/icons@3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-3.5.0.tgz#29d0dbf100c8cb392dd64f1fe8efdcfcd1f57e44"
+  integrity sha512-I53dC3ZSHQ2MZFGvDYJelfXm91L2bTTixS4w5jTAulLhHbCZso5Bih4Rk/NYZxlngLQMKHvEYwZQ+6w/WluKiA==
 
 "@types/cookie@^0.6.0":
   version "0.6.0"
@@ -607,11 +612,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
   integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
-bootstrap@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38"
-  integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -644,6 +644,11 @@ builtin-modules@^3.3.0:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
   integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
 
+bulma@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bulma/-/bulma-1.0.1.tgz#e37261d6f8e1a3494c9378803d9958effb2715ce"
+  integrity sha512-+xv/BIAEQakHkR0QVz+s+RjNqfC53Mx9ZYexyaFNFo9wx5i76HXArNdwW7bccyJxa5mgV/T5DcVGqsAB19nBJQ==
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -657,7 +662,7 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chokidar@^3.4.1:
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -1144,6 +1149,11 @@ ignore@^5.2.0, ignore@^5.3.1:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
+immutable@^4.0.0:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.6.tgz#6a05f7858213238e587fb83586ffa3b4b27f0447"
+  integrity sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==
+
 import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -1630,6 +1640,15 @@ sander@^0.5.0:
     mkdirp "^0.5.1"
     rimraf "^2.5.2"
 
+sass@^1.77.4:
+  version "1.77.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.4.tgz#92059c7bfc56b827c56eb116778d157ec017a5cd"
+  integrity sha512-vcF3Ckow6g939GMA4PeU7b2K/9FALXk2KF9J87txdHzXbUF9XRQRwSxcAs/fGaTnJeBFd7UoV22j3lzMLdM0Pw==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
+
 semver@^7.5.4, semver@^7.6.0:
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
@@ -1676,7 +1695,7 @@ sorcery@^0.11.0:
     minimist "^1.2.0"
     sander "^0.5.0"
 
-source-map-js@^1.0.1, source-map-js@^1.2.0:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==