Skip to content

Commit

Permalink
Merge internal branch with conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
jacc committed Dec 9, 2024
2 parents f906915 + 699c18a commit c2c40bf
Show file tree
Hide file tree
Showing 33 changed files with 1,543 additions and 283 deletions.
Binary file modified bun.lockb
Binary file not shown.
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
"@radix-ui/react-avatar": "^1.0.3",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-context-menu": "^2.1.4",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.0.5",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-popover": "^1.0.6",
"@radix-ui/react-progress": "^1.0.3",
"@radix-ui/react-scroll-area": "^1.0.4",
"@radix-ui/react-select": "^1.2.2",
"@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.0.3",
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-toast": "^1.1.4",
"@radix-ui/react-tooltip": "^1.0.6",
"@radix-ui/react-tooltip": "^1.1.3",
"@react-hook/media-query": "^1.1.1",
"@sentry/nextjs": "^7.104.0",
"@tabler/icons-react": "^2.30.0",
Expand All @@ -40,16 +40,18 @@
"@types/react-dom": "18.2.6",
"autoprefixer": "10.4.14",
"axios": "^1.7.2",
"class-variance-authority": "^0.6.1",
"class-variance-authority": "^0.7.0",
"clsx": "^1.2.1",
"cmdk": "^0.2.0",
"cookies-next": "^2.1.2",
"drizzle-orm": "^0.31.2",
"eslint": "8.44.0",
"eslint-config-next": "13.4.12",
"fast-xml-parser": "^4.2.6",
"geist": "^1.3.1",
"lucide-react": "^0.454.0",
"mysql2": "^3.10.1",
"next": "^14.2.3",
"next": "^15.0.2",
"next-themes": "^0.2.1",
"postcss": "8.4.24",
"posthog-js": "^1.110.0",
Expand Down
Binary file added public/farmer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions src/components/sidebar/group.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import {
SidebarGroup,
SidebarGroupLabel,
SidebarGroupContent,
SidebarMenu,
SidebarMenuItem,
SidebarMenuButton,
} from "@/components/ui/sidebar";
import Link from "next/link";
import React from "react";

interface CustomSidebarGroupProps {
label?: string;
items: { name: string; href: string; icon: (props: any) => JSX.Element }[];
pathname: string;
className?: string;
}

const SidebarLinks = ({
label,
items,
pathname,
className = "",
}: CustomSidebarGroupProps) => (
<SidebarGroup className={className}>
{label && (
<SidebarGroupLabel className="text-sm font-medium">
{label}
</SidebarGroupLabel>
)}
<SidebarGroupContent>
<SidebarMenu>
{items.map((item) => (
<SidebarMenuItem key={item.name}>
<SidebarMenuButton
asChild
isActive={pathname === item.href}
tooltip={item.name}
>
<Link href={item.href}>
<item.icon className="h-4 w-4" />
{item.name}
</Link>
</SidebarMenuButton>
</SidebarMenuItem>
))}
</SidebarMenu>
</SidebarGroupContent>
</SidebarGroup>
);

export default SidebarLinks;
Loading

0 comments on commit c2c40bf

Please sign in to comment.