From d1d7e9c5bdc169149ccf0f5605b73a3921c111c8 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+joeacarstairs@users.noreply.github.com> Date: Thu, 1 Feb 2024 22:30:29 +0000 Subject: Updates from staging (#79) * Adds no-breadcrumbs variant of the navbar (#75) * README: replaces 'Sycamost' with 'joeacarstairs' (#74) * Design system board (#77) * Simplifies theme selector syntax * Adds .dark theming class * Adds design system page (dev env only) * Closes the Sangschaw (#78) * Closes the Sangschaw * Fixes syntax --------- Co-authored-by: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> --------- Co-authored-by: Joe Carstairs <118172583+jcarstairs-scottlogic@users.noreply.github.com> Co-authored-by: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> --- src/components/Navbar/Navbar.astro | 8 +- src/i18n/translations/pages/home.ts | 26 ++--- src/layouts/Layout.astro | 5 +- src/layouts/Page.astro | 5 +- src/pages/[designSystem].astro | 190 ++++++++++++++++++++++++++++++++++++ src/pages/[locale]/index.astro | 1 + 6 files changed, 218 insertions(+), 17 deletions(-) create mode 100644 src/pages/[designSystem].astro (limited to 'src') diff --git a/src/components/Navbar/Navbar.astro b/src/components/Navbar/Navbar.astro index 4fa05a9..0722f01 100644 --- a/src/components/Navbar/Navbar.astro +++ b/src/components/Navbar/Navbar.astro @@ -3,13 +3,19 @@ import Breadcrumbs from './Breadcrumbs.astro'; import SwitchLanguageLink from '../SwitchLanguageLink.astro'; import NavLinks from './NavLinks.astro'; import Logo from './Logo.astro'; + +interface Props { + noBreadcrumbs?: boolean; +} + +const { noBreadcrumbs } = Astro.props; --- diff --git a/src/i18n/translations/pages/home.ts b/src/i18n/translations/pages/home.ts index 6628682..a3bafe9 100644 --- a/src/i18n/translations/pages/home.ts +++ b/src/i18n/translations/pages/home.ts @@ -6,30 +6,24 @@ const tPage = { 'en-GB': () => 'Home', }, submit: { - sco: () => 'Sang\u00adschaw apen for submeissions', - 'en-GB': () => 'Sang\u00adschaw open for submissions', + sco: () => 'Lallans 104 apen for sub\u00admeissions', + 'en-GB': () => 'Lallans 104 open for sub\u00admissions', }, 'submit-para-1': { sco: () => ` - We ar acceptin submeissions til our annual Scots scrievin competeition, - the Sangschaw, until the 31st o Januar 2024. + We ar acceptin submeissions til Lallans 104. `, 'en-GB': () => ` - We are accepting submissions to our annual Scots writing competition, the - Sangschaw, until the 31st of January 2024. + We are accepting submissions to Lallans 104. `, }, 'submit-para-2': { sco: () => ` - Aince ye’ve read the submeission criteria in - Eiks an Ens 31, send - your submeissions til + Send us your cuttie tales, poesie and drama til lallans@hotmail.co.uk. `, 'en-GB': () => ` - Once you’ve read the submission criteria in - Eiks an Ens 31, send - your submissions to + Send us your short stories, poetry and drama to lallans@hotmail.co.uk. `, }, @@ -43,6 +37,14 @@ const tPage = { submitting for years or you’re a first-time writer! `, }, + 'sangschaw-closed': { + sco: () => ` + This year’s Sangschaw competeition closed on the 31st o Januar 2024. + `, + 'en-GB': () => ` + This year’s Sangschaw competition closed on the 31st of January 2024. + `, + }, news: { sco: () => 'Recent News', 'en-GB': () => 'Recent News', diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index a5315be..938bfe5 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -10,9 +10,10 @@ import type Locale from '$types/Locale'; interface Props { title: string; + noBreadcrumbs?: boolean; } -const { title } = Astro.props; +const { noBreadcrumbs, title } = Astro.props; const locale = getLocaleFromPathOrDefault(Astro.url.pathname); const t = translate(locale); @@ -55,7 +56,7 @@ function qualifiedLocalisedPath(newLocale: Locale) { - +