From 0b30d9ade51c327bca41c2a55780b3e29ecbe75c Mon Sep 17 00:00:00 2001
From: Joe Carstairs <jcarstairs@scottlogic.com>
Date: Tue, 8 Aug 2023 19:44:52 +0100
Subject: Defines Page layout

---
 src/layouts/Page.astro                             | 17 ++++
 src/pages/[locale]/furthsettins/index.astro        | 26 +++---
 .../furthsettins/lallans/[issueNumber].astro       | 12 ++-
 .../[locale]/furthsettins/lallans/index.astro      | 12 ++-
 src/pages/[locale]/index.astro                     | 92 +++++++++++-----------
 5 files changed, 84 insertions(+), 75 deletions(-)
 create mode 100644 src/layouts/Page.astro

(limited to 'src')

diff --git a/src/layouts/Page.astro b/src/layouts/Page.astro
new file mode 100644
index 0000000..3ef0a58
--- /dev/null
+++ b/src/layouts/Page.astro
@@ -0,0 +1,17 @@
+---
+import type Locale from '../types/Locale';
+import Layout from './Layout.astro';
+
+interface Props {
+  locale: Locale;
+  title: string;
+}
+
+const { locale, title } = Astro.props;
+---
+
+<Layout locale={locale} title={title} >
+  <main id="main">
+    <slot />
+  </main>
+</Layout>
diff --git a/src/pages/[locale]/furthsettins/index.astro b/src/pages/[locale]/furthsettins/index.astro
index c42c671..8489a1a 100644
--- a/src/pages/[locale]/furthsettins/index.astro
+++ b/src/pages/[locale]/furthsettins/index.astro
@@ -1,5 +1,5 @@
 ---
-import Layout from '../../../layouts/Layout.astro';
+import Page from '../../../layouts/Page.astro';
 import localeStaticPaths from '../../../lib/localeStaticPaths';
 import translate from '../../../i18n/translate';
 import tFurthsettins from '../../../i18n/translations/pages/furthsettins';
@@ -12,17 +12,15 @@ const locale = Astro.params.locale as Locale;
 const t = translate(locale);
 ---
 
-<Layout locale={locale} title={ t(tFurthsettins, 'title') }>
-  <main id="main">
-    <h1>Furthsettins</h1>
+<Page locale={locale} title={ t(tFurthsettins, 'title') }>
+  <h1>Furthsettins</h1>
 
-    <ul class="publications-gallery">
-      <li>
-        <a href="furthsettins/lallans" class="link">
-          <img src="/public/images/furthsettins/lallans.png" class="publications-gallery__image" />
-          <p class="publications-gallery__title">{ t(tSite, 'lallans') }</p>
-        </a>
-      </li>
-    </ul>
-  </main>
-</Layout>
\ No newline at end of file
+  <ul class="publications-gallery">
+    <li>
+      <a href="furthsettins/lallans" class="link">
+        <img src="/public/images/furthsettins/lallans.png" class="publications-gallery__image" />
+        <p class="publications-gallery__title">{ t(tSite, 'lallans') }</p>
+      </a>
+    </li>
+  </ul>
+</Page>
\ No newline at end of file
diff --git a/src/pages/[locale]/furthsettins/lallans/[issueNumber].astro b/src/pages/[locale]/furthsettins/lallans/[issueNumber].astro
index c5d8088..78afe1f 100644
--- a/src/pages/[locale]/furthsettins/lallans/[issueNumber].astro
+++ b/src/pages/[locale]/furthsettins/lallans/[issueNumber].astro
@@ -1,5 +1,5 @@
 ---
-import Layout from '../../../../layouts/Layout.astro';
+import Page from '../../../../layouts/Page.astro';
 import localeStaticPaths from '../../../../lib/localeStaticPaths';
 import translate from '../../../../i18n/translate';
 import tFurthsettins from '../../../../i18n/translations/pages/furthsettins';
@@ -23,9 +23,7 @@ const issueNumber = new Number(Astro.params.issueNumber).valueOf() as LallansIss
 const issue = await getLallansIssue[issueNumber]();
 ---
 
-<Layout locale={locale} title={ t(tFurthsettins, 'title') }>
-  <main id="main">
-    <h1>{ t(tSite, 'lallans') } { issueNumber }</h1>
-    <p>{ issue.description[locale] }</p>
-  </main>
-</Layout>
\ No newline at end of file
+<Page locale={locale} title={ t(tFurthsettins, 'title') }>
+  <h1>{ t(tSite, 'lallans') } { issueNumber }</h1>
+  <p>{ issue.description[locale] }</p>
+</Page>
\ No newline at end of file
diff --git a/src/pages/[locale]/furthsettins/lallans/index.astro b/src/pages/[locale]/furthsettins/lallans/index.astro
index c7d8970..0c10b99 100644
--- a/src/pages/[locale]/furthsettins/lallans/index.astro
+++ b/src/pages/[locale]/furthsettins/lallans/index.astro
@@ -1,5 +1,5 @@
 ---
-import Layout from '../../../../layouts/Layout.astro';
+import Page from '../../../../layouts/Page.astro';
 import localeStaticPaths from '../..//../../lib/localeStaticPaths';
 import translate from '../../../../i18n/translate';
 import tFurthsettins from '../../../../i18n/translations/pages/furthsettins';
@@ -12,10 +12,8 @@ const locale = Astro.params.locale as Locale;
 const t = translate(locale);
 ---
 
-<Layout locale={locale} title={ t(tFurthsettins, 'title') }>
-  <main id="main">
-    <h1>Lallans</h1>
+<Page locale={locale} title={ t(tFurthsettins, 'title') }>
+  <h1>Lallans</h1>
 
-    <LallansIssuesGallery />
-  </main>
-</Layout>
\ No newline at end of file
+  <LallansIssuesGallery />
+</Page>
\ No newline at end of file
diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro
index 7552cd0..5f9ab7a 100644
--- a/src/pages/[locale]/index.astro
+++ b/src/pages/[locale]/index.astro
@@ -1,5 +1,5 @@
 ---
-import Layout from '../../layouts/Layout.astro';
+import Page from '../../layouts/Page.astro';
 import localeStaticPaths from '../../lib/localeStaticPaths';
 import translate from '../../i18n/translate';
 import site from '../../i18n/translations/site';
@@ -12,49 +12,47 @@ const locale = Astro.params.locale as Locale;
 const t = translate(locale);
 ---
 
-<Layout locale={locale} title={ t(home, 'title') }>
-  <main id="main">
-    <section>
-      <h1 class="title">{ t(site, 'title') }</h1>
-      <h1>Tap-level heidin</h1>
-      <h2>Seicont-level heidin</h2>
-      <h3>Third-level heidin</h3>
-      <h4>Fowert-level heidin</h4>
-      <p>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
-        labore et dolore magna aliqua.
-      </p>
-      <a class="link" href="#">Lairn mair!</a>
-      <p>
-        Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
-        commodo consequat.
-      </p>
-      <button class="btn">Dae somethin excitin...</button>
-      <p>
-        Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-        pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
-        mollit anim id est laborum.
-      </p>
-    </section>
-    <section>
-      <h2>Seicont-level heidin</h2>
-      <h3>Third-level heidin</h3>
-      <h4>Fowert-level heidin</h4>
-      <p>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
-        labore et dolore magna aliqua.
-      </p>
-      <a class="link" href="#">Lairn mair!</a>
-      <p>
-        Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
-        commodo consequat.
-      </p>
-      <button class="btn">Dae somethin excitin...</button>
-      <p>
-        Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-        pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
-        mollit anim id est laborum.
-      </p>
-    </section>
-  </main>
-</Layout>
+<Page locale={locale} title={ t(home, 'title') }>
+  <section>
+    <h1 class="title">{ t(site, 'title') }</h1>
+    <h1>Tap-level heidin</h1>
+    <h2>Seicont-level heidin</h2>
+    <h3>Third-level heidin</h3>
+    <h4>Fowert-level heidin</h4>
+    <p>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
+      labore et dolore magna aliqua.
+    </p>
+    <a class="link" href="#">Lairn mair!</a>
+    <p>
+      Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
+      commodo consequat.
+    </p>
+    <button class="btn">Dae somethin excitin...</button>
+    <p>
+      Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+      pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
+      mollit anim id est laborum.
+    </p>
+  </section>
+  <section>
+    <h2>Seicont-level heidin</h2>
+    <h3>Third-level heidin</h3>
+    <h4>Fowert-level heidin</h4>
+    <p>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
+      labore et dolore magna aliqua.
+    </p>
+    <a class="link" href="#">Lairn mair!</a>
+    <p>
+      Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
+      commodo consequat.
+    </p>
+    <button class="btn">Dae somethin excitin...</button>
+    <p>
+      Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+      pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
+      mollit anim id est laborum.
+    </p>
+  </section>
+</Page>
-- 
cgit v1.2.3