fix: instance admin layout

admin/app/ai/layout.tsx

@@ -1,9 +1,11 @@
-"use client";
-
 import { ReactNode } from "react";
-// layouts
+import { Metadata } from "next";
 import { AdminLayout } from "@/layouts/admin-layout";
 
+export const metadata: Metadata = {
+  title: "AI Settings - God Mode",
+};
+
 export default function AILayout({ children }: { children: ReactNode }) {
   return <AdminLayout>{children}</AdminLayout>;
 }

admin/app/authentication/layout.tsx

@@ -1,9 +1,11 @@
-"use client";
-
 import { ReactNode } from "react";
-// layouts
+import { Metadata } from "next";
 import { AdminLayout } from "@/layouts/admin-layout";
 
+export const metadata: Metadata = {
+  title: "Authentication Settings - God Mode",
+};
+
 export default function AuthenticationLayout({ children }: { children: ReactNode }) {
   return <AdminLayout>{children}</AdminLayout>;
 }

admin/app/email/layout.tsx

@@ -1,13 +1,15 @@
-"use client";
-
 import { ReactNode } from "react";
-// layouts
+import { Metadata } from "next";
 import { AdminLayout } from "@/layouts/admin-layout";
 
 interface EmailLayoutProps {
   children: ReactNode;
 }
 
+export const metadata: Metadata = {
+  title: "Email Settings - God Mode",
+};
+
 const EmailLayout = ({ children }: EmailLayoutProps) => <AdminLayout>{children}</AdminLayout>;
 
 export default EmailLayout;

admin/app/general/form.tsx

@@ -13,7 +13,7 @@ import { ControllerInput } from "@/components/common";
 import { useInstance } from "@/hooks/store";
 
 export interface IGeneralConfigurationForm {
-  instance: IInstance["instance"];
+  instance: IInstance;
   instanceAdmins: IInstanceAdmin[];
 }
 
@@ -26,15 +26,15 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
     handleSubmit,
     control,
     formState: { errors, isSubmitting },
-  } = useForm<Partial<IInstance["instance"]>>({
+  } = useForm<Partial<IInstance>>({
     defaultValues: {
       instance_name: instance?.instance_name,
       is_telemetry_enabled: instance?.is_telemetry_enabled,
     },
   });
 
-  const onSubmit = async (formData: Partial<IInstance["instance"]>) => {
-    const payload: Partial<IInstance["instance"]> = { ...formData };
+  const onSubmit = async (formData: Partial<IInstance>) => {
+    const payload: Partial<IInstance> = { ...formData };
 
     console.log("payload", payload);
 

admin/app/general/layout.tsx

@@ -1,6 +1,5 @@
 import { ReactNode } from "react";
 import { Metadata } from "next";
-// components
 import { AdminLayout } from "@/layouts/admin-layout";
 
 export const metadata: Metadata = {

admin/app/general/page.tsx

@@ -7,7 +7,7 @@ import { GeneralConfigurationForm } from "./form";
 
 function GeneralPage() {
   const { instance, instanceAdmins } = useInstance();
-  console.log("instance", instanceAdmins);
+  console.log("instance", instance);
   return (
     <>
       <div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
@@ -19,8 +19,8 @@ function GeneralPage() {
           </div>
         </div>
         <div className="flex-grow overflow-hidden overflow-y-auto">
-          {instance?.instance && instanceAdmins && (
-            <GeneralConfigurationForm instance={instance.instance} instanceAdmins={instanceAdmins} />
+          {instance && instanceAdmins && (
+            <GeneralConfigurationForm instance={instance} instanceAdmins={instanceAdmins} />
           )}
         </div>
       </div>

admin/app/image/layout.tsx

@@ -1,11 +1,15 @@
 import { ReactNode } from "react";
-// layouts
+import { Metadata } from "next";
 import { AdminLayout } from "@/layouts/admin-layout";
 
 interface ImageLayoutProps {
   children: ReactNode;
 }
 
+export const metadata: Metadata = {
+  title: "Images Settings - God Mode",
+};
+
 const ImageLayout = ({ children }: ImageLayoutProps) => <AdminLayout>{children}</AdminLayout>;
 
 export default ImageLayout;

admin/app/layout.tsx

@@ -1,40 +1,20 @@
+"use client";
+
 import { ReactNode } from "react";
-import { Metadata } from "next";
-// components
-import { InstanceFailureView, InstanceSetupForm } from "@/components/instance";
+import { ThemeProvider } from "next-themes";
+import { SWRConfig } from "swr";
+// constants
+import { SWR_CONFIG } from "@/constants/swr-config";
 // helpers
 import { ASSET_PREFIX } from "@/helpers/common.helper";
-// layout
-import { DefaultLayout } from "@/layouts/default-layout";
 // lib
-import { AppProvider } from "@/lib/app-providers";
+import { InstanceProvider } from "@/lib/instance-provider";
+import { StoreProvider } from "@/lib/store-provider";
+import { UserProvider } from "@/lib/user-provider";
 // styles
 import "./globals.css";
-// services
-import { InstanceService } from "@/services/instance.service";
-
-const instanceService = new InstanceService();
-
-export const metadata: Metadata = {
-  title: "Plane | Simple, extensible, open-source project management tool.",
-  description:
-    "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.",
-  openGraph: {
-    title: "Plane | Simple, extensible, open-source project management tool.",
-    description:
-      "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.",
-    url: "https://plane.so/",
-  },
-  keywords:
-    "software development, customer feedback, software, accelerate, code management, release management, project management, issue tracking, agile, scrum, kanban, collaboration",
-  twitter: {
-    site: "@planepowers",
-  },
-};
-
-export default async function RootLayout({ children }: { children: ReactNode }) {
-  const instanceDetails = await instanceService.getInstanceInfo().catch(() => null);
 
+function RootLayout({ children }: { children: ReactNode }) {
   return (
     <html lang="en">
       <head>
@@ -45,28 +25,18 @@ export default async function RootLayout({ children }: { children: ReactNode })
         <link rel="shortcut icon" href={`${ASSET_PREFIX}/favicon/favicon.ico`} />
       </head>
       <body className={`antialiased`}>
-        <AppProvider initialState={{ instance: instanceDetails }}>
-          {instanceDetails ? (
-            <>
-              {instanceDetails?.instance?.is_setup_done ? (
-                <>{children}</>
-              ) : (
-                <DefaultLayout>
-                  <div className="relative w-screen min-h-screen overflow-y-auto px-5 py-10 mx-auto flex justify-center items-center">
-                    <InstanceSetupForm />
-                  </div>
-                </DefaultLayout>
-              )}
-            </>
-          ) : (
-            <DefaultLayout>
-              <div className="relative w-screen min-h-[500px] overflow-y-auto px-5 mx-auto flex justify-center items-center">
-                <InstanceFailureView />
-              </div>
-            </DefaultLayout>
-          )}
-        </AppProvider>
+        <ThemeProvider themes={["light", "dark"]} defaultTheme="system" enableSystem>
+          <SWRConfig value={SWR_CONFIG}>
+            <StoreProvider>
+              <InstanceProvider>
+                <UserProvider>{children}</UserProvider>
+              </InstanceProvider>
+            </StoreProvider>
+          </SWRConfig>
+        </ThemeProvider>
       </body>
     </html>
   );
 }
+
+export default RootLayout;

admin/app/page.tsx

@@ -1,7 +1,26 @@
+import { Metadata } from "next";
+// components
 import { InstanceSignInForm } from "@/components/login";
 // layouts
 import { DefaultLayout } from "@/layouts/default-layout";
 
+export const metadata: Metadata = {
+  title: "Plane | Simple, extensible, open-source project management tool.",
+  description:
+    "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.",
+  openGraph: {
+    title: "Plane | Simple, extensible, open-source project management tool.",
+    description:
+      "Open-source project management tool to manage issues, sprints, and product roadmaps with peace of mind.",
+    url: "https://plane.so/",
+  },
+  keywords:
+    "software development, customer feedback, software, accelerate, code management, release management, project management, issue tracking, agile, scrum, kanban, collaboration",
+  twitter: {
+    site: "@planepowers",
+  },
+};
+
 export default async function LoginPage() {
   return (
     <DefaultLayout>