chore(release)

app/[locale]/[...uriSegments]/page.tsx

@@ -102,7 +102,6 @@ export async function generateStaticParams({
 
 const sectionMap = {
   events: EventPageTemplate,
-  // galleryItems: GalleryPageTemplate,
   glossaryTerms: GlossaryPageTemplate,
   news: NewsPageTemplate,
   searchResults: SearchPageTemplate,

components/EventTime/patterns/EventTimeLong.js

@@ -1,5 +1,6 @@
 import PropTypes from "prop-types";
-import { useDateString, useTimeString, useTimeZone } from "@/lib/utils";
+import { useTimeString, useTimeZone } from "@/lib/utils";
+import { makeDateString } from "@/helpers/dates";
 
 export default function EventTimeLong({
   startDate,
@@ -9,9 +10,9 @@ export default function EventTimeLong({
   timezone,
   isSameDay,
 }) {
-  const localizedStartDate = useDateString(startDate);
+  const localizedStartDate = makeDateString(startDate);
   const localizedStartTime = useTimeString(startTime);
-  const localizedEndDate = useDateString(endDate);
+  const localizedEndDate = makeDateString(endDate);
   const localizedEndTime = useTimeString(endTime);
   const localizedTimezone = useTimeZone(timezone);
 

components/EventTime/patterns/EventTimeShort/index.js

@@ -1,5 +1,6 @@
 import PropTypes from "prop-types";
-import { makeDateObject, useGlobalData } from "@/lib/utils";
+import { useGlobalData } from "@/lib/utils";
+import { makeDateObject } from "@/helpers/dates";
 import * as Styled from "./styles";
 import { fallbackLng } from "@/lib/i18n/settings";
 
@@ -15,10 +16,10 @@ function renderShortDate({ month, day, year }) {
 
 export default function EventTimeShort({ startDate, endDate, isSameDay }) {
   const localeInfo = useGlobalData("localeInfo");
-  const lang = localeInfo?.language || fallbackLng;
-  const endDateObject = makeDateObject(endDate, lang, true);
+  const locale = localeInfo?.language || fallbackLng;
+  const endDateObject = makeDateObject(endDate, { locale, isShort: true });
   const startDateObject = !isSameDay
-    ? makeDateObject(startDate, lang, true)
+    ? makeDateObject(startDate, { locale, isShort: true })
     : null;
 
   return (

components/atomic/Tile/index.js

@@ -1,12 +1,7 @@
 import PropTypes from "prop-types";
 import { useId } from "react";
 import classNames from "classnames";
-import {
-  ResponsiveImage,
-  Image,
-  MixedLink,
-  IconComposer,
-} from "@rubin-epo/epo-react-lib";
+import { Image, MixedLink, IconComposer } from "@rubin-epo/epo-react-lib";
 import { mixedLinkShape } from "@/shapes/link";
 import { useGlobalData } from "@/lib/utils";
 import * as Styled from "./styles";
@@ -57,13 +52,9 @@ const Tile = ({
         {finalImage && (
           <div className="image">
             {ratio ? (
-              <ResponsiveImage
-                role="presentation"
-                ratio={ratio}
-                image={finalImage}
-              />
+              <Styled.ResponsiveImage aspectRatio={ratio} image={finalImage} />
             ) : (
-              <Image role="presentation" image={finalImage} />
+              <Image image={finalImage} />
             )}
             {isVideo && (
               <Styled.PlayButton>

components/atomic/Tile/styles.js

@@ -1,6 +1,7 @@
 /* eslint-disable */
 import styled from "styled-components";
-import { MixedLink as BaseMixedLink } from "@rubin-epo/epo-react-lib";
+import BaseMixedLink from "@rubin-epo/epo-react-lib/MixedLink";
+import BaseResponsiveImage from "@rubin-epo/epo-react-lib/ResponsiveImage";
 import SharePopupComponent from "@/layout/SharePopup";
 import {
   BREAK_PHABLET,
@@ -16,6 +17,10 @@ Media queries are done this way for special treatment at tablet level vs phone l
 @media (min-width: ${BREAK_PHABLET_MIN}) and (max-width: ${BREAK_TABLET}) {}
 */
 
+export const ResponsiveImage = styled(BaseResponsiveImage)`
+  height: 100%;
+`;
+
 export const ListItem = styled.li`
   position: relative;
 `;
@@ -36,6 +41,7 @@ export const MixedLink = styled(BaseMixedLink)`
   /* set the grid areas for various bits */
   .image {
     grid-area: image;
+    overflow: hidden;
   }
 
   .pretitle {
@@ -210,10 +216,6 @@ export const MixedLink = styled(BaseMixedLink)`
       grid-row-gap: 0px;
       padding: 0px;
 
-      && .image > div {
-        padding-top: 50%;
-      }
-
       .pretitle {
         padding: 0.5rem 0;
         font-weight: normal;
@@ -296,10 +298,6 @@ export const MixedLink = styled(BaseMixedLink)`
       grid-gap: 0;
       padding: 0px;
 
-      && .image > div {
-        padding-top: 50%;
-      }
-
       .pretitle {
         padding: 0.5rem 20px;
         font-weight: normal;
@@ -330,13 +328,7 @@ export const MixedLink = styled(BaseMixedLink)`
         "image title"
         "image subtitle"
         "image text"
-        "footer text";
-
-      .image {
-        > div {
-          padding-top: 100%;
-        }
-      }
+        "image text";
 
       && .footer {
         display: none;
@@ -655,12 +647,6 @@ export const MixedLink = styled(BaseMixedLink)`
         "image title"
         "image text"
         "image text";
-
-      .image {
-        > div {
-          padding-top: 100%;
-        }
-      }
     }
   }
 

components/content-blocks/Callout/CalloutEntry/index.js

@@ -2,26 +2,27 @@
 
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
-import { makeDateString, getSiteString, makeReleaseFeature } from "@/lib/utils";
+import { getSiteString, makeReleaseFeature } from "@/lib/utils";
+import { makeDateString } from "@/helpers/dates";
 import * as Styled from "./styles";
 import { Image } from "@rubin-epo/epo-react-lib";
 import { useRelease } from "@/lib/api/noirlabReleases";
 import { fallbackLng } from "@/lib/i18n/settings";
 
-const getDateString = (newsDate, eventStart, eventEnd, lang) => {
+const getDateString = (newsDate, eventStart, eventEnd, locale) => {
   if (newsDate) {
-    return makeDateString(newsDate, lang);
+    return makeDateString(newsDate, { locale });
   }
 
   if (eventStart && eventEnd) {
-    return `${makeDateString(eventStart, lang)} - ${makeDateString(
+    return `${makeDateString(eventStart, { locale })} - ${makeDateString(
       eventEnd,
-      lang
+      { locale }
     )}`;
   }
 
   if (eventEnd) {
-    return makeDateString(eventEnd, lang);
+    return makeDateString(eventEnd, { locale });
   }
 };
 

components/content-blocks/GridBlock/NewsGrid.js

@@ -1,13 +1,14 @@
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import {
-  makeDateString,
   makeTruncatedString,
   makeReleaseFeature,
   normalizeItemData,
   useGlobalData,
   useList,
 } from "@/lib/utils";
+
+import { makeDateString } from "@/helpers/dates";
 import { Grid } from "@rubin-epo/epo-react-lib";
 import Tile from "@/atomic/Tile";
 import Loader from "@/atomic/Loader";
@@ -16,7 +17,7 @@ import { fallbackLng } from "@/lib/i18n/settings";
 const NewsGrid = ({ items = [], limit, listTypeId, sectionHandle, pageId }) => {
   const { t } = useTranslation();
   const localeInfo = useGlobalData("localeInfo");
-  const lang = localeInfo?.language || fallbackLng;
+  const locale = localeInfo?.language || fallbackLng;
   // get manually-curated data first
   let allItems = normalizeItemData(items);
 
@@ -70,7 +71,7 @@ const NewsGrid = ({ items = [], limit, listTypeId, sectionHandle, pageId }) => {
                 isFeature={i === 0}
                 link={uri}
                 pretitle={postType?.[0]?.title ? postType[0].title : " "}
-                subtitle={makeDateString(date || releaseDate, lang)}
+                subtitle={makeDateString(date || releaseDate, { locale })}
                 text={makeTruncatedString(subtitle || description, 30)}
                 title={title}
                 type="news"

components/content-blocks/PublicationsList/index.js

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import { Container } from "@rubin-epo/epo-react-lib";
 import { mixedLinkShape } from "@/shapes/link";
-import { makeDateString } from "@/lib/utils";
+import { makeDateString } from "@/helpers/dates";
 import * as Styled from "./styles";
 
 export default function PublicationsListBlock({

components/content-blocks/Schedule/index.js

@@ -1,10 +1,10 @@
 import PropTypes from "prop-types";
 import styled from "styled-components";
 import { Container } from "@rubin-epo/epo-react-lib";
-import { useDateString } from "@/lib/utils";
+import { makeDateString } from "@/helpers/dates";
 
 export default function ScheduleBlock({ date, description, scheduleRows }) {
-  const localizedDate = useDateString(date);
+  const localizedDate = makeDateString(date);
   return (
     <Container>
       <Date>{localizedDate}</Date>

components/content-blocks/SlideBlock/index.js

@@ -32,9 +32,7 @@ const SlideBlock = ({
 
   // get manually-curated data first. This has some filtering for missing entries (deleted in craft)
   let allItems = [];
-  if (dynamicComponent === "galleryItems") {
-    allItems = normalizeItemData(items, "galleryEntry");
-  } else if (dynamicComponent === "staffProfiles") {
+  if (dynamicComponent === "staffProfiles") {
     allItems = normalizeItemData(items, "staffEntry");
     truncate = 50;
   }
@@ -74,10 +72,6 @@ const SlideBlock = ({
   const makePretitle = (cat, type) => {
     if (type === "slideshow") {
       return t(`gallery.slideshow`);
-    } else if (type === "galleryItem") {
-      return cat?.[0]?.slug
-        ? t(`gallery.${cat[0].slug}`)
-        : t(`gallery.gallery`);
     }
     return null;
   };

components/dynamic/DataList/index.js

@@ -34,7 +34,6 @@ const DataList = ({
   const listTypeMap = {
     newsPosts: "news-post",
     pressReleases: "press-release",
-    imageGalleryItems: "image",
     videoGalleryItems: "video",
   };
   const listType = categories.find((c) => c.slug === listTypeMap[component]);

components/dynamic/NewsList/index.js

@@ -4,11 +4,11 @@ import { Grid } from "@rubin-epo/epo-react-lib";
 import DataList from "@/dynamic/DataList";
 import Tile from "@/atomic/Tile";
 import {
-  makeDateString,
   makeTruncatedString,
   makeReleaseFeature,
   useGlobalData,
 } from "@/lib/utils";
+import { makeDateString } from "@/helpers/dates";
 import { fallbackLng } from "@/lib/i18n/settings";
 
 const NewsList = ({
@@ -23,7 +23,7 @@ const NewsList = ({
 }) => {
   const { t } = useTranslation();
   const localeInfo = useGlobalData("localeInfo");
-  const lang = localeInfo?.language || fallbackLng;
+  const locale = localeInfo?.language || fallbackLng;
   const cols = initialLimit === 4 ? 4 : initialLimit === 3 ? 3 : 2;
   const canShowFeatured = initialLimit > 4;
 
@@ -84,7 +84,7 @@ const NewsList = ({
                         ? postType[0].title
                         : null
                     }
-                    subtitle={makeDateString(date || releaseDate, lang)}
+                    subtitle={makeDateString(date || releaseDate, { locale })}
                     text={makeTruncatedString(description || subtitle, 30)}
                     title={title}
                     titleTag={"h2"}