From 086b3aaed18c0f3cf401ebfe48134cbcf3cee749 Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Sun, 8 Nov 2026 13:07:55 +0100 Subject: [PATCH 01/35] refactor: implemented simple .css into .tsx --- frontend/src/App.tsx | 2 +- frontend/src/components/GameListItem.tsx | 42 +++++++++++++++++++ .../GameListItem/GameListItem.module.css | 36 ---------------- .../components/GameListItem/GameListItem.tsx | 40 ------------------ .../src/components/{Header => }/Header.tsx | 18 ++++---- .../src/components/Header/Header.module.css | 39 ----------------- frontend/src/components/Layout.tsx | 7 ++++ .../src/components/Layout/Layout.module.css | 5 --- frontend/src/components/Layout/Layout.tsx | 6 --- frontend/src/pages/GameDetails.tsx | 4 +- .../src/pages/{GamesGrid => }/GamesGrid.tsx | 18 ++++---- .../src/pages/GamesGrid/GamesGrid.module.css | 7 ---- frontend/src/pages/MyRatings.tsx | 2 +- 13 files changed, 73 insertions(+), 153 deletions(-) create mode 100644 frontend/src/components/GameListItem.tsx delete mode 100644 frontend/src/components/GameListItem/GameListItem.module.css delete mode 100644 frontend/src/components/GameListItem/GameListItem.tsx rename frontend/src/components/{Header => }/Header.tsx (77%) delete mode 100644 frontend/src/components/Header/Header.module.css create mode 100644 frontend/src/components/Layout.tsx delete mode 100644 frontend/src/components/Layout/Layout.module.css delete mode 100644 frontend/src/components/Layout/Layout.tsx rename frontend/src/pages/{GamesGrid => }/GamesGrid.tsx (94%) delete mode 100644 frontend/src/pages/GamesGrid/GamesGrid.module.css diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index cc94a32..b430de1 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,6 +1,6 @@ import "bootstrap/dist/css/bootstrap.min.css"; import { BrowserRouter, Route, Routes } from "react-router-dom"; -import GamesGrid from "./pages/GamesGrid/GamesGrid"; +import GamesGrid from "./pages/GamesGrid"; import GameDetails from "./pages/GameDetails"; import MyRatings from "./pages/MyRatings"; diff --git a/frontend/src/components/GameListItem.tsx b/frontend/src/components/GameListItem.tsx new file mode 100644 index 0000000..e109f32 --- /dev/null +++ b/frontend/src/components/GameListItem.tsx @@ -0,0 +1,42 @@ +import { Image } from "react-bootstrap"; +import { Link } from "react-router-dom"; +import StarRating from "./StarRating"; + +interface GameListItemProps { + id: string; + title: string; + year: number | null; + tags: string; + rating: number | null; + image: string; + striped: boolean; +} + +export default function GameListItem({ + id, + title, + year, + tags, + rating, + image, + striped, +}: GameListItemProps) { + return ( + + {title} +
+

{title}

+

{year ?? "—"}

+

{tags || "—"}

+ +
+ + ); +} diff --git a/frontend/src/components/GameListItem/GameListItem.module.css b/frontend/src/components/GameListItem/GameListItem.module.css deleted file mode 100644 index 7c5a6c5..0000000 --- a/frontend/src/components/GameListItem/GameListItem.module.css +++ /dev/null @@ -1,36 +0,0 @@ -.row { - display: flex; - align-items: center; - flex: 1 1 0; - min-height: var(--row-min-height); - gap: 1.5rem; - padding: 0 1.5rem; - color: inherit; - text-decoration: none; -} - -.odd { - background-color: var(--color-stripe-odd); -} - -.even { - background-color: var(--color-stripe-even); -} - -.image { - width: 95px; - height: 95px; - object-fit: cover; - background-color: #ddd; - flex-shrink: 0; -} - -.info p { - margin: 0; -} - -.title { - margin: 0 0 0.25rem; - font-size: 1.1rem; - font-weight: 700; -} diff --git a/frontend/src/components/GameListItem/GameListItem.tsx b/frontend/src/components/GameListItem/GameListItem.tsx deleted file mode 100644 index 9c6953a..0000000 --- a/frontend/src/components/GameListItem/GameListItem.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import { Image } from "react-bootstrap"; -import { Link } from "react-router-dom"; -import styles from "./GameListItem.module.css"; -import StarRating from "../StarRating"; - -interface GameListItemProps { - id: string; - title: string; - year: number | null; - tags: string; - rating: number | null; - image: string; - striped: boolean; -} - -export default function GameListItem({ - id, - title, - year, - tags, - rating, - image, - striped, -}: GameListItemProps) { - return ( - - {title} -
-

{title}

-

{year ?? "—"}

-

{tags || "—"}

- {/*

{rating != null ? `${Number.isInteger(rating) ? rating.toFixed(0) : rating.toFixed(1)}/10` : "Not yet rated"}

*/} - -
- - ); -} diff --git a/frontend/src/components/Header/Header.tsx b/frontend/src/components/Header.tsx similarity index 77% rename from frontend/src/components/Header/Header.tsx rename to frontend/src/components/Header.tsx index fe38b96..74bbb22 100644 --- a/frontend/src/components/Header/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -8,9 +8,8 @@ import { useNavigate, useSearchParams, } from "react-router-dom"; -import { GRID_QUERY_STORAGE_KEY } from "../../constants/storageKeys"; -import styles from "./Header.module.css"; -import { useIsMobile } from "../../constants/global"; +import { GRID_QUERY_STORAGE_KEY } from "../constants/storageKeys"; +import { useIsMobile } from "../constants/global"; export default function Header() { const navigate = useNavigate(); @@ -54,14 +53,17 @@ export default function Header() { } return ( -
- +
+ { isMobile ? : "Working Title" } -
- + + - + { isMobile ? :"My Ratings" }
diff --git a/frontend/src/components/Header/Header.module.css b/frontend/src/components/Header/Header.module.css deleted file mode 100644 index 30c4aeb..0000000 --- a/frontend/src/components/Header/Header.module.css +++ /dev/null @@ -1,39 +0,0 @@ -.header { - display: flex; - align-items: center; - justify-content: space-between; - gap: 1rem; - height: var(--header-height); - padding: 0 1.5rem; - background-color: var(--color-brand); -} - -.brand, -.link { - font-weight: 700; - color: var(--color-text); - white-space: nowrap; - text-decoration: none; -} - -.search { - flex: 1; - max-width: 420px; -} - -.search :global(.input-group) { - border-radius: 999px; - overflow: hidden; -} - -.search :global(.form-control) { - border: none; -} - -.search :global(.form-control:focus) { - box-shadow: none; -} - -.search :global(.btn) { - border: none; -} diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx new file mode 100644 index 0000000..7b18c12 --- /dev/null +++ b/frontend/src/components/Layout.tsx @@ -0,0 +1,7 @@ +import type { ReactNode } from "react"; + +export default function Layout({ children }: { children: ReactNode }) { + return
+ {children} +
; +} diff --git a/frontend/src/components/Layout/Layout.module.css b/frontend/src/components/Layout/Layout.module.css deleted file mode 100644 index 52611a0..0000000 --- a/frontend/src/components/Layout/Layout.module.css +++ /dev/null @@ -1,5 +0,0 @@ -.shell { - width: 100%; - max-width: var(--content-width); - margin: 0 auto; -} diff --git a/frontend/src/components/Layout/Layout.tsx b/frontend/src/components/Layout/Layout.tsx deleted file mode 100644 index ced9683..0000000 --- a/frontend/src/components/Layout/Layout.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import type { ReactNode } from "react"; -import styles from "./Layout.module.css"; - -export default function Layout({ children }: { children: ReactNode }) { - return
{children}
; -} diff --git a/frontend/src/pages/GameDetails.tsx b/frontend/src/pages/GameDetails.tsx index c25ff40..c5869d6 100644 --- a/frontend/src/pages/GameDetails.tsx +++ b/frontend/src/pages/GameDetails.tsx @@ -4,8 +4,8 @@ import { useParams } from "react-router-dom"; import { gql } from "@apollo/client"; import { useMutation, useQuery } from "@apollo/client/react"; import { uri as graphqlUri } from "../apolloClient"; -import Header from "../components/Header/Header"; -import Layout from "../components/Layout/Layout"; +import Header from "../components/Header"; +import Layout from "../components/Layout"; import StarRating from "../components/StarRating"; import { getUserId } from "../utils/userId"; import { useIsMobile } from "../constants/global"; diff --git a/frontend/src/pages/GamesGrid/GamesGrid.tsx b/frontend/src/pages/GamesGrid.tsx similarity index 94% rename from frontend/src/pages/GamesGrid/GamesGrid.tsx rename to frontend/src/pages/GamesGrid.tsx index 69db842..6359375 100644 --- a/frontend/src/pages/GamesGrid/GamesGrid.tsx +++ b/frontend/src/pages/GamesGrid.tsx @@ -2,22 +2,21 @@ import { useEffect, useLayoutEffect, useMemo, useRef, useState } from "react"; import { gql } from "@apollo/client"; import { useQuery } from "@apollo/client/react"; import { useSearchParams } from "react-router-dom"; -import Header from "../../components/Header/Header"; -import Layout from "../../components/Layout/Layout"; -import Toolbar from "../../components/Toolbar/Toolbar"; -import GameListItem from "../../components/GameListItem/GameListItem"; +import Header from "../components/Header"; +import Layout from "../components/Layout"; +import Toolbar from "../components/Toolbar/Toolbar"; +import GameListItem from "../components/GameListItem"; import { GRID_PAGE_STORAGE_KEY, GRID_QUERY_STORAGE_KEY, -} from "../../constants/storageKeys"; +} from "../constants/storageKeys"; import { DEFAULT_SORT, hasActiveFilters, type GameFilters, type SortField, type SortState, -} from "../../types/gameQuery"; -import styles from "./GamesGrid.module.css"; +} from "../types/gameQuery"; const GET_GAMES = gql` query GetGames( @@ -255,7 +254,10 @@ export default function GamesGrid() { sort={sort} onSortChange={updateSort} /> -
+

{!loading && `${totalCount} game${totalCount === 1 ? "" : "s"} found`}

diff --git a/frontend/src/pages/GamesGrid/GamesGrid.module.css b/frontend/src/pages/GamesGrid/GamesGrid.module.css deleted file mode 100644 index 2daf25e..0000000 --- a/frontend/src/pages/GamesGrid/GamesGrid.module.css +++ /dev/null @@ -1,7 +0,0 @@ -.list { - display: flex; - flex-direction: column; - height: calc(100vh - var(--header-height) - var(--toolbar-height)); - overflow: hidden; -} - diff --git a/frontend/src/pages/MyRatings.tsx b/frontend/src/pages/MyRatings.tsx index 82efe80..24497d7 100644 --- a/frontend/src/pages/MyRatings.tsx +++ b/frontend/src/pages/MyRatings.tsx @@ -1,7 +1,7 @@ import { useMemo } from "react"; import { gql } from "@apollo/client"; import { useQuery } from "@apollo/client/react"; -import Header from "../components/Header/Header"; +import Header from "../components/Header"; import { getUserId } from "../utils/userId"; import Card from "react-bootstrap/esm/Card"; import StarRating from "../components/StarRating"; From 749b0cd9a0055d85955eee542339af75ea3ed77b Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Sun, 8 Nov 2026 13:18:05 +0100 Subject: [PATCH 02/35] fix: #61 - details reload the page --- frontend/src/pages/MyRatings.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/MyRatings.tsx b/frontend/src/pages/MyRatings.tsx index 24497d7..4dbdf31 100644 --- a/frontend/src/pages/MyRatings.tsx +++ b/frontend/src/pages/MyRatings.tsx @@ -6,6 +6,7 @@ import { getUserId } from "../utils/userId"; import Card from "react-bootstrap/esm/Card"; import StarRating from "../components/StarRating"; import { useIsMobile } from "../constants/global"; +import { Link } from "react-router-dom"; const GET_MY_REVIEWS = gql` query GetMyReviews($userId: String!) { @@ -109,9 +110,9 @@ export default function MyRatings() {
{ratings.map(({ game, score }) => (
- - +
))}
From 1bcf1e570a412149398fe9f04908393541d50920 Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Sun, 8 Nov 2026 13:31:30 +0100 Subject: [PATCH 03/35] fix: #48 - star size on mobile in MyRatings --- frontend/src/pages/MyRatings.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/MyRatings.tsx b/frontend/src/pages/MyRatings.tsx index 4dbdf31..b7e1102 100644 --- a/frontend/src/pages/MyRatings.tsx +++ b/frontend/src/pages/MyRatings.tsx @@ -107,7 +107,7 @@ export default function MyRatings() {

You haven’t rated any games yet.

)} {!error && ( -
+
{ratings.map(({ game, score }) => (
{game.name}
- +
From b2a0e507a674d3ec93acdbbdeac990f09db0ea4b Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Sun, 8 Nov 2026 13:54:06 +0100 Subject: [PATCH 04/35] fix: #48 - stars in game details on mobile --- frontend/src/pages/GameDetails.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/pages/GameDetails.tsx b/frontend/src/pages/GameDetails.tsx index c5869d6..80210c8 100644 --- a/frontend/src/pages/GameDetails.tsx +++ b/frontend/src/pages/GameDetails.tsx @@ -116,6 +116,7 @@ export default function GameDetails() { const { id } = useParams<{ id: string }>(); const isMobile = useIsMobile(); const userId = useMemo(() => getUserId(), []); + const imageSize: number = isMobile ? 150 : 220; const { data, loading, error } = useQuery(GET_GAME, { variables: { id }, @@ -207,21 +208,21 @@ export default function GameDetails() {

{game.name}

- + {game.name}

NTNU Rating

- +

Your Rating

- +
From 6a9fa0a55824e92d9bdf0dc78ecbef1b3bf580c7 Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Sun, 8 Nov 2026 14:05:28 +0100 Subject: [PATCH 05/35] fix: #63 - added border color grey for unchecked check items in Toolbar.css. --- frontend/src/components/Toolbar/Toolbar.module.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/components/Toolbar/Toolbar.module.css b/frontend/src/components/Toolbar/Toolbar.module.css index 52d9fb7..901e1a4 100644 --- a/frontend/src/components/Toolbar/Toolbar.module.css +++ b/frontend/src/components/Toolbar/Toolbar.module.css @@ -133,6 +133,10 @@ white-space: nowrap; } +.checkOption :global(.form-check-input:not(:checked)) { + border-color: grey; +} + .panelRow { display: flex; flex-wrap: wrap; From 97732efbcfb37efde36b34afaaee9fd4a1d00d4b Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Sun, 8 Nov 2026 14:20:09 +0100 Subject: [PATCH 06/35] fix: #55 - added missing lazy loads to images --- frontend/src/components/GameListItem.tsx | 4 +++- frontend/src/pages/GameDetails.tsx | 1 + frontend/src/pages/MyRatings.tsx | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/GameListItem.tsx b/frontend/src/components/GameListItem.tsx index e109f32..51e9be9 100644 --- a/frontend/src/components/GameListItem.tsx +++ b/frontend/src/components/GameListItem.tsx @@ -30,7 +30,9 @@ export default function GameListItem({ {title} + alt={title} + loading="lazy" + />

{title}

{year ?? "—"}

diff --git a/frontend/src/pages/GameDetails.tsx b/frontend/src/pages/GameDetails.tsx index 80210c8..f5c67ce 100644 --- a/frontend/src/pages/GameDetails.tsx +++ b/frontend/src/pages/GameDetails.tsx @@ -214,6 +214,7 @@ export default function GameDetails() { style={{ width: ` ${imageSize}px`, height: ` ${imageSize}px`, backgroundColor: `var(--color-stripe-odd)` }} src={game.imageUrl ?? ""} alt={game.name} + loading="lazy" />
diff --git a/frontend/src/pages/MyRatings.tsx b/frontend/src/pages/MyRatings.tsx index b7e1102..5ed0f19 100644 --- a/frontend/src/pages/MyRatings.tsx +++ b/frontend/src/pages/MyRatings.tsx @@ -123,6 +123,7 @@ export default function MyRatings() { height: "11rem", objectFit: "cover", }} + loading="lazy" /> {game.name} From 46192af53c89600f83b26a378ba6cdd544c03c5a Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Sun, 8 Nov 2026 14:35:16 +0100 Subject: [PATCH 07/35] fix: #68 - aria-label for icons on header --- frontend/src/components/Header.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 74bbb22..5e99558 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -57,7 +57,7 @@ export default function Header() { style={{ backgroundColor: "var(--color-brand)", height: "var(--header-height)" }} > - { isMobile ? : "Working Title" } + { isMobile ? : "Working Title" }
@@ -84,7 +84,7 @@ export default function Header() {
- { isMobile ? :"My Ratings" } + { isMobile ? :"My Ratings" }
); From a430a2698357dbbffcea3d0b1df54e428dd383ea Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Sun, 8 Nov 2026 14:43:20 +0100 Subject: [PATCH 08/35] fix: #56 - aria-labelledby is aria-label now --- frontend/src/pages/MyRatings.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/MyRatings.tsx b/frontend/src/pages/MyRatings.tsx index 5ed0f19..999bd44 100644 --- a/frontend/src/pages/MyRatings.tsx +++ b/frontend/src/pages/MyRatings.tsx @@ -86,7 +86,7 @@ export default function MyRatings() {
From d9693fa09813d90f70bf8a1ca76b516da9536e4f Mon Sep 17 00:00:00 2001 From: Halvor Thallaug Fagerli Date: Mon, 9 Nov 2026 16:23:38 +0100 Subject: [PATCH 09/35] build: added .env to .gitingore in /frontend --- frontend/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/.gitignore b/frontend/.gitignore index a547bf3..55c738a 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -12,6 +12,9 @@ dist dist-ssr *.local +# Env +.env + # Editor directories and files .vscode/* !.vscode/extensions.json From 0719bc2261b79864de141346837a4ae82731b280 Mon Sep 17 00:00:00 2001 From: Halvor Thallaug Fagerli Date: Mon, 9 Nov 2026 18:46:36 +0100 Subject: [PATCH 10/35] fix: Game now displays in correct size Game now displays in correct size even though there is only (max - n) to display #25 --- frontend/src/components/GameListItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/GameListItem.tsx b/frontend/src/components/GameListItem.tsx index 51e9be9..40bcb19 100644 --- a/frontend/src/components/GameListItem.tsx +++ b/frontend/src/components/GameListItem.tsx @@ -25,7 +25,7 @@ export default function GameListItem({ Date: Mon, 9 Nov 2026 22:00:53 +0100 Subject: [PATCH 11/35] fix: #64 - changed header text to text-light --- frontend/src/components/Header.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 5e99558..d4f0928 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -56,7 +56,7 @@ export default function Header() {
- + { isMobile ? : "Working Title" } @@ -83,7 +83,7 @@ export default function Header() { - + { isMobile ? :"My Ratings" }
From 63b33d193e2402f90452fe58104c6d922bb9c718 Mon Sep 17 00:00:00 2001 From: Halvor Thallaug Fagerli Date: Tue, 10 Nov 2026 15:22:19 +0100 Subject: [PATCH 12/35] revert: Changed flex back to "1 1 0" in GameListItem New fix made the previous change useless, so I changed it back #25 --- frontend/src/components/GameListItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/GameListItem.tsx b/frontend/src/components/GameListItem.tsx index 40bcb19..51e9be9 100644 --- a/frontend/src/components/GameListItem.tsx +++ b/frontend/src/components/GameListItem.tsx @@ -25,7 +25,7 @@ export default function GameListItem({ Date: Tue, 10 Nov 2026 15:24:43 +0100 Subject: [PATCH 13/35] fix: Changed amount of games showed Rather than just showing a dynamic amount varying on screen size, we now display a fixed amount of 20 games per page. This also suits feedback from user who wanted more games per page. Also a good solution for mobile to save jumping from page to page #25 --- frontend/src/pages/GamesGrid.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/GamesGrid.tsx b/frontend/src/pages/GamesGrid.tsx index 6359375..a45ffdf 100644 --- a/frontend/src/pages/GamesGrid.tsx +++ b/frontend/src/pages/GamesGrid.tsx @@ -201,7 +201,8 @@ export default function GamesGrid() { ) || 1; const updatePageSize = () => { - setPageSize(Math.max(1, Math.floor(listEl.clientHeight / rowMinHeight))); + //setPageSize(Math.max(1, Math.floor(listEl.clientHeight / rowMinHeight))); + setPageSize(20); }; updatePageSize(); @@ -255,7 +256,7 @@ export default function GamesGrid() { onSortChange={updateSort} />

From 6f850be49b7ee84df577ec1be4f75e53c1b98759 Mon Sep 17 00:00:00 2001 From: Halvor Thallaug Fagerli Date: Tue, 10 Nov 2026 16:46:23 +0100 Subject: [PATCH 14/35] fix: Truncation added for text In cases of text overflow in titles and tags, the text will now truncate #73 --- frontend/src/components/GameListItem.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/GameListItem.tsx b/frontend/src/components/GameListItem.tsx index 51e9be9..c3b8848 100644 --- a/frontend/src/components/GameListItem.tsx +++ b/frontend/src/components/GameListItem.tsx @@ -33,10 +33,10 @@ export default function GameListItem({ alt={title} loading="lazy" /> -

-

{title}

+
+

{title}

{year ?? "—"}

-

{tags || "—"}

+

{tags || "—"}

From 41cd848391226aabdf370d50bdf4119851c85d66 Mon Sep 17 00:00:00 2001 From: Halvor Thallaug Fagerli Date: Tue, 10 Nov 2026 18:05:22 +0100 Subject: [PATCH 15/35] fix: Partial control of input Min + max has been set for yearFrom and yearTo inputs, but only works for the arrows! Needs further work... --- frontend/src/components/Toolbar/Toolbar.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/components/Toolbar/Toolbar.tsx b/frontend/src/components/Toolbar/Toolbar.tsx index 29d9caa..7619b23 100644 --- a/frontend/src/components/Toolbar/Toolbar.tsx +++ b/frontend/src/components/Toolbar/Toolbar.tsx @@ -274,6 +274,8 @@ function FilterPanel({ filters, onApply, onClose }: FilterPanelProps) { type="number" inputMode="numeric" placeholder="Year" + min="1970" + max="2026" value={draft.yearFrom ?? ""} onChange={(event: ChangeEvent) => setDraft((d) => ({ @@ -290,6 +292,8 @@ function FilterPanel({ filters, onApply, onClose }: FilterPanelProps) { type="number" inputMode="numeric" placeholder="Year" + min={draft.yearFrom?.valueOf() ?? 1970} + max="2026" value={draft.yearTo ?? ""} onChange={(event: ChangeEvent) => setDraft((d) => ({ From 9217bb194b94189b573259b231832b19792d06e9 Mon Sep 17 00:00:00 2001 From: Halvor Thallaug Fagerli Date: Tue, 10 Nov 2026 19:43:37 +0100 Subject: [PATCH 16/35] fix: Change in score text Changed the score number from "out of 10" to "out of 5" with `score/2` as the showing score. This is to be consistent with the amount of stars. This will hopefully fix the problem with score showing as a date as well #69 --- frontend/src/components/StarRating.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/StarRating.tsx b/frontend/src/components/StarRating.tsx index 2e56e7b..0e29a24 100644 --- a/frontend/src/components/StarRating.tsx +++ b/frontend/src/components/StarRating.tsx @@ -118,7 +118,7 @@ export default function StarRating({ })}

- {score == null ? "Not yet rated" : `${Number.isInteger(score) ? score.toFixed(0) : score.toFixed(1)}/10`} + {score == null ? "Not yet rated" : `${score/2}/5 stars`}

); From 1a914a1a6606fb13ad1f13d61bc10cee211dc83b Mon Sep 17 00:00:00 2001 From: Halvor Thallaug Fagerli Date: Wed, 11 Nov 2026 20:13:59 +0100 Subject: [PATCH 17/35] feat: Added YEAR_OPTIONS Added array with options for years for the "Year" Select objects in Toolbar.tsx --- frontend/src/constants/filterOptions.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/frontend/src/constants/filterOptions.ts b/frontend/src/constants/filterOptions.ts index e876034..e1a968a 100644 --- a/frontend/src/constants/filterOptions.ts +++ b/frontend/src/constants/filterOptions.ts @@ -74,6 +74,17 @@ export const ESRB_OPTIONS = [ "Rating Pending", ] as const; +export const YEAR_OPTIONS = [ + 1984, 1985, 1986, 1987, 1988, 1989, + 1990, 1991, 1992, 1993, 1994, + 1995, 1996, 1997, 1998, 1999, + 2000, 2001, 2002, 2003, 2004, + 2005, 2006, 2007, 2008, 2009, + 2010, 2011, 2012, 2013, 2014, + 2015, 2016, 2017, 2018, 2019, + 2020, // Games imported are only up to 2020 +] as const; + export const SORT_FIELD_OPTIONS = [ { value: "NAME", label: "Name" }, { value: "RELEASE_DATE", label: "Release date" }, From 43888f8cf8643e147b58558e6c8f4db6a8e57ac3 Mon Sep 17 00:00:00 2001 From: Halvor Thallaug Fagerli Date: Wed, 11 Nov 2026 20:18:40 +0100 Subject: [PATCH 18/35] feat: Changed yearFrom and yearTo to Select objects `yearFrom` and `yearTo` are now changeable via Select object rather than being input objects. `yearTo` only displays valid years (after `yearFrom`). Known bug: when changing `yearFrom` to a year ealier than `yearTo` and applying filter, `yearTo` changes to `Year`, but gives result "No games match these filters." --- frontend/src/components/Toolbar/Toolbar.tsx | 40 ++++++++++++--------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/Toolbar/Toolbar.tsx b/frontend/src/components/Toolbar/Toolbar.tsx index 7619b23..9f10ee8 100644 --- a/frontend/src/components/Toolbar/Toolbar.tsx +++ b/frontend/src/components/Toolbar/Toolbar.tsx @@ -14,6 +14,7 @@ import { PLATFORM_OPTIONS, SORT_FIELD_OPTIONS, TAG_OPTIONS, + YEAR_OPTIONS, } from "../../constants/filterOptions"; import type { GameFilters, SortField, SortState } from "../../types/gameQuery"; import { EMPTY_FILTERS, hasActiveFilters } from "../../types/gameQuery"; @@ -270,38 +271,45 @@ function FilterPanel({ filters, onApply, onClose }: FilterPanelProps) { Released from - ) => + onChange={(event: ChangeEvent) => setDraft((d) => ({ ...d, yearFrom: event.target.value ? Number(event.target.value) : null, })) } - /> + > + + {YEAR_OPTIONS.map((year) => ( + + ))} + Released to - ) => + onChange={(event: ChangeEvent) => setDraft((d) => ({ ...d, yearTo: event.target.value ? Number(event.target.value) : null, })) } - /> + > + + {YEAR_OPTIONS.filter(year => { + if (draft.yearFrom == null) return ; + else if (year >= draft.yearFrom) return ; + }).map(filterYear => ( + + ))} + From a6d5c4abe4d0fa245413209a99a6a71fa483948f Mon Sep 17 00:00:00 2001 From: joelte Date: Fri, 13 Nov 2026 14:02:49 +0100 Subject: [PATCH 19/35] feat: Add remove rating button Implemented a x button that lets a user delete their rating from the gamedetails page. --- frontend/src/components/StarRating.tsx | 111 +++++++++++++++---------- frontend/src/pages/GameDetails.tsx | 38 ++++++++- server/src/resolvers/mutation.ts | 6 +- server/src/schema/typeDefs.ts | 1 + server/src/services/reviewService.ts | 13 +++ 5 files changed, 120 insertions(+), 49 deletions(-) diff --git a/frontend/src/components/StarRating.tsx b/frontend/src/components/StarRating.tsx index 0e29a24..dcd41bf 100644 --- a/frontend/src/components/StarRating.tsx +++ b/frontend/src/components/StarRating.tsx @@ -1,6 +1,6 @@ import { useRef, useState } from "react"; import type { KeyboardEvent, MouseEvent } from "react"; -import { Star, StarFill, StarHalf } from "react-bootstrap-icons"; +import { Star, StarFill, StarHalf, XCircle } from "react-bootstrap-icons"; const STAR_COUNT = 5; // Ratings are out of 10 server-side, so each star covers two points and a @@ -10,6 +10,7 @@ const POINTS_PER_STAR = 2; interface StarRatingProps { score: number | null; // 0-10, null when no rating exists yet onChange?: (score: number) => void; + onDelete?: () => void; disabled?: boolean; size?: number; scorePosition?: "bottom" | "right"; @@ -40,6 +41,7 @@ function starValueFromPointer(clientX: number, rect: DOMRect): number { export default function StarRating({ score, onChange, + onDelete, disabled = false, size = 2, scorePosition = "bottom", @@ -71,51 +73,68 @@ export default function StarRating({ return (
-
setHovered(scoreFromPointer(event)) : undefined - } - onMouseLeave={canInteract ? () => setHovered(null) : undefined} - onClick={ - canInteract - ? (event) => { - const value = scoreFromPointer(event); - if (value != null) onChange?.(value); - } - : undefined - } - onKeyDown={canInteract ? handleKeyDown : undefined} - > - {Array.from({ length: STAR_COUNT }, (_, i) => i + 1).map((starIndex) => { - const fill = fillFor(displayed, starIndex); - return ( - - ); - })} +
+
setHovered(scoreFromPointer(event)) : undefined + } + onMouseLeave={canInteract ? () => setHovered(null) : undefined} + onClick={ + canInteract + ? (event) => { + const value = scoreFromPointer(event); + if (value != null) onChange?.(value); + } + : undefined + } + onKeyDown={canInteract ? handleKeyDown : undefined} + > + {Array.from({ length: STAR_COUNT }, (_, i) => i + 1).map((starIndex) => { + const fill = fillFor(displayed, starIndex); + return ( + + ); + })} +
+ {onDelete && score != null && ( + + )}

{score == null ? "Not yet rated" : `${score/2}/5 stars`} diff --git a/frontend/src/pages/GameDetails.tsx b/frontend/src/pages/GameDetails.tsx index f5c67ce..649ed16 100644 --- a/frontend/src/pages/GameDetails.tsx +++ b/frontend/src/pages/GameDetails.tsx @@ -48,6 +48,16 @@ const RATE_GAME = gql` } `; +const DELETE_RATING = gql` + mutation DeleteRating($gameId: ID!, $userId: String!) { + deleteRating(gameId: $gameId, userId: $userId) { + id + averageScore + reviewCount + } + } +`; + interface GameData { game: { id: string; @@ -126,6 +136,19 @@ export default function GameDetails() { variables: { userId }, }); const [rateGame] = useMutation(RATE_GAME); + const [deleteRating] = useMutation(DELETE_RATING, { + update(cache, _result, { variables }) { + cache.updateQuery( + { query: GET_MY_REVIEW, variables: { userId: variables?.userId } }, + (data) => + data && { + myReviews: data.myReviews.filter( + (review) => review.gameId !== variables?.gameId, + ), + }, + ); + }, + }); const game = data?.game; const savedScore = @@ -138,7 +161,7 @@ export default function GameDetails() { // is only sent once they leave this page (see the effect below). Scoped // to the current game id so switching games falls back to that game's // own saved score instead of carrying the previous game's override. - const [override, setOverride] = useState<{ id: string; score: number } | null>( + const [override, setOverride] = useState<{ id: string; score: number | null } | null>( null, ); const draftScore = @@ -188,6 +211,12 @@ export default function GameDetails() { setOverride({ id, score }); } + function handleDeleteRating() { + if (!id) return; + setOverride({ id, score: null }); + deleteRating({ variables: { gameId: id, userId } }); + } + return ( <>

@@ -223,7 +252,12 @@ export default function GameDetails() {

Your Rating

- +
diff --git a/server/src/resolvers/mutation.ts b/server/src/resolvers/mutation.ts index 7114705..dc20fc6 100644 --- a/server/src/resolvers/mutation.ts +++ b/server/src/resolvers/mutation.ts @@ -1,8 +1,12 @@ -import { rateGame } from '../services/reviewService.js' +import { rateGame, deleteRating } from '../services/reviewService.js' export const Mutation = { rateGame: ( _parent: unknown, args: { gameId: string; userId: string; score: number }, ) => rateGame(args.gameId, args.userId, args.score), + deleteRating: ( + _parent: unknown, + args: { gameId: string; userId: string }, + ) => deleteRating(args.gameId, args.userId), } diff --git a/server/src/schema/typeDefs.ts b/server/src/schema/typeDefs.ts index 20bbe5b..5058897 100644 --- a/server/src/schema/typeDefs.ts +++ b/server/src/schema/typeDefs.ts @@ -65,5 +65,6 @@ export const typeDefs = `#graphql type Mutation { rateGame(gameId: ID!, userId: String!, score: Int!): Game! + deleteRating(gameId: ID!, userId: String!): Game! } ` diff --git a/server/src/services/reviewService.ts b/server/src/services/reviewService.ts index a6d5d56..123b3b0 100644 --- a/server/src/services/reviewService.ts +++ b/server/src/services/reviewService.ts @@ -45,3 +45,16 @@ export async function rateGame(gameId: string, userId: string, score: number) { return recomputeGameAggregates(gameObjectId) } + +export async function deleteRating(gameId: string, userId: string) { + const game = await Game.findById(gameId) + if (!game) { + throw new GraphQLError('Game not found', { extensions: { code: 'BAD_USER_INPUT' } }) + } + + const gameObjectId = new Types.ObjectId(gameId) + + await Review.deleteOne({ gameId: gameObjectId, userId }) + + return recomputeGameAggregates(gameObjectId) +} From 6340bb37afed946041d1acd0cf200499fe82692b Mon Sep 17 00:00:00 2001 From: joelte Date: Fri, 13 Nov 2026 14:29:57 +0100 Subject: [PATCH 20/35] fix: Fix decimal places not rounding Average scores now round to nearest 2 decimals when relevant in the UI. --- frontend/src/components/StarRating.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/StarRating.tsx b/frontend/src/components/StarRating.tsx index dcd41bf..895444c 100644 --- a/frontend/src/components/StarRating.tsx +++ b/frontend/src/components/StarRating.tsx @@ -137,7 +137,7 @@ export default function StarRating({ )}

- {score == null ? "Not yet rated" : `${score/2}/5 stars`} + {score == null ? "Not yet rated" : `${Math.round((score / 2) * 100) / 100}/5 stars`}

); From b3aebdaff717adf23f569fc82a83f9a7c745c22b Mon Sep 17 00:00:00 2001 From: joelte Date: Fri, 13 Nov 2026 14:59:01 +0100 Subject: [PATCH 21/35] docs: Update ai-usage Updated ai-usage.md with info ralating to delivery 2 and 3 --- docs/ai-usage.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/ai-usage.md b/docs/ai-usage.md index 7b75d5e..30889bc 100644 --- a/docs/ai-usage.md +++ b/docs/ai-usage.md @@ -7,4 +7,17 @@ This file documents how we use AI tools in the project. | Tool | Used for | How we checked the output | | --- | --- | --- | | Claude (Anthropic) / Opus 5.5 (medium)| Refactoring our written specification into a structured README format. | The group wrote the content and made all decisions: app idea, dataset, data model, functionality and tech stack. We reviewed the result against our own notes and the project requirements, and corrected inconsistencies before committing. | -| Claude (Anthropic) / Sonnet 5 | Scaffolding the backend (`server/`): project setup, Mongoose schema/index design, the `averageScore`/`reviewCount` recompute strategy for ratings, the CSV ingestion script, GraphQL resolvers, and integration tests. Database choice (MongoDB) was decided by the group. | We reviewed the generated code against the README's data model and functionality requirements, checked proposed package versions for compatibility, and verified behavior by running the backend locally against Apollo Sandbox and the automated test suite before committing. | \ No newline at end of file +| Claude (Anthropic) / Sonnet 5 | Scaffolding the backend (`server/`): project setup, Mongoose schema/index design, the `averageScore`/`reviewCount` recompute strategy for ratings, the CSV ingestion script, GraphQL resolvers, and integration tests. Database choice (MongoDB) was decided by the group. | We reviewed the generated code against the README's data model and functionality requirements, checked proposed package versions for compatibility, and verified behavior by running the backend locally against Apollo Sandbox and the automated test suite before committing. | + +## Delivery 2 + +| Tool | Used for | How we checked the output | +| --- | --- | --- | +| Claude (Anthropic) / Sonnet 5 | Writing tests, keeping documentation in sync with new features and decisions, and assisting with debugging and error handling. | We reviewed and ran the tests locally, read through the documentation changes for accuracy, and verified fixes by reproducing the original issues before committing. | + +## Delivery 3 + +| Tool | Used for | How we checked the output | +| --- | --- | --- | +| Claude (Anthropic) / Sonnet 5 | Same as Delivery 2: writing tests, keeping documentation in sync with new features and decisions, and assisting with debugging and error handling. | We reviewed and ran the tests locally, read through the documentation changes for accuracy, and verified fixes by reproducing the original issues before committing. | +| Claude (Anthropic) / Opus 5.5 | Assisting with error handling during deployment to the VM. | We tested the deployment on the VM and confirmed the errors were resolved before committing. | \ No newline at end of file From de495fb10941a8f5ecdee3d71811a15f65c84267 Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Sat, 14 Nov 2026 00:00:49 +0100 Subject: [PATCH 22/35] feat: Add rating alert and timeout --- frontend/src/pages/GameDetails.tsx | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/GameDetails.tsx b/frontend/src/pages/GameDetails.tsx index f5c67ce..ff80aa8 100644 --- a/frontend/src/pages/GameDetails.tsx +++ b/frontend/src/pages/GameDetails.tsx @@ -1,5 +1,5 @@ import { useEffect, useMemo, useRef, useState } from "react"; -import { Image, Stack } from "react-bootstrap"; +import { Alert, Image, Stack } from "react-bootstrap"; import { useParams } from "react-router-dom"; import { gql } from "@apollo/client"; import { useMutation, useQuery } from "@apollo/client/react"; @@ -117,6 +117,8 @@ export default function GameDetails() { const isMobile = useIsMobile(); const userId = useMemo(() => getUserId(), []); const imageSize: number = isMobile ? 150 : 220; + const [alertingUser, setAlertingUser] = useState(false); + const alertTimeout = useRef | null>(null); const { data, loading, error } = useQuery(GET_GAME, { variables: { id }, @@ -127,6 +129,12 @@ export default function GameDetails() { }); const [rateGame] = useMutation(RATE_GAME); + useEffect(() => { + return () => { + if (alertTimeout.current) clearTimeout(alertTimeout.current); + }; + }, []); + const game = data?.game; const savedScore = myReviewData?.myReviews.find((review) => review.gameId === id)?.score ?? @@ -186,12 +194,27 @@ export default function GameDetails() { function handleRate(score: number) { if (!id) return; setOverride({ id, score }); + setAlertingUser(true); + if (alertTimeout.current) clearTimeout(alertTimeout.current); + alertTimeout.current = setTimeout(() => setAlertingUser(false), 3000); } return ( <>
+ {alertingUser && ( + + Your rating is locally stored and will be updated next time you are here. + + )}
{loading && !data &&

Loading…

} {!loading && (error || !game) && ( From 250c3c9ba8e5148e896dc9a58a337d1b84a4793a Mon Sep 17 00:00:00 2001 From: Halvor Thallaug Fagerli Date: Sun, 15 Nov 2026 14:07:37 +0100 Subject: [PATCH 23/35] fix: Changes yearTo = null if yearFrom is newer year Fixes problems with #60 and #81 and eliminates problems when setting release year filters #60 #81 --- frontend/src/components/Toolbar/Toolbar.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Toolbar/Toolbar.tsx b/frontend/src/components/Toolbar/Toolbar.tsx index 9f10ee8..85af415 100644 --- a/frontend/src/components/Toolbar/Toolbar.tsx +++ b/frontend/src/components/Toolbar/Toolbar.tsx @@ -286,6 +286,7 @@ function FilterPanel({ filters, onApply, onClose }: FilterPanelProps) { {year} ))} + @@ -293,17 +294,20 @@ function FilterPanel({ filters, onApply, onClose }: FilterPanelProps) { Released to ) => + onChange={(event: ChangeEvent) => { setDraft((d) => ({ ...d, yearTo: event.target.value ? Number(event.target.value) : null, })) - } + console.log(event.target.value); + }} > {YEAR_OPTIONS.filter(year => { if (draft.yearFrom == null) return ; else if (year >= draft.yearFrom) return ; + // If someone changes yearFrom to a later year than yearTo + else if (Number(draft.yearTo) < draft.yearFrom) draft.yearTo = null; }).map(filterYear => (
+ ); } From 46b6281e12310241ce493883c5dcf860f887e5fe Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Mon, 16 Nov 2026 10:18:18 +0100 Subject: [PATCH 31/35] fix: finalize title --- frontend/index.html | 2 +- frontend/src/components/Header.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index d4263e3..b20be89 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,7 +4,7 @@ - it2810-t33-p2 + NTNU GameShelf
diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 8eb7726..26c4fd8 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -58,7 +58,7 @@ export default function Header() { > From c0560c4cc5f9d437e3d1fc648736669d825129c4 Mon Sep 17 00:00:00 2001 From: joelte Date: Mon, 16 Nov 2026 10:21:04 +0100 Subject: [PATCH 32/35] test: Make tests for GameList, Header, Layout, StarRating and Toolbar Created the setup for and implementation of tests for GameList, Header, Layout, StarRating and Toolbar. Added dev dependencies: @testing-library/react, @testing-library/jest-dom, @testing-library/user-event, jsdom --- frontend/package-lock.json | 594 ++++++++++++++++++ frontend/package.json | 4 + frontend/src/components/GameListItem.test.tsx | 46 ++ frontend/src/components/Header.test.tsx | 80 +++ frontend/src/components/Layout.test.tsx | 14 + frontend/src/components/StarRating.test.tsx | 79 +++ .../src/components/Toolbar/Toolbar.test.tsx | 142 +++++ frontend/src/test/setup.ts | 22 + frontend/vite.config.ts | 8 +- 9 files changed, 987 insertions(+), 2 deletions(-) create mode 100644 frontend/src/components/GameListItem.test.tsx create mode 100644 frontend/src/components/Header.test.tsx create mode 100644 frontend/src/components/Layout.test.tsx create mode 100644 frontend/src/components/StarRating.test.tsx create mode 100644 frontend/src/components/Toolbar/Toolbar.test.tsx create mode 100644 frontend/src/test/setup.ts diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 519bdb9..33da54e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -24,6 +24,9 @@ "@babel/core": "^7.29.7", "@eslint/js": "^10.0.1", "@rolldown/plugin-babel": "^0.2.3", + "@testing-library/jest-dom": "^7.0.1", + "@testing-library/react": "^16.3.3", + "@testing-library/user-event": "^14.6.12", "@types/babel__core": "^7.20.5", "@types/node": "^24.13.3", "@types/react": "^19.2.18", @@ -35,6 +38,7 @@ "eslint-plugin-react-hooks": "^7.1.1", "eslint-plugin-react-refresh": "^0.5.6", "globals": "^17.12.0", + "jsdom": "^31.0.1", "prettier": "3.9.9", "typescript": "~6.0.2", "typescript-eslint": "^8.69.0", @@ -42,6 +46,13 @@ "vitest": "^5.1.0" } }, + "node_modules/@adobe/css-tools": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.5.0.tgz", + "integrity": "sha512-6OzddxPio9UiWTCemp4N8cYLV2ZN1ncRnV1cVGtve7dhPOtRkleRyx32GQCYSwDYgaHU3USMm84tNsvKzRCa1Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@apollo/client": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/@apollo/client/-/client-4.3.1.tgz", @@ -480,6 +491,24 @@ "node": "^20.19.0 || ^22.13.0 || >=24" } }, + "node_modules/@exodus/bytes": { + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.16.0.tgz", + "integrity": "sha512-IcpW84uEn3N7ETtNZMlxKhfl6Pec8rUNGOTBtWbK1FKhJxIFAptZyVrvVRVBimAJxJCgc3PxepxkdWWG4DVzfA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + }, + "peerDependencies": { + "@noble/hashes": "^1.8.0 || ^2.0.0" + }, + "peerDependenciesMeta": { + "@noble/hashes": { + "optional": true + } + } + }, "node_modules/@graphql-typed-document-node/core": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz", @@ -1042,6 +1071,113 @@ "tslib": "^2.8.0" } }, + "node_modules/@testing-library/dom": { + "version": "10.4.2", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.2.tgz", + "integrity": "sha512-yzr2S9HyAIdhz2/6qHgbs665Q7PKVcDF05vsOlHPxG1mo36gKVesdYVeDLnXgfjJ03CrKRk08knc6+E/9m8v2Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.3.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "picocolors": "1.1.1", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@testing-library/jest-dom": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-7.0.1.tgz", + "integrity": "sha512-oMDTC3oA+6CXSO2JZnvOI7CA6oVub6kij5ggk9ohwye5slmkwxYDXcPOVxgMw/RQlticjtO0C1RZkR97HgrWMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@adobe/css-tools": "^4.4.0", + "aria-query": "^5.0.0", + "css.escape": "^1.5.1", + "dom-accessibility-api": "^0.6.3", + "picocolors": "^1.1.1", + "redent": "^3.0.0" + }, + "engines": { + "node": ">=22", + "npm": ">=6", + "yarn": ">=1" + }, + "peerDependencies": { + "@testing-library/dom": ">=10 <11", + "vitest": ">= 0.32" + }, + "peerDependenciesMeta": { + "vitest": { + "optional": true + } + } + }, + "node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz", + "integrity": "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@testing-library/react": { + "version": "16.3.3", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.3.tgz", + "integrity": "sha512-Uo193NgQbPMz6lrrhtRQQFcMC6Re/ELLFbbuVL30WDlZxlpZf9/lMHTAVxPRLw1q1iu9OJmR1c2BLiENRstdBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.12.5" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@testing-library/dom": "^10.0.0", + "@types/react": "^18.0.0 || ^19.0.0", + "@types/react-dom": "^18.0.0 || ^19.0.0", + "react": "^18.0.0 || ^19.0.0", + "react-dom": "^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@testing-library/user-event": { + "version": "14.6.12", + "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.12.tgz", + "integrity": "sha512-8yQV8v+eToBhsUO4oYrZY7fzhpTEMZx4IDx0/iuER/x0Xuy0NdqQOhsaaUNlvXE03N7vQ+4RCXUieKC0NJty9w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12", + "npm": ">=6" + }, + "peerDependencies": { + "@testing-library/dom": ">=7.21.4" + } + }, + "node_modules/@types/aria-query": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", + "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -1575,6 +1711,31 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/aria-hidden": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz", @@ -1587,6 +1748,16 @@ "node": ">=10" } }, + "node_modules/aria-query": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "dequal": "^2.0.3" + } + }, "node_modules/assertion-error": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", @@ -1630,6 +1801,33 @@ "node": ">=6.0.0" } }, + "node_modules/bcp-47": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/bcp-47/-/bcp-47-2.1.2.tgz", + "integrity": "sha512-wsv86UuNFuPnVieKLyECTT+CP1WSAHeoIg5P3xu2kA9Z+7fVPoKt7dxzSeEhtJel0AI+NW3fIW3KtTKQKUCngg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-alphabetical": "^2.0.0", + "is-alphanumerical": "^2.0.0", + "is-decimal": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/bcp-47-match": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/bcp-47-match/-/bcp-47-match-2.0.3.tgz", + "integrity": "sha512-JtTezzbAibu8G0R9op9zb3vcWZd9JF6M0xOYGPn0fNCd7wOpRB1mU2mH9T8gaBGbAAyIIVgB2G7xG0GP98zMAQ==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/bootstrap": { "version": "5.3.8", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz", @@ -1797,12 +1995,33 @@ "integrity": "sha512-COtn4EROW5dBGlE/4PiKnh6rZpAPxDeFLaEEwt4i10jpDMFt2EhQGS79QmmrO+iKCHv0PU/HrOWEhijFd1x99Q==", "license": "BSD" }, + "node_modules/css.escape": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", + "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==", + "dev": true, + "license": "MIT" + }, "node_modules/csstype": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", "license": "MIT" }, + "node_modules/data-urls": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-8.0.0.tgz", + "integrity": "sha512-JQUCCK+/CAGbGGx618PlFZMXH81Jtj7t73CHv9dd/zVWvxgGT2zLFRjnKb+Ng46GIwcy+f7f88qd4duqllK+WQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-mimetype": "^5.0.0", + "whatwg-url": "^17.1.2" + }, + "engines": { + "node": "^22.14.0 || >=24.0.0" + } + }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -1821,6 +2040,13 @@ } } }, + "node_modules/decimal.js": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz", + "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==", + "dev": true, + "license": "MIT" + }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -1847,6 +2073,14 @@ "node": ">=8" } }, + "node_modules/dom-accessibility-api": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", + "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/dom-helpers": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", @@ -1864,6 +2098,19 @@ "dev": true, "license": "ISC" }, + "node_modules/entities": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-9.0.0.tgz", + "integrity": "sha512-oJFNDJg3kTPwAD1cNn2+WmUq4wFoo09npc3Ydf1D7ED4smRiWrsKnaLxykrTWgyGEcusc87P5dxlAleol9kpkg==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=20.19.0" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/es-module-lexer": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.2.tgz", @@ -2312,6 +2559,19 @@ "dev": true, "license": "MIT" }, + "node_modules/html-encoding-sniffer": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-7.0.0.tgz", + "integrity": "sha512-UikN5yr7xsCDAq87Or5or0PAlD3HJJOKVzM05az588WnpDJ4Ux7a2A53Qi6gofGg2/EtvF/H4hCi/TXfCW4Y6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@exodus/bytes": "^1.15.1" + }, + "engines": { + "node": "^22.13.0 || >=24.0.0" + } + }, "node_modules/hyphenate-style-name": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz", @@ -2338,6 +2598,16 @@ "node": ">=0.8.19" } }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -2347,6 +2617,43 @@ "loose-envify": "^1.0.0" } }, + "node_modules/is-alphabetical": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-2.0.1.tgz", + "integrity": "sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-alphanumerical": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz", + "integrity": "sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-alphabetical": "^2.0.0", + "is-decimal": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/is-decimal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-2.0.1.tgz", + "integrity": "sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -2370,6 +2677,13 @@ "node": ">=0.10.0" } }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true, + "license": "MIT" + }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -2383,6 +2697,54 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "license": "MIT" }, + "node_modules/jsdom": { + "version": "31.0.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-31.0.1.tgz", + "integrity": "sha512-CbhJL8ZQg3eKswxSZth4QO9tW0jPIhmR0vtSXQSbKSfWbwIT6hoRc17wdHIVTQ43KI0mdV5iTJr3281IDgVZ5g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@exodus/bytes": "^1.16.0", + "bcp-47": "^2.1.2", + "bcp-47-match": "^2.0.3", + "data-urls": "^8.0.0", + "decimal.js": "^10.6.0", + "html-encoding-sniffer": "^7.0.0", + "is-potential-custom-element-name": "^1.0.1", + "lru-cache": "^11.5.3", + "parse5": "^8.1.0", + "parse5-parser-stream": "^8.1.0", + "saxes": "^6.0.0", + "tough-cookie": "^6.0.2", + "undici": "^8.12.3", + "w3c-xmlserializer": "^6.0.0", + "webidl-conversions": "^8.0.1", + "whatwg-mimetype": "^5.0.0", + "whatwg-url": "^17.3.0", + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": "^22.22.2 || ^24.15.0 || >=26.0.0" + }, + "peerDependencies": { + "@napi-rs/canvas": "^1.0.13" + }, + "peerDependenciesMeta": { + "@napi-rs/canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/lru-cache": { + "version": "11.5.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.3.tgz", + "integrity": "sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": "20 || >=22" + } + }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", @@ -2746,6 +3108,17 @@ "yallist": "^3.0.2" } }, + "node_modules/lz-string": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "lz-string": "bin/bin.js" + } + }, "node_modules/magic-string": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.5.tgz", @@ -2765,6 +3138,16 @@ "css-mediaquery": "^0.1.2" } }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/minimatch": { "version": "10.2.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", @@ -2908,6 +3291,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/parse5": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.1.1.tgz", + "integrity": "sha512-EcR/6WDcU7b2N3vQSxKALCk9lXGtUMQxXio008OEMBE0kavu/7JLfBEeFPzi43nMqVDSbEn3QCK+BMCc9zO//w==", + "dev": true, + "license": "MIT", + "dependencies": { + "entities": "^9.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5-parser-stream": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-8.1.1.tgz", + "integrity": "sha512-hMcVbbUJcQmP8rURWUdYrT1flRiBiBVjq/RYGguJpDUgIXSqdYKlE0CxthmdMWoSlBAuL5bUBa73g0pttSy7Hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "parse5": "^8.1.1" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -3002,6 +3411,30 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, + "node_modules/pretty-format": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/pretty-format/node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", @@ -3242,6 +3675,20 @@ "react-dom": ">=16.6.0" } }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/rolldown": { "version": "1.2.15", "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.15.tgz", @@ -3284,6 +3731,19 @@ "tslib": "^2.1.0" } }, + "node_modules/saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", + "dev": true, + "license": "ISC", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=v12.22.7" + } + }, "node_modules/scheduler": { "version": "0.28.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz", @@ -3351,6 +3811,19 @@ "dev": true, "license": "MIT" }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/tinybench": { "version": "6.2.3", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-6.2.3.tgz", @@ -3388,6 +3861,52 @@ "url": "https://github.com/sponsors/SuperchupuDev" } }, + "node_modules/tldts": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.5.4.tgz", + "integrity": "sha512-Rn2ABgjHZrA+jzqom5zhxA0hLohzYrIgfCPyhpTUxqsUrcsBYuab49LseR9waB9Jr8/MxdodvMHA91oRiGLO3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "tldts-core": "^7.5.4" + }, + "bin": { + "tldts": "bin/cli.js" + } + }, + "node_modules/tldts-core": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.5.4.tgz", + "integrity": "sha512-9+4zWtKEDZ3V3FoZ1B97rv+5z5oqp7yeXGVze3CxgQ+CJro9do9DCPD00wxstYZDXDMXsurkBerFfiB6GYtPbA==", + "dev": true, + "license": "MIT" + }, + "node_modules/tough-cookie": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.1.0.tgz", + "integrity": "sha512-FTxc8u8Kl2tz0Lat1u8ksvcy8bwHRyEMawwTWybo51JqaC6O7SvfuhAKg+Ld6VqyIe2QRJBzY9HA7y2WyFRT2w==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "tldts": "^7.0.5" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/tr46": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-7.0.0.tgz", + "integrity": "sha512-BcDSDW+SIGWVOns1Zm6Yg91q9AEj7eaID0QDY9oIqJD1A8dscNwMcl9Sms2DeuWCNov1X0/oXanHGYQBSLwZsg==", + "dev": true, + "license": "MIT", + "dependencies": { + "punycode": "^2.3.1" + }, + "engines": { + "node": "^22.14.0 || >=24.0.0" + } + }, "node_modules/ts-api-utils": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", @@ -3473,6 +3992,16 @@ "react": ">=15.0.0" } }, + "node_modules/undici": { + "version": "8.12.4", + "resolved": "https://registry.npmjs.org/undici/-/undici-8.12.4.tgz", + "integrity": "sha512-8Mx+uNKKER2bA4AdtedkqRbwUCIJFr2nJckXRe5yrDqzePqwLP7VNcctN8/XdmDSbF7mS+jJKIszlL+vbam1VA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=22.19.0" + } + }, "node_modules/undici-types": { "version": "7.24.6", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz", @@ -3702,6 +4231,19 @@ } } }, + "node_modules/w3c-xmlserializer": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-6.0.0.tgz", + "integrity": "sha512-4Nsy8K5Tr6SPDH9jhKJOHf7ChDrc1zufZTVSF7x72hwuEXBqxqk9G6cK+K2NRUtB3iELRJqjXb4JPDMBjMTl2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": "^22.22.2 || ^24.15.0 || >=26.0.0" + } + }, "node_modules/warning": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", @@ -3711,6 +4253,41 @@ "loose-envify": "^1.0.0" } }, + "node_modules/webidl-conversions": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz", + "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=20" + } + }, + "node_modules/whatwg-mimetype": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz", + "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + } + }, + "node_modules/whatwg-url": { + "version": "17.3.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-17.3.0.tgz", + "integrity": "sha512-KwOAJrpf+GTgBvcBQJcP38sMF0DsQKdwtG+TxM2pW44P6E5k0hDbWrDmyuJDIF0Uef0aQq0ZoJs+5oI+k8ddhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@exodus/bytes": "^1.16.0", + "tr46": "^7.0.0", + "webidl-conversions": "^8.0.1" + }, + "engines": { + "node": "^22.14.0 || >=24.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -3750,6 +4327,23 @@ "node": ">=0.10.0" } }, + "node_modules/xml-name-validator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true, + "license": "MIT" + }, "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index 7371f2d..23d983e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -27,6 +27,9 @@ "@babel/core": "^7.29.7", "@eslint/js": "^10.0.1", "@rolldown/plugin-babel": "^0.2.3", + "@testing-library/jest-dom": "^7.0.1", + "@testing-library/react": "^16.3.3", + "@testing-library/user-event": "^14.6.12", "@types/babel__core": "^7.20.5", "@types/node": "^24.13.3", "@types/react": "^19.2.18", @@ -38,6 +41,7 @@ "eslint-plugin-react-hooks": "^7.1.1", "eslint-plugin-react-refresh": "^0.5.6", "globals": "^17.12.0", + "jsdom": "^31.0.1", "prettier": "3.9.9", "typescript": "~6.0.2", "typescript-eslint": "^8.69.0", diff --git a/frontend/src/components/GameListItem.test.tsx b/frontend/src/components/GameListItem.test.tsx new file mode 100644 index 0000000..4244c16 --- /dev/null +++ b/frontend/src/components/GameListItem.test.tsx @@ -0,0 +1,46 @@ +import { describe, expect, it } from "vitest"; +import { render, screen } from "@testing-library/react"; +import { MemoryRouter } from "react-router-dom"; +import GameListItem from "./GameListItem"; + +function renderItem(overrides: Partial[0]> = {}) { + return render( + + + , + ); +} + +describe("GameListItem", () => { + it("renders the title, year, tags and image", () => { + renderItem(); + expect(screen.getByText("Great Game")).toBeInTheDocument(); + expect(screen.getByText("2020")).toBeInTheDocument(); + expect(screen.getByText("Action, Adventure")).toBeInTheDocument(); + expect(screen.getByRole("img", { name: "Great Game" })).toHaveAttribute("src", "/game.png"); + }); + + it("falls back to an em dash when year or tags are missing", () => { + renderItem({ year: null, tags: "" }); + expect(screen.getAllByText("—")).toHaveLength(2); + }); + + it("links to the game's detail page", () => { + renderItem({ id: "456" }); + expect(screen.getByRole("link")).toHaveAttribute("href", "/project2/games/456"); + }); + + it("renders the star rating for the given score", () => { + renderItem({ rating: 10 }); + expect(screen.getByText("5/5 stars")).toBeInTheDocument(); + }); +}); diff --git a/frontend/src/components/Header.test.tsx b/frontend/src/components/Header.test.tsx new file mode 100644 index 0000000..616f198 --- /dev/null +++ b/frontend/src/components/Header.test.tsx @@ -0,0 +1,80 @@ +import { beforeEach, describe, expect, it, vi } from "vitest"; +import { render, screen } from "@testing-library/react"; +import userEvent from "@testing-library/user-event"; +import { MemoryRouter } from "react-router-dom"; +import Header from "./Header"; +import { GRID_QUERY_STORAGE_KEY } from "../constants/storageKeys"; + +const navigateMock = vi.fn(); + +vi.mock("react-router-dom", async (importOriginal) => { + const actual = await importOriginal(); + return { ...actual, useNavigate: () => navigateMock }; +}); + +function renderHeader(initialEntry: string) { + return render( + +
+ , + ); +} + +describe("Header", () => { + beforeEach(() => { + navigateMock.mockClear(); + sessionStorage.clear(); + }); + + it("renders the wordmark, search field and My Ratings link", () => { + renderHeader("/project2"); + expect(screen.getByText("Working Title")).toBeInTheDocument(); + expect(screen.getByPlaceholderText("Search games...")).toHaveValue(""); + expect(screen.getByText("My Ratings")).toBeInTheDocument(); + expect(screen.queryByRole("button", { name: "Clear" })).not.toBeInTheDocument(); + }); + + it("prefills the search field from the current search param", () => { + renderHeader("/project2?search=zelda"); + expect(screen.getByPlaceholderText("Search games...")).toHaveValue("zelda"); + expect(screen.getByRole("button", { name: "Clear" })).toBeInTheDocument(); + }); + + it("navigates with the trimmed search term on submit", async () => { + const user = userEvent.setup(); + renderHeader("/project2"); + await user.type(screen.getByPlaceholderText("Search games..."), " mario "); + await user.click(screen.getByRole("button", { name: "Search" })); + expect(navigateMock).toHaveBeenCalledWith("/project2/?search=mario"); + }); + + it("clears the search term and navigates without it", async () => { + const user = userEvent.setup(); + renderHeader("/project2?search=zelda"); + await user.click(screen.getByRole("button", { name: "Clear" })); + expect(screen.getByPlaceholderText("Search games...")).toHaveValue(""); + expect(navigateMock).toHaveBeenCalledWith("/project2/?"); + }); + + it("links home to the current query on the grid page", () => { + renderHeader("/project2?search=zelda"); + expect(screen.getByText("Working Title").closest("a")).toHaveAttribute( + "href", + "/project2/?search=zelda", + ); + }); + + it("links home to the persisted grid query from other pages", () => { + sessionStorage.setItem(GRID_QUERY_STORAGE_KEY, "search=bar"); + renderHeader("/project2/my-ratings"); + expect(screen.getByText("Working Title").closest("a")).toHaveAttribute( + "href", + "/project2/?search=bar", + ); + }); + + it("links home plainly when there is no persisted query", () => { + renderHeader("/project2/my-ratings"); + expect(screen.getByText("Working Title").closest("a")).toHaveAttribute("href", "/project2"); + }); +}); diff --git a/frontend/src/components/Layout.test.tsx b/frontend/src/components/Layout.test.tsx new file mode 100644 index 0000000..4d2204c --- /dev/null +++ b/frontend/src/components/Layout.test.tsx @@ -0,0 +1,14 @@ +import { describe, expect, it } from "vitest"; +import { render, screen } from "@testing-library/react"; +import Layout from "./Layout"; + +describe("Layout", () => { + it("renders its children", () => { + render( + +

Page content

+
, + ); + expect(screen.getByText("Page content")).toBeInTheDocument(); + }); +}); diff --git a/frontend/src/components/StarRating.test.tsx b/frontend/src/components/StarRating.test.tsx new file mode 100644 index 0000000..7a990fa --- /dev/null +++ b/frontend/src/components/StarRating.test.tsx @@ -0,0 +1,79 @@ +import { describe, expect, it, vi } from "vitest"; +import { fireEvent, render, screen } from "@testing-library/react"; +import StarRating from "./StarRating"; + +function mockRowWidth(width: number) { + vi.spyOn(HTMLElement.prototype, "getBoundingClientRect").mockReturnValue({ + left: 0, + top: 0, + right: width, + bottom: 0, + width, + height: 0, + x: 0, + y: 0, + toJSON: () => {}, + }); +} + +describe("StarRating", () => { + it("shows 'Not yet rated' when score is null", () => { + render(); + expect(screen.getByText("Not yet rated")).toBeInTheDocument(); + }); + + it("rounds a whole score to a clean X/5", () => { + render(); + expect(screen.getByText("5/5 stars")).toBeInTheDocument(); + }); + + it("rounds a repeating decimal down to 2 places", () => { + render(); + expect(screen.getByText("4.33/5 stars")).toBeInTheDocument(); + }); + + it("rounds a repeating decimal up to 2 places", () => { + render(); + expect(screen.getByText("4.67/5 stars")).toBeInTheDocument(); + }); + + it("does not render an interactive slider or delete button when readonly", () => { + render(); + expect(screen.queryByRole("slider")).not.toBeInTheDocument(); + expect(screen.queryByRole("button", { name: "Remove your rating" })).not.toBeInTheDocument(); + }); + + it("calls onChange with the score for the clicked position", () => { + mockRowWidth(100); + const onChange = vi.fn(); + render(); + fireEvent.click(screen.getByRole("slider"), { clientX: 50 }); + expect(onChange).toHaveBeenCalledWith(5); + }); + + it("increments and decrements by arrow keys, clamped to 0-10", () => { + const onChange = vi.fn(); + render(); + const slider = screen.getByRole("slider"); + + fireEvent.keyDown(slider, { key: "ArrowRight" }); + expect(onChange).toHaveBeenLastCalledWith(10); + + fireEvent.keyDown(slider, { key: "ArrowLeft" }); + expect(onChange).toHaveBeenLastCalledWith(9); + }); + + it("calls onDelete without bubbling the click to a parent handler", () => { + const onDelete = vi.fn(); + const onParentClick = vi.fn(); + render( +
+ +
, + ); + + fireEvent.click(screen.getByRole("button", { name: "Remove your rating" })); + expect(onDelete).toHaveBeenCalledOnce(); + expect(onParentClick).not.toHaveBeenCalled(); + }); +}); diff --git a/frontend/src/components/Toolbar/Toolbar.test.tsx b/frontend/src/components/Toolbar/Toolbar.test.tsx new file mode 100644 index 0000000..fec2985 --- /dev/null +++ b/frontend/src/components/Toolbar/Toolbar.test.tsx @@ -0,0 +1,142 @@ +import { describe, expect, it, vi } from "vitest"; +import { render, screen } from "@testing-library/react"; +import userEvent from "@testing-library/user-event"; +import Toolbar from "./Toolbar"; +import { EMPTY_FILTERS } from "../../types/gameQuery"; +import type { GameFilters, SortState } from "../../types/gameQuery"; + +function renderToolbar(overrides: { + page?: number; + totalPages?: number; + filters?: GameFilters; + sort?: SortState; +} = {}) { + const onPrevPage = vi.fn(); + const onNextPage = vi.fn(); + const onFiltersChange = vi.fn(); + const onSortChange = vi.fn(); + + render( + , + ); + + return { onPrevPage, onNextPage, onFiltersChange, onSortChange }; +} + +describe("Toolbar pagination", () => { + it("shows the current page and total", () => { + renderToolbar({ page: 2, totalPages: 5 }); + expect(screen.getByText("Page 2 of 5")).toBeInTheDocument(); + }); + + it("disables previous on the first page and next on the last page", () => { + renderToolbar({ page: 1, totalPages: 1 }); + expect(screen.getByRole("button", { name: "Previous page" })).toBeDisabled(); + expect(screen.getByRole("button", { name: "Next page" })).toBeDisabled(); + }); + + it("calls onPrevPage and onNextPage when enabled", async () => { + const user = userEvent.setup(); + const { onPrevPage, onNextPage } = renderToolbar({ page: 2, totalPages: 5 }); + await user.click(screen.getByRole("button", { name: "Previous page" })); + await user.click(screen.getByRole("button", { name: "Next page" })); + expect(onPrevPage).toHaveBeenCalledOnce(); + expect(onNextPage).toHaveBeenCalledOnce(); + }); +}); + +describe("Toolbar sorting", () => { + it("shows the active sort field's label", () => { + renderToolbar({ sort: { field: "AVERAGE_SCORE", order: "ASC" } }); + expect(screen.getByText("Average score")).toBeInTheDocument(); + }); + + it("toggles sort order", async () => { + const user = userEvent.setup(); + const { onSortChange } = renderToolbar({ sort: { field: "NAME", order: "ASC" } }); + await user.click(screen.getByRole("button", { name: "Switch to descending order" })); + expect(onSortChange).toHaveBeenCalledWith({ field: "NAME", order: "DESC" }); + }); + + it("opens the sort menu and selects a field", async () => { + const user = userEvent.setup(); + const { onSortChange } = renderToolbar({ sort: { field: "NAME", order: "ASC" } }); + await user.click(screen.getByRole("button", { name: /Sort by/ })); + await user.click(screen.getByRole("menuitemradio", { name: "Number of reviews" })); + expect(onSortChange).toHaveBeenCalledWith({ field: "REVIEW_COUNT", order: "ASC" }); + expect(screen.queryByRole("menu")).not.toBeInTheDocument(); + }); +}); + +describe("Toolbar filtering", () => { + it("shows a badge only when filters are active", () => { + const { container, unmount } = render( + , + ); + expect(container.querySelector('[aria-hidden="true"]')).not.toBeInTheDocument(); + unmount(); + + render( + , + ); + expect(screen.getByRole("button", { name: "Filter by" }).querySelector('[aria-hidden="true"]')).toBeInTheDocument(); + }); + + it("toggles a tag, applies and reports the updated filters", async () => { + const user = userEvent.setup(); + const { onFiltersChange } = renderToolbar({ filters: EMPTY_FILTERS }); + await user.click(screen.getByRole("button", { name: "Filter by" })); + await user.click(screen.getByRole("checkbox", { name: "RPG" })); + await user.click(screen.getByRole("button", { name: "Apply" })); + + expect(onFiltersChange).toHaveBeenCalledWith({ ...EMPTY_FILTERS, tags: ["RPG"] }); + expect(screen.queryByRole("dialog")).not.toBeInTheDocument(); + }); + + it("clears all filters", async () => { + const user = userEvent.setup(); + const { onFiltersChange } = renderToolbar({ + filters: { ...EMPTY_FILTERS, tags: ["RPG"], platforms: ["PC"] }, + }); + await user.click(screen.getByRole("button", { name: "Filter by" })); + await user.click(screen.getByRole("button", { name: "Clear all" })); + + expect(onFiltersChange).toHaveBeenCalledWith(EMPTY_FILTERS); + }); + + it("closes the filter panel on Escape", async () => { + const user = userEvent.setup(); + renderToolbar(); + await user.click(screen.getByRole("button", { name: "Filter by" })); + expect(screen.getByRole("dialog")).toBeInTheDocument(); + await user.keyboard("{Escape}"); + expect(screen.queryByRole("dialog")).not.toBeInTheDocument(); + }); +}); diff --git a/frontend/src/test/setup.ts b/frontend/src/test/setup.ts new file mode 100644 index 0000000..d837a33 --- /dev/null +++ b/frontend/src/test/setup.ts @@ -0,0 +1,22 @@ +import { afterEach } from 'vitest'; +import { cleanup } from '@testing-library/react'; +import '@testing-library/jest-dom/vitest'; + +afterEach(() => { + cleanup(); +}); + +// jsdom does not implement matchMedia, which react-responsive (useIsMobile) needs. +Object.defineProperty(window, 'matchMedia', { + writable: true, + value: (query: string) => ({ + matches: false, + media: query, + onchange: null, + addListener: () => {}, + removeListener: () => {}, + addEventListener: () => {}, + removeEventListener: () => {}, + dispatchEvent: () => false, + }), +}); diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index edffd66..5f5564d 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -1,6 +1,6 @@ import react, { reactCompilerPreset } from '@vitejs/plugin-react' import babel from '@rolldown/plugin-babel' -import { defineConfig } from 'vite' +import { defineConfig } from 'vitest/config' // https://vite.dev/config/ export default defineConfig({ @@ -8,5 +8,9 @@ export default defineConfig({ react(), babel({ presets: [reactCompilerPreset()] }) ], - base: '/project2' + base: '/project2', + test: { + environment: 'jsdom', + setupFiles: ['./src/test/setup.ts'], + }, }) From a56191689a66d171184f6134af960127197ed3a5 Mon Sep 17 00:00:00 2001 From: joelte Date: Mon, 16 Nov 2026 11:36:16 +0100 Subject: [PATCH 33/35] feat: Add paging to My Ratings Extract the page counter and chevron arrows from Toolbar into a shared Pagination component, then reuse it on the My Ratings page so rated games are paged the same way as the main grid. --- frontend/src/components/Pagination.module.css | 14 ++++++ frontend/src/components/Pagination.tsx | 45 +++++++++++++++++++ .../src/components/Toolbar/Toolbar.module.css | 15 ------- frontend/src/components/Toolbar/Toolbar.tsx | 41 ++++------------- frontend/src/pages/MyRatings.tsx | 25 ++++++++++- 5 files changed, 90 insertions(+), 50 deletions(-) create mode 100644 frontend/src/components/Pagination.module.css create mode 100644 frontend/src/components/Pagination.tsx diff --git a/frontend/src/components/Pagination.module.css b/frontend/src/components/Pagination.module.css new file mode 100644 index 0000000..ff3bf19 --- /dev/null +++ b/frontend/src/components/Pagination.module.css @@ -0,0 +1,14 @@ +.pagination { + display: inline-flex; + align-items: center; + justify-self: center; + gap: 0.75rem; +} + +.pageButton { + display: inline-flex; + align-items: center; + padding: 0; + color: inherit; + font: inherit; +} diff --git a/frontend/src/components/Pagination.tsx b/frontend/src/components/Pagination.tsx new file mode 100644 index 0000000..4e6a8eb --- /dev/null +++ b/frontend/src/components/Pagination.tsx @@ -0,0 +1,45 @@ +import { Button } from "react-bootstrap"; +import { ChevronLeft, ChevronRight } from "react-bootstrap-icons"; +import styles from "./Pagination.module.css"; + +interface PaginationProps { + page: number; + totalPages: number; + onPrevPage: () => void; + onNextPage: () => void; +} + +export default function Pagination({ + page, + totalPages, + onPrevPage, + onNextPage, +}: PaginationProps) { + return ( +
+ + + Page {page} of {totalPages} + + +
+ ); +} diff --git a/frontend/src/components/Toolbar/Toolbar.module.css b/frontend/src/components/Toolbar/Toolbar.module.css index 901e1a4..d0f4173 100644 --- a/frontend/src/components/Toolbar/Toolbar.module.css +++ b/frontend/src/components/Toolbar/Toolbar.module.css @@ -38,21 +38,6 @@ background-color: var(--color-brand); } -.pagination { - display: inline-flex; - align-items: center; - justify-self: center; - gap: 0.75rem; -} - -.pageButton { - display: inline-flex; - align-items: center; - padding: 0; - color: inherit; - font: inherit; -} - .sort { display: inline-flex; align-items: center; diff --git a/frontend/src/components/Toolbar/Toolbar.tsx b/frontend/src/components/Toolbar/Toolbar.tsx index 4a9fe71..56a597a 100644 --- a/frontend/src/components/Toolbar/Toolbar.tsx +++ b/frontend/src/components/Toolbar/Toolbar.tsx @@ -1,14 +1,7 @@ import { useEffect, useRef, useState } from "react"; import type { ChangeEvent } from "react"; import { Button, Form } from "react-bootstrap"; -import { - ArrowDownUp, - ChevronDown, - ChevronLeft, - ChevronRight, - Funnel, - X, -} from "react-bootstrap-icons"; +import { ArrowDownUp, ChevronDown, Funnel, X } from "react-bootstrap-icons"; import { ESRB_OPTIONS, PLATFORM_OPTIONS, @@ -18,6 +11,7 @@ import { } from "../../constants/filterOptions"; import type { GameFilters, SortField, SortState } from "../../types/gameQuery"; import { EMPTY_FILTERS, hasActiveFilters } from "../../types/gameQuery"; +import Pagination from "../Pagination"; import styles from "./Toolbar.module.css"; interface ToolbarProps { @@ -101,31 +95,12 @@ export default function Toolbar({ )} -
- - - Page {page} of {totalPages} - - -
+
diff --git a/frontend/src/pages/MyRatings.tsx b/frontend/src/pages/MyRatings.tsx index 999bd44..d5a0700 100644 --- a/frontend/src/pages/MyRatings.tsx +++ b/frontend/src/pages/MyRatings.tsx @@ -1,4 +1,4 @@ -import { useMemo } from "react"; +import { useMemo, useState } from "react"; import { gql } from "@apollo/client"; import { useQuery } from "@apollo/client/react"; import Header from "../components/Header"; @@ -7,6 +7,9 @@ import Card from "react-bootstrap/esm/Card"; import StarRating from "../components/StarRating"; import { useIsMobile } from "../constants/global"; import { Link } from "react-router-dom"; +import Pagination from "../components/Pagination"; + +const RATINGS_PAGE_SIZE = 10; const GET_MY_REVIEWS = gql` query GetMyReviews($userId: String!) { @@ -81,6 +84,14 @@ export default function MyRatings() { }) .sort((a, b) => b.score - a.score); + const [rawPage, setPage] = useState(1); + const totalPages = Math.max(1, Math.ceil(ratings.length / RATINGS_PAGE_SIZE)); + const page = Math.min(rawPage, totalPages); + const pagedRatings = ratings.slice( + (page - 1) * RATINGS_PAGE_SIZE, + page * RATINGS_PAGE_SIZE, + ); + return ( <>
@@ -106,9 +117,19 @@ export default function MyRatings() { {!error && !loading && ratings.length === 0 && (

You haven’t rated any games yet.

)} + {!error && !loading && ratings.length > 0 && ( +
+ setPage((p) => Math.max(1, p - 1))} + onNextPage={() => setPage((p) => Math.min(totalPages, p + 1))} + /> +
+ )} {!error && (
- {ratings.map(({ game, score }) => ( + {pagedRatings.map(({ game, score }) => (
Date: Mon, 16 Nov 2026 17:00:13 +0100 Subject: [PATCH 34/35] fix: Update Tests to match frontend Updatet GameListItem and Header tests to match the updates for delivery 4. --- frontend/src/components/GameListItem.test.tsx | 4 ++-- frontend/src/components/Header.test.tsx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/GameListItem.test.tsx b/frontend/src/components/GameListItem.test.tsx index 4244c16..098c814 100644 --- a/frontend/src/components/GameListItem.test.tsx +++ b/frontend/src/components/GameListItem.test.tsx @@ -29,9 +29,9 @@ describe("GameListItem", () => { expect(screen.getByRole("img", { name: "Great Game" })).toHaveAttribute("src", "/game.png"); }); - it("falls back to an em dash when year or tags are missing", () => { + it("falls back to N/A when year or tags are missing", () => { renderItem({ year: null, tags: "" }); - expect(screen.getAllByText("—")).toHaveLength(2); + expect(screen.getAllByText("N/A")).toHaveLength(2); }); it("links to the game's detail page", () => { diff --git a/frontend/src/components/Header.test.tsx b/frontend/src/components/Header.test.tsx index 616f198..31d4cf1 100644 --- a/frontend/src/components/Header.test.tsx +++ b/frontend/src/components/Header.test.tsx @@ -28,7 +28,7 @@ describe("Header", () => { it("renders the wordmark, search field and My Ratings link", () => { renderHeader("/project2"); - expect(screen.getByText("Working Title")).toBeInTheDocument(); + expect(screen.getByText("NTNU GameShelf")).toBeInTheDocument(); expect(screen.getByPlaceholderText("Search games...")).toHaveValue(""); expect(screen.getByText("My Ratings")).toBeInTheDocument(); expect(screen.queryByRole("button", { name: "Clear" })).not.toBeInTheDocument(); @@ -58,7 +58,7 @@ describe("Header", () => { it("links home to the current query on the grid page", () => { renderHeader("/project2?search=zelda"); - expect(screen.getByText("Working Title").closest("a")).toHaveAttribute( + expect(screen.getByText("NTNU GameShelf").closest("a")).toHaveAttribute( "href", "/project2/?search=zelda", ); @@ -67,7 +67,7 @@ describe("Header", () => { it("links home to the persisted grid query from other pages", () => { sessionStorage.setItem(GRID_QUERY_STORAGE_KEY, "search=bar"); renderHeader("/project2/my-ratings"); - expect(screen.getByText("Working Title").closest("a")).toHaveAttribute( + expect(screen.getByText("NTNU GameShelf").closest("a")).toHaveAttribute( "href", "/project2/?search=bar", ); @@ -75,6 +75,6 @@ describe("Header", () => { it("links home plainly when there is no persisted query", () => { renderHeader("/project2/my-ratings"); - expect(screen.getByText("Working Title").closest("a")).toHaveAttribute("href", "/project2"); + expect(screen.getByText("NTNU GameShelf").closest("a")).toHaveAttribute("href", "/project2"); }); }); From ddb97a40ecad25d991388983dcf130600f8eacf6 Mon Sep 17 00:00:00 2001 From: Ayse Zeynep Aydin Date: Mon, 16 Nov 2026 17:55:58 +0100 Subject: [PATCH 35/35] arrowupdown color fix and refactor --- frontend/src/components/Pagination.module.css | 14 -------------- frontend/src/components/Pagination.tsx | 10 ++++++---- frontend/src/components/Toolbar/Toolbar.tsx | 3 ++- 3 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 frontend/src/components/Pagination.module.css diff --git a/frontend/src/components/Pagination.module.css b/frontend/src/components/Pagination.module.css deleted file mode 100644 index ff3bf19..0000000 --- a/frontend/src/components/Pagination.module.css +++ /dev/null @@ -1,14 +0,0 @@ -.pagination { - display: inline-flex; - align-items: center; - justify-self: center; - gap: 0.75rem; -} - -.pageButton { - display: inline-flex; - align-items: center; - padding: 0; - color: inherit; - font: inherit; -} diff --git a/frontend/src/components/Pagination.tsx b/frontend/src/components/Pagination.tsx index 4e6a8eb..a99869c 100644 --- a/frontend/src/components/Pagination.tsx +++ b/frontend/src/components/Pagination.tsx @@ -1,6 +1,5 @@ import { Button } from "react-bootstrap"; import { ChevronLeft, ChevronRight } from "react-bootstrap-icons"; -import styles from "./Pagination.module.css"; interface PaginationProps { page: number; @@ -16,10 +15,12 @@ export default function Pagination({ onNextPage, }: PaginationProps) { return ( -
+