From e8182fc943a44af99b0af27323eeb440b4128eed Mon Sep 17 00:00:00 2001 From: Alma Date: Tue, 8 Apr 2025 17:59:33 +0200 Subject: [PATCH] Iframe Correction --- app/layout.tsx | 33 ++++++++++++++++---------- components/crm/crm-frame.tsx | 12 ++++++++++ components/flow/flow-frame.tsx | 14 +++++------ components/gitlab/gitlab-frame.tsx | 16 ++++++------- components/shared/iframe-container.tsx | 20 ++++++++++++++++ 5 files changed, 66 insertions(+), 29 deletions(-) create mode 100644 components/crm/crm-frame.tsx create mode 100644 components/shared/iframe-container.tsx diff --git a/app/layout.tsx b/app/layout.tsx index cbf2d066..271723fc 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -6,6 +6,10 @@ import { getServerSession } from "next-auth/next"; import { authOptions } from "@/app/api/auth/[...nextauth]/route"; import { Providers } from "@/components/providers"; import { LayoutWrapper } from "@/components/layout/layout-wrapper"; +import { Navbar } from "@/components/navbar"; +import { ThemeProvider } from "@/components/theme-provider"; +import { Toaster } from "@/components/ui/toaster"; +import { redirect } from "next/navigation"; const inter = Inter({ subsets: ["latin"] }); @@ -15,21 +19,26 @@ export default async function RootLayout({ children: React.ReactNode; }) { const session = await getServerSession(authOptions); - const headersList = headers(); - const pathname = headersList.get("x-pathname") || ""; - const isSignInPage = pathname === "/signin"; + + if (!session) { + redirect("/signin"); + } return ( - - - - + + + +
+ {children} - - +
+ + ); diff --git a/components/crm/crm-frame.tsx b/components/crm/crm-frame.tsx new file mode 100644 index 00000000..26a9e2f1 --- /dev/null +++ b/components/crm/crm-frame.tsx @@ -0,0 +1,12 @@ +"use client"; + +import { IframeContainer } from "@/components/shared/iframe-container"; + +export function CrmFrame() { + return ( + + ); +} \ No newline at end of file diff --git a/components/flow/flow-frame.tsx b/components/flow/flow-frame.tsx index 4b3da7c0..4095a1a3 100644 --- a/components/flow/flow-frame.tsx +++ b/components/flow/flow-frame.tsx @@ -1,14 +1,12 @@ "use client"; +import { IframeContainer } from "@/components/shared/iframe-container"; + export function FlowFrame() { return ( -
-