diff --git a/client/src/components/layout/Canvas/SearchBar.jsx b/client/src/components/layout/Canvas/SearchBar.jsx index 3a37fe5..5d116a4 100644 --- a/client/src/components/layout/Canvas/SearchBar.jsx +++ b/client/src/components/layout/Canvas/SearchBar.jsx @@ -9,7 +9,7 @@ export function SearchBar({ placeholder="Enter a volcano to search", size="sm", size={size} width={width} borderRadius="full" - + bg="base100" /> ); diff --git a/client/src/components/layout/Header/Header.jsx b/client/src/components/layout/Header/Header.jsx index d11f2d6..9b7e7c5 100644 --- a/client/src/components/layout/Header/Header.jsx +++ b/client/src/components/layout/Header/Header.jsx @@ -16,7 +16,7 @@ export default function Header() { - + {user.name} {user.email} diff --git a/client/src/components/layout/Header/UserAvatarMenu.jsx b/client/src/components/layout/Header/UserAvatarMenu.jsx index cbef63d..c4eb8a0 100644 --- a/client/src/components/layout/Header/UserAvatarMenu.jsx +++ b/client/src/components/layout/Header/UserAvatarMenu.jsx @@ -1,30 +1,31 @@ import { Avatar, Menu, Portal, Box } from "@chakra-ui/react" - + export default function UserAvatarMenu({ name, avatar }) { - return ( - - - - - - - - - - - - - Account - Settings - Logout - - - - - ); + return ( + + + + + + + + + + + + + Account + Settings + Logout + + + + + ); } \ No newline at end of file diff --git a/client/src/components/layout/Sidebar/Sidebar.jsx b/client/src/components/layout/Sidebar/Sidebar.jsx index c505707..55de0b0 100644 --- a/client/src/components/layout/Sidebar/Sidebar.jsx +++ b/client/src/components/layout/Sidebar/Sidebar.jsx @@ -1,4 +1,4 @@ -import { chakra, useRecipe, useSlotRecipe, Box, Button, createIcon, CloseButton, IconButton, Stack, useDisclosure, Tooltip } from "@chakra-ui/react"; +import { useSlotRecipe, Box, Button, createIcon, CloseButton, IconButton, Stack, useDisclosure, Tooltip } from "@chakra-ui/react"; import { ColorModeButton } from "@/components/ui/color-mode"; import { FaVolcano } from "react-icons/fa6"; import { RxHamburgerMenu } from "react-icons/rx"; @@ -59,7 +59,6 @@ export const Users = createIcon({ export default function Sidebar() { const [isOpen, setIsOpen] = useState(true); - const [hasFinishedTransitions, setFinishedTransitions] = useState(false); const buttons = [ {icon: PushPin, name: "Dashboard"}, @@ -74,10 +73,8 @@ export default function Sidebar() { const styles = recipe(); const toggleSidebar = () => { - setFinishedTransitions(false); if (isOpen) setIsOpen(false); else setIsOpen(true); - setTimeout(() => setFinishedTransitions(true), 400); // Match sidebar transition duration }; return ( @@ -88,9 +85,10 @@ export default function Sidebar() { > @@ -98,7 +96,12 @@ export default function Sidebar() { {buttons.map((button, idx) => { const Icon = button.icon; return ( -