diff --git a/client/src/components/layout/Canvas/Canvas.jsx b/client/src/components/layout/Canvas/Canvas.jsx index d94300e..d059e1c 100644 --- a/client/src/components/layout/Canvas/Canvas.jsx +++ b/client/src/components/layout/Canvas/Canvas.jsx @@ -7,6 +7,8 @@ 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 { DashboardCanvas } from "./views/DashboardCanvas"; import { DASHBOARD_VIEWS } from "@/constants/viewKeys"; @@ -30,6 +32,8 @@ export default function Canvas({ view, setView, layout, setLayout, onLayoutChang {view === "regional" && } {view === "volcano" && } {view === "admin" && } + {view === "account" && } + {view === "settings" && } ); } \ No newline at end of file diff --git a/client/src/components/layout/Canvas/views/AccountCanvas.jsx b/client/src/components/layout/Canvas/views/AccountCanvas.jsx new file mode 100644 index 0000000..211606f --- /dev/null +++ b/client/src/components/layout/Canvas/views/AccountCanvas.jsx @@ -0,0 +1,24 @@ +import { Box, Text } from '@chakra-ui/react'; + +export default function AccountCanvas() { + return ( + + + + Account Canvas coming soon! + + + + ); +} \ No newline at end of file diff --git a/client/src/components/layout/Canvas/views/SettingsCanvas.jsx b/client/src/components/layout/Canvas/views/SettingsCanvas.jsx new file mode 100644 index 0000000..3fb32bb --- /dev/null +++ b/client/src/components/layout/Canvas/views/SettingsCanvas.jsx @@ -0,0 +1,24 @@ +import { Box, Text } from '@chakra-ui/react'; + +export default function SettingsCanvas() { + return ( + + + + Settings Canvas coming soon! + + + + ); +} \ No newline at end of file diff --git a/client/src/components/layout/Dashboard.jsx b/client/src/components/layout/Dashboard.jsx index cf76695..05cde64 100644 --- a/client/src/components/layout/Dashboard.jsx +++ b/client/src/components/layout/Dashboard.jsx @@ -61,12 +61,16 @@ export default function Dashboard() { width="100vw" > -
+
+ onChangeView={ setView } + /> {user.name} {user.email} - + ); diff --git a/client/src/components/layout/Header/UserAvatarMenu.jsx b/client/src/components/layout/Header/UserAvatarMenu.jsx index a4960cf..250542c 100644 --- a/client/src/components/layout/Header/UserAvatarMenu.jsx +++ b/client/src/components/layout/Header/UserAvatarMenu.jsx @@ -1,7 +1,7 @@ import { Avatar, Menu, Portal, Box } from "@chakra-ui/react" -export default function UserAvatarMenu({ name, avatar }) { +export default function UserAvatarMenu({ view, setView, name, avatar }) { return ( @@ -21,9 +21,15 @@ export default function UserAvatarMenu({ name, avatar }) { {/* zIndex: overlay = 1300 */} - Account - Settings - Logout + setView("account")}> + Account + + setView("settings")}> + Settings + + console.log("Log out triggered")}> + Logout +