on master help sign in
Merge pull request #1861 from urbit/mp/grant-fixes

site: grants navigation fixes

commitb05bc0cd0171b2031224061c69120d6a95cc7da1 author~sarlev-sarsen <tlatfcp@protonmail.com> dateTue 25 Oct 2022, 07:52 (4 years ago) parent14eb5f5802ce57
2 files changed+11−9
lib/cache.js+9−6 pages/grants.js+2−3
lib/cache.js+9−6
@@ -24,7 +24,7 @@ function buildSearchIndex(dir) {
2424
2525 try {
2626 metadata = matter(fs.readFileSync(path.join(dir, "_index.md")), options);
27− } catch (err) {}
27+ } catch (err) { }
2828
2929 const children = fs.readdirSync(dir, { withFileTypes: true });
3030 const pages = children.filter((f) => f.isFile() && f.name !== "_index.md");
@@ -40,14 +40,17 @@ function buildSearchIndex(dir) {
4040 );
4141 const parsed = markdoc.parse(pageContent);
4242 const transform = markdoc.transform(parsed);
43− return {
44− title: pageData.title,
45− base: page.name,
46− slug: path.join(
43+ const slug = dir.includes("/grants/")
44+ ? `/grants/${page.name.replace(/.md$/, "")}`
45+ : path.join(
4746 dir.substr(dir.indexOf("content") + 7),
4847 "/",
4948 page.name.replace(/.md$/, "")
50− ),
49+ );
50+ return {
51+ title: pageData.title,
52+ base: page.name,
53+ slug,
5154 content: pageData.description || "",
5255 headings: transform.children
5356 .filter((e) => e.name === "h2" || e.name === "h3")
pages/grants.js+2−3
@@ -373,9 +373,8 @@ export async function getStaticProps() {
373373 `grants/${year.name}`,
374374 "date"
375375 )
376− }).flat().sort((a, b) => {
377− return a.title.toLowerCase().localeCompare(b.title.toLowerCase())
378− });
376+ }).flat()
377+ .sort((a, b) => new Date(b.date) - new Date(a.date));
379378
380379 return {
381380 props: {