diff --git a/client/src/components/Canvas/Canvas.jsx b/client/src/components/Canvas/Canvas.jsx index b6f49c7..8594742 100644 --- a/client/src/components/Canvas/Canvas.jsx +++ b/client/src/components/Canvas/Canvas.jsx @@ -9,9 +9,12 @@ import { chakra } from "@chakra-ui/react"; import Personal from "./views/Personal"; import Security from "./views/Security"; +const ADMIN_DEFAULT = "medataentry"; + export default function Canvas(props) { const { view } = props; - return ( + + return ( {/* Check if view is a tab inside the Home Header */} { DASHBOARD_VIEWS.includes(view) && ( diff --git a/client/src/components/Canvas/views/Admin.jsx b/client/src/components/Canvas/views/Admin.jsx index ab3c50d..6b27590 100644 --- a/client/src/components/Canvas/views/Admin.jsx +++ b/client/src/components/Canvas/views/Admin.jsx @@ -7,11 +7,6 @@ import { SearchBar } from "../CanvasComponents/SearchBar"; import { SettingsButton } from "../CanvasComponents/SettingsButton"; export default function Admin({ view, onChangeView, onEditWidgets, appendWidget }) { - // Prop Forwarding - // const { view, layout, setLayout, setOriginalLayout, onLayoutChange, onChangeView, onCancel, setOriginalWidgets, - // isDelete, setIsDelete, beginEditIfNeeded, isEditable, setIsEditable, widgetArray, setWidgetArray } = props; - - // const MyDashboardProps = { layout, onLayoutChange, isEditable, beginEditIfNeeded, isDelete, DeleteWidget, widgetArray, appendWidget }; const settingsButtonProps = { onEditWidgets, appendWidget }; return ( @@ -76,69 +71,4 @@ export default function Admin({ view, onChangeView, onEditWidgets, appendWidget ); -} - - - // return ( - // /* HEADER */ - // { - // const nextView = e.value; - // onChangeView(nextView); - // }} - // > - // - // - // - // M&E Data Entry - // - // - // Project Collector - // - // - // NAS Application - // - // IVANS - // - // - // - // - // - // - // - - // {/* CANVAS */} - // - // - // - // - // - // - // - // - // - // - // - // - // - // ); - // } - \ No newline at end of file +} \ No newline at end of file diff --git a/client/src/components/Sidebar/Sidebar.jsx b/client/src/components/Sidebar/Sidebar.jsx index a403f76..a90e407 100644 --- a/client/src/components/Sidebar/Sidebar.jsx +++ b/client/src/components/Sidebar/Sidebar.jsx @@ -25,7 +25,7 @@ export default function Sidebar({ view, onChangeView, darkMode, setDarkMode }) { {icon: FaGlobeAmericas, name: "Global Map", view: "global"}, {icon: FaMapMarkerAlt, name: "Regional Map", view: "regional"}, {icon: FaVolcano, name: "Volcano", view: "volcano"}, - {icon: HiUsers, name: "Admin", view: "admin"} + {icon: HiUsers, name: "Admin", view: "medataentry"} ]; // Different Sidebar Button Options for Settings View