From 73132c177c6a75ee708c278f81bbb457746dfdf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Buczek?= Date: Fri, 10 May 2024 11:16:01 +0200 Subject: [PATCH] fix: #80 fixes --- package-lock.json | 16 ++++++++-------- package.json | 2 +- src/app/(role_all)/conference/page.tsx | 3 +-- .../myconference/[conferenceId]/page.tsx | 2 +- src/components/common/List/ListItemImage.tsx | 4 ++-- src/components/conference/SignUpWarning.tsx | 13 ++++++++----- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a6ef20..f8321e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@mui/material": "^5.15.16", + "@mui/material": "^5.15.17", "axios": "^1.6.8", "leaflet": "^1.9.4", "leaflet-defaulticon-compatibility": "^0.1.2", @@ -387,22 +387,22 @@ } }, "node_modules/@mui/core-downloads-tracker": { - "version": "5.15.16", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.16.tgz", - "integrity": "sha512-PTIbMJs5C/vYMfyJNW8ArOezh4eyHkg2pTeA7bBxh2kLP1Uzs0Nm+krXWbWGJPwTWjM8EhnDrr4aCF26+2oleg==", + "version": "5.15.17", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.17.tgz", + "integrity": "sha512-DVAejDQkjNnIac7MfP8sLzuo7fyrBPxNdXe+6bYqOqg1z2OPTlfFAejSNzWe7UenRMuFu9/AyFXj/X2vN2w6dA==", "funding": { "type": "opencollective", "url": "https://opencollective.com/mui-org" } }, "node_modules/@mui/material": { - "version": "5.15.16", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.15.16.tgz", - "integrity": "sha512-ery2hFReewko9gpDBqOr2VmXwQG9ifXofPhGzIx09/b9JqCQC/06kZXZDGGrOTpIddK9HlIf4yrS+G70jPAzUQ==", + "version": "5.15.17", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.15.17.tgz", + "integrity": "sha512-ru/MLvTkCh0AZXmqwIpqGTOoVBS/sX48zArXq/DvktxXZx4fskiRA2PEc7Rk5ZlFiZhKh4moL4an+l8zZwq49Q==", "dependencies": { "@babel/runtime": "^7.23.9", "@mui/base": "5.0.0-beta.40", - "@mui/core-downloads-tracker": "^5.15.16", + "@mui/core-downloads-tracker": "^5.15.17", "@mui/system": "^5.15.15", "@mui/types": "^7.2.14", "@mui/utils": "^5.15.14", diff --git a/package.json b/package.json index 27ec150..2ff2c1e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "dependencies": { "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", - "@mui/material": "^5.15.16", + "@mui/material": "^5.15.17", "axios": "^1.6.8", "leaflet": "^1.9.4", "leaflet-defaulticon-compatibility": "^0.1.2", diff --git a/src/app/(role_all)/conference/page.tsx b/src/app/(role_all)/conference/page.tsx index 0f07db5..08cf8d5 100644 --- a/src/app/(role_all)/conference/page.tsx +++ b/src/app/(role_all)/conference/page.tsx @@ -25,7 +25,6 @@ export default function ConferencePage() { useEffect(() => { const fetchRole = async () => { const role = await getRole(); - console.log(role); setUserRole(role); }; fetchRole(); @@ -47,7 +46,7 @@ export default function ConferencePage() { useEffect(() => { refetch(); - }, [update]); + }, [update]); return ( diff --git a/src/app/(role_organizer)/myconference/[conferenceId]/page.tsx b/src/app/(role_organizer)/myconference/[conferenceId]/page.tsx index b8de556..cd2d05f 100644 --- a/src/app/(role_organizer)/myconference/[conferenceId]/page.tsx +++ b/src/app/(role_organizer)/myconference/[conferenceId]/page.tsx @@ -63,7 +63,7 @@ export default function MyConferencePage({ useEffect(() => { refetch(); - }, [update]); + }, [update]); return ( diff --git a/src/components/common/List/ListItemImage.tsx b/src/components/common/List/ListItemImage.tsx index 8350e37..deb5f71 100644 --- a/src/components/common/List/ListItemImage.tsx +++ b/src/components/common/List/ListItemImage.tsx @@ -1,4 +1,4 @@ -import APIImageComponent, { LogoInterface } from "@/hooks/imageAPI"; +import APIImageComponent, { ImageInterface, LogoInterface } from "@/hooks/imageAPI"; import Link from "next/link"; export default function ListItemImage({ @@ -8,7 +8,7 @@ export default function ListItemImage({ className, }: { href: string; - logo: LogoInterface; + logo: LogoInterface | ImageInterface; children: React.ReactNode; className?: string; }) { diff --git a/src/components/conference/SignUpWarning.tsx b/src/components/conference/SignUpWarning.tsx index c18a565..e945a2f 100644 --- a/src/components/conference/SignUpWarning.tsx +++ b/src/components/conference/SignUpWarning.tsx @@ -39,11 +39,14 @@ export default function SignUpWarning({
{setSignUpWarning(false); setTempId && setTempId(-1)}} className="absolute inset-0 bg-darkblue opacity-80">

Zapis na konferencję

-

- Czy na pewno chcesz zapisać się na konferencję? -
- Organizator otrzyma dostęp do twoich danych. -

+
+

+ Czy na pewno chcesz zapisać się na konferencję? +

+

+ Organizator otrzyma dostęp do twoich danych. +

+