diff --git a/src/components/SiteHeader/MobileMenu/index.svelte b/src/components/SiteHeader/MobileMenu/index.svelte index 9c6a340e..d4afd107 100644 --- a/src/components/SiteHeader/MobileMenu/index.svelte +++ b/src/components/SiteHeader/MobileMenu/index.svelte @@ -4,13 +4,15 @@ import { normalizeUrl } from '../NavBar/utils/index.js'; interface Props { + // eslint-disable-next-line @typescript-eslint/no-explicit-any data?: any; isMobileMenuOpen?: boolean; + // eslint-disable-next-line @typescript-eslint/no-explicit-any releaseMobileMenu?: any; } let { - data = [], + data = {}, isMobileMenuOpen = false, releaseMobileMenu = () => {}, }: Props = $props(); diff --git a/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/index.svelte b/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/index.svelte index 7c0d8e3e..bb5c75c6 100644 --- a/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/index.svelte +++ b/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/index.svelte @@ -13,12 +13,19 @@ {story.title} - {#if thumbnail} + {#if thumbnail && (thumbnail.resizer_url || thumbnail?.renditions?.square?.['120w'])}
- {thumbnail.alt_text} + {#if thumbnail.resizer_url} + {thumbnail.alt_text} + {:else} + {thumbnail.alt_text} + {/if}
{/if} @@ -39,9 +46,6 @@ text-decoration: none; .story-text span { text-decoration: underline; - &.label { - text-decoration: none; - } } } @@ -62,14 +66,6 @@ } } - span.label { - font-size: 14px; - line-height: 1.1; - margin-bottom: 8px; - display: block; - font-weight: 200; - } - time { @include font-sans; margin-top: 8px; diff --git a/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/time.js b/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/time.ts similarity index 76% rename from src/components/SiteHeader/NavBar/NavDropdown/StoryCard/time.js rename to src/components/SiteHeader/NavBar/NavDropdown/StoryCard/time.ts index d30c0c75..db2455a5 100644 --- a/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/time.js +++ b/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/time.ts @@ -31,7 +31,7 @@ dayjs.updateLocale('en', { }, }); -const getTimeZone = (local) => { +const getTimeZone = (local: boolean) => { if (local) { return dayjs.tz.guess(); } @@ -39,15 +39,19 @@ const getTimeZone = (local) => { return 'UTC'; }; -const diff = (dateFrom, dateTo, measurement = 'day') => { +const diff = ( + dateFrom: Date, + dateTo: number, + measurement: 'day' | 'hour' = 'day' +) => { return dayjs(dateFrom).diff(dayjs(dateTo), measurement, true); }; -const olderThanHour = (dateFrom, dateTo, hours = 1) => { +const olderThanHour = (dateFrom: Date, dateTo: number, hours = 1) => { return diff(dateFrom, dateTo, 'hour') < -hours; }; -const isSameDay = (dateFrom, dateTo) => { +const isSameDay = (dateFrom: Date, dateTo: number) => { const first = new Date(dateFrom); const second = new Date(dateTo); return ( @@ -57,10 +61,10 @@ const isSameDay = (dateFrom, dateTo) => { ); }; -export const getTime = (datetime) => { +export const getTime = (datetime: dayjs.ConfigType) => { const publishTime = dayjs(datetime, { utc: true }); - const showRelativeTime = !olderThanHour(publishTime, Date.now()); - const showTime = isSameDay(publishTime, Date.now()); + const showRelativeTime = !olderThanHour(publishTime.toDate(), Date.now()); + const showTime = isSameDay(publishTime.toDate(), Date.now()); const timezone = getTimeZone(false); if (showRelativeTime) { return dayjs().to(publishTime); diff --git a/src/components/SiteHeader/NavBar/NavDropdown/index.svelte b/src/components/SiteHeader/NavBar/NavDropdown/index.svelte index 2f32cb2d..89eeb35f 100644 --- a/src/components/SiteHeader/NavBar/NavDropdown/index.svelte +++ b/src/components/SiteHeader/NavBar/NavDropdown/index.svelte @@ -1,20 +1,34 @@ - -