diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx index fb36178..f8213a1 100644 --- a/frontend/src/components/Sidebar.tsx +++ b/frontend/src/components/Sidebar.tsx @@ -1,6 +1,7 @@ import { Link } from "react-router-dom"; import clsx from "clsx"; import MenuButton from "./buttons/MenuButton.tsx"; +import { Cross } from 'lucide-react'; type props = { className?: string @@ -11,8 +12,8 @@ const Sidebar = ({className}: props) => {
- - ➕ Create Clip + + Create Clip
diff --git a/frontend/src/components/Topbar.tsx b/frontend/src/components/Topbar.tsx index 80478be..e67a1bc 100644 --- a/frontend/src/components/Topbar.tsx +++ b/frontend/src/components/Topbar.tsx @@ -1,14 +1,16 @@ import { Menu, X} from 'lucide-react'; import MenuButton from "./buttons/MenuButton.tsx"; +import clsx from "clsx"; type props = { sidebarToggled: boolean, setSidebarToggled: Function + className?: string; } -const Topbar = ({sidebarToggled, setSidebarToggled}: props) => { +const Topbar = ({sidebarToggled, setSidebarToggled, className}: props) => { return ( -
+
setSidebarToggled(!sidebarToggled)}> {sidebarToggled ? : } diff --git a/frontend/src/layouts/MainLayout.tsx b/frontend/src/layouts/MainLayout.tsx index 507232a..67f6996 100644 --- a/frontend/src/layouts/MainLayout.tsx +++ b/frontend/src/layouts/MainLayout.tsx @@ -8,9 +8,13 @@ const MainLayout = () => { const [sidebarToggled, setSidebarToggled] = useState(false); return ( -
- - +
+ +
{/* This renders the nested route content */}