diff --git a/TODO.md b/TODO.md index 7fdf64e..db71616 100644 --- a/TODO.md +++ b/TODO.md @@ -3,13 +3,19 @@ ## Code - [ ] Temporal API or day.js for dates +## SSE +- [x] Correct Sitemap.xml +- [x] Correct robots.txt +- [x] Correct security.txt + ## Layout -- [ ] Show current page in navbar +- [x] Show current page - [x] Correct bg colour on entire page +- [x] Hamburger menu on mobile ## Accessibility - [ ] Fix colours on buttons -- [ ] Correct contrast +- [x] Correct contrast - [ ] All interactable elements have labels - [ ] Colour links, also in MDX posts diff --git a/astro.config.mjs b/astro.config.mjs index 1c06fa7..c11c5ff 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -10,13 +10,13 @@ import icon from "astro-icon" import { loadEnv } from "vite" -const { url } = process.env.URL - ? loadEnv(process.env.URL, process.cwd(), "") - : { url: "http://localhost:3000" } +const { URL } = process.env.NODE_ENV + ? loadEnv(process.env.NODE_ENV, process.cwd(), "") + : { URL: "http://localhost:3000" } // https://astro.build/config export default defineConfig({ - site: url, + site: URL, output: "server", i18n: { defaultLocale: "nb", diff --git a/src/components/UsesPage.astro b/src/components/UsesPage.astro index 4aca7a4..4d8f2a6 100644 --- a/src/components/UsesPage.astro +++ b/src/components/UsesPage.astro @@ -1,5 +1,4 @@ --- -import Select from "./Select.svelte" import * as m from "@/paraglide/messages" import CollapseList from "@/components/collapse/CollapseList.svelte" import type { CollectionEntry } from "astro:content" diff --git a/src/components/header/HamburgerMenuButton.astro b/src/components/header/HamburgerMenuButton.astro new file mode 100644 index 0000000..bd7eff1 --- /dev/null +++ b/src/components/header/HamburgerMenuButton.astro @@ -0,0 +1,17 @@ +--- +import PajamasIcon from "@/components/icons/PajamasIcon.astro" + +interface Props { + id: string +} + +const { id } = Astro.props +--- + + diff --git a/src/components/header/Header.astro b/src/components/header/Header.astro index 44405a1..3301fb7 100644 --- a/src/components/header/Header.astro +++ b/src/components/header/Header.astro @@ -1,7 +1,38 @@ --- import Navbar from "./Navbar.astro" +import NavbarDrawer from "./NavbarDrawer.astro" +import HamburgerMenuButton from "./HamburgerMenuButton.astro" +import { resolvePathname } from "@/utils/linking" + +const currentPath = `~${resolvePathname(Astro.originPathname)}` --- -
- +
+
+ +
+ + +
+
+ + +
+
diff --git a/src/components/header/NavbarDrawer.astro b/src/components/header/NavbarDrawer.astro new file mode 100644 index 0000000..f0705e4 --- /dev/null +++ b/src/components/header/NavbarDrawer.astro @@ -0,0 +1,12 @@ +--- +import Links from "../../links" +import LocaleLink from "../links/LocaleLink.astro" +--- + +{ + Links.map((link) => ( +
  • + {link.label} +
  • + )) +} diff --git a/src/components/myLinks/LinkCard.astro b/src/components/myLinks/LinkCard.astro index 1a5f152..a869efb 100644 --- a/src/components/myLinks/LinkCard.astro +++ b/src/components/myLinks/LinkCard.astro @@ -9,7 +9,6 @@ interface Props extends MyLink { const { title, message, url, icon, class: clazz } = Astro.props const iconStyle = "w-6 h-6" -console.log(icon) --- diff --git a/src/components/projects/MyProjectsPage.astro b/src/components/projects/MyProjectsPage.astro index edfc447..4503ef4 100644 --- a/src/components/projects/MyProjectsPage.astro +++ b/src/components/projects/MyProjectsPage.astro @@ -1,6 +1,5 @@ --- import ProjectCard from "./ProjectCard.astro" -import * as m from "@/paraglide/messages" import { type CollectionEntry } from "astro:content" import { type NavLink } from "@/utils/linking" diff --git a/src/components/projects/ProjectPage.astro b/src/components/projects/ProjectPage.astro index fef3f03..c5f75ac 100644 --- a/src/components/projects/ProjectPage.astro +++ b/src/components/projects/ProjectPage.astro @@ -1,11 +1,11 @@ --- import Layout from "@/layouts/Layout.astro" -import { Image } from "astro:assets" -import { getEntry, render } from "astro:content" import BadgeList from "@/components/badge/BadgeList.astro" -import * as m from "@/paraglide/messages" -import { languageTag } from "@/paraglide/runtime" import GiteaLink from "@/components/links/GiteaLink.astro" +import { languageTag } from "@/paraglide/runtime" +import { getEntry, render } from "astro:content" +import { Image } from "astro:assets" +import * as m from "@/paraglide/messages" import "@/styles/global.css" interface Props { @@ -29,10 +29,10 @@ const { --- - +
    -

    {title}

    +

    {title}

    diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index ff3a04b..4d0e4ce 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -9,7 +9,7 @@ interface Props { class?: string } const { title, class: clazz } = Astro.props -const mainClass = "grow max-w-[1000px] m-auto sm:min-w-[500px] mt-5" +const mainClass = "grow max-w-[1000px] m-auto sm:min-w-[500px]" --- @@ -26,8 +26,12 @@ const mainClass = "grow max-w-[1000px] m-auto sm:min-w-[500px] mt-5"
    -

    ~{resolvePathname(Astro.originPathname)}

    - +

    + ~{resolvePathname(Astro.originPathname)} +

    +
    + +