Merged conflicts

hngprojects · Jul 21, 2024 · ba4bdf0 · ba4bdf0
1 parent 057000b
commit ba4bdf0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/components/dashboard/userdashboard.tsx b/app/components/dashboard/userdashboard.tsx
@@ -100,7 +100,7 @@ function Navbar() {
 function Sidebar({ on }: { on: boolean }) {
   return (
     <aside
-      className={`absolute top-0 flex h-screen w-full flex-row items-start duration-1000 ${on ? "left-0" : "-left-full"}`}
+      className={`absolute top-0 flex h-screen w-full flex-row items-start z-50 duration-1000 ${on ? "left-0" : "-left-full"}`}
     >
       <div className="flex h-full w-[85%] flex-col items-start bg-[#E4E4E7]">
         <div className="flex w-full flex-row items-center justify-between p-8">

diff --git a/app/components/userdashboard/barchart.tsx b/app/components/userdashboard/barchart.tsx
@@ -1,7 +1,14 @@
 "use client";
 
 import { Bar, BarChart, CartesianGrid, XAxis, YAxis } from "recharts";
-import { ChartConfig, ChartContainer, ChartTooltip, ChartTooltipContent } from "../ui/chart";
+
+import {
+  ChartConfig,
+  ChartContainer,
+  ChartTooltip,
+  ChartTooltipContent,
+} from "../ui/chart";
+
 const chartData = [
   { month: "January", desktop: 4500, price: "$6000" },
   { month: "February", desktop: 3300, price: "$4500" },
@@ -68,4 +75,4 @@ export default function BarComponent() {
       </BarChart>
     </ChartContainer>
   );
-}
+}