diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 431efeb5..0232927b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -13,7 +13,7 @@ "styled-components": "^6.0.3" }, "devDependencies": { - "@types/react": "^18.2.14", + "@types/react": "^18.2.15", "@types/react-dom": "^18.2.6", "@typescript-eslint/eslint-plugin": "^5.61.0", "@typescript-eslint/parser": "^5.61.0", @@ -2439,9 +2439,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.14", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.14.tgz", - "integrity": "sha512-A0zjq+QN/O0Kpe30hA1GidzyFjatVvrpIvWLxD+xv67Vt91TWWgco9IvrJBkeyHm1trGaFS/FSGqPlhyeZRm0g==", + "version": "18.2.15", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.15.tgz", + "integrity": "sha512-oEjE7TQt1fFTFSbf8kkNuc798ahTUzn3Le67/PWjE8MAfYAD/qB7O8hSTcromLFqHCt9bcdOg5GXMokzTjJ5SA==", "dev": true, "dependencies": { "@types/prop-types": "*", diff --git a/frontend/package.json b/frontend/package.json index 7ab39954..ba728c64 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -15,7 +15,7 @@ "styled-components": "^6.0.3" }, "devDependencies": { - "@types/react": "^18.2.14", + "@types/react": "^18.2.15", "@types/react-dom": "^18.2.6", "@typescript-eslint/eslint-plugin": "^5.61.0", "@typescript-eslint/parser": "^5.61.0", diff --git a/frontend/public/close-danger.svg b/frontend/public/close-danger.svg deleted file mode 100644 index 7cf85cf5..00000000 --- a/frontend/public/close-danger.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/frontend/public/close.svg b/frontend/public/close.svg deleted file mode 100644 index ca2c5a76..00000000 --- a/frontend/public/close.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/frontend/public/edit.svg b/frontend/public/edit.svg deleted file mode 100644 index b203a52a..00000000 --- a/frontend/public/edit.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/frontend/public/log.svg b/frontend/public/log.svg deleted file mode 100644 index 27b83ecc..00000000 --- a/frontend/public/log.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/frontend/public/plus.svg b/frontend/public/plus.svg deleted file mode 100644 index 532a8a18..00000000 --- a/frontend/public/plus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index e58f464b..0947a6d4 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,72 +1,27 @@ -import { useState, useRef } from "react"; -import styled, { ThemeProvider } from "styled-components"; -import Board from "./components/Board"; -import HistoryBtn from "./components/HistoryBtn"; -import Logo from "./components/Logo"; -import Modal from "./components/Modal"; -import Header from "./components/landmark/Header"; -import Main from "./components/landmark/Main"; -import CommonStyle from "./styles/CommonStyle"; -import { theme } from "./theme"; -import { TTheme } from "./types/theme"; - -export default function App() { - const [isUserLogOpened, setIsUserLogOpened] = useState(false); - const [message, setMessage] = useState(""); - const callbackTemp = useRef<() => void | undefined>(); - - function clearMessage() { - setMessage(""); - } - - function dummyAction() { - clearMessage(); - if (callbackTemp.current) { - callbackTemp.current(); - } - } - - function openConfirmModal(content: string, callback: () => void) { - setMessage(content); - callbackTemp.current = callback; - } - - function toggleActiveUserLog() { - setIsUserLogOpened((bool) => !bool); +import { useState } from "react"; +import Header from "./components/Header"; +import Main from "./components/main/Main"; +import Alert from "./components/common/Alert"; +import Container from "./styles/Container"; +import Aside from "./components/aside/Aside"; + +const App: React.FC = () => { + const [isHistoryOpen, setIsHistoryOpen] = useState(false); + + function toggleHistory() { + setIsHistoryOpen((bool) => !bool); } return ( - - - -
- - -
- -
- -
- {/* */} -
- -
{" "} -
+ <> +
+ +
+ {/*