-
-
-
- Set new password
-
-
Secure your account with a strong password
-
-
+
);
};
diff --git a/space/pages/index.tsx b/space/pages/index.tsx
index 0ab791c60..8bba85cca 100644
--- a/space/pages/index.tsx
+++ b/space/pages/index.tsx
@@ -2,8 +2,15 @@ import { observer } from "mobx-react-lite";
import { NextPage } from "next";
// components
import { AuthView } from "@/components/views";
-// store
+// helpers
+import { EPageTypes } from "@/helpers/authentication.helper";
+// wrapper
+import { AuthWrapper } from "@/lib/wrappers";
-const Index: NextPage = observer(() =>
);
+const Index: NextPage = observer(() => (
+
+
+
+));
export default Index;
diff --git a/space/pages/onboarding/index.tsx b/space/pages/onboarding/index.tsx
index acebd6b2c..6ba95126a 100644
--- a/space/pages/onboarding/index.tsx
+++ b/space/pages/onboarding/index.tsx
@@ -7,8 +7,12 @@ import { useTheme } from "next-themes";
import { Avatar } from "@plane/ui";
// components
import { OnBoardingForm } from "@/components/accounts/onboarding-form";
-// mobx
+// helpers
+import { EPageTypes } from "@/helpers/authentication.helper";
+// hooks
import { useUser, useUserProfile } from "@/hooks/store";
+// wrappers
+import { AuthWrapper } from "@/lib/wrappers";
// assets
import ProfileSetupDark from "public/onboarding/profile-setup-dark.svg";
import ProfileSetup from "public/onboarding/profile-setup.svg";
@@ -49,71 +53,78 @@ const OnBoardingPage = observer(() => {
};
return (
-
-
-
-
-
-
+
+
+
+
-
-
-
- {user?.avatar && (
-
- )}
-
- {user?.first_name ? `${user?.first_name} ${user?.last_name ?? ""}` : user?.email}
-
+
+
+
+ {user?.avatar && (
+
+ )}
+
+ {user?.first_name ? `${user?.first_name} ${user?.last_name ?? ""}` : user?.email}
+
+
-
-
-
-
Welcome to Plane!
-
- Let’s setup your profile, tell us a bit about yourself.
-
-
-
-
-
-
-
-
- {user?.avatar && (
-
- )}
-
- {user?.first_name ? `${user?.first_name} ${user?.last_name ?? ""}` : user?.email}
-
+
+
+
Welcome to Plane!
+
+ Let’s setup your profile, tell us a bit about yourself.
+
+
+
-
-
+
+
+
+ {user?.avatar && (
+
+ )}
+
+ {user?.first_name ? `${user?.first_name} ${user?.last_name ?? ""}` : user?.email}
+
+
+
+
+
+
-
+
);
});
diff --git a/space/pages/project-not-published/index.tsx b/space/pages/project-not-published/index.tsx
index acc638412..803ed3d03 100644
--- a/space/pages/project-not-published/index.tsx
+++ b/space/pages/project-not-published/index.tsx
@@ -1,32 +1,39 @@
// next imports
import Image from "next/image";
-import projectNotPublishedImage from "public/project-not-published.svg";
+// helpers
+import { EPageTypes } from "@/helpers/authentication.helper";
+// wrappers
+import { AuthWrapper } from "@/lib/wrappers";
+// images
+import projectNotPublishedImage from "@/public/project-not-published.svg";
const CustomProjectNotPublishedError = () => (
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Oops! The page you{`'`}re looking for isn{`'`}t live at the moment.
+
+
+ If this is your project, login to your workspace to adjust its visibility settings and make it public.
+
-
- Oops! The page you{`'`}re looking for isn{`'`}t live at the moment.
-
-
- If this is your project, login to your workspace to adjust its visibility settings and make it public.
-
-
-
+
);
export default CustomProjectNotPublishedError;
diff --git a/space/services/api.service.ts b/space/services/api.service.ts
index 9ab4d56ed..26f8cc727 100644
--- a/space/services/api.service.ts
+++ b/space/services/api.service.ts
@@ -19,7 +19,7 @@ abstract class APIService {
this.axiosInstance.interceptors.response.use(
(response) => response,
(error) => {
- if (error.response && error.response.status === 401) window.location.href = "/space/login";
+ if (error.response && error.response.status === 401) window.location.href = "/";
return Promise.reject(error.response?.data ?? error);
}
);
diff --git a/space/services/authentication.service.ts b/space/services/authentication.service.ts
index 698aaa31f..e18205479 100644
--- a/space/services/authentication.service.ts
+++ b/space/services/authentication.service.ts
@@ -26,7 +26,7 @@ export class AuthService extends APIService {
});
}
- async sendResetPasswordLink(data: { email: string }): Promise
{
+ async sendResetPasswordLink(data: { email: string }): Promise {
return this.post(`/auth/forgot-password/`, data)
.then((response) => response?.data)
.catch((error) => {
@@ -34,7 +34,7 @@ export class AuthService extends APIService {
});
}
- async generateUniqueCode(data: { email: string }): Promise {
+ async generateUniqueCode(data: { email: string }): Promise {
return this.post("/auth/spaces/magic-generate/", data, { headers: {} })
.then((response) => response?.data)
.catch((error) => {
diff --git a/space/services/user.service.ts b/space/services/user.service.ts
index a08ccf837..72500a048 100644
--- a/space/services/user.service.ts
+++ b/space/services/user.service.ts
@@ -18,7 +18,7 @@ export class UserService extends APIService {
});
}
- async updateUser(data: Partial): Promise {
+ async updateUser(data: Partial): Promise {
return this.patch("/api/users/me/", data)
.then((response) => response?.data)
.catch((error) => {
@@ -33,7 +33,7 @@ export class UserService extends APIService {
throw error?.response;
});
}
- async updateCurrentUserProfile(data: any): Promise {
+ async updateCurrentUserProfile(data: Partial): Promise {
return this.patch("/api/users/me/profile/", data)
.then((response) => response?.data)
.catch((error) => {
diff --git a/web/components/account/auth-forms/sign-in-root.tsx b/web/components/account/auth-forms/auth-root.tsx
similarity index 66%
rename from web/components/account/auth-forms/sign-in-root.tsx
rename to web/components/account/auth-forms/auth-root.tsx
index 78a65a63d..a451994d8 100644
--- a/web/components/account/auth-forms/sign-in-root.tsx
+++ b/web/components/account/auth-forms/auth-root.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { FC, useEffect, useState } from "react";
import { observer } from "mobx-react";
import { useRouter } from "next/router";
import { IEmailCheckData } from "@plane/types";
@@ -29,26 +29,42 @@ import { AuthService } from "@/services/auth.service";
const authService = new AuthService();
-export const SignInAuthRoot = observer(() => {
+type TAuthRoot = {
+ authMode: EAuthModes;
+};
+
+export const AuthRoot: FC = observer((props) => {
//router
const router = useRouter();
- const { email: emailParam, invitation_id, slug: workspaceSlug, error_code, error_message } = router.query;
+ const { email: emailParam, invitation_id, slug: workspaceSlug, error_code } = router.query;
+ // props
+ const { authMode } = props;
// states
const [authStep, setAuthStep] = useState(EAuthSteps.EMAIL);
const [email, setEmail] = useState(emailParam ? emailParam.toString() : "");
const [errorInfo, setErrorInfo] = useState(undefined);
// hooks
const { instance } = useInstance();
- // derived values
- const authMode = EAuthModes.SIGN_IN;
useEffect(() => {
- if (error_code && error_message) {
- const errorhandler = authErrorHandler(
- error_code?.toString() as EAuthenticationErrorCodes,
- error_message?.toString()
- );
+ if (error_code) {
+ const errorhandler = authErrorHandler(error_code?.toString() as EAuthenticationErrorCodes);
if (errorhandler) {
+ if (
+ [
+ EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_IN,
+ EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_UP,
+ ].includes(errorhandler.code)
+ )
+ setAuthStep(EAuthSteps.PASSWORD);
+ if (
+ [EAuthenticationErrorCodes.INVALID_MAGIC_CODE, EAuthenticationErrorCodes.EXPIRED_MAGIC_CODE].includes(
+ errorhandler.code
+ )
+ )
+ setAuthStep(EAuthSteps.UNIQUE_CODE);
+
+ // validating wheather to show alert to banner
if (errorhandler?.type === EErrorAlertType.TOAST_ALERT) {
setToast({
type: TOAST_TYPE.ERROR,
@@ -58,23 +74,30 @@ export const SignInAuthRoot = observer(() => {
} else setErrorInfo(errorhandler);
}
}
- }, [error_code, error_message]);
+ }, [error_code, authMode]);
// step 1 submit handler- email verification
const handleEmailVerification = async (data: IEmailCheckData) => {
setEmail(data.email);
- await authService
- .signInEmailCheck(data)
+ const emailCheckRequest =
+ authMode === EAuthModes.SIGN_IN ? authService.signInEmailCheck(data) : authService.signUpEmailCheck(data);
+
+ await emailCheckRequest
.then(() => {
setAuthStep(EAuthSteps.PASSWORD);
})
- .catch((err) => {
- setToast({
- type: TOAST_TYPE.ERROR,
- title: "Error!",
- message: err?.error_message ?? "Something went wrong. Please try again.",
- });
+ .catch((error) => {
+ const errorhandler = authErrorHandler(error?.error_code.toString());
+ if (errorhandler?.type === EErrorAlertType.BANNER_ALERT) {
+ setErrorInfo(errorhandler);
+ return;
+ } else if (errorhandler?.type === EErrorAlertType.TOAST_ALERT)
+ setToast({
+ type: TOAST_TYPE.ERROR,
+ title: errorhandler?.title,
+ message: (errorhandler?.message as string) || "Something went wrong. Please try again.",
+ });
});
};
@@ -87,7 +110,7 @@ export const SignInAuthRoot = observer(() => {
workspaceSlug={workspaceSlug?.toString() || undefined}
invitationId={invitation_id?.toString() || undefined}
invitationEmail={email || undefined}
- authMode={EAuthModes.SIGN_IN}
+ authMode={authMode}
currentAuthStep={authStep}
>
{errorInfo && errorInfo?.type === EErrorAlertType.BANNER_ALERT && (
diff --git a/web/components/account/auth-forms/index.ts b/web/components/account/auth-forms/index.ts
index e5d77069c..604c4b5c6 100644
--- a/web/components/account/auth-forms/index.ts
+++ b/web/components/account/auth-forms/index.ts
@@ -1,5 +1,4 @@
-export * from "./sign-up-root";
-export * from "./sign-in-root";
+export * from "./auth-root";
export * from "./auth-header";
export * from "./auth-banner";
diff --git a/web/components/account/auth-forms/sign-up-root.tsx b/web/components/account/auth-forms/sign-up-root.tsx
deleted file mode 100644
index 0ea698674..000000000
--- a/web/components/account/auth-forms/sign-up-root.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import { FC, useEffect, useState } from "react";
-import { observer } from "mobx-react";
-import { useRouter } from "next/router";
-// types
-import { IEmailCheckData } from "@plane/types";
-// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import {
- AuthHeader,
- AuthBanner,
- AuthEmailForm,
- AuthUniqueCodeForm,
- AuthPasswordForm,
- OAuthOptions,
- TermsAndConditions,
-} from "@/components/account";
-// helpers
-import {
- EAuthModes,
- EAuthSteps,
- EAuthenticationErrorCodes,
- EErrorAlertType,
- TAuthErrorInfo,
- authErrorHandler,
-} from "@/helpers/authentication.helper";
-// hooks
-import { useInstance } from "@/hooks/store";
-// services
-import { AuthService } from "@/services/auth.service";
-
-// service initialization
-const authService = new AuthService();
-
-export const SignUpAuthRoot: FC = observer(() => {
- //router
- const router = useRouter();
- const { email: emailParam, invitation_id, slug: workspaceSlug, error_code, error_message } = router.query;
- // states
- const [authStep, setAuthStep] = useState(EAuthSteps.EMAIL);
- const [email, setEmail] = useState(emailParam ? emailParam.toString() : "");
- const [errorInfo, setErrorInfo] = useState(undefined);
- // hooks
- const { instance } = useInstance();
- // derived values
- const authMode = EAuthModes.SIGN_UP;
- const isSmtpConfigured = instance?.config?.is_smtp_configured;
-
- useEffect(() => {
- if (error_code && error_message) {
- const errorhandler = authErrorHandler(
- error_code?.toString() as EAuthenticationErrorCodes,
- error_message?.toString()
- );
- if (errorhandler) {
- if (errorhandler?.type === EErrorAlertType.TOAST_ALERT) {
- setToast({
- type: TOAST_TYPE.ERROR,
- title: errorhandler?.title,
- message: errorhandler?.message as string,
- });
- } else setErrorInfo(errorhandler);
- }
- }
- }, [error_code, error_message]);
-
- // email verification
- const handleEmailVerification = async (data: IEmailCheckData) => {
- setEmail(data.email);
- await authService
- .signUpEmailCheck(data)
- .then(() => {
- if (isSmtpConfigured) setAuthStep(EAuthSteps.UNIQUE_CODE);
- else setAuthStep(EAuthSteps.PASSWORD);
- })
- .catch((error) => {
- const errorhandler = authErrorHandler(error?.error_code, error?.error_message);
- if (errorhandler) {
- setErrorInfo(errorhandler);
- return;
- }
- setToast({
- type: TOAST_TYPE.ERROR,
- title: "Error!",
- message: error?.error_message ?? "Something went wrong. Please try again.",
- });
- });
- };
-
- const isOAuthEnabled =
- instance?.config && (instance?.config?.is_google_enabled || instance?.config?.is_github_enabled);
-
- return (
-
-
- {errorInfo && errorInfo?.type === EErrorAlertType.BANNER_ALERT && (
- setErrorInfo(value)} />
- )}
- {authStep === EAuthSteps.EMAIL && }
- {authStep === EAuthSteps.UNIQUE_CODE && (
- {
- setEmail("");
- setAuthStep(EAuthSteps.EMAIL);
- }}
- submitButtonText="Continue"
- mode={authMode}
- />
- )}
- {authStep === EAuthSteps.PASSWORD && (
- {
- setEmail("");
- setAuthStep(EAuthSteps.EMAIL);
- }}
- handleStepChange={(step) => setAuthStep(step)}
- mode={authMode}
- />
- )}
- {isOAuthEnabled && }
-
-
-
+ Your account is already registered.
+
+ Sign In
+
+ now.
+
+ ),
+ },
+ [EAuthenticationErrorCodes.USER_DOES_NOT_EXIST]: {
+ title: `User does not exist`,
+ message: (
+
+ No account found.
+
+ Create one
+
+ to get started.
+
+ ),
+ },
+ [EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_IN]: {
+ title: `Authentication failed`,
+ message: `Authentication failed. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_UP]: {
+ title: `Authentication failed`,
+ message: `Authentication failed. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.SMTP_NOT_CONFIGURED]: {
+ title: `SMTP not configured`,
+ message: `SMTP not configured. Please contact your administrator.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_MAGIC_CODE]: {
+ title: `Authentication failed`,
+ message: `Invalid magic code. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.EXPIRED_MAGIC_CODE]: {
+ title: `Expired magic code`,
+ message: `Expired magic code. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.GOOGLE_NOT_CONFIGURED]: {
+ title: `Google not configured`,
+ message: `Google not configured. Please contact your administrator.`,
+ },
+ [EAuthenticationErrorCodes.GITHUB_NOT_CONFIGURED]: {
+ title: `GitHub not configured`,
+ message: `GitHub not configured. Please contact your administrator.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_EMAIL]: {
+ title: `Invalid email`,
+ message: `Invalid email. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.EMAIL_REQUIRED]: {
+ title: `Email required`,
+ message: `Email required. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_IN]: {
+ title: `Email and password required`,
+ message: `Email and password required. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_IN]: {
+ title: `Invalid email`,
+ message: `Invalid email. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_UP]: {
+ title: `Invalid email`,
+ message: `Invalid email. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_IN]: {
+ title: `Invalid email`,
+ message: `Invalid email. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_UP]: {
+ title: `Invalid email`,
+ message: `Invalid email. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.GITHUB_OAUTH_PROVIDER_ERROR]: {
+ title: `GitHub OAuth provider error`,
+ message: `GitHub OAuth provider error. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.GOOGLE_OAUTH_PROVIDER_ERROR]: {
+ title: `Google OAuth provider error`,
+ message: `Google OAuth provider error. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.MAGIC_SIGN_IN_EMAIL_CODE_REQUIRED]: {
+ title: `Email and code required`,
+ message: `Email and code required. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.MAGIC_SIGN_UP_EMAIL_CODE_REQUIRED]: {
+ title: `Email and code required`,
+ message: `Email and code required. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_PASSWORD_TOKEN]: {
+ title: `Invalid password token`,
+ message: `Invalid password token. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.EXPIRED_PASSWORD_TOKEN]: {
+ title: `Expired password token`,
+ message: `Expired password token. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.INCORRECT_OLD_PASSWORD]: {
+ title: `Incorrect old password`,
+ message: `Incorrect old password. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_NEW_PASSWORD]: {
+ title: `Invalid new password`,
+ message: `Invalid new password. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.PASSWORD_ALREADY_SET]: {
+ title: `Password already set`,
+ message: `Password already set. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.ADMIN_ALREADY_EXIST]: {
+ title: `Admin already exists`,
+ message: `Admin already exists. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD_FIRST_NAME]: {
+ title: `Email, password and first name required`,
+ message: `Email, password and first name required. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_ADMIN_EMAIL]: {
+ title: `Invalid email`,
+ message: `Invalid email. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.INVALID_ADMIN_PASSWORD]: {
+ title: `Invalid password`,
+ message: `Invalid password. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD]: {
+ title: `Email and password required`,
+ message: `Email and password required. Please try again.`,
+ },
+ [EAuthenticationErrorCodes.ADMIN_AUTHENTICATION_FAILED]: {
+ title: `Authentication failed`,
+ message: `Authentication failed. Please try again.`,
+ },
+};
+
+export const authErrorHandler = (errorCode: EAuthenticationErrorCodes): TAuthErrorInfo | undefined => {
+ const toastAlertErrorCodes = [
+ EAuthenticationErrorCodes.INSTANCE_NOT_CONFIGURED,
+ EAuthenticationErrorCodes.SIGNUP_DISABLED,
+ EAuthenticationErrorCodes.INVALID_PASSWORD,
+ EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_IN,
+ EAuthenticationErrorCodes.AUTHENTICATION_FAILED_SIGN_UP,
+ EAuthenticationErrorCodes.SMTP_NOT_CONFIGURED,
+ EAuthenticationErrorCodes.INVALID_MAGIC_CODE,
+ EAuthenticationErrorCodes.EXPIRED_MAGIC_CODE,
+ EAuthenticationErrorCodes.GOOGLE_NOT_CONFIGURED,
+ EAuthenticationErrorCodes.GITHUB_NOT_CONFIGURED,
+ EAuthenticationErrorCodes.INVALID_EMAIL,
+ EAuthenticationErrorCodes.EMAIL_REQUIRED,
+ EAuthenticationErrorCodes.REQUIRED_EMAIL_PASSWORD_SIGN_IN,
+ EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_IN,
+ EAuthenticationErrorCodes.INVALID_EMAIL_SIGN_UP,
+ EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_IN,
+ EAuthenticationErrorCodes.INVALID_EMAIL_MAGIC_SIGN_UP,
+ EAuthenticationErrorCodes.GITHUB_OAUTH_PROVIDER_ERROR,
+ EAuthenticationErrorCodes.GOOGLE_OAUTH_PROVIDER_ERROR,
+ EAuthenticationErrorCodes.MAGIC_SIGN_IN_EMAIL_CODE_REQUIRED,
+ EAuthenticationErrorCodes.MAGIC_SIGN_UP_EMAIL_CODE_REQUIRED,
+ EAuthenticationErrorCodes.INVALID_PASSWORD_TOKEN,
+ EAuthenticationErrorCodes.EXPIRED_PASSWORD_TOKEN,
+ EAuthenticationErrorCodes.INCORRECT_OLD_PASSWORD,
+ EAuthenticationErrorCodes.INVALID_NEW_PASSWORD,
+ EAuthenticationErrorCodes.PASSWORD_ALREADY_SET,
+ EAuthenticationErrorCodes.ADMIN_ALREADY_EXIST,
+ EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD_FIRST_NAME,
+ EAuthenticationErrorCodes.INVALID_ADMIN_EMAIL,
+ EAuthenticationErrorCodes.INVALID_ADMIN_PASSWORD,
+ EAuthenticationErrorCodes.REQUIRED_ADMIN_EMAIL_PASSWORD,
+ EAuthenticationErrorCodes.ADMIN_AUTHENTICATION_FAILED,
+ ];
+ const bannerAlertErrorCodes = [
+ EAuthenticationErrorCodes.USER_ALREADY_EXIST,
+ EAuthenticationErrorCodes.USER_DOES_NOT_EXIST,
+ ];
+
+ if (toastAlertErrorCodes.includes(errorCode))
+ return {
+ type: EErrorAlertType.TOAST_ALERT,
+ code: errorCode,
+ title: errorCodeMessages[errorCode]?.title || "Error",
+ message: errorCodeMessages[errorCode]?.message || "Something went wrong. Please try again.",
+ };
+
+ if (bannerAlertErrorCodes.includes(errorCode))
+ return {
+ type: EErrorAlertType.BANNER_ALERT,
+ code: errorCode,
+ title: errorCodeMessages[errorCode]?.title || "Error",
+ message: errorCodeMessages[errorCode]?.message || "Something went wrong. Please try again.",
+ };
+
+ return undefined;
+};
diff --git a/web/lib/wrappers/instance-wrapper.tsx b/web/lib/wrappers/instance-wrapper.tsx
index 25ca7c424..a9d114dbc 100644
--- a/web/lib/wrappers/instance-wrapper.tsx
+++ b/web/lib/wrappers/instance-wrapper.tsx
@@ -30,12 +30,7 @@ export const InstanceWrapper: FC = observer((props) => {
);
// something went wrong while in the request
- if (error && error?.status === "error")
- return (
-
- Something went wrong. please try again later
-
- );
+ if (error && error?.status === "error") return <>{children};
// instance is not ready and setup is not done
if (instance?.instance?.is_setup_done === false) return ;
diff --git a/web/pages/accounts/forgot-password.tsx b/web/pages/accounts/forgot-password.tsx
index 57debc226..cb1df8504 100644
--- a/web/pages/accounts/forgot-password.tsx
+++ b/web/pages/accounts/forgot-password.tsx
@@ -122,7 +122,7 @@ const ForgotPasswordPage: NextPageWithLayout = () => {
-
+
@@ -176,7 +176,7 @@ const ForgotPasswordPage: NextPageWithLayout = () => {
>
{resendTimerCode > 0 ? `Resend in ${resendTimerCode} seconds` : "Send reset link"}
-
+
Back to sign in
diff --git a/web/pages/accounts/reset-password.tsx b/web/pages/accounts/reset-password.tsx
index 433689bf4..f7c9acf37 100644
--- a/web/pages/accounts/reset-password.tsx
+++ b/web/pages/accounts/reset-password.tsx
@@ -90,7 +90,7 @@ const ResetPasswordPage: NextPageWithLayout = () => {
Plane
-
+
diff --git a/web/pages/accounts/set-password.tsx b/web/pages/accounts/set-password.tsx
index 86f98b272..7437f8ea9 100644
--- a/web/pages/accounts/set-password.tsx
+++ b/web/pages/accounts/set-password.tsx
@@ -111,7 +111,7 @@ const SetPasswordPage: NextPageWithLayout = observer(() => {
Plane
-
+
diff --git a/web/pages/accounts/sign-in.tsx b/web/pages/accounts/sign-in.tsx
index 30a5b96cb..11f7cc478 100644
--- a/web/pages/accounts/sign-in.tsx
+++ b/web/pages/accounts/sign-in.tsx
@@ -4,12 +4,12 @@ import Link from "next/link";
// ui
import { useTheme } from "next-themes";
// components
-import { SignInAuthRoot } from "@/components/account";
+import { AuthRoot } from "@/components/account";
import { PageHead } from "@/components/core";
// constants
import { NAVIGATE_TO_SIGNUP } from "@/constants/event-tracker";
// helpers
-import { EPageTypes } from "@/helpers/authentication.helper";
+import { EAuthModes, EPageTypes } from "@/helpers/authentication.helper";
// hooks
import { useEventTracker } from "@/hooks/store";
// layouts
@@ -58,8 +58,8 @@ const SignInPage: NextPageWithLayout = observer(() => {
-
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index 5b23b618e..6b085ffd3 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -5,12 +5,12 @@ import Link from "next/link";
// ui
import { useTheme } from "next-themes";
// components
-import { SignUpAuthRoot } from "@/components/account";
+import { AuthRoot } from "@/components/account";
import { PageHead } from "@/components/core";
// constants
import { NAVIGATE_TO_SIGNIN } from "@/constants/event-tracker";
// helpers
-import { EPageTypes } from "@/helpers/authentication.helper";
+import { EAuthModes, EPageTypes } from "@/helpers/authentication.helper";
// hooks
import { useEventTracker } from "@/hooks/store";
// layouts
@@ -56,8 +56,8 @@ const HomePage: NextPageWithLayout = observer(() => {
-