diff --git a/src/app/[orgId]/components/TopbarNav.tsx b/src/app/[orgId]/components/TopbarNav.tsx index a1952d6d9b1acf6996577f7d277438c4c02ceca5..6fe92f6874f04023fe15e196cab692a4f1f7b311 100644 --- a/src/app/[orgId]/components/TopbarNav.tsx +++ b/src/app/[orgId]/components/TopbarNav.tsx @@ -40,8 +40,8 @@ export function TopbarNav({ className={cn( "px-2 py-3 text-md", pathname.startsWith(item.href.replace("{orgId}", orgId)) - ? "border-b-2 border-secondary text-secondary font-medium" - : "hover:secondary-primary text-muted-foreground font-medium", + ? "border-b-2 border-primary text-primary font-medium" + : "hover:text-primary text-muted-foreground font-medium", "whitespace-nowrap", disabled && "cursor-not-allowed", )} @@ -51,9 +51,7 @@ export function TopbarNav({ >
{item.icon && ( -
- {item.icon} -
+
{item.icon}
)} {item.title}
diff --git a/src/app/[orgId]/resources/components/ResourcesTable.tsx b/src/app/[orgId]/resources/components/ResourcesTable.tsx index 56386b6d7f5b8095a822cbd0cdb4689b9468756c..976f2fe4773ab2b58f89495a83b70c953e511c2c 100644 --- a/src/app/[orgId]/resources/components/ResourcesTable.tsx +++ b/src/app/[orgId]/resources/components/ResourcesTable.tsx @@ -17,6 +17,8 @@ export type ResourceRow = { id: string; name: string; orgId: string; + domain: string; + site: string; }; export const columns: ColumnDef[] = [ @@ -36,6 +38,26 @@ export const columns: ColumnDef[] = [ ); }, }, + { + accessorKey: "site", + header: ({ column }) => { + return ( + + ); + }, + }, + { + accessorKey: "domain", + header: "Domain", + }, { id: "actions", cell: ({ row }) => { diff --git a/src/app/[orgId]/resources/page.tsx b/src/app/[orgId]/resources/page.tsx index 3b3c461ecdbec054ebc54e8f8212a6faf102060c..80cf9ba14763674255d841001afad9621b4865dd 100644 --- a/src/app/[orgId]/resources/page.tsx +++ b/src/app/[orgId]/resources/page.tsx @@ -25,6 +25,8 @@ export default async function Page({ params }: ResourcesPageProps) { id: resource.resourceId.toString(), name: resource.name, orgId: params.orgId, + domain: resource.subdomain || "", + site: resource.siteName || "None", }; }); diff --git a/src/app/auth/layout.tsx b/src/app/auth/layout.tsx index 83b9062dc84b6f6069e71815e7b7278f3db64a1b..189b6f6f81493bbff37ae8f5c3992307328ee18b 100644 --- a/src/app/auth/layout.tsx +++ b/src/app/auth/layout.tsx @@ -5,7 +5,7 @@ type AuthLayoutProps = { export default async function AuthLayout({ children }: AuthLayoutProps) { return ( <> -
+
{children}
diff --git a/src/app/page.tsx b/src/app/page.tsx index d8f8b9500e0ffcb977ac094a80184d3b21dfd408..36782e4c4a9b9a12dbbea52af245a5abc955f0cb 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,5 +1,11 @@ +import { internal } from "@app/api"; +import { authCookieHeader } from "@app/api/cookies"; import { verifySession } from "@app/lib/auth/verifySession"; import { LandingProvider } from "@app/providers/LandingProvider"; +import { ListOrgsResponse } from "@server/routers/org"; +import { AxiosResponse } from "axios"; +import { ArrowUpLeft, ArrowUpRight } from "lucide-react"; +import Link from "next/link"; import { redirect } from "next/navigation"; export default async function Page() { @@ -9,11 +15,35 @@ export default async function Page() { redirect("/auth/login"); } + let orgs: ListOrgsResponse["orgs"] = []; + try { + const res = await internal.get>( + `/orgs`, + authCookieHeader(), + ); + if (res && res.data.data.orgs) { + orgs = res.data.data.orgs; + } + } catch (e) { + console.error("Error fetching orgs", e); + } + return ( <>

Logged in as {user.email}

+ +
+ {orgs.map((org) => ( + +
+ {org.name} + +
+ + ))} +
); }