From 363936641a31b0b508197d41bea1ce116931b5d4 Mon Sep 17 00:00:00 2001 From: Paweł Bernaciak Date: Sat, 20 Jan 2024 11:03:44 +0100 Subject: New element creator --- frontend/src/components/Dialog.tsx | 54 ++++++++ frontend/src/components/ElementCreator.tsx | 203 +++++++++++++++++++++++++++++ frontend/src/components/ElementList.tsx | 76 +++++++++-- frontend/src/components/ElementView.tsx | 58 ++++++++- 4 files changed, 377 insertions(+), 14 deletions(-) create mode 100644 frontend/src/components/Dialog.tsx create mode 100644 frontend/src/components/ElementCreator.tsx (limited to 'frontend/src/components') diff --git a/frontend/src/components/Dialog.tsx b/frontend/src/components/Dialog.tsx new file mode 100644 index 0000000..4fa6bf7 --- /dev/null +++ b/frontend/src/components/Dialog.tsx @@ -0,0 +1,54 @@ +import { FC, PropsWithChildren, useEffect, useRef } from 'react'; + +interface DialogProps { + visible: boolean; + closeDialog: () => void; +} + +const Dialog: FC> = ({ + visible, + closeDialog, + children, +}) => { + const dialogRef = useRef(null); + + useEffect(() => { + if (visible) { + dialogRef.current?.showModal(); + } else { + dialogRef.current?.close(); + } + }, [visible]); + + const handleButtonClick = (e: React.MouseEvent) => { + e.preventDefault(); + closeDialog(); + }; + + return ( + +
+
+ +
+ {children} +
+
+ ); +}; + +export default Dialog; diff --git a/frontend/src/components/ElementCreator.tsx b/frontend/src/components/ElementCreator.tsx new file mode 100644 index 0000000..61f5aba --- /dev/null +++ b/frontend/src/components/ElementCreator.tsx @@ -0,0 +1,203 @@ +import { FC, useEffect, useState } from 'react'; +import { + Element, + Color, + ColorBitmap, + ElementState, + ElementSuggestion, + ColorCode, +} from '../types'; +import toast from 'react-hot-toast'; +import ElementView from './ElementView'; +import { userStore } from '../stores'; + +interface ElementCreatorProps { + firstElementId: number | undefined; + secondElementId: number | undefined; + closeDialog: () => void; +} + +const ElementCreator: FC = ({ + firstElementId, + secondElementId, + closeDialog, +}) => { + const [elementName, setElementName] = useState(''); + const [color, setColor] = useState(Color.Air); + const [firstElement, setFirstElement] = useState(null); + const [secondElement, setSecondElement] = useState(null); + const setUser = userStore((store) => store.setUser); + + const fetchElement = async (elementId: number): Promise => { + const elementResponse = await fetch(`/api/element/${elementId}`); + return await elementResponse.json(); + }; + + useEffect(() => { + if (firstElementId == undefined || secondElementId == undefined) { + return; + } + + setElementName(''); + setColor(Color.Air); + + fetchElement(firstElementId).then((elem) => { + setFirstElement(elem); + }); + fetchElement(secondElementId).then((elem) => { + setSecondElement(elem); + }); + }, [firstElementId, secondElementId]); + + const handleNameChange = (e: React.ChangeEvent) => { + setElementName(e.target.value); + }; + + const createHandleColorClick = (color: Color) => { + return (e: React.MouseEvent) => { + e.preventDefault(); + setColor(color); + }; + }; + + const handleSubmitButton = async (e: React.MouseEvent) => { + e.preventDefault(); + + if (elementName == '') { + toast.error('No name selected'); + return; + } + if (!(color in Color)) { + toast.error('Bad color value'); + return; + } + + const request: ElementSuggestion = { + name: elementName, + iconBitmap: ColorBitmap[color], + firstElementId: firstElementId!, + secondElementId: secondElementId!, + }; + + console.log(request); + + const createVoteResponse = await fetch(`/api/suggestion/create`, { + method: 'POST', + credentials: 'include', + body: JSON.stringify(request), + headers: { + 'Content-Type': 'application/json', + }, + }); + + if (createVoteResponse.status == 401) { + console.log('Session expired'); + toast.error('Your authorization has expired. You have to log in again.'); + localStorage.removeItem('user'); + setUser(undefined); + return; + } + console.log(createVoteResponse.status); + console.log('Vote started'); + closeDialog(); + }; + + return ( +
+
+ {firstElement != null && secondElement != null && ( + <> + {}} + isPreview={false} + interactive={false} + /> + + + + {}} + isPreview={false} + interactive={false} + /> + + + + + )} + {}} + isPreview={true} + interactive={false} + /> +
+
+ + +
+
+ {(Object.keys(Color) as Array) + .filter((color) => Number.isNaN(Number(color))) + .map((color) => { + return ( + + ); + })} +
+ +
+ ); +}; + +export default ElementCreator; diff --git a/frontend/src/components/ElementList.tsx b/frontend/src/components/ElementList.tsx index 20b27dd..04650c4 100644 --- a/frontend/src/components/ElementList.tsx +++ b/frontend/src/components/ElementList.tsx @@ -1,22 +1,35 @@ import { FC, useEffect, useState } from 'react'; -import {Element} from '../types'; +import { Element } from '../types'; import ElementView from './ElementView'; +import Dialog from './Dialog'; +import ElementCreator from './ElementCreator'; +import { userStore } from '../stores'; +import toast from 'react-hot-toast'; const ElementList: FC = () => { const [elements, setElements] = useState([]); + const [elementCreatorVisible, setElementCreatorVisible] = + useState(false); + const [creatorFirstElementId, setCreatorFirstElementId] = useState< + number | undefined + >(undefined); + const [creatorSecondElementId, setCreatorSecondElementId] = useState< + number | undefined + >(undefined); + const user = userStore((store) => store.user); useEffect(() => { const initialElements: number[] = [1, 2, 3, 4]; const elementStateString = localStorage.getItem('elementState'); if (elementStateString != null) { - setElements(JSON.parse(elementStateString)); - return; + setElements(JSON.parse(elementStateString)); + return; } const fetchElements = async () => { const elems: Element[] = []; - + for (const elemId of initialElements) { const response = await fetch(`/api/element/${elemId}`); const elem: Element = await response.json(); @@ -32,14 +45,59 @@ const ElementList: FC = () => { useEffect(() => { if (elements.length != 0) { - localStorage.setItem('elementState', JSON.stringify(elements)); + localStorage.setItem('elementState', JSON.stringify(elements)); } - }, [elements]) + }, [elements]); + + const createOnElementCombine = (firstElementId: number) => { + return async (secondElementId: number) => { + const combineResponse = await fetch( + `/api/element/combine?firstElementId=${firstElementId}&secondElementId=${secondElementId}`, + ); + if (combineResponse.status == 404) { + console.log("Element doesn't exist"); + if (!user) { + toast("You have discovered a new element but need to log in to name it"); + return; + } + setCreatorFirstElementId(firstElementId); + setCreatorSecondElementId(secondElementId); + setElementCreatorVisible(true); + return; + } + + const newElem: Element = await combineResponse.json(); + if (elements.find((e) => e.id == newElem.id)) { + toast(`You have already discovered ${newElem.name}`); + return; + } + setElements((elems) => elems.concat(newElem)); + }; + }; return ( - <> - {elements.map(elem => )} - +
+ {elements.map((elem) => ( + + ))} + { + setElementCreatorVisible(false); + }}> + setElementCreatorVisible(false)} + /> + +
); }; diff --git a/frontend/src/components/ElementView.tsx b/frontend/src/components/ElementView.tsx index 4f9d489..1b11ffb 100644 --- a/frontend/src/components/ElementView.tsx +++ b/frontend/src/components/ElementView.tsx @@ -2,15 +2,63 @@ import { FC } from 'react'; import { Element } from '../types'; interface ElementViewProps { + onElementCombine: (elementId: number) => void; element: Element; + interactive: boolean; + isPreview: boolean; } -const ElementView: FC = ({ element }) => { +const ElementView: FC = ({ + onElementCombine, + element, + interactive, + isPreview, +}) => { + const onDragStart = (e: React.DragEvent) => { + e.stopPropagation(); + + e.dataTransfer.setData('text/plain', element.name); + e.dataTransfer.setData('id', element.id.toString()); + }; + + const onDragOver = (e: React.DragEvent) => { + e.preventDefault(); + }; + + const onDrop = (e: React.DragEvent) => { + const elementId = e.dataTransfer.getData('id'); + onElementCombine(Number.parseInt(elementId)); + e.preventDefault(); + }; + return ( -
-
- -

{element.name}

+
+
+ {isPreview ? ( +
+ ) : ( + + )} + + {element.name.length > 0 ? element.name : '\u00A0'} +
); -- cgit v1.2.3