OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
rename folder organizationId -> organizationSlug
Carl-Gerhard Lindesvärdd922c31455af
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsxsimilarity index 97%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsxindex 21b87099a..a259c9064 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/list-reports.tsx@@ -1,6 +1,6 @@'use client';-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';import { useOverviewOptions } from '@/components/overview/useOverviewOptions';import { LazyChart } from '@/components/report/chart/LazyChart';import { Button } from '@/components/ui/button';diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsxsimilarity index 78%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsxindex 40912c64b..86b3cb5ab 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/[dashboardId]/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { notFound } from 'next/navigation';import { getDashboardById, getReportsByDashboardId } from '@openpanel/db';@@ -7,14 +7,14 @@ import { ListReports } from './list-reports';interface PageProps {params: {- organizationId: string;+ organizationSlug: string;projectId: string;dashboardId: string;};}export default async function Page({- params: { organizationId: organizationSlug, projectId, dashboardId },+ params: { organizationSlug, projectId, dashboardId },}: PageProps) {const [dashboard, reports] = await Promise.all([getDashboardById(dashboardId, projectId),diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/header-dashboards.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/header-dashboards.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/header-dashboards.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/header-dashboards.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/list-dashboards.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/list-dashboards.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/list-dashboards.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/list-dashboards.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/page.tsxsimilarity index 77%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/page.tsxindex e0b0f670b..5058afb1d 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/dashboards/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { getDashboardsByProjectId } from '@openpanel/db';@@ -8,12 +8,12 @@ import { ListDashboards } from './list-dashboards';interface PageProps {params: {projectId: string;- organizationId: string;+ organizationSlug: string;};}export default async function Page({- params: { projectId, organizationId: organizationSlug },+ params: { projectId, organizationSlug },}: PageProps) {const dashboards = await getDashboardsByProjectId(projectId);diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/charts/events-per-day-chart.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/charts/events-per-day-chart.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/charts/events-per-day-chart.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/charts/events-per-day-chart.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/event-conversions-list.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-conversions-list/event-conversions-list.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/event-conversions-list.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-conversions-list/event-conversions-list.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-conversions-list/index.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/index.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-conversions-list/index.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-details.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-details.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-details.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-details.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-edit.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-edit.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-edit.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-edit.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-icon.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-icon.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-icon.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-icon.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-list-item.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-list-item.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-list.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-list.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-listener.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-listener.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-listener.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/event-listener.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsxsimilarity index 93%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsxindex 271c286a8..d3e57f5b3 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/events/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';import { OverviewFiltersDrawer } from '@/components/overview/filters/overview-filters-drawer';import {@@ -17,7 +17,7 @@ import { EventList } from './event-list';interface PageProps {params: {projectId: string;- organizationId: string;+ organizationSlug: string;};searchParams: {events?: string;@@ -31,7 +31,7 @@ const nuqsOptions = {};export default async function Page({- params: { projectId, organizationId: organizationSlug },+ params: { projectId, organizationSlug },searchParams,}: PageProps) {const filters =diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-menu.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-menu.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-organization-selector.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-organization-selector.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-organization-selector.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-organization-selector.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-project-selector.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-project-selector.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-project-selector.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-project-selector.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sidebar.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sidebar.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sidebar.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sidebar.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsxsimilarity index 94%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsxindex 152a3f19e..79b6e68aa 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/layout.tsx@@ -11,14 +11,14 @@ import { LayoutSidebar } from './layout-sidebar';interface AppLayoutProps {children: React.ReactNode;params: {- organizationId: string;+ organizationSlug: string;projectId: string;};}export default async function AppLayout({children,- params: { organizationId: organizationSlug, projectId },+ params: { organizationSlug, projectId },}: AppLayoutProps) {const [organizations, projects, dashboards] = await Promise.all([getCurrentOrganizations(),diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/overview-sticky-header.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/overview-sticky-header.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/overview-sticky-header.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/overview-sticky-header.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page-layout.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page-layout.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsxsimilarity index 93%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsxindex a71f5ffb0..55f2b36c2 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';import { OverviewFiltersDrawer } from '@/components/overview/filters/overview-filters-drawer';import ServerLiveCounter from '@/components/overview/live-counter';@@ -18,13 +18,13 @@ import { OverviewReportRange } from './overview-sticky-header';interface PageProps {params: {- organizationId: string;+ organizationSlug: string;projectId: string;};}export default async function Page({- params: { organizationId: organizationSlug, projectId },+ params: { organizationSlug, projectId },}: PageProps) {const share = await getShareByProjectId(projectId);diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsxsimilarity index 97%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsxindex 2775862b5..a30223fd1 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/[profileId]/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';import { OverviewFiltersDrawer } from '@/components/overview/filters/overview-filters-drawer';import { ProfileAvatar } from '@/components/profiles/profile-avatar';@@ -27,9 +27,9 @@ import { StickyBelowHeader } from '../../layout-sticky-below-header';interface PageProps {params: {+ organizationSlug: string;projectId: string;profileId: string;- organizationId: string;};searchParams: {events?: string;@@ -41,7 +41,7 @@ interface PageProps {}export default async function Page({- params: { projectId, profileId, organizationId: organizationSlug },+ params: { projectId, profileId, organizationSlug },searchParams,}: PageProps) {const eventListOptions: GetEventListOptions = {diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsxsimilarity index 91%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsxindex 8ca653b17..e3c711153 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';import { OverviewFiltersDrawer } from '@/components/overview/filters/overview-filters-drawer';import { eventQueryFiltersParser } from '@/hooks/useEventQueryFilters';@@ -11,7 +11,7 @@ import ProfileTopServer from './profile-top';interface PageProps {params: {- organizationId: string;+ organizationSlug: string;projectId: string;};searchParams: {@@ -25,7 +25,7 @@ const nuqsOptions = {};export default function Page({- params: { organizationId: organizationSlug, projectId },+ params: { organizationSlug, projectId },searchParams: { cursor, f },}: PageProps) {return (diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-last-seen/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-last-seen/index.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-last-seen/index.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-last-seen/index.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-list/index.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/index.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-list/index.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/profile-list.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-list/profile-list.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/profile-list.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-list/profile-list.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-top/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-top/index.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-top/index.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/profiles/profile-top/index.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/[reportId]/page.tsxsimilarity index 81%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/[reportId]/page.tsxindex 5218a8d6c..394870bb4 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/[reportId]/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { Pencil } from 'lucide-react';import { notFound } from 'next/navigation';@@ -8,14 +8,14 @@ import ReportEditor from '../report-editor';interface PageProps {params: {+ organizationSlug: string;projectId: string;reportId: string;- organizationId: string;};}export default async function Page({- params: { reportId, organizationId: organizationSlug },+ params: { reportId, organizationSlug },}: PageProps) {const report = await getReportById(reportId);diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/page.tsxsimilarity index 68%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/page.tsxindex 1711a3acc..537909b22 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/page.tsx@@ -1,18 +1,16 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { Pencil } from 'lucide-react';import ReportEditor from './report-editor';interface PageProps {params: {- organizationId: string;+ organizationSlug: string;projectId: string;};}-export default function Page({- params: { organizationId: organizationSlug },-}: PageProps) {+export default function Page({ params: { organizationSlug } }: PageProps) {return (<PageLayoutorganizationSlug={organizationSlug}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/report-editor.tsxsimilarity index 97%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/report-editor.tsxindex 10debee6d..eaea10ada 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/reports/report-editor.tsx@@ -1,7 +1,7 @@'use client';import { useEffect } from 'react';-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';import { ChartSwitch } from '@/components/report/chart';import { ReportChartType } from '@/components/report/ReportChartType';import { ReportInterval } from '@/components/report/ReportInterval';diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/edit-organization.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/edit-organization.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/edit-organization.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/edit-organization.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/index.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/index.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/index.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/invites.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/invites.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/index.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/index.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/index.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/index.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/members.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/members/members.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsxsimilarity index 79%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsxindex ec7679053..fdb4ef200 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/page.tsx@@ -1,7 +1,7 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { notFound } from 'next/navigation';-import { getInvites, getOrganizationBySlug } from '@openpanel/db';+import { getOrganizationBySlug } from '@openpanel/db';import EditOrganization from './edit-organization';import InvitesServer from './invites';@@ -9,12 +9,12 @@ import MembersServer from './members';interface PageProps {params: {- organizationId: string;+ organizationSlug: string;};}export default async function Page({- params: { organizationId: organizationSlug },+ params: { organizationSlug },}: PageProps) {const organization = await getOrganizationBySlug(organizationSlug);diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/page.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/page.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/edit-profile.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/edit-profile.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/edit-profile.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/edit-profile.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/logout.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/logout.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/logout.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/logout.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/page.tsxsimilarity index 78%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/page.tsxindex 9793d135e..9033caea6 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/profile/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { auth } from '@clerk/nextjs';import { getUserById } from '@openpanel/db';@@ -8,11 +8,11 @@ import { Logout } from './logout';interface PageProps {params: {- organizationId: string;+ organizationSlug: string;};}export default async function Page({- params: { organizationId: organizationSlug },+ params: { organizationSlug },}: PageProps) {const { userId } = auth();const profile = await getUserById(userId!);diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/list-projects.tsxsimilarity index 97%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/list-projects.tsxindex 6b67f1488..6786f9738 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/list-projects.tsx@@ -1,6 +1,6 @@'use client';-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';import { ClientActions } from '@/components/clients/client-actions';import { ProjectActions } from '@/components/projects/project-actions';// import { columns } from '@/components/projects/table';diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsxsimilarity index 78%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsxindex bb8241795..5f7c02d54 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/projects/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import {getClientsByOrganizationSlug,@@ -9,12 +9,12 @@ import ListProjects from './list-projects';interface PageProps {params: {- organizationId: string;+ organizationSlug: string;};}export default async function Page({- params: { organizationId: organizationSlug },+ params: { organizationSlug },}: PageProps) {const [projects, clients] = await Promise.all([getProjectsByOrganizationSlug(organizationSlug),diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/list-references.tsxsimilarity index 89%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/list-references.tsxindex 0040cc796..854567712 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/list-references.tsx@@ -1,6 +1,6 @@'use client';-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';import { DataTable } from '@/components/data-table';import { columns } from '@/components/references/table';import { Button } from '@/components/ui/button';diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsxsimilarity index 74%rename from apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsxindex ee6b723f7..f008741d3 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/references/page.tsx@@ -1,4 +1,4 @@-import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';+import PageLayout from '@/app/(app)/[organizationSlug]/[projectId]/page-layout';import { getReferences } from '@openpanel/db';@@ -6,13 +6,13 @@ import ListReferences from './list-references';interface PageProps {params: {- organizationId: string;+ organizationSlug: string;projectId: string;};}export default async function Page({- params: { organizationId: organizationSlug, projectId },+ params: { organizationSlug, projectId },}: PageProps) {const references = await getReferences({where: {diff --git a/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/create-project.tsxsimilarity index 100%rename from apps/dashboard/src/app/(app)/[organizationId]/create-project.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/create-project.tsxdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/page.tsxsimilarity index 96%rename from apps/dashboard/src/app/(app)/[organizationId]/page.tsxrename to apps/dashboard/src/app/(app)/[organizationSlug]/page.tsxindex 83e73c10e..2ed6f5fb9 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/page.tsx@@ -12,12 +12,12 @@ import { CreateProject } from './create-project';interface PageProps {params: {- organizationId: string;+ organizationSlug: string;};}export default async function Page({- params: { organizationId: organizationSlug },+ params: { organizationSlug },}: PageProps) {const [organization, projects] = await Promise.all([getOrganizationBySlug(organizationSlug),diff --git a/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx b/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsxindex 50afad8e9..c9ea643d3 100644--- a/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx+++ b/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx@@ -1,5 +1,5 @@-import { StickyBelowHeader } from '@/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header';-import { OverviewReportRange } from '@/app/(app)/[organizationId]/[projectId]/overview-sticky-header';+import { StickyBelowHeader } from '@/app/(app)/[organizationSlug]/[projectId]/layout-sticky-below-header';+import { OverviewReportRange } from '@/app/(app)/[organizationSlug]/[projectId]/overview-sticky-header';import { Logo } from '@/components/logo';import { OverviewFiltersButtons } from '@/components/overview/filters/overview-filters-buttons';import ServerLiveCounter from '@/components/overview/live-counter';