From 25ba731173314e3dee48a0b4671f38ba4018564d Mon Sep 17 00:00:00 2001 From: Volpeon Date: Thu, 23 Jul 2026 18:04:38 +0200 Subject: Use Corvos 0.1.3 --- src/ui/base/BaseLayout.tsx | 23 +++++++++++------------ src/ui/components/SiteFooter.tsx | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'src/ui') diff --git a/src/ui/base/BaseLayout.tsx b/src/ui/base/BaseLayout.tsx index 2fb999d..617bb99 100644 --- a/src/ui/base/BaseLayout.tsx +++ b/src/ui/base/BaseLayout.tsx @@ -1,4 +1,5 @@ -// @ts-types="corvos/mod.ts" +import type { Query } from "corvos/mod.ts"; + import { getGenerator, type Select } from "corvos/mod.ts"; import site from "@/corvos.config.ts"; @@ -9,7 +10,7 @@ import { Lightbox } from "../objects/Lightbox.tsx"; export interface Props { page: Select; - pages: readonly Select[]; + pages: Query>; image?: string; theme?: "l1" | "l2" | null; children?: JSX.Element; @@ -24,17 +25,15 @@ export const BaseLayout = async ({ children, class: cls, }: Props) => { - const query = site.$.query(pages); - - const stylesheet = await site.load("styles/style.scss"); - const script = await site.load("scripts/script.ts"); - const fonts = await site.glob("assets/**.woff2"); - const favicon = await site.load("assets/favicon.svg"); - const image = await site.load( - imageUrl ?? "https://strapi.volpeon.ink/uploads/icon_7999cf625e.png", - ); + const stylesheet = await site.load("styles/style.scss").one(); + const script = await site.load("scripts/script.ts").one(); + const fonts = await site.glob("assets/**.woff2").array(); + const favicon = await site.load("assets/favicon.svg").one(); + const image = await site + .load(imageUrl ?? "https://strapi.volpeon.ink/uploads/icon_7999cf625e.png") + .one(); - const feeds = query.type(".rss").many(); + const feeds = await pages.type(".rss").array(); return ( <> diff --git a/src/ui/components/SiteFooter.tsx b/src/ui/components/SiteFooter.tsx index 8bada2e..9accfbe 100644 --- a/src/ui/components/SiteFooter.tsx +++ b/src/ui/components/SiteFooter.tsx @@ -5,7 +5,7 @@ import { Divider } from "../objects/Divider.tsx"; import { Logo } from "./Logo.tsx"; export const SiteFooter = async () => { - const symbols = await site.load("assets/symbols.svg"); + const symbols = await site.load("assets/symbols.svg").one(); return (