diff --git a/client/src/components/Canvas/Canvas.jsx b/client/src/components/Canvas/Canvas.jsx index 1e6739c..bc97e65 100644 --- a/client/src/components/Canvas/Canvas.jsx +++ b/client/src/components/Canvas/Canvas.jsx @@ -3,7 +3,6 @@ import RegionalMap from "./views/RegionalMap"; import Volcano from "./views/Volcano"; import Admin from "./views/Admin"; import Account from "./views/Account" -import Settings from "./views/Settings" import Home from "./views/Home"; import { DASHBOARD_VIEWS } from "@/constants/viewKeys"; import { chakra } from "@chakra-ui/react"; @@ -23,7 +22,7 @@ export default function Canvas({...props}) { {view === "volcano" && } {view === "admin" && } {view === "account" && } - {view === "settings" && } + {view === "settings" && } {view === "personal" && } {view === "security" && } diff --git a/client/src/components/Canvas/views/Personal.jsx b/client/src/components/Canvas/views/Personal.jsx index 2a95b02..2b67a20 100644 --- a/client/src/components/Canvas/views/Personal.jsx +++ b/client/src/components/Canvas/views/Personal.jsx @@ -1,9 +1,24 @@ -import { Box } from "@chakra-ui/react"; +import { Box, Text } from "@chakra-ui/react"; export default function Personal() { return ( - - Hello World + + + + Personal Info Canvas coming soon! + + ); } \ No newline at end of file diff --git a/client/src/components/Canvas/views/Security.jsx b/client/src/components/Canvas/views/Security.jsx index e8fac7f..cba798d 100644 --- a/client/src/components/Canvas/views/Security.jsx +++ b/client/src/components/Canvas/views/Security.jsx @@ -1,9 +1,24 @@ -import { Box } from "@chakra-ui/react"; +import { Box, Text } from "@chakra-ui/react"; export default function Security() { return ( - - Heya + + + + Security Canvas coming soon! + + ); } \ No newline at end of file diff --git a/client/src/components/Canvas/views/Settings.jsx b/client/src/components/Canvas/views/Settings.jsx deleted file mode 100644 index 85440d6..0000000 --- a/client/src/components/Canvas/views/Settings.jsx +++ /dev/null @@ -1,24 +0,0 @@ -import { Box, Text } from '@chakra-ui/react'; - -export default function Settings() { - return ( - - - - Settings Canvas coming soon! - - - - ); -} \ No newline at end of file diff --git a/client/src/components/Header/UserAvatarMenu.jsx b/client/src/components/Header/UserAvatarMenu.jsx index b7d29bc..14bbdc9 100644 --- a/client/src/components/Header/UserAvatarMenu.jsx +++ b/client/src/components/Header/UserAvatarMenu.jsx @@ -21,10 +21,7 @@ export default function UserAvatarMenu({ onChangeView, name, avatar }) { {/* zIndex: overlay = 1300 */} - onChangeView("account")}> - Account - - onChangeView("settings")}> + onChangeView("personal")}> Settings console.log("Log out triggered")}>