Merge branch 'refs/heads/feat/dokku' into production

# Conflicts: # frontend/app/layout.tsx
2024-07-31 18:18:38 -07:00
parent 8c3e40975e d0a9c8548c
commit e8a3944b9e
23 changed files with 1443 additions and 347 deletions
--- a/frontend/app/layout.tsx
+++ b/frontend/app/layout.tsx
@ -6,7 +6,8 @@ import { ThemeProvider } from "@/components/layout/themeProvider"
 import { ClerkProvider } from "@clerk/nextjs"
 import { Toaster } from "@/components/ui/sonner"
 import { Analytics } from "@vercel/analytics/react"
-import { PHProvider } from "./providers"
+import { TerminalProvider } from '@/context/TerminalContext';
+import { PreviewProvider } from "@/context/PreviewContext"

 export const metadata: Metadata = {
  title: "Sandbox",
@ -21,21 +22,23 @@ export default function RootLayout({
  return (
    <ClerkProvider>
      <html lang="en" className={`${GeistSans.variable} ${GeistMono.variable}`}>
-        <PHProvider>
-          <body>
-            <ThemeProvider
-              attribute="class"
-              defaultTheme="dark"
-              forcedTheme="dark"
-              disableTransitionOnChange
-            >
-              {children}
-              <Analytics />
-              <Toaster position="bottom-left" richColors />
-            </ThemeProvider>
-          </body>
-        </PHProvider>
+        <body>
+          <ThemeProvider
+            attribute="class"
+            defaultTheme="dark"
+            forcedTheme="dark"
+            disableTransitionOnChange
+          >
+            <PreviewProvider>
+            <TerminalProvider>
+            {children}
+            </TerminalProvider>
+            </PreviewProvider>
+            <Analytics />
+            <Toaster position="bottom-left" richColors />
+          </ThemeProvider>
+        </body>
      </html>
    </ClerkProvider>
  )
-}
+}