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
6 changes: 3 additions & 3 deletions Backend/resolvers/FriendResolvers.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { GraphQLError } from 'graphql'
import { pool } from '../DatabaseConnection.ts'
import { GAME_COLUMNS } from '../GameColumns.ts'
import { AddFriend, AreFriends, GetFriendId, GetFriends } from '../FriendLogicBackend.ts'
import { GAME_COLUMNS } from '../types/GameColumns.ts'
import { AddFriend, AreFriends, GetFriendId, GetFriends } from '../logic/FriendLogicBackend.ts'
import type { Game } from '../Steam.ts'
import { RequireUser } from '../UserLogicBackend.ts'
import { RequireUser } from '../logic/UserLogicBackend.ts'
import type { GraphQLContext } from './types.ts'

export const friendQueryResolvers = {
Expand Down
6 changes: 3 additions & 3 deletions Backend/resolvers/GameResolvers.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { pool } from '../DatabaseConnection.ts'
import { FetchGenres } from '../Genres.ts'
import { GAME_COLUMNS } from '../GameColumns.ts'
import { FetchGenres } from '../logic/GenresLogicBackend.ts'
import { GAME_COLUMNS } from '../types/GameColumns.ts'
import {
FetchDiscountedGames,
FetchTop10GamesPerGenre,
FetchTop3Games
} from '../MainPageLogicBackend.ts'
} from '../logic/MainPageLogicBackend.ts'
import type { Game } from '../Steam.ts'

const SORT_SQL: Record<string, string> = {
Expand Down
4 changes: 2 additions & 2 deletions Backend/resolvers/ReviewResolvers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {
GetRecentReviews,
GetReviewsForGame,
UpdateReview
} from '../Reviews.ts'
import { RequireUser } from '../UserLogicBackend.ts'
} from '../logic/ReviewsLogicBackend.ts'
import { RequireUser } from '../logic/UserLogicBackend.ts'
import type { GraphQLContext } from './types.ts'

export const reviewQueryResolvers = {
Expand Down
4 changes: 2 additions & 2 deletions Backend/resolvers/UserResolvers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RequireUser, Signin, Signup } from '../UserLogicBackend.ts'
import { FetchProfile, UpdateProfile, type ProfileInput } from '../ProfileLogicBackend.ts'
import { RequireUser, Signin, Signup } from '../logic/UserLogicBackend.ts'
import { FetchProfile, UpdateProfile, type ProfileInput } from '../logic/ProfileLogicBackend.ts'
import type { GraphQLContext } from './types.ts'

export const userQueryResolvers = {
Expand Down
6 changes: 3 additions & 3 deletions Backend/resolvers/WishlistResolvers.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { pool } from '../DatabaseConnection.ts'
import { GAME_COLUMNS } from '../GameColumns.ts'
import { AddToWishlist, RemoveFromWishlist } from '../WishlistLogicBackend.ts'
import { GAME_COLUMNS } from '../types/GameColumns.ts'
import { AddToWishlist, RemoveFromWishlist } from '../logic/WishlistLogicBackend.ts'
import type { Game } from '../Steam.ts'
import { RequireUser } from '../UserLogicBackend.ts'
import { RequireUser } from '../logic/UserLogicBackend.ts'
import type { GraphQLContext } from './types.ts'

export const wishlistQueryResolvers = {
Expand Down
35 changes: 35 additions & 0 deletions Frontend/src/FrontendLogic/SearchPageLogicFrontend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,38 @@ export function GetPageSearchpage(): number {
return 1
}
}

export function SaveFilterMenuOpenSearchpage(isOpen: boolean) {
try {
sessionStorage.setItem('GameStart:filterMenuOpenSearchpage', JSON.stringify(isOpen))
} catch (error: unknown) {
const message = error instanceof Error ? error.message : String(error)
console.log(`Searchpage: Could not save filter menu state to session storage: ${message}`)
}
}

export function GetFilterMenuOpenSearchpage(): boolean {
try {
return JSON.parse(sessionStorage.getItem('GameStart:filterMenuOpenSearchpage') ?? 'false') === true
} catch {
return false
}
}

export function ClearFilterAndSort() {
try {
sessionStorage.removeItem('GameStart:sortOptionSearchpage')
sessionStorage.removeItem('GameStart:filtersSearchpage')
sessionStorage.removeItem('GameStart:filterMenuOpenSearchpage')
} catch (error) {
console.log(`Could not clear filters and sorting from storage`)
}
}

export function ClearSearch() {
try {
sessionStorage.removeItem('GameStart:pageSearchpage')
} catch (error) {
console.log(`Could not clear search from storage`)
}
}
60 changes: 51 additions & 9 deletions Frontend/src/css/SearchPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,67 @@

.filtersection {
box-sizing: border-box;
display: flex;
flex-wrap: wrap;
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
align-items: start;
align-self: center;
justify-content: center;
gap: 0.5rem;
gap: 0.75rem 0.5rem;
width: min(480px, calc(100% - 32px));
padding: 16px;
border: 1px solid var(--primary-accent-color);
border-top: 0;
}

.filtersection .MuiFormControl-root {
flex: 1 1 200px;
min-width: min(100%, 140px);
min-width: 0;
}

.filtersection .resetButton.MuiButton-root,
.filtersection .removeFiltersButton.MuiButton-root {
width: 100%;
padding: 0.6rem 1rem;
border: none;
border-radius: 4px;
background-color: var(--primary-component-color);
color: var(--primary-text-color);
font-family: var(--primary-font);
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.25);
}

.filtersection .resetButton.MuiButton-root:hover,
.filtersection .removeFiltersButton.MuiButton-root:hover {
background-color: var(--primary-accent-color);
}

.filtersection .resetButton.MuiButton-root.Mui-disabled,
.filtersection .removeFiltersButton.MuiButton-root.Mui-disabled {
background-color: var(--secondary-component-color);
color: rgba(0, 0, 0, 0.4);
box-shadow: none;
}

.filtersection .MuiOutlinedInput-root .MuiOutlinedInput-notchedOutline {
border-color: var(--primary-component-color);
}

@media (min-width: 600px) {
.filtersection .MuiFormControl-root {
min-width: 200px;
.filtersection .MuiOutlinedInput-root:hover .MuiOutlinedInput-notchedOutline,
.filtersection .MuiOutlinedInput-root.Mui-focused .MuiOutlinedInput-notchedOutline {
border-color: var(--primary-accent-color);
}

.filtersection .MuiInputLabel-root.Mui-focused {
color: var(--primary-accent-color);
}

@media (max-width: 599px) {
.filtersection {
grid-template-columns: minmax(0, 1fr);
}

.filtersection .resetButton,
.filtersection .removeFiltersButton {
grid-column: 1;
grid-row: auto;
}
}

Expand Down
100 changes: 80 additions & 20 deletions Frontend/src/pages/SearchPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import {
Paper,
InputBase,
IconButton,
Pagination
Pagination,
Button
} from '@mui/material'
import { Funnel, SearchIcon } from 'lucide-react'
import { useState, useEffect, useMemo } from 'react'
Expand All @@ -25,21 +26,26 @@ import {
GetSortOptionSearchpage,
SaveSortOptionSearchpage,
GetPageSearchpage,
SavePageSearchpage
SavePageSearchpage,
SaveFilterMenuOpenSearchpage,
GetFilterMenuOpenSearchpage
} from '../FrontendLogic/SearchPageLogicFrontend'
import type { Game } from '../../../Backend/Steam'
import type { SelectChangeEvent } from '@mui/material'
import { X } from 'lucide-react'

type SortOption = '' | 'discount-desc' | 'price-asc' | 'price-desc' | 'title-asc'

const SORT_OPTIONS: SortOption[] = ['', 'discount-desc', 'price-asc', 'price-desc', 'title-asc']
const DEFAULT_SORT: SortOption = 'title-asc'
const SORT_OPTIONS: SortOption[] = ['title-asc', 'discount-desc', 'price-asc', 'price-desc']
const GAMES_PER_PAGE = 12

const NO_GAMES: Game[] = []
const NO_FILTERS: string[] = []

function GetInitialSort(): SortOption {
const saved = GetSortOptionSearchpage()
return SORT_OPTIONS.includes(saved as SortOption) ? (saved as SortOption) : ''
return SORT_OPTIONS.includes(saved as SortOption) ? (saved as SortOption) : DEFAULT_SORT
}

export function SearchPage() {
Expand All @@ -55,17 +61,28 @@ export function SearchPage() {
const [activeSorting, setActiveSorting] = useState<SortOption>(GetInitialSort)
const [searchVal, setSearchVal] = useState(GetQuerySearchpage)
const [searchQuery, setSearchQuery] = useState(GetQuerySearchpage)
const [isFilterActive, setIsFilterActive] = useState(
() => activeFilters.length > 0 || activeSorting !== ''
)
const [isFilterActive, setIsFilterActive] = useState(GetFilterMenuOpenSearchpage)
const appliedFilters = isFilterActive && activeFilters.length > 0 ? activeFilters : NO_FILTERS
const appliedSorting = isFilterActive ? activeSorting : DEFAULT_SORT

// fetches the genres from the DB
useEffect(() => {
FetchGenres().then(setGenres).catch(console.error)
}, [])

// Opens the filter menu
const ToggleActive = () => setIsFilterActive((isActive) => !isActive)
const ToggleActive = () => {
const hasSelection = activeFilters.length > 0 || activeSorting !== DEFAULT_SORT
if (hasSelection) {
setPage(1)
}
setIsFilterActive(!isFilterActive)
}

// saves the filter menu state (open: yes/no)
useEffect(() => {
SaveFilterMenuOpenSearchpage(isFilterActive)
}, [isFilterActive])

const HandleSearchSubmit = (e: React.FormEvent) => {
e.preventDefault()
Expand All @@ -85,6 +102,24 @@ export function SearchPage() {
setPage(1)
}

const HandleRemoveFilters = () => {
setActiveFilters(NO_FILTERS)
setPage(1)
}

const HandleReset = () => {
setSearchVal('')
setSearchQuery('')
setActiveFilters(NO_FILTERS)
setActiveSorting(DEFAULT_SORT)
setPage(1)
}

const HandleRemoveSearch = () => {
setSearchVal('')
setSearchQuery('')
}

// These useEffects save the current filters, query and sorting option in session storage
// so that when the user goes back to the searchpage they are kept.
useEffect(() => {
Expand All @@ -103,19 +138,19 @@ export function SearchPage() {
// Total count of games matching the current search and filters
useEffect(() => {
let cancelled = false
GetTotalGameCount({ search: searchQuery, genres: activeFilters })
GetTotalGameCount({ search: searchQuery, genres: appliedFilters })
.then((count) => {
if (!cancelled) setTotalCount(count)
})
.catch(console.error)
return () => {
cancelled = true
}
}, [searchQuery, activeFilters])
}, [searchQuery, appliedFilters])

const requestKey = useMemo(
() => JSON.stringify([page, searchQuery, activeFilters, activeSorting]),
[page, searchQuery, activeFilters, activeSorting]
() => JSON.stringify([page, searchQuery, appliedFilters, appliedSorting]),
[page, searchQuery, appliedFilters, appliedSorting]
)
const isCurrent = result !== null && result.key === requestKey
const games = isCurrent ? result.games : NO_GAMES
Expand All @@ -128,8 +163,8 @@ export function SearchPage() {

FetchGamesFromDB(GAMES_PER_PAGE, (page - 1) * GAMES_PER_PAGE, {
search: searchQuery,
genres: activeFilters,
sort: activeSorting
genres: appliedFilters,
sort: appliedSorting
})
.then((loadedGames) => {
if (!cancelled) setResult({ key: requestKey, games: loadedGames, error: null })
Expand All @@ -147,7 +182,7 @@ export function SearchPage() {
return () => {
cancelled = true
}
}, [requestKey, page, searchQuery, activeFilters, activeSorting])
}, [requestKey, page, searchQuery, appliedFilters, appliedSorting])

// Decides games per page and makes a constant for the pagination
const pageCount = Math.max(1, Math.ceil(totalCount / GAMES_PER_PAGE))
Expand All @@ -163,6 +198,13 @@ export function SearchPage() {
value={searchVal}
onChange={(e) => setSearchVal(e.target.value)}
/>
<IconButton
aria-label="clear"
className="searchConfirm"
onClick={HandleRemoveSearch}
>
<X />
</IconButton>

<IconButton type="submit" aria-label="search" className="searchConfirm">
<SearchIcon id="searchIcon" />
Expand All @@ -188,8 +230,8 @@ export function SearchPage() {
onChange={HandleSortChange}
label="Sort by"
>
<MenuItem className="sortingOptionSearchpage" value="">
None
<MenuItem className="sortingOptionSearchpage" value="title-asc">
Title: A to Z
</MenuItem>
<MenuItem className="sortingOptionSearchpage" value="discount-desc">
Discount: high to low
Expand All @@ -200,9 +242,6 @@ export function SearchPage() {
<MenuItem className="sortingOptionSearchpage" value="price-desc">
Price: high to low
</MenuItem>
<MenuItem className="sortingOptionSearchpage" value="title-asc">
Title: A to Z
</MenuItem>
</Select>
</FormControl>

Expand All @@ -227,6 +266,27 @@ export function SearchPage() {
))}
</Select>
</FormControl>
<Button
type="button"
className="removeFiltersButton"
onClick={HandleRemoveFilters}
disabled={activeFilters.length === 0}
>
Remove filters
</Button>
<Button
type="button"
className="resetButton"
onClick={HandleReset}
disabled={
searchVal === '' &&
searchQuery === '' &&
activeFilters.length === 0 &&
activeSorting === DEFAULT_SORT
}
>
Reset
</Button>
</div>
)}
<Pagination
Expand Down
Loading