From cb002523646c73150a600b53609f0987d6a6450c Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sat, 15 Feb 2025 14:59:32 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Format=20files,=20Added=20codebe?= =?UTF-8?q?rg=20to=20links,lighter=20colour=20for=20linkcards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- messages/en.json | 1 + messages/nb.json | 1 + src/components/ContactMeForm.astro | 12 +++++-- src/components/Footer.astro | 2 +- src/components/Greeting.astro | 11 ++++-- src/components/LanguageButtonGroup.astro | 8 +++-- src/components/Select.svelte | 1 - src/components/UsesPage.svelte | 23 +++++++++---- src/components/collapse/Collapse.svelte | 5 +-- src/components/collapse/CollapseList.svelte | 4 +-- src/components/icons/Gitea.astro | 2 +- src/components/links/ExternalLink.astro | 8 ++++- src/components/myLinks/LinkCard.astro | 2 +- src/components/myLinks/myLinks.ts | 36 ++++++++++++-------- src/components/projects/MyProjectsPage.astro | 9 ++--- src/components/projects/ProjectPage.astro | 2 +- src/content/config.ts | 10 +++--- src/layouts/Layout.astro | 32 ++++++++--------- src/links.ts | 12 +++---- src/pages/en/links.astro | 3 +- src/pages/en/projects/[project].astro | 2 +- src/pages/en/projects/index.astro | 2 +- src/pages/en/uses.astro | 2 +- src/pages/index.astro | 1 - src/pages/links.astro | 3 +- src/pages/projects/[project].astro | 2 +- src/styles/global.css | 32 ++++++++--------- src/types/icons.ts | 12 ++++++- src/types/props.ts | 6 ++-- src/utils/linking.ts | 8 ++--- 30 files changed, 151 insertions(+), 103 deletions(-) diff --git a/messages/en.json b/messages/en.json index cbd1ac5..e065450 100644 --- a/messages/en.json +++ b/messages/en.json @@ -13,6 +13,7 @@ "sourceCode": "Source code", "createdAt": "Created at", "updatedAt": "Updated at", + "forMirrors": "For mirrors of Gitea", "forPersonalProjects": "For personal projects", "status": "Status", "name": "Name", diff --git a/messages/nb.json b/messages/nb.json index ae228b5..49c6ccd 100644 --- a/messages/nb.json +++ b/messages/nb.json @@ -13,6 +13,7 @@ "sourceCode": "Kildekode", "createdAt": "Opprettet", "updatedAt": "Oppdatert", + "forMirrors": "For mirrors av Gitea", "forPersonalProjects": "For personlige prosjekter", "status": "Status", "name": "Navn", diff --git a/src/components/ContactMeForm.astro b/src/components/ContactMeForm.astro index 84f0970..911e351 100644 --- a/src/components/ContactMeForm.astro +++ b/src/components/ContactMeForm.astro @@ -4,14 +4,20 @@ import * as m from "@/paraglide/messages.js" // TODO self-host email server --- -
+ - { /*Honeypot spam filter*/} + + {/*Honeypot spam filter*/}
diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 03b25c1..7228ef4 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -9,7 +9,7 @@ import * as m from "@/paraglide/messages" const giteaLink = `${GIT_URL}/martials/martials.no` --- -
+
diff --git a/src/components/Greeting.astro b/src/components/Greeting.astro index 7927167..6f8e75a 100644 --- a/src/components/Greeting.astro +++ b/src/components/Greeting.astro @@ -16,7 +16,14 @@ import "@/styles/global.css"

{m.aboutMe()}

- Me on a hike + Me on a hike
- \ No newline at end of file + diff --git a/src/components/LanguageButtonGroup.astro b/src/components/LanguageButtonGroup.astro index ba09225..cae9281 100644 --- a/src/components/LanguageButtonGroup.astro +++ b/src/components/LanguageButtonGroup.astro @@ -6,6 +6,10 @@ const currentPath = resolvePathname(Astro.url.pathname) ---
- Norsk - English + Norsk + English
diff --git a/src/components/Select.svelte b/src/components/Select.svelte index a50d0df..47a475f 100644 --- a/src/components/Select.svelte +++ b/src/components/Select.svelte @@ -1,5 +1,4 @@

{m.uses()}

-

- {#if (selectedHardware.data.accessories)} - + {#if selectedHardware.data.accessories} + {/if}
diff --git a/src/components/collapse/Collapse.svelte b/src/components/collapse/Collapse.svelte index 5021914..ba7b843 100644 --- a/src/components/collapse/Collapse.svelte +++ b/src/components/collapse/Collapse.svelte @@ -1,8 +1,9 @@ - +
    {#each items as item}
  • {item}
    • {/each}
- \ No newline at end of file + diff --git a/src/components/icons/Gitea.astro b/src/components/icons/Gitea.astro index e03339f..061d284 100644 --- a/src/components/icons/Gitea.astro +++ b/src/components/icons/Gitea.astro @@ -7,4 +7,4 @@ interface Props { const { class: clazz } = Astro.props --- - + diff --git a/src/components/links/ExternalLink.astro b/src/components/links/ExternalLink.astro index 94d30ea..2aeb7bf 100644 --- a/src/components/links/ExternalLink.astro +++ b/src/components/links/ExternalLink.astro @@ -7,6 +7,12 @@ interface Props extends LinkProps { const { href, noStyle = false, class: clazz, ...props } = Astro.props --- - + diff --git a/src/components/myLinks/LinkCard.astro b/src/components/myLinks/LinkCard.astro index 8a9851f..48a9b60 100644 --- a/src/components/myLinks/LinkCard.astro +++ b/src/components/myLinks/LinkCard.astro @@ -11,7 +11,7 @@ const { title, message, url, icon, class: clazz } = Astro.props --- -
+
diff --git a/src/components/myLinks/myLinks.ts b/src/components/myLinks/myLinks.ts index 3de998b..823cf5a 100644 --- a/src/components/myLinks/myLinks.ts +++ b/src/components/myLinks/myLinks.ts @@ -3,44 +3,50 @@ import { GIT_URL } from "astro:env/client" import * as m from "@/paraglide/messages" export interface MyLink { - title: string; - url: string; - message?: string; + title: string + url: string + message?: string icon?: PajamasIcon } export default [ { - title: "GitHub", - url: "https://github.com/emberal", - icon: "pajamas:github" + title: "Codeberg", + url: "https://codeberg.org/martials", + message: m.forMirrors(), + icon: "pajamas:git", }, { title: "Gitea", url: `${GIT_URL}/martials`, message: m.forPersonalProjects(), - icon: "pajamas:gitea" + icon: "pajamas:gitea", + }, + { + title: "GitHub", + url: "https://github.com/emberal", + icon: "pajamas:github", }, { title: "LinkedIn", url: "https://www.linkedin.com/in/martin-b-2a69391a3/", - icon: "pajamas:linkedin" + icon: "pajamas:linkedin", }, { - title: "Mastodon (Snabelen)", + title: "Mastodon (Snabelen.no)", url: "https://snabelen.no/@Martials", - icon: "pajamas:mastodon" + icon: "pajamas:mastodon", }, { title: "Pixelfed", - url: "https://pixelfed.social/i/web/profile/261454857934868480" + url: "https://pixelfed.social/i/web/profile/261454857934868480", }, { title: "Steam", - url: "https://steamcommunity.com/id/martials/" + url: "https://steamcommunity.com/id/martials/", }, { title: "Trakt.tv", - url: "https://trakt.tv/users/martials" - } -] satisfies MyLink[] + url: "https://trakt.tv/users/martials", + }, +] as MyLink[] diff --git a/src/components/projects/MyProjectsPage.astro b/src/components/projects/MyProjectsPage.astro index 412a492..0e0175d 100644 --- a/src/components/projects/MyProjectsPage.astro +++ b/src/components/projects/MyProjectsPage.astro @@ -17,10 +17,7 @@ const baseUrl: NavLink = "/projects"
{ projects.map( - ({ - data: { title, description, tags, heroImage, heroImageAlt }, - id - }) => ( + ({ data: { title, description, tags, heroImage, heroImageAlt }, id }) => (
- ) + ), ) } -
\ No newline at end of file +
diff --git a/src/components/projects/ProjectPage.astro b/src/components/projects/ProjectPage.astro index 3bd65c0..4e44967 100644 --- a/src/components/projects/ProjectPage.astro +++ b/src/components/projects/ProjectPage.astro @@ -24,7 +24,7 @@ const { heroImageAlt, source, createdAt, - updatedAt + updatedAt, } = entry!.data --- diff --git a/src/content/config.ts b/src/content/config.ts index 5f934ca..f83f1a5 100644 --- a/src/content/config.ts +++ b/src/content/config.ts @@ -12,8 +12,8 @@ const projectCollection = defineCollection({ tags: z.array(z.string()), source: z.string(), createdAt: z.string(), - updatedAt: z.string() - }) + updatedAt: z.string(), + }), }) const usesCollection = defineCollection({ @@ -21,11 +21,11 @@ const usesCollection = defineCollection({ schema: z.object({ title: z.string(), accessories: z.optional(z.array(z.string())), - hardware: z.array(z.string()) - }) + hardware: z.array(z.string()), + }), }) export const collections = { projects: projectCollection, - uses: usesCollection + uses: usesCollection, } diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 1513020..9d1ea0e 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -12,20 +12,20 @@ const { title, class: clazz } = Astro.props - - - - - - - - {title} - - - -
- -
-