diff --git a/src/components/collapse/Collapse.svelte b/src/components/collapse/Collapse.svelte
index ba7b843..3a623a0 100644
--- a/src/components/collapse/Collapse.svelte
+++ b/src/components/collapse/Collapse.svelte
@@ -1,12 +1,12 @@
diff --git a/src/components/collapse/CollapseList.svelte b/src/components/collapse/CollapseList.svelte
index fb74942..8aa03b2 100644
--- a/src/components/collapse/CollapseList.svelte
+++ b/src/components/collapse/CollapseList.svelte
@@ -1,12 +1,12 @@
diff --git a/src/components/header/Header.astro b/src/components/header/Header.astro
index 1a7f04e..8e1c897 100644
--- a/src/components/header/Header.astro
+++ b/src/components/header/Header.astro
@@ -3,9 +3,9 @@ import Navbar from "./Navbar.astro"
import NavbarDrawer from "./NavbarDrawer.astro"
import HamburgerMenuButton from "./HamburgerMenuButton.astro"
import Breadcrumb from "../Breadcrumb.astro"
-import { resolvePathname } from "@/utils/linking"
+import { deLocalizeHref } from "@/paraglide/runtime"
-const currentPath = `~${resolvePathname(Astro.originPathname)}`
+const currentPath = `~${deLocalizeHref(Astro.originPathname)}`
const drawerToggleId = "header-drawer"
---
diff --git a/src/components/links/LocaleLink.astro b/src/components/links/LocaleLink.astro
index e8e25af..cb1b68b 100644
--- a/src/components/links/LocaleLink.astro
+++ b/src/components/links/LocaleLink.astro
@@ -1,16 +1,17 @@
---
-import { languageTag, type AvailableLanguageTag } from "@/paraglide/runtime"
-import { localizePathname, type NavLink } from "@/utils/linking"
+import { localizeHref, getLocale, type Locale } from "@/paraglide/runtime"
+import { type NavLink } from "@/utils/linking"
import type { ComponentProps } from "@/types/props"
interface Props extends ComponentProps {
to: NavLink
- lang?: AvailableLanguageTag
+ lang?: Locale
}
-const { to, class: clazz, lang = languageTag() } = Astro.props
+const { to, class: clazz, lang = getLocale() } = Astro.props
---
-
+
+
diff --git a/src/components/projects/ProjectPage.astro b/src/components/projects/ProjectPage.astro
index 9377508..b9cab53 100644
--- a/src/components/projects/ProjectPage.astro
+++ b/src/components/projects/ProjectPage.astro
@@ -3,7 +3,7 @@ import * as m from "@/paraglide/messages"
import Layout from "@/layouts/Layout.astro"
import BadgeList from "@/components/badge/BadgeList.astro"
import GiteaLink from "@/components/links/GiteaLink.astro"
-import { languageTag } from "@/paraglide/runtime"
+import { getLocale } from "@/paraglide/runtime"
import { getEntry, render } from "astro:content"
import { Image } from "astro:assets"
import dayjs from "dayjs"
@@ -16,7 +16,10 @@ interface Props {
const { project } = Astro.props
const entry = await getEntry("projects", project)
-const { Content } = await render(entry!)
+if (!entry) {
+ throw new Error("Project not found")
+}
+const { Content } = await render(entry)
const {
lang,
title,
@@ -28,14 +31,14 @@ const {
source,
createdAt,
updatedAt,
-} = entry!.data
+} = entry.data
function localeDateString(isoString: string): string {
let template = "DD-MM-YYYY"
- if (languageTag() === "nb") {
+ if (getLocale() === "nb") {
template = "DD/MM/YYYY"
}
- return dayjs(isoString).locale(languageTag()).format(template)
+ return dayjs(isoString).locale(getLocale()).format(template)
}
---
diff --git a/src/content/config.ts b/src/content/config.ts
index 36633ba..9174a08 100644
--- a/src/content/config.ts
+++ b/src/content/config.ts
@@ -2,7 +2,7 @@ import { defineCollection, z } from "astro:content"
import { glob } from "astro/loaders"
const projectCollection = defineCollection({
- loader: glob({ pattern: "**\/*.mdx", base: "./src/content/projects" }),
+ loader: glob({ pattern: "**/*.mdx", base: "./src/content/projects" }),
schema: ({ image }) =>
z.object({
lang: z.union([z.literal("en"), z.literal("nb")]),
@@ -19,7 +19,7 @@ const projectCollection = defineCollection({
})
const usesCollection = defineCollection({
- loader: glob({ pattern: "**\/*.yaml", base: "./src/content/uses" }),
+ loader: glob({ pattern: "**/*.yaml", base: "./src/content/uses" }),
schema: z.object({
title: z.string(),
accessories: z.optional(z.array(z.string())),
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 285e2e9..92b18e3 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -2,7 +2,7 @@
import Footer from "@/components/Footer.astro"
import Header from "@/components/header/Header.astro"
import Breadcrumb from "@/components/Breadcrumb.astro"
-import { languageTag } from "@/paraglide/runtime"
+import { getLocale } from "@/paraglide/runtime"
interface Props {
title: string
@@ -11,12 +11,15 @@ interface Props {
class?: string
}
const { title, description, keywords, class: clazz } = Astro.props
+
+const prefix = import.meta.env.MODE === "staging" ? "[DEV] " : ""
+
const mainClass =
"grow max-w-[1000px] m-auto sm:min-w-[500px] not-sm:w-full px-5"
---
-
+
@@ -26,7 +29,7 @@ const mainClass =
{keywords && }
- {title} | Martin Berg Alstad
+ {prefix}{title} | Martin Berg Alstad
diff --git a/src/middleware.ts b/src/middleware.ts
new file mode 100644
index 0000000..39330bc
--- /dev/null
+++ b/src/middleware.ts
@@ -0,0 +1,6 @@
+import { paraglideMiddleware } from "@/paraglide/server"
+import { defineMiddleware } from "astro/middleware"
+
+export const onRequest = defineMiddleware((context, next) => {
+ return paraglideMiddleware(context.request, () => next());
+});
\ No newline at end of file
diff --git a/src/pages/en/projects/[project].astro b/src/pages/en/projects/[project].astro
index f879eff..0412950 100644
--- a/src/pages/en/projects/[project].astro
+++ b/src/pages/en/projects/[project].astro
@@ -1,17 +1,9 @@
---
import ProjectPage from "@/components/projects/ProjectPage.astro"
-import { type GetStaticPathsResult } from "astro"
import "@/styles/global.css"
-// Prerender the page as static HTML during build
-export const prerender = true
-
-export function getStaticPaths(): GetStaticPathsResult {
- return [
- { params: { project: "homepage" } },
- { params: { project: "sb1budget" } },
- ]
-}
+// Prerender must be false for paraglide js
+export const prerender = false
const { project } = Astro.params
---
diff --git a/src/pages/projects/[project].astro b/src/pages/projects/[project].astro
index f879eff..14208ed 100644
--- a/src/pages/projects/[project].astro
+++ b/src/pages/projects/[project].astro
@@ -1,19 +1,11 @@
---
import ProjectPage from "@/components/projects/ProjectPage.astro"
-import { type GetStaticPathsResult } from "astro"
import "@/styles/global.css"
-// Prerender the page as static HTML during build
-export const prerender = true
-
-export function getStaticPaths(): GetStaticPathsResult {
- return [
- { params: { project: "homepage" } },
- { params: { project: "sb1budget" } },
- ]
-}
+// Prerender must be false for paraglide js
+export const prerender = false
const { project } = Astro.params
---
-
+
diff --git a/src/styles/global.css b/src/styles/global.css
index 13e4c61..55aeffc 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -4,50 +4,50 @@
@plugin "daisyui";
@theme {
- --color-cat-rosewater: #f5e0dc;
- --color-cat-flamingo: #f2cdcd;
- --color-cat-pink: #f5c2e7;
- --color-cat-mauve: #cba6f7;
- --color-cat-red: #f38ba8;
- --color-cat-maroon: #eba0ac;
- --color-cat-peach: #fab387;
- --color-cat-yellow: #f9e2af;
- --color-cat-green: #a6e3a1;
- --color-cat-teal: #94e2d5;
- --color-cat-sky: #89dceb;
- --color-cat-sapphire: #74c7ec;
- --color-cat-blue: #89b4fa;
- --color-cat-lavender: #b4befe;
- --color-cat-text: #cdd6f4;
- --color-cat-surface0: #313244;
- --color-cat-base: #1e1e2e;
- --color-cat-mantle: #181825;
+ --color-cat-rosewater: #f5e0dc;
+ --color-cat-flamingo: #f2cdcd;
+ --color-cat-pink: #f5c2e7;
+ --color-cat-mauve: #cba6f7;
+ --color-cat-red: #f38ba8;
+ --color-cat-maroon: #eba0ac;
+ --color-cat-peach: #fab387;
+ --color-cat-yellow: #f9e2af;
+ --color-cat-green: #a6e3a1;
+ --color-cat-teal: #94e2d5;
+ --color-cat-sky: #89dceb;
+ --color-cat-sapphire: #74c7ec;
+ --color-cat-blue: #89b4fa;
+ --color-cat-lavender: #b4befe;
+ --color-cat-text: #cdd6f4;
+ --color-cat-surface0: #313244;
+ --color-cat-base: #1e1e2e;
+ --color-cat-mantle: #181825;
}
@layer utilities {
- .debug {
- @apply border border-red-500;
- }
+ .debug {
+ @apply border border-red-500;
+ }
}
br {
- @apply my-0.5;
+ @apply my-0.5;
}
h1 {
- @apply text-4xl font-bold mb-2;
+ @apply text-4xl font-bold mb-2;
}
h2 {
- @apply text-3xl font-bold mb-2;
+ @apply text-3xl font-bold mb-2;
}
h3 {
- @apply text-2xl font-bold mb-2;
+ @apply text-2xl font-bold mb-2;
}
/* TODO change default style*/
a {
- @apply link text-cat-mauve;
- text-decoration-line: none;
+ @apply link text-cat-mauve;
+ text-decoration-line: none;
}
diff --git a/src/utils/linking.ts b/src/utils/linking.ts
index 0f8ddaf..a9fd8a2 100644
--- a/src/utils/linking.ts
+++ b/src/utils/linking.ts
@@ -1,4 +1,3 @@
-import type { AvailableLanguageTag } from "@/paraglide/runtime.js"
import type { AbsolutePathname, Project } from "@/types/types.ts"
interface TranslatedPathnames {
@@ -22,8 +21,6 @@ const paths: Set = new Set([
"/uses",
])
-const projectPaths: Set = new Set(["homepage", "sb1budget"])
-
/**
* Defines the localized pathnames for the site.
* The key must be used to navigate to the correct path.
@@ -38,49 +35,3 @@ for (const path of paths) {
en: `/en${path}`,
}
}
-
-export function localizePathname(
- pathname: NavLink,
- locale: AvailableLanguageTag,
-): string {
- const pathnameParts = pathname.split("/")
- const firstSegment: AbsolutePathname = `/${pathnameParts[1]}`
-
- if (pathnames[firstSegment]) {
- const localizedPathname = pathnames[firstSegment][locale]
-
- const rest = pathnameParts.slice(2)
- if (rest.length > 0) {
- return `${localizedPathname}/${rest.join("/")}`
- } else {
- return localizedPathname
- }
- }
- return pathname
-}
-
-export function resolvePathname(pathname: string): AbsolutePathname {
- if (pathname.startsWith("/en")) {
- return pathname.slice(3) as AbsolutePathname
- }
- return pathname as AbsolutePathname
-}
-
-export function isAbsolutePathname(path: string): path is AbsolutePathname {
- return path.startsWith("/")
-}
-
-export function isNavLink(path: string): path is NavLink {
- if (path.startsWith("/en")) {
- path = path.slice(2)
- }
- if (paths.has(path as NavLink)) {
- return true
- }
- const pathSplit = path.split("/").slice(1)
- return (
- pathSplit.length === 2 &&
- pathSplit[0] === "projects" &&
- projectPaths.has(pathSplit[1])
- )
-}