Merge branch 'Refactor/file-names-and-organization' into 'main'

Rename and Restructure

See merge request vkuchenik/website-framework!49

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';
 
 

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}) {

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

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

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";