Theme

midday-ai · Dec 2, 2023 · 808477b · 808477b
1 parent 6e3edd6
commit 808477b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 35 deletions.
diff --git a/apps/dashboard/next.config.mjs b/apps/dashboard/next.config.mjs
@@ -22,7 +22,7 @@ const config = {
       },
     ],
   },
-  transpilePackages: ["@midday/ui", "@midday/jobs"],
+  transpilePackages: ["@midday/ui", "@midday/jobs", "@midday/tailwind"],
   eslint: {
     ignoreDuringBuilds: true,
   },

diff --git a/apps/dashboard/src/app/layout.tsx b/apps/dashboard/src/app/layout.tsx
@@ -3,7 +3,6 @@ import { ThemeProvider } from "@/components/theme-provider";
 import "@/styles/globals.css";
 import "@midday/ui/globals.css";
 import { Toaster } from "@midday/ui/toaster";
-import { cn } from "@midday/ui/utils";
 import type { Metadata } from "next";
 import { Instrument_Sans } from "next/font/google";
 import { type ReactElement, Suspense } from "react";
@@ -25,13 +24,8 @@ export const metadata: Metadata = {
 export default function Layout({ children }: { children: ReactElement }) {
   return (
     <html lang="en" suppressHydrationWarning>
-      <body className={cn(fontSans.variable, "bg-background")}>
-        <ThemeProvider
-          attribute="class"
-          defaultTheme="system"
-          enableSystem
-          disableTransitionOnChange
-        >
+      <body className={fontSans.variable}>
+        <ThemeProvider attribute="class">
           {children}
           <Toaster />
         </ThemeProvider>

diff --git a/apps/website/next.config.mjs b/apps/website/next.config.mjs
@@ -1,7 +1,7 @@
 /** @type {import("next").NextConfig} */
 const config = {
   reactStrictMode: true,
-  transpilePackages: ["@midday/ui", "@midday/tailwind", "@midday/location"],
+  transpilePackages: ["@midday/ui", "@midday/tailwind"],
   experimental: {
     // ppr: true,
   },

diff --git a/apps/website/src/app/[locale]/layout.tsx b/apps/website/src/app/[locale]/layout.tsx
@@ -4,6 +4,9 @@ import { Provider } from "./provider";
 export default function Layout({
   params: { locale },
   children,
-}: { params: { locale: string }; children: ReactNode }) {
+}: {
+  params: { locale: string };
+  children: ReactNode;
+}) {
   return <Provider locale={locale}>{children}</Provider>;
 }
diff --git a/apps/website/src/app/[locale]/page.tsx b/apps/website/src/app/[locale]/page.tsx
@@ -1,17 +1,5 @@
 import { StartPage } from "@/components/startpage";
-import { getStaticParams } from "@/locales/server";
-import { setStaticParamsLocale } from "next-international/server";
-
-export function generateStaticParams() {
-  return getStaticParams();
-}
-
-export default function Page({
-  params: { locale },
-}: {
-  params: { locale: string };
-}) {
-  setStaticParamsLocale(locale);
 
+export default function Page() {
   return <StartPage />;
 }
diff --git a/apps/website/src/app/layout.tsx b/apps/website/src/app/layout.tsx
@@ -24,17 +24,8 @@ export const metadata: Metadata = {
 export default function Layout({ children }: { children: ReactElement }) {
   return (
     <html lang="en" suppressHydrationWarning>
-      <body
-        className={cn(fontSans.variable, "bg-background whitespace-pre-line")}
-      >
-        <ThemeProvider
-          attribute="class"
-          defaultTheme="system"
-          enableSystem
-          disableTransitionOnChange
-        >
-          {children}
-        </ThemeProvider>
+      <body className={cn(fontSans.variable, "whitespace-pre-line")}>
+        <ThemeProvider attribute="class">{children}</ThemeProvider>
         <Analytics />
       </body>
     </html>

diff --git a/apps/website/src/components/theme-provider.tsx b/apps/website/src/components/theme-provider.tsx
@@ -2,6 +2,7 @@
 
 import { ThemeProvider as NextThemesProvider } from "next-themes";
 import * as React from "react";
+
 type ThemeProviderProps = Parameters<typeof NextThemesProvider>[0];
 
 export function ThemeProvider({ children, ...props }: ThemeProviderProps) {