Merge branch 'staging' of https://github.com/joeacarstairs/lallans-wabsteid-astro into staging

8 files changed, 67 insertions, 14 deletions

diff --git a/README.md b/README.md
index b81517d..ba423b7 100644
--- a/README.md
+++ b/README.md
@@ -35,13 +35,13 @@ git clone https://github.com/joeacarstairs/lallans-wabsteid-astro.git \
 2. Make a suitably named branch on your fork.
 3. Make your desired changes (see sections below for common cases).
 4. Commit and push them on your branch.
-5. Make a Pull Request to merge your changes into `joeacarstairs/deployment-staging`.
+5. Make a Pull Request to merge your changes into `joeacarstairs/staging`.
 6. A code owner (probably the Scots Language Society Webmaster) will review your Pull Request, ask
-   for any necessary changes, and when satisfied, merge it into `joeacarstairs/deployment-staging`.
+   for any necessary changes, and when satisfied, merge it into `joeacarstairs/staging`.
    (This will update the [staging deployment](#cicd) on
    [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org).)
-7. Code owners will merge `joeacarstairs/deployment-staging` into
-   `joeacarstairs/deployment-production` at their discretion. (This will update the production
+7. Code owners will merge `joeacarstairs/staging` into
+   `joeacarstairs/production` at their discretion. (This will update the production
    deployment on [scotsleidassocie.org](https://scotsleidassocie.org).)
 
 ### Coding style
@@ -140,13 +140,13 @@ just need to make commits to the repo to see them deployed automagically.
 Ideally, we should check everything's working on deployment before everyone on the internet starts
 looking at it. For that reason, we have a staging deployment at
 [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org). To update the staging
-deployment, simply commit to `deployment-staging` by making a Pull Request and getting it approved
+deployment, simply commit to `staging` by making a Pull Request and getting it approved
 by a code owner and then merged.
 
-To update production, you'll want to first merge your changes into `deployment-staging` by making a
+To update production, you'll want to first merge your changes into `staging` by making a
 Pull Request and getting it approved and merged. Once you've done that, given it five minutes to
 deploy, and you've checked that everything looks good on
 [staging.scotsleidassocie.org](https://staging.scotsleidassocie.org),
-[make a Pull Request to merge deployment-staging into deployment-production](https://github.com/joeacarstairs/lallans-wabsteid-astro/compare/deployment-production...deployment-staging).
+[make a Pull Request to merge staging into production](https://github.com/joeacarstairs/lallans-wabsteid-astro/compare/production...staging).
 Once that Pull Request is approved by a code owner, merge it in and it should update production in
 under five minutes.
diff --git a/src/data/lallans/index.ts b/src/data/lallans/index.ts
index db443d2..bdb09ad 100644
--- a/src/data/lallans/index.ts
+++ b/src/data/lallans/index.ts
@@ -78,6 +78,7 @@ export const getLallansIssue: LallansIssueGetterTable = {
   100: async () => (await import('./issue100')).default,
   101: async () => (await import('./issue101')).default,
   102: async () => (await import('./issue102')).default,
+  104: async () => (await import('./issue104')).default,
 };
 
 export type LallansIssueGetterTable = { [key in LallansIssueNumber]: () => Promise<LallansIssue> };
diff --git a/src/data/lallans/issue104.ts b/src/data/lallans/issue104.ts
new file mode 100644
index 0000000..55a22d1
--- /dev/null
+++ b/src/data/lallans/issue104.ts
@@ -0,0 +1,46 @@
+import img192w from '$images/lallans/issue104-192w.jpg';
+import img274w from '$images/lallans/issue104-274w.jpg';
+import type LallansIssue from '$types/LallansIssue';
+
+const issue: LallansIssue = {
+  issueNumber: 104,
+  img: {
+    width192: img192w,
+    width274: img274w,
+  },
+  issueName: 'Lammas 2024',
+  price: '10.00',
+  uploadDate: '2024-06-12',
+  description: {
+    'en-GB': 'The hundred-and-fourth issue of the Lallans magazine.',
+    sco: 'The hunner-an-fowert issue o the Lallans magazine.',
+  },
+  contributors: [
+    'Brendan McCluskey',
+    'Braxfield',
+    'Craig Aitchison',
+    'Tracy Ann Harvey',
+    'Tom Ellett',
+    'Hugh McMillan',
+    'Jim Aitken',
+    'Lynn Valentine',
+    'Gavin MacDougall',
+    'David Bleiman',
+    'Dauvit Horsbroch',
+    'Iain WD Forde',
+    'Hugh Pyper',
+    'Maureen Sangster',
+    'Stuart McHardy',
+    'Tom Hubbard',
+    'Andrew Matthews',
+    'Elaine Morton',
+    'Kevin Connelly',
+    'George T Watt',
+    'WS Milne',
+    'Andrew Urquhart',
+    'Moira Dalgetty',
+    'Olive Ritchie',
+  ],
+};
+
+export default issue;
diff --git a/src/images/lallans/issue104-192w.jpg b/src/images/lallans/issue104-192w.jpg
new file mode 100644
index 0000000..08ba533
--- /dev/null
+++ b/src/images/lallans/issue104-192w.jpg
diff --git a/src/images/lallans/issue104-274w.jpg b/src/images/lallans/issue104-274w.jpg
new file mode 100644
index 0000000..f1ce5e8
--- /dev/null
+++ b/src/images/lallans/issue104-274w.jpg
diff --git a/src/images/lallans/issue104.png b/src/images/lallans/issue104.png
new file mode 100644
index 0000000..9f3a9a9
--- /dev/null
+++ b/src/images/lallans/issue104.png
diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro
index d930c20..9f994a2 100644
--- a/src/pages/[locale]/index.astro
+++ b/src/pages/[locale]/index.astro
@@ -20,12 +20,17 @@ const mostRecentNewsItem = await getMostRecentNewsItem(locale);
 ---
 
 <Page title={t(tPage, { key: 'title' })}>
-  <section>
-    <h2 set:html={t(tPage, { key: 'submit' })} />
-    <p set:html={t(tPage, { key: 'submit-para-1' })} />
-    <p set:html={t(tPage, { key: 'submit-para-2' })} />
-    <p set:html={t(tPage, { key: 'submit-para-3' })} />
-  </section>
+  <!--
+    Lallans 105 is leukin fair full the nou. Ance Lallans 105 is out we'll
+    stert encouragin submeissions for 106.
+
+    <section>
+      <h2 set:html={t(tPage, { key: 'submit' })} />
+      <p set:html={t(tPage, { key: 'submit-para-1' })} />
+      <p set:html={t(tPage, { key: 'submit-para-2' })} />
+      <p set:html={t(tPage, { key: 'submit-para-3' })} />
+    </section>
+  -->
   <section>
     <h2 class="grid-span-6" set:html={t(tPage, { key: 'news' })} />
     <NewsIndex newsItems={mostRecentNewsItem ? [mostRecentNewsItem] : []} headingLevel="h3" />
diff --git a/src/types/LallansIssueNumber.d.ts b/src/types/LallansIssueNumber.d.ts
index 52dc35a..25e39e9 100644
--- a/src/types/LallansIssueNumber.d.ts
+++ b/src/types/LallansIssueNumber.d.ts
@@ -69,6 +69,7 @@ type LallansIssueNumber =
   | 99
   | 100
   | 101
-  | 102;
+  | 102
+  | 104;
 
 export default LallansIssueNumber;