From ad9efaccd7a547ceb79d9fa585c5e4439eba7b5f Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Wed, 7 Jun 2023 22:32:23 +0200 Subject: [PATCH] Extract wiki page layout --- src/components/tree/List.astro | 16 +++++++---- src/components/tree/Tree.astro | 6 ++--- src/layouts/Wiki.astro | 48 +++++++++++++++++++++++++++++++++ src/pages/wiki/[...slug].astro | 16 +++-------- src/pages/wiki/index.astro | 18 ------------- src/pages/wiki/index.md | 6 +++++ src/{schema.d.ts => types.d.ts} | 0 src/utils/tree.ts | 8 +++--- 8 files changed, 76 insertions(+), 42 deletions(-) create mode 100644 src/layouts/Wiki.astro delete mode 100644 src/pages/wiki/index.astro create mode 100644 src/pages/wiki/index.md rename src/{schema.d.ts => types.d.ts} (100%) diff --git a/src/components/tree/List.astro b/src/components/tree/List.astro index 1b94109..4838940 100644 --- a/src/components/tree/List.astro +++ b/src/components/tree/List.astro @@ -1,11 +1,11 @@ --- -import { Tree, pathify } from "@utils/tree"; -import type { Maybe } from "purify-ts"; +import { PageTree, pathify } from "@utils/tree"; +import { Maybe } from "purify-ts"; interface Props { - tree: Tree; - slug: string; + tree: PageTree; + slug: Maybe; prefix: Maybe; } @@ -17,6 +17,12 @@ function compare(a: {title: string}, b: {title: string}) { sensitivity: "base", }); } + +function checkCurrent(checked: Maybe) { + return Maybe + .sequence([checked, slug]) + .mapOrDefault(([a, b]) => a == pathify(b), false) +} --- {tree.children @@ -26,7 +32,7 @@ function compare(a: {title: string}, b: {title: string}) {
    {pages .sort(compare) - .map(page => ({...page, current: page.slug.mapOrDefault(other => other === pathify(slug), false)})) + .map(page => ({...page, current: checkCurrent(page.slug) })) .map(page =>
  • {page.slug diff --git a/src/components/tree/Tree.astro b/src/components/tree/Tree.astro index 6bde128..4a0afb3 100644 --- a/src/components/tree/Tree.astro +++ b/src/components/tree/Tree.astro @@ -1,13 +1,13 @@ --- import List from "./List.astro"; -import { Tree, pathify } from "@utils/tree"; +import { PageTree, pathify } from "@utils/tree"; import type { Maybe } from "purify-ts"; interface Props { heading: string; - tree: Tree; - slug: string; + tree: PageTree; + slug: Maybe; prefix: Maybe; } diff --git a/src/layouts/Wiki.astro b/src/layouts/Wiki.astro new file mode 100644 index 0000000..499caec --- /dev/null +++ b/src/layouts/Wiki.astro @@ -0,0 +1,48 @@ +--- +import Base from "@layouts/Base.astro"; +import Tree from "@components/tree/Tree.astro"; +import { getCollection } from "astro:content"; +import { Maybe, MaybeAsync } from "purify-ts"; +import { collapse, type PageTree } from "@utils/tree"; + + +interface Props { + frontmatter: { + title: string; + }; + slug?: string; + tree?: PageTree; +} + +const { + frontmatter, + slug, + tree, +} = Astro.props; + + +function constructTree(tree?: PageTree) { + return MaybeAsync + .liftMaybe(Maybe.fromNullable(tree)) + .alt( + MaybeAsync(async () => await getCollection('wiki')) + .map(collapse)); +} + +const pageTree = (await constructTree(tree)) + .orDefaultLazy(() => { throw new Error("Couldn't load page tree") }); +--- + + +
    + +
    +

    {frontmatter.title}

    + +
    +
    + diff --git a/src/pages/wiki/[...slug].astro b/src/pages/wiki/[...slug].astro index 109241f..2930ecb 100644 --- a/src/pages/wiki/[...slug].astro +++ b/src/pages/wiki/[...slug].astro @@ -1,10 +1,8 @@ --- -import Tree from '@components/tree/Tree.astro'; -import Base from '@layouts/Base.astro'; import type { InferGetStaticPropsType } from 'astro'; import { getCollection } from 'astro:content'; -import { Maybe } from 'purify-ts'; import { collapse } from '@utils/tree'; +import Wiki from '@layouts/Wiki.astro'; type Props = InferGetStaticPropsType; @@ -19,12 +17,6 @@ const { tree, entry } = Astro.props; const { Content } = await entry.render(); --- - -
    - -
    -

    {entry.data.title}

    - -
    -
    - + + + diff --git a/src/pages/wiki/index.astro b/src/pages/wiki/index.astro deleted file mode 100644 index b5db69f..0000000 --- a/src/pages/wiki/index.astro +++ /dev/null @@ -1,18 +0,0 @@ ---- -import Base from "@layouts/Base.astro"; -import Tree from "@components/tree/Tree.astro"; -import { collapse } from "@utils/tree"; -import { getCollection } from "astro:content"; -import { Maybe } from "purify-ts"; - -const tree = collapse(await getCollection('wiki')); ---- - - -
    - -
    - siema -
    -
    - diff --git a/src/pages/wiki/index.md b/src/pages/wiki/index.md new file mode 100644 index 0000000..fe29650 --- /dev/null +++ b/src/pages/wiki/index.md @@ -0,0 +1,6 @@ +--- +layout: ../../layouts/Wiki.astro +title: Wiki home page +--- + +Hello diff --git a/src/schema.d.ts b/src/types.d.ts similarity index 100% rename from src/schema.d.ts rename to src/types.d.ts diff --git a/src/utils/tree.ts b/src/utils/tree.ts index 2e55aa7..85a9c20 100644 --- a/src/utils/tree.ts +++ b/src/utils/tree.ts @@ -6,14 +6,14 @@ interface Page { data: { title: string }; } -export interface Tree { +export interface PageTree { title: string; slug: Maybe; - children: Maybe<{ [key: string]: Tree }>; + children: Maybe<{ [key: string]: PageTree }>; } -export function collapse(pages: Page[]): Tree { - const root: Tree = { title: '', slug: Maybe.empty(), children: Maybe.empty() }; +export function collapse(pages: Page[]): PageTree { + const root: PageTree = { title: '', slug: Maybe.empty(), children: Maybe.empty() }; for (const page of pages) { const ptr = page.slug.split('/')