diff --git a/Backend/Schema.ts b/Backend/Schema.ts index 90306a3..398d8ac 100644 --- a/Backend/Schema.ts +++ b/Backend/Schema.ts @@ -75,6 +75,8 @@ export const typeDefs = `#graphql discountedGames(genre: String!): [Game!]! reviews(gameId: Int!, userId: Int): [Review!]! recentReviews(limit: Int = 10): [Review!]! + userReviews(userId: Int!, limit: Int = 6, offset: Int = 0): [Review!]! + userReviewCount(userId: Int!): Int! friends(userId: Int!): [Friend!]! friendWishlist(userId: Int!, friendId: Int!): [Game!]! myFriendId(userId: Int!): String diff --git a/Backend/logic/ReviewsLogicBackend.ts b/Backend/logic/ReviewsLogicBackend.ts index a8c298f..d2c0f40 100644 --- a/Backend/logic/ReviewsLogicBackend.ts +++ b/Backend/logic/ReviewsLogicBackend.ts @@ -29,6 +29,17 @@ function ValidateId(id: number, name: string) { if (!Number.isSafeInteger(id) || id <= 0) throw new Error(`The ${name} is invalid.`) } +function ClampLimit(limit: number): number { + return Math.min(Math.max(Math.trunc(limit) || 1, 1), 50) +} + +const REVIEWS_WITH_GAME_NAME = ` + SELECT ${REVIEW_COLUMNS}, + g.game_name AS "gameName" + FROM reviews r + JOIN users u ON u.user_id = r.user_id + JOIN games g ON g.game_id = r.game_id` + export async function GetReviewsForGame( gameId: number, currentUserId: number | null = null @@ -47,21 +58,38 @@ export async function GetReviewsForGame( } export async function GetRecentReviews(limit = 10): Promise { - const safeLimit = Math.min(Math.max(Math.trunc(limit) || 1, 1), 50) - const { rows } = await pool.query( - `SELECT ${REVIEW_COLUMNS}, - g.game_name AS "gameName" - FROM reviews r - JOIN users u ON u.user_id = r.user_id - JOIN games g ON g.game_id = r.game_id + `${REVIEWS_WITH_GAME_NAME} ORDER BY r.review_id DESC LIMIT $1`, - [safeLimit] + [ClampLimit(limit)] + ) + return rows +} + +export async function GetReviewsByUser(userId: number, limit = 6, offset = 0): Promise { + ValidateId(userId, 'user ID') + const safeOffset = Math.max(Math.trunc(offset) || 0, 0) + + const { rows } = await pool.query( + `${REVIEWS_WITH_GAME_NAME} + WHERE r.user_id = $1 + ORDER BY r.review_id DESC + LIMIT $2 OFFSET $3`, + [userId, ClampLimit(limit), safeOffset] ) return rows } +export async function CountReviewsByUser(userId: number): Promise { + ValidateId(userId, 'user ID') + + const { rows } = await pool.query('SELECT COUNT(*) AS count FROM reviews WHERE user_id = $1', [ + userId + ]) + return Number(rows[0].count) +} + export async function CreateReview( userId: number, gameId: number, diff --git a/Backend/resolvers/ReviewResolvers.ts b/Backend/resolvers/ReviewResolvers.ts index 33ec562..ab4e925 100644 --- a/Backend/resolvers/ReviewResolvers.ts +++ b/Backend/resolvers/ReviewResolvers.ts @@ -1,7 +1,9 @@ import { + CountReviewsByUser, CreateReview, DeleteReview, GetRecentReviews, + GetReviewsByUser, GetReviewsForGame, UpdateReview } from '../logic/ReviewsLogicBackend.ts' @@ -12,7 +14,15 @@ export const reviewQueryResolvers = { reviews: (_parent: unknown, { gameId, userId }: { gameId: number; userId?: number | null }) => GetReviewsForGame(gameId, userId ?? null), - recentReviews: (_parent: unknown, { limit }: { limit: number }) => GetRecentReviews(limit) + recentReviews: (_parent: unknown, { limit }: { limit: number }) => GetRecentReviews(limit), + + userReviews: ( + _parent: unknown, + { userId, limit, offset }: { userId: number; limit: number; offset: number } + ) => GetReviewsByUser(userId, limit, offset), + + userReviewCount: (_parent: unknown, { userId }: { userId: number }) => + CountReviewsByUser(userId) } export const reviewMutationResolvers = { diff --git a/Backend/tests/ReviewsBackend.test.ts b/Backend/tests/ReviewsBackend.test.ts index f67d188..016941b 100644 --- a/Backend/tests/ReviewsBackend.test.ts +++ b/Backend/tests/ReviewsBackend.test.ts @@ -7,9 +7,11 @@ const { Query } = vi.hoisted(() => ({ Query: vi.fn() })) vi.mock('../DatabaseConnection.ts', () => ({ pool: { query: Query } })) import { + CountReviewsByUser, CreateReview, DeleteReview, GetRecentReviews, + GetReviewsByUser, GetReviewsForGame, UpdateReview } from '../logic/ReviewsLogicBackend.ts' @@ -86,6 +88,59 @@ describe('reviews (backend)', () => { }) }) + describe('GetReviewsByUser', () => { + it("returns the first page of one user's reviews with the game names, newest first", async () => { + Query.mockResolvedValue({ rows: [testReview] }) + + await expect(GetReviewsByUser(7)).resolves.toEqual([testReview]) + + const [sql, params] = Query.mock.calls[0] + expect(String(sql)).toContain('g.game_name AS "gameName"') + expect(String(sql)).toContain('WHERE r.user_id = $1') + expect(String(sql)).toContain('ORDER BY r.review_id DESC') + expect(String(sql)).toContain('LIMIT $2 OFFSET $3') + expect(params).toEqual([7, 6, 0]) + }) + + it('skips the reviews of earlier pages', async () => { + Query.mockResolvedValue({ rows: [] }) + + await GetReviewsByUser(7, 6, 12) + + expect(Query.mock.calls[0][1]).toEqual([7, 6, 12]) + }) + + it('keeps the page size between 1 and 50 and the offset at 0 or more', async () => { + Query.mockResolvedValue({ rows: [] }) + + await GetReviewsByUser(7, 1000, -5) + + expect(Query.mock.calls[0][1]).toEqual([7, 50, 0]) + }) + + it('rejects an invalid user id without touching the database', async () => { + await expect(GetReviewsByUser(0)).rejects.toThrow('The user ID is invalid.') + expect(Query).not.toHaveBeenCalled() + }) + }) + + describe('CountReviewsByUser', () => { + it('counts all reviews written by the user', async () => { + Query.mockResolvedValue({ rows: [{ count: '13' }] }) + + await expect(CountReviewsByUser(7)).resolves.toBe(13) + + const [sql, params] = Query.mock.calls[0] + expect(String(sql)).toContain('WHERE user_id = $1') + expect(params).toEqual([7]) + }) + + it('rejects an invalid user id without touching the database', async () => { + await expect(CountReviewsByUser(-1)).rejects.toThrow('The user ID is invalid.') + expect(Query).not.toHaveBeenCalled() + }) + }) + describe('CreateReview', () => { it('saves the review and returns it with the username', async () => { Query.mockResolvedValue({ rows: [testReview] }) diff --git a/Frontend/src/FrontendLogic/ReviewLogicFrontend.ts b/Frontend/src/FrontendLogic/ReviewLogicFrontend.ts index cc31b09..c5eae41 100644 --- a/Frontend/src/FrontendLogic/ReviewLogicFrontend.ts +++ b/Frontend/src/FrontendLogic/ReviewLogicFrontend.ts @@ -31,6 +31,24 @@ export async function GetRecentReviews(limit = 10): Promise { return data.recentReviews } +export const USER_REVIEWS_PER_PAGE = 6 + +export type UserReviewPage = { + reviews: Review[] + totalCount: number +} + +export async function GetReviewsByUser(userId: number, page = 1): Promise { + const data = await Gql<{ userReviews: Review[]; userReviewCount: number }>( + `query($userId: Int!, $limit: Int, $offset: Int) { + userReviews(userId: $userId, limit: $limit, offset: $offset) { ${REVIEW_FIELDS} gameName } + userReviewCount(userId: $userId) + }`, + { userId, limit: USER_REVIEWS_PER_PAGE, offset: (page - 1) * USER_REVIEWS_PER_PAGE } + ) + return { reviews: data.userReviews, totalCount: data.userReviewCount } +} + export async function CreateReview( gameId: number, userId: number, diff --git a/Frontend/src/components/ActiveGameCard.tsx b/Frontend/src/components/ActiveGameCard.tsx index a07fc96..e91546b 100644 --- a/Frontend/src/components/ActiveGameCard.tsx +++ b/Frontend/src/components/ActiveGameCard.tsx @@ -42,6 +42,8 @@ export default function ActiveGameCard({ const isOnSale = game.salePercent !== undefined && game.salePercent > 0 && game.salePercent <= 100 + const showOriginalPrice = + isOnSale && game.originalPrice !== undefined && game.originalPrice > game.price //Loads the game's reviews, again when the user signs in or out so their own review comes first useEffect(() => { @@ -168,9 +170,20 @@ export default function ActiveGameCard({ size="small" /> )} - + {game.price.toFixed(2)} $ + {showOriginalPrice && ( + + + Original price:{' '} + + {game.originalPrice!.toFixed(2)} $ + + )} diff --git a/Frontend/src/components/PassiveGameCard.tsx b/Frontend/src/components/PassiveGameCard.tsx index 26b34a9..fe26523 100644 --- a/Frontend/src/components/PassiveGameCard.tsx +++ b/Frontend/src/components/PassiveGameCard.tsx @@ -40,40 +40,46 @@ export default function PassiveGameCard({ game, rank }: Props) { }, [game.name]) return ( - - {rank !== undefined && ( - - #{rank} - - )} - + - - -
- - {game.name} - -
-
-
{isOnSale ? `-${game.salePercent}%` : ''}
- - {game.price.toFixed(2)} $ - -
-
-
-
+ {rank !== undefined && ( + + #{rank} + + )} + + + +
+ + {game.name} + +
+
+
+ {isOnSale ? `-${game.salePercent}%` : ''} +
+ + {game.price.toFixed(2)} $ + +
+
+
+ + ) } diff --git a/Frontend/src/components/ReviewCard.tsx b/Frontend/src/components/ReviewCard.tsx index 1ef113f..966d7bf 100644 --- a/Frontend/src/components/ReviewCard.tsx +++ b/Frontend/src/components/ReviewCard.tsx @@ -1,3 +1,4 @@ +import { useEffect, useLayoutEffect, useRef, useState } from 'react' import { Link } from 'react-router-dom' import Button from '@mui/material/Button' import Rating from '@mui/material/Rating' @@ -12,6 +13,7 @@ type ReviewCardProps = { currentUserId?: number | null onEdit?: (review: Review) => void onDelete?: (review: Review) => void + collapsible?: boolean } export default function ReviewCard({ @@ -20,38 +22,81 @@ export default function ReviewCard({ className, currentUserId = null, onEdit, - onDelete + onDelete, + collapsible = false }: ReviewCardProps) { const isOwner = currentUserId !== null && review.userId === currentUserId + const cardRef = useRef(null) + const textBoxRef = useRef(null) + const [isTextCut, setIsTextCut] = useState(false) + const [isExpanded, setIsExpanded] = useState(false) + const canExpand = collapsible && (isTextCut || isExpanded) + + useLayoutEffect(() => { + const textBox = textBoxRef.current + if (!collapsible || isExpanded || !textBox) return + + const CheckIfCut = () => setIsTextCut(textBox.scrollHeight > textBox.clientHeight + 1) + CheckIfCut() + if (typeof ResizeObserver === 'undefined') return + const resizeObserver = new ResizeObserver(CheckIfCut) + resizeObserver.observe(textBox) + return () => resizeObserver.disconnect() + }, [collapsible, isExpanded, review.text]) + + useEffect(() => { + if (!isExpanded) return + + function HandlePointerDown(event: PointerEvent) { + if (!cardRef.current?.contains(event.target as Node)) setIsExpanded(false) + } + function HandleKeyDown(event: KeyboardEvent) { + if (event.key === 'Escape') setIsExpanded(false) + } + + document.addEventListener('pointerdown', HandlePointerDown) + document.addEventListener('keydown', HandleKeyDown) + return () => { + document.removeEventListener('pointerdown', HandlePointerDown) + document.removeEventListener('keydown', HandleKeyDown) + } + }, [isExpanded]) + + function HandleCardClick(event: React.MouseEvent) { + if (!canExpand || (event.target as HTMLElement).closest('a, button')) return + ToggleExpanded() + } + + function ToggleExpanded() { + setIsExpanded((expanded) => !expanded) + } + + function HandleTextKeyDown(event: React.KeyboardEvent) { + if (event.key !== 'Enter' && event.key !== ' ') return + event.preventDefault() + ToggleExpanded() + } + + const reviewText = review.text &&

“{review.text}”

+ + const cardClassName = [ + 'reviewCard', + collapsible && 'reviewCardCollapsible', + canExpand && 'reviewCardExpandable', + isExpanded && 'reviewCardExpanded', + className + ] + .filter(Boolean) + .join(' ') return ( -
+
-
- {game && {game.name}} - - Review by {review.reviewer} - {isOwner && ' (you)'} + {game && ( + + {game.name} - {isOwner && onEdit && onDelete && ( -
- - -
- )} -
+ )}
+ + Review by {review.reviewer} + {isOwner && ' (you)'} + + {isOwner && onEdit && onDelete && ( +
+ + +
+ )}
- {review.text &&

“{review.text}”

} + {collapsible ? ( +
+ {reviewText || ( +

No written review

+ )} + {canExpand && !isExpanded &&
} +
+ ) : ( + reviewText + )} {game && ( See this game diff --git a/Frontend/src/components/ReviewComposer.tsx b/Frontend/src/components/ReviewComposer.tsx new file mode 100644 index 0000000..77a097f --- /dev/null +++ b/Frontend/src/components/ReviewComposer.tsx @@ -0,0 +1,70 @@ +import { useState } from 'react' +import Button from '@mui/material/Button' +import Rating from '@mui/material/Rating' +import TextField from '@mui/material/TextField' +import Typography from '@mui/material/Typography' +import '../css/ReviewComposer.css' + +type ReviewComposerProps = { + isEditing: boolean + gameName?: string + initialRating?: number | null + initialText?: string + onSave: (rating: number, text: string) => Promise + onCancel: () => void +} + +export default function ReviewComposer({ + isEditing, + gameName, + initialRating = null, + initialText = '', + onSave, + onCancel +}: ReviewComposerProps) { + const [rating, setRating] = useState(initialRating) + const [text, setText] = useState(initialText) + + async function HandleSubmit(event: React.FormEvent) { + event.preventDefault() + if (rating === null) return + await onSave(rating, text) + } + + return ( +
+ + {isEditing ? 'Edit your review' : 'Write your review'} + {gameName && ` of ${gameName}`} + +
+ Your rating (required) + setRating(value)} + getLabelText={(value) => `Rating ${value} out of 5`} + /> +
+ setText(event.target.value)} + multiline + minRows={3} + maxRows={6} + slotProps={{ htmlInput: { maxLength: 500 } }} + helperText={`${text.length} / 500 characters`} + fullWidth + /> +
+ + +
+ + ) +} diff --git a/Frontend/src/components/Reviews.tsx b/Frontend/src/components/Reviews.tsx index 9358914..d5fa34e 100644 --- a/Frontend/src/components/Reviews.tsx +++ b/Frontend/src/components/Reviews.tsx @@ -2,10 +2,9 @@ import { useState } from 'react' import Button from '@mui/material/Button' import CardContent from '@mui/material/CardContent' import Divider from '@mui/material/Divider' -import Rating from '@mui/material/Rating' -import TextField from '@mui/material/TextField' import Typography from '@mui/material/Typography' import ReviewCard from './ReviewCard' +import ReviewComposer from './ReviewComposer' import type { Review } from '../types/Review' function GetAverageRating(reviews: Review[]): number | null { @@ -40,9 +39,7 @@ export default function Reviews({ onDeleteReview }: ReviewsProps) { const [isComposerOpen, setIsComposerOpen] = useState(false) - const [rating, setRating] = useState(null) - const [text, setText] = useState('') - const [editingReviewId, setEditingReviewId] = useState(null) + const [editingReview, setEditingReview] = useState(null) const [error, setError] = useState(null) function IsOwnReview(review: Review) { @@ -53,35 +50,28 @@ export default function Reviews({ const averageRating = GetAverageRating(reviews) function OpenNewReviewForm() { - setEditingReviewId(null) - setRating(null) - setText('') + setEditingReview(null) setError(null) setIsComposerOpen(true) } function OpenEditReviewForm(review: Review) { - setEditingReviewId(review.id) - setRating(review.rating) - setText(review.text) + setEditingReview(review) setError(null) setIsComposerOpen(true) } function CloseComposer() { setIsComposerOpen(false) - setEditingReviewId(null) + setEditingReview(null) } - async function HandleSave(event: React.FormEvent) { - event.preventDefault() - if (rating === null) return - + async function HandleSave(rating: number, text: string) { try { - if (editingReviewId === null) { + if (editingReview === null) { await onSubmitReview(rating, text) } else { - await onEditReview(editingReviewId, rating, text) + await onEditReview(editingReview.id, rating, text) } CloseComposer() setError(null) @@ -93,7 +83,7 @@ export default function Reviews({ async function HandleDelete(review: Review) { try { await onDeleteReview(review.id) - if (editingReviewId === review.id) CloseComposer() + if (editingReview?.id === review.id) CloseComposer() setError(null) } catch (deleteError: unknown) { setError( @@ -126,39 +116,14 @@ export default function Reviews({

Sign in to submit a review.

)} {isComposerOpen && ( -
- - {editingReviewId === null ? 'Write your review' : 'Edit your review'} - -
- Your rating (required) - setRating(value)} - getLabelText={(value) => `Rating ${value} out of 5`} - /> -
- setText(event.target.value)} - multiline - minRows={3} - maxRows={6} - slotProps={{ htmlInput: { maxLength: 500 } }} - helperText={`${text.length} / 500 characters`} - fullWidth - /> -
- - -
- + )} {(error ?? loadError) && (

diff --git a/Frontend/src/components/UserReviews.tsx b/Frontend/src/components/UserReviews.tsx new file mode 100644 index 0000000..895eb6b --- /dev/null +++ b/Frontend/src/components/UserReviews.tsx @@ -0,0 +1,180 @@ +import { useEffect, useRef, useState } from 'react' +import Card from '@mui/material/Card' +import CardContent from '@mui/material/CardContent' +import Divider from '@mui/material/Divider' +import Pagination from '@mui/material/Pagination' +import useMediaQuery from '@mui/material/useMediaQuery' +import ReviewCard from './ReviewCard' +import ReviewComposer from './ReviewComposer' +import '../css/UserReviews.css' +import { + DeleteReview, + GetReviewsByUser, + UpdateReview, + USER_REVIEWS_PER_PAGE, + type UserReviewPage +} from '../FrontendLogic/ReviewLogicFrontend' +import type { Review } from '../types/Review' + +type UserReviewsProps = { + userId: number +} + +export default function UserReviews({ userId }: UserReviewsProps) { + const [page, setPage] = useState(1) + const [reviewPage, setReviewPage] = useState(null) + const [reloadCount, setReloadCount] = useState(0) + const [editingReviewId, setEditingReviewId] = useState(null) + const [error, setError] = useState(null) + const cardRef = useRef(null) + const isSingleColumn = useMediaQuery('(max-width: 43.75rem)') + + useEffect(() => { + let cancelled = false + + GetReviewsByUser(userId, page) + .then((loaded) => { + if (cancelled) return + if (loaded.reviews.length === 0 && page > 1) { + setPage(page - 1) + return + } + setReviewPage(loaded) + setError(null) + }) + .catch((loadError: unknown) => { + if (!cancelled) + setError( + loadError instanceof Error ? loadError.message : 'Could not load reviews.' + ) + }) + + return () => { + cancelled = true + } + }, [userId, page, reloadCount]) + + const reviews = reviewPage?.reviews ?? [] + const pageCount = Math.max(1, Math.ceil((reviewPage?.totalCount ?? 0) / USER_REVIEWS_PER_PAGE)) + + const columns = isSingleColumn + ? [reviews] + : [ + reviews.filter((_, index) => index % 2 === 0), + reviews.filter((_, index) => index % 2 === 1) + ] + + function ChangePage(value: number, scrollToTop: boolean) { + setPage(value) + setEditingReviewId(null) + if (scrollToTop) cardRef.current?.scrollIntoView?.({ behavior: 'smooth', block: 'start' }) + } + + function OpenEditReviewForm(review: Review) { + setEditingReviewId(review.id) + setError(null) + } + + async function HandleSave(review: Review, rating: number, text: string) { + try { + await UpdateReview(review.gameId, review.id, userId, rating, text) + setReviewPage( + (current) => + current && { + ...current, + reviews: current.reviews.map((other) => + other.id === review.id ? { ...other, rating, text } : other + ) + } + ) + setEditingReviewId(null) + setError(null) + } catch (saveError: unknown) { + setError(saveError instanceof Error ? saveError.message : 'Could not save review.') + } + } + + async function HandleDelete(review: Review) { + try { + await DeleteReview(review.gameId, review.id, userId) + if (editingReviewId === review.id) setEditingReviewId(null) + setReloadCount((count) => count + 1) + setError(null) + } catch (deleteError: unknown) { + setError( + deleteError instanceof Error ? deleteError.message : 'Could not delete review.' + ) + } + } + + function RenderReview(review: Review) { + return review.id === editingReviewId ? ( + HandleSave(review, rating, text)} + onCancel={() => setEditingReviewId(null)} + /> + ) : ( + + ) + } + + function RenderPagination(scrollToTop: boolean) { + if (pageCount <= 1) return null + return ( + ChangePage(value, scrollToTop)} + /> + ) + } + + return ( + + +

Your reviews

+ + + + + + {error && ( +

+ {error} +

+ )} + {reviewPage === null ? ( + !error &&

Loading reviews…

+ ) : reviews.length === 0 ? ( +

You have not reviewed any games yet.

+ ) : ( + <> + {RenderPagination(false)} +
+ {columns.map((column, columnIndex) => ( +
+ {column.map(RenderReview)} +
+ ))} +
+ {RenderPagination(true)} + + )} +
+ + ) +} diff --git a/Frontend/src/css/ActiveGameCard.css b/Frontend/src/css/ActiveGameCard.css index 4c7f5d8..75b5724 100644 --- a/Frontend/src/css/ActiveGameCard.css +++ b/Frontend/src/css/ActiveGameCard.css @@ -106,6 +106,30 @@ white-space: nowrap; } +.activeGamePrice.activeGameSalePrice { + padding: 0.1rem 0.5rem; + border-radius: 0.5rem; + background-color: var(--primary-background-color); + font-size: 1rem; + font-weight: 400; +} + +.activeGameOriginalPrice { + color: var(--primary-text-color); + font-size: 0.95rem; + opacity: 0.7; + white-space: nowrap; +} + +.activeGameVisuallyHidden { + position: absolute; + width: 1px; + height: 1px; + overflow: hidden; + clip-path: inset(50%); + white-space: nowrap; +} + .activeGameSaleChip.MuiChip-root { background-color: var(--primary-background-color); color: var(--primary-text-color); @@ -155,52 +179,11 @@ white-space: nowrap; } -.reviewComposerToggle.MuiButton-root { +.activeGameReviewsContent .reviewComposerToggle.MuiButton-root { align-self: flex-start; -} - -.reviewComposer { - display: flex; - flex-direction: column; - gap: 0.75rem; - padding: 0.9rem; - border: 1px solid var(--primary-component-color); - border-radius: 0.75rem; background-color: var(--primary-background-color); -} - -.reviewComposerRating { - display: flex; - flex-wrap: wrap; - align-items: center; - gap: 0.5rem; - color: var(--primary-text-color); -} - -.reviewComposerRating .MuiRating-root { - color: var(--primary-accent-color); -} - -.reviewComposer .MuiTextField-root .MuiInputBase-root, -.reviewComposer .MuiTextField-root .MuiFormLabel-root { - color: var(--primary-text-color); -} - -.reviewComposer .MuiTextField-root .MuiOutlinedInput-notchedOutline { - border-color: var(--primary-component-color); -} - -.reviewComposerActions { - display: flex; - flex-wrap: wrap; - gap: 0.5rem; -} - -.reviewComposerError { - margin: 0; color: var(--primary-text-color); - font-weight: 700; - overflow-wrap: anywhere; + text-transform: none; } .reviewComposerHint { diff --git a/Frontend/src/css/Global.css b/Frontend/src/css/Global.css index 7287dd0..451fca7 100644 --- a/Frontend/src/css/Global.css +++ b/Frontend/src/css/Global.css @@ -62,7 +62,7 @@ body { .filtersection .resetButton, .filtersection .removeFiltersButton, .genre-carousel-controls .MuiButton-root, - .reviewCardActions .reviewCardEdit, + .reviewCardActions .app-button, .sign-in-and-up-card .MuiButton-contained ).MuiButton-root { background-color: var(--primary-component-color); @@ -75,7 +75,7 @@ body { .filtersection .resetButton, .filtersection .removeFiltersButton, .genre-carousel-controls .MuiButton-root, - .reviewCardActions .reviewCardEdit, + .reviewCardActions .app-button, .sign-in-and-up-card .MuiButton-contained ).MuiButton-root:hover { background-color: var(--primary-accent-color); @@ -87,7 +87,7 @@ body { .filtersection .resetButton, .filtersection .removeFiltersButton, .genre-carousel-controls .MuiButton-root, - .reviewCardActions .reviewCardEdit, + .reviewCardActions .app-button, .sign-in-and-up-card .MuiButton-contained ).MuiButton-root.Mui-disabled { background-color: var(--secondary-component-color); diff --git a/Frontend/src/css/MainPage.css b/Frontend/src/css/MainPage.css index 24a9eca..cde951e 100644 --- a/Frontend/src/css/MainPage.css +++ b/Frontend/src/css/MainPage.css @@ -133,11 +133,12 @@ min-width: 0; } -.featured-game-card > .passiveGameCard { +.featured-game-card > .passiveGameCardHoverArea { width: 100%; } -.featured-games-primary > .passiveGameCard { +.featured-games-primary > .passiveGameCardHoverArea, +.featured-games-primary .passiveGameCard { height: 100%; min-height: 0; } @@ -238,7 +239,8 @@ height: auto; } - .featured-games-primary > .passiveGameCard { + .featured-games-primary > .passiveGameCardHoverArea, + .featured-games-primary .passiveGameCard { height: auto; } @@ -359,7 +361,7 @@ grid-template-columns: minmax(0, 1fr); } - .featured-game-card > .passiveGameCard { + .featured-game-card > .passiveGameCardHoverArea { width: min(100%, 22rem); margin-inline: auto; } diff --git a/Frontend/src/css/PassiveGameCard.css b/Frontend/src/css/PassiveGameCard.css index 42b0bf1..59839a8 100644 --- a/Frontend/src/css/PassiveGameCard.css +++ b/Frontend/src/css/PassiveGameCard.css @@ -1,6 +1,12 @@ -.passiveGameCard { +.passiveGameCardHoverArea { + display: flex; + flex-direction: column; width: min(100%, 22rem); justify-self: center; +} + +.passiveGameCard { + flex: 1 1 auto; display: flex; flex-direction: column; overflow: hidden; @@ -30,7 +36,7 @@ pointer-events: none; } -.passiveGameCard:hover, +.passiveGameCardHoverArea:hover > .passiveGameCard, .passiveGameCard:focus-within { transform: translateY(-4px); box-shadow: 0 8px 18px rgb(0 0 0 / 20%) !important; @@ -158,7 +164,7 @@ transition: none; } - .passiveGameCard:hover, + .passiveGameCardHoverArea:hover > .passiveGameCard, .passiveGameCard:focus-within { transform: none; } diff --git a/Frontend/src/css/ProfilePage.css b/Frontend/src/css/ProfilePage.css index bfbd4db..44a79a1 100644 --- a/Frontend/src/css/ProfilePage.css +++ b/Frontend/src/css/ProfilePage.css @@ -18,6 +18,17 @@ margin: 0 0 clamp(2rem, 8vh, 5rem); } +.profile-sections { + display: flex; + flex-direction: column; + gap: clamp(1rem, 3vw, 1.5rem); + margin: 0 0 clamp(2rem, 8vh, 5rem); +} + +.profile-sections > .profile-card.MuiCard-root { + margin: 0; +} + .profile-card .MuiDivider-root { align-self: stretch; } diff --git a/Frontend/src/css/ReviewComposer.css b/Frontend/src/css/ReviewComposer.css new file mode 100644 index 0000000..b3b12ba --- /dev/null +++ b/Frontend/src/css/ReviewComposer.css @@ -0,0 +1,49 @@ +.reviewComposerActions .MuiButton-root { + background-color: var(--primary-background-color); + color: var(--primary-text-color); + text-transform: none; +} + +.reviewComposer { + display: flex; + flex-direction: column; + gap: 0.75rem; + padding: 0.9rem; + border: 1px solid var(--primary-component-color); + border-radius: 0.75rem; + background-color: var(--primary-background-color); +} + +.reviewComposerRating { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 0.5rem; + color: var(--primary-text-color); +} + +.reviewComposerRating .MuiRating-root { + color: var(--primary-accent-color); +} + +.reviewComposer .MuiTextField-root .MuiInputBase-root, +.reviewComposer .MuiTextField-root .MuiFormLabel-root { + color: var(--primary-text-color); +} + +.reviewComposer .MuiTextField-root .MuiOutlinedInput-notchedOutline { + border-color: var(--primary-component-color); +} + +.reviewComposerActions { + display: flex; + flex-wrap: wrap; + gap: 0.5rem; +} + +.reviewComposerError { + margin: 0; + color: var(--primary-text-color); + font-weight: 700; + overflow-wrap: anywhere; +} diff --git a/Frontend/src/css/Reviews.css b/Frontend/src/css/Reviews.css index 9859f67..c27349d 100644 --- a/Frontend/src/css/Reviews.css +++ b/Frontend/src/css/Reviews.css @@ -11,19 +11,12 @@ .reviewCardHeader { display: flex; - flex-wrap: wrap; - align-items: flex-start; - justify-content: space-between; - gap: 0.75rem; -} - -.reviewCardReviewerGroup { + flex-direction: column; min-width: 0; } .reviewCardGame, .reviewCardReviewer { - display: block; overflow-wrap: anywhere; } @@ -57,7 +50,7 @@ text-transform: none; } -.reviewCardActions .reviewCardEdit.MuiButton-root { +.reviewCardActions .app-button.MuiButton-root { background-color: var(--primary-component-color); } @@ -71,12 +64,15 @@ .reviewCardRating { display: flex; - flex: 0 0 auto; align-items: center; gap: 0.35rem; white-space: nowrap; } +.reviewCardGame + .reviewCardRating { + margin-top: 0.3rem; +} + .reviewCardRating .MuiRating-root { color: var(--primary-accent-color); } @@ -91,6 +87,60 @@ overflow-wrap: anywhere; } +.reviewCardTextBox { + position: relative; + margin-top: 0.65rem; +} + +.reviewCardTextBox .reviewCardText { + margin: 0; +} + +.reviewCardTextBoxCollapsed { + height: calc(1.45em * 2); + overflow: hidden; +} + +.reviewCardNoText { + color: var(--primary-text-color); + font-style: italic; + opacity: 0.55; +} + +.reviewCardCollapsible .reviewCardGame { + overflow: hidden; + overflow-wrap: normal; + text-overflow: ellipsis; + white-space: nowrap; +} + +.reviewCardTextFade { + position: absolute; + right: 0; + bottom: 0; + left: 0; + height: 1.45em; + background: linear-gradient( + to bottom, + transparent, + color-mix(in srgb, var(--primary-background-color) 90%, transparent) + ); + pointer-events: none; +} + +.reviewCardExpandable { + cursor: pointer; +} + +.reviewCardExpandable .reviewCardTextBox:focus-visible { + outline: 2px solid var(--primary-accent-color); + outline-offset: 3px; +} + +.reviewCardExpanded { + border-color: var(--primary-accent-color); +} + .reviewCard-link { width: fit-content; margin-top: 0.75rem; diff --git a/Frontend/src/css/UserReviews.css b/Frontend/src/css/UserReviews.css new file mode 100644 index 0000000..79e391b --- /dev/null +++ b/Frontend/src/css/UserReviews.css @@ -0,0 +1,32 @@ +.user-reviews-title { + margin: 0; + font-size: clamp(1.35rem, 4vw, 1.75rem); +} + +.user-reviews.MuiCardContent-root { + display: flex; + flex-direction: column; + gap: 1rem; +} + +.user-reviews-message { + margin: 0; +} + +.user-reviews-pagination .MuiPagination-ul { + justify-content: center; +} + +.user-reviews-columns { + display: flex; + align-items: flex-start; + gap: 1rem; +} + +.user-reviews-column { + display: flex; + flex: 1 1 0; + flex-direction: column; + gap: 1rem; + min-width: 0; +} diff --git a/Frontend/src/pages/GamePage.tsx b/Frontend/src/pages/GamePage.tsx index d1f426a..4be295f 100644 --- a/Frontend/src/pages/GamePage.tsx +++ b/Frontend/src/pages/GamePage.tsx @@ -48,6 +48,7 @@ export default function GamePage() { const price = game ? Number(game.price) : 0 const salePercent = game ? Number(game.discount) : 0 + const originalPrice = game ? Number(game.initialprice) : 0 const genres = game ? game.genre .split(',') @@ -82,7 +83,10 @@ export default function GamePage() { developer: 'Unknown developer', description: game.description, image: game.img, - salePercent: Number.isFinite(salePercent) ? salePercent : 0 + salePercent: Number.isFinite(salePercent) ? salePercent : 0, + originalPrice: Number.isFinite(originalPrice) + ? originalPrice + : undefined }} /> ) : ( diff --git a/Frontend/src/pages/ProfilePage.tsx b/Frontend/src/pages/ProfilePage.tsx index 2ffc68a..e7eeaae 100644 --- a/Frontend/src/pages/ProfilePage.tsx +++ b/Frontend/src/pages/ProfilePage.tsx @@ -13,6 +13,7 @@ import { } from '../FrontendLogic/ProfileLogicFrontend.ts' import type { Profile } from '../../../Backend/logic/ProfileLogicBackend.ts' import ProfileEditor from '../components/ProfileEditor.tsx' +import UserReviews from '../components/UserReviews.tsx' import { Button, Card, CardContent } from '@mui/material' export default function ProfilePage() { @@ -115,7 +116,10 @@ export default function ProfilePage() { ) : ( - +
+ + +
))} )} diff --git a/Frontend/src/tests/ActiveGameCard.test.tsx b/Frontend/src/tests/ActiveGameCard.test.tsx new file mode 100644 index 0000000..4b3a02a --- /dev/null +++ b/Frontend/src/tests/ActiveGameCard.test.tsx @@ -0,0 +1,82 @@ +// @vitest-environment jsdom +import { cleanup, render, screen } from '@testing-library/react' +import { afterEach, describe, expect, it, vi } from 'vitest' +import { MemoryRouter } from 'react-router-dom' +import type { GameData } from '../types/Game' + +vi.mock('../context/AuthContext', () => ({ UseAuth: () => ({ user: null }) })) +vi.mock('../FrontendLogic/UserLogicFrontend', () => ({ GetSavedUser: () => null })) +vi.mock('../FrontendLogic/WishlistLogicFrontend', () => ({ + AddToWishlistFrontend: vi.fn(), + RemoveFromWishlistFrontend: vi.fn(), + FetchWishlistFrontend: vi.fn() +})) +vi.mock('../FrontendLogic/ReviewLogicFrontend', () => ({ + CreateReview: vi.fn(), + DeleteReview: vi.fn(), + UpdateReview: vi.fn(), + GetReviewsForGame: vi.fn().mockResolvedValue([]) +})) + +import ActiveGameCard from '../components/ActiveGameCard' + +const testGame: GameData = { + id: 570, + name: 'Dota 2', + price: 9.99, + genre: ['Action'], + developer: 'Unknown developer', + description: 'A test game', + image: '' +} + +function RenderActiveGameCard(game: GameData) { + return render( + + + + ) +} + +describe('ActiveGameCard prices', () => { + afterEach(() => { + cleanup() + }) + + it('shows the discount, the discounted price and the crossed-out original price', async () => { + const { container } = RenderActiveGameCard({ + ...testGame, + salePercent: 50, + originalPrice: 19.98 + }) + + await screen.findByText('-50%') + expect(screen.getByText('9.99 $').className).toContain('activeGameSalePrice') + const originalPrice = container.querySelector('s.activeGameOriginalPrice')! + expect(originalPrice.textContent).toBe('Original price: 19.98 $') + }) + + it('only shows the price when the game is not on sale', async () => { + const { container } = RenderActiveGameCard({ + ...testGame, + salePercent: 0, + originalPrice: 9.99 + }) + + await screen.findByText('9.99 $') + expect(screen.getByText('9.99 $').className).not.toContain('activeGameSalePrice') + expect(container.querySelector('.activeGameOriginalPrice')).toBeNull() + expect(screen.queryByText('-0%')).toBeNull() + }) + + it('does not show an original price that is not higher than the current price', async () => { + const { container } = RenderActiveGameCard({ + ...testGame, + salePercent: 50, + originalPrice: 9.99 + }) + + await screen.findByText('-50%') + expect(container.querySelector('.activeGameOriginalPrice')).toBeNull() + }) +}) diff --git a/Frontend/src/tests/ReviewCard.test.tsx b/Frontend/src/tests/ReviewCard.test.tsx index cb61d94..f7006d8 100644 --- a/Frontend/src/tests/ReviewCard.test.tsx +++ b/Frontend/src/tests/ReviewCard.test.tsx @@ -51,6 +51,17 @@ describe('ReviewCard', () => { ) }) + it('always puts the stars between the game name and the reviewer', () => { + const { container } = RenderReviewCard({ game: { id: 570, name: 'Dota 2' } }) + + const header = container.querySelector('.reviewCardHeader')! + expect(Array.from(header.children).map((child) => child.className)).toEqual([ + 'reviewCardGame', + 'reviewCardRating', + 'reviewCardReviewer' + ]) + }) + it('has no game name or link without a game, like on the game page', () => { RenderReviewCard() @@ -91,4 +102,126 @@ describe('ReviewCard', () => { expect(screen.getByText('Review by TestUser (you)')).toBeTruthy() expect(screen.queryByRole('button', { name: 'Edit' })).toBeNull() }) + + describe('collapsible, like on "Your reviews"', () => { + function MockTextHeight(fullHeight: number) { + vi.spyOn(Element.prototype, 'scrollHeight', 'get').mockReturnValue(fullHeight) + vi.spyOn(Element.prototype, 'clientHeight', 'get').mockReturnValue(90) + } + + function IsOpen(container: HTMLElement) { + return container.querySelector('article')!.classList.contains('reviewCardExpanded') + } + + afterEach(() => { + vi.restoreAllMocks() + }) + + it('gives every closed card the same text box, even without any text', () => { + MockTextHeight(60) + const { container } = RenderReviewCard({ + collapsible: true, + review: { ...testReview, text: '' } + }) + + expect(container.querySelector('.reviewCardTextBoxCollapsed')).not.toBeNull() + expect(screen.getByText('No written review')).toBeTruthy() + }) + + it('shows short texts in full, without a fade', () => { + MockTextHeight(40) + const { container } = RenderReviewCard({ collapsible: true }) + + expect(screen.getByText('“A test review”')).toBeTruthy() + expect(container.querySelector('.reviewCardTextFade')).toBeNull() + expect(screen.queryByRole('button', { expanded: false })).toBeNull() + }) + + it('fades the second line of a longer review and opens it when the card is clicked', () => { + MockTextHeight(200) + const { container } = RenderReviewCard({ collapsible: true }) + expect(container.querySelector('.reviewCardTextFade')).not.toBeNull() + + fireEvent.click(screen.getByText('“A test review”')) + + expect(IsOpen(container)).toBe(true) + expect(container.querySelector('.reviewCardTextBoxCollapsed')).toBeNull() + expect(container.querySelector('.reviewCardTextFade')).toBeNull() + + fireEvent.click(screen.getByText('“A test review”')) + expect(IsOpen(container)).toBe(false) + }) + + it('can be opened with the keyboard', () => { + MockTextHeight(200) + const { container } = RenderReviewCard({ collapsible: true }) + const textBox = screen.getByRole('button', { expanded: false }) + + fireEvent.keyDown(textBox, { key: 'Enter' }) + + expect(IsOpen(container)).toBe(true) + expect(textBox.getAttribute('aria-expanded')).toBe('true') + }) + + it('closes again when clicking outside the card or pressing Escape', () => { + MockTextHeight(200) + const { container } = RenderReviewCard({ collapsible: true }) + const text = screen.getByText('“A test review”') + + fireEvent.click(text) + fireEvent.pointerDown(text) + expect(IsOpen(container)).toBe(true) + + fireEvent.pointerDown(document.body) + expect(IsOpen(container)).toBe(false) + + fireEvent.click(text) + fireEvent.keyDown(document, { key: 'Escape' }) + expect(IsOpen(container)).toBe(false) + }) + + it('only has one card open at a time', () => { + MockTextHeight(200) + const { container } = render( + + + + + ) + const [first, second] = Array.from(container.querySelectorAll('article')) + + fireEvent.click(first) + fireEvent.pointerDown(second) + fireEvent.click(second) + + expect(first.classList.contains('reviewCardExpanded')).toBe(false) + expect(second.classList.contains('reviewCardExpanded')).toBe(true) + }) + + it('does not open the card when the game link or a button is clicked', () => { + MockTextHeight(200) + const onEdit = vi.fn() + const { container } = RenderReviewCard({ + collapsible: true, + game: { id: 570, name: 'Dota 2' }, + currentUserId: 7, + onEdit, + onDelete: vi.fn() + }) + + fireEvent.click(screen.getByRole('button', { name: 'Edit' })) + fireEvent.click(screen.getByRole('link', { name: 'See this game' })) + + expect(onEdit).toHaveBeenCalled() + expect(IsOpen(container)).toBe(false) + }) + + it('is not shortened on other pages', () => { + MockTextHeight(200) + const { container } = RenderReviewCard() + + expect(container.querySelector('.reviewCardTextBox')).toBeNull() + expect(container.querySelector('.reviewCardTextFade')).toBeNull() + }) + }) }) diff --git a/Frontend/src/tests/ReviewLogicFrontend.test.ts b/Frontend/src/tests/ReviewLogicFrontend.test.ts index b35d627..10c3517 100644 --- a/Frontend/src/tests/ReviewLogicFrontend.test.ts +++ b/Frontend/src/tests/ReviewLogicFrontend.test.ts @@ -11,6 +11,7 @@ import { CreateReview, DeleteReview, GetRecentReviews, + GetReviewsByUser, GetReviewsForGame, UpdateReview } from '../FrontendLogic/ReviewLogicFrontend' @@ -58,6 +59,19 @@ describe('ReviewLogicFrontend', () => { expect(variables).toEqual({ limit: 5 }) }) + it("loads one page of a user's reviews with the game names and their total count", async () => { + const own = [{ ...testReview, gameName: 'Dota 2' }] + Gql.mockResolvedValue({ userReviews: own, userReviewCount: 13 }) + + await expect(GetReviewsByUser(7, 3)).resolves.toEqual({ reviews: own, totalCount: 13 }) + + const [query, variables] = Gql.mock.calls[0] + expect(query).toContain('userReviews(userId: $userId, limit: $limit, offset: $offset)') + expect(query).toContain('userReviewCount(userId: $userId)') + expect(query).toContain('gameName') + expect(variables).toEqual({ userId: 7, limit: 6, offset: 12 }) + }) + it('creates a review and returns the updated reviews of the game', async () => { Gql.mockResolvedValueOnce({ createReview: { id: 1 } }) Gql.mockResolvedValueOnce({ reviews: [testReview] }) diff --git a/Frontend/src/tests/UserReviews.test.tsx b/Frontend/src/tests/UserReviews.test.tsx new file mode 100644 index 0000000..be1bb6d --- /dev/null +++ b/Frontend/src/tests/UserReviews.test.tsx @@ -0,0 +1,184 @@ +// @vitest-environment jsdom +import { cleanup, fireEvent, render, screen } from '@testing-library/react' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { MemoryRouter } from 'react-router-dom' +import type { Review } from '../types/Review' + +const { GetReviewsByUser, UpdateReview, DeleteReview } = vi.hoisted(() => ({ + GetReviewsByUser: vi.fn(), + UpdateReview: vi.fn(), + DeleteReview: vi.fn() +})) + +// Replace the backend calls, so no server is needed +vi.mock('../FrontendLogic/ReviewLogicFrontend', async (importOriginal) => ({ + ...(await importOriginal()), + GetReviewsByUser, + UpdateReview, + DeleteReview +})) + +import UserReviews from '../components/UserReviews' + +const newerReview: Review = { + id: 2, + gameId: 730, + userId: 7, + reviewer: 'TestUser', + rating: 5, + text: 'Newer review', + gameName: 'Counter-Strike 2' +} + +const olderReview: Review = { + id: 1, + gameId: 570, + userId: 7, + reviewer: 'TestUser', + rating: 4, + text: 'Older review', + gameName: 'Dota 2' +} + +function MakeReviews(from: number, to: number): Review[] { + return Array.from({ length: to - from + 1 }, (_, index) => ({ + ...olderReview, + id: 100 - (from + index), + gameId: from + index, + gameName: `Game ${from + index}` + })) +} + +function RenderUserReviews() { + return render( + + + + ) +} + +describe('UserReviews', () => { + beforeEach(() => { + GetReviewsByUser.mockReset() + UpdateReview.mockReset() + DeleteReview.mockReset() + }) + + afterEach(() => { + cleanup() + }) + + it("shows the first page of the user's reviews in order, linking to each game", async () => { + GetReviewsByUser.mockResolvedValue({ reviews: [newerReview, olderReview], totalCount: 2 }) + RenderUserReviews() + + await screen.findByText('Counter-Strike 2') + expect(GetReviewsByUser).toHaveBeenCalledWith(7, 1) + const links = screen.getAllByRole('link', { name: 'See this game' }) + expect(links.map((link) => link.getAttribute('href'))).toEqual([ + '/gamepage/730', + '/gamepage/570' + ]) + expect(screen.queryByRole('navigation')).toBeNull() + }) + + it('tells the user when they have no reviews yet', async () => { + GetReviewsByUser.mockResolvedValue({ reviews: [], totalCount: 0 }) + RenderUserReviews() + + expect(await screen.findByText('You have not reviewed any games yet.')).toBeTruthy() + }) + + it('loads only the reviews of the chosen page', async () => { + GetReviewsByUser.mockImplementation(async (_userId: number, page: number) => + page === 1 + ? { reviews: MakeReviews(1, 6), totalCount: 8 } + : { reviews: MakeReviews(7, 8), totalCount: 8 } + ) + RenderUserReviews() + + await screen.findByText('Game 6') + expect(screen.getAllByRole('link', { name: 'See this game' })).toHaveLength(6) + expect(screen.getAllByRole('navigation')).toHaveLength(2) + + fireEvent.click(screen.getAllByRole('button', { name: 'Go to page 2' })[0]) + + await screen.findByText('Game 8') + expect(GetReviewsByUser).toHaveBeenLastCalledWith(7, 2) + expect(screen.getAllByRole('link', { name: 'See this game' })).toHaveLength(2) + expect(screen.queryByText('Game 1')).toBeNull() + }) + + it('opens the edit form in place of the review and saves the changes', async () => { + GetReviewsByUser.mockResolvedValue({ reviews: [newerReview, olderReview], totalCount: 2 }) + UpdateReview.mockResolvedValue([]) + RenderUserReviews() + + await screen.findByText('Dota 2') + fireEvent.click(screen.getAllByRole('button', { name: 'Edit' })[1]) + + expect(screen.getByText('Edit your review of Dota 2')).toBeTruthy() + fireEvent.change(screen.getByLabelText('Review (optional)'), { + target: { value: 'Changed my mind' } + }) + fireEvent.click(screen.getByRole('button', { name: 'Save Changes' })) + + expect(await screen.findByText('“Changed my mind”')).toBeTruthy() + expect(UpdateReview).toHaveBeenCalledWith(570, 1, 7, 4, 'Changed my mind') + expect(screen.queryByText('Edit your review of Dota 2')).toBeNull() + }) + + it('loads the page again after deleting, so a review from the next page moves up', async () => { + GetReviewsByUser.mockResolvedValueOnce({ + reviews: [newerReview, olderReview], + totalCount: 2 + }) + GetReviewsByUser.mockResolvedValueOnce({ reviews: [olderReview], totalCount: 1 }) + DeleteReview.mockResolvedValue([]) + RenderUserReviews() + + await screen.findByText('Counter-Strike 2') + fireEvent.click(screen.getAllByRole('button', { name: 'Delete' })[0]) + + await vi.waitFor(() => expect(screen.queryByText('Counter-Strike 2')).toBeNull()) + expect(DeleteReview).toHaveBeenCalledWith(730, 2, 7) + expect(GetReviewsByUser).toHaveBeenCalledTimes(2) + expect(screen.getByText('Dota 2')).toBeTruthy() + }) + + it('goes back a page when the last review on the last page is deleted', async () => { + let allReviews = MakeReviews(1, 7) + GetReviewsByUser.mockImplementation(async (_userId: number, page: number) => ({ + reviews: allReviews.slice((page - 1) * 6, page * 6), + totalCount: allReviews.length + })) + DeleteReview.mockImplementation(async (_gameId: number, reviewId: number) => { + allReviews = allReviews.filter((review) => review.id !== reviewId) + return [] + }) + RenderUserReviews() + + await screen.findByText('Game 1') + fireEvent.click(screen.getAllByRole('button', { name: 'Go to page 2' })[0]) + await screen.findByText('Game 7') + fireEvent.click(screen.getByRole('button', { name: 'Delete' })) + + await screen.findByText('Game 1') + expect(GetReviewsByUser).toHaveBeenLastCalledWith(7, 1) + expect(screen.queryByText('Game 7')).toBeNull() + expect(screen.queryByRole('navigation')).toBeNull() + }) + + it('shows an error when the review could not be deleted', async () => { + GetReviewsByUser.mockResolvedValue({ reviews: [olderReview], totalCount: 1 }) + DeleteReview.mockRejectedValue(new Error('You can only delete your own reviews.')) + RenderUserReviews() + + await screen.findByText('Dota 2') + fireEvent.click(screen.getByRole('button', { name: 'Delete' })) + + expect((await screen.findByRole('alert')).textContent).toBe( + 'You can only delete your own reviews.' + ) + }) +}) diff --git a/Frontend/src/types/Game.ts b/Frontend/src/types/Game.ts index a8a84dc..8a26eca 100644 --- a/Frontend/src/types/Game.ts +++ b/Frontend/src/types/Game.ts @@ -7,6 +7,7 @@ export type GameData = { description: string image: string salePercent?: number + originalPrice?: number } export interface Game { diff --git a/package-lock.json b/package-lock.json index 4c7199c..072d8b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/react": "^19.2.18", "@types/react-dom": "^19.2.7", "@vitejs/plugin-react": "^6.1.1", - "@vitest/coverage-v8": "^5.0.5", + "@vitest/coverage-v8": "^5.1.0", "@vitest/ui": "^5.0.5", "eslint": "^10.10.0", "eslint-config-prettier": "^10.1.8", @@ -401,7 +401,6 @@ "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.7", @@ -746,7 +745,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=20.19.0" }, @@ -795,7 +793,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=20.19.0" } @@ -864,7 +861,6 @@ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz", "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", @@ -908,7 +904,6 @@ "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz", "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==", "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", @@ -2085,7 +2080,8 @@ "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@types/bcrypt": { "version": "6.0.0", @@ -2181,7 +2177,6 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.3.0.tgz", "integrity": "sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==", "license": "MIT", - "peer": true, "dependencies": { "csstype": "^3.2.2" } @@ -2192,7 +2187,6 @@ "integrity": "sha512-ZI7bU42mZXXKHn/qNLEw2IrbiINU7X5+vfgdixBHkCNpYWXjKgfQ/P+uyGb5CjOLB9UcnTeg3rylQtV2hym44Q==", "dev": true, "license": "MIT", - "peer": true, "peerDependencies": { "@types/react": "^19.3.0" } @@ -2251,7 +2245,6 @@ "integrity": "sha512-nO974WLllwhSFWQXnMLj6nDGa8f0khKEz1JzpPJ1u7Vm/4X1X6ZHajpoknU4bb41vJyMB0HHVyS2GqdhWfIXZw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.70.1", "@typescript-eslint/types": "8.70.1", @@ -2481,16 +2474,15 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-5.0.5.tgz", - "integrity": "sha512-4KpkGdIrSqBihx/JyP/e+S+IKB98etg1XDQiLAxksLfcShnwi1VReGeOT9NI43hLHbknosKp/1CCLn9Zgcs8mg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-5.1.0.tgz", + "integrity": "sha512-OY9aShBQG5KOIw2zCo9fDoCHI9RHliNHJ//nM7m6jGg41Hyke9JOGWmeMlK74xYErsxMoK8mIB3gAeEyFVA7LA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@bcoe/v8-coverage": "^1.0.2", - "@vitest/istanbul-lib-coverage": "^1.0.2", - "@vitest/istanbul-lib-report": "^1.0.2", + "@vitest/istanbul-lib-coverage": "^2.1.0", + "@vitest/istanbul-lib-report": "^2.1.0", "ast-v8-to-istanbul": "^1.0.7", "magicast": "^0.5.5", "obug": "^3.0.0", @@ -2501,8 +2493,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "5.0.5", - "vitest": "5.0.5" + "@vitest/browser": "5.1.0", + "vitest": "5.1.0" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -2511,9 +2503,9 @@ } }, "node_modules/@vitest/istanbul-lib-coverage": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@vitest/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz", - "integrity": "sha512-9J/JMwOf9AoJhAywhrn7ScKTL38hsWQP/qPG60OtaAFcQ5OXPwKsxZFlbnuCKmZ61m8/lGgHYnFpdyQZUvG/iA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@vitest/istanbul-lib-coverage/-/istanbul-lib-coverage-2.1.0.tgz", + "integrity": "sha512-WOjuS+xcjSIy7ruYBQ+9BUcV7XZQ0FyVcbWbWxW9TRx/kLGx5SQaeFRIFDJxjNplb6YsT7SpKo2zuXXUo91OIQ==", "dev": true, "license": "MIT", "engines": { @@ -2521,27 +2513,27 @@ } }, "node_modules/@vitest/istanbul-lib-report": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@vitest/istanbul-lib-report/-/istanbul-lib-report-1.0.2.tgz", - "integrity": "sha512-gUsfXZJbzPamoIY5TvHFiMMoXESBrUMo+xqaj+rYrWI69+EnvRlYBlP96ZnHPY4vX8kyUpgAnFUCg5wZG/HkDQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@vitest/istanbul-lib-report/-/istanbul-lib-report-2.1.0.tgz", + "integrity": "sha512-+ZFta25nWtGCOBG9/IET8w1RO5Oawsd6H8Uf6AJ9EA/StFuKVtKAEJEJ6uRt84OH+T4YkI0ASmIHAhRA+0KVxw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/istanbul-lib-coverage": "1.0.2" + "@vitest/istanbul-lib-coverage": "2.1.0" }, "engines": { "node": ">=22" } }, "node_modules/@vitest/mocker": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-5.0.5.tgz", - "integrity": "sha512-xLL3lkDegJZw+MGoGaCCsFayDZthGgpAtr3Vziyfc4p7xH89K7KRPcRBBh/kEYm0Aqkt5DtTmkYpBtRV/FrHZg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-5.1.0.tgz", + "integrity": "sha512-5umB9/jlWcqVS6fsrFmv5Gdnpu6wAUio/lEOwAmvB7v+lFo/IW2B9FhAD0p19GCULTgMzLCdUmuCDCnAzWgppQ==", "dev": true, "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "0.3.31", - "@vitest/spy": "5.0.5", + "@vitest/spy": "5.1.0", "estree-walker": "^3.0.3", "magic-string": "^1.4.3" }, @@ -2562,9 +2554,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-5.0.5.tgz", - "integrity": "sha512-24sSdIlMA9DVPXnYiB9siwU0bTd887Y9jX3+vabztCSsvHwo7ipvJ/a2L3Rljw8+2rK1f5fCj3h5U9I/Jsqgbw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-5.1.0.tgz", + "integrity": "sha512-IRx5mc30CrFzyMNni6SZKQ1r53kv049Mcvvk0WbWcD6PUz/bFjG4zYv0KosQAeonPpGp5WxqYBMqdSOfJfvVWw==", "dev": true, "license": "MIT", "dependencies": { @@ -2575,9 +2567,9 @@ } }, "node_modules/@vitest/spy": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-5.0.5.tgz", - "integrity": "sha512-lwJRExuH417257Q5wv9QYugN9IMJkoxcrKrYxGPQkBzl7wlNpTUxD/5yNX4ESKVUIShKPgkGchYPFMWOOk0wzw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-5.1.0.tgz", + "integrity": "sha512-2DPO5OMHWKrBngC+fCmTQqemNF0gidRhp3lxbBmRhW+M1XJrfgPpqNqWVevXtn2f2ufD5ZaR1B6B641aAlcX5A==", "dev": true, "license": "MIT", "funding": { @@ -2585,14 +2577,13 @@ } }, "node_modules/@vitest/ui": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-5.0.5.tgz", - "integrity": "sha512-dCoGUOdgmCaSB2g+WQ/spPCBkytAWdNUkFSXY4z+eYp2d8JEOY8v0uDRaJTG9qf/kTlTVZ4CuYMYMz/f1HS/qQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-5.1.0.tgz", + "integrity": "sha512-00S3x4NRmqIBUiTVWF9/xLaA9EP9KeKv0+1sBO7e2Y4luBISlW+2ttnhlk/zjbTqEvVhJWCCo7MXzu6zNbefqQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@vitest/utils": "5.0.5", + "@vitest/utils": "5.1.0", "fflate": "^0.8.3", "flatted": "^3.4.4", "pathe": "^2.0.3", @@ -2603,17 +2594,17 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "5.0.5" + "vitest": "5.1.0" } }, "node_modules/@vitest/utils": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-5.0.5.tgz", - "integrity": "sha512-/rBu7gzLDQI/SC79Tn98b5DwOgaHU/Gt4I9OVeP3YofzNaYtbImRCOJQmT1S6vOJg9gEIlWC+r3QxKkjuSa1nQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-5.1.0.tgz", + "integrity": "sha512-V+qgCwkvVw+s1t1S5TaoBHsLi5Sz/YmohCMoOu0mZ8ZQst2bKhRYARAQucWpVg8D0mv0x5MHcWXY5QdOsoiGBQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "5.0.5", + "@vitest/pretty-format": "5.1.0", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.2.0" }, @@ -2639,7 +2630,6 @@ "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2680,6 +2670,7 @@ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=8" } @@ -2690,6 +2681,7 @@ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=10" }, @@ -2892,7 +2884,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.11.23", "caniuse-lite": "^1.0.30001810", @@ -3247,7 +3238,8 @@ "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/dom-helpers": { "version": "5.2.1", @@ -3403,7 +3395,6 @@ "integrity": "sha512-P7a6UEEqb9G95MYAtqkmsTbVXIYyzIfl6NGOIJk162PaahFxFyeGcrlXYFSiagECg4sEm8IseJdZBKR3rx6MsQ==", "dev": true, "license": "MIT", - "peer": true, "workspaces": [ "packages/*" ], @@ -3867,7 +3858,6 @@ "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.14.2.tgz", "integrity": "sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==", "license": "MIT", - "peer": true, "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } @@ -4275,7 +4265,6 @@ "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@keyv/serialize": "^1.1.1" } @@ -4639,6 +4628,7 @@ "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", "dev": true, "license": "MIT", + "peer": true, "bin": { "lz-string": "bin/bin.js" } @@ -5042,7 +5032,6 @@ "resolved": "https://registry.npmjs.org/pg/-/pg-8.23.1.tgz", "integrity": "sha512-aL96AHANtWjPLDOLqnhx+ngp9+UK7ETEU8VJrDCGvsSSi/mGLcWYsS6Herg7lmaBJe4uwrfqsa7gTEFaSizDoQ==", "license": "MIT", - "peer": true, "dependencies": { "pg-connection-string": "^2.14.1", "pg-pool": "^3.14.0", @@ -5255,6 +5244,7 @@ "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -5347,7 +5337,6 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.3.0.tgz", "integrity": "sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==", "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -5357,7 +5346,6 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.0.tgz", "integrity": "sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==", "license": "MIT", - "peer": true, "dependencies": { "scheduler": "^0.28.0" }, @@ -5370,7 +5358,8 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/react-router": { "version": "7.18.4", @@ -6028,7 +6017,6 @@ "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -6143,7 +6131,6 @@ "integrity": "sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "lightningcss": "^1.33.0", "picomatch": "^4.0.7", @@ -6217,15 +6204,14 @@ } }, "node_modules/vitest": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-5.0.5.tgz", - "integrity": "sha512-cPODOMF8YnkiiYtDdHo6n4wWmBrOBBbOIYH2d33M4l3CdNn72h+qMmO6uXffUN6A5AZFXNND/d+krS9mgkXRfg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-5.1.0.tgz", + "integrity": "sha512-MzmNFnrwa8v8lF1bLxw3UJ4EREwVOVb75VqJZmUDRjJ6EluK/x9th7qTbaeDk41WxE1GxWqmTXcdsfobfH5sOA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/chai": "^5.2.2", - "@vitest/mocker": "5.0.5", + "@vitest/mocker": "5.1.0", "chai": "^6.3.0", "es-module-lexer": "^2.3.2", "expect-type": "^1.4.0", @@ -6251,12 +6237,12 @@ "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "5.0.5", - "@vitest/browser-preview": "5.0.5", + "@vitest/browser-playwright": "5.1.0", + "@vitest/browser-preview": "5.1.0", "@vitest/browser-webdriverio": "^5.0.0-beta.5 || >=5.0.0", - "@vitest/coverage-istanbul": "5.0.5", - "@vitest/coverage-v8": "5.0.5", - "@vitest/ui": "5.0.5", + "@vitest/coverage-istanbul": "5.1.0", + "@vitest/coverage-v8": "5.1.0", + "@vitest/ui": "5.1.0", "happy-dom": "*", "jsdom": "*", "vite": "^6.4.0 || ^7.0.0 || ^8.0.0" @@ -6460,7 +6446,6 @@ "integrity": "sha512-g8W2D2kU6a8untc053fX1uVBKzM7yqAxW/3zwk83+6RyF2+SKOuV+c0wBDhUwzV1PaGapmZH+rmcUzPf+3CGwg==", "dev": true, "license": "MIT", - "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } diff --git a/package.json b/package.json index 71f5c30..972a5b3 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "server": "node Backend/Server.ts", "db:create": "node Database/CreateTables.ts", "db:fill": "node Database/FillDb.ts", - "db:fill:genres": "node Database/FillGenres.ts", + "db:fill:genres":"node Database/FillGenres.ts", "server:local": "node --env-file=Frontend/.env.development Backend/Server.ts", "db:create:local": "node --env-file=Frontend/.env.development Database/CreateTables.ts", "db:fill:local": "node --env-file=Frontend/.env.development Database/FillDb.ts", @@ -49,7 +49,7 @@ "@types/react": "^19.2.18", "@types/react-dom": "^19.2.7", "@vitejs/plugin-react": "^6.1.1", - "@vitest/coverage-v8": "^5.0.5", + "@vitest/coverage-v8": "^5.1.0", "@vitest/ui": "^5.0.5", "eslint": "^10.10.0", "eslint-config-prettier": "^10.1.8",