auxolotl/docs-site
21
0
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Activity

feat: add canonical URLs #3

Merged
Minion3665 merged 3 commits from private/skyler/canonical-urls into main 2024-05-25 15:13:20 +00:00
Conversation 0 Commits 3 Files changed 3 +70 -84
3 changed files with 70 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -149,11 +149,11 @@
"wiki": {
"flake": false,
"locked": {
"lastModified": 1716056148,
"narHash": "sha256-jWgjCkiExjBrRYcBzziNGPkorzJBLyWIa/ZUyUqqcr0=",
"lastModified": 1716579217,
"narHash": "sha256-Zu/DzCkjgic5qAFGgrRtpuPD8I9/kYqNxhCmixYL0GY=",
"owner": "auxolotl",
"repo": "wiki",
"rev": "644da0cf69dd962394c75cf4c924b19d56ba60c4",
"rev": "c2f9bdfeba0b44aae46569da6207867706e7f6ee",
"type": "github"
},
"original": {

2
src/content/wiki

@ -1 +1 @@
Subproject commit 644da0cf69dd962394c75cf4c924b19d56ba60c4
Subproject commit c2f9bdfeba0b44aae46569da6207867706e7f6ee

146
src/pages/[...slug].astro
View file

@ -1,97 +1,83 @@
---
import { type CollectionEntry, getCollection, getEntry } from 'astro:content';
import NavBar from '../components/NavBar.astro';
import Renderer from '../components/Renderer.astro';
import NavPage from '../components/NavPage.astro';
import "../style/globals.css"
import { type CollectionEntry, getCollection, getEntry } from "astro:content";
import NavBar from "../components/NavBar.astro";
import Renderer from "../components/Renderer.astro";
import NavPage from "../components/NavPage.astro";
import "../style/globals.css";
import { allPageAndDirectoryPaths } from "../lib/pagePaths";
import { parse } from "node:path"
import { parse } from "node:path";
export async function getStaticPaths() {
const wikiPages = await getCollection('wiki');
const paths = allPageAndDirectoryPaths(wikiPages);
return [
{
params: { slug: undefined },
props: { path: "home", name: "Home", post: await getEntry("wiki", "home") }
},
...Array.from(paths.entries()).flatMap(([key, post]) => {
if (!post) {
return [{
params: { slug: key },
props: { path: key, name: parse(key).name }
}]
} else {
return [
{
params: { slug: post.slug },
props: { path: post.id, name: post.data.title, post },
},
{
params: { slug: post.slug + ".md" },
props: { path: post.id, name: post.data.title, post },
}
]
}
})
// ...pages.flatMap((post: CollectionEntry<'wiki'> | undefined) => {
// if (!post) {
// return [{
// params: { slug: }
// }]
// } else {
// return [
// {
// params: { slug: post.slug },
// props: { path: post.id, name: post.data.title, post },
// },
// {
// params: { slug: post.slug + ".md" },
// props: { path: post.id, name: post.data.title, post },
// }
// ]
// }
// })
];
const wikiPages = await getCollection("wiki");
const paths = allPageAndDirectoryPaths(wikiPages);
return [
{
params: { slug: undefined },
props: {
path: "home",
name: "Home",
post: await getEntry("wiki", "home"),
},
},
...Array.from(paths.entries()).flatMap(([key, post]) => {
if (!post) {
return [
{
params: { slug: key },
props: { path: key, name: parse(key).name },
},
];
} else {
return [
{
params: { slug: post.slug },
props: { path: post.id, name: post.data.title, post },
},
{
params: { slug: post.slug + ".md" },
props: { path: post.id, name: post.data.title, post },
},
];
}
}),
];
}
type Props = {
post?: CollectionEntry<'wiki'>
path: string;
name: string;
post?: CollectionEntry<"wiki">;
path: string;
name: string;
};
const { post, path, name } = Astro.props;
---
<head>
<meta charset="utf-8">
<title>Aux Docs - {name}</title>
<meta charset="utf-8" />
<title>Aux Docs - {name}</title>
{
post ? (
<link rel="canonical" href={`https://wiki.auxolotl.org/${path}`} />
) : null
}
</head>
<style>
.box {
display: flex;
flex-direction: row;
margin: 0;
height: 100vh;
}
.nav-pane {
display: flex;
flex-direction: column;
min-width: 16em;
width: fit-content;
}
.box {
display: flex;
flex-direction: row;
margin: 0;
height: 100vh;
}
.nav-pane {
display: flex;
flex-direction: column;
min-width: 16em;
width: fit-content;
}
</style>
<body class="box">
<div class="nav-pane">
<NavBar currentPage={path} />
</div>
{
post ? (
<Renderer post={post} />
) : (
<NavPage path={path} />
)
}
</body>
<div class="nav-pane">
<NavBar currentPage={path} />
</div>
{post ? <Renderer post={post} /> : <NavPage path={path} />}
</body>