feat: clean up (#519)

* feat: clean up * fix: cloud credentials validation * chore: linting
konstructio · Nov 13, 2024 · 96dda0d · 96dda0d
1 parent 748b791
commit 96dda0d
Show file tree

Hide file tree

Showing 165 changed files with 132 additions and 10,532 deletions.
diff --git a/app/auth/signin/page.tsx b/app/auth/signin/page.tsx
diff --git a/app/auth/signin/signin.styled.ts b/app/auth/signin/signin.styled.ts
diff --git a/app/dashboard/applications/page.tsx b/app/dashboard/applications/page.tsx
diff --git a/app/dashboard/cluster-management/page.tsx b/app/dashboard/cluster-management/page.tsx
diff --git a/app/dashboard/environments/page.tsx b/app/dashboard/environments/page.tsx
diff --git a/app/dashboard/layout.tsx b/app/dashboard/layout.tsx
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,11 +1,9 @@
 import React, { PropsWithChildren } from 'react';
-import { getServerSession } from 'next-auth/next';
-import { Session } from 'next-auth';
 
 import { Providers } from '@/app/lib/providers';
 import StyledComponentsRegistry from '@/app/lib/registry';
-import { authOptions } from '@/pages/api/auth/[...nextauth]';
-
+import { Layout } from '@/containers/Layout/Layout';
+import { getEnvVars, getFeatureFlags } from '@/app/lib/common';
 import '../styles/globals.css';
 
 export const metadata = {
@@ -20,13 +18,18 @@ export const metadata = {
 };
 
 export default async function RootLayout({ children }: PropsWithChildren) {
-  const session = await getServerSession<typeof authOptions, Session>(authOptions);
+  const envVariables = await getEnvVars();
+  const featureFlags = await getFeatureFlags();
 
   return (
     <html lang="en">
       <body suppressHydrationWarning={true}>
-        <Providers session={session}>
-          <StyledComponentsRegistry>{children}</StyledComponentsRegistry>
+        <Providers>
+          <StyledComponentsRegistry>
+            <Layout envVariables={envVariables} featureFlags={featureFlags}>
+              {children}
+            </Layout>
+          </StyledComponentsRegistry>
         </Providers>
       </body>
     </html>

diff --git a/app/lib/common.ts b/app/lib/common.ts
@@ -1,23 +1,7 @@
-import axios from 'axios';
 import { PostHog } from 'posthog-node';
 
-import { License } from '@/types/subscription';
 import { EnvironmentVariables, FeatureFlag } from '@/types/config';
 
-const { ENTERPRISE_API_URL } = process.env;
-
-export async function validateLicense() {
-  try {
-    const response = await axios.post<License>(
-      `${ENTERPRISE_API_URL}/api/v1/subscription/validate`,
-    );
-    return response.data;
-  } catch (error) {
-    // supressing error. license not found
-    return {} as License;
-  }
-}
-
 export async function getFeatureFlags() {
   try {
     const { KUBEFIRST_VERSION = '', POSTHOG_KEY = '' } = process.env;
@@ -52,7 +36,6 @@ export async function getEnvVars() {
       IS_CLUSTER_ZERO = '',
       KUBEFIRST_VERSION = '',
       POSTHOG_KEY = '',
-      SAAS_URL = '',
     } = process.env;
 
     return {
@@ -64,7 +47,6 @@ export async function getEnvVars() {
       isClusterZero: IS_CLUSTER_ZERO === 'true',
       kubefirstVersion: KUBEFIRST_VERSION,
       installMethod: INSTALL_METHOD,
-      saasURL: SAAS_URL,
       POSTHOG_KEY,
     };
   } catch (error) {

diff --git a/app/lib/providers.tsx b/app/lib/providers.tsx
@@ -2,8 +2,6 @@
 
 import React, { PropsWithChildren } from 'react';
 import { Provider } from 'react-redux';
-import { Session } from 'next-auth';
-import { SessionProvider } from 'next-auth/react';
 import { ThemeProvider as ThemeProviderMUI } from '@mui/material/styles';
 import { PersistGate } from 'redux-persist/integration/react';
 
@@ -14,20 +12,18 @@ import { persistor, store } from '@/redux/store';
 import { muiTheme } from '@/theme/muiTheme';
 import { theme } from '@/theme/index';
 
-export function Providers({ children, session }: PropsWithChildren<{ session: Session | null }>) {
+export function Providers({ children }: PropsWithChildren) {
   return (
-    <SessionProvider session={session}>
-      <Provider store={store}>
-        <PersistGate persistor={persistor}>
-          <ThemeProviderMUI theme={muiTheme}>
-            <ThemeProvider theme={theme}>
-              <QueueProvider>
-                <NotificationsProvider>{children}</NotificationsProvider>
-              </QueueProvider>
-            </ThemeProvider>
-          </ThemeProviderMUI>
-        </PersistGate>
-      </Provider>
-    </SessionProvider>
+    <Provider store={store}>
+      <PersistGate persistor={persistor}>
+        <ThemeProviderMUI theme={muiTheme}>
+          <ThemeProvider theme={theme}>
+            <QueueProvider>
+              <NotificationsProvider>{children}</NotificationsProvider>
+            </QueueProvider>
+          </ThemeProvider>
+        </ThemeProviderMUI>
+      </PersistGate>
+    </Provider>
   );
 }