-
-
-
-
- {m.status()}
-
+
+
diff --git a/src/components/LanguageButtonGroup.astro b/src/components/LanguageButtonGroup.astro
new file mode 100644
index 0000000..ba09225
--- /dev/null
+++ b/src/components/LanguageButtonGroup.astro
@@ -0,0 +1,11 @@
+---
+import LocaleLink from "./links/LocaleLink.astro"
+import { type NavLink, resolvePathname } from "@/utils/linking"
+
+const currentPath = resolvePathname(Astro.url.pathname)
+---
+
+
+ Norsk
+ English
+
diff --git a/src/components/LanguageButtonGroup.svelte b/src/components/LanguageButtonGroup.svelte
deleted file mode 100644
index 95db333..0000000
--- a/src/components/LanguageButtonGroup.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/Navbar.astro b/src/components/Navbar.astro
index ebbfe3a..e1fab57 100644
--- a/src/components/Navbar.astro
+++ b/src/components/Navbar.astro
@@ -1,15 +1,14 @@
---
-import { localizePathname } from "@/utils/linking"
-import { languageTag } from "@/paraglide/runtime"
+import LocaleLink from "./links/LocaleLink.astro"
import Links from "@/links"
---
{
Links.map(({ to, label }) => (
-
- {label}
-
+
+ {label()}
+
))
}
diff --git a/src/components/links/LocaleLink.astro b/src/components/links/LocaleLink.astro
new file mode 100644
index 0000000..e8e25af
--- /dev/null
+++ b/src/components/links/LocaleLink.astro
@@ -0,0 +1,16 @@
+---
+import { languageTag, type AvailableLanguageTag } from "@/paraglide/runtime"
+import { localizePathname, type NavLink } from "@/utils/linking"
+import type { ComponentProps } from "@/types/props"
+
+interface Props extends ComponentProps {
+ to: NavLink
+ lang?: AvailableLanguageTag
+}
+
+const { to, class: clazz, lang = languageTag() } = Astro.props
+---
+
+
+
+
diff --git a/src/links.ts b/src/links.ts
index 90df433..f716b76 100644
--- a/src/links.ts
+++ b/src/links.ts
@@ -1,22 +1,31 @@
-import * as m from "./paraglide/messages.js"
+import * as m from "@/paraglide/messages.js"
+import type { NavLink } from "@/utils/linking.ts"
interface Link {
- label: string
- to: `/${string}`
+ label: () => string
+ to: NavLink
}
const Links: Link[] = [
{
- label: m.home(),
+ label: m.home,
to: "/"
},
{
- label: m.myProjects(),
- to: "/project"
+ label: m.myProjects,
+ to: "/projects"
},
{
- label: m.contactMe(),
- to: "/contact-me"
+ label: m.myLinks,
+ to: "/links"
+ },
+ {
+ label: m.hardware,
+ to: "/hardware"
+ },
+ {
+ label: m.contactMe,
+ to: "/contact"
}
]
diff --git a/src/pages/contact-me.astro b/src/pages/contact.astro
similarity index 100%
rename from src/pages/contact-me.astro
rename to src/pages/contact.astro
diff --git a/src/pages/en/contact-me.astro b/src/pages/en/contact.astro
similarity index 100%
rename from src/pages/en/contact-me.astro
rename to src/pages/en/contact.astro
diff --git a/src/pages/en/project/[project].astro b/src/pages/en/projects/[project].astro
similarity index 92%
rename from src/pages/en/project/[project].astro
rename to src/pages/en/projects/[project].astro
index 908cfbe..3603e45 100644
--- a/src/pages/en/project/[project].astro
+++ b/src/pages/en/projects/[project].astro
@@ -2,6 +2,8 @@
import ProjectPage from "../../../components/projects/ProjectPage.astro"
import { type GetStaticPathsResult } from "astro"
+export const prerender = true
+
export function getStaticPaths(): GetStaticPathsResult {
return [
{ params: { project: "hotelservice" } },
diff --git a/src/pages/en/project/index.astro b/src/pages/en/projects/index.astro
similarity index 100%
rename from src/pages/en/project/index.astro
rename to src/pages/en/projects/index.astro
diff --git a/src/pages/project/[project].astro b/src/pages/projects/[project].astro
similarity index 92%
rename from src/pages/project/[project].astro
rename to src/pages/projects/[project].astro
index 4e9d1cf..f5bbcd1 100644
--- a/src/pages/project/[project].astro
+++ b/src/pages/projects/[project].astro
@@ -2,6 +2,8 @@
import ProjectPage from "../../components/projects/ProjectPage.astro"
import { type GetStaticPathsResult } from "astro"
+export const prerender = true
+
export function getStaticPaths(): GetStaticPathsResult {
return [
{ params: { project: "hotelservice" } },
diff --git a/src/pages/project/index.astro b/src/pages/projects/index.astro
similarity index 100%
rename from src/pages/project/index.astro
rename to src/pages/projects/index.astro
diff --git a/src/types/types.ts b/src/types/types.ts
new file mode 100644
index 0000000..a738bb4
--- /dev/null
+++ b/src/types/types.ts
@@ -0,0 +1 @@
+export type AbsolutePathname = `/${string}`
diff --git a/src/utils/linking.ts b/src/utils/linking.ts
index e4327e2..3105a7a 100644
--- a/src/utils/linking.ts
+++ b/src/utils/linking.ts
@@ -1,20 +1,38 @@
import type { AvailableLanguageTag } from "@/paraglide/runtime.js"
+import type { AbsolutePathname } from "@/types/types.ts"
-type AbsolutePathname = `/${string}`
+interface TranslatedPathnames {
+ nb: AbsolutePathname
+ en: `/en${string}`
+}
-// TODO what?
-// https://inlang.com/m/iljlwzfs/paraglide-astro-i18n
-const pathnames: Record
-> = {
- "/contact-me": {
- nb: "/contact-me",
- en: "/en/contact-me"
+export type NavLink = "/" | "/contact" | "/projects" | "/links" | "/hardware"
+
+const paths: NavLink[] = [
+ "/",
+ "/contact",
+ "/projects",
+ "/links",
+ "/hardware"
+]
+
+/**
+ * Defines the localized pathnames for the site.
+ * The key must be used to navigate to the correct path.
+ * The value is the path that will be used for the given locale.
+ *
+ * @see https://inlang.com/m/iljlwzfs/paraglide-astro-i18n
+ */
+const pathnames: Record = {}
+for (const path of paths) {
+ pathnames[path] = {
+ nb: path,
+ en: `/en${path}`
}
}
export function localizePathname(
- pathname: AbsolutePathname,
+ pathname: NavLink,
locale: AvailableLanguageTag
) {
if (pathnames[pathname]) {
@@ -22,3 +40,10 @@ export function localizePathname(
}
return pathname
}
+
+export function resolvePathname(pathname: string): AbsolutePathname {
+ if (pathname.startsWith("/en")) {
+ return pathname.slice(3) as AbsolutePathname
+ }
+ return pathname as AbsolutePathname
+}