diff --git a/ui/app/(prowler)/categories/page.tsx b/ui/app/(prowler)/categories/page.tsx
deleted file mode 100644
index 1a5650d8af..0000000000
--- a/ui/app/(prowler)/categories/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Spacer } from "@nextui-org/react";
-
-import { Header } from "@/components/ui";
-
-export default async function Categories() {
- return (
- <>
-
-
- >
- );
-}
diff --git a/ui/app/(prowler)/compliance/page.tsx b/ui/app/(prowler)/compliance/page.tsx
index ce5fe18e5d..22164bbcc3 100644
--- a/ui/app/(prowler)/compliance/page.tsx
+++ b/ui/app/(prowler)/compliance/page.tsx
@@ -10,7 +10,7 @@ import {
ComplianceSkeletonGrid,
} from "@/components/compliance";
import { DataCompliance } from "@/components/compliance/data-compliance";
-import { Header } from "@/components/ui";
+import { ContentLayout } from "@/components/ui";
import { ComplianceOverviewData, SearchParamsProps } from "@/types";
export default async function Compliance({
@@ -80,15 +80,13 @@ export default async function Compliance({
}
return (
- <>
-
-
+
}>
- >
+
);
}
diff --git a/ui/app/(prowler)/findings/page.tsx b/ui/app/(prowler)/findings/page.tsx
index 0c9b170ddd..9fa50fc115 100644
--- a/ui/app/(prowler)/findings/page.tsx
+++ b/ui/app/(prowler)/findings/page.tsx
@@ -11,7 +11,7 @@ import {
ColumnFindings,
SkeletonTableFindings,
} from "@/components/findings/table";
-import { Header } from "@/components/ui";
+import { ContentLayout } from "@/components/ui";
import { DataTable, DataTableFilterCustom } from "@/components/ui/table";
import { createDict } from "@/lib";
import {
@@ -101,10 +101,7 @@ export default async function Findings({
completedScans?.map((scan: ScanProps) => scan.id) || [];
return (
- <>
-
-
-
+
}>
- >
+
);
}
diff --git a/ui/app/(prowler)/integrations/page.tsx b/ui/app/(prowler)/integrations/page.tsx
index a930f1ed36..3760cae57e 100644
--- a/ui/app/(prowler)/integrations/page.tsx
+++ b/ui/app/(prowler)/integrations/page.tsx
@@ -1,13 +1,11 @@
import React from "react";
-import { Header } from "@/components/ui";
+import { ContentLayout } from "@/components/ui";
export default function Integrations() {
return (
- <>
-
-
-
Hi hi from Integration page
- >
+
+ Integrations
+
);
}
diff --git a/ui/app/(prowler)/invitations/page.tsx b/ui/app/(prowler)/invitations/page.tsx
index e9cc2a8cb0..b51a315d15 100644
--- a/ui/app/(prowler)/invitations/page.tsx
+++ b/ui/app/(prowler)/invitations/page.tsx
@@ -10,7 +10,7 @@ import {
ColumnsInvitation,
SkeletonTableInvitation,
} from "@/components/invitations/table";
-import { Header } from "@/components/ui";
+import { ContentLayout } from "@/components/ui";
import { DataTable, DataTableFilterCustom } from "@/components/ui/table";
import { InvitationProps, Role, SearchParamsProps } from "@/types";
@@ -22,9 +22,7 @@ export default async function Invitations({
const searchParamsKey = JSON.stringify(searchParams || {});
return (
- <>
-
-
+
@@ -35,7 +33,7 @@ export default async function Invitations({
}>
- >
+
);
}
diff --git a/ui/app/(prowler)/layout.tsx b/ui/app/(prowler)/layout.tsx
index 2d74472428..ff931d8f19 100644
--- a/ui/app/(prowler)/layout.tsx
+++ b/ui/app/(prowler)/layout.tsx
@@ -1,10 +1,10 @@
import "@/styles/globals.css";
import { Metadata, Viewport } from "next";
-import React, { use } from "react";
+import React from "react";
-import { getProfileInfo } from "@/actions/users/users";
-import { SidebarWrap, Toaster } from "@/components/ui";
+import MainLayout from "@/components/ui/main-layout/main-layout";
+import { Toaster } from "@/components/ui/toast";
import { fontSans } from "@/config/fonts";
import { siteConfig } from "@/config/site";
import { cn } from "@/lib/utils";
@@ -34,8 +34,6 @@ export default function RootLayout({
}: {
children: React.ReactNode;
}) {
- const user = use(getProfileInfo());
-
return (