Skip to content

Commit e5bb9a7

Browse files
authored
Merge pull request #499 from processing/fix/libraries-double-post
Fix double-rendering of libraries page description
2 parents c569acf + e71fc2e commit e5bb9a7

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

src/layouts/CommunityLayout.astro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ setJumpToState({
6767
}
6868
</ul>
6969
<div class="content-grid-simple">
70-
<LinkButton url="/sketches" variant="link" class="mt-lg col-span-1 w-full"
70+
<LinkButton url="/sketches/" variant="link" class="mt-lg col-span-1 w-full"
7171
>{t("All Sketches")}</LinkButton
7272
>
7373
</div>
@@ -86,7 +86,7 @@ setJumpToState({
8686
</ul>
8787
<div class="content-grid-simple">
8888
<LinkButton
89-
url="/libraries"
89+
url="/libraries/"
9090
variant="link"
9191
class="mt-lg col-span-1 w-full">{t("All Libraries")}</LinkButton
9292
>
@@ -112,7 +112,7 @@ setJumpToState({
112112
}
113113
</ul>
114114
<div class="content-grid-simple">
115-
<LinkButton url="/events" variant="link" class="mt-lg col-span-1 w-full"
115+
<LinkButton url="/events/" variant="link" class="mt-lg col-span-1 w-full"
116116
>{t("All Events")}</LinkButton
117117
>
118118
</div>

src/layouts/LibrariesLayout.astro

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ import { categories } from "../content/libraries/config";
99
1010
interface Props {
1111
entries: CollectionEntry<"libraries">[];
12-
page: CollectionEntry<"pages">;
1312
title: string;
1413
}
1514
type LibraryEntry = CollectionEntry<"libraries">;
1615
1716
const currentLocale = getCurrentLocale(Astro.url.pathname);
1817
const t = await getUiTranslator(currentLocale);
1918
20-
const { entries, page } = Astro.props;
21-
const { Content } = await page.render();
19+
const { entries } = Astro.props;
2220
2321
function strCompare(a: string, b: string) {
2422
if (a < b) {
@@ -62,10 +60,6 @@ setJumpToState({
6260
variant="item"
6361
topic="community"
6462
>
65-
<div class="rendered-markdown">
66-
<Content />
67-
</div>
68-
6963
{
7064
sections.map(({ slug, name, sectionEntries }) => (
7165
<section>

src/pages/[locale]/libraries/index.astro

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ export async function getStaticPaths() {
1010
},
1111
props: {
1212
entries: await getCollectionInLocaleWithFallbacks("libraries", locale),
13-
pages: await getCollectionInLocaleWithFallbacks("pages", locale),
1413
},
1514
}));
1615
1716
return await Promise.all(pages);
1817
}
1918
20-
const { entries, pages } = Astro.props;
21-
const page = pages.find((page) => page.slug === 'libraries')!
19+
const { entries } = Astro.props;
2220
---
2321

24-
<LibrariesLayout title="Libraries" entries={entries} page={page} />
22+
<LibrariesLayout title="Libraries" entries={entries} />

src/pages/libraries/index.astro

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import { getCollectionInDefaultLocale } from "../_utils";
33
import LibrariesLayout from "@/src/layouts/LibrariesLayout.astro";
44
55
const libraries = await getCollectionInDefaultLocale("libraries");
6-
const pages = await getCollectionInDefaultLocale("pages");
7-
const page = pages.find((page) => page.slug === 'libraries')!
86
---
97

10-
<LibrariesLayout title="Libraries" entries={libraries} page={page} />
8+
<LibrariesLayout title="Libraries" entries={libraries} />

0 commit comments

Comments
 (0)