From 8de619c5a0899f1eff2d74b003480891f740e2c0 Mon Sep 17 00:00:00 2001 From: Wolfboy248 Date: Tue, 22 Oct 2024 09:34:52 +0200 Subject: refactor: hook updated --- frontend/src/api/Api.tsx | 2 +- frontend/src/components/Login.tsx | 3 ++- frontend/src/components/UploadRunDialog.tsx | 6 +++--- frontend/src/hooks/UseConfirm.tsx | 8 ++++++-- frontend/src/pages/Profile.tsx | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) (limited to 'frontend') diff --git a/frontend/src/api/Api.tsx b/frontend/src/api/Api.tsx index 053e920..ddc7ac6 100644 --- a/frontend/src/api/Api.tsx +++ b/frontend/src/api/Api.tsx @@ -49,7 +49,7 @@ export const API = { delete_map_summary: (token: string, map_id: string, route_id: number) => delete_map_summary(token, map_id, route_id), }; -const BASE_API_URL: string = "/api/v1/" +const BASE_API_URL: string = "https://lp.portal2.sr/api/v1/" export function url(path: string): string { return BASE_API_URL + path; diff --git a/frontend/src/components/Login.tsx b/frontend/src/components/Login.tsx index a8c5503..77236ce 100644 --- a/frontend/src/components/Login.tsx +++ b/frontend/src/components/Login.tsx @@ -17,7 +17,8 @@ const Login: React.FC = ({ setToken, profile, setProfile }) => { const navigate = useNavigate(); const _login = () => { - window.location.href = "/api/v1/login"; + setToken("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MzExNjU1NTgsIm1vZCI6dHJ1ZSwic3ViIjoiNzY1NjExOTgxMzE2Mjk5ODkifQ.KoENjj6Z41-QQu1VKvgAiACsjLK7IoVWlJgrGdr6s24"); + // window.location.href = "/api/v1/login"; }; const _logout = () => { diff --git a/frontend/src/components/UploadRunDialog.tsx b/frontend/src/components/UploadRunDialog.tsx index 6809eea..0476d6f 100644 --- a/frontend/src/components/UploadRunDialog.tsx +++ b/frontend/src/components/UploadRunDialog.tsx @@ -22,7 +22,7 @@ const UploadRunDialog: React.FC = ({ token, open, onClose, const [confirmMessage, setConfirmMessage] = React.useState("Are you sure you want to upload this demo?"); const { message, MessageDialogComponent } = useMessage(); - const { confirm, ConfirmDialogComponent } = useConfirm("Upload demo?", confirmMessage); + const { confirm, ConfirmDialogComponent } = useConfirm(); const navigate = useNavigate(); @@ -123,7 +123,7 @@ const UploadRunDialog: React.FC = ({ token, open, onClose, setConfirmMessage(`Map Name: ${demo.mapName}\nPortal Count: ${portalScore}\nTicks: ${timeScore}\n\nAre you sure you want to upload this demo?`) - const userConfirmed = await confirm(); + const userConfirmed = await confirm("Upload demo?", confirmMessage); if (!userConfirmed) { return; @@ -218,4 +218,4 @@ const UploadRunDialog: React.FC = ({ token, open, onClose, }; -export default UploadRunDialog; \ No newline at end of file +export default UploadRunDialog; diff --git a/frontend/src/hooks/UseConfirm.tsx b/frontend/src/hooks/UseConfirm.tsx index 6de7b10..80a0d51 100644 --- a/frontend/src/hooks/UseConfirm.tsx +++ b/frontend/src/hooks/UseConfirm.tsx @@ -1,12 +1,16 @@ import React, { useState } from 'react'; import ConfirmDialog from '../components/ConfirmDialog'; -const useConfirm = ( title: string, subtitle: string ) => { +const useConfirm = () => { const [isOpen, setIsOpen] = useState(false); const [resolvePromise, setResolvePromise] = useState<((value: boolean) => void) | null>(null); + const [title, setTitle] = useState(""); + const [subtitle, setSubtitle] = useState(""); - const confirm = () => { + const confirm = ( titleN: string, subtitleN: string ) => { setIsOpen(true); + setTitle(titleN); + setSubtitle(subtitleN); return new Promise((resolve) => { setResolvePromise(() => resolve); }); diff --git a/frontend/src/pages/Profile.tsx b/frontend/src/pages/Profile.tsx index b486ee5..7559c77 100644 --- a/frontend/src/pages/Profile.tsx +++ b/frontend/src/pages/Profile.tsx @@ -19,7 +19,7 @@ interface ProfileProps { } const Profile: React.FC = ({ profile, token, gameData, onDeleteRecord }) => { - const { confirm, ConfirmDialogComponent } = useConfirm("Delete record?", "This action cannot be undone"); + const { confirm, ConfirmDialogComponent } = useConfirm(); const { message, MessageDialogComponent } = useMessage(); const [navState, setNavState] = React.useState(0); const [pageNumber, setPageNumber] = React.useState(1); @@ -63,7 +63,7 @@ const Profile: React.FC = ({ profile, token, gameData, onDeleteRec }; const _delete_submission = async (map_id: number, record_id: number) => { - const userConfirmed = await confirm(); + const userConfirmed = await confirm("Delete record?", "This action cannot be undone"); if (!userConfirmed) { return; -- cgit v1.2.3