wip: clerk auth

apps/web/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/page.tsx

@@ -1,10 +1,10 @@
 import PageLayout from '@/app/(app)/page-layout';
-import { getSession } from '@/server/auth';
 import {
   createRecentDashboard,
   getDashboardById,
 } from '@/server/services/dashboard.service';
 import { getReportsByDashboardId } from '@/server/services/reports.service';
+import { auth } from '@clerk/nextjs';
 import { revalidateTag } from 'next/cache';
 
 import { ListReports } from './list-reports';
@@ -20,10 +20,10 @@ interface PageProps {
 export default async function Page({
   params: { organizationId, projectId, dashboardId },
 }: PageProps) {
-  const session = await getSession();
+  const { userId } = auth();
+
   const dashboard = await getDashboardById(dashboardId);
   const reports = await getReportsByDashboardId(dashboardId);
-  const userId = session?.user.id;
   if (userId && dashboard) {
     await createRecentDashboard({
       userId,
@@ -35,7 +35,7 @@ export default async function Page({
   }
 
   return (
-    <PageLayout title={dashboard.name} organizationId={organizationId}>
+    <PageLayout title={dashboard.name}>
       <ListReports reports={reports} />
     </PageLayout>
   );

apps/web/src/app/(app)/[organizationId]/[projectId]/dashboards/page.tsx

@@ -6,18 +6,15 @@ import { ListDashboards } from './list-dashboards';
 
 interface PageProps {
   params: {
-    organizationId: string;
     projectId: string;
   };
 }
 
-export default async function Page({
-  params: { organizationId, projectId },
-}: PageProps) {
+export default async function Page({ params: { projectId } }: PageProps) {
   const dashboards = await getDashboardsByProjectId(projectId);
 
   return (
-    <PageLayout title="Dashboards" organizationId={organizationId}>
+    <PageLayout title="Dashboards">
       <HeaderDashboards projectId={projectId} />
       <ListDashboards dashboards={dashboards} />
     </PageLayout>

apps/web/src/app/(app)/[organizationId]/[projectId]/events/page.tsx

@@ -4,15 +4,12 @@ import { ListEvents } from './list-events';
 
 interface PageProps {
   params: {
-    organizationId: string;
     projectId: string;
   };
 }
-export default function Page({
-  params: { organizationId, projectId },
-}: PageProps) {
+export default function Page({ params: { projectId } }: PageProps) {
   return (
-    <PageLayout title="Events" organizationId={organizationId}>
+    <PageLayout title="Events">
       <ListEvents projectId={projectId} />
     </PageLayout>
   );

apps/web/src/app/(app)/[organizationId]/[projectId]/page.tsx

@@ -2,16 +2,9 @@ import PageLayout from '@/app/(app)/page-layout';
 
 import OverviewMetrics from './overview-metrics';
 
-interface PageProps {
-  params: {
-    organizationId: string;
-    projectId: string;
-  };
-}
-
-export default function Page({ params: { organizationId } }: PageProps) {
+export default function Page() {
   return (
-    <PageLayout title="Overview" organizationId={organizationId}>
+    <PageLayout title="Overview">
       <OverviewMetrics />
     </PageLayout>
   );

apps/web/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsx

@@ -1,7 +1,6 @@
 import PageLayout from '@/app/(app)/page-layout';
 import { ListProperties } from '@/components/events/ListProperties';
 import { ProfileAvatar } from '@/components/profiles/ProfileAvatar';
-import { Avatar } from '@/components/ui/avatar';
 import { Widget, WidgetBody, WidgetHead } from '@/components/Widget';
 import {
   getProfileById,
@@ -14,14 +13,13 @@ import ListProfileEvents from './list-profile-events';
 
 interface PageProps {
   params: {
-    organizationId: string;
     projectId: string;
     profileId: string;
   };
 }
 
 export default async function Page({
-  params: { organizationId, projectId, profileId },
+  params: { projectId, profileId },
 }: PageProps) {
   const profile = await getProfileById(profileId);
   const profiles = (
@@ -35,7 +33,6 @@ export default async function Page({
           {getProfileName(profile)}
         </div>
       }
-      organizationId={organizationId}
     >
       <div className="p-4">
         <div className="grid gap-4 grid-cols-1 md:grid-cols-2 mb-8">

apps/web/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsx

@@ -12,7 +12,7 @@ export default function Page({
   params: { organizationId, projectId },
 }: PageProps) {
   return (
-    <PageLayout title="Events" organizationId={organizationId}>
+    <PageLayout title="Events">
       <ListProfiles projectId={projectId} organizationId={organizationId} />
     </PageLayout>
   );

apps/web/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsx

@@ -6,15 +6,12 @@ import ReportEditor from '../report-editor';
 
 interface PageProps {
   params: {
-    organizationId: string;
     projectId: string;
     reportId: string;
   };
 }
 
-export default async function Page({
-  params: { organizationId, reportId },
-}: PageProps) {
+export default async function Page({ params: { reportId } }: PageProps) {
   const report = await getReportById(reportId);
   return (
     <PageLayout
@@ -24,7 +21,6 @@ export default async function Page({
           <Pencil size={16} />
         </div>
       }
-      organizationId={organizationId}
     >
       <ReportEditor report={report} />
     </PageLayout>

apps/web/src/app/(app)/[organizationId]/[projectId]/reports/page.tsx

@@ -19,7 +19,6 @@ export default function Page({ params: { organizationId } }: PageProps) {
           <Pencil size={16} />
         </div>
       }
-      organizationId={organizationId}
     >
       <ReportEditor reportId={null} />
     </PageLayout>