Simple homepage
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
Static Astro site with a git-based CMS (Sveltia). Code lives here; editorial
|
||||
content lives in the separate [`ctao/content`](https://astro-git.isl-dev.grid.cyfronet.pl/ctao/content)
|
||||
repository. Four Example pages are editable; all other pages are placeholders.
|
||||
repository. The Home page and four Example pages are editable; the rest are placeholders.
|
||||
|
||||
- Live demo: https://astro.isl-dev.grid.cyfronet.pl
|
||||
- Editor: https://astro.isl-dev.grid.cyfronet.pl/admin/ (Gitea sign-in)
|
||||
@@ -42,7 +42,7 @@ Server setup is in [deploy/README.md](deploy/README.md).
|
||||
| Path | Purpose |
|
||||
|---|---|
|
||||
| `src/layouts/Base.astro` | Header, navigation, footer, page shell |
|
||||
| `src/pages/example/[slug].astro` | Template for the editable Example pages |
|
||||
| `src/layouts/ContentPage.astro` | Layout of the editable pages (Home and Examples) |
|
||||
| `src/data/examples.json` | Example pages: menu labels, order, slugs |
|
||||
| `src/data/placeholders.json` | Placeholder pages |
|
||||
| `src/styles/global.css` | All site styles |
|
||||
|
||||
@@ -44,6 +44,30 @@ media_libraries:
|
||||
optimize: true
|
||||
|
||||
collections:
|
||||
- name: home
|
||||
label: "Home page"
|
||||
files:
|
||||
- name: home
|
||||
label: "Home page"
|
||||
file: "pages/home.md"
|
||||
format: frontmatter
|
||||
fields:
|
||||
- { name: title, label: "Title", widget: string }
|
||||
- { name: introduction, label: "Introduction", widget: text, required: false }
|
||||
- name: images
|
||||
label: "Images"
|
||||
label_singular: "image"
|
||||
widget: list
|
||||
required: false
|
||||
max: 2
|
||||
hint: "Up to two images, shown side by side."
|
||||
fields:
|
||||
- { name: image, label: "Image", widget: image }
|
||||
- { name: alt, label: "Alternative text", widget: string, required: false, hint: "Describe the image; leave empty only for decorative images." }
|
||||
- { name: caption, label: "Caption", widget: string, required: false }
|
||||
- { name: body, label: "Body", widget: markdown }
|
||||
- { name: buttonLabel, label: "Button label", widget: string, required: false }
|
||||
- { name: buttonUrl, label: "Button destination", widget: string, required: false, hint: "A site path such as /example/lorem-ipsum/, or an https:// URL." }
|
||||
- name: examples
|
||||
label: "Example pages"
|
||||
files:
|
||||
|
||||
@@ -279,6 +279,24 @@ button:hover .arrow {
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
/* Two photos side by side, pulled up over the hero together */
|
||||
.page-figures {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 1.5rem;
|
||||
margin: -9rem 0 4rem;
|
||||
}
|
||||
|
||||
.page-figures .page-figure {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Same shape for both photos, whatever the uploads' proportions */
|
||||
.page-figures img {
|
||||
aspect-ratio: 3 / 2;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
/* Prose
|
||||
========================================================================== */
|
||||
|
||||
@@ -450,11 +468,18 @@ button:hover .arrow {
|
||||
padding-bottom: 4rem;
|
||||
}
|
||||
|
||||
.page-figure {
|
||||
.page-figure,
|
||||
.page-figures {
|
||||
margin-top: -6rem;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 600px) {
|
||||
.page-figures {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
|
||||
/* Preferences
|
||||
========================================================================== */
|
||||
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ for (const { from, to } of targets) {
|
||||
}
|
||||
|
||||
const pages = join(root, 'src/content/pages');
|
||||
for (const { slug } of examples) {
|
||||
for (const slug of ['home', ...examples.map(({ slug }) => slug)]) {
|
||||
if (!existsSync(join(pages, `${slug}.md`))) {
|
||||
throw new Error(`Missing ${join(pages, `${slug}.md`)}. Check the content checkout, or run npm run content:link -- <path>.`);
|
||||
}
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
---
|
||||
interface Props { title: string; introduction?: string; example?: boolean; hasImage?: boolean }
|
||||
const { title, introduction, example = false, hasImage = false } = Astro.props;
|
||||
interface Props { title: string; introduction?: string; example?: boolean; breadcrumb?: boolean; hasImage?: boolean }
|
||||
const { title, introduction, example = false, breadcrumb = true, hasImage = false } = Astro.props;
|
||||
---
|
||||
<section class:list={['page-hero', { 'page-hero--compact': !hasImage }]}>
|
||||
<div class="container">
|
||||
<nav class="breadcrumb" aria-label="Breadcrumb">
|
||||
{breadcrumb && <nav class="breadcrumb" aria-label="Breadcrumb">
|
||||
<ol>
|
||||
{Astro.url.pathname !== '/' && <li><a href="/">Home</a></li>}
|
||||
{example && <li>Example</li>}
|
||||
<li aria-current="page">{title}</li>
|
||||
</ol>
|
||||
</nav>
|
||||
</nav>}
|
||||
<h1 class="page-hero__title">{title}</h1>
|
||||
{introduction && <p class="page-hero__lead">{introduction}</p>}
|
||||
</div>
|
||||
|
||||
@@ -8,17 +8,24 @@ const destination = z.string().refine(
|
||||
'Use a site path, https:// URL, mailto: address, or fragment.',
|
||||
);
|
||||
const pages = defineCollection({
|
||||
// Only these four files can become public content pages.
|
||||
// Only the Home page and the four Example files can become public pages.
|
||||
loader: glob({
|
||||
pattern: `{${examples.map(({ slug }) => slug).join(',')}}.md`,
|
||||
pattern: `{home,${examples.map(({ slug }) => slug).join(',')}}.md`,
|
||||
base: './src/content/pages',
|
||||
}),
|
||||
schema: z.object({
|
||||
title: z.string().min(1),
|
||||
introduction: z.string().optional(),
|
||||
// Example pages: one photo
|
||||
image: z.string().optional(),
|
||||
imageAlt: z.string().optional(),
|
||||
imageCaption: z.string().optional(),
|
||||
// Home: up to two photos side by side
|
||||
images: z.array(z.object({
|
||||
image: z.string().min(1),
|
||||
alt: z.string().optional(),
|
||||
caption: z.string().optional(),
|
||||
})).max(2).optional(),
|
||||
buttonLabel: z.string().optional(),
|
||||
buttonUrl: destination.optional(),
|
||||
}),
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
---
|
||||
// Editable content page: hero, one photo (Example pages) or two side by side
|
||||
// (Home), Markdown body and optional button. The CMS preview template in
|
||||
// src/pages/admin/index.astro mirrors this markup.
|
||||
import type { CollectionEntry } from 'astro:content';
|
||||
import { render } from 'astro:content';
|
||||
import Base from './Base.astro';
|
||||
import PageHero from '../components/PageHero.astro';
|
||||
|
||||
interface Props { page: CollectionEntry<'pages'>; example?: boolean; breadcrumb?: boolean }
|
||||
const { page, example = false, breadcrumb = true } = Astro.props;
|
||||
const { Content } = await render(page);
|
||||
const { title, introduction, image, imageAlt, imageCaption, images, buttonLabel, buttonUrl } = page.data;
|
||||
const photos = images ?? (image ? [{ image, alt: imageAlt, caption: imageCaption }] : []);
|
||||
---
|
||||
<Base title={example ? title : undefined} description={introduction}>
|
||||
<PageHero title={title} introduction={introduction} example={example} breadcrumb={breadcrumb} hasImage={photos.length > 0} />
|
||||
{photos.length > 0 && <div class="container">
|
||||
<div class:list={{ 'page-figures': photos.length > 1 }}>
|
||||
{photos.map(({ image, alt, caption }) => (
|
||||
<figure class="page-figure">
|
||||
<img src={image} alt={alt || ''} />
|
||||
{caption && <figcaption>{caption}</figcaption>}
|
||||
</figure>
|
||||
))}
|
||||
</div>
|
||||
</div>}
|
||||
<article class:list={['container', 'prose', { 'prose--no-image': photos.length === 0 }]}>
|
||||
<Content />
|
||||
{buttonLabel && buttonUrl && <p>
|
||||
<a class="btn btn--primary" href={buttonUrl}>
|
||||
<span class="btn__label">{buttonLabel}</span><span class="arrow" aria-hidden="true">→</span>
|
||||
</a>
|
||||
</p>}
|
||||
</article>
|
||||
</Base>
|
||||
+17
-13
@@ -36,9 +36,9 @@ const previewNames = examples.map(({ slug }) => slug);
|
||||
window.CMS?.registerPreviewStyle?.('/admin/preview.css');
|
||||
</script>
|
||||
<script is:inline define:vars={{ previewNames }}>
|
||||
// Preview pane: the same markup as src/pages/example/[slug].astro and
|
||||
// Preview pane: the same markup as src/layouts/ContentPage.astro and
|
||||
// PageHero.astro, without field labels. Sveltia looks templates up by
|
||||
// file name for file collections, so register one per Example page.
|
||||
// file name for file collections, so register one per page.
|
||||
const { h, rf } = window;
|
||||
// Our own <img>: Sveltia's image widget keeps the image transparent until
|
||||
// a visibility check that does not complete inside a custom template.
|
||||
@@ -56,37 +56,41 @@ const previewNames = examples.map(({ slug }) => slug);
|
||||
retry(10);
|
||||
},
|
||||
});
|
||||
const PagePreview = ({ entry, widgetFor, getAsset }) => {
|
||||
const PagePreview = ({ entry, widgetFor, getAsset, home = false }) => {
|
||||
const get = (key) => entry.getIn(['data', key]);
|
||||
const title = get('title') || '';
|
||||
const introduction = get('introduction');
|
||||
const image = get('image');
|
||||
const imageAlt = get('imageAlt') || '';
|
||||
const imageCaption = get('imageCaption');
|
||||
const buttonLabel = get('buttonLabel');
|
||||
const buttonUrl = get('buttonUrl');
|
||||
// Home: a list of up to two photos; Example pages: a single photo
|
||||
const photos = home
|
||||
? (get('images')?.toJS?.() ?? []).filter((item) => item?.image)
|
||||
: get('image') ? [{ image: get('image'), alt: get('imageAlt'), caption: get('imageCaption') }] : [];
|
||||
return h(rf, null,
|
||||
h('section', { className: image ? 'page-hero' : 'page-hero page-hero--compact' },
|
||||
h('section', { className: photos.length ? 'page-hero' : 'page-hero page-hero--compact' },
|
||||
h('div', { className: 'container' },
|
||||
h('nav', { className: 'breadcrumb', 'aria-label': 'Breadcrumb' },
|
||||
!home && h('nav', { className: 'breadcrumb', 'aria-label': 'Breadcrumb' },
|
||||
h('ol', null,
|
||||
h('li', null, h('a', { href: '/' }, 'Home')),
|
||||
h('li', null, 'Example'),
|
||||
h('li', { 'aria-current': 'page' }, title))),
|
||||
h('h1', { className: 'page-hero__title' }, title),
|
||||
introduction && h('p', { className: 'page-hero__lead' }, introduction))),
|
||||
image && h('div', { className: 'container' },
|
||||
h('figure', { className: 'page-figure' },
|
||||
h(PreviewImage, { key: image, asset: getAsset(image), fallback: image, alt: imageAlt }),
|
||||
imageCaption && h('figcaption', null, imageCaption))),
|
||||
h('article', { className: image ? 'container prose' : 'container prose prose--no-image' },
|
||||
photos.length > 0 && h('div', { className: 'container' },
|
||||
h('div', { className: photos.length > 1 ? 'page-figures' : undefined },
|
||||
photos.map(({ image, alt, caption }, index) => h('figure', { className: 'page-figure', key: index },
|
||||
h(PreviewImage, { key: image, asset: getAsset(image), fallback: image, alt: alt || '' }),
|
||||
caption && h('figcaption', null, caption))))),
|
||||
h('article', { className: photos.length ? 'container prose' : 'container prose prose--no-image' },
|
||||
widgetFor('body'),
|
||||
buttonLabel && buttonUrl && h('p', null,
|
||||
h('a', { className: 'btn btn--primary', href: buttonUrl },
|
||||
h('span', { className: 'btn__label' }, buttonLabel),
|
||||
h('span', { className: 'arrow', 'aria-hidden': 'true' }, '→')))));
|
||||
};
|
||||
const HomePreview = (props) => h(PagePreview, { ...props, home: true });
|
||||
if (window.CMS?.registerPreviewTemplate && h) {
|
||||
window.CMS.registerPreviewTemplate('home', HomePreview);
|
||||
for (const name of previewNames) window.CMS.registerPreviewTemplate(name, PagePreview);
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
---
|
||||
import { getCollection, render } from 'astro:content';
|
||||
import Base from '../../layouts/Base.astro';
|
||||
import PageHero from '../../components/PageHero.astro';
|
||||
import { getCollection } from 'astro:content';
|
||||
import ContentPage from '../../layouts/ContentPage.astro';
|
||||
import examples from '../../data/examples.json';
|
||||
|
||||
export async function getStaticPaths() {
|
||||
@@ -13,23 +12,5 @@ export async function getStaticPaths() {
|
||||
});
|
||||
}
|
||||
const { page } = Astro.props;
|
||||
const { Content } = await render(page);
|
||||
const { title, introduction, image, imageAlt, imageCaption, buttonLabel, buttonUrl } = page.data;
|
||||
---
|
||||
<Base title={title} description={introduction}>
|
||||
<PageHero title={title} introduction={introduction} example hasImage={Boolean(image)} />
|
||||
{image && <div class="container">
|
||||
<figure class="page-figure">
|
||||
<img src={image} alt={imageAlt || ''} />
|
||||
{imageCaption && <figcaption>{imageCaption}</figcaption>}
|
||||
</figure>
|
||||
</div>}
|
||||
<article class:list={['container', 'prose', { 'prose--no-image': !image }]}>
|
||||
<Content />
|
||||
{buttonLabel && buttonUrl && <p>
|
||||
<a class="btn btn--primary" href={buttonUrl}>
|
||||
<span class="btn__label">{buttonLabel}</span><span class="arrow" aria-hidden="true">→</span>
|
||||
</a>
|
||||
</p>}
|
||||
</article>
|
||||
</Base>
|
||||
<ContentPage page={page} example />
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
---
|
||||
import Placeholder from '../layouts/Placeholder.astro';
|
||||
import { getEntry } from 'astro:content';
|
||||
import ContentPage from '../layouts/ContentPage.astro';
|
||||
|
||||
const page = await getEntry('pages', 'home');
|
||||
if (!page) throw new Error('Missing Home page: pages/home.md. Check the content checkout (npm run content:link -- <path>).');
|
||||
---
|
||||
<Placeholder title="CTAO Science Portal" />
|
||||
<ContentPage page={page} breadcrumb={false} />
|
||||
|
||||
+26
-1
@@ -690,6 +690,24 @@ button:hover .arrow {
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
/* Two photos side by side (Home), pulled up over the hero together */
|
||||
.page-figures {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 1.5rem;
|
||||
margin: -9rem 0 4rem;
|
||||
}
|
||||
|
||||
.page-figures .page-figure {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Same shape for both photos, whatever the uploads' proportions */
|
||||
.page-figures img {
|
||||
aspect-ratio: 3 / 2;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
/* Prose
|
||||
========================================================================== */
|
||||
|
||||
@@ -916,11 +934,18 @@ main {
|
||||
padding-bottom: 4rem;
|
||||
}
|
||||
|
||||
.page-figure {
|
||||
.page-figure,
|
||||
.page-figures {
|
||||
margin-top: -6rem;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 600px) {
|
||||
.page-figures {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
|
||||
/* Preferences
|
||||
========================================================================== */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user