diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 72062a6..5dd10f9 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -29,8 +29,8 @@ "moment": "^2.29.4", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-icons": "^4.7.1", - "react-router-dom": "^6.8.1", + "react-icons": "^5.2.1", + "react-router-dom": "^6.23.1", "react-three-fiber": "^6.0.13", "rodal": "^2.0.1", "tailwind": "^4.0.0", @@ -7979,9 +7979,9 @@ } }, "node_modules/react-icons": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.12.0.tgz", - "integrity": "sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.2.1.tgz", + "integrity": "sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw==", "peerDependencies": { "react": "*" } diff --git a/frontend/package.json b/frontend/package.json index 9e10876..ccf9632 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,15 +10,6 @@ "preview": "vite preview" }, "dependencies": { - "@nextui-org/button": "^2.0.31", - "@nextui-org/react": "^2.3.6", - "@react-three/drei": "^9.105.6", - "@react-three/fiber": "^8.16.6", - "axios": "^1.7.2", - "framer-motion": "^11.2.6", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-router-dom": "^6.23.1", "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@fullcalendar/core": "^6.1.4", @@ -28,12 +19,20 @@ "@fullcalendar/timegrid": "^6.1.4", "@mui/icons-material": "^5.11.9", "@mui/material": "^5.11.10", - + "@nextui-org/button": "^2.0.31", + "@nextui-org/react": "^2.3.6", + "@react-three/drei": "^9.105.6", + "@react-three/fiber": "^8.16.6", + "axios": "^1.7.2", "echarts": "^5.4.1", "echarts-for-react": "^3.0.2", - + "framer-motion": "^11.2.6", "material-react-table": "^1.8.1", "moment": "^2.29.4", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-icons": "^5.2.1", + "react-router-dom": "^6.23.1", "react-three-fiber": "^6.0.13", "rodal": "^2.0.1", "tailwind": "^4.0.0", diff --git a/frontend/src/components/Layout/Layout.jsx b/frontend/src/components/Layout/Layout.jsx index 06c1014..e9602cc 100644 --- a/frontend/src/components/Layout/Layout.jsx +++ b/frontend/src/components/Layout/Layout.jsx @@ -1,7 +1,6 @@ import moment from "moment/moment"; import css from "./Layout.module.css"; -import { BiSearch } from "react-icons/bi"; -import Sidebar from "../Sidebar/Sidebar"; + import { Navigate, Outlet, useLocation } from "react-router-dom"; const Layout = () => {