From 6f61e056ae2c970ec17a2808e3372f121e948e8d Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Fri, 13 Oct 2023 20:07:29 +0100 Subject: Optimises Lallans images --- src/components/LallansIssue.astro | 3 ++- src/components/LallansIssuesGallery.astro | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/components') diff --git a/src/components/LallansIssue.astro b/src/components/LallansIssue.astro index 3b58124..c8bc6eb 100644 --- a/src/components/LallansIssue.astro +++ b/src/components/LallansIssue.astro @@ -4,6 +4,7 @@ import tSite from '$i18n/translations/site'; import { getLocaleFromPathOrThrow } from '$lib/getLocaleFromPath'; import relativePath from '$lib/relativePath'; import type LallansIssue from '$types/LallansIssue'; +import { Image } from 'astro:assets'; import LallansIssueContributions from './LallansIssueContributions.astro'; import LallansIssueContributors from './LallansIssueContributors.astro'; import PayPalButtons from './PayPalButtons.astro'; @@ -25,7 +26,7 @@ const t = translate(locale);
- + { - issues.map((issue) => ( + issues.map(async (issue) => (
  • - +

    Lallans {issue.issueNumber} | {issue.issueName}

    -- cgit v1.2.3 From 8b2d91cb1cdff722bb4913c8f023c6cd16801e5c Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Fri, 13 Oct 2023 20:47:26 +0100 Subject: Optimises Scotsoun images --- src/components/Scotsoun.astro | 3 ++- src/components/ScotsounCdGallery.astro | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/components') diff --git a/src/components/Scotsoun.astro b/src/components/Scotsoun.astro index 594b8c9..bbf9730 100644 --- a/src/components/Scotsoun.astro +++ b/src/components/Scotsoun.astro @@ -1,4 +1,5 @@ --- +import { Image } from 'astro:assets'; import translate from '$i18n/translate'; import tSite from '$i18n/translations/site'; import tComponent from '$i18n/translations/components/scotsoun'; @@ -25,7 +26,7 @@ const t = translate(locale); {scotsoun?.author &&

    {t(tSite, { key: 'by' }) + ' ' + scotsoun.author}

    }
    - + - +

    {scotsounItem.title}
    • -- cgit v1.2.3 From 796fdeed465f8a4f9d4aaaaf9ddf448f91e901e6 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Fri, 13 Oct 2023 21:26:13 +0100 Subject: Pulls out CommitteeList component --- src/components/CommitteeList/CommitteeList.astro | 8 +++++ .../CommitteeList/CommitteeListItem.astro | 39 ++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/components/CommitteeList/CommitteeList.astro create mode 100644 src/components/CommitteeList/CommitteeListItem.astro (limited to 'src/components') diff --git a/src/components/CommitteeList/CommitteeList.astro b/src/components/CommitteeList/CommitteeList.astro new file mode 100644 index 0000000..f576c9a --- /dev/null +++ b/src/components/CommitteeList/CommitteeList.astro @@ -0,0 +1,8 @@ +--- +import committee from '$data/committee'; +import CommitteeListItem from './CommitteeListItem.astro'; +--- + + diff --git a/src/components/CommitteeList/CommitteeListItem.astro b/src/components/CommitteeList/CommitteeListItem.astro new file mode 100644 index 0000000..d026047 --- /dev/null +++ b/src/components/CommitteeList/CommitteeListItem.astro @@ -0,0 +1,39 @@ +--- +import CommitteeRole from '$enums/CommitteeRole'; +import tRole from '$i18n/translations/enums/committeeRole'; +import translate from '$i18n/translate'; +import type { CommitteeMember } from '$types/CommitteeMember'; +import type Locale from '$types/Locale'; + +interface Props { + committeeMember: CommitteeMember; +} + +const { committeeMember } = Astro.props; + +const locale = Astro.params.locale as Locale; + +const t = translate(locale); +--- + +
  • + { + committeeMember.img && ( + + ) + } +
    +

    + {committeeMember.name} + { + committeeMember.roles.length > 0 && ( + + |{' '} + {committeeMember.roles.map((role) => t(tRole, { key: CommitteeRole[role] })).join(', ')} + + ) + } +

    + {committeeMember.bio &&

    } +

    +
    • -- cgit v1.2.3 From 76b737c5978732363317e029aeec6d3ce9c8234d Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Fri, 13 Oct 2023 21:37:39 +0100 Subject: Optimises Committee images --- src/components/CommitteeList/CommitteeListItem.astro | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/CommitteeList/CommitteeListItem.astro b/src/components/CommitteeList/CommitteeListItem.astro index d026047..9a5a55b 100644 --- a/src/components/CommitteeList/CommitteeListItem.astro +++ b/src/components/CommitteeList/CommitteeListItem.astro @@ -19,7 +19,23 @@ const t = translate(locale);
  • { committeeMember.img && ( - + ) }
    -- cgit v1.2.3 From a37d5bd725cfe61c56d84f06a58d88872f6b7690 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Fri, 13 Oct 2023 21:41:54 +0100 Subject: Avoids content shift on RSS button --- src/components/Footer.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/Footer.astro b/src/components/Footer.astro index ffb49c9..f582d33 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -14,7 +14,7 @@ const t = translate(locale); {t(tComponent, { key: 'subscribe-to-rss' })} - +