-
-
{page.title}
+ page.showTitle &&
+ (journal ? (
+ // Like the journal's PubPub pages (JournalPage.astro): the journal's name, the title and the description
+
+
+
+ {journal.config.title}
+
+
{page.title}
+ {page.description &&
{page.description}
}
+
-
- )
+ ) : (
+
+ ))
}
{
searchSection ? (
diff --git a/apps/site/src/pages/[...slug].astro b/apps/site/src/pages/[...slug].astro
index 7310ad21..26417d37 100644
--- a/apps/site/src/pages/[...slug].astro
+++ b/apps/site/src/pages/[...slug].astro
@@ -13,7 +13,8 @@ type Props = { local: CollectionEntry<"pages"> } | { cms: CmsPage };
export const getStaticPaths = (async () => {
// The homepage and the journal's front page have pages of their own (index.astro, journal/index.astro)
const OWN_PAGES = ["index", "journal"];
- const local = (await getCollection("pages")).filter((p) => !OWN_PAGES.includes(p.id));
+ // pages/journal/* are the journal's (journal/[slug].astro)
+ const local = (await getCollection("pages")).filter((p) => !OWN_PAGES.includes(p.id) && !p.id.startsWith("journal/"));
const localSlugs = new Set([...local.map((p) => p.id), ...OWN_PAGES]);
const cms = (await getCmsPages()).filter((p) => !localSlugs.has(p.slug));
return [
diff --git a/apps/site/src/pages/admin/preview.astro b/apps/site/src/pages/admin/preview.astro
index eaf34b08..2fe44e41 100644
--- a/apps/site/src/pages/admin/preview.astro
+++ b/apps/site/src/pages/admin/preview.astro
@@ -32,14 +32,16 @@ const clean = (value: unknown): unknown => {
return value;
};
-const { slug, data } = (await Astro.request.json().catch(() => ({}))) as { slug?: string; data?: unknown };
+const { slug, data, collection } = (await Astro.request.json().catch(() => ({}))) as { slug?: string; data?: unknown; collection?: string };
+// The journal's front page (pages/journal.yaml) and its own pages (pages/journal/) are drawn under the journal's menu
+const inJournal = slug === "journal" || collection === "journal-pages";
const parsed = pageSchema.safeParse(clean(data ?? {}));
const problems = parsed.success ? [] : parsed.error.issues.map((issue) => `${issue.path.join(" → ") || "page"}: ${issue.message}`);
---
{
parsed.success ? (
-
+
) : (
diff --git a/apps/site/src/pages/journal/[slug].astro b/apps/site/src/pages/journal/[slug].astro
index 4429d321..9cb91d37 100644
--- a/apps/site/src/pages/journal/[slug].astro
+++ b/apps/site/src/pages/journal/[slug].astro
@@ -1,19 +1,28 @@
---
import type { GetStaticPaths } from "astro";
+import { getCollection } from "astro:content";
import JournalArticle from "~/layouts/JournalArticle.astro";
import JournalPage from "~/layouts/JournalPage.astro";
+import SectionsPage from "~/layouts/SectionsPage.astro";
import { getArticleDetails, prefetchArticles } from "~/lib/journal-article";
-import { ARTICLE_PAGES, getArticles, getPages } from "~/lib/sources/journal";
+import { ARTICLE_PAGES, getArticles, getPages, journal } from "~/lib/sources/journal";
export const getStaticPaths = (async () => {
+ // Pages built from sections in site-content (pages/journal/
.yaml) win over everything else at their address
+ const local = (await getCollection("pages"))
+ .filter((p) => p.id.startsWith("journal/"))
+ .map((p) => ({ slug: p.id.slice("journal/".length), data: p.data }));
+ const taken = new Set(local.map((p) => p.slug));
+ const sectionPages = local.map((p) => ({ params: { slug: p.slug }, props: { sections: p.data } }));
// The journal's own pages from PubPub (For Authors, Editorial Board...) share the address space
- const pages = (await getPages()).map((page) => ({ params: { slug: page.slug }, props: { page } }));
- if (!ARTICLE_PAGES) return pages;
+ const pages = (await getPages()).filter((p) => !taken.has(p.slug)).map((page) => ({ params: { slug: page.slug }, props: { page } }));
+ if (!ARTICLE_PAGES) return [...sectionPages, ...pages];
const articles = await getArticles();
await prefetchArticles(articles);
return [
+ ...sectionPages,
...pages,
- ...articles.map((article) => {
+ ...articles.filter((article) => !taken.has(article.slug)).map((article) => {
const issue = article.issues[0]?.slug;
const related = issue
? articles.filter((a) => a.id !== article.id && a.issues.some((i) => i.slug === issue)).slice(0, 3)
@@ -23,8 +32,16 @@ export const getStaticPaths = (async () => {
];
}) satisfies GetStaticPaths;
-const { page, article, related } = Astro.props;
+const { sections, page, article, related } = Astro.props;
const details = article && (await getArticleDetails(article));
---
-{page ? : article && details && }
+{
+ sections ? (
+
+ ) : page ? (
+
+ ) : (
+ article && details &&
+ )
+}
diff --git a/apps/site/src/styles/global.css b/apps/site/src/styles/global.css
index bd427968..4bacbbbc 100644
--- a/apps/site/src/styles/global.css
+++ b/apps/site/src/styles/global.css
@@ -152,6 +152,26 @@
@apply w-full border-frame border-ink;
}
+ /* Short Markdown inside cards, steps and panels: tighter than .prose-site */
+ .card-text {
+ @apply flex flex-col gap-3;
+ }
+ .card-text :where(ul) {
+ @apply list-disc pl-5;
+ }
+ .card-text :where(ol) {
+ @apply list-decimal pl-5;
+ }
+ .card-text :where(li + li) {
+ @apply mt-1;
+ }
+ .card-text :where(a) {
+ @apply font-semibold underline decoration-2 underline-offset-4 hover:decoration-accent;
+ }
+ .card-text :where(h3, h4) {
+ @apply font-heading text-lg font-extrabold;
+ }
+
/* Drop cap on the first paragraph of a blog post */
.lettrine {
@apply float-left mt-2 mr-2 border-frame border-ink bg-paper px-2 font-heading text-6xl leading-none font-bold md:text-8xl;