Merge branch 'sidebar/account-sidebar' into 'main'

removed account button

See merge request vkuchenik/website-framework!63

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" && <Volcano />}
             {view === "admin" && <Admin />}
             {view === "account" && <Account />}
-            {view === "settings" && <Settings />}
+            {view === "settings" && <Personal />}
             {view === "personal" && <Personal />}
             {view === "security" && <Security />}
         </chakra.div>

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 (
-    <Box color="white" bg="tomato">
+    <Box p={8} mt={4} ml="auto" mr="auto" width="600px">
-      Hello World
+      <Box 
+        bg="bg" 
+        shadow="md" 
+        borderRadius="md"
+        p={8}
+        width="600px"
+        height="100px"
+        textAlign="center"
+        display="flex"
+        alignItems="center"
+        justifyContent="center"
+      >
+        <Text fontsize="2xl" fontWeight="bold" color="gray.700">
+            Personal Info Canvas coming soon!
+        </Text>
+      </Box>
     </Box>
   );
 }

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 (
-    <Box color="white" bg="tomato">
+    <Box p={8} mt={4} ml="auto" mr="auto" width="600px">
-      Heya
+      <Box 
+        bg="bg" 
+        shadow="md" 
+        borderRadius="md"
+        p={8}
+        width="600px"
+        height="100px"
+        textAlign="center"
+        display="flex"
+        alignItems="center"
+        justifyContent="center"
+      >
+        <Text fontsize="2xl" fontWeight="bold" color="gray.700">
+            Security Canvas coming soon!
+        </Text>
+      </Box>
     </Box>
   );
 }

client/src/components/Canvas/views/Settings.jsx

@@ -1,24 +0,0 @@
-import { Box, Text } from '@chakra-ui/react';
-
-export default function Settings() {
-  return (
-    <Box p={8} mt={4} ml="auto" mr="auto" width="600px">
-      <Box 
-        bg="bg" 
-        shadow="md" 
-        borderRadius="md"
-        p={8}
-        width="600px"
-        height="100px"
-        textAlign="center"
-        display="flex"
-        alignItems="center"
-        justifyContent="center"
-      >
-        <Text fontsize="2xl" fontWeight="bold" color="gray.700">
-            Settings Canvas coming soon!
-        </Text>
-      </Box>
-    </Box>
-  );
-}

client/src/components/Header/UserAvatarMenu.jsx

@@ -21,10 +21,7 @@ export default function UserAvatarMenu({ onChangeView, name, avatar }) {
 				{/* zIndex: overlay = 1300 */}
 				<Menu.Positioner zIndex="overlay"> 
 					<Menu.Content>
-						<Menu.Item value="account" onClick={() => onChangeView("account")}>
+						<Menu.Item value="settings" onClick={() => onChangeView("personal")}>
-							Account
-						</Menu.Item>
-						<Menu.Item value="settings" onClick={() => onChangeView("settings")}>
 							Settings
 						</Menu.Item>
 						<Menu.Item value="logout" onClick={() => console.log("Log out triggered")}>