git.iko.soy/urbit.org
on master help sign in
Merge branch 'urbit.org2' of github.com:urbit/urbit.org into urbit.org2
commit5f6b9170e626aa5fb856df625593aa80e96fb7f9 authorGavin Atkinson <gvnatknsn@protonmail.com> dateFri 9 Jul 2021, 12:31 (5 years ago) parent3e145e00e16496
3 files changed+20−8
compare with master
unifiedsplit
lib/lib.js+16−4 pages/docs/[[...slug]].js+1−1 pages/using/[[...slug]].js+3−3
lib/lib.js+16−4
@@ -190,10 +190,22 @@ export function buildPageTree(path, ordering = "", content = false) {
190190 })
191191 .sort((a, b) => a.weight - b.weight),
192192 children: Object.fromEntries(
193− subdirs.map((subdir) => [
194− subdir.name,
195− buildPageTree(join(path, subdir.name), ordering, content),
196− ])
193+ subdirs
194+ .sort((a, b) => {
195+ const aMetadata = matter(
196+ fs.readFileSync(join(path, a.name, "_index.md")),
197+ options
198+ );
199+ const bMetadata = matter(
200+ fs.readFileSync(join(path, b.name, "_index.md")),
201+ options
202+ );
203+ return aMetadata?.data?.weight - bMetadata?.data?.weight || 0;
204+ })
205+ .map((subdir) => [
206+ subdir.name,
207+ buildPageTree(join(path, subdir.name), ordering, content),
208+ ])
197209 ),
198210 };
199211}
pages/docs/[[...slug]].js+1−1
@@ -100,7 +100,7 @@ export default function DocsLayout({ posts, data, params, search, markdown }) {
100100 return (
101101 <>
102102 <Head>
103− <title>{data.title} / Documentation / Urbit.org</title>
103+ <title>{data.title} / Documentation / urbit.org</title>
104104 </Head>
105105 <div className="flex w-screen h-screen min-h-screen w-screen">
106106 <Sidebar>{childPages("/docs", posts.children)}</Sidebar>
pages/using/[[...slug]].js+3−3
@@ -17,7 +17,7 @@ const breadcrumbs = (posts, paths) => {
1717 <span className="px-1">/</span>,
1818 <Link href="/using">Operator's Manual</Link>,
1919 ];
20− let thisLink = "/docs";
20+ let thisLink = "/using";
2121 for (const path of paths) {
2222 posts = posts.children[path];
2323 thisLink = join(thisLink, path);
@@ -100,10 +100,10 @@ export default function UsingLayout({ posts, data, params, search, markdown }) {
100100 return (
101101 <>
102102 <Head>
103− <title>{data.title} / Operator's Manual / Urbit.org</title>
103+ <title>{data.title} / Operator's Manual / urbit.org</title>
104104 </Head>
105105 <div className="flex w-screen h-screen min-h-screen w-screen">
106− <Sidebar>{childPages("/docs", posts.children)}</Sidebar>
106+ <Sidebar>{childPages("/using", posts.children)}</Sidebar>
107107 <ContentArea
108108 breadcrumbs={breadcrumbs(posts, params.slug?.slice(0, -1) || "")}
109109 title={data.title}