From db43e010d8a7445c09906d33b8ae91fc2ca2eff6 Mon Sep 17 00:00:00 2001 From: Daniel Subiabre Date: Wed, 4 Mar 2026 14:24:19 +0100 Subject: [PATCH] feat: start port Header component to svelte --- .../{Header.astro => Header.svelte} | 265 ++++++++---------- src/components/LoginForm.astro | 76 ----- .../{Logout.astro => Logout.svelte} | 19 +- src/layouts/Layout.astro | 4 +- src/pages/[...lang]/login/callback.astro | 4 +- src/pages/[...lang]/login/index.astro | 5 + src/svgs/{Logo.astro => Logo.svelte} | 15 +- src/svgs/{MenuIcon.astro => MenuIcon.svelte} | 3 +- src/svgs/UserIcon.astro | 8 - src/svgs/UserIcon.svelte | 15 +- 10 files changed, 156 insertions(+), 258 deletions(-) rename src/components/{Header.astro => Header.svelte} (61%) delete mode 100644 src/components/LoginForm.astro rename src/components/{Logout.astro => Logout.svelte} (88%) rename src/svgs/{Logo.astro => Logo.svelte} (93%) rename src/svgs/{MenuIcon.astro => MenuIcon.svelte} (94%) delete mode 100644 src/svgs/UserIcon.astro diff --git a/src/components/Header.astro b/src/components/Header.svelte similarity index 61% rename from src/components/Header.astro rename to src/components/Header.svelte index 2b530105..7d21d0ab 100644 --- a/src/components/Header.astro +++ b/src/components/Header.svelte @@ -1,139 +1,17 @@ ---- -import CartButton from "./CartButton.svelte"; -import MenuIcon from "../svgs/MenuIcon.astro"; -import CloseIconMenu from "../svgs/CloseIconMenu.svelte"; -import Logo from "../svgs/Logo.astro"; -import UserIcon from "../svgs/UserIcon.astro"; -import Logout from "./Logout.astro"; -import UiLanguages from "./UiLanguages.svelte"; -import HeaderButtons from "./HeaderButtons.svelte"; -import SearchIcon from "../svgs/SearchIcon.svelte"; + + +
+
+
+
+
+ + +
+ +
+ + +
+
+
diff --git a/src/components/LoginForm.astro b/src/components/LoginForm.astro deleted file mode 100644 index ba6f394e..00000000 --- a/src/components/LoginForm.astro +++ /dev/null @@ -1,76 +0,0 @@ ---- -import TextInput from "./library/TextInput.svelte"; - -const { t } = Astro.locals; ---- - -
-
-
- - - - -
- -
-
- - diff --git a/src/components/Logout.astro b/src/components/Logout.svelte similarity index 88% rename from src/components/Logout.astro rename to src/components/Logout.svelte index 8bf785bb..9c594381 100644 --- a/src/components/Logout.astro +++ b/src/components/Logout.svelte @@ -1,16 +1,6 @@ ---- -const { t } = Astro.locals; ---- - - - + + diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index c190303a..9ec8f978 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -2,7 +2,7 @@ import "../styles/global.css"; import Metatags from "../components/Metatags.astro"; // import ThemeToggle from "../components/ThemeToggle.astro"; -import Header from "../components/Header.astro"; +import Header from "../components/Header.svelte"; import Footer from "../components/Footer.astro"; const { lang } = Astro.locals; @@ -25,7 +25,7 @@ const { title, description, class: className } = Astro.props; -
+
diff --git a/src/pages/[...lang]/login/callback.astro b/src/pages/[...lang]/login/callback.astro index 6cd17ab0..175f532b 100644 --- a/src/pages/[...lang]/login/callback.astro +++ b/src/pages/[...lang]/login/callback.astro @@ -40,7 +40,9 @@ if (accessToken.error) { console.error(accessToken); return Astro.redirect("/error"); } + +Astro.cookies.set("access-token", accessToken, { path: "/" }); --- - + diff --git a/src/pages/[...lang]/login/index.astro b/src/pages/[...lang]/login/index.astro index 150b35eb..6f4687d6 100644 --- a/src/pages/[...lang]/login/index.astro +++ b/src/pages/[...lang]/login/index.astro @@ -1,6 +1,11 @@ --- import CSRF from "csrf"; +const accessToken = Astro.cookies.get("access-token"); +if (accessToken) { + Astro.redirect("/"); +} + const oauth2Authorize = new URL("/oauth/authorize", import.meta.env.PUBLIC_API_URL); oauth2Authorize.searchParams.set("client_id", import.meta.env.OAUTH2_CLIENT_ID); diff --git a/src/svgs/Logo.astro b/src/svgs/Logo.svelte similarity index 93% rename from src/svgs/Logo.astro rename to src/svgs/Logo.svelte index 0371e634..05366b3f 100644 --- a/src/svgs/Logo.astro +++ b/src/svgs/Logo.svelte @@ -1,17 +1,22 @@ + fill="#3D3D3D" + > + fill="#3D3D3D" + > + fill="#3D3D3D" + > + fill="#3D3D3D" + > + fill="#3D3D3D" + > diff --git a/src/svgs/MenuIcon.astro b/src/svgs/MenuIcon.svelte similarity index 94% rename from src/svgs/MenuIcon.astro rename to src/svgs/MenuIcon.svelte index 39cdbb0b..fecfaab1 100644 --- a/src/svgs/MenuIcon.astro +++ b/src/svgs/MenuIcon.svelte @@ -4,5 +4,6 @@ fill-rule="evenodd" clip-rule="evenodd" d="M11 12C11 11.4477 11.3663 11 11.8182 11H28.1818C28.6337 11 29 11.4477 29 12C29 12.5523 28.6337 13 28.1818 13H11.8182C11.3663 13 11 12.5523 11 12ZM11 20C11 19.4477 11.3663 19 11.8182 19H28.1818C28.6337 19 29 19.4477 29 20C29 20.5523 28.6337 21 28.1818 21H11.8182C11.3663 21 11 20.5523 11 20ZM11 28C11 27.4477 11.3663 27 11.8182 27H28.1818C28.6337 27 29 27.4477 29 28C29 28.5523 28.6337 29 28.1818 29H11.8182C11.3663 29 11 28.5523 11 28Z" - fill="#462949"> + fill="#462949" + > diff --git a/src/svgs/UserIcon.astro b/src/svgs/UserIcon.astro deleted file mode 100644 index cdf4315a..00000000 --- a/src/svgs/UserIcon.astro +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/src/svgs/UserIcon.svelte b/src/svgs/UserIcon.svelte index 125121f0..a39fa059 100644 --- a/src/svgs/UserIcon.svelte +++ b/src/svgs/UserIcon.svelte @@ -1,18 +1,9 @@ - + - + >