11 Commits

Author SHA1 Message Date
051cadca66 Start updating paraglide to v2 2025-07-01 20:51:59 +02:00
1114fe7565 🔥 Remove prettier 2025-07-01 19:58:36 +02:00
f11ed70b85 Update git domain 2025-07-01 19:55:54 +02:00
bce965ba2a 🎨 Fix lint errors using Biome 2025-07-01 19:52:28 +02:00
0337e34af5 🎨 Fix lint errors using Biome 2025-07-01 19:50:35 +02:00
45226136f3 🎨 Format using Biome 2025-07-01 19:45:02 +02:00
a859439353 Adde Biome formatter and linter 2025-07-01 19:43:59 +02:00
969660abc8 ❄️ Add Nix shell 2025-07-01 19:20:26 +02:00
99aced7367 📦 Update dependencies 2025-07-01 19:09:53 +02:00
78b333e9f7 ✍️ Update TODO.md 2025-07-01 19:09:24 +02:00
1d04befff1 🐛 Fix trailing slash 2025-07-01 19:08:34 +02:00
23 changed files with 1560 additions and 1813 deletions

2
.env
View File

@ -1,3 +1,3 @@
DOMAIN="martials.no"
GIT_URL=https://git.$DOMAIN
GIT_URL=https://code.$DOMAIN
STATUS_URL="https://status.$DOMAIN/status/home"

View File

@ -3,11 +3,16 @@
- [ ] License
## Code
- [ ] Nix Shell
- [x] Nix Shell
- [ ] Analytics
- [ ] Organize code better
- [ ] Type slug of project
## CI/CD
- [ ] Staging environment
- [ ] Deploy to staging environment on push to master
- [ ] Deploy to production environment on push tag to master
## SEO
- [ ] Meta tags on each page

View File

@ -1,6 +1,5 @@
// @ts-check
import { defineConfig, envField } from "astro/config"
import paraglide from "@inlang/paraglide-astro"
import tailwindcss from "@tailwindcss/vite"
import sitemap from "@astrojs/sitemap"
import svelte from "@astrojs/svelte"
@ -9,6 +8,7 @@ import mdx from "@astrojs/mdx"
import icon from "astro-icon"
import { loadEnv } from "vite"
import { paraglideVitePlugin } from "@inlang/paraglide-js"
const { URL } = process.env.NODE_ENV
? loadEnv(process.env.NODE_ENV, process.cwd(), "")
@ -20,35 +20,37 @@ export default defineConfig({
output: "server",
i18n: {
defaultLocale: "nb",
locales: ["nb", "en"],
locales: ["nb", "en"]
},
integrations: [
sitemap(),
mdx(),
svelte(),
icon(),
paraglide({
project: "./project.inlang",
outdir: "./src/paraglide",
}),
icon()
],
adapter: node({
mode: "standalone",
mode: "standalone"
}),
vite: {
plugins: [tailwindcss()],
plugins: [
tailwindcss(),
paraglideVitePlugin({
project: "./project.inlang",
outdir: "./src/paraglide"
})
]
},
markdown: {
shikiConfig: {
theme: "catppuccin-mocha",
},
theme: "catppuccin-mocha"
}
},
env: {
schema: {
DOMAIN: envField.string({ context: "client", access: "public" }),
URL: envField.string({ context: "client", access: "public" }),
GIT_URL: envField.string({ context: "client", access: "public" }),
STATUS_URL: envField.string({ context: "client", access: "public" }),
},
},
STATUS_URL: envField.string({ context: "client", access: "public" })
}
}
})

57
biome.jsonc Normal file
View File

@ -0,0 +1,57 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
"vcs": {
"enabled": false,
"clientKind": "git",
"useIgnoreFile": false
},
"files": {
"ignoreUnknown": false,
"ignore": ["./src/paraglide"],
"include": ["./src/**"]
},
"formatter": {
"enabled": true,
"indentStyle": "space"
},
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
},
"javascript": {
"formatter": {
"quoteStyle": "double",
"semicolons": "asNeeded",
"arrowParentheses": "asNeeded"
}
},
"overrides": [
{
"include": ["*.astro"],
"linter": {
"rules": {
"style": {
"useConst": "off",
"useImportType": "off"
}
}
}
},
{
"include": ["*.svelte"],
"linter": {
"rules": {
"style": {
"useConst": "off",
"useImportType": "off"
}
}
}
}
]
}

27
flake.lock generated Normal file
View File

@ -0,0 +1,27 @@
{
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1751211869,
"narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

37
flake.nix Normal file
View File

@ -0,0 +1,37 @@
{
description = "martials.no Development environment";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
};
outputs = { nixpkgs, ... }:
let
system = "x86_64-linux";
in
{
devShells.${system}.default =
let
pkgs = import nixpkgs {
inherit system;
};
in
pkgs.mkShell {
packages = with pkgs; [
git
] ++ [
# Node
nodejs_22
pnpm
] ++ [
nodePackages.prettier
biome
];
shellHook = ''
pnpm install
fish
'';
};
};
}

6
middleware.ts Normal file
View 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());
});

View File

@ -10,49 +10,31 @@
"astro": "astro",
"type-check": "astro check",
"postinstall": "paraglide-js compile --project ./project.inlang --outdir ./src/paraglide",
"format": "prettier --write \"./src/**/*.{js,mjs,ts,astro,svelte,css,md,json}\"",
"format": "biome format --write .",
"lint": "biome lint --write .",
"lint:fix": "biome check --write .",
"watch-messages": "paraglide-js compile --watch --project ./project.inlang --outdir ./src/paraglide"
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/mdx": "^4.0.8",
"@astrojs/node": "9.1.1",
"@astrojs/sitemap": "^3.2.1",
"@astrojs/svelte": "^7.0.4",
"@iconify-json/pajamas": "^1.2.5",
"@inlang/paraglide-astro": "^0.3.5",
"@inlang/paraglide-js": "1.11.8",
"@astrojs/mdx": "^4.3.0",
"@astrojs/node": "9.2.2",
"@astrojs/sitemap": "^3.4.1",
"@astrojs/svelte": "^7.1.0",
"@iconify-json/pajamas": "^1.2.11",
"@inlang/paraglide-js": "2.1.0",
"@tailwindcss/typography": "^0.5.16",
"@tailwindcss/vite": "^4.0.9",
"astro": "^5.4.1 ",
"@tailwindcss/vite": "^4.1.11",
"astro": "^5.10.2",
"astro-icon": "^1.1.5",
"dayjs": "^1.11.13",
"sharp": "^0.33.5",
"svelte": "^5.20.4",
"tailwindcss": "^4.0.9",
"typescript": "^5.7.3"
"sharp": "^0.34.2",
"svelte": "^5.34.9",
"tailwindcss": "^4.1.11",
"typescript": "^5.8.3"
},
"devDependencies": {
"daisyui": "^5.0.0",
"prettier": "^3.5.2",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-svelte": "^3.3.3",
"vite": "^6.2.0"
},
"prettier": {
"semi": false,
"singleQuote": false,
"plugins": [
"prettier-plugin-astro",
"prettier-plugin-svelte"
],
"overrides": [
{
"files": "**/*.astro",
"options": {
"parser": "astro"
}
}
]
"daisyui": "^5.0.43",
"vite": "^7.0.0"
}
}

2843
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -1,15 +1,15 @@
{
"$schema": "https://inlang.com/schema/project-settings",
"sourceLanguageTag": "nb",
"languageTags": ["nb", "en"],
"baseLocale": "nb",
"locales": [
"nb",
"en"
],
"modules": [
"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@latest/dist/index.js",
"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@latest/dist/index.js",
"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@latest/dist/index.js",
"https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@latest/dist/index.js",
"https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@latest/dist/index.js"
"https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@4/dist/index.js",
"https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@2/dist/index.js"
],
"plugin.inlang.messageFormat": {
"pathPattern": "./messages/{languageTag}.json"
"pathPattern": "./messages/{locale}.json"
}
}

View File

@ -1,14 +1,15 @@
---
import { type NavLink, resolvePathname } from "@/utils/linking"
import { type NavLink } from "@/utils/linking"
import LocaleLink from "@/components/links/LocaleLink.astro"
import { deLocalizeHref } from "@/paraglide/runtime.js"
const pathname = resolvePathname(Astro.originPathname)
const pathname = deLocalizeHref(Astro.originPathname)
let paths: string[]
if (pathname === "/") {
paths = ["~"]
} else {
paths = ["~", ...pathname.split("/").slice(1)]
paths = ["~", ...pathname.split("/").filter(x => x)]
}
function getLink(path: string): NavLink {
@ -25,13 +26,13 @@ function getLink(path: string): NavLink {
{
paths.map((path, index) => (
<span>
{index != paths.length - 1 ? (
{ index != paths.length - 1 ? (
<span>
<LocaleLink to={getLink(path)}>{path}</LocaleLink>/
<LocaleLink to={ getLink(path) }>{ path }</LocaleLink>/
</span>
) : (
path
)}
) }
</span>
))
}

View File

@ -1,9 +1,10 @@
---
import LocaleLink from "./links/LocaleLink.astro"
import { type NavLink, resolvePathname } from "@/utils/linking"
import { type NavLink } from "@/utils/linking"
import { deLocalizeHref } from "@/paraglide/runtime"
const pathname = Astro.url.pathname
const currentPath = resolvePathname(pathname)
const currentPath = deLocalizeHref(pathname)
const isEnglish = pathname.startsWith("/en")
---

View File

@ -1,17 +1,17 @@
<script lang="ts">
// TODO move to types?
interface Option<Key> {
key: Key
value: string
}
// TODO move to types?
interface Option<Key> {
key: Key
value: string
}
interface Props<Key = string> {
selected: Key
options?: Option<Key>[]
class?: string
}
interface Props<Key = string> {
selected: Key
options?: Option<Key>[]
class?: string
}
let { selected = $bindable(), options = [], class: clazz }: Props = $props()
let { selected = $bindable(), options = [], class: clazz }: Props = $props()
</script>
<select

View File

@ -1,80 +1,76 @@
<script lang="ts">
import { onMount } from "svelte"
import { onMount } from "svelte"
let history: string[] = []
let currentDir = "~"
let history: string[] = []
let currentDir = "~"
type Command = "help" | "about" | "skills" | "projects" | "contact" | "clear"
type Command = "help" | "about" | "skills" | "projects" | "contact" | "clear"
const commands: Record<Command, () => string> = {
help: () => `Available commands:
const commands: Record<Command, () => string> = {
help: () => `Available commands:
about - Display information about me
skills - List my technical skills
projects - Show my notable projects
contact - Display my contact information
clear - Clear the terminal screen`,
about: () => `Hi, I'm John Doe!
about: () => `Hi, I'm John Doe!
I'm a passionate software developer with 5 years of experience.
I love creating elegant solutions to complex problems.`,
skills: () => `My technical skills include:
skills: () => `My technical skills include:
- JavaScript/TypeScript
- React & Next.js
- Node.js
- Python
- SQL & NoSQL databases`,
projects: () => `Some of my notable projects:
projects: () => `Some of my notable projects:
1. E-commerce Platform (React, Node.js, MongoDB)
2. Weather App (React Native, OpenWeatherMap API)
3. Task Management System (Python, Django, PostgreSQL)`,
contact: () => `You can reach me at:
contact: () => `You can reach me at:
Email: john.doe@example.com
GitHub: github.com/johndoe
LinkedIn: linkedin.com/in/johndoe`,
clear: () => {
clear: () => {
history = []
return ""
},
}
const executeCommand = (input: string) => {
const [command, ...args] = input.trim().split(" ")
if (command in commands) {
return commands[command as Command]()
}
return `Command not found: ${command}. Type 'help' for available commands.`
}
let input = ""
let inputRef: HTMLInputElement | null = null
const handleSubmit = (e: Event) => {
e.preventDefault()
if (input.trim()) {
if (input === "clear") {
history = []
return ""
},
}
const executeCommand = (input: string) => {
const [command, ...args] = input.trim().split(" ")
if (command in commands) {
return commands[command as Command]()
} else {
history = [...history, `${currentDir} $ ${input}`, executeCommand(input)]
}
return `Command not found: ${command}. Type 'help' for available commands.`
input = ""
}
}
let input = ""
let inputRef: HTMLInputElement | null = null
onMount(() => {
history = [
"Welcome to John Doe's Terminal Portfolio!",
"Type 'help' to see available commands.",
]
})
const handleSubmit = (e: Event) => {
e.preventDefault()
if (input.trim()) {
if (input === "clear") {
history = []
} else {
history = [
...history,
`${currentDir} $ ${input}`,
executeCommand(input),
]
}
input = ""
}
}
onMount(() => {
history = [
"Welcome to John Doe's Terminal Portfolio!",
"Type 'help' to see available commands.",
]
})
$: {
if (inputRef) {
inputRef.scrollIntoView({ behavior: "smooth" })
}
$: {
if (inputRef) {
inputRef.scrollIntoView({ behavior: "smooth" })
}
}
</script>
<div class="min-h-screen bg-black text-green-500 p-4 font-mono">

View File

@ -1,12 +1,12 @@
<script lang="ts">
import type { Snippet } from "svelte"
import type { Snippet } from "svelte"
interface Props {
title?: string
children: Snippet
}
interface Props {
title?: string
children: Snippet
}
const { title = "", children }: Props = $props()
const { title = "", children }: Props = $props()
</script>
<details class="collapse collapse-arrow bg-base-200">

View File

@ -1,12 +1,12 @@
<script lang="ts">
import Collapse from "@/components/collapse/Collapse.svelte"
import Collapse from "@/components/collapse/Collapse.svelte"
interface Props {
items?: string[]
title?: string
}
interface Props {
items?: string[]
title?: string
}
const { items = [], title = "" }: Props = $props()
const { items = [], title = "" }: Props = $props()
</script>
<Collapse {title}>

View File

@ -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"
---

View File

@ -1,16 +1,16 @@
---
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
---
<a href={localizePathname(to, lang)} class={clazz}>
<a href={localizeHref(to, { locale: lang })} class={clazz}>
<slot />
</a>

View File

@ -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)
}
---

View File

@ -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())),

View File

@ -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
@ -16,7 +16,7 @@ const mainClass =
---
<!doctype html>
<html lang={languageTag()} dir={"ltr"}>
<html lang={getLocale()} dir={"ltr"}>
<head>
<meta charset="UTF-8" />
<meta name="author" content="Martin Berg Alstad" />

View File

@ -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;
}

View File

@ -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<NavLink> = new Set([
"/uses",
])
const projectPaths: Set<string> = new Set<string>(["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])
)
}