Merge branch 'Infisical:main' into cloudflare-workers

frontend/src/pages/_app.tsx

@@ -20,6 +20,7 @@ import {
   OrgPermissionProvider,
   OrgProvider,
   ProjectPermissionProvider,
+  ServerConfigProvider,
   SubscriptionProvider,
   UserProvider,
   WorkspaceProvider
@@ -84,36 +85,42 @@ const App = ({ Component, pageProps, ...appProps }: NextAppProp): JSX.Element =>
     return (
       <QueryClientProvider client={queryClient}>
         <NotificationProvider>
-          <AuthProvider>
-            <Component {...pageProps} />
-          </AuthProvider>
+          <ServerConfigProvider>
+            <AuthProvider>
+              <Component {...pageProps} />
+            </AuthProvider>
+          </ServerConfigProvider>
         </NotificationProvider>
       </QueryClientProvider>
     );
   }
 
+  const Layout = Component?.layout || AppLayout;
+
   return (
     <QueryClientProvider client={queryClient}>
       <TooltipProvider>
-        <AuthProvider>
-          <OrgProvider>
-            <OrgPermissionProvider>
-              <WorkspaceProvider>
-                <ProjectPermissionProvider>
-                  <SubscriptionProvider>
-                    <UserProvider>
-                      <NotificationProvider>
-                        <AppLayout>
-                          <Component {...pageProps} />
-                        </AppLayout>
-                      </NotificationProvider>
-                    </UserProvider>
-                  </SubscriptionProvider>
-                </ProjectPermissionProvider>
-              </WorkspaceProvider>
-            </OrgPermissionProvider>
-          </OrgProvider>
-        </AuthProvider>
+        <NotificationProvider>
+          <ServerConfigProvider>
+            <AuthProvider>
+              <OrgProvider>
+                <OrgPermissionProvider>
+                  <WorkspaceProvider>
+                    <ProjectPermissionProvider>
+                      <SubscriptionProvider>
+                        <UserProvider>
+                          <Layout>
+                            <Component {...pageProps} />
+                          </Layout>
+                        </UserProvider>
+                      </SubscriptionProvider>
+                    </ProjectPermissionProvider>
+                  </WorkspaceProvider>
+                </OrgPermissionProvider>
+              </OrgProvider>
+            </AuthProvider>
+          </ServerConfigProvider>
+        </NotificationProvider>
       </TooltipProvider>
     </QueryClientProvider>
   );

frontend/src/pages/admin/index.tsx

@@ -0,0 +1,30 @@
+import { useTranslation } from "react-i18next";
+import Head from "next/head";
+
+import { AdminLayout } from "@app/layouts";
+import { AdminDashboardPage } from "@app/views/admin/DashboardPage";
+
+const AdminDashboard = () => {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <Head>
+        <title>{t("common.head-title", { title: t("admin.dashboard") })}</title>
+        <link rel="icon" href="/infisical.ico" />
+        <meta property="og:image" content="/images/message.png" />
+        <meta property="og:title" content={t("admin.dashboard.og-title") ?? ""} />
+        <meta name="og:description" content={t("admin.dashboard.og-description") ?? ""} />
+      </Head>
+      <div className="h-full">
+        <AdminDashboardPage />
+      </div>
+    </>
+  );
+};
+
+export default AdminDashboard;
+
+AdminDashboard.requireAuth = true;
+
+AdminDashboard.layout = AdminLayout;

frontend/src/pages/admin/signup.tsx

@@ -0,0 +1,21 @@
+import { useTranslation } from "react-i18next";
+import Head from "next/head";
+
+import { SignUpPage } from "@app/views/admin/SignUpPage";
+
+export default function LoginPage() {
+  const { t } = useTranslation();
+
+  return (
+    <div className="flex min-h-screen max-h-screen overflow-y-auto flex-col justify-center bg-gradient-to-tr from-mineshaft-600 via-mineshaft-800 to-bunker-700 px-6">
+      <Head>
+        <title>{t("common.head-title", { title: t("signup.title") })}</title>
+        <link rel="icon" href="/infisical.ico" />
+        <meta property="og:image" content="/images/message.png" />
+        <meta property="og:title" content={t("signup.og-title") ?? ""} />
+        <meta name="og:description" content={t("signup.og-description") ?? ""} />
+      </Head>
+      <SignUpPage />
+    </div>
+  );
+}

frontend/src/pages/org/[id]/overview/index.tsx

@@ -559,6 +559,7 @@ const OrganizationPage = withPermission(
 
     useEffect(() => {
       onboardingCheck({
+        orgId: currentOrg,
         setHasUserClickedIntro,
         setHasUserClickedSlack,
         setHasUserPushedSecrets,

frontend/src/pages/signup/index.tsx

@@ -12,6 +12,7 @@ import InitialSignupStep from "@app/components/signup/InitialSignupStep";
 import TeamInviteStep from "@app/components/signup/TeamInviteStep";
 import UserInfoStep from "@app/components/signup/UserInfoStep";
 import SecurityClient from "@app/components/utilities/SecurityClient";
+import { useServerConfig } from "@app/context";
 import { useVerifyEmailVerificationCode } from "@app/hooks/api";
 import { fetchOrganizations } from "@app/hooks/api/organization/queries";
 import { useFetchServerStatus } from "@app/hooks/api/serverDetails";
@@ -34,6 +35,13 @@ export default function SignUp() {
   const [isCodeInputCheckLoading, setIsCodeInputCheckLoading] = useState(false);
   const { t } = useTranslation();
   const { mutateAsync } = useVerifyEmailVerificationCode();
+  const { config } = useServerConfig();
+
+  useEffect(() => {
+    if (!config.allowSignUp) {
+      router.push("/login");
+    }
+  }, [config.allowSignUp]);
 
   useEffect(() => {
     const tryAuth = async () => {
@@ -65,7 +73,7 @@ export default function SignUp() {
         const { token } = await mutateAsync({ email, code });
         SecurityClient.setSignupToken(token);
         setStep(3);
-      } catch(err) {
+      } catch (err) {
         console.error(err);
         setCodeError(true);
       }