From 1a959e206f6ba4f8eb7b3a9ff3b8539db6beaed0 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:44:45 +0100 Subject: Adds original cover image --- src/images/lallans/issue104.png | Bin 0 -> 3355948 bytes src/types/LallansIssueNumber.d.ts | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/images/lallans/issue104.png diff --git a/src/images/lallans/issue104.png b/src/images/lallans/issue104.png new file mode 100644 index 0000000..9f3a9a9 Binary files /dev/null and b/src/images/lallans/issue104.png differ 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; -- cgit v1.2.3 From c7d5fcbc647fa50dd01d3df4307ed46ee4207caf Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:44:59 +0100 Subject: Adds 192w cover image --- src/images/lallans/issue104-192w.jpg | Bin 0 -> 18909 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/images/lallans/issue104-192w.jpg diff --git a/src/images/lallans/issue104-192w.jpg b/src/images/lallans/issue104-192w.jpg new file mode 100644 index 0000000..08ba533 Binary files /dev/null and b/src/images/lallans/issue104-192w.jpg differ -- cgit v1.2.3 From 4c10e112f9a86150028e178bc4d5fd6b416f300b Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:46:19 +0100 Subject: Adds 274w cover image --- src/images/lallans/issue104-274w.jpg | Bin 0 -> 34516 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/images/lallans/issue104-274w.jpg diff --git a/src/images/lallans/issue104-274w.jpg b/src/images/lallans/issue104-274w.jpg new file mode 100644 index 0000000..f1ce5e8 Binary files /dev/null and b/src/images/lallans/issue104-274w.jpg differ -- cgit v1.2.3 From e297cdb1b0ccd39de00b39c0548a0be4b05372eb Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:52:26 +0100 Subject: Adds issue data --- src/data/lallans/index.ts | 1 + src/data/lallans/issue104.ts | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/data/lallans/issue104.ts 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 }; 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; -- cgit v1.2.3 From bba7c5b5df8f993a26a1a6aa12193272af4c8d4d Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:56:58 +0100 Subject: README fixes (random and unrelated) --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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. -- cgit v1.2.3 From e5159282f91cec9b77b9429f8ff199d2ced5e7c9 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sun, 23 Jun 2024 17:24:16 +0100 Subject: Quit encouraging entries to Lallans 105 --- src/pages/[locale]/index.astro | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) 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); --- -
-

-

-

-

-

+

-- cgit v1.2.3