diff --git a/bun.lockb b/bun.lockb index 590d410..a0180a8 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index edbf4f5..15b8834 100644 --- a/package.json +++ b/package.json @@ -12,15 +12,12 @@ }, "dependencies": { "@astrojs/node": "^6.0.0", - "@hotwired/turbo": "^7.3.0", "accept-language": "^3.0.18", "astro": "^3.0.3", "astro-icon": "next", "hono": "^3.5.7", - "htmx.org": "^1.9.5", "js-cookie": "^3.0.5", "node-cache": "^5.1.2", - "sanitize.css": "^13.0.0", "tippy.js": "^6.3.7" }, "devDependencies": { diff --git a/src/pages/_components/AppLayout/AppLayout.astro b/src/pages/_components/AppLayout/AppLayout.astro index 37e73a3..ac5520e 100644 --- a/src/pages/_components/AppLayout/AppLayout.astro +++ b/src/pages/_components/AppLayout/AppLayout.astro @@ -1,8 +1,7 @@ --- import Html from "pages/_components/Html.astro"; import Navbar from "./components/Navbar.astro"; -import { parseCookie } from "utils/astro"; -import { CookieNames } from "utils/cookies"; +import { CookieNames, parseCookie } from "utils/cookies"; import MenuPanel from "./components/MenuPanel.astro"; interface Props { diff --git a/src/pages/_components/AppLayout/components/MenuPanel.astro b/src/pages/_components/AppLayout/components/MenuPanel.astro index 0f4afa4..b179053 100644 --- a/src/pages/_components/AppLayout/components/MenuPanel.astro +++ b/src/pages/_components/AppLayout/components/MenuPanel.astro @@ -18,11 +18,7 @@ const { isReduced = false } = Astro.props; /* ------------------------------------------- HTML ------------------------------------------- */ } - @@ -122,9 +118,11 @@ const { isReduced = false } = Astro.props;

@@ -194,7 +192,7 @@ const { isReduced = false } = Astro.props; place-items: center; gap: 2rem; - & > svg { + & > a > svg { width: 40px; height: 40px; } diff --git a/src/pages/_components/AppLayout/components/ThemeToggleButton.astro b/src/pages/_components/AppLayout/components/ThemeToggleButton.astro index 010b0a8..775817d 100644 --- a/src/pages/_components/AppLayout/components/ThemeToggleButton.astro +++ b/src/pages/_components/AppLayout/components/ThemeToggleButton.astro @@ -1,7 +1,6 @@ --- import { Icon } from "astro-icon/components"; -import { parseCookie } from "utils/astro"; -import { CookieNames } from "utils/cookies"; +import { CookieNames, parseCookie } from "utils/cookies"; const themeColors = parseCookie( Astro.cookies.get(CookieNames.THEME_COLOR), diff --git a/src/pages/_components/Html.astro b/src/pages/_components/Html.astro index 60378ab..879a5c9 100644 --- a/src/pages/_components/Html.astro +++ b/src/pages/_components/Html.astro @@ -1,6 +1,5 @@ --- -import { parseCookie } from "utils/astro"; -import { CookieNames } from "utils/cookies"; +import { CookieNames, parseCookie } from "utils/cookies"; interface Props { title: string; @@ -242,7 +241,7 @@ const themeColors = parseCookie( @font-face { font-family: "Vollkorn"; src: url("/fonts/Vollkorn-Bold.woff2") format("woff2"); - font-weight: bold; + font-weight: 700; font-style: normal; font-display: swap; } @@ -250,7 +249,7 @@ const themeColors = parseCookie( @font-face { font-family: "Noto Sans"; src: url("/fonts/NotoSans-Medium.woff2") format("woff2"); - font-weight: medium; + font-weight: 600; font-style: normal; font-display: swap; } @@ -258,7 +257,7 @@ const themeColors = parseCookie( @font-face { font-family: "Noto Sans"; src: url("/fonts/NotoSans-Bold.woff2") format("woff2"); - font-weight: bold; + font-weight: 700; font-style: normal; font-display: swap; } @@ -266,7 +265,7 @@ const themeColors = parseCookie( @font-face { font-family: "Angelic Agrippa"; src: url("/fonts/AngelicAgrippa-Regular.woff2") format("woff2"); - font-weight: normal; + font-weight: 500; font-style: normal; font-display: swap; } diff --git a/src/utils/astro.ts b/src/utils/astro.ts deleted file mode 100644 index 4176051..0000000 --- a/src/utils/astro.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { type AstroCookies } from "astro"; - -type AstroCookie = ReturnType; - -export const parseCookie = (cookies: AstroCookie, defaultValue: T): T => { - const value: T | null = JSON.parse(cookies?.value ?? "null"); - return value ?? defaultValue; -}; diff --git a/src/utils/cookies.ts b/src/utils/cookies.ts index 0af06cd..1825a24 100644 --- a/src/utils/cookies.ts +++ b/src/utils/cookies.ts @@ -1,3 +1,12 @@ +import { type AstroCookies } from "astro"; + +type AstroCookie = ReturnType; + +export const parseCookie = (cookies: AstroCookie, defaultValue: T): T => { + const value: T | null = JSON.parse(cookies?.value ?? "null"); + return value ?? defaultValue; +}; + export enum CookieNames { MENU_PANEL_REDUCED = "menuPanelReduced", THEME_COLOR = "themeColor", diff --git a/src/utils/events.ts b/src/utils/events.ts deleted file mode 100644 index a0de62f..0000000 --- a/src/utils/events.ts +++ /dev/null @@ -1,5 +0,0 @@ -export const customEvents = { - mainPanel: { - reduce: { toggle: "mainPanel.reduce.toggle" }, - }, -};