Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Frontend/App.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { HashRouter, Routes, Route } from 'react-router-dom'
import MainPage from './src/pages/MainPage'
import GamePage from './src/pages/GamePage'
import { SearchPage } from './src/pages/SearchPage'
import SignUpPage from './src/pages/SignUp'
import SignInPage from './src/pages/SignIn'
import WishlistPage from './src/pages/WishlistPage'
import ProfilePage from './src/pages/ProfilePage'
import FriendsPage from './src/pages/FriendsPage'
import MainPage from './src/pages/MainPage/MainPage'
import GamePage from './src/pages/GamePage/GamePage'
import { SearchPage } from './src/pages/SearchPage/SearchPage'
import SignUpPage from './src/pages/SignIn&SignUp/SignUp'
import SignInPage from './src/pages/SignIn&SignUp/SignIn'
import WishlistPage from './src/pages/WishlistPage/WishlistPage'
import ProfilePage from './src/pages/ProfilePage/ProfilePage'
import FriendsPage from './src/pages/FriendsPage/FriendsPage'
import ScrollManager from './src/components/ScrollManager'

function App() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,13 @@
min-height: 0;
}

.activeGameInfoContent.MuiCardContent-root,
.activeGameReviewsContent.MuiCardContent-root {
.activeGameInfoContent.MuiCardContent-root {
display: flex;
flex-direction: column;
gap: 1rem;
padding: 1.25rem;
}

.activeGameReviewsContent.MuiCardContent-root {
box-sizing: border-box;
flex: 1 1 0;
height: 100%;
min-height: 0;
}

.activeGameInfoHeader {
display: flex;
align-items: center;
Expand Down Expand Up @@ -173,56 +165,6 @@
color: var(--primary-text-color);
}

.activeGameReviewsHeader {
display: flex;
align-items: center;
justify-content: space-between;
gap: 1rem;
}

.activeGameReviewsHeader .MuiTypography-root {
color: var(--primary-text-color);
}

.activeGameScore {
margin: 0;
white-space: nowrap;
}

.activeGameReviewsContent .reviewComposerToggle.MuiButton-root {
align-self: flex-start;
background-color: var(--primary-background-color);
color: var(--primary-text-color);
text-transform: none;
}

.reviewComposerHint {
margin: -0.5rem 0 0;
color: var(--primary-text-color);
font-size: 0.9rem;
}

.activeGameReviewList {
display: flex;
flex: 1 1 0;
flex-direction: column;
min-height: clamp(6rem, 28vh, 20rem);
gap: 0.65rem;
overflow-y: auto;
scrollbar-gutter: stable;
}

.activeGameReviewList > .reviewCard {
flex: 0 0 auto;
box-shadow: none;
}

.activeGameNoReviews {
margin: 0;
color: var(--primary-text-color);
}

.activeGameReviewsContent .MuiDivider-root,
.activeGameInfoContent .MuiDivider-root {
width: 100%;
border-color: rgb(0 0 0 / 20%);
Expand All @@ -239,20 +181,9 @@
gap: 1rem;
}

.activeGameInfoContent.MuiCardContent-root,
.activeGameReviewsContent.MuiCardContent-root {
.activeGameInfoContent.MuiCardContent-root {
padding: 1.125rem;
}

.activeGameReviewsContent.MuiCardContent-root {
height: auto;
}

.activeGameReviewList {
flex: 0 1 auto;
min-height: 0;
max-height: min(36rem, 70vh);
}
}

@media (max-width: 26rem) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import { Box, Button, Card, CardContent, CardMedia, Chip, Divider, Typography } from '@mui/material'
import '../css/ActiveGameCard.css'
import type { GameData } from '../types/Game'
import { GetSavedUser } from '../FrontendLogic/UserLogicFrontend'
import './ActiveGameCard.css'
import type { GameData } from '../../types/Game'
import { GetSavedUser } from '../../FrontendLogic/UserLogicFrontend'
import { useState, useEffect } from 'react'
import {
RemoveFromWishlistFrontend,
AddToWishlistFrontend,
FetchWishlistFrontend
} from '../FrontendLogic/WishlistLogicFrontend'
} from '../../FrontendLogic/WishlistLogicFrontend'
import {
CreateReview,
DeleteReview,
GetReviewsForGame,
UpdateReview
} from '../FrontendLogic/ReviewLogicFrontend'
import type { Review } from '../types/Review'
import Reviews from './Reviews'
import { UseAuth } from '../context/AuthContext'
} from '../../FrontendLogic/ReviewLogicFrontend'
import type { Review } from '../../types/Review'
import Reviews from '../Reviews/Reviews'
import { UseAuth } from '../../context/AuthContext'

type ActiveGameCardProps = {
game: GameData
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import '../css/Footer.css'
import gameStartLogo from '../assets/LogoGameStartTransparent.webp'
import './Footer.css'
import gameStartLogo from '../../assets/LogoGameStartTransparent.webp'
import { Divider } from '@mui/material'

export default function Footer() {
Expand Down
2 changes: 1 addition & 1 deletion Frontend/src/components/GenreGamesSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import { type CSSProperties, useEffect, useState } from 'react'
import { Autocomplete, Button, TextField, useMediaQuery, Card } from '@mui/material'
import type { PageGame } from '../types/Game'
import PassiveGameCard from './PassiveGameCard'
import PassiveGameCard from './PassiveGameCard/PassiveGameCard'
import { Link } from 'react-router-dom'

const NO_GAMES: PageGame[] = []
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useState } from 'react'
import { Link, NavLink, useLocation } from 'react-router-dom'
import '../css/Header.css'
import './Header.css'
import {
House,
UserRound,
Expand All @@ -12,9 +12,9 @@ import {
Menu,
X
} from 'lucide-react'
import gameStartLogo from '../assets/LogoGameStartTransparent.webp'
import gameStartLogo from '../../assets/LogoGameStartTransparent.webp'
import Divider from '@mui/material/Divider'
import { UseAuth } from '../context/AuthContext'
import { UseAuth } from '../../context/AuthContext'

export default function Header() {
const { user, logout } = UseAuth()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { ReactNode } from 'react'
import { ArrowLeft } from 'lucide-react'
import { useNavigate } from 'react-router-dom'
import '../css/PageHeading.css'
import './PageHeading.css'

type PageHeadingProps = {
title: string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import '../css/PassiveGameCard.css'
import './PassiveGameCard.css'
import Card from '@mui/material/Card'
import CardContent from '@mui/material/CardContent'
import CardMedia from '@mui/material/CardMedia'
import Typography from '@mui/material/Typography'
import CardActionArea from '@mui/material/CardActionArea'
import { Link } from 'react-router-dom'
import { useLayoutEffect, useRef, useState } from 'react'
import type { PassiveGameData } from '../types/Game'
import type { PassiveGameData } from '../../types/Game'

type Props = {
game: PassiveGameData
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import {
MenuItem,
TextField
} from '@mui/material'
import { FetchGameOptions, type GameOption } from '../FrontendLogic/ProfileLogicFrontend'
import { useDebouncedValue } from '../hooks/useDebouncedValue'
import type { Profile } from '../../../Backend/logic/ProfileLogicBackend'
import { SETUP_OPTIONS } from '../types/SetupOptions'
import '../css/EditProfile.css'
import { FetchGameOptions, type GameOption } from '../../FrontendLogic/ProfileLogicFrontend'
import { useDebouncedValue } from '../../hooks/useDebouncedValue'
import type { Profile } from '../../../../Backend/logic/ProfileLogicBackend'
import { SETUP_OPTIONS } from '../../types/SetupOptions'
import './EditProfile.css'

const GAME_OPTIONS_PAGE_SIZE = 20

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useLayoutEffect, useRef, useState } from 'react'
import useMediaQuery from '@mui/material/useMediaQuery'
import ReviewCard from './ReviewCard'
import ReviewCard from '../ReviewCard/ReviewCard'
import { Card } from '@mui/material'
import '../css/RecentReviews.css'
import './RecentReviews.css'
import {
GetSavedRecentReviewCount,
SaveRecentReviewCount
} from '../FrontendLogic/MainPageLogicFrontend'
import type { Review } from '../types/Review'
} from '../../FrontendLogic/MainPageLogicFrontend'
import type { Review } from '../../types/Review'

type RecentReviewsProps = {
reviews: Review[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { Link } from 'react-router-dom'
import Button from '@mui/material/Button'
import Rating from '@mui/material/Rating'
import Typography from '@mui/material/Typography'
import '../css/Reviews.css'
import type { Review } from '../types/Review'
import './ReviewCard.css'
import type { Review } from '../../types/Review'

type ReviewCardProps = {
review: Review
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,3 @@
flex-wrap: wrap;
gap: 0.5rem;
}

.reviewComposerError {
margin: 0;
color: var(--primary-text-color);
font-weight: 700;
overflow-wrap: anywhere;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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'
import './ReviewComposer.css'

type ReviewComposerProps = {
isEditing: boolean
Expand Down
84 changes: 84 additions & 0 deletions Frontend/src/components/Reviews/Reviews.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
.activeGameReviewsContent.MuiCardContent-root {
display: flex;
box-sizing: border-box;
flex: 1 1 0;
flex-direction: column;
gap: 1rem;
height: 100%;
min-height: 0;
padding: 1.25rem;
}

.activeGameReviewsHeader {
display: flex;
align-items: center;
justify-content: space-between;
gap: 1rem;
}

.activeGameReviewsHeader .MuiTypography-root {
color: var(--primary-text-color);
}

.activeGameScore {
margin: 0;
white-space: nowrap;
}

.activeGameReviewsContent .reviewComposerToggle.MuiButton-root {
align-self: flex-start;
background-color: var(--primary-background-color);
color: var(--primary-text-color);
text-transform: none;
}

.reviewComposerHint {
margin: -0.5rem 0 0;
color: var(--primary-text-color);
font-size: 0.9rem;
}

.reviewComposerError {
margin: 0;
color: var(--primary-text-color);
font-weight: 700;
overflow-wrap: anywhere;
}

.activeGameReviewsContent .MuiDivider-root {
width: 100%;
border-color: rgb(0 0 0 / 20%);
}

.activeGameReviewList {
display: flex;
flex: 1 1 0;
flex-direction: column;
min-height: clamp(6rem, 28vh, 20rem);
gap: 0.65rem;
overflow-y: auto;
scrollbar-gutter: stable;
}

.activeGameReviewList > .reviewCard {
flex: 0 0 auto;
box-shadow: none;
}

.activeGameNoReviews {
margin: 0;
color: var(--primary-text-color);
}

@media (max-width: 64rem) {
.activeGameReviewsContent.MuiCardContent-root {
height: auto;
padding: 1.125rem;
}

.activeGameReviewList {
flex: 0 1 auto;
min-height: 0;
max-height: min(36rem, 70vh);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import Button from '@mui/material/Button'
import CardContent from '@mui/material/CardContent'
import Divider from '@mui/material/Divider'
import Typography from '@mui/material/Typography'
import ReviewCard from './ReviewCard'
import ReviewComposer from './ReviewComposer'
import type { Review } from '../types/Review'
import ReviewCard from '../ReviewCard/ReviewCard'
import ReviewComposer from '../ReviewComposer/ReviewComposer'
import type { Review } from '../../types/Review'
import './Reviews.css'

function GetAverageRating(reviews: Review[]): number | null {
if (reviews.length === 0) return null
Expand Down
2 changes: 1 addition & 1 deletion Frontend/src/components/SearchPageResults.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { memo } from 'react'
import { Pagination } from '@mui/material'
import type { Game } from '../../../Backend/Steam'
import PassiveGameCard from './PassiveGameCard'
import PassiveGameCard from './PassiveGameCard/PassiveGameCard'

const SearchResultsGrid = memo(function SearchResultsGrid({ games }: { games: Game[] }) {
return (
Expand Down
2 changes: 1 addition & 1 deletion Frontend/src/components/TopGames.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Card } from '@mui/material'
import type { PageGame } from '../types/Game'
import PassiveGameCard from './PassiveGameCard'
import PassiveGameCard from './PassiveGameCard/PassiveGameCard'

interface TopGamesProps {
loading: boolean
Expand Down
Loading