Imperial-MEng/drp-48
1
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/fave-only-on-session' into 'master'

Browse Source 
merge: Merged fix/fave-only-on-session to master

See merge request gk1623/drp-48!22

Co-authored-by: Caspar Jojo Asaam <caspar@Caspars-MacBook-Pro-6597.local>
This commit is contained in:
Caspar Jojo Asaam
2025-06-13 11:47:24 +00:00
parent 7f305287f0 d767bc4fad
commit b8f31aef5b
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/components/SpaceCard.svelte
View File

@@ -11,7 +11,8 @@
imgSrc: string; imgSrc: string;
href?: string; href?: string;
isFavourite: boolean; isFavourite: boolean;
onToggleFavourite: () => void;
onToggleFavourite?: () => void;
} }
const { space, hours, alt, imgSrc, href, isFavourite, onToggleFavourite }: Props = $props(); const { space, hours, alt, imgSrc, href, isFavourite, onToggleFavourite }: Props = $props();
@@ -21,9 +22,11 @@
<!-- <img src={imgSrc} {alt} /> --> <!-- <img src={imgSrc} {alt} /> -->
<div class="image-container"> <div class="image-container">
<img src={imgSrc} {alt} /> <img src={imgSrc} {alt} />
<div class="fav-button"> {#if onToggleFavourite}
<Favourite {isFavourite} {onToggleFavourite} /> <div class="fav-button">
</div> <Favourite {isFavourite} {onToggleFavourite} />
</div>
{/if}
</div> </div>
<div class="description"> <div class="description">
<h1>{space.location}</h1> <h1>{space.location}</h1>

2
src/routes/+page.svelte
View File

@@ -232,7 +232,7 @@
space={studySpace} space={studySpace}
hours={studySpace.study_space_hours} hours={studySpace.study_space_hours}
isFavourite={favouriteIds.includes(studySpace.id)} isFavourite={favouriteIds.includes(studySpace.id)}
onToggleFavourite={() => handleToggleFavourite(studySpace.id)} onToggleFavourite={session ? () => handleToggleFavourite(studySpace.id) : undefined}
/> />
{/each} {/each}
</main> </main>

25
src/routes/space/[id]/+page.svelte
View File

@@ -122,11 +122,15 @@
{/if} {/if}
<main> <main>
<Carousel urls={imgUrls} /> <Carousel urls={imgUrls} />
<div class="titleContainer"> <div class="nameContainer">
<div class="nameContainer">{space.location}</div> <div class="locationContainer">{space.location}</div>
<div class="title-fav"> {#await supabase.auth.getSession() then resp}
<Favourite {isFavourite} onToggleFavourite={handleToggleFavourite} /> {#if resp.data.session}
</div> <div class="title-fav">
<Favourite {isFavourite} onToggleFavourite={handleToggleFavourite} />
</div>
{/if}
{/await}
</div> </div>
{#if space.description != null && space.description.length > 0} {#if space.description != null && space.description.length > 0}
<p class="descContainer"> <p class="descContainer">
@@ -223,12 +227,13 @@
} }
.nameContainer { .nameContainer {
z-index: 10; display: flex;
display: block; align-items: center;
justify-content: space-between;
gap: 0.5rem;
width: 100%; width: 100%;
padding: 0.6rem; padding: 0.6rem;
margin-top: -0.5rem; margin-top: -0.5rem;
object-position: center;
background-color: #49bd85; background-color: #49bd85;
border-radius: 8px; border-radius: 8px;
font-size: 2.8rem; font-size: 2.8rem;
@@ -338,12 +343,12 @@
font-family: monospace; font-family: monospace;
color: #eaffeb; color: #eaffeb;
} }
.titleContainer { /* .titleContainer {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin: -0.5rem 0 1rem; margin: -0.5rem 0 1rem;
} } */
.title-fav { .title-fav {
font-size: 2rem; font-size: 2rem;
background: rgba(0, 0, 0, 0.4); background: rgba(0, 0, 0, 0.4);