Merge pull request #122 from joeacarstairs/staging

discontinue furthsettins

16 files changed, 26 insertions, 227 deletions

diff --git a/scss/modules/_nav.lg.scss b/scss/modules/_nav.lg.scss
index c47a685..234bbd8 100644
--- a/scss/modules/_nav.lg.scss
+++ b/scss/modules/_nav.lg.scss
@@ -5,11 +5,3 @@
   padding-inline: max(10%, calc((100% - var(--max-width-all-content)) / 2));
   gap: var(--spacing-inline-xs);
 }
-
-.nav__nav-links li:nth-child(4) {
-  grid-column: 8 / 10;
-}
-
-.nav__nav-links li:nth-child(5) {
-  grid-column: 10 / 12;
-}
diff --git a/scss/modules/_nav.md.scss b/scss/modules/_nav.md.scss
index 4b09cf7..f884c5c 100644
--- a/scss/modules/_nav.md.scss
+++ b/scss/modules/_nav.md.scss
@@ -8,15 +8,11 @@
   }
 
   &:nth-child(3) {
-    grid-column: 5 / 8;
+    grid-column: 5 / 7;
   }
 
   &:nth-child(4) {
-    grid-column: 1 / 3;
-  }
-
-  &:nth-child(5) {
-    grid-column: 3 / 5;
+    grid-column: 7 / 9;
   }
 }
 
diff --git a/scss/modules/_nav.sm.scss b/scss/modules/_nav.sm.scss
index 226df3b..50d0e9b 100644
--- a/scss/modules/_nav.sm.scss
+++ b/scss/modules/_nav.sm.scss
@@ -24,14 +24,10 @@
   }
 
   &:nth-child(3) {
-    grid-column: 6 / 9;
+    grid-column: 6 / 8;
   }
 
   &:nth-child(4) {
     grid-column: 1 / 3;
   }
-
-  &:nth-child(5) {
-    grid-column: 3 / 5;
-  }
 }
diff --git a/scss/modules/_nav.xs.scss b/scss/modules/_nav.xs.scss
index 708652c..f65a527 100644
--- a/scss/modules/_nav.xs.scss
+++ b/scss/modules/_nav.xs.scss
@@ -7,13 +7,9 @@
 }
 
 .nav__nav-links li:nth-child(3) {
-  grid-column: 1 / 4;
-}
-
-.nav__nav-links li:nth-child(4) {
   grid-column: 1 / 3;
 }
 
-.nav__nav-links li:nth-child(5) {
+.nav__nav-links li:nth-child(4) {
   grid-column: 3 / 5;
 }
diff --git a/src/components/Navbar/NavLinks.astro b/src/components/Navbar/NavLinks.astro
index 2343a42..a96dc48 100644
--- a/src/components/Navbar/NavLinks.astro
+++ b/src/components/Navbar/NavLinks.astro
@@ -3,7 +3,6 @@ import { getLocaleFromPathOrDefault } from '$lib/getLocaleFromPath';
 import translate from '$i18n/translate';
 import tContact from '$i18n/translations/pages/contact';
 import tNews from '$i18n/translations/pages/news';
-import tFurthsettins from '$i18n/translations/pages/furthsettins';
 import tJyne from '$i18n/translations/pages/jyne';
 import tSubmit from '$i18n/translations/pages/submit';
 
@@ -19,9 +18,6 @@ const t = translate(locale);
     <a class="btn" href={`/${locale}/submit`}>{t(tSubmit, { key: 'title' })}</a>
   </li>
   <li>
-    <a class="btn" href={`/${locale}/furthsettins`}>{t(tFurthsettins, { key: 'title' })}</a>
-  </li>
-  <li>
     <a class="btn" href={`/${locale}/jyne`}>{t(tJyne, { key: 'title' })}</a>
   </li>
   <li>
diff --git a/src/data/committee.ts b/src/data/committee.ts
index f384d4f..5f935ab 100644
--- a/src/data/committee.ts
+++ b/src/data/committee.ts
@@ -232,13 +232,13 @@ const committee: CommitteeMember[] = [
         George T Watt is a writer in Scots poesie, cutty tales and airticles.
         This cheil haes been published in mony anthologies an magazines as weel
         as Lallans. He haes produced seiveral recordings fur
-        <a href="/en-GB/furthsettins/scotsoun">Scotsoun</a> anaa.
+        Scotsoun anaa.
       `,
       'en-GB': `
         George T Watt is a writer in Scots poetry, short stories and articles.
         He has been published in many anthologies and magazines as well as
         Lallans. He has also produced several recordings for
-        <a href="/en-GB/furthsettins/scotsoun">Scotsoun</a>.
+        Scotsoun.
       `,
     },
     img: {
diff --git a/src/i18n/translations/pages/furthsettins.ts b/src/i18n/translations/pages/furthsettins.ts
index a686529..c745fc7 100644
--- a/src/i18n/translations/pages/furthsettins.ts
+++ b/src/i18n/translations/pages/furthsettins.ts
@@ -2,8 +2,20 @@ import type { TranslationsDictionary } from '$types/TranslationsDictionary';
 
 const tPage = {
   title: {
-    sco: () => 'Furthsettins',
-    'en-GB': () => 'Publications',
+    sco: () => 'Furthsettins: discontinued',
+    'en-GB': () => 'Publications: discontinued',
+  },
+  para: {
+    sco: () => `
+      We uisst tae sell back issues o Lallans and Scotsoun CDs frae this page,
+      but this isnae feasible ony mair. We're leukin at the options for a new
+      wey o distributin thir furthsettins.
+    `,
+    'en-GB': () => `
+      We used to sell back issues of Lallans and Scotsoun CDs from this page,
+      but this isn't feasible any more. We're looking at the options for a new
+      way of distributing these publications.
+    `,
   },
 };
 
diff --git a/src/i18n/translations/pages/home.ts b/src/i18n/translations/pages/home.ts
index 1c4eda4..bb2f86d 100644
--- a/src/i18n/translations/pages/home.ts
+++ b/src/i18n/translations/pages/home.ts
@@ -77,20 +77,15 @@ const tPage = {
     sco: () => `
       We ar ane o the foremaist furthsetters o new Scots leitratur.
       Oor maist important furthsettins ar
-      <a href="/sco/furthsettins/lallans">Lallans</a> an
-      <a href="/sco/furthsettins/scotsoun">Scotsoun</a>.
+      Lallans an Scotsoun.
     `,
     'en-GB': () => `
       We are one of the leading publishers of new Scots literature.
       Our most important publications are
-      <a href="/en-GB/furthsettins/lallans">Lallans</a> and
-      <a href="/en-GB/furthsettins/scotsoun">Scotsoun</a>.
+      Lallans and
+      Scotsoun.
     `,
   },
-  'aw-furthsettins': {
-    sco: () => 'Aw furthsettins',
-    'en-GB': () => 'All publications',
-  },
 };
 
 type Raw = typeof tPage;
diff --git a/src/pages/[locale]/furthsettins/lallans/index.astro b/src/pages/[locale]/furthsettins.astro
index a4b6d70..7d31430 100644
--- a/src/pages/[locale]/furthsettins/lallans/index.astro
+++ b/src/pages/[locale]/furthsettins.astro
@@ -1,10 +1,9 @@
 ---
+import translate from '$i18n/translate';
+import tPage from '$i18n/translations/pages/furthsettins';
 import Page from '$layouts/Page.astro';
 import localeStaticPaths from '$lib/localeStaticPaths';
-import translate from '$i18n/translate';
-import tPage from '$i18n/translations/pages/lallansGallery';
 import type Locale from '$types/Locale';
-import LallansIssuesGallery from '$components/LallansIssuesGallery.astro';
 
 export async function getStaticPaths() {
   return localeStaticPaths;
@@ -17,7 +16,6 @@ const t = translate(locale);
 <Page title={t(tPage, { key: 'title' })}>
   <section>
     <h1>{t(tPage, { key: 'title' })}</h1>
-    <p set:html={t(tPage, { key: 'about-lallans' })} />
-    <LallansIssuesGallery />
+    <p set:html={t(tPage, { key: 'para' })} />
   </section>
 </Page>
diff --git a/src/pages/[locale]/furthsettins/index.astro b/src/pages/[locale]/furthsettins/index.astro
deleted file mode 100644
index a053621..0000000
--- a/src/pages/[locale]/furthsettins/index.astro
+++ /dev/null
@@ -1,40 +0,0 @@
----
-import { Image } from 'astro:assets';
-import Page from '$layouts/Page.astro';
-import localeStaticPaths from '$lib/localeStaticPaths';
-import translate from '$i18n/translate';
-import tFurthsettins from '$i18n/translations/pages/furthsettins';
-import tSite from '$i18n/translations/site';
-import type Locale from '$types/Locale';
-import relativePath from '$lib/relativePath';
-import lallansImg from '$images/furthsettins/lallans-192w.jpg';
-import scotsounImg from '$images/furthsettins/scotsoun-192w.jpg';
-
-export async function getStaticPaths() {
-  return localeStaticPaths;
-}
-
-const locale = Astro.params.locale as Locale;
-const t = translate(locale);
----
-
-<Page title={t(tFurthsettins, { key: 'title' })}>
-  <section>
-    <h1>{t(tFurthsettins, { key: 'title' })}</h1>
-
-    <ul class="link-gallery link-gallery--furthsettins">
-      <li>
-        <a href={relativePath(Astro.url.pathname, 'lallans')} class="link-gallery__container">
-          <Image src={lallansImg} alt="" />
-          <p class="link-gallery__title">{t(tSite, { key: 'lallans' })}</p>
-        </a>
-      </li>
-      <li>
-        <a href={relativePath(Astro.url.pathname, 'scotsoun')} class="link-gallery__container">
-          <Image src={scotsounImg} alt="" />
-          <p class="link-gallery__title">{t(tSite, { key: 'scotsoun' })}</p>
-        </a>
-      </li>
-    </ul>
-  </section>
-</Page>
diff --git a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/index.astro b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/index.astro
deleted file mode 100644
index 82fabf0..0000000
--- a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/index.astro
+++ /dev/null
@@ -1,27 +0,0 @@
----
-import Page from '$layouts/Page.astro';
-import localeStaticPaths from '$lib/localeStaticPaths';
-import translate from '$i18n/translate';
-import tFurthsettins from '$i18n/translations/pages/furthsettins';
-import type Locale from '$types/Locale';
-import { getLallansIssue } from '$data/lallans';
-import type LallansIssueNumber from '$types/LallansIssueNumber';
-import LallansIssue from '$components/LallansIssue.astro';
-
-export async function getStaticPaths() {
-  const lallansIssueNumbers = Object.keys(getLallansIssue) as `${LallansIssueNumber}`[];
-  return lallansIssueNumbers.flatMap((n) =>
-    localeStaticPaths.map((p) => ({ ...p, params: { ...p.params, issueNumber: n } }))
-  );
-}
-
-const locale = Astro.params.locale as Locale;
-const t = translate(locale);
-const issueNumber = new Number(Astro.params.issueNumber).valueOf() as LallansIssueNumber;
-const issue = await getLallansIssue[issueNumber]();
----
-
-<Page title={t(tFurthsettins, { key: 'title' })}>
-  <LallansIssue issue={issue} />
-  <script src="$scripts/wc/paypal-product-buttons.ts"></script>
-</Page>
diff --git a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro
deleted file mode 100644
index f0b9512..0000000
--- a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro
+++ /dev/null
@@ -1,30 +0,0 @@
----
-import Page from '$layouts/Page.astro';
-import localeStaticPaths from '$lib/localeStaticPaths';
-import translate from '$i18n/translate';
-import tPage from '$i18n/translations/pages/lallansIssuePaymentSuccessConfirmation';
-import type Locale from '$types/Locale';
-import { getLallansIssue } from '$data/lallans';
-import type LallansIssueNumber from '$types/LallansIssueNumber';
-
-export async function getStaticPaths() {
-  const lallansIssueNumbers = Object.keys(getLallansIssue) as `${LallansIssueNumber}`[];
-  return lallansIssueNumbers.flatMap((n) =>
-    localeStaticPaths.map((p) => ({ ...p, params: { ...p.params, issueNumber: n } }))
-  );
-}
-
-const locale = Astro.params.locale as Locale;
-const t = translate(locale);
-const issueNumber = new Number(Astro.params.issueNumber).valueOf() as LallansIssueNumber;
----
-
-<Page title={t(tPage, { key: 'title' })}>
-  <section>
-    <h1>{t(tPage, { key: 'title' })}</h1>
-    <p>{t(tPage, { key: 'payment-confirmation-message', issueNumber: `${issueNumber}` })}</p>
-    <a href={`/${locale}/furthsettins/lallans/${issueNumber}`}>
-      {t(tPage, { key: 'back-button-text', issueNumber: `${issueNumber}` })}
-    </a>
-  </section>
-</Page>
diff --git a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/index.astro b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/index.astro
deleted file mode 100644
index 4244f70..0000000
--- a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/index.astro
+++ /dev/null
@@ -1,28 +0,0 @@
----
-import Page from '$layouts/Page.astro';
-import localeStaticPaths from '$lib/localeStaticPaths';
-import tPage from '$i18n/translations/pages/scotsounRelease';
-import translate from '$i18n/translate';
-import type Locale from '$types/Locale';
-import { getScotsoun } from '$data/scotsoun';
-import type ScotsounId from '$types/ScotsounId';
-import Scotsoun from '$components/Scotsoun.astro';
-
-export async function getStaticPaths() {
-  const scotsounIds = Object.keys(getScotsoun) as `${ScotsounId}`[];
-  return scotsounIds.flatMap((n) =>
-    localeStaticPaths.map((p) => ({ ...p, params: { ...p.params, scotsounId: n } }))
-  );
-}
-
-const locale = Astro.params.locale as Locale;
-const scotsounId = Astro.params.scotsounId as ScotsounId;
-const t = translate(locale);
-
-const scotsoun = await getScotsoun[scotsounId]();
----
-
-<Page title={t(tPage, { key: 'title', scotsounId, name: scotsoun.title })}>
-  <Scotsoun scotsoun={scotsoun} />
-  <script src="$scripts/wc/paypal-product-buttons.ts"></script>
-</Page>
diff --git a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro
deleted file mode 100644
index 9e152ee..0000000
--- a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro
+++ /dev/null
@@ -1,30 +0,0 @@
----
-import Page from '$layouts/Page.astro';
-import localeStaticPaths from '$lib/localeStaticPaths';
-import translate from '$i18n/translate';
-import tPage from '$i18n/translations/pages/scotsounPaymentSuccessConfirmation';
-import type Locale from '$types/Locale';
-import { getScotsoun } from '$data/scotsoun';
-import type ScotsounId from '$types/ScotsounId';
-
-export async function getStaticPaths() {
-  const scotsounIds = Object.keys(getScotsoun) as `${ScotsounId}`[];
-  return scotsounIds.flatMap((n) =>
-    localeStaticPaths.map((p) => ({ ...p, params: { ...p.params, scotsounId: n } }))
-  );
-}
-
-const locale = Astro.params.locale as Locale;
-const scotsounId = Astro.params.scotsounId as ScotsounId;
-const t = translate(locale);
----
-
-<Page title={t(tPage, { key: 'title' })}>
-  <section>
-    <h1>{t(tPage, { key: 'title' })}</h1>
-    <p>{t(tPage, { key: 'payment-confirmation-message', scotsounId })}</p>
-    <a href={`/${locale}/furthsettins/scotsoun/${scotsounId}`}>
-      {t(tPage, { key: 'back-button-text', scotsounId })}
-    </a>
-  </section>
-</Page>
diff --git a/src/pages/[locale]/furthsettins/scotsoun/index.astro b/src/pages/[locale]/furthsettins/scotsoun/index.astro
deleted file mode 100644
index 26f1f13..0000000
--- a/src/pages/[locale]/furthsettins/scotsoun/index.astro
+++ /dev/null
@@ -1,23 +0,0 @@
----
-import Page from '$layouts/Page.astro';
-import localeStaticPaths from '$lib/localeStaticPaths';
-import translate from '$i18n/translate';
-import tPage from '$i18n/translations/pages/scotsounGallery';
-import type Locale from '$types/Locale';
-import ScotsounCdGallery from '$components/ScotsounCdGallery.astro';
-
-export async function getStaticPaths() {
-  return localeStaticPaths;
-}
-
-const locale = Astro.params.locale as Locale;
-const t = translate(locale);
----
-
-<Page title={t(tPage, { key: 'title' })}>
-  <section>
-    <h1>Scotsoun</h1>
-    <p>{t(tPage, { key: 'about-scotsoun' })}</p>
-    <ScotsounCdGallery />
-  </section>
-</Page>
diff --git a/src/pages/[locale]/index.astro b/src/pages/[locale]/index.astro
index 796bf59..7846fd8 100644
--- a/src/pages/[locale]/index.astro
+++ b/src/pages/[locale]/index.astro
@@ -4,7 +4,6 @@ import localeStaticPaths from '$lib/localeStaticPaths';
 import translate from '$i18n/translate';
 import tPage from '$i18n/translations/pages/home';
 import type Locale from '$types/Locale';
-import Button from '$components/Button.astro';
 import CommitteeList from '$components/CommitteeList/CommitteeList.astro';
 
 export async function getStaticPaths() {
@@ -28,8 +27,5 @@ const t = translate(locale);
   <section>
     <h2 set:html={t(tPage, { key: 'furthsettins' })} />
     <p set:html={t(tPage, { key: 'furthsettins-para' })} />
-    <Button classNames="grid-span-3 grid-prose-end" href={`/${locale}/furthsettins`}>
-      {t(tPage, { key: 'aw-furthsettins' })} ▶
-    </Button>
   </section>
 </Page>