From 539d9ac1734ef8855892b46f1e3c994a98b6fc1a Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Thu, 7 Nov 2024 04:21:32 -0500 Subject: [PATCH] feat: change in structure to apply architecture to project --- Client/src/App.jsx | 44 +++++++++++-------- .../{ => Components}/HOC/withAdminCheck.jsx | 6 +-- .../{ => Components}/HOC/withAdminProp.jsx | 0 .../Layouts/HomeLayout/index.css | 0 .../Layouts/HomeLayout/index.jsx | 2 +- Client/src/Components/Sidebar/index.jsx | 9 +++- Client/src/Pages/Infrastructure/index.jsx | 5 +++ Client/src/Pages/ReadMe.md | 1 - 8 files changed, 42 insertions(+), 25 deletions(-) rename Client/src/{ => Components}/HOC/withAdminCheck.jsx (85%) rename Client/src/{ => Components}/HOC/withAdminProp.jsx (100%) rename Client/src/{ => Components}/Layouts/HomeLayout/index.css (100%) rename Client/src/{ => Components}/Layouts/HomeLayout/index.jsx (85%) create mode 100644 Client/src/Pages/Infrastructure/index.jsx delete mode 100644 Client/src/Pages/ReadMe.md diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 6cb2f433a..65ba6fc21 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -8,7 +8,6 @@ import { ToastContainer } from "react-toastify"; import NotFound from "./Pages/NotFound"; import Login from "./Pages/Auth/Login"; import Register from "./Pages/Auth/Register/Register"; -import HomeLayout from "./Layouts/HomeLayout"; import Account from "./Pages/Account"; import Monitors from "./Pages/Monitors/Home"; import CreateMonitor from "./Pages/Monitors/CreateMonitor"; @@ -30,8 +29,9 @@ import CreatePageSpeed from "./Pages/PageSpeed/CreatePageSpeed"; import CreateNewMaintenanceWindow from "./Pages/Maintenance/CreateMaintenance"; import PageSpeedDetails from "./Pages/PageSpeed/Details"; import PageSpeedConfigure from "./Pages/PageSpeed/Configure"; -import withAdminCheck from "./HOC/withAdminCheck"; -import withAdminProp from "./HOC/withAdminProp"; +import HomeLayout from "./Components/Layouts/HomeLayout"; +import withAdminCheck from "./Components/HOC/withAdminCheck"; +import withAdminProp from "./Components/HOC/withAdminProp"; import { ThemeProvider } from "@emotion/react"; import lightTheme from "./Utils/Theme/lightTheme"; import darkTheme from "./Utils/Theme/darkTheme"; @@ -39,6 +39,7 @@ import { CssBaseline } from "@mui/material"; import { getAppSettings } from "./Features/Settings/settingsSlice"; import { logger } from "./Utils/Logger"; // Import the logger import { networkService } from "./main"; +import { Infrastructure } from "./Pages/Infrastructure"; function App() { const AdminCheckedRegister = withAdminCheck(Register); const MonitorsWithAdminProp = withAdminProp(Monitors); @@ -96,6 +97,27 @@ function App() { path="/monitors/configure/:monitorId/" element={} /> + } + /> + } + /> + } + /> + } + /> + } + /> + } @@ -152,22 +174,6 @@ function App() { /> } /> - } - /> - } - /> - } - /> - } - /> { const WithAdminCheck = (props) => { diff --git a/Client/src/HOC/withAdminProp.jsx b/Client/src/Components/HOC/withAdminProp.jsx similarity index 100% rename from Client/src/HOC/withAdminProp.jsx rename to Client/src/Components/HOC/withAdminProp.jsx diff --git a/Client/src/Layouts/HomeLayout/index.css b/Client/src/Components/Layouts/HomeLayout/index.css similarity index 100% rename from Client/src/Layouts/HomeLayout/index.css rename to Client/src/Components/Layouts/HomeLayout/index.css diff --git a/Client/src/Layouts/HomeLayout/index.jsx b/Client/src/Components/Layouts/HomeLayout/index.jsx similarity index 85% rename from Client/src/Layouts/HomeLayout/index.jsx rename to Client/src/Components/Layouts/HomeLayout/index.jsx index 0fe787fd6..b605a0d53 100644 --- a/Client/src/Layouts/HomeLayout/index.jsx +++ b/Client/src/Components/Layouts/HomeLayout/index.jsx @@ -1,4 +1,4 @@ -import Sidebar from "../../Components/Sidebar"; +import Sidebar from "../../Sidebar"; import { Outlet } from "react-router"; import { Stack } from "@mui/material"; diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index 9135dcefa..ac0e8f9e5 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -54,6 +54,7 @@ const menu = [ nested: [ { name: "Monitors", path: "monitors", icon: }, { name: "Pagespeed", path: "pagespeed", icon: }, + { name: "Infrastructure", path: "infrastructure", icon: }, ], }, { name: "Incidents", path: "incidents", icon: }, @@ -181,7 +182,13 @@ function Sidebar() { direction="row" alignItems="center" gap={theme.spacing(4)} - onClick={() => window.open("https://github.com/bluewave-labs/bluewave-uptime", "_blank", "noreferrer")} + onClick={() => + window.open( + "https://github.com/bluewave-labs/bluewave-uptime", + "_blank", + "noreferrer" + ) + } sx={{ cursor: "pointer" }} > Infrastructure monitors; +} + +export { Infrastructure }; diff --git a/Client/src/Pages/ReadMe.md b/Client/src/Pages/ReadMe.md deleted file mode 100644 index 45ec6ce12..000000000 --- a/Client/src/Pages/ReadMe.md +++ /dev/null @@ -1 +0,0 @@ -#Pages Folder