Compare commits
14 Commits
develop
...
c1714e9654
Author | SHA1 | Date | |
---|---|---|---|
c1714e9654
|
|||
409c343a1b
|
|||
fa58967164
|
|||
e0908c57a8
|
|||
7030f70b50
|
|||
5e7100c1e2
|
|||
82d1eea4f7
|
|||
8d5c61cbaa
|
|||
45226136f3
|
|||
a859439353
|
|||
969660abc8
|
|||
99aced7367
|
|||
78b333e9f7
|
|||
1d04befff1
|
6
middleware.ts
Normal file
6
middleware.ts
Normal file
@ -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());
|
||||
});
|
@ -2,12 +2,11 @@
|
||||
import GiteaLink from "./links/GiteaLink.astro"
|
||||
import PajamasIcon from "./icons/PajamasIcon.astro"
|
||||
import ExternalLink from "./links/ExternalLink.astro"
|
||||
import LanguageButtonGroup from "./LanguageButtonGroup.svelte"
|
||||
import LanguageButtonGroup from "./LanguageButtonGroup.astro"
|
||||
import { GIT_URL, STATUS_URL } from "astro:env/client"
|
||||
import * as m from "@/paraglide/messages"
|
||||
|
||||
const giteaLink = `${GIT_URL}/martials/martials.no`
|
||||
const pathname = Astro.url.pathname
|
||||
---
|
||||
|
||||
<div class="divider bg-inherit"></div>
|
||||
@ -29,5 +28,5 @@ const pathname = Astro.url.pathname
|
||||
{m.status()}
|
||||
</ExternalLink>
|
||||
</div>
|
||||
<LanguageButtonGroup client:load />
|
||||
<LanguageButtonGroup />
|
||||
</div>
|
||||
|
@ -15,7 +15,7 @@ const isEnglish = pathname.startsWith("/en")
|
||||
class:list={[
|
||||
"btn join-item !text-cat-text border-cat-surface0",
|
||||
!isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
||||
]} client:load>Norsk</LocaleLink
|
||||
]}>Norsk</LocaleLink
|
||||
>
|
||||
<LocaleLink
|
||||
to={currentPath as NavLink}
|
||||
@ -23,6 +23,6 @@ const isEnglish = pathname.startsWith("/en")
|
||||
class:list={[
|
||||
"btn join-item !text-cat-text border-cat-surface0",
|
||||
isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
||||
]} client:load>English</LocaleLink
|
||||
]}>English</LocaleLink
|
||||
>
|
||||
</div>
|
||||
|
@ -1,29 +0,0 @@
|
||||
<script lang="ts">
|
||||
import { getLocale, type Locale, setLocale } from "@/paraglide/runtime"
|
||||
|
||||
const isEnglish = getLocale() === "en"
|
||||
|
||||
function updateLocale(lang: Locale) {
|
||||
setLocale(lang)
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<div class="join">
|
||||
<button
|
||||
onclick={() => updateLocale("nb")}
|
||||
class={[
|
||||
"btn join-item !text-cat-text border-cat-surface0",
|
||||
!isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
||||
]}>Norsk
|
||||
</button
|
||||
>
|
||||
<button
|
||||
onclick={() => updateLocale("en")}
|
||||
class={[
|
||||
"btn join-item !text-cat-text border-cat-surface0",
|
||||
isEnglish ? "bg-cat-mantle" : "bg-cat-base",
|
||||
]}>English
|
||||
</button
|
||||
>
|
||||
</div>
|
@ -11,7 +11,6 @@ interface Props extends ComponentProps {
|
||||
const { to, class: clazz, lang = getLocale() } = Astro.props
|
||||
---
|
||||
|
||||
<!-- TODO currently not working on Paraglide 2 https://github.com/opral/inlang-paraglide-js/issues/472 -->
|
||||
<a href={localizeHref(to, { locale: lang })} class={clazz}>
|
||||
<slot />
|
||||
</a>
|
||||
|
@ -1,6 +0,0 @@
|
||||
import { paraglideMiddleware } from "@/paraglide/server"
|
||||
import { defineMiddleware } from "astro/middleware"
|
||||
|
||||
export const onRequest = defineMiddleware((context, next) => {
|
||||
return paraglideMiddleware(context.request, () => next());
|
||||
});
|
@ -1,9 +1,17 @@
|
||||
---
|
||||
import ProjectPage from "@/components/projects/ProjectPage.astro"
|
||||
import { type GetStaticPathsResult } from "astro"
|
||||
import "@/styles/global.css"
|
||||
|
||||
// Prerender must be false for paraglide js
|
||||
export const prerender = false
|
||||
// Prerender the page as static HTML during build
|
||||
export const prerender = true
|
||||
|
||||
export function getStaticPaths(): GetStaticPathsResult {
|
||||
return [
|
||||
{ params: { project: "homepage" } },
|
||||
{ params: { project: "sb1budget" } },
|
||||
]
|
||||
}
|
||||
|
||||
const { project } = Astro.params
|
||||
---
|
||||
|
@ -1,11 +1,19 @@
|
||||
---
|
||||
import ProjectPage from "@/components/projects/ProjectPage.astro"
|
||||
import { type GetStaticPathsResult } from "astro"
|
||||
import "@/styles/global.css"
|
||||
|
||||
// Prerender must be false for paraglide js
|
||||
export const prerender = false
|
||||
// Prerender the page as static HTML during build
|
||||
export const prerender = true
|
||||
|
||||
export function getStaticPaths(): GetStaticPathsResult {
|
||||
return [
|
||||
{ params: { project: "homepage" } },
|
||||
{ params: { project: "sb1budget" } },
|
||||
]
|
||||
}
|
||||
|
||||
const { project } = Astro.params
|
||||
---
|
||||
|
||||
<ProjectPage project={ project as string } />
|
||||
<ProjectPage project={project as string} />
|
||||
|
Reference in New Issue
Block a user