From ff95f2cbc0d1e8a15f0869aedb5538b46d55e793 Mon Sep 17 00:00:00 2001 From: Venessa Kuchenik Date: Tue, 5 Aug 2025 12:57:18 -0700 Subject: [PATCH] Rename and Restructure + took out extra 'layout' directory. + 'Canvas' postfix removed from all files in the views directory. + "WidgetCanvas" renamed to "MyDashboard" --- client/src/App.jsx | 2 +- .../components/{layout => }/Canvas/Canvas.jsx | 14 ++++++------- .../CanvasComponents}/AddWidgetMenu.jsx | 0 .../CanvasComponents}/AlertLevelWidget.jsx | 0 .../CanvasComponents}/CancelButton.jsx | 0 .../CanvasComponents}/DeleteAllButton.jsx | 0 .../CanvasComponents}/SaveButton.jsx | 0 .../CanvasComponents}/SearchBar.jsx | 0 .../CanvasComponents}/SettingsButton.jsx | 0 .../CanvasComponents}/Tooltip.jsx | 0 .../CanvasComponents}/Widget.jsx | 0 .../views/Account.jsx} | 0 .../views/Admin.jsx} | 0 .../views/GlobalMap.jsx} | 0 .../HomeCanvas.jsx => Canvas/views/Home.jsx} | 20 +++++++++---------- .../views/HomeTabs}/DailyActivity.jsx | 0 .../views/HomeTabs}/Gas.jsx | 0 .../views/HomeTabs/MyDashboard.jsx} | 2 +- .../views/HomeTabs}/RemoteSensing.jsx | 0 .../views/HomeTabs}/Seismic.jsx | 0 .../views/RegionalMap.jsx} | 0 .../views/Settings.jsx} | 0 .../views/Volcano.jsx} | 0 .../src/components/{layout => }/Dashboard.jsx | 0 .../components/{layout => }/Header/Header.jsx | 0 .../{layout => }/Header/UserAvatarMenu.jsx | 0 .../{layout => }/Sidebar/Sidebar.jsx | 2 +- 27 files changed, 20 insertions(+), 20 deletions(-) rename client/src/components/{layout => }/Canvas/Canvas.jsx (67%) rename client/src/components/{layout/Canvas/components => Canvas/CanvasComponents}/AddWidgetMenu.jsx (100%) rename client/src/components/{layout/Canvas/components => Canvas/CanvasComponents}/AlertLevelWidget.jsx (100%) rename client/src/components/{layout/Canvas/components => Canvas/CanvasComponents}/CancelButton.jsx (100%) rename client/src/components/{layout/Canvas/components => Canvas/CanvasComponents}/DeleteAllButton.jsx (100%) rename client/src/components/{layout/Canvas/components => Canvas/CanvasComponents}/SaveButton.jsx (100%) rename client/src/components/{layout/Canvas/components => Canvas/CanvasComponents}/SearchBar.jsx (100%) rename client/src/components/{layout/Canvas/components => Canvas/CanvasComponents}/SettingsButton.jsx (100%) rename client/src/components/{layout/Canvas/components => Canvas/CanvasComponents}/Tooltip.jsx (100%) rename client/src/components/{layout/Canvas/components => Canvas/CanvasComponents}/Widget.jsx (100%) rename client/src/components/{layout/Canvas/views/AccountCanvas.jsx => Canvas/views/Account.jsx} (100%) rename client/src/components/{layout/Canvas/views/AdminCanvas.jsx => Canvas/views/Admin.jsx} (100%) rename client/src/components/{layout/Canvas/views/GlobalMapCanvas.jsx => Canvas/views/GlobalMap.jsx} (100%) rename client/src/components/{layout/Canvas/views/HomeCanvas.jsx => Canvas/views/Home.jsx} (87%) rename client/src/components/{layout/Canvas/views/DashboardCanvasNav => Canvas/views/HomeTabs}/DailyActivity.jsx (100%) rename client/src/components/{layout/Canvas/views/DashboardCanvasNav => Canvas/views/HomeTabs}/Gas.jsx (100%) rename client/src/components/{layout/Canvas/views/DashboardCanvasNav/WidgetCanvas.jsx => Canvas/views/HomeTabs/MyDashboard.jsx} (97%) rename client/src/components/{layout/Canvas/views/DashboardCanvasNav => Canvas/views/HomeTabs}/RemoteSensing.jsx (100%) rename client/src/components/{layout/Canvas/views/DashboardCanvasNav => Canvas/views/HomeTabs}/Seismic.jsx (100%) rename client/src/components/{layout/Canvas/views/RegionalMapCanvas.jsx => Canvas/views/RegionalMap.jsx} (100%) rename client/src/components/{layout/Canvas/views/SettingsCanvas.jsx => Canvas/views/Settings.jsx} (100%) rename client/src/components/{layout/Canvas/views/VolcanoCanvas.jsx => Canvas/views/Volcano.jsx} (100%) rename client/src/components/{layout => }/Dashboard.jsx (100%) rename client/src/components/{layout => }/Header/Header.jsx (100%) rename client/src/components/{layout => }/Header/UserAvatarMenu.jsx (100%) rename client/src/components/{layout => }/Sidebar/Sidebar.jsx (98%) diff --git a/client/src/App.jsx b/client/src/App.jsx index 9935035..af7991e 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -1,4 +1,4 @@ -import Dashboard from './components/layout/Dashboard.jsx' +import Dashboard from './components/Dashboard.jsx' import 'leaflet/dist/leaflet.css'; diff --git a/client/src/components/layout/Canvas/Canvas.jsx b/client/src/components/Canvas/Canvas.jsx similarity index 67% rename from client/src/components/layout/Canvas/Canvas.jsx rename to client/src/components/Canvas/Canvas.jsx index a8789f5..f50075f 100644 --- a/client/src/components/layout/Canvas/Canvas.jsx +++ b/client/src/components/Canvas/Canvas.jsx @@ -1,11 +1,11 @@ import { Box } from "@chakra-ui/react"; -import GlobalMapCanvas from "./views/GlobalMapCanvas"; -import RegionalMapCanvas from "./views/RegionalMapCanvas"; -import VolcanoCanvas from "./views/VolcanoCanvas"; -import AdminCanvas from "./views/AdminCanvas"; -import AccountCanvas from "./views/AccountCanvas" -import SettingsCanvas from "./views/SettingsCanvas" -import { HomeCanvas } from "./views/HomeCanvas"; +import GlobalMapCanvas from "./views/GlobalMap"; +import RegionalMapCanvas from "./views/RegionalMap"; +import VolcanoCanvas from "./views/Volcano"; +import AdminCanvas from "./views/Admin"; +import AccountCanvas from "./views/Account" +import SettingsCanvas from "./views/Settings" +import { HomeCanvas } from "./views/Home"; import { DASHBOARD_VIEWS } from "@/constants/viewKeys"; export default function Canvas({...props}) { diff --git a/client/src/components/layout/Canvas/components/AddWidgetMenu.jsx b/client/src/components/Canvas/CanvasComponents/AddWidgetMenu.jsx similarity index 100% rename from client/src/components/layout/Canvas/components/AddWidgetMenu.jsx rename to client/src/components/Canvas/CanvasComponents/AddWidgetMenu.jsx diff --git a/client/src/components/layout/Canvas/components/AlertLevelWidget.jsx b/client/src/components/Canvas/CanvasComponents/AlertLevelWidget.jsx similarity index 100% rename from client/src/components/layout/Canvas/components/AlertLevelWidget.jsx rename to client/src/components/Canvas/CanvasComponents/AlertLevelWidget.jsx diff --git a/client/src/components/layout/Canvas/components/CancelButton.jsx b/client/src/components/Canvas/CanvasComponents/CancelButton.jsx similarity index 100% rename from client/src/components/layout/Canvas/components/CancelButton.jsx rename to client/src/components/Canvas/CanvasComponents/CancelButton.jsx diff --git a/client/src/components/layout/Canvas/components/DeleteAllButton.jsx b/client/src/components/Canvas/CanvasComponents/DeleteAllButton.jsx similarity index 100% rename from client/src/components/layout/Canvas/components/DeleteAllButton.jsx rename to client/src/components/Canvas/CanvasComponents/DeleteAllButton.jsx diff --git a/client/src/components/layout/Canvas/components/SaveButton.jsx b/client/src/components/Canvas/CanvasComponents/SaveButton.jsx similarity index 100% rename from client/src/components/layout/Canvas/components/SaveButton.jsx rename to client/src/components/Canvas/CanvasComponents/SaveButton.jsx diff --git a/client/src/components/layout/Canvas/components/SearchBar.jsx b/client/src/components/Canvas/CanvasComponents/SearchBar.jsx similarity index 100% rename from client/src/components/layout/Canvas/components/SearchBar.jsx rename to client/src/components/Canvas/CanvasComponents/SearchBar.jsx diff --git a/client/src/components/layout/Canvas/components/SettingsButton.jsx b/client/src/components/Canvas/CanvasComponents/SettingsButton.jsx similarity index 100% rename from client/src/components/layout/Canvas/components/SettingsButton.jsx rename to client/src/components/Canvas/CanvasComponents/SettingsButton.jsx diff --git a/client/src/components/layout/Canvas/components/Tooltip.jsx b/client/src/components/Canvas/CanvasComponents/Tooltip.jsx similarity index 100% rename from client/src/components/layout/Canvas/components/Tooltip.jsx rename to client/src/components/Canvas/CanvasComponents/Tooltip.jsx diff --git a/client/src/components/layout/Canvas/components/Widget.jsx b/client/src/components/Canvas/CanvasComponents/Widget.jsx similarity index 100% rename from client/src/components/layout/Canvas/components/Widget.jsx rename to client/src/components/Canvas/CanvasComponents/Widget.jsx diff --git a/client/src/components/layout/Canvas/views/AccountCanvas.jsx b/client/src/components/Canvas/views/Account.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/AccountCanvas.jsx rename to client/src/components/Canvas/views/Account.jsx diff --git a/client/src/components/layout/Canvas/views/AdminCanvas.jsx b/client/src/components/Canvas/views/Admin.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/AdminCanvas.jsx rename to client/src/components/Canvas/views/Admin.jsx diff --git a/client/src/components/layout/Canvas/views/GlobalMapCanvas.jsx b/client/src/components/Canvas/views/GlobalMap.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/GlobalMapCanvas.jsx rename to client/src/components/Canvas/views/GlobalMap.jsx diff --git a/client/src/components/layout/Canvas/views/HomeCanvas.jsx b/client/src/components/Canvas/views/Home.jsx similarity index 87% rename from client/src/components/layout/Canvas/views/HomeCanvas.jsx rename to client/src/components/Canvas/views/Home.jsx index a562bb6..1ee89fe 100644 --- a/client/src/components/layout/Canvas/views/HomeCanvas.jsx +++ b/client/src/components/Canvas/views/Home.jsx @@ -1,15 +1,15 @@ import { HStack, Flex, Tabs } from "@chakra-ui/react"; import { useState } from "react"; -import WidgetCanvas from "./DashboardCanvasNav/WidgetCanvas"; -import { SearchBar } from "../components/SearchBar"; -import { SettingsButton } from "../components/SettingsButton"; -import { DailyActivity } from "./DashboardCanvasNav/DailyActivity"; -import { Gas } from "./DashboardCanvasNav/Gas"; -import { Seismic } from "./DashboardCanvasNav/Seismic"; -import { RemoteSensing } from "./DashboardCanvasNav/RemoteSensing"; -import { CancelButton } from "../components/CancelButton"; -import { SaveButton } from "../components/SaveButton"; -import DeleteAllButton from "../components/DeleteAllButton"; +import WidgetCanvas from "./HomeTabs/MyDashboard"; +import { SearchBar } from "../CanvasComponents/SearchBar"; +import { SettingsButton } from "../CanvasComponents/SettingsButton"; +import { DailyActivity } from "./HomeTabs/DailyActivity"; +import { Gas } from "./HomeTabs/Gas"; +import { Seismic } from "./HomeTabs/Seismic"; +import { RemoteSensing } from "./HomeTabs/RemoteSensing"; +import { CancelButton } from "../CanvasComponents/CancelButton"; +import { SaveButton } from "../CanvasComponents/SaveButton"; +import DeleteAllButton from "../CanvasComponents/DeleteAllButton"; export function HomeCanvas({...props}) { // deconstructing props diff --git a/client/src/components/layout/Canvas/views/DashboardCanvasNav/DailyActivity.jsx b/client/src/components/Canvas/views/HomeTabs/DailyActivity.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/DashboardCanvasNav/DailyActivity.jsx rename to client/src/components/Canvas/views/HomeTabs/DailyActivity.jsx diff --git a/client/src/components/layout/Canvas/views/DashboardCanvasNav/Gas.jsx b/client/src/components/Canvas/views/HomeTabs/Gas.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/DashboardCanvasNav/Gas.jsx rename to client/src/components/Canvas/views/HomeTabs/Gas.jsx diff --git a/client/src/components/layout/Canvas/views/DashboardCanvasNav/WidgetCanvas.jsx b/client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx similarity index 97% rename from client/src/components/layout/Canvas/views/DashboardCanvasNav/WidgetCanvas.jsx rename to client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx index 0c1779f..c790cf3 100644 --- a/client/src/components/layout/Canvas/views/DashboardCanvasNav/WidgetCanvas.jsx +++ b/client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx @@ -2,7 +2,7 @@ import GridLayout, { WidthProvider } from 'react-grid-layout'; import { useSlotRecipe, chakra, Flex } from '@chakra-ui/react'; export default function WidgetCanvas({layout, onLayoutChange, isEditable, isDelete, DeleteWidget, widgetArray}) { - console.log("rendering widgetcanvas"); + console.log("rendering MyDashboard"); const recipe = useSlotRecipe({ key: "widget" }); const styles = recipe(); // using root recipe for widget below const ResponsiveGridLayout = WidthProvider(GridLayout); // canvas width now adjusts to window size diff --git a/client/src/components/layout/Canvas/views/DashboardCanvasNav/RemoteSensing.jsx b/client/src/components/Canvas/views/HomeTabs/RemoteSensing.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/DashboardCanvasNav/RemoteSensing.jsx rename to client/src/components/Canvas/views/HomeTabs/RemoteSensing.jsx diff --git a/client/src/components/layout/Canvas/views/DashboardCanvasNav/Seismic.jsx b/client/src/components/Canvas/views/HomeTabs/Seismic.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/DashboardCanvasNav/Seismic.jsx rename to client/src/components/Canvas/views/HomeTabs/Seismic.jsx diff --git a/client/src/components/layout/Canvas/views/RegionalMapCanvas.jsx b/client/src/components/Canvas/views/RegionalMap.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/RegionalMapCanvas.jsx rename to client/src/components/Canvas/views/RegionalMap.jsx diff --git a/client/src/components/layout/Canvas/views/SettingsCanvas.jsx b/client/src/components/Canvas/views/Settings.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/SettingsCanvas.jsx rename to client/src/components/Canvas/views/Settings.jsx diff --git a/client/src/components/layout/Canvas/views/VolcanoCanvas.jsx b/client/src/components/Canvas/views/Volcano.jsx similarity index 100% rename from client/src/components/layout/Canvas/views/VolcanoCanvas.jsx rename to client/src/components/Canvas/views/Volcano.jsx diff --git a/client/src/components/layout/Dashboard.jsx b/client/src/components/Dashboard.jsx similarity index 100% rename from client/src/components/layout/Dashboard.jsx rename to client/src/components/Dashboard.jsx diff --git a/client/src/components/layout/Header/Header.jsx b/client/src/components/Header/Header.jsx similarity index 100% rename from client/src/components/layout/Header/Header.jsx rename to client/src/components/Header/Header.jsx diff --git a/client/src/components/layout/Header/UserAvatarMenu.jsx b/client/src/components/Header/UserAvatarMenu.jsx similarity index 100% rename from client/src/components/layout/Header/UserAvatarMenu.jsx rename to client/src/components/Header/UserAvatarMenu.jsx diff --git a/client/src/components/layout/Sidebar/Sidebar.jsx b/client/src/components/Sidebar/Sidebar.jsx similarity index 98% rename from client/src/components/layout/Sidebar/Sidebar.jsx rename to client/src/components/Sidebar/Sidebar.jsx index 47e1e88..7f8c12a 100644 --- a/client/src/components/layout/Sidebar/Sidebar.jsx +++ b/client/src/components/Sidebar/Sidebar.jsx @@ -1,6 +1,6 @@ import { useSlotRecipe, Box, Button, IconButton } from "@chakra-ui/react"; import { ColorModeButton, useColorMode } from "@/components/ui/color-mode"; -import Tooltip from "../Canvas/components/Tooltip.jsx"; +import Tooltip from "../Canvas/CanvasComponents/Tooltip.jsx"; import { FaVolcano } from "react-icons/fa6"; import { FaHome } from "react-icons/fa"; import { FaGlobeAmericas } from "react-icons/fa";