Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import "./globals.css";
import { getServerSession } from "next-auth";
import SessionProvider from "@/utils/SessionProvider";

import Navbar from "@/components/Navbar";
import Footer from "@/components/Footer";
import { cookies } from "next/headers";
import Script from "next/script";
import AppThemeProvider from "@/components/theme";
import AnalyticsProvider from "@/utils/AnalyticsProvider";
import { Toaster } from "@/components/ui/sonner";
import { cn } from "@/lib/utils";

const geist = Geist({subsets:['latin'],variable:'--font-sans'});
const geist = Geist({ subsets: ['latin'], variable: '--font-sans' });

const popins = Poppins({
weight: '500',
Expand All @@ -34,29 +34,29 @@ export default async function RootLayout({ children }) {
return (
<html className={cn(theme, "font-sans", geist.variable)} lang="en" style={theme !== "system" ? { colorScheme: theme } : {}} suppressHydrationWarning>
<body className={popins.className}>
<AppThemeProvider
attribute="class"
defaultTheme={theme}
enableSystem
>
<SessionProvider session={session}>
{/* <Navbar activeTab={"profile"} /> */}
<div className=" mx-auto min-h-screen">
{children}

</div>
<Footer />
<Toaster />
</SessionProvider>
</AppThemeProvider>

{process.env.E2E_TEST !== "1" && (
<Script
src="https://challenges.cloudflare.com/turnstile/v0/api.js"
strategy="afterInteractive"
/>
)}
<AppThemeProvider
attribute="class"
defaultTheme={theme}
enableSystem
>
<SessionProvider session={session}>
{/* <Navbar activeTab={"profile"} /> */}
<div className=" mx-auto min-h-screen">
{children}
</div>
<Footer />
<Toaster />
</SessionProvider>
</AppThemeProvider>

{process.env.E2E_TEST !== "1" && (
<Script
src="https://challenges.cloudflare.com/turnstile/v0/api.js"
strategy="afterInteractive"
/>
)}
</body>
<AnalyticsProvider />
</html>
);
}
2 changes: 1 addition & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const securityHeaders = [
{
key: 'Content-Security-Policy',
value: "default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline' https://challenges.cloudflare.com; style-src 'self' 'unsafe-inline'; img-src 'self' data: blob: https://getlancer.1a3c2f86a3386038e3a37e793a2777b5.r2.cloudflarestorage.com; font-src 'self' data:; connect-src 'self' https://challenges.cloudflare.com https://firestore.googleapis.com https://*.googleapis.com https://*.firebaseio.com https://*.firebaseapp.com https://www.google-analytics.com https://region1.google-analytics.com https://analytics.google.com https://firebaselogging.googleapis.com; frame-src 'self' https://challenges.cloudflare.com; object-src 'none'; base-uri 'self';",
value: "default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline' https://challenges.cloudflare.com https://www.googletagmanager.com/gtag/js; style-src 'self' 'unsafe-inline'; img-src 'self' data: blob: https://getlancer.1a3c2f86a3386038e3a37e793a2777b5.r2.cloudflarestorage.com; font-src 'self' data:; connect-src 'self' https://challenges.cloudflare.com https://firestore.googleapis.com https://*.googleapis.com https://*.firebaseio.com https://*.firebaseapp.com https://www.google-analytics.com https://region1.google-analytics.com https://analytics.google.com https://firebaselogging.googleapis.com; frame-src 'self' https://challenges.cloudflare.com; object-src 'none'; base-uri 'self';",
},
{
key: 'Cross-Origin-Opener-Policy',
Expand Down
Loading
Loading