From de601a42588ecc6c134ffc810b3b6f8050cf603e Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Fri, 4 Oct 2024 14:29:36 -0400 Subject: [PATCH 01/27] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb187018..4cf5da54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Updated - Refactored collection/item lanes into one `Lane` component (DR-3191) +- Update "Divisions" link in header to link to /divisions (DR-3140) +- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) +- Remove redirect for /divisions page (DR-3132) +- Remove redirect for /divisions/:slug pages (DR-3133) ## [0.1.14] 2024-10-03 From 4cfb8186eb34f75f1f5e8b56a778c2931c2267d3 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Fri, 4 Oct 2024 14:35:19 -0400 Subject: [PATCH 02/27] remove /divisions and /divisions/:slug from middleware --- CHANGELOG.md | 3 +++ middleware.tsx | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cf5da54..5c0c4f62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Refactored collection/item lanes into one `Lane` component (DR-3191) - Update "Divisions" link in header to link to /divisions (DR-3140) - Update links on /divisions page to point to /divisions/:slug pages (DR-3142) + +### Removed + - Remove redirect for /divisions page (DR-3132) - Remove redirect for /divisions/:slug pages (DR-3133) diff --git a/middleware.tsx b/middleware.tsx index 898af8c5..ae884cc0 100644 --- a/middleware.tsx +++ b/middleware.tsx @@ -14,8 +14,6 @@ export const config = { matcher: [ "/collections", "/collections/:path*", - "/divisions", - "/divisions/:path*", "/items/:path*", "/search/:path*", ], From ea842653d627638c24ec202d20ba206323ab0527 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Fri, 4 Oct 2024 14:38:28 -0400 Subject: [PATCH 03/27] update Divisions link in nav --- app/src/data/dcNavLinks.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/data/dcNavLinks.ts b/app/src/data/dcNavLinks.ts index 425f96cd..d7dda40c 100644 --- a/app/src/data/dcNavLinks.ts +++ b/app/src/data/dcNavLinks.ts @@ -10,7 +10,7 @@ export const dcNavLinks = [ text: "Collections", }, { - href: `${DC_URL}/divisions`, + href: `/divisions`, text: "Divisions", }, { From 9c52c8008e9b21ec1481443ae43c6bfc7775107b Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Fri, 4 Oct 2024 14:40:43 -0400 Subject: [PATCH 04/27] thought I removed these comments oops --- app/src/components/pages/divisionPage/divisionPage.tsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/src/components/pages/divisionPage/divisionPage.tsx b/app/src/components/pages/divisionPage/divisionPage.tsx index 4de60978..a2dcc715 100644 --- a/app/src/components/pages/divisionPage/divisionPage.tsx +++ b/app/src/components/pages/divisionPage/divisionPage.tsx @@ -15,14 +15,9 @@ import { import React, { useEffect, useState, useRef } from "react"; import PageLayout from "../../pageLayout/pageLayout"; import { headerBreakpoints } from "../../../utils/breakpoints"; -// import { ItemLane } from "../../lanes/itemLane/itemLane"; import { CollectionsGrid } from "../../grids/collectionsGrid"; -// import CollectionLanesLoading from "../../lanes/collectionLanes/collectionLanesLoading"; import { slugToString, totalNumPages } from "../../../utils/utils"; import useBreakpoints from "../../../hooks/useBreakpoints"; -// import { slugToString } from "../../../utils/utils"; -// import React, { useEffect, useState } from "react"; -// import { CollectionsGrid } from "../../grids/collectionsGrid"; import { DC_URL } from "@/src/config/constants"; import { Lane as DCLane } from "../../lane/lane"; import LaneLoading from "../../lane/laneLoading"; @@ -44,8 +39,6 @@ export default function DivisionPage({ data }: any) { const { replace } = useRouter(); - const { isLargerThanLargeTablet } = useBreakpoints(); - const totalPages = totalNumPages(data.numFound, data.perPage); const updatePageURL = async (pageNumber: number) => { From ada85eb08913a2c70ea76569edb6808b0879d049 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Fri, 4 Oct 2024 14:42:48 -0400 Subject: [PATCH 05/27] update links on all divisions page to point to /divisions/:slug --- app/src/components/pages/divisionsPage/divisionsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/components/pages/divisionsPage/divisionsPage.tsx b/app/src/components/pages/divisionsPage/divisionsPage.tsx index 968d1b56..c6cbbe5b 100644 --- a/app/src/components/pages/divisionsPage/divisionsPage.tsx +++ b/app/src/components/pages/divisionsPage/divisionsPage.tsx @@ -50,7 +50,7 @@ export default function DivisionsPage({ summary, divisions }: DivisionsProps) { From 973d456e9d6b5f0fffd477b3f01615caae9b530c Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Mon, 28 Oct 2024 12:59:20 -0700 Subject: [PATCH 06/27] remove banner --- CHANGELOG.md | 1 + app/src/components/pageLayout/pageLayout.tsx | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2540a83a..57e8c02d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased +- remove banner that links to old site ### Updated diff --git a/app/src/components/pageLayout/pageLayout.tsx b/app/src/components/pageLayout/pageLayout.tsx index 09a7cb4f..538d93df 100644 --- a/app/src/components/pageLayout/pageLayout.tsx +++ b/app/src/components/pageLayout/pageLayout.tsx @@ -52,7 +52,6 @@ const PageLayout = ({ -
{activePage === "home" || activePage === "about" || From f377a4cddff96fff6becac84eb5be2b6052a80c7 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Wed, 30 Oct 2024 16:02:08 -0700 Subject: [PATCH 07/27] remove import --- app/src/components/pageLayout/pageLayout.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/components/pageLayout/pageLayout.tsx b/app/src/components/pageLayout/pageLayout.tsx index 538d93df..066ee0fc 100644 --- a/app/src/components/pageLayout/pageLayout.tsx +++ b/app/src/components/pageLayout/pageLayout.tsx @@ -10,7 +10,6 @@ import { import React, { useEffect } from "react"; import { type PropsWithChildren } from "react"; import Header from "../header/header"; -import NotificationBanner from "../notificationBanner/notificationBanner"; import Script from "next/script"; import { BreadcrumbsDataProps } from "@nypl/design-system-react-components/dist/src/components/Breadcrumbs/Breadcrumbs"; import { ADOBE_EMBED_URL } from "../../config/constants"; From 10c25b3a0412eb969d9dbc4263f2763d083685b9 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:14:39 -0500 Subject: [PATCH 08/27] changelog --- public/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index d688a3b3..7510038f 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -36,6 +36,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Updated - Refactored collection/item lanes into one `Lane` component (DR-3191) +- Update "Divisions" link in header to link to /divisions (DR-3140) +- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) + +### Removed + +- Remove redirect for /divisions page (DR-3132) +- Remove redirect for /divisions/:slug pages (DR-3133) - Updated header on /divisions/:slug page to have a tabIndex of -1 (DR-3229) - General cleanup (DR-3194) From d18afccc87850e879d97f4c35f7083b865bb1628 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:32:58 -0500 Subject: [PATCH 09/27] changelog --- public/CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index d688a3b3..f14823da 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased +- remove banner that links to old site + +## [0.1.19] 2024-11-18 + +## Updated + +- Updated collection card urls to use uuid +- Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible +- Updated item card urls to use uuid +- Updated collection card urls to use legacy url +- Updated prod ECS cluster name to `new-digitalcollections-prod` ## [0.1.17] 2024-11-14 From ac8691a92fbda6144b63dc74a8b90aece75293de Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:38:29 -0500 Subject: [PATCH 10/27] changelog --- public/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index 6cc7c66a..78895869 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased + +## [0.2.0] 2024-22-20 + - remove banner that links to old site +- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) ## [0.1.19] 2024-11-18 From c8c7afac7a5a7608127780c744c400a81f057cef Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:39:41 -0500 Subject: [PATCH 11/27] changelog --- public/CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index 78895869..6cc7c66a 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -6,11 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased - -## [0.2.0] 2024-22-20 - - remove banner that links to old site -- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) ## [0.1.19] 2024-11-18 From ef6afd8cf560824595d81ee519faf39b4349c556 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:42:14 -0500 Subject: [PATCH 12/27] changelog AGAIN --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cc7c66a..8977dfd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,14 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased -- remove banner that links to old site + +## [0.2.0] 2024-11-20 +- remove banner that links to old site (DR-3263) +- Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) +- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) ## [0.1.19] 2024-11-18 ## Updated - Updated collection card urls to use uuid -- Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible - Updated item card urls to use uuid - Updated collection card urls to use legacy url - Updated prod ECS cluster name to `new-digitalcollections-prod` From e9338438624b3930787070f28182eb23d958835e Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:42:27 -0500 Subject: [PATCH 13/27] AGAIN --- public/CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index 6cc7c66a..8977dfd6 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -6,14 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased -- remove banner that links to old site + +## [0.2.0] 2024-11-20 +- remove banner that links to old site (DR-3263) +- Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) +- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) ## [0.1.19] 2024-11-18 ## Updated - Updated collection card urls to use uuid -- Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible - Updated item card urls to use uuid - Updated collection card urls to use legacy url - Updated prod ECS cluster name to `new-digitalcollections-prod` From 892ece0b34969aa80070637a9e13801101d51594 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:43:31 -0500 Subject: [PATCH 14/27] fix copy on changelog for banner update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8977dfd6..4a61c12b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ## [0.2.0] 2024-11-20 -- remove banner that links to old site (DR-3263) +- Remove banner that links to OG Digital Collections (DR-3263) - Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) - Update links on /divisions page to point to /divisions/:slug pages (DR-3142) From ed820d03ff9ec3d5a1f016e4e9e4da7fb72b9c75 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:45:24 -0500 Subject: [PATCH 15/27] fix public changelog because that's how the world works ig --- public/CHANGELOG.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index 8977dfd6..5efdf688 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ## [0.2.0] 2024-11-20 -- remove banner that links to old site (DR-3263) +- Remove banner that links to OG Digital Collections (DR-3263) - Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) - Update links on /divisions page to point to /divisions/:slug pages (DR-3142) @@ -50,13 +50,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Updated - Refactored collection/item lanes into one `Lane` component (DR-3191) -- Update "Divisions" link in header to link to /divisions (DR-3140) -- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) - -### Removed - -- Remove redirect for /divisions page (DR-3132) -- Remove redirect for /divisions/:slug pages (DR-3133) - Updated header on /divisions/:slug page to have a tabIndex of -1 (DR-3229) - General cleanup (DR-3194) From be6076819d1c717fdc584c29b358362a2ba742c2 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:45:46 -0500 Subject: [PATCH 16/27] and fix reg changelog --- CHANGELOG.md | 7 ------- public/CHANGELOG.md | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a61c12b..5efdf688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,13 +50,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Updated - Refactored collection/item lanes into one `Lane` component (DR-3191) -- Update "Divisions" link in header to link to /divisions (DR-3140) -- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) - -### Removed - -- Remove redirect for /divisions page (DR-3132) -- Remove redirect for /divisions/:slug pages (DR-3133) - Updated header on /divisions/:slug page to have a tabIndex of -1 (DR-3229) - General cleanup (DR-3194) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index 5efdf688..4a61c12b 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -50,6 +50,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Updated - Refactored collection/item lanes into one `Lane` component (DR-3191) +- Update "Divisions" link in header to link to /divisions (DR-3140) +- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) + +### Removed + +- Remove redirect for /divisions page (DR-3132) +- Remove redirect for /divisions/:slug pages (DR-3133) - Updated header on /divisions/:slug page to have a tabIndex of -1 (DR-3229) - General cleanup (DR-3194) From 7d935e218cc864266ca93a85270fd2088151eaf5 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:45:58 -0500 Subject: [PATCH 17/27] ok --- public/CHANGELOG.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index 4a61c12b..5efdf688 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -50,13 +50,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Updated - Refactored collection/item lanes into one `Lane` component (DR-3191) -- Update "Divisions" link in header to link to /divisions (DR-3140) -- Update links on /divisions page to point to /divisions/:slug pages (DR-3142) - -### Removed - -- Remove redirect for /divisions page (DR-3132) -- Remove redirect for /divisions/:slug pages (DR-3133) - Updated header on /divisions/:slug page to have a tabIndex of -1 (DR-3229) - General cleanup (DR-3194) From 1fce181d30f06253cf730d19c64479eb9ea776dc Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:47:35 -0500 Subject: [PATCH 18/27] add note for 0.1.18 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5efdf688..f1448e19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated collection card urls to use legacy url - Updated prod ECS cluster name to `new-digitalcollections-prod` +## [0.1.18] 2024-11-18 +- merged into 0.1.19 + ## [0.1.17] 2024-11-14 ### Updated From a0181ff26df39be6143d8e2344155b61e47d0a83 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:47:44 -0500 Subject: [PATCH 19/27] public changelog --- public/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index 5efdf688..f1448e19 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -21,6 +21,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated collection card urls to use legacy url - Updated prod ECS cluster name to `new-digitalcollections-prod` +## [0.1.18] 2024-11-18 +- merged into 0.1.19 + ## [0.1.17] 2024-11-14 ### Updated From 1dc7aeacf274e375e014e5044ff446c4e872420b Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:48:40 -0500 Subject: [PATCH 20/27] last changelog update --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1448e19..8504ef69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ## [0.2.0] 2024-11-20 + +### Removed - Remove banner that links to OG Digital Collections (DR-3263) + +### Updated - Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) - Update links on /divisions page to point to /divisions/:slug pages (DR-3142) ## [0.1.19] 2024-11-18 -## Updated +### Updated - Updated collection card urls to use uuid - Updated item card urls to use uuid From 0217628d5eb6b089142d1c969ad9e450c1468726 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 11:48:52 -0500 Subject: [PATCH 21/27] hopefully last public changelog update --- public/CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index f1448e19..8504ef69 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -8,13 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ## [0.2.0] 2024-11-20 + +### Removed - Remove banner that links to OG Digital Collections (DR-3263) + +### Updated - Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) - Update links on /divisions page to point to /divisions/:slug pages (DR-3142) ## [0.1.19] 2024-11-18 -## Updated +### Updated - Updated collection card urls to use uuid - Updated item card urls to use uuid From 992f1df686aca815795cbbad242575ebb6349e70 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 13:10:24 -0500 Subject: [PATCH 22/27] meep --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8504ef69..98e1fe32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,13 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Remove banner that links to OG Digital Collections (DR-3263) ### Updated -- Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) - Update links on /divisions page to point to /divisions/:slug pages (DR-3142) ## [0.1.19] 2024-11-18 ### Updated - +- Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) - Updated collection card urls to use uuid - Updated item card urls to use uuid - Updated collection card urls to use legacy url From de7721fe6eca727627810375298caec07c345f01 Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 13:10:33 -0500 Subject: [PATCH 23/27] meep2 --- public/CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md index 8504ef69..98e1fe32 100644 --- a/public/CHANGELOG.md +++ b/public/CHANGELOG.md @@ -13,13 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Remove banner that links to OG Digital Collections (DR-3263) ### Updated -- Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) - Update links on /divisions page to point to /divisions/:slug pages (DR-3142) ## [0.1.19] 2024-11-18 ### Updated - +- Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) - Updated collection card urls to use uuid - Updated item card urls to use uuid - Updated collection card urls to use legacy url From b8cce66dd2f96494ce190113f60b312f4b4c8d0b Mon Sep 17 00:00:00 2001 From: Alessandra Vertrees Date: Tue, 19 Nov 2024 13:14:15 -0500 Subject: [PATCH 24/27] package json release number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7087b28a..773ce179 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "digital-collections", - "version": "0.1.19", + "version": "0.2.0", "private": true, "scripts": { "dev": "next dev", From 1cbde46e886656ac269d1b3b97a0eef947f955d5 Mon Sep 17 00:00:00 2001 From: Emma Mansell <73774046+7emansell@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:02:19 -0500 Subject: [PATCH 25/27] Pagination results fix --- .../components/pages/divisionPage/divisionPage.tsx | 5 +++-- app/src/utils/utils.test.tsx | 12 ++++++------ app/src/utils/utils.ts | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/components/pages/divisionPage/divisionPage.tsx b/app/src/components/pages/divisionPage/divisionPage.tsx index a51f41d9..17497727 100644 --- a/app/src/components/pages/divisionPage/divisionPage.tsx +++ b/app/src/components/pages/divisionPage/divisionPage.tsx @@ -113,13 +113,14 @@ export default function DivisionPage({ data }: any) { - {displayResults(data.numFound, data.perPage, data.page)} + {`Displaying ${displayResults(data.numFound, data.perPage, data.page)} + results`} diff --git a/app/src/utils/utils.test.tsx b/app/src/utils/utils.test.tsx index 28b49bad..6fcf2634 100644 --- a/app/src/utils/utils.test.tsx +++ b/app/src/utils/utils.test.tsx @@ -180,26 +180,26 @@ describe("createAdobeAnalyticsPageName generates the correct Adobe Analytics pag describe("displayResults", () => { test("displays correct result range for first page with enough results", () => { - expect(displayResults(100, 10, 1)).toBe("Results: 1-10 of 100"); + expect(displayResults(100, 10, 1)).toBe("1-10 of 100"); }); test("displays correct result range for middle page", () => { - expect(displayResults(100, 10, 5)).toBe("Results: 41-50 of 100"); + expect(displayResults(100, 10, 5)).toBe("41-50 of 100"); }); test("displays correct result range for last page when there are fewer results than perPage", () => { - expect(displayResults(45, 10, 5)).toBe("Results: 41-45 of 45"); + expect(displayResults(45, 10, 5)).toBe("41-45 of 45"); }); test("displays correct result range when numFound is less than perPage", () => { - expect(displayResults(8, 10, 1)).toBe("Results: 1-8 of 8"); + expect(displayResults(8, 10, 1)).toBe("1-8 of 8"); }); test("displays correct result range for the last page when it's the same as perPage", () => { - expect(displayResults(50, 10, 5)).toBe("Results: 41-50 of 50"); + expect(displayResults(50, 10, 5)).toBe("41-50 of 50"); }); test("displays correct range when perPage is greater than numFound", () => { - expect(displayResults(5, 10, 1)).toBe("Results: 1-5 of 5"); + expect(displayResults(5, 10, 1)).toBe("1-5 of 5"); }); }); diff --git a/app/src/utils/utils.ts b/app/src/utils/utils.ts index 981e8fda..b7be976c 100644 --- a/app/src/utils/utils.ts +++ b/app/src/utils/utils.ts @@ -120,5 +120,5 @@ export function displayResults( ) { const start = (page - 1) * perPage + 1; const end = Math.min(page * perPage, numFound); - return `Results: ${start}-${end} of ${numFound}`; + return `${start}-${end} of ${numFound}`; } From b7063c0050cde554202ee8e039f83cadfe41d0b5 Mon Sep 17 00:00:00 2001 From: Emma Mansell <73774046+7emansell@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:08:51 -0500 Subject: [PATCH 26/27] Image blurriness fix --- app/src/components/card/cardImage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/components/card/cardImage.tsx b/app/src/components/card/cardImage.tsx index fd46d9bb..96c45a14 100644 --- a/app/src/components/card/cardImage.tsx +++ b/app/src/components/card/cardImage.tsx @@ -33,6 +33,7 @@ export const CardImage = ({ record, imageHeight }: CardImageProps) => { minHeight: "100%", height: "auto", }} + quality={100} placeholder="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mN8WQ8AAlcBas53/MIAAAAASUVORK5CYII=" width={initialImageHeight * 2} height={initialImageHeight} From 92281b062ed48ddd635d881bd5ade7f8f327310d Mon Sep 17 00:00:00 2001 From: Emma Mansell <73774046+7emansell@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:11:06 -0500 Subject: [PATCH 27/27] changelog --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98e1fe32..992bd106 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,15 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.2.0] 2024-11-20 -### Removed +### Removed + - Remove banner that links to OG Digital Collections (DR-3263) ### Updated + - Update links on /divisions page to point to /divisions/:slug pages (DR-3142) +- Updating pagination text on division landing page +- Updating Next Image quality ## [0.1.19] 2024-11-18 ### Updated + - Moved `/divisions` and `/divisions/[slug]` from behind middleware, now accessible (DR-3132, DR-3133) - Updated collection card urls to use uuid - Updated item card urls to use uuid @@ -25,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated prod ECS cluster name to `new-digitalcollections-prod` ## [0.1.18] 2024-11-18 + - merged into 0.1.19 ## [0.1.17] 2024-11-14