diff --git a/ui/package.json b/ui/package.json index 9c2f6650..78121f4c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -13,13 +13,20 @@ "test:watch": "jest --watch" }, "dependencies": { + "@fortawesome/free-solid-svg-icons": "^6.6.0", + "@fortawesome/react-fontawesome": "^0.2.2", "@hookform/resolvers": "^3.3.4", "@radix-ui/react-alert-dialog": "^1.0.5", "@radix-ui/react-dialog": "^1.0.5", + "@radix-ui/react-dropdown-menu": "^2.1.1", + "@radix-ui/react-icons": "^1.3.0", "@radix-ui/react-label": "^2.0.2", "@radix-ui/react-select": "^1.0.2", "@radix-ui/react-slot": "^1.0.2", + "@radix-ui/react-switch": "^1.1.0", "@radix-ui/react-tabs": "^1.0.4", + "@radix-ui/react-tooltip": "^1.1.2", + "@tanstack/react-table": "^8.20.1", "camaro": "^6.2.2", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", diff --git a/ui/src/app/groupings/page.tsx b/ui/src/app/groupings/page.tsx index 6d6dba73..8192f488 100644 --- a/ui/src/app/groupings/page.tsx +++ b/ui/src/app/groupings/page.tsx @@ -1,9 +1,27 @@ -const Groupings = () => { +import GroupingsTable from '@/components/table/GroupingsTable'; +import {ownerGroupings} from '@/actions/groupings-api'; + +const Groupings = async () => { + const res = await ownerGroupings(); + const groupingPaths = res.groupingPaths; return ( -
-
{/* GroupingsTable goes here */}
-
+
+
+
+

Manage My Groupings

+

+ View and manage groupings I own. Manage members, + configure grouping options and sync destinations. +

+
+
+
+ +
+
+
+
); -}; +} export default Groupings; diff --git a/ui/src/components/layout/navbar/navbar-menu.tsx b/ui/src/components/layout/navbar/navbar-menu.tsx index 8066d4b7..f8b8067b 100644 --- a/ui/src/components/layout/navbar/navbar-menu.tsx +++ b/ui/src/components/layout/navbar/navbar-menu.tsx @@ -1,12 +1,13 @@ 'use client'; -import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet'; +import { Sheet, SheetContent, SheetTitle, SheetTrigger } from '@/components/ui/sheet'; import User from '@/access/user'; import Link from 'next/link'; import { NavbarLinks } from './navbar-links'; -import { useState } from 'react'; +import React, { useState } from 'react'; import Role from '@/access/role'; import NavbarMenuIcon from './navbar-menu-icon'; +import {VisuallyHidden} from "@radix-ui/react-visually-hidden"; const NavbarMenu = ({ currentUser }: { currentUser: User }) => { const [open, setOpen] = useState(false); @@ -20,13 +21,20 @@ const NavbarMenu = ({ currentUser }: { currentUser: User }) => {