diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/actions/delete-control.ts b/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/actions/delete-control.ts deleted file mode 100644 index 970156f970..0000000000 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/actions/delete-control.ts +++ /dev/null @@ -1,69 +0,0 @@ -"use server"; - -import { db } from "@comp/db"; -import { revalidatePath, revalidateTag } from "next/cache"; -import { z } from "zod"; -import { authActionClient } from "../../../../../../../actions/safe-action"; - -const deleteControlSchema = z.object({ - id: z.string(), - entityId: z.string(), -}); - -export const deleteControlAction = authActionClient - .schema(deleteControlSchema) - .metadata({ - name: "delete-control", - track: { - event: "delete-control", - description: "Delete Control", - channel: "server", - }, - }) - .action(async ({ parsedInput, ctx }) => { - const { id } = parsedInput; - const { activeOrganizationId } = ctx.session; - - if (!activeOrganizationId) { - return { - success: false, - error: "Not authorized", - }; - } - - try { - const control = await db.control.findUnique({ - where: { - id, - organizationId: activeOrganizationId, - }, - }); - - if (!control) { - return { - success: false, - error: "Control not found", - }; - } - - // Delete the control - await db.control.delete({ - where: { id }, - }); - - // Revalidate paths to update UI - revalidatePath(`/${activeOrganizationId}/controls/all`); - revalidatePath(`/${activeOrganizationId}/controls`); - revalidateTag("controls"); - - return { - success: true, - }; - } catch (error) { - console.error(error); - return { - success: false, - error: "Failed to delete control", - }; - } - }); diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/constants.ts b/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/constants.ts deleted file mode 100644 index a0fb4cb3a8..0000000000 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/constants.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Departments, TaskFrequency, TaskStatus } from "@comp/db/types"; - -// Define possible statuses based on the Prisma schema -export const taskStatuses: TaskStatus[] = ["todo", "in_progress", "done"]; - -// Define possible frequencies -export const taskFrequencies: TaskFrequency[] = [ - "daily", - "weekly", - "monthly", - "quarterly", - "yearly", -]; - -// Define possible departments -export const taskDepartments: Departments[] = [ - "none", - "admin", - "gov", - "hr", - "it", - "itsm", - "qms", -]; - -// Define MAIN colors for Departments -export const DEPARTMENT_COLORS: Record = { - none: "#6b7280", // Gray - admin: "#14b8a6", // Teal - gov: "#f97316", // Orange - hr: "#eab308", // Yellow - it: "#22c55e", // Green - itsm: "#3b82f6", // Blue - qms: "#a855f7", // Purple -}; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/components/OnboardingTracker.tsx b/apps/app/src/app/(app)/[orgId]/components/OnboardingTracker.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/components/OnboardingTracker.tsx rename to apps/app/src/app/(app)/[orgId]/components/OnboardingTracker.tsx diff --git a/apps/app/src/app/(app)/[orgId]/controls/[controlId]/actions/delete-control.ts b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/actions/delete-control.ts new file mode 100644 index 0000000000..6488e96b3d --- /dev/null +++ b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/actions/delete-control.ts @@ -0,0 +1,69 @@ +"use server"; + +import { db } from "@comp/db"; +import { revalidatePath, revalidateTag } from "next/cache"; +import { z } from "zod"; +import { authActionClient } from "@/actions/safe-action"; + +const deleteControlSchema = z.object({ + id: z.string(), + entityId: z.string(), +}); + +export const deleteControlAction = authActionClient + .schema(deleteControlSchema) + .metadata({ + name: "delete-control", + track: { + event: "delete-control", + description: "Delete Control", + channel: "server", + }, + }) + .action(async ({ parsedInput, ctx }) => { + const { id } = parsedInput; + const { activeOrganizationId } = ctx.session; + + if (!activeOrganizationId) { + return { + success: false, + error: "Not authorized", + }; + } + + try { + const control = await db.control.findUnique({ + where: { + id, + organizationId: activeOrganizationId, + }, + }); + + if (!control) { + return { + success: false, + error: "Control not found", + }; + } + + // Delete the control + await db.control.delete({ + where: { id }, + }); + + // Revalidate paths to update UI + revalidatePath(`/${activeOrganizationId}/controls/all`); + revalidatePath(`/${activeOrganizationId}/controls`); + revalidateTag("controls"); + + return { + success: true, + }; + } catch (error) { + console.error(error); + return { + success: false, + error: "Failed to delete control", + }; + } + }); diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/ControlDeleteDialog.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/ControlDeleteDialog.tsx similarity index 96% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/ControlDeleteDialog.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/ControlDeleteDialog.tsx index 2723045ffd..9827ee337b 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/ControlDeleteDialog.tsx +++ b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/ControlDeleteDialog.tsx @@ -1,6 +1,6 @@ "use client"; -import { deleteControlAction } from "@/app/(app)/(dashboard)/[orgId]/controls/[controlId]/actions/delete-control"; +import { deleteControlAction } from "@/app/(app)/[orgId]/controls/[controlId]/actions/delete-control"; import { Control } from "@comp/db/types"; import { Button } from "@comp/ui/button"; import { diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/PoliciesTable.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/PoliciesTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/PoliciesTable.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/PoliciesTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/RequirementsTable.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/RequirementsTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/RequirementsTable.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/RequirementsTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/SingleControl.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/SingleControl.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/SingleControl.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/SingleControl.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/SingleControlSkeleton.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/SingleControlSkeleton.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/SingleControlSkeleton.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/SingleControlSkeleton.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/TasksTable.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/TasksTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/TasksTable.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/TasksTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTable.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTable.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTableColumns.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTableColumns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTableColumns.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTableColumns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTableHeader.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTableHeader.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTableHeader.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/components/table/ControlRequirementsTableHeader.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getControl.ts b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/data/getControl.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getControl.ts rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/data/getControl.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getOrganizationControlProgress.ts b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/data/getOrganizationControlProgress.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getOrganizationControlProgress.ts rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/data/getOrganizationControlProgress.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getRelatedPolicies.ts b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/data/getRelatedPolicies.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getRelatedPolicies.ts rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/data/getRelatedPolicies.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/loading.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/loading.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/page.tsx b/apps/app/src/app/(app)/[orgId]/controls/[controlId]/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/[controlId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/controls/[controlId]/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/components/controls-table-columns.tsx b/apps/app/src/app/(app)/[orgId]/controls/components/controls-table-columns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/components/controls-table-columns.tsx rename to apps/app/src/app/(app)/[orgId]/controls/components/controls-table-columns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/components/controls-table.tsx b/apps/app/src/app/(app)/[orgId]/controls/components/controls-table.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/components/controls-table.tsx rename to apps/app/src/app/(app)/[orgId]/controls/components/controls-table.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/data/queries.ts b/apps/app/src/app/(app)/[orgId]/controls/data/queries.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/data/queries.ts rename to apps/app/src/app/(app)/[orgId]/controls/data/queries.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/data/validations.ts b/apps/app/src/app/(app)/[orgId]/controls/data/validations.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/data/validations.ts rename to apps/app/src/app/(app)/[orgId]/controls/data/validations.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/layout.tsx b/apps/app/src/app/(app)/[orgId]/controls/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/layout.tsx rename to apps/app/src/app/(app)/[orgId]/controls/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/lib/utils.ts b/apps/app/src/app/(app)/[orgId]/controls/lib/utils.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/lib/utils.ts rename to apps/app/src/app/(app)/[orgId]/controls/lib/utils.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/loading.tsx b/apps/app/src/app/(app)/[orgId]/controls/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/loading.tsx rename to apps/app/src/app/(app)/[orgId]/controls/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/controls/page.tsx b/apps/app/src/app/(app)/[orgId]/controls/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/controls/page.tsx rename to apps/app/src/app/(app)/[orgId]/controls/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/error.tsx b/apps/app/src/app/(app)/[orgId]/error.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/error.tsx rename to apps/app/src/app/(app)/[orgId]/error.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/actions/delete-framework.ts b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/actions/delete-framework.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/actions/delete-framework.ts rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/actions/delete-framework.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkDeleteDialog.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkDeleteDialog.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkDeleteDialog.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkDeleteDialog.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkRequirements.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkRequirements.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkRequirements.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkRequirements.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTable.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTable.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTableColumns.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTableColumns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTableColumns.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTableColumns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTableHeader.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTableHeader.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTableHeader.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/table/FrameworkControlsTableHeader.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/loading.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/loading.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx similarity index 95% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx index 1e422baf3f..27dbe5059f 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx +++ b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx @@ -2,7 +2,7 @@ import { auth } from "@/utils/auth"; import { db } from "@comp/db"; import { headers } from "next/headers"; import { redirect } from "next/navigation"; -import PageWithBreadcrumb from "../../../../../../components/pages/PageWithBreadcrumb"; +import PageWithBreadcrumb from "../../../../../components/pages/PageWithBreadcrumb"; import { getSingleFrameworkInstanceWithControls } from "../data/getSingleFrameworkInstanceWithControls"; import { FrameworkOverview } from "./components/FrameworkOverview"; import { FrameworkRequirements } from "./components/FrameworkRequirements"; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/RequirementControls.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/RequirementControls.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/RequirementControls.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/RequirementControls.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTable.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTable.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTableColumns.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTableColumns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTableColumns.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTableColumns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/loading.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/loading.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/page.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/page.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/AddFrameworkModal.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/components/AddFrameworkModal.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/AddFrameworkModal.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/components/AddFrameworkModal.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/FrameworkCard.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/components/FrameworkCard.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/FrameworkCard.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/components/FrameworkCard.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/FrameworkList.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/components/FrameworkList.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/FrameworkList.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/components/FrameworkList.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/FrameworksOverview.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/components/FrameworksOverview.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/FrameworksOverview.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/components/FrameworksOverview.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/types.ts b/apps/app/src/app/(app)/[orgId]/frameworks/components/types.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/components/types.ts rename to apps/app/src/app/(app)/[orgId]/frameworks/components/types.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/data/getAllFrameworkInstancesWithControls.ts b/apps/app/src/app/(app)/[orgId]/frameworks/data/getAllFrameworkInstancesWithControls.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/data/getAllFrameworkInstancesWithControls.ts rename to apps/app/src/app/(app)/[orgId]/frameworks/data/getAllFrameworkInstancesWithControls.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/data/getFrameworkWithComplianceScores.ts b/apps/app/src/app/(app)/[orgId]/frameworks/data/getFrameworkWithComplianceScores.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/data/getFrameworkWithComplianceScores.ts rename to apps/app/src/app/(app)/[orgId]/frameworks/data/getFrameworkWithComplianceScores.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/data/getSingleFrameworkInstanceWithControls.ts b/apps/app/src/app/(app)/[orgId]/frameworks/data/getSingleFrameworkInstanceWithControls.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/data/getSingleFrameworkInstanceWithControls.ts rename to apps/app/src/app/(app)/[orgId]/frameworks/data/getSingleFrameworkInstanceWithControls.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/error.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/error.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/error.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/error.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/layout.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/layout.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/lib/utils.ts b/apps/app/src/app/(app)/[orgId]/frameworks/lib/utils.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/lib/utils.ts rename to apps/app/src/app/(app)/[orgId]/frameworks/lib/utils.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/loading.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/loading.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/page.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/page.tsx rename to apps/app/src/app/(app)/[orgId]/frameworks/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/types.ts b/apps/app/src/app/(app)/[orgId]/frameworks/types.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/frameworks/types.ts rename to apps/app/src/app/(app)/[orgId]/frameworks/types.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/integrations/layout.tsx b/apps/app/src/app/(app)/[orgId]/integrations/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/integrations/layout.tsx rename to apps/app/src/app/(app)/[orgId]/integrations/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/integrations/loading.tsx b/apps/app/src/app/(app)/[orgId]/integrations/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/integrations/loading.tsx rename to apps/app/src/app/(app)/[orgId]/integrations/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/integrations/page.tsx b/apps/app/src/app/(app)/[orgId]/integrations/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/integrations/page.tsx rename to apps/app/src/app/(app)/[orgId]/integrations/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/layout.tsx b/apps/app/src/app/(app)/[orgId]/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/layout.tsx rename to apps/app/src/app/(app)/[orgId]/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/page.tsx b/apps/app/src/app/(app)/[orgId]/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/get-employee-details.ts b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/get-employee-details.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/get-employee-details.ts rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/get-employee-details.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-department.ts b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/update-department.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-department.ts rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/update-department.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-employee-details.ts b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/update-employee-details.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-employee-details.ts rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/update-employee-details.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-employee-status.ts b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/update-employee-status.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-employee-status.ts rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/update-employee-status.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-employee.ts b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/update-employee.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/actions/update-employee.ts rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/actions/update-employee.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EditableDepartment.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EditableDepartment.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EditableDepartment.tsx rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EditableDepartment.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EditableDetails.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EditableDetails.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EditableDetails.tsx rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EditableDetails.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EditableStatus.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EditableStatus.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EditableStatus.tsx rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EditableStatus.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EmployeeDetails.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeDetails.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EmployeeDetails.tsx rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeDetails.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/layout.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/layout.tsx rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/page.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/types/index.ts b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/types/index.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/[employeeId]/types/index.ts rename to apps/app/src/app/(app)/[orgId]/people/[employeeId]/types/index.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts rename to apps/app/src/app/(app)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/bulkInviteMembers.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/bulkInviteMembers.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/bulkInviteMembers.ts rename to apps/app/src/app/(app)/[orgId]/people/all/actions/bulkInviteMembers.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/invalidateMembers.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/invalidateMembers.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/invalidateMembers.ts rename to apps/app/src/app/(app)/[orgId]/people/all/actions/invalidateMembers.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/removeMember.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/removeMember.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/removeMember.ts rename to apps/app/src/app/(app)/[orgId]/people/all/actions/removeMember.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/revokeInvitation.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/revokeInvitation.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/revokeInvitation.ts rename to apps/app/src/app/(app)/[orgId]/people/all/actions/revokeInvitation.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/updateMemberRole.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/updateMemberRole.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/actions/updateMemberRole.ts rename to apps/app/src/app/(app)/[orgId]/people/all/actions/updateMemberRole.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/InviteMembersModal.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/InviteMembersModal.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/InviteMembersModal.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/components/InviteMembersModal.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/MemberRow.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/MemberRow.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/MemberRow.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/components/MemberRow.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/MultiRoleCombobox.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/MultiRoleCombobox.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/MultiRoleCombobox.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/components/MultiRoleCombobox.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/MultiRoleComboboxContent.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/MultiRoleComboboxContent.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/MultiRoleComboboxContent.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/components/MultiRoleComboboxContent.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/MultiRoleComboboxTrigger.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/MultiRoleComboboxTrigger.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/MultiRoleComboboxTrigger.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/components/MultiRoleComboboxTrigger.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/PendingInvitationRow.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/PendingInvitationRow.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/PendingInvitationRow.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/components/PendingInvitationRow.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/TeamMembers.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/TeamMembers.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/TeamMembersClient.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembersClient.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/components/TeamMembersClient.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembersClient.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/loading.tsx b/apps/app/src/app/(app)/[orgId]/people/all/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/loading.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/page.tsx b/apps/app/src/app/(app)/[orgId]/people/all/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/all/page.tsx rename to apps/app/src/app/(app)/[orgId]/people/all/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/dashboard/components/EmployeeCompletionChart.tsx b/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeeCompletionChart.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/dashboard/components/EmployeeCompletionChart.tsx rename to apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeeCompletionChart.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/dashboard/components/EmployeesOverview.tsx b/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeesOverview.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/dashboard/components/EmployeesOverview.tsx rename to apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeesOverview.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/dashboard/page.tsx b/apps/app/src/app/(app)/[orgId]/people/dashboard/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/dashboard/page.tsx rename to apps/app/src/app/(app)/[orgId]/people/dashboard/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/layout.tsx b/apps/app/src/app/(app)/[orgId]/people/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/layout.tsx rename to apps/app/src/app/(app)/[orgId]/people/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/loading.tsx b/apps/app/src/app/(app)/[orgId]/people/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/loading.tsx rename to apps/app/src/app/(app)/[orgId]/people/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/page.tsx b/apps/app/src/app/(app)/[orgId]/people/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/page.tsx rename to apps/app/src/app/(app)/[orgId]/people/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/people/types.ts b/apps/app/src/app/(app)/[orgId]/people/types.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/people/types.ts rename to apps/app/src/app/(app)/[orgId]/people/types.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/components/policy-assignee-chart.tsx b/apps/app/src/app/(app)/[orgId]/policies/(overview)/components/policy-assignee-chart.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/components/policy-assignee-chart.tsx rename to apps/app/src/app/(app)/[orgId]/policies/(overview)/components/policy-assignee-chart.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/components/policy-status-chart.tsx b/apps/app/src/app/(app)/[orgId]/policies/(overview)/components/policy-status-chart.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/components/policy-status-chart.tsx rename to apps/app/src/app/(app)/[orgId]/policies/(overview)/components/policy-status-chart.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/layout.tsx b/apps/app/src/app/(app)/[orgId]/policies/(overview)/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/layout.tsx rename to apps/app/src/app/(app)/[orgId]/policies/(overview)/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/loading.tsx b/apps/app/src/app/(app)/[orgId]/policies/(overview)/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/loading.tsx rename to apps/app/src/app/(app)/[orgId]/policies/(overview)/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/page.tsx b/apps/app/src/app/(app)/[orgId]/policies/(overview)/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/(overview)/page.tsx rename to apps/app/src/app/(app)/[orgId]/policies/(overview)/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/actions/mapPolicyToControls.ts b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/actions/mapPolicyToControls.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/actions/mapPolicyToControls.ts rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/actions/mapPolicyToControls.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/actions/unmapPolicyFromControl.ts b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/actions/unmapPolicyFromControl.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/actions/unmapPolicyFromControl.ts rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/actions/unmapPolicyFromControl.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyActionDialog.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyActionDialog.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyActionDialog.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyActionDialog.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyArchiveSheet.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyArchiveSheet.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyArchiveSheet.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyArchiveSheet.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyControlMappingConfirmDeleteModal.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyControlMappingConfirmDeleteModal.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyControlMappingConfirmDeleteModal.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyControlMappingConfirmDeleteModal.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyControlMappingModal.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyControlMappingModal.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyControlMappingModal.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyControlMappingModal.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyControlMappings.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyControlMappings.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyControlMappings.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyControlMappings.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyDeleteDialog.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyDeleteDialog.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyDeleteDialog.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyDeleteDialog.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyOverview.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyOverview.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyOverview.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyOverview.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyOverviewSheet.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyOverviewSheet.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyOverviewSheet.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyOverviewSheet.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyPage.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyPage.tsx similarity index 95% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyPage.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyPage.tsx index 505ae08ee4..31f72cce3e 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/PolicyPage.tsx +++ b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyPage.tsx @@ -3,7 +3,7 @@ import { JSONContent } from "novel"; import { Comments, CommentWithAuthor, -} from "../../../../../../../components/comments/Comments"; +} from "../../../../../../components/comments/Comments"; import { AuditLogWithRelations } from "../data"; import { PolicyPageEditor } from "../editor/components/PolicyDetails"; import { PolicyOverview } from "./PolicyOverview"; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/RecentAuditLogs.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/RecentAuditLogs.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/RecentAuditLogs.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/RecentAuditLogs.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/SubmitApprovalDialog.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/SubmitApprovalDialog.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/SubmitApprovalDialog.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/SubmitApprovalDialog.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/UpdatePolicyOverview.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/UpdatePolicyOverview.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/components/UpdatePolicyOverview.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/UpdatePolicyOverview.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/data/index.ts b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/data/index.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/data/index.ts rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/data/index.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/actions/get-policy-details.ts b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/actions/get-policy-details.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/actions/get-policy-details.ts rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/actions/get-policy-details.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/actions/update-policy.ts b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/actions/update-policy.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/actions/update-policy.ts rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/actions/update-policy.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/components/PolicyDetails.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/components/PolicyDetails.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/components/PolicyDetails.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/components/PolicyDetails.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/components/PolicyHeader.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/components/PolicyHeader.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/components/PolicyHeader.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/components/PolicyHeader.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/types/index.ts b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/types/index.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/editor/types/index.ts rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/editor/types/index.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/layout.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/layout.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/page.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/[policyId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/policies/[policyId]/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/components/policies-table-columns.tsx b/apps/app/src/app/(app)/[orgId]/policies/all/components/policies-table-columns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/components/policies-table-columns.tsx rename to apps/app/src/app/(app)/[orgId]/policies/all/components/policies-table-columns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/components/policies-table.tsx b/apps/app/src/app/(app)/[orgId]/policies/all/components/policies-table.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/components/policies-table.tsx rename to apps/app/src/app/(app)/[orgId]/policies/all/components/policies-table.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/data/queries.ts b/apps/app/src/app/(app)/[orgId]/policies/all/data/queries.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/data/queries.ts rename to apps/app/src/app/(app)/[orgId]/policies/all/data/queries.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/data/validations.ts b/apps/app/src/app/(app)/[orgId]/policies/all/data/validations.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/data/validations.ts rename to apps/app/src/app/(app)/[orgId]/policies/all/data/validations.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/layout.tsx b/apps/app/src/app/(app)/[orgId]/policies/all/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/layout.tsx rename to apps/app/src/app/(app)/[orgId]/policies/all/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/loading.tsx b/apps/app/src/app/(app)/[orgId]/policies/all/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/loading.tsx rename to apps/app/src/app/(app)/[orgId]/policies/all/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/page.tsx b/apps/app/src/app/(app)/[orgId]/policies/all/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/policies/all/page.tsx rename to apps/app/src/app/(app)/[orgId]/policies/all/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/RisksTable.tsx b/apps/app/src/app/(app)/[orgId]/risk/(overview)/RisksTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/RisksTable.tsx rename to apps/app/src/app/(app)/[orgId]/risk/(overview)/RisksTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/components/table/RiskColumns.tsx b/apps/app/src/app/(app)/[orgId]/risk/(overview)/components/table/RiskColumns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/components/table/RiskColumns.tsx rename to apps/app/src/app/(app)/[orgId]/risk/(overview)/components/table/RiskColumns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/data/getRisks.ts b/apps/app/src/app/(app)/[orgId]/risk/(overview)/data/getRisks.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/data/getRisks.ts rename to apps/app/src/app/(app)/[orgId]/risk/(overview)/data/getRisks.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/data/validations.ts b/apps/app/src/app/(app)/[orgId]/risk/(overview)/data/validations.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/data/validations.ts rename to apps/app/src/app/(app)/[orgId]/risk/(overview)/data/validations.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/loading.tsx b/apps/app/src/app/(app)/[orgId]/risk/(overview)/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/loading.tsx rename to apps/app/src/app/(app)/[orgId]/risk/(overview)/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/page.tsx b/apps/app/src/app/(app)/[orgId]/risk/(overview)/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/page.tsx rename to apps/app/src/app/(app)/[orgId]/risk/(overview)/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/search-params.ts b/apps/app/src/app/(app)/[orgId]/risk/(overview)/search-params.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/(overview)/search-params.ts rename to apps/app/src/app/(app)/[orgId]/risk/(overview)/search-params.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx b/apps/app/src/app/(app)/[orgId]/risk/[riskId]/page.tsx similarity index 98% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/risk/[riskId]/page.tsx index ededf08278..cafebcfd38 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx +++ b/apps/app/src/app/(app)/[orgId]/risk/[riskId]/page.tsx @@ -12,7 +12,7 @@ import { cache } from "react"; import { Comments, CommentWithAuthor, -} from "../../../../../../components/comments/Comments"; +} from "../../../../../components/comments/Comments"; interface PageProps { searchParams: Promise<{ diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/page.tsx b/apps/app/src/app/(app)/[orgId]/risk/[riskId]/tasks/[taskId]/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/risk/[riskId]/tasks/[taskId]/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/search-params.ts b/apps/app/src/app/(app)/[orgId]/risk/[riskId]/tasks/search-params.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/search-params.ts rename to apps/app/src/app/(app)/[orgId]/risk/[riskId]/tasks/search-params.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/risk/layout.tsx b/apps/app/src/app/(app)/[orgId]/risk/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/risk/layout.tsx rename to apps/app/src/app/(app)/[orgId]/risk/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/components/CreateApiKeyDialog.tsx b/apps/app/src/app/(app)/[orgId]/settings/api-keys/components/CreateApiKeyDialog.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/components/CreateApiKeyDialog.tsx rename to apps/app/src/app/(app)/[orgId]/settings/api-keys/components/CreateApiKeyDialog.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/components/table/ApiKeysColumns.tsx b/apps/app/src/app/(app)/[orgId]/settings/api-keys/components/table/ApiKeysColumns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/components/table/ApiKeysColumns.tsx rename to apps/app/src/app/(app)/[orgId]/settings/api-keys/components/table/ApiKeysColumns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/components/table/ApiKeysTable.tsx b/apps/app/src/app/(app)/[orgId]/settings/api-keys/components/table/ApiKeysTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/components/table/ApiKeysTable.tsx rename to apps/app/src/app/(app)/[orgId]/settings/api-keys/components/table/ApiKeysTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/loading.tsx b/apps/app/src/app/(app)/[orgId]/settings/api-keys/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/loading.tsx rename to apps/app/src/app/(app)/[orgId]/settings/api-keys/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/page.tsx b/apps/app/src/app/(app)/[orgId]/settings/api-keys/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/api-keys/page.tsx rename to apps/app/src/app/(app)/[orgId]/settings/api-keys/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/ContextTable.tsx b/apps/app/src/app/(app)/[orgId]/settings/context-hub/ContextTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/ContextTable.tsx rename to apps/app/src/app/(app)/[orgId]/settings/context-hub/ContextTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/CreateContextSheet.tsx b/apps/app/src/app/(app)/[orgId]/settings/context-hub/components/CreateContextSheet.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/CreateContextSheet.tsx rename to apps/app/src/app/(app)/[orgId]/settings/context-hub/components/CreateContextSheet.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/context-form.tsx b/apps/app/src/app/(app)/[orgId]/settings/context-hub/components/context-form.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/context-form.tsx rename to apps/app/src/app/(app)/[orgId]/settings/context-hub/components/context-form.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/context-hub-list.tsx b/apps/app/src/app/(app)/[orgId]/settings/context-hub/components/context-hub-list.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/context-hub-list.tsx rename to apps/app/src/app/(app)/[orgId]/settings/context-hub/components/context-hub-list.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/context-list.tsx b/apps/app/src/app/(app)/[orgId]/settings/context-hub/components/context-list.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/context-list.tsx rename to apps/app/src/app/(app)/[orgId]/settings/context-hub/components/context-list.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/table/ContextColumns.tsx b/apps/app/src/app/(app)/[orgId]/settings/context-hub/components/table/ContextColumns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/components/table/ContextColumns.tsx rename to apps/app/src/app/(app)/[orgId]/settings/context-hub/components/table/ContextColumns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/data/getContextEntries.ts b/apps/app/src/app/(app)/[orgId]/settings/context-hub/data/getContextEntries.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/data/getContextEntries.ts rename to apps/app/src/app/(app)/[orgId]/settings/context-hub/data/getContextEntries.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/loading.tsx b/apps/app/src/app/(app)/[orgId]/settings/context-hub/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/loading.tsx rename to apps/app/src/app/(app)/[orgId]/settings/context-hub/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/page.tsx b/apps/app/src/app/(app)/[orgId]/settings/context-hub/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/context-hub/page.tsx rename to apps/app/src/app/(app)/[orgId]/settings/context-hub/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/layout.tsx b/apps/app/src/app/(app)/[orgId]/settings/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/layout.tsx rename to apps/app/src/app/(app)/[orgId]/settings/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/loading.tsx b/apps/app/src/app/(app)/[orgId]/settings/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/loading.tsx rename to apps/app/src/app/(app)/[orgId]/settings/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/page.tsx b/apps/app/src/app/(app)/[orgId]/settings/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/page.tsx rename to apps/app/src/app/(app)/[orgId]/settings/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/check-dns-record.ts b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/check-dns-record.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/check-dns-record.ts rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/check-dns-record.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/custom-domain.ts b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/custom-domain.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/custom-domain.ts rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/custom-domain.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/is-friendly-available.ts b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/is-friendly-available.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/is-friendly-available.ts rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/is-friendly-available.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/trust-portal-switch.ts b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/trust-portal-switch.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/trust-portal-switch.ts rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/trust-portal-switch.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/update-trust-portal-frameworks.ts b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/update-trust-portal-frameworks.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/update-trust-portal-frameworks.ts rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/actions/update-trust-portal-frameworks.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalDomain.tsx b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/TrustPortalDomain.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalDomain.tsx rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/TrustPortalDomain.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/components/logos.tsx b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/logos.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/components/logos.tsx rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/logos.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/loading.tsx b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/loading.tsx rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/page.tsx b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/settings/trust-portal/page.tsx rename to apps/app/src/app/(app)/[orgId]/settings/trust-portal/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/actions.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/actions.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/actions.ts rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/actions.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/actions/delete-task.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/actions/delete-task.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/actions/delete-task.ts rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/actions/delete-task.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/AttachmentItem.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/AttachmentItem.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/AttachmentItem.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/AttachmentItem.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/PropertySelector.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/PropertySelector.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/PropertySelector.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/PropertySelector.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/SingleTask.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx similarity index 96% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/SingleTask.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx index 2c25c5197f..1bc1dac00d 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/SingleTask.tsx +++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx @@ -2,7 +2,7 @@ import type { Attachment, Member, Task, User } from "@comp/db/types"; import { useMemo, useState } from "react"; -import { CommentWithAuthor } from "../../../../../../../components/comments/Comments"; +import { CommentWithAuthor } from "../../../../../../components/comments/Comments"; import { updateTask } from "../../actions/updateTask"; import { TaskDeleteDialog } from "./TaskDeleteDialog"; import { TaskMainContent } from "./TaskMainContent"; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/TaskBody.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskBody.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/TaskBody.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskBody.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/TaskDeleteDialog.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskDeleteDialog.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/TaskDeleteDialog.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskDeleteDialog.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/TaskMainContent.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskMainContent.tsx similarity index 88% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/TaskMainContent.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskMainContent.tsx index b32402ca2d..4e098b891a 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/TaskMainContent.tsx +++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskMainContent.tsx @@ -6,9 +6,9 @@ import { useEffect, useState } from "react"; import { useDebouncedCallback } from "use-debounce"; import { updateTask } from "../../actions/updateTask"; import { TaskBody } from "./TaskBody"; -import { CommentForm } from "../../../../../../../components/comments/CommentForm"; -import { CommentList } from "../../../../../../../components/comments/CommentList"; -import { CommentWithAuthor } from "../../../../../../../components/comments/Comments"; +import { CommentForm } from "../../../../../../components/comments/CommentForm"; +import { CommentList } from "../../../../../../components/comments/CommentList"; +import { CommentWithAuthor } from "../../../../../../components/comments/Comments"; interface TaskMainContentProps { task: Task & { fileUrls?: string[] }; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/commentUtils.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/commentUtils.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/commentUtils.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/commentUtils.tsx diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/constants.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/constants.ts new file mode 100644 index 0000000000..e7d9fc034b --- /dev/null +++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/constants.ts @@ -0,0 +1,40 @@ +import { Departments, TaskFrequency, TaskStatus } from "@comp/db/types"; + +// Define possible statuses based on the Prisma schema +export const taskStatuses: TaskStatus[] = [ + "todo", + "in_progress", + "done", + "not_relevant", +]; + +// Define possible frequencies +export const taskFrequencies: TaskFrequency[] = [ + "daily", + "weekly", + "monthly", + "quarterly", + "yearly", +]; + +// Define possible departments +export const taskDepartments: Departments[] = [ + "none", + "admin", + "gov", + "hr", + "it", + "itsm", + "qms", +]; + +// Define MAIN colors for Departments +export const DEPARTMENT_COLORS: Record = { + none: "#6b7280", // Gray + admin: "#14b8a6", // Teal + gov: "#f97316", // Orange + hr: "#eab308", // Yellow + it: "#22c55e", // Green + itsm: "#3b82f6", // Blue + qms: "#a855f7", // Purple +}; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/layout.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/layout.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/page.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/page.tsx similarity index 97% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/page.tsx index 082e4ef94f..b63ed7aa44 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/page.tsx +++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/page.tsx @@ -5,7 +5,7 @@ import { CommentEntityType, AttachmentEntityType } from "@comp/db/types"; import { headers } from "next/headers"; import { redirect } from "next/navigation"; import { SingleTask } from "./components/SingleTask"; -import { CommentWithAuthor } from "../../../../../../components/comments/Comments"; +import { CommentWithAuthor } from "../../../../../components/comments/Comments"; export default async function TaskPage({ params, diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/utils/attachmentUtils.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/utils/attachmentUtils.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/[taskId]/utils/attachmentUtils.ts rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/utils/attachmentUtils.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/actions/deleteTaskAttachment.ts b/apps/app/src/app/(app)/[orgId]/tasks/actions/deleteTaskAttachment.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/actions/deleteTaskAttachment.ts rename to apps/app/src/app/(app)/[orgId]/tasks/actions/deleteTaskAttachment.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/actions/getTaskAttachmentUrl.ts b/apps/app/src/app/(app)/[orgId]/tasks/actions/getTaskAttachmentUrl.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/actions/getTaskAttachmentUrl.ts rename to apps/app/src/app/(app)/[orgId]/tasks/actions/getTaskAttachmentUrl.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/actions/updateTask.ts b/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTask.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/actions/updateTask.ts rename to apps/app/src/app/(app)/[orgId]/tasks/actions/updateTask.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/actions/updateTaskOrder.ts b/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTaskOrder.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/actions/updateTaskOrder.ts rename to apps/app/src/app/(app)/[orgId]/tasks/actions/updateTaskOrder.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/StatusGroup.tsx b/apps/app/src/app/(app)/[orgId]/tasks/components/StatusGroup.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/StatusGroup.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/components/StatusGroup.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/TaskCard.tsx b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskCard.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/TaskCard.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/components/TaskCard.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/TaskFilterHeader.tsx b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskFilterHeader.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/TaskFilterHeader.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/components/TaskFilterHeader.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/TaskList.tsx b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskList.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/TaskList.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/components/TaskList.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/TaskStatusIndicator.tsx b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusIndicator.tsx similarity index 91% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/TaskStatusIndicator.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusIndicator.tsx index 52c17e6aa7..01f4118b25 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/components/TaskStatusIndicator.tsx +++ b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusIndicator.tsx @@ -1,6 +1,6 @@ import type { TaskStatus } from "@comp/db/types"; import { cn } from "@comp/ui/cn"; -import { Check, Circle, Loader2 } from "lucide-react"; +import { Check, Circle, CircleX, Loader2 } from "lucide-react"; import { STATUS_COLORS } from "@/components/status-indicator"; interface TaskStatusIndicatorProps { @@ -49,6 +49,9 @@ export function TaskStatusIndicator({ {status === "done" && ( )} + {status === "not_relevant" && ( + + )} ); } diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/loading.tsx b/apps/app/src/app/(app)/[orgId]/tasks/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/loading.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/page.tsx b/apps/app/src/app/(app)/[orgId]/tasks/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tasks/page.tsx rename to apps/app/src/app/(app)/[orgId]/tasks/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tests/(overview)/loading.tsx b/apps/app/src/app/(app)/[orgId]/tests/(overview)/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tests/(overview)/loading.tsx rename to apps/app/src/app/(app)/[orgId]/tests/(overview)/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tests/(overview)/page.tsx b/apps/app/src/app/(app)/[orgId]/tests/(overview)/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tests/(overview)/page.tsx rename to apps/app/src/app/(app)/[orgId]/tests/(overview)/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/actions/run-tests.ts b/apps/app/src/app/(app)/[orgId]/tests/dashboard/actions/run-tests.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/actions/run-tests.ts rename to apps/app/src/app/(app)/[orgId]/tests/dashboard/actions/run-tests.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/components/TestCard.tsx b/apps/app/src/app/(app)/[orgId]/tests/dashboard/components/TestCard.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/components/TestCard.tsx rename to apps/app/src/app/(app)/[orgId]/tests/dashboard/components/TestCard.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/components/TestsLayout.tsx b/apps/app/src/app/(app)/[orgId]/tests/dashboard/components/TestsLayout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/components/TestsLayout.tsx rename to apps/app/src/app/(app)/[orgId]/tests/dashboard/components/TestsLayout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/layout.tsx b/apps/app/src/app/(app)/[orgId]/tests/dashboard/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/layout.tsx rename to apps/app/src/app/(app)/[orgId]/tests/dashboard/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/page.tsx b/apps/app/src/app/(app)/[orgId]/tests/dashboard/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/tests/dashboard/page.tsx rename to apps/app/src/app/(app)/[orgId]/tests/dashboard/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/components/VendorColumns.tsx b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/components/VendorColumns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/components/VendorColumns.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/(overview)/components/VendorColumns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/components/VendorsTable.tsx b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/components/VendorsTable.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/components/VendorsTable.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/(overview)/components/VendorsTable.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/data/queries.ts b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/data/queries.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/data/queries.ts rename to apps/app/src/app/(app)/[orgId]/vendors/(overview)/data/queries.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/data/validations.ts b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/data/validations.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/data/validations.ts rename to apps/app/src/app/(app)/[orgId]/vendors/(overview)/data/validations.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/loading.tsx b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/loading.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/loading.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/(overview)/loading.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/page.tsx b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/(overview)/page.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/(overview)/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/schema.ts b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/schema.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/schema.ts rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/schema.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/revalidate-upload.ts b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/task/revalidate-upload.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/revalidate-upload.ts rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/task/revalidate-upload.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/update-task-action.ts b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/task/update-task-action.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/update-task-action.ts rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/task/update-task-action.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-action.ts b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/update-vendor-action.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-action.ts rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/update-vendor-action.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-inherent-risk.ts b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/update-vendor-inherent-risk.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-inherent-risk.ts rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/update-vendor-inherent-risk.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk.ts b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk.ts rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskChart.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskChart.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskChart.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskChart.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskSheet.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskSheet.tsx similarity index 94% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskSheet.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskSheet.tsx index 540557fea9..f9dff800ec 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskSheet.tsx +++ b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskSheet.tsx @@ -1,6 +1,6 @@ "use client"; -import { InherentRiskForm } from "@/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/InherentRiskForm"; +import { InherentRiskForm } from "@/app/(app)/[orgId]/vendors/[vendorId]/forms/risks/InherentRiskForm"; import { Button } from "@comp/ui/button"; import { Drawer, DrawerContent, DrawerTitle } from "@comp/ui/drawer"; import { useMediaQuery } from "@comp/ui/hooks"; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskChart.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskChart.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskChart.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskChart.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskForm.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskForm.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskForm.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskForm.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskSheet.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskSheet.tsx similarity index 94% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskSheet.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskSheet.tsx index 615e978bb5..aa0e788263 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskSheet.tsx +++ b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskSheet.tsx @@ -1,6 +1,6 @@ "use client"; -import { ResidualRiskForm } from "@/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/ResidualRiskForm"; +import { ResidualRiskForm } from "@/app/(app)/[orgId]/vendors/[vendorId]/forms/risks/ResidualRiskForm"; import type { Vendor } from "@comp/db/types"; import { Button } from "@comp/ui/button"; import { Drawer, DrawerContent, DrawerTitle } from "@comp/ui/drawer"; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/secondary-fields.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/secondary-fields/secondary-fields.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/secondary-fields.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/secondary-fields/secondary-fields.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/update-secondary-fields-form.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/secondary-fields/update-secondary-fields-form.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/update-secondary-fields-form.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/secondary-fields/update-secondary-fields-form.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-form.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-form.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-form.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-form.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-sheet.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-sheet.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-sheet.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-sheet.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/client-columns.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/client-columns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/client-columns.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/client-columns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/columns.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/columns.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/columns.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/columns.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/data-table.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/data-table.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/data-table.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/data-table.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/empty-states.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/empty-states.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/empty-states.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/empty-states.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/filter-toolbar.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/filter-toolbar.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/filter-toolbar.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/tasks/data-table/filter-toolbar.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/title-and-description.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/title-and-description/title-and-description.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/title-and-description.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/title-and-description/title-and-description.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-form.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-form.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-form.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-form.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-sheet.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-sheet.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-sheet.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-sheet.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/InherentRiskForm.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/forms/risks/InherentRiskForm.tsx similarity index 96% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/InherentRiskForm.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/forms/risks/InherentRiskForm.tsx index 5a3cb91609..26515477c4 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/InherentRiskForm.tsx +++ b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/forms/risks/InherentRiskForm.tsx @@ -1,6 +1,6 @@ "use client"; -import { updateVendorInherentRisk } from "@/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-inherent-risk"; +import { updateVendorInherentRisk } from "@/app/(app)/[orgId]/vendors/[vendorId]/actions/update-vendor-inherent-risk"; import { Button } from "@comp/ui/button"; import { Form, diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/ResidualRiskForm.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/forms/risks/ResidualRiskForm.tsx similarity index 96% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/ResidualRiskForm.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/forms/risks/ResidualRiskForm.tsx index 84b2cdb30b..3861fccf3d 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/ResidualRiskForm.tsx +++ b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/forms/risks/ResidualRiskForm.tsx @@ -1,6 +1,6 @@ "use client"; -import { updateVendorResidualRisk } from "@/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk"; +import { updateVendorResidualRisk } from "@/app/(app)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk"; import { Button } from "@comp/ui/button"; import { Form, diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/page.tsx similarity index 98% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/page.tsx index f11b30522b..d32dcc8a62 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx +++ b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/page.tsx @@ -14,7 +14,7 @@ import { cache } from "react"; import { Comments, CommentWithAuthor, -} from "../../../../../../components/comments/Comments"; +} from "../../../../../components/comments/Comments"; import { VendorInherentRiskChart } from "./components/VendorInherentRiskChart"; import { VendorResidualRiskChart } from "./components/VendorResidualRiskChart"; import { SecondaryFields } from "./components/secondary-fields/secondary-fields"; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/secondary-fields/secondary-fields.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/secondary-fields/secondary-fields.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/secondary-fields/secondary-fields.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/secondary-fields/secondary-fields.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/title/title.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/title/title.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/title/title.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/title/title.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/title/update-task-sheet.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/title/update-task-sheet.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/title/update-task-sheet.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/components/title/update-task-sheet.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/actions/create-vendor-action.ts b/apps/app/src/app/(app)/[orgId]/vendors/actions/create-vendor-action.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/actions/create-vendor-action.ts rename to apps/app/src/app/(app)/[orgId]/vendors/actions/create-vendor-action.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/actions/search-global-vendors-action.ts b/apps/app/src/app/(app)/[orgId]/vendors/actions/search-global-vendors-action.ts similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/actions/search-global-vendors-action.ts rename to apps/app/src/app/(app)/[orgId]/vendors/actions/search-global-vendors-action.ts diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/category-chart.tsx b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/category-chart.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/category-chart.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/category-chart.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/status-chart.tsx b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/status-chart.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/status-chart.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/status-chart.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/vendor-overview.tsx b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/vendor-overview.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/vendor-overview.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/vendor-overview.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/vendors-by-category.tsx b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/vendors-by-category.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/vendors-by-category.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/vendors-by-category.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/vendors-by-status.tsx b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/vendors-by-status.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/vendors-by-status.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/backup-overview/components/charts/vendors-by-status.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/layout.tsx b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/layout.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/backup-overview/layout.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/page.tsx b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/page.tsx similarity index 83% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/page.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/backup-overview/page.tsx index ba108efce1..e986d170dc 100644 --- a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/page.tsx +++ b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/page.tsx @@ -1,4 +1,4 @@ -import { VendorOverview } from "@/app/(app)/(dashboard)/[orgId]/vendors/backup-overview/components/charts/vendor-overview"; +import { VendorOverview } from "@/app/(app)/[orgId]/vendors/backup-overview/components/charts/vendor-overview"; import { getServersideSession } from "@/lib/get-session"; import type { Metadata } from "next"; import { headers } from "next/headers"; diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-form.tsx b/apps/app/src/app/(app)/[orgId]/vendors/components/create-vendor-form.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-form.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/components/create-vendor-form.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx b/apps/app/src/app/(app)/[orgId]/vendors/components/create-vendor-sheet.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/components/create-vendor-sheet.tsx diff --git a/apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/layout.tsx b/apps/app/src/app/(app)/[orgId]/vendors/layout.tsx similarity index 100% rename from apps/app/src/app/(app)/(dashboard)/[orgId]/vendors/layout.tsx rename to apps/app/src/app/(app)/[orgId]/vendors/layout.tsx diff --git a/apps/app/src/components/comments/CommentForm.tsx b/apps/app/src/components/comments/CommentForm.tsx index 50e28ef089..565d940784 100644 --- a/apps/app/src/components/comments/CommentForm.tsx +++ b/apps/app/src/components/comments/CommentForm.tsx @@ -13,7 +13,7 @@ import { useCallback, useEffect, useRef, useState } from "react"; import { toast } from "sonner"; import { useParams, useRouter } from "next/navigation"; import { createComment } from "@/actions/comments/createComment"; -import { AttachmentItem } from "../../app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/AttachmentItem"; +import { AttachmentItem } from "../../app/(app)/[orgId]/tasks/[taskId]/components/AttachmentItem"; import { Input } from "@comp/ui/input"; interface CommentFormProps { diff --git a/apps/app/src/components/comments/CommentItem.tsx b/apps/app/src/components/comments/CommentItem.tsx index 1fac17ba7f..e7d23a2b83 100644 --- a/apps/app/src/components/comments/CommentItem.tsx +++ b/apps/app/src/components/comments/CommentItem.tsx @@ -27,8 +27,8 @@ import { deleteComment } from "@/actions/comments/deleteComment"; import { deleteCommentAttachment } from "@/actions/comments/deleteCommentAttachment"; import { getCommentAttachmentUrl } from "@/actions/comments/getCommentAttachmentUrl"; // Import action import { updateComment } from "@/actions/comments/updateComment"; -import { AttachmentItem } from "../../app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/AttachmentItem"; -import { formatRelativeTime } from "../../app/(app)/(dashboard)/[orgId]/tasks/[taskId]/components/commentUtils"; // Revert import path +import { AttachmentItem } from "../../app/(app)/[orgId]/tasks/[taskId]/components/AttachmentItem"; +import { formatRelativeTime } from "../../app/(app)/[orgId]/tasks/[taskId]/components/commentUtils"; // Revert import path import { AttachmentEntityType } from "@comp/db/types"; // Import AttachmentEntityType import type { AttachmentType } from "@comp/db/types"; import type { CommentWithAuthor } from "./Comments"; diff --git a/apps/app/src/components/risks/charts/RisksAssignee.tsx b/apps/app/src/components/risks/charts/RisksAssignee.tsx index 0a4c0286e1..ee601434b1 100644 --- a/apps/app/src/components/risks/charts/RisksAssignee.tsx +++ b/apps/app/src/components/risks/charts/RisksAssignee.tsx @@ -45,13 +45,12 @@ export async function RisksAssignee() { email: member.user.email, image: member.user.image, }, - totalRisks: member.Risk.length, - openRisks: member.Risk.filter((risk) => risk.status === "open").length, - pendingRisks: member.Risk.filter((risk) => risk.status === "pending") + totalRisks: member.risks.length, + openRisks: member.risks.filter((risk) => risk.status === "open").length, + pendingRisks: member.risks.filter((risk) => risk.status === "pending") .length, - closedRisks: member.Risk.filter((risk) => risk.status === "closed") - .length, - archivedRisks: member.Risk.filter((risk) => risk.status === "archived") + closedRisks: member.risks.filter((risk) => risk.status === "closed").length, + archivedRisks: member.risks.filter((risk) => risk.status === "archived") .length, })); @@ -72,14 +71,10 @@ export async function RisksAssignee() { >
- + {getInitials( - stat.user.name || - stat.user.email || - "Unknown User", + stat.user.name || stat.user.email || "Unknown User", )} @@ -87,13 +82,10 @@ export async function RisksAssignee() {

- {stat.user.name || - stat.user.email || - "Unknown User"} + {stat.user.name || stat.user.email || "Unknown User"}

- {stat.totalRisks}{" "} - {"risks"} + {stat.totalRisks} {"risks"}
@@ -113,10 +105,9 @@ export async function RisksAssignee() {
@@ -150,8 +141,7 @@ export async function RisksAssignee() { className={`size-2 rounded-full ${riskStatusColors.open}`} /> - {"Open"}{" "} - ({stat.openRisks}) + {"Open"} ({stat.openRisks})
)} @@ -161,8 +151,7 @@ export async function RisksAssignee() { className={`size-2 rounded-full ${riskStatusColors.pending}`} /> - {"Pending"}{" "} - ({stat.pendingRisks}) + {"Pending"} ({stat.pendingRisks})
)} @@ -172,8 +161,7 @@ export async function RisksAssignee() { className={`size-2 rounded-full ${riskStatusColors.closed}`} /> - {"Closed"}{" "} - ({stat.closedRisks}) + {"Closed"} ({stat.closedRisks})
)} @@ -183,8 +171,7 @@ export async function RisksAssignee() { className={`size-2 rounded-full ${riskStatusColors.archived}`} /> - {"Archived"}{" "} - ({stat.archivedRisks}) + {"Archived"} ({stat.archivedRisks}) )} @@ -215,7 +202,7 @@ const userData = cache(async () => { }, select: { id: true, - Risk: { + risks: { where: { organizationId: session.session.activeOrganizationId, }, diff --git a/apps/app/src/components/status-indicator.tsx b/apps/app/src/components/status-indicator.tsx index ae8c42f4ec..c00a5b5792 100644 --- a/apps/app/src/components/status-indicator.tsx +++ b/apps/app/src/components/status-indicator.tsx @@ -23,6 +23,7 @@ export const STATUS_TYPES = [ // Task "todo", "done", + "not_relevant", ] as const; export type StatusType = (typeof STATUS_TYPES)[number]; @@ -46,6 +47,7 @@ export const STATUS_COLORS: Record = { // Warning / Needs Attention needs_review: "#ff0000", // Red not_started: "#ff0000", // Red + not_relevant: "#ff0000", // Red } as const; // Updated status translation mapping diff --git a/apps/app/src/components/tables/people/employee-status.tsx b/apps/app/src/components/tables/people/employee-status.tsx index 222fd6b895..9d94ddf478 100644 --- a/apps/app/src/components/tables/people/employee-status.tsx +++ b/apps/app/src/components/tables/people/employee-status.tsx @@ -1,4 +1,4 @@ -import { EMPLOYEE_STATUS_HEX_COLORS } from "@/app/(app)/(dashboard)/[orgId]/people/[employeeId]/components/EmployeeDetails"; +import { EMPLOYEE_STATUS_HEX_COLORS } from "@/app/(app)/[orgId]/people/[employeeId]/components/EmployeeDetails"; import { cn } from "@comp/ui/cn"; // Define employee status types diff --git a/packages/db/prisma/migrations/20250609130129_add_not_relevant/migration.sql b/packages/db/prisma/migrations/20250609130129_add_not_relevant/migration.sql new file mode 100644 index 0000000000..81f1f6d973 --- /dev/null +++ b/packages/db/prisma/migrations/20250609130129_add_not_relevant/migration.sql @@ -0,0 +1,2 @@ +-- AlterEnum +ALTER TYPE "TaskStatus" ADD VALUE 'not_relevant'; diff --git a/packages/db/prisma/schema/attachments.prisma b/packages/db/prisma/schema/attachments.prisma index dc6f8070a0..4b1acfe8c5 100644 --- a/packages/db/prisma/schema/attachments.prisma +++ b/packages/db/prisma/schema/attachments.prisma @@ -13,7 +13,7 @@ model Attachment { // Relationships organizationId String organization Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade) - Comment Comment? @relation(fields: [commentId], references: [id]) + comment Comment? @relation(fields: [commentId], references: [id]) commentId String? @@index([entityId, entityType]) diff --git a/packages/db/prisma/schema/auth.prisma b/packages/db/prisma/schema/auth.prisma index 78c72fed6a..de9925552d 100644 --- a/packages/db/prisma/schema/auth.prisma +++ b/packages/db/prisma/schema/auth.prisma @@ -86,11 +86,11 @@ model Member { assignedPolicies Policy[] @relation("PolicyAssignee") // Policies where this member is an assignee approvedPolicies Policy[] @relation("PolicyApprover") // Policies where this member is an approver - Risk Risk[] - Task Task[] - Vendor Vendor[] + risks Risk[] + tasks Task[] + vendors Vendor[] comments Comment[] - auditLog AuditLog[] + auditLogs AuditLog[] } model Invitation { diff --git a/packages/db/prisma/schema/task.prisma b/packages/db/prisma/schema/task.prisma index 8154b620f7..9eb3e27a22 100644 --- a/packages/db/prisma/schema/task.prisma +++ b/packages/db/prisma/schema/task.prisma @@ -29,6 +29,7 @@ enum TaskStatus { todo in_progress done + not_relevant } enum TaskFrequency {