From 01190eb17af0675c3ab927d6b1572e5909574314 Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Tue, 19 Nov 2024 14:56:23 +1100 Subject: [PATCH 01/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Add=20Basic=20Sca?= =?UTF-8?q?ffold=20for=20Event=20Details=20View?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.tsx | 17 ++- .../src/EventDetails/EventDetails.module.css | 142 ++++++++++++++++++ frontend/src/EventDetails/EventDetails.tsx | 92 ++++++++++++ 3 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 frontend/src/EventDetails/EventDetails.module.css create mode 100644 frontend/src/EventDetails/EventDetails.tsx diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 80a761b..ffd4d12 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -5,6 +5,7 @@ import bbq from "./assets/bbq.png"; import NavBar from "./NavBar/NavBar"; import Button, { ButtonOptions } from "./Button/Button"; import CreateEvent from "./CreateEvent/CreateEvent"; +import EventDetails from "./EventDetails/EventDetails"; function App() { return ( @@ -31,7 +32,21 @@ function App() { - + {/* */} + ); diff --git a/frontend/src/EventDetails/EventDetails.module.css b/frontend/src/EventDetails/EventDetails.module.css new file mode 100644 index 0000000..c3acafd --- /dev/null +++ b/frontend/src/EventDetails/EventDetails.module.css @@ -0,0 +1,142 @@ +.container { + background: hsl(0, 0%, 100%); + border-radius: 16px; + padding: 0; + width: 76vw; + height: 90vh; + box-shadow: 0px 0px 16px hsla(0, 0%, 0%, 0.25); +} + +.picture { + width: 100%; + border-radius: 16px 16px 0px 0px; + height: 280px; + background-size: cover; +} + +.info { + display: flex; + padding-left: 40px; + padding-right: 40px; +} + +.details { + width: 50vw; +} + +.detail { + display: flex; + height: 24px; + margin-bottom: 6px; +} + +.detailInfo { + margin: 0px; +} + +.actions { + display: flex; + height: 64px; +} + +.description { + width: 50vw; + margin-top: 24px; +} + +.keywords { + display: flex; +} + +/* .back { + width: 50px; + height: 50px; + background-color: hsl(0, 0%, 85%); + border-radius: 25px; + margin: 16px; + margin-top: 8px; + display: flex; + align-items: center; + justify-content: center; + border: 0px; +} + +.back:hover { + background-color: hsl(0, 0%, 93%); + color: hsl(0, 0%, 18%); +} + +.chevronIcon { + height: 32px; + width: 32px; + margin-left: -2px; +} + +.main { + width: 40vw; + min-width: 400px; +} + +.header { + display: flex; + justify-content: space-between; + align-items: center; + height: 64px; + margin-bottom: 24px; + font-weight: bolder; +} + +.plusIcon { + width: 50px; + height: 50px; + padding: 10px; +} + +.photo { + border: 4px hsl(0, 0%, 85%) dashed; + height: 120px; + border-radius: 16px; + display: flex; + justify-content: center; + align-items: center; + color: hsl(0, 0%, 60%); + margin-bottom: 36px; +} + +.cameraIcon { + height: 42px; + width: 42px; + margin: 12px; +} + +.field { + margin: 0px; + margin-bottom: 12px; +} + +.textInput { + background-color: hsl(0, 0%, 93%); + color: hsla(0, 0%, 0%, 30%); + height: fit-content; + min-height: 48px; + font-size: 18px; + border-radius: 8px; + padding: 14px; + margin-bottom: 34px; +} + +.times { + display: flex; + justify-content: space-between; + gap: 12px; +} + +.timeInput { + width: 23vh; +} + +.description { + line-height: 160%; + padding-left: 20px; + padding-right: 20px; +} */ diff --git a/frontend/src/EventDetails/EventDetails.tsx b/frontend/src/EventDetails/EventDetails.tsx new file mode 100644 index 0000000..699677a --- /dev/null +++ b/frontend/src/EventDetails/EventDetails.tsx @@ -0,0 +1,92 @@ +import classes from "./EventDetails.module.css"; +import Button, { ButtonOptions } from "../Button/Button"; +import { + ArrowTopRightOnSquareIcon, + CalendarIcon, + CheckIcon, + ClockIcon, + MapPinIcon, + ShareIcon, + UserIcon, +} from "@heroicons/react/24/outline"; +import { Keyword, KeywordOptions } from "../Keyword/Keyword"; + +type EventDetailsProps = { + image: string; + backgroundPositionY: string; + name: string; + society: string; + date: string; + startTime: string; + endTime: string; + location: string; + locationUrl?: string; + attending: number; + description: string; + keywords?: string[]; +}; + +function EventDetails(props: EventDetailsProps) { + return ( +
+
+ +
+
+

{props.name}

+
+ +

{props.society}

+
+
+ +

{props.date}

+
+
+ +

{`${props.startTime} - ${props.endTime}`}

+
+
+ +

{props.location}

+ {props.locationUrl && ( + + + + )} +
+
+ +

{props.attending} attending

+
+ +
+ + +
+
+ +
+

{props.description}

+ {props.keywords && ( +
+ {props.keywords?.map((keyword) => ( + {keyword} + ))} +
+ )} +
+
+
+ ); +} + +export default EventDetails; From 53dac3c32453212aa48768fa9db98000a2bf6f4d Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Mon, 9 Dec 2024 20:03:36 +1100 Subject: [PATCH 02/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Fix=20Spacing=20f?= =?UTF-8?q?or=20Event=20Details=20View?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/index.html | 2 +- frontend/src/App.tsx | 4 +- .../src/EventDetails/EventDetails.module.css | 131 +++++------------- frontend/src/EventDetails/EventDetails.tsx | 25 ++-- 4 files changed, 55 insertions(+), 107 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index f684169..2b2b636 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,7 +4,7 @@ - + Pyramids diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index ffd4d12..7f3cc07 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -32,7 +32,7 @@ function App() { - {/* */} +
-

{props.name}

+

{props.name}

- +

{props.society}

- +

{props.date}

- +

{`${props.startTime} - ${props.endTime}`}

- +

{props.location}

{props.locationUrl && ( - - + + )}
- +

{props.attending} attending

- - + +
From 5d5d922cc1837d7e0882a32fefb996634d3d3bf1 Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Tue, 10 Dec 2024 00:26:09 +1100 Subject: [PATCH 03/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Add=20ShareButton?= =?UTF-8?q?=20Component=20and=20Fix=20Classes=20for=20Button=20Components?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.tsx | 1 + frontend/src/Button/Button.module.css | 7 +++---- frontend/src/Button/Button.tsx | 21 ++++++++----------- .../src/EventDetails/EventDetails.module.css | 18 +++++++++++----- frontend/src/EventDetails/EventDetails.tsx | 6 ++---- .../src/ShareButton/ShareButton.module.css | 21 +++++++++++++++++++ frontend/src/ShareButton/ShareButton.tsx | 20 ++++++++++++++++++ 7 files changed, 69 insertions(+), 25 deletions(-) create mode 100644 frontend/src/ShareButton/ShareButton.module.css create mode 100644 frontend/src/ShareButton/ShareButton.tsx diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 7f3cc07..f6eaa34 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -6,6 +6,7 @@ import NavBar from "./NavBar/NavBar"; import Button, { ButtonOptions } from "./Button/Button"; import CreateEvent from "./CreateEvent/CreateEvent"; import EventDetails from "./EventDetails/EventDetails"; +import ShareButton from "./ShareButton/ShareButton"; function App() { return ( diff --git a/frontend/src/Button/Button.module.css b/frontend/src/Button/Button.module.css index 98e770e..f981a30 100644 --- a/frontend/src/Button/Button.module.css +++ b/frontend/src/Button/Button.module.css @@ -8,10 +8,10 @@ display: flex; align-items: center; justify-content: center; - padding: 0px; + padding: 16px; margin: 0px; box-shadow: 0px 0px 4px hsla(0, 0%, 0%, 0.25); - transition: background 0.2s linear, color 0.2s linear; + transition: background 0.2s linear, color 0.2s linear; } .button:hover { @@ -21,9 +21,8 @@ .icon { height: 64px; - padding: 16px; } .string { - padding: 12px 28px; + padding: 0px 16px; } diff --git a/frontend/src/Button/Button.tsx b/frontend/src/Button/Button.tsx index 7774c51..8379938 100644 --- a/frontend/src/Button/Button.tsx +++ b/frontend/src/Button/Button.tsx @@ -6,6 +6,7 @@ export enum ButtonOptions { String, Plus, Bookmark, + Share, } type ButtonProps = { @@ -16,29 +17,25 @@ type ButtonProps = { function Button(props: ButtonProps) { return ( - - + diff --git a/frontend/src/ShareButton/ShareButton.module.css b/frontend/src/ShareButton/ShareButton.module.css new file mode 100644 index 0000000..a52230b --- /dev/null +++ b/frontend/src/ShareButton/ShareButton.module.css @@ -0,0 +1,21 @@ +.share { + color: hsl(0, 0%, 0%); + background-color: hsl(0, 0%, 85%); + border: 0px; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + padding: 16px; + margin: 0px; + transition: background 0.2s linear, color 0.2s linear; +} + +.share:hover { + background-color: hsl(0, 0%, 93%); + color: hsl(0, 0%, 18%); +} + +.shareIcon { + height: 64px; +} \ No newline at end of file diff --git a/frontend/src/ShareButton/ShareButton.tsx b/frontend/src/ShareButton/ShareButton.tsx new file mode 100644 index 0000000..6df77db --- /dev/null +++ b/frontend/src/ShareButton/ShareButton.tsx @@ -0,0 +1,20 @@ +import { ShareIcon } from "@heroicons/react/24/outline"; +import classes from "./ShareButton.module.css"; + +type ShareButtonProps = { + className?: string; +}; + +function ShareButton(props: ShareButtonProps) { + return ( + + ); +} + +export default ShareButton; From bc1a4c92e404e5beea4e4361438d433f81405a21 Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Tue, 10 Dec 2024 01:10:23 +1100 Subject: [PATCH 04/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Modify=20Keywords?= =?UTF-8?q?=20for=20EventDetails=20Component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.tsx | 2 -- frontend/src/EventDetails/EventDetails.module.css | 6 +++++- frontend/src/EventDetails/EventDetails.tsx | 5 +++-- frontend/src/Keyword/Keyword.module.css | 11 ++++++++++- frontend/src/Keyword/Keyword.tsx | 11 ++++++----- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 1dff690..6b694b0 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -3,8 +3,6 @@ import NavBar from "./NavBar/NavBar"; import { BrowserRouter, Route, Routes } from "react-router"; import HomePage from "./HomePage/HomePage"; import AboutPage from "./About/About"; -import EventDetails from "./EventDetails/EventDetails"; -import ShareButton from "./ShareButton/ShareButton"; function App() { return ( diff --git a/frontend/src/EventDetails/EventDetails.module.css b/frontend/src/EventDetails/EventDetails.module.css index f3c6db1..0011d95 100644 --- a/frontend/src/EventDetails/EventDetails.module.css +++ b/frontend/src/EventDetails/EventDetails.module.css @@ -60,7 +60,7 @@ display: flex; height: 24px; margin-bottom: 12px; - width: 40vw; + width: 30vw; gap: 8px; } @@ -85,9 +85,13 @@ button.actionIcon { width: 40vw; margin-top: 24px; padding-left: 24px; + line-height: 1.8; height: auto; } .keywords { display: flex; + flex-wrap: wrap; + margin-top: 12px; + gap: 12px; } diff --git a/frontend/src/EventDetails/EventDetails.tsx b/frontend/src/EventDetails/EventDetails.tsx index 5a07d97..8551dda 100644 --- a/frontend/src/EventDetails/EventDetails.tsx +++ b/frontend/src/EventDetails/EventDetails.tsx @@ -70,7 +70,8 @@ function EventDetails(props: EventDetailsProps) {
@@ -82,7 +83,7 @@ function EventDetails(props: EventDetailsProps) { {props.keywords && (
{props.keywords?.map((keyword) => ( - {keyword} + {keyword} ))}
)} diff --git a/frontend/src/Keyword/Keyword.module.css b/frontend/src/Keyword/Keyword.module.css index 93cf60b..2ab4b54 100644 --- a/frontend/src/Keyword/Keyword.module.css +++ b/frontend/src/Keyword/Keyword.module.css @@ -22,9 +22,18 @@ height: 24px; } +.NoneKeyword { + background: hsl(0, 3%, 93%); + border-radius: 8px; + padding: 0.6em 0.8em 0.6em 0.8em; + display: flex; + width: fit-content; + align-items: center; + height: 24px; +} + .keywordText { width: 100%; - margin-right: 10px; font-size: 1em; } diff --git a/frontend/src/Keyword/Keyword.tsx b/frontend/src/Keyword/Keyword.tsx index 1e63252..b862af9 100644 --- a/frontend/src/Keyword/Keyword.tsx +++ b/frontend/src/Keyword/Keyword.tsx @@ -4,6 +4,7 @@ import { PlusIcon, XMarkIcon } from "@heroicons/react/24/solid"; export enum KeywordOptions { Delete, Add, + None, } type KeywordProps = { @@ -15,20 +16,20 @@ export function Keyword(props: KeywordProps) { return (
{props.children}
- + }
); } From 0dd6163220e3155a690249813f8b7bc49d07b799 Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Tue, 10 Dec 2024 01:15:28 +1100 Subject: [PATCH 05/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Reformat=20Files?= =?UTF-8?q?=20for=20eventDetailsComponent=20Branch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/Button/Button.tsx | 16 +++++-------- frontend/src/Event/Event.tsx | 2 +- frontend/src/EventDetails/EventDetails.tsx | 4 +++- frontend/src/Keyword/Keyword.tsx | 26 ++++++++++++---------- frontend/src/ShareButton/ShareButton.tsx | 8 +++---- 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/frontend/src/Button/Button.tsx b/frontend/src/Button/Button.tsx index b29dd45..8bdb35f 100644 --- a/frontend/src/Button/Button.tsx +++ b/frontend/src/Button/Button.tsx @@ -18,22 +18,16 @@ type ButtonProps = { function Button(props: ButtonProps) { return ( -
diff --git a/frontend/src/Keyword/Keyword.tsx b/frontend/src/Keyword/Keyword.tsx index b862af9..3a29ec3 100644 --- a/frontend/src/Keyword/Keyword.tsx +++ b/frontend/src/Keyword/Keyword.tsx @@ -15,21 +15,23 @@ type KeywordProps = { export function Keyword(props: KeywordProps) { return (
{props.children}
- {props.type !== KeywordOptions.None && } + {props.type !== KeywordOptions.None && ( + + )}
); } diff --git a/frontend/src/ShareButton/ShareButton.tsx b/frontend/src/ShareButton/ShareButton.tsx index 6df77db..e560ea4 100644 --- a/frontend/src/ShareButton/ShareButton.tsx +++ b/frontend/src/ShareButton/ShareButton.tsx @@ -7,11 +7,9 @@ type ShareButtonProps = { function ShareButton(props: ShareButtonProps) { return ( - ); From a3669bf7964d807f61dbaee3184f0b78115ddfb4 Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Tue, 10 Dec 2024 01:24:26 +1100 Subject: [PATCH 06/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Lighten=20Text=20?= =?UTF-8?q?Colour=20in=20Event=20Details=20Information?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.tsx | 22 +++++++++++++++++++ .../src/EventDetails/EventDetails.module.css | 5 +++++ frontend/src/EventDetails/EventDetails.tsx | 2 +- .../src/ShareButton/ShareButton.module.css | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 6b694b0..85369c4 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -3,6 +3,7 @@ import NavBar from "./NavBar/NavBar"; import { BrowserRouter, Route, Routes } from "react-router"; import HomePage from "./HomePage/HomePage"; import AboutPage from "./About/About"; +import EventDetails from "./EventDetails/EventDetails"; function App() { return ( @@ -13,6 +14,27 @@ function App() { } /> + ); diff --git a/frontend/src/EventDetails/EventDetails.module.css b/frontend/src/EventDetails/EventDetails.module.css index 0011d95..5c6b4c6 100644 --- a/frontend/src/EventDetails/EventDetails.module.css +++ b/frontend/src/EventDetails/EventDetails.module.css @@ -62,12 +62,17 @@ margin-bottom: 12px; width: 30vw; gap: 8px; + color: hsl(0, 0%, 20%); } .detailInfo { margin: 0px; } +.attending { + color: hsl(0, 0%, 40%); +} + .actions { display: flex; height: fit-content; diff --git a/frontend/src/EventDetails/EventDetails.tsx b/frontend/src/EventDetails/EventDetails.tsx index 1f9b5a8..689e25d 100644 --- a/frontend/src/EventDetails/EventDetails.tsx +++ b/frontend/src/EventDetails/EventDetails.tsx @@ -65,7 +65,7 @@ function EventDetails(props: EventDetailsProps) { )} -
+

{props.attending} attending

diff --git a/frontend/src/ShareButton/ShareButton.module.css b/frontend/src/ShareButton/ShareButton.module.css index a52230b..66bc31f 100644 --- a/frontend/src/ShareButton/ShareButton.module.css +++ b/frontend/src/ShareButton/ShareButton.module.css @@ -1,6 +1,6 @@ .share { color: hsl(0, 0%, 0%); - background-color: hsl(0, 0%, 85%); + background-color: hsl(0, 0%, 100%); border: 0px; border-radius: 8px; display: flex; From b2259dd49ea6b3485fe71c2edcd8f0b69b55a191 Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Tue, 10 Dec 2024 15:49:30 +1100 Subject: [PATCH 07/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Remove=20EventDet?= =?UTF-8?q?ails=20Card=20Used=20for=20Testing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.tsx | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 85369c4..6b694b0 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -3,7 +3,6 @@ import NavBar from "./NavBar/NavBar"; import { BrowserRouter, Route, Routes } from "react-router"; import HomePage from "./HomePage/HomePage"; import AboutPage from "./About/About"; -import EventDetails from "./EventDetails/EventDetails"; function App() { return ( @@ -14,27 +13,6 @@ function App() { } />
- ); From 908ef0417ed1e39ecbf82918afddbffa458baaf9 Mon Sep 17 00:00:00 2001 From: lachlanshoesmith <12870244+lachlanshoesmith@users.noreply.github.com> Date: Tue, 10 Dec 2024 20:08:29 +1100 Subject: [PATCH 08/12] =?UTF-8?q?=F0=9F=90=A2=20update=20other=20component?= =?UTF-8?q?s=20to=20use=20new=20props=20fmt=20for=20keyword+button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/EventDetails/EventDetails.tsx | 10 ++++++---- frontend/src/Keyword/Keyword.tsx | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/src/EventDetails/EventDetails.tsx b/frontend/src/EventDetails/EventDetails.tsx index 689e25d..b7c1b3c 100644 --- a/frontend/src/EventDetails/EventDetails.tsx +++ b/frontend/src/EventDetails/EventDetails.tsx @@ -1,5 +1,5 @@ import classes from "./EventDetails.module.css"; -import Button, { ButtonOptions } from "../Button/Button"; +import Button from "../Button/Button"; import { ArrowTopRightOnSquareIcon, CalendarIcon, @@ -8,8 +8,9 @@ import { MapPinIcon, UserIcon, } from "@heroicons/react/24/outline"; -import { Keyword, KeywordOptions } from "../Keyword/Keyword"; +import Keyword from "../Keyword/Keyword"; import ShareButton from "../ShareButton/ShareButton"; +import { ButtonIcons, ButtonVariants } from "../Button/ButtonTypes"; type EventDetailsProps = { image: string; @@ -73,7 +74,8 @@ function EventDetails(props: EventDetailsProps) {
@@ -85,7 +87,7 @@ function EventDetails(props: EventDetailsProps) { {props.keywords && (
{props.keywords?.map((keyword) => ( - {keyword} + {keyword} ))}
)} diff --git a/frontend/src/Keyword/Keyword.tsx b/frontend/src/Keyword/Keyword.tsx index e9a76a8..29964d5 100644 --- a/frontend/src/Keyword/Keyword.tsx +++ b/frontend/src/Keyword/Keyword.tsx @@ -7,7 +7,7 @@ type KeywordProps = { type?: KeywordOptions; }; -export function Keyword(props: KeywordProps) { +export default function Keyword(props: KeywordProps) { return (
Date: Fri, 13 Dec 2024 13:04:20 +1100 Subject: [PATCH 09/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Remove=20Redundan?= =?UTF-8?q?t=20Button=20Component=20Files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/pnpm-lock.yaml | 361 +++++++++--------- frontend/src/BackButton/BackButton.module.css | 24 -- frontend/src/BackButton/BackButton.tsx | 12 - frontend/src/Button/Button.tsx | 8 +- frontend/src/Button/ButtonTypes.tsx | 1 + .../src/ShareButton/ShareButton.module.css | 21 - frontend/src/ShareButton/ShareButton.tsx | 18 - 7 files changed, 196 insertions(+), 249 deletions(-) delete mode 100644 frontend/src/BackButton/BackButton.module.css delete mode 100644 frontend/src/BackButton/BackButton.tsx delete mode 100644 frontend/src/ShareButton/ShareButton.module.css delete mode 100644 frontend/src/ShareButton/ShareButton.tsx diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 1cd4d45..4e1d65e 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -32,10 +32,10 @@ importers: version: 9.16.0 '@types/react': specifier: ^18.3.14 - version: 18.3.14 + version: 18.3.16 '@types/react-dom': specifier: ^18.3.3 - version: 18.3.3(@types/react@18.3.14) + version: 18.3.5(@types/react@18.3.16) '@vitejs/plugin-react': specifier: ^4.3.4 version: 4.3.4(vite@5.4.11) @@ -98,10 +98,18 @@ packages: resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==} engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.25.7': + resolution: {integrity: sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==} + engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.25.9': resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.25.7': + resolution: {integrity: sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.25.9': resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} engines: {node: '>=6.9.0'} @@ -114,6 +122,11 @@ packages: resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==} engines: {node: '>=6.9.0'} + '@babel/parser@7.25.8': + resolution: {integrity: sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==} + engines: {node: '>=6.0.0'} + hasBin: true + '@babel/parser@7.26.3': resolution: {integrity: sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==} engines: {node: '>=6.0.0'} @@ -139,6 +152,10 @@ packages: resolution: {integrity: sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==} engines: {node: '>=6.9.0'} + '@babel/types@7.25.8': + resolution: {integrity: sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==} + engines: {node: '>=6.9.0'} + '@babel/types@7.26.3': resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==} engines: {node: '>=6.9.0'} @@ -281,12 +298,16 @@ packages: cpu: [x64] os: [win32] - '@eslint-community/eslint-utils@4.4.1': - resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} + '@eslint-community/eslint-utils@4.4.0': + resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + '@eslint-community/regexpp@4.11.1': + resolution: {integrity: sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + '@eslint-community/regexpp@4.12.1': resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} @@ -311,14 +332,14 @@ packages: resolution: {integrity: sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/plugin-kit@0.2.4': - resolution: {integrity: sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==} + '@eslint/plugin-kit@0.2.3': + resolution: {integrity: sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@heroicons/react@2.2.0': - resolution: {integrity: sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==} + '@heroicons/react@2.1.5': + resolution: {integrity: sha512-FuzFN+BsHa+7OxbvAERtgBTNeZpUjgM/MIizfVkSCL2/edriN0Hx/DWRCR//aPYwO5QX/YlgLGXk+E3PcfZwjA==} peerDependencies: - react: '>= 16 || ^19.0.0-rc' + react: '>= 16' '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} @@ -370,98 +391,83 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@rollup/rollup-android-arm-eabi@4.28.1': - resolution: {integrity: sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==} + '@rollup/rollup-android-arm-eabi@4.24.0': + resolution: {integrity: sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.28.1': - resolution: {integrity: sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==} + '@rollup/rollup-android-arm64@4.24.0': + resolution: {integrity: sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.28.1': - resolution: {integrity: sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==} + '@rollup/rollup-darwin-arm64@4.24.0': + resolution: {integrity: sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.28.1': - resolution: {integrity: sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==} + '@rollup/rollup-darwin-x64@4.24.0': + resolution: {integrity: sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.28.1': - resolution: {integrity: sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==} - cpu: [arm64] - os: [freebsd] - - '@rollup/rollup-freebsd-x64@4.28.1': - resolution: {integrity: sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==} - cpu: [x64] - os: [freebsd] - - '@rollup/rollup-linux-arm-gnueabihf@4.28.1': - resolution: {integrity: sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==} + '@rollup/rollup-linux-arm-gnueabihf@4.24.0': + resolution: {integrity: sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.28.1': - resolution: {integrity: sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==} + '@rollup/rollup-linux-arm-musleabihf@4.24.0': + resolution: {integrity: sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.28.1': - resolution: {integrity: sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==} + '@rollup/rollup-linux-arm64-gnu@4.24.0': + resolution: {integrity: sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.28.1': - resolution: {integrity: sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==} + '@rollup/rollup-linux-arm64-musl@4.24.0': + resolution: {integrity: sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-loongarch64-gnu@4.28.1': - resolution: {integrity: sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==} - cpu: [loong64] - os: [linux] - - '@rollup/rollup-linux-powerpc64le-gnu@4.28.1': - resolution: {integrity: sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==} + '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': + resolution: {integrity: sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.28.1': - resolution: {integrity: sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==} + '@rollup/rollup-linux-riscv64-gnu@4.24.0': + resolution: {integrity: sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.28.1': - resolution: {integrity: sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==} + '@rollup/rollup-linux-s390x-gnu@4.24.0': + resolution: {integrity: sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.28.1': - resolution: {integrity: sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==} + '@rollup/rollup-linux-x64-gnu@4.24.0': + resolution: {integrity: sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.28.1': - resolution: {integrity: sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==} + '@rollup/rollup-linux-x64-musl@4.24.0': + resolution: {integrity: sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.28.1': - resolution: {integrity: sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==} + '@rollup/rollup-win32-arm64-msvc@4.24.0': + resolution: {integrity: sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.28.1': - resolution: {integrity: sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==} + '@rollup/rollup-win32-ia32-msvc@4.24.0': + resolution: {integrity: sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.28.1': - resolution: {integrity: sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==} + '@rollup/rollup-win32-x64-msvc@4.24.0': + resolution: {integrity: sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==} cpu: [x64] os: [win32] @@ -486,16 +492,16 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/prop-types@15.7.14': - resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==} + '@types/prop-types@15.7.13': + resolution: {integrity: sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==} - '@types/react-dom@18.3.3': - resolution: {integrity: sha512-uTYkxTLkYp41nq/ULXyXMtkNT1vu5fXJoqad6uTNCOGat5t9cLgF4vMNLBXsTOXpdOI44XzKPY1M5RRm0bQHuw==} + '@types/react-dom@18.3.5': + resolution: {integrity: sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==} peerDependencies: '@types/react': ^18.0.0 - '@types/react@18.3.14': - resolution: {integrity: sha512-NzahNKvjNhVjuPBQ+2G7WlxstQ+47kXZNHlUvFakDViuIEfGY926GqhMueQFZ7woG+sPiQKlF36XfrIUVSUfFg==} + '@types/react@18.3.16': + resolution: {integrity: sha512-oh8AMIC4Y2ciKufU8hnKgs+ufgbA/dhPTACaZPM86AbwX9QwnFtSoPWEeRUj8fge+v6kFt78BXcDhAU1SrrAsw==} '@typescript-eslint/eslint-plugin@8.18.0': resolution: {integrity: sha512-NR2yS7qUqCL7AIxdJUQf2MKKNDVNaig/dEB0GBLU7D+ZdHgK1NoH/3wsgO3OnPVipn51tG3MAwaODEGil70WEw==} @@ -592,8 +598,8 @@ packages: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} - caniuse-lite@1.0.30001687: - resolution: {integrity: sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==} + caniuse-lite@1.0.30001669: + resolution: {integrity: sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==} chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} @@ -622,11 +628,12 @@ packages: csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + date-fns@4.1.0: resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==} - debug@4.4.0: - resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} + debug@4.3.7: + resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -637,8 +644,8 @@ packages: deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} - electron-to-chromium@1.5.72: - resolution: {integrity: sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw==} + electron-to-chromium@1.5.41: + resolution: {integrity: sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==} esbuild@0.21.5: resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} @@ -738,8 +745,8 @@ packages: resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} engines: {node: '>=16'} - flatted@3.3.2: - resolution: {integrity: sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==} + flatted@3.3.1: + resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} @@ -865,16 +872,16 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - nanoid@3.3.8: - resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} + nanoid@3.3.7: + resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} - node-releases@2.0.19: - resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} + node-releases@2.0.18: + resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} optionator@0.9.4: resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} @@ -907,8 +914,8 @@ packages: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} - postcss@8.4.49: - resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==} + postcss@8.4.47: + resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==} engines: {node: ^10 || ^12 || >=14} prelude-ls@1.2.1: @@ -938,8 +945,8 @@ packages: react: '>=18' react-dom: '>=18' - react-router@7.0.2: - resolution: {integrity: sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==} + react-router@7.0.1: + resolution: {integrity: sha512-WVAhv9oWCNsja5AkK6KLpXJDSJCQizOIyOd4vvB/+eHGbYx5vkhcmcmwWjQ9yqkRClogi+xjEg9fNEOd5EX/tw==} engines: {node: '>=20.0.0'} peerDependencies: react: '>=18' @@ -970,8 +977,8 @@ packages: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rollup@4.28.1: - resolution: {integrity: sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==} + rollup@4.24.0: + resolution: {integrity: sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -1013,12 +1020,16 @@ packages: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} + to-fast-properties@2.0.0: + resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} + engines: {node: '>=4'} + to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} - ts-api-utils@1.4.3: - resolution: {integrity: sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==} + ts-api-utils@1.3.0: + resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} engines: {node: '>=16'} peerDependencies: typescript: '>=4.2.0' @@ -1126,7 +1137,7 @@ snapshots: '@babel/traverse': 7.26.4 '@babel/types': 7.26.3 convert-source-map: 2.0.0 - debug: 4.4.0 + debug: 4.3.7 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -1167,8 +1178,12 @@ snapshots: '@babel/helper-plugin-utils@7.25.9': {} + '@babel/helper-string-parser@7.25.7': {} + '@babel/helper-string-parser@7.25.9': {} + '@babel/helper-validator-identifier@7.25.7': {} + '@babel/helper-validator-identifier@7.25.9': {} '@babel/helper-validator-option@7.25.9': {} @@ -1178,6 +1193,10 @@ snapshots: '@babel/template': 7.25.9 '@babel/types': 7.26.3 + '@babel/parser@7.25.8': + dependencies: + '@babel/types': 7.25.8 + '@babel/parser@7.26.3': dependencies: '@babel/types': 7.26.3 @@ -1205,11 +1224,17 @@ snapshots: '@babel/parser': 7.26.3 '@babel/template': 7.25.9 '@babel/types': 7.26.3 - debug: 4.4.0 + debug: 4.3.7 globals: 11.12.0 transitivePeerDependencies: - supports-color + '@babel/types@7.25.8': + dependencies: + '@babel/helper-string-parser': 7.25.7 + '@babel/helper-validator-identifier': 7.25.7 + to-fast-properties: 2.0.0 + '@babel/types@7.26.3': dependencies: '@babel/helper-string-parser': 7.25.9 @@ -1284,17 +1309,19 @@ snapshots: '@esbuild/win32-x64@0.21.5': optional: true - '@eslint-community/eslint-utils@4.4.1(eslint@9.16.0)': + '@eslint-community/eslint-utils@4.4.0(eslint@9.16.0)': dependencies: eslint: 9.16.0 eslint-visitor-keys: 3.4.3 + '@eslint-community/regexpp@4.11.1': {} + '@eslint-community/regexpp@4.12.1': {} '@eslint/config-array@0.19.1': dependencies: '@eslint/object-schema': 2.1.5 - debug: 4.4.0 + debug: 4.3.7 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -1306,7 +1333,7 @@ snapshots: '@eslint/eslintrc@3.2.0': dependencies: ajv: 6.12.6 - debug: 4.4.0 + debug: 4.3.7 espree: 10.3.0 globals: 14.0.0 ignore: 5.3.2 @@ -1321,11 +1348,11 @@ snapshots: '@eslint/object-schema@2.1.5': {} - '@eslint/plugin-kit@0.2.4': + '@eslint/plugin-kit@0.2.3': dependencies: levn: 0.4.1 - '@heroicons/react@2.2.0(react@18.3.1)': + '@heroicons/react@2.1.5(react@18.3.1)': dependencies: react: 18.3.1 @@ -1371,83 +1398,74 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - '@rollup/rollup-android-arm-eabi@4.28.1': - optional: true - - '@rollup/rollup-android-arm64@4.28.1': - optional: true - - '@rollup/rollup-darwin-arm64@4.28.1': + '@rollup/rollup-android-arm-eabi@4.24.0': optional: true - '@rollup/rollup-darwin-x64@4.28.1': + '@rollup/rollup-android-arm64@4.24.0': optional: true - '@rollup/rollup-freebsd-arm64@4.28.1': + '@rollup/rollup-darwin-arm64@4.24.0': optional: true - '@rollup/rollup-freebsd-x64@4.28.1': + '@rollup/rollup-darwin-x64@4.24.0': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.28.1': + '@rollup/rollup-linux-arm-gnueabihf@4.24.0': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.28.1': + '@rollup/rollup-linux-arm-musleabihf@4.24.0': optional: true - '@rollup/rollup-linux-arm64-gnu@4.28.1': + '@rollup/rollup-linux-arm64-gnu@4.24.0': optional: true - '@rollup/rollup-linux-arm64-musl@4.28.1': + '@rollup/rollup-linux-arm64-musl@4.24.0': optional: true - '@rollup/rollup-linux-loongarch64-gnu@4.28.1': + '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.28.1': + '@rollup/rollup-linux-riscv64-gnu@4.24.0': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.28.1': + '@rollup/rollup-linux-s390x-gnu@4.24.0': optional: true - '@rollup/rollup-linux-s390x-gnu@4.28.1': + '@rollup/rollup-linux-x64-gnu@4.24.0': optional: true - '@rollup/rollup-linux-x64-gnu@4.28.1': + '@rollup/rollup-linux-x64-musl@4.24.0': optional: true - '@rollup/rollup-linux-x64-musl@4.28.1': + '@rollup/rollup-win32-arm64-msvc@4.24.0': optional: true - '@rollup/rollup-win32-arm64-msvc@4.28.1': + '@rollup/rollup-win32-ia32-msvc@4.24.0': optional: true - '@rollup/rollup-win32-ia32-msvc@4.28.1': - optional: true - - '@rollup/rollup-win32-x64-msvc@4.28.1': + '@rollup/rollup-win32-x64-msvc@4.24.0': optional: true '@types/babel__core@7.20.5': dependencies: - '@babel/parser': 7.26.3 - '@babel/types': 7.26.3 + '@babel/parser': 7.25.8 + '@babel/types': 7.25.8 '@types/babel__generator': 7.6.8 '@types/babel__template': 7.4.4 '@types/babel__traverse': 7.20.6 '@types/babel__generator@7.6.8': dependencies: - '@babel/types': 7.26.3 + '@babel/types': 7.25.8 '@types/babel__template@7.4.4': dependencies: - '@babel/parser': 7.26.3 - '@babel/types': 7.26.3 + '@babel/parser': 7.25.8 + '@babel/types': 7.25.8 '@types/babel__traverse@7.20.6': dependencies: - '@babel/types': 7.26.3 + '@babel/types': 7.25.8 '@types/cookie@0.6.0': {} @@ -1455,20 +1473,20 @@ snapshots: '@types/json-schema@7.0.15': {} - '@types/prop-types@15.7.14': {} + '@types/prop-types@15.7.13': {} - '@types/react-dom@18.3.3(@types/react@18.3.14)': + '@types/react-dom@18.3.5(@types/react@18.3.16)': dependencies: - '@types/react': 18.3.14 + '@types/react': 18.3.16 - '@types/react@18.3.14': + '@types/react@18.3.16': dependencies: - '@types/prop-types': 15.7.14 + '@types/prop-types': 15.7.13 csstype: 3.1.3 '@typescript-eslint/eslint-plugin@8.18.0(@typescript-eslint/parser@8.18.0(eslint@9.16.0)(typescript@5.7.2))(eslint@9.16.0)(typescript@5.7.2)': dependencies: - '@eslint-community/regexpp': 4.12.1 + '@eslint-community/regexpp': 4.11.1 '@typescript-eslint/parser': 8.18.0(eslint@9.16.0)(typescript@5.7.2) '@typescript-eslint/scope-manager': 8.18.0 '@typescript-eslint/type-utils': 8.18.0(eslint@9.16.0)(typescript@5.7.2) @@ -1478,7 +1496,7 @@ snapshots: graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.4.3(typescript@5.7.2) + ts-api-utils: 1.3.0(typescript@5.7.2) typescript: 5.7.2 transitivePeerDependencies: - supports-color @@ -1489,7 +1507,7 @@ snapshots: '@typescript-eslint/types': 8.18.0 '@typescript-eslint/typescript-estree': 8.18.0(typescript@5.7.2) '@typescript-eslint/visitor-keys': 8.18.0 - debug: 4.4.0 + debug: 4.3.7 eslint: 9.16.0 typescript: 5.7.2 transitivePeerDependencies: @@ -1504,9 +1522,9 @@ snapshots: dependencies: '@typescript-eslint/typescript-estree': 8.18.0(typescript@5.7.2) '@typescript-eslint/utils': 8.18.0(eslint@9.16.0)(typescript@5.7.2) - debug: 4.4.0 + debug: 4.3.7 eslint: 9.16.0 - ts-api-utils: 1.4.3(typescript@5.7.2) + ts-api-utils: 1.3.0(typescript@5.7.2) typescript: 5.7.2 transitivePeerDependencies: - supports-color @@ -1517,19 +1535,19 @@ snapshots: dependencies: '@typescript-eslint/types': 8.18.0 '@typescript-eslint/visitor-keys': 8.18.0 - debug: 4.4.0 + debug: 4.3.7 fast-glob: 3.3.2 is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.4.3(typescript@5.7.2) + ts-api-utils: 1.3.0(typescript@5.7.2) typescript: 5.7.2 transitivePeerDependencies: - supports-color '@typescript-eslint/utils@8.18.0(eslint@9.16.0)(typescript@5.7.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.16.0) '@typescript-eslint/scope-manager': 8.18.0 '@typescript-eslint/types': 8.18.0 '@typescript-eslint/typescript-estree': 8.18.0(typescript@5.7.2) @@ -1590,14 +1608,14 @@ snapshots: browserslist@4.24.2: dependencies: - caniuse-lite: 1.0.30001687 - electron-to-chromium: 1.5.72 - node-releases: 2.0.19 + caniuse-lite: 1.0.30001669 + electron-to-chromium: 1.5.41 + node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.2) callsites@3.1.0: {} - caniuse-lite@1.0.30001687: {} + caniuse-lite@1.0.30001669: {} chalk@4.1.2: dependencies: @@ -1626,13 +1644,13 @@ snapshots: date-fns@4.1.0: {} - debug@4.4.0: + debug@4.3.7: dependencies: ms: 2.1.3 deep-is@0.1.4: {} - electron-to-chromium@1.5.72: {} + electron-to-chromium@1.5.41: {} esbuild@0.21.5: optionalDependencies: @@ -1683,13 +1701,13 @@ snapshots: eslint@9.16.0: dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.16.0) '@eslint-community/regexpp': 4.12.1 '@eslint/config-array': 0.19.1 '@eslint/core': 0.9.1 '@eslint/eslintrc': 3.2.0 '@eslint/js': 9.16.0 - '@eslint/plugin-kit': 0.2.4 + '@eslint/plugin-kit': 0.2.3 '@humanfs/node': 0.16.6 '@humanwhocodes/module-importer': 1.0.1 '@humanwhocodes/retry': 0.4.1 @@ -1698,7 +1716,7 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.6 - debug: 4.4.0 + debug: 4.3.7 escape-string-regexp: 4.0.0 eslint-scope: 8.2.0 eslint-visitor-keys: 4.2.0 @@ -1771,10 +1789,10 @@ snapshots: flat-cache@4.0.1: dependencies: - flatted: 3.3.2 + flatted: 3.3.1 keyv: 4.5.4 - flatted@3.3.2: {} + flatted@3.3.1: {} fsevents@2.3.3: optional: true @@ -1872,11 +1890,11 @@ snapshots: ms@2.1.3: {} - nanoid@3.3.8: {} + nanoid@3.3.7: {} natural-compare@1.4.0: {} - node-releases@2.0.19: {} + node-releases@2.0.18: {} optionator@0.9.4: dependencies: @@ -1907,9 +1925,9 @@ snapshots: picomatch@2.3.1: {} - postcss@8.4.49: + postcss@8.4.47: dependencies: - nanoid: 3.3.8 + nanoid: 3.3.7 picocolors: 1.1.1 source-map-js: 1.2.1 @@ -1933,7 +1951,7 @@ snapshots: react-dom: 18.3.1(react@18.3.1) react-router: 7.0.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react-router@7.0.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-router@7.0.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@types/cookie': 0.6.0 cookie: 1.0.2 @@ -1961,29 +1979,26 @@ snapshots: reusify@1.0.4: {} - rollup@4.28.1: + rollup@4.24.0: dependencies: '@types/estree': 1.0.6 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.28.1 - '@rollup/rollup-android-arm64': 4.28.1 - '@rollup/rollup-darwin-arm64': 4.28.1 - '@rollup/rollup-darwin-x64': 4.28.1 - '@rollup/rollup-freebsd-arm64': 4.28.1 - '@rollup/rollup-freebsd-x64': 4.28.1 - '@rollup/rollup-linux-arm-gnueabihf': 4.28.1 - '@rollup/rollup-linux-arm-musleabihf': 4.28.1 - '@rollup/rollup-linux-arm64-gnu': 4.28.1 - '@rollup/rollup-linux-arm64-musl': 4.28.1 - '@rollup/rollup-linux-loongarch64-gnu': 4.28.1 - '@rollup/rollup-linux-powerpc64le-gnu': 4.28.1 - '@rollup/rollup-linux-riscv64-gnu': 4.28.1 - '@rollup/rollup-linux-s390x-gnu': 4.28.1 - '@rollup/rollup-linux-x64-gnu': 4.28.1 - '@rollup/rollup-linux-x64-musl': 4.28.1 - '@rollup/rollup-win32-arm64-msvc': 4.28.1 - '@rollup/rollup-win32-ia32-msvc': 4.28.1 - '@rollup/rollup-win32-x64-msvc': 4.28.1 + '@rollup/rollup-android-arm-eabi': 4.24.0 + '@rollup/rollup-android-arm64': 4.24.0 + '@rollup/rollup-darwin-arm64': 4.24.0 + '@rollup/rollup-darwin-x64': 4.24.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.24.0 + '@rollup/rollup-linux-arm-musleabihf': 4.24.0 + '@rollup/rollup-linux-arm64-gnu': 4.24.0 + '@rollup/rollup-linux-arm64-musl': 4.24.0 + '@rollup/rollup-linux-powerpc64le-gnu': 4.24.0 + '@rollup/rollup-linux-riscv64-gnu': 4.24.0 + '@rollup/rollup-linux-s390x-gnu': 4.24.0 + '@rollup/rollup-linux-x64-gnu': 4.24.0 + '@rollup/rollup-linux-x64-musl': 4.24.0 + '@rollup/rollup-win32-arm64-msvc': 4.24.0 + '@rollup/rollup-win32-ia32-msvc': 4.24.0 + '@rollup/rollup-win32-x64-msvc': 4.24.0 fsevents: 2.3.3 run-parallel@1.2.0: @@ -2014,11 +2029,13 @@ snapshots: dependencies: has-flag: 4.0.0 + to-fast-properties@2.0.0: {} + to-regex-range@5.0.1: dependencies: is-number: 7.0.0 - ts-api-utils@1.4.3(typescript@5.7.2): + ts-api-utils@1.3.0(typescript@5.7.2): dependencies: typescript: 5.7.2 @@ -2053,8 +2070,8 @@ snapshots: vite@5.4.11: dependencies: esbuild: 0.21.5 - postcss: 8.4.49 - rollup: 4.28.1 + postcss: 8.4.47 + rollup: 4.24.0 optionalDependencies: fsevents: 2.3.3 diff --git a/frontend/src/BackButton/BackButton.module.css b/frontend/src/BackButton/BackButton.module.css deleted file mode 100644 index ebc5b80..0000000 --- a/frontend/src/BackButton/BackButton.module.css +++ /dev/null @@ -1,24 +0,0 @@ -.back { - width: 50px; - height: 50px; - background-color: hsl(0, 0%, 85%); - border-radius: 25px; - margin: 16px; - margin-top: 8px; - display: flex; - align-items: center; - justify-content: center; - border: 0px; - transition: background 0.2s linear, color 0.2s linear; -} - -.back:hover { - background-color: hsl(0, 0%, 93%); - color: hsl(0, 0%, 18%); -} - -.chevronIcon { - height: 32px; - width: 32px; - margin-left: -2px; -} \ No newline at end of file diff --git a/frontend/src/BackButton/BackButton.tsx b/frontend/src/BackButton/BackButton.tsx deleted file mode 100644 index 1433e48..0000000 --- a/frontend/src/BackButton/BackButton.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import classes from "./BackButton.module.css"; -import { ChevronLeftIcon } from "@heroicons/react/24/solid"; - -function BackButton() { - return ( - - ); -} - -export default BackButton; diff --git a/frontend/src/Button/Button.tsx b/frontend/src/Button/Button.tsx index 4980d9c..0769946 100644 --- a/frontend/src/Button/Button.tsx +++ b/frontend/src/Button/Button.tsx @@ -4,6 +4,7 @@ import { BookmarkIcon, ChevronLeftIcon, MagnifyingGlassIcon, + ShareIcon, } from '@heroicons/react/24/outline'; import { ButtonIcons, ButtonVariants } from './ButtonTypes'; @@ -19,8 +20,8 @@ function Button(props: ButtonProps) { return ( - ); -} - -export default ShareButton; From 2519d65d759f29eaf2b65c50aaa619fdfbc73e2d Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Fri, 13 Dec 2024 13:17:09 +1100 Subject: [PATCH 10/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Adjust=20Spacing?= =?UTF-8?q?=20in=20String=20Button=20Component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/Button/Button.module.css | 8 ++++---- frontend/src/Button/Button.tsx | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/src/Button/Button.module.css b/frontend/src/Button/Button.module.css index 25e3039..6aabfdc 100644 --- a/frontend/src/Button/Button.module.css +++ b/frontend/src/Button/Button.module.css @@ -19,6 +19,10 @@ cursor: pointer; } +.stringButton { + padding: 12px 28px; +} + .primary { background: hsl(203, 88%, 27%); color: hsl(202, 49%, 90%); @@ -51,10 +55,6 @@ height: 64px; } -.string { - padding: 0px 16px; -} - .round-secondary { border-radius: 50%; } diff --git a/frontend/src/Button/Button.tsx b/frontend/src/Button/Button.tsx index 0769946..4fcd747 100644 --- a/frontend/src/Button/Button.tsx +++ b/frontend/src/Button/Button.tsx @@ -21,7 +21,8 @@ function Button(props: ButtonProps) { ); From f2b2b1f805dfac8fc8ea51f85b528f7b9fe1b97b Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Fri, 13 Dec 2024 13:41:57 +1100 Subject: [PATCH 11/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Add=20Suggestions?= =?UTF-8?q?=20to=20EventDetails=20Component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.tsx | 14 +++++----- frontend/src/Button/Button.tsx | 11 +++++--- frontend/src/Button/ButtonTypes.tsx | 17 ++++++------ .../src/EventDetails/EventDetails.module.css | 24 +++++++++++++---- frontend/src/EventDetails/EventDetails.tsx | 26 ++++++++++++++----- frontend/src/Keyword/KeywordTypes.tsx | 1 + 6 files changed, 63 insertions(+), 30 deletions(-) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index ab7c6de..695a58c 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -3,14 +3,14 @@ import NavBar from "./NavBar/NavBar"; import { BrowserRouter, Route, Routes } from "react-router"; import HomePage from "./HomePage/HomePage"; import AboutPage from "./About/About"; -import Calendar from "./Calendar/Calendar" +import Calendar from "./Calendar/Calendar"; import LoginPage from "./Login/Login"; import RegisterPage from "./Register/Register"; -import { Settings } from './Settings/Settings'; -import { ProfilePage } from './Settings/SettingsPage/ProfilePage/ProfilePage'; -import { EventManagementPage } from './Settings/SettingsPage/EventManagementPage/EventManagementPage'; -import { CreateNewEventPage } from './Settings/SettingsPage/EventManagementPage/CreateNewEvent/CreateNewEvent'; -import { DiscordPage } from './Settings/SettingsPage/DiscordPage/DiscordPage'; +import { Settings } from "./Settings/Settings"; +import { ProfilePage } from "./Settings/SettingsPage/ProfilePage/ProfilePage"; +import { EventManagementPage } from "./Settings/SettingsPage/EventManagementPage/EventManagementPage"; +import { CreateNewEventPage } from "./Settings/SettingsPage/EventManagementPage/CreateNewEvent/CreateNewEvent"; +import { DiscordPage } from "./Settings/SettingsPage/DiscordPage/DiscordPage"; function App() { return ( @@ -19,7 +19,7 @@ function App() { } /> } /> - }/> // + } /> // } /> } /> }> diff --git a/frontend/src/Button/Button.tsx b/frontend/src/Button/Button.tsx index 4fcd747..0cffa60 100644 --- a/frontend/src/Button/Button.tsx +++ b/frontend/src/Button/Button.tsx @@ -5,6 +5,7 @@ import { ChevronLeftIcon, MagnifyingGlassIcon, ShareIcon, + XMarkIcon, } from '@heroicons/react/24/outline'; import { ButtonIcons, ButtonVariants } from './ButtonTypes'; @@ -21,8 +22,9 @@ function Button(props: ButtonProps) { ); } diff --git a/frontend/src/Button/ButtonTypes.tsx b/frontend/src/Button/ButtonTypes.tsx index 2471b49..9d9ada1 100644 --- a/frontend/src/Button/ButtonTypes.tsx +++ b/frontend/src/Button/ButtonTypes.tsx @@ -1,13 +1,14 @@ export enum ButtonIcons { - Plus = 'plus', - Bookmark = 'bookmark', - Search = 'search', - Back = 'back', - Share = 'share', + Plus = "plus", + Bookmark = "bookmark", + Search = "search", + Back = "back", + Share = "share", + Cross = "cross", } export enum ButtonVariants { - Primary = 'primary', - Secondary = 'secondary', - RoundSecondary = 'round-secondary', + Primary = "primary", + Secondary = "secondary", + RoundSecondary = "round-secondary", } diff --git a/frontend/src/EventDetails/EventDetails.module.css b/frontend/src/EventDetails/EventDetails.module.css index 5c6b4c6..a10a89f 100644 --- a/frontend/src/EventDetails/EventDetails.module.css +++ b/frontend/src/EventDetails/EventDetails.module.css @@ -1,10 +1,8 @@ .container { background: hsl(0, 0%, 100%); border-radius: 16px; - padding: 0; padding-bottom: 40px; width: 76vw; - min-width: 700px; min-height: fit-content; height: 90vh; box-shadow: 0px 0px 16px hsla(0, 0%, 0%, 0.25); @@ -15,6 +13,20 @@ border-radius: 16px 16px 0px 0px; height: 280px; background-size: cover; + position: relative; +} + +.exitIcon { + height: 48px; + width: 48px; + padding: 12px; + position: absolute; + right: 0px; + top: 0px; + background-color: hsl(0, 0%, 100%); + color: hsl(0, 0%, 0%); + box-shadow: none; + border-radius: 0px 8px 0px 0px; } .info { @@ -26,7 +38,7 @@ } .name { - font-size: 48px; + font-size: 3rem; font-weight: 750; margin: 0px; margin-bottom: 12px; @@ -35,7 +47,8 @@ .details { width: 40vw; margin-top: 24px; - font-size: 20px; + font-size: 1.2rem; + font-weight: 500; height: auto; display: flex; align-items: start; @@ -47,7 +60,8 @@ } .locationLink { - margin-top: -2px; + height: 18px; + margin-top: 2px; color: hsl(0, 0%, 35%); transition: color 0.2s linear; } diff --git a/frontend/src/EventDetails/EventDetails.tsx b/frontend/src/EventDetails/EventDetails.tsx index 689e25d..3526b4d 100644 --- a/frontend/src/EventDetails/EventDetails.tsx +++ b/frontend/src/EventDetails/EventDetails.tsx @@ -1,5 +1,6 @@ import classes from "./EventDetails.module.css"; -import Button, { ButtonOptions } from "../Button/Button"; +import Button from "../Button/Button"; +import { ButtonIcons, ButtonVariants } from "../Button/ButtonTypes" import { ArrowTopRightOnSquareIcon, CalendarIcon, @@ -8,8 +9,8 @@ import { MapPinIcon, UserIcon, } from "@heroicons/react/24/outline"; -import { Keyword, KeywordOptions } from "../Keyword/Keyword"; -import ShareButton from "../ShareButton/ShareButton"; +import { Keyword } from "../Keyword/Keyword"; +import { KeywordOptions } from "../Keyword/KeywordTypes" type EventDetailsProps = { image: string; @@ -35,7 +36,14 @@ function EventDetails(props: EventDetailsProps) { backgroundImage: `url(${props.image})`, backgroundPositionY: props.backgroundPositionY, }} - >
+ > + +
@@ -73,10 +81,16 @@ function EventDetails(props: EventDetailsProps) {
+ -
diff --git a/frontend/src/Keyword/KeywordTypes.tsx b/frontend/src/Keyword/KeywordTypes.tsx index 31f9fb6..c24b3e5 100644 --- a/frontend/src/Keyword/KeywordTypes.tsx +++ b/frontend/src/Keyword/KeywordTypes.tsx @@ -1,4 +1,5 @@ export enum KeywordOptions { Delete, Add, + None, } From ee827ea9005cf4c6833f0d1f94541e26b103a03e Mon Sep 17 00:00:00 2001 From: Vincent Tannos Date: Fri, 13 Dec 2024 14:21:29 +1100 Subject: [PATCH 12/12] =?UTF-8?q?=F0=9F=97=92=EF=B8=8F=20Fix=20Keyword=20S?= =?UTF-8?q?tyles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/EventDetails/EventDetails.tsx | 28 +++++++-------- frontend/src/Keyword/Keyword.module.css | 40 ++++++++++++---------- frontend/src/Keyword/Keyword.tsx | 18 ++++++---- 3 files changed, 46 insertions(+), 40 deletions(-) diff --git a/frontend/src/EventDetails/EventDetails.tsx b/frontend/src/EventDetails/EventDetails.tsx index 3526b4d..55ddfb9 100644 --- a/frontend/src/EventDetails/EventDetails.tsx +++ b/frontend/src/EventDetails/EventDetails.tsx @@ -1,6 +1,6 @@ import classes from "./EventDetails.module.css"; import Button from "../Button/Button"; -import { ButtonIcons, ButtonVariants } from "../Button/ButtonTypes" +import { ButtonIcons, ButtonVariants } from "../Button/ButtonTypes"; import { ArrowTopRightOnSquareIcon, CalendarIcon, @@ -9,8 +9,8 @@ import { MapPinIcon, UserIcon, } from "@heroicons/react/24/outline"; -import { Keyword } from "../Keyword/Keyword"; -import { KeywordOptions } from "../Keyword/KeywordTypes" +import Keyword from "../Keyword/Keyword"; +import { KeywordOptions } from "../Keyword/KeywordTypes"; type EventDetailsProps = { image: string; @@ -46,8 +46,8 @@ function EventDetails(props: EventDetailsProps) {
); diff --git a/frontend/src/Keyword/Keyword.module.css b/frontend/src/Keyword/Keyword.module.css index 2ab4b54..31f76de 100644 --- a/frontend/src/Keyword/Keyword.module.css +++ b/frontend/src/Keyword/Keyword.module.css @@ -1,35 +1,27 @@ -.DeleteKeyword { - background: hsl(0, 3%, 93%); +.keyword { border-radius: 16px; - padding: 0.4em 0.6em 0.4em 0.8em; margin: 0.5em; margin-right: 1em; + padding: 0.6em 0.8em 0.6em 0.8em; display: flex; width: fit-content; align-items: center; height: 24px; } +.DeleteKeyword { + background: hsl(0, 3%, 93%); +} + .AddKeyword { background: hsl(209, 100%, 96%); - border-radius: 16px; - padding: 0.4em 0.6em 0.4em 0.8em; - margin: 0.5em; - margin-right: 1em; - display: flex; - width: fit-content; - align-items: center; - height: 24px; + color: hsl(202, 15%, 25%); } .NoneKeyword { background: hsl(0, 3%, 93%); border-radius: 8px; - padding: 0.6em 0.8em 0.6em 0.8em; - display: flex; - width: fit-content; - align-items: center; - height: 24px; + margin: 0; } .keywordText { @@ -40,14 +32,24 @@ .button { width: 24px; height: 24px; - margin: 0; background: none; border: none; padding: 0; } -.deleteButtonIcon { - color: hsl(0, 0%, 54%); +.icon { width: 24px; height: 24px; + margin-left: 8px; +} + +.deleteButtonIcon { + color: hsl(0, 0%, 54%); + width: 22px; + height: 22px; + margin-top: 1px; +} + +.addButtonIcon { + color: hsl(202, 15%, 25%); } diff --git a/frontend/src/Keyword/Keyword.tsx b/frontend/src/Keyword/Keyword.tsx index e0f783e..a84dfdb 100644 --- a/frontend/src/Keyword/Keyword.tsx +++ b/frontend/src/Keyword/Keyword.tsx @@ -1,16 +1,16 @@ -import classes from './Keyword.module.css'; -import { PlusIcon, XMarkIcon } from '@heroicons/react/24/solid'; -import { KeywordOptions } from './KeywordTypes'; +import classes from "./Keyword.module.css"; +import { PlusIcon, XMarkIcon } from "@heroicons/react/24/solid"; +import { KeywordOptions } from "./KeywordTypes"; type KeywordProps = { children: string; type: KeywordOptions; }; -export function Keyword(props: KeywordProps) { +export default function Keyword(props: KeywordProps) { return (
{props.type === KeywordOptions.Delete && ( - + )} {props.type === KeywordOptions.Add && ( - + )} )}