Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

refactor(accounts):render-login-form-directly

Aswin Asokb5f496ec6ff3
diff --git a/web/apps/photos/src/pages/index.tsx b/web/apps/photos/src/pages/index.tsx
index d6ccb8803d..6e3a72eeac 100644
--- a/web/apps/photos/src/pages/index.tsx
+++ b/web/apps/photos/src/pages/index.tsx
@@ -1,6 +1,5 @@
import { DevSettingsDialog } from "@/components/auth/DevSettingsDialog";
import { PhotosAuthShell } from "@/components/PhotosAuthShell";
-import { LoginForm } from "ente-accounts/components/auth/LoginForm";
import { SignUpForm } from "ente-accounts/components/auth/SignUpForm";
import { LoginContents } from "ente-accounts/components/LoginContents";
import { SignUpContents } from "ente-accounts/components/SignUpContents";
@@ -120,7 +119,6 @@ const Page: React.FC = () => {
<LoginContents
{...{ host }}
onSignUp={handleShowSignUp}
- presentation={LoginForm}
/>
) : (
<SignUpContents
diff --git a/web/packages/accounts/components/LoginContents.tsx b/web/packages/accounts/components/LoginContents.tsx
index af5e2c954d..85a6167c9f 100644
--- a/web/packages/accounts/components/LoginContents.tsx
+++ b/web/packages/accounts/components/LoginContents.tsx
@@ -1,3 +1,4 @@
+import { LoginForm } from "ente-accounts/components/auth/LoginForm";
import {
replaceSavedLocalUser,
saveSRPAttributes,
@@ -17,7 +18,6 @@ import { z } from "zod";
interface LoginContentsProps {
host: string | undefined;
onSignUp: () => void;
- presentation: React.ComponentType<LoginPresentationProps>;
}
export interface LoginPresentationProps {
@@ -38,7 +38,6 @@ export interface LoginPresentationProps {
export const LoginContents: React.FC<LoginContentsProps> = ({
onSignUp,
host,
- presentation: Presentation,
}) => {
const router = useRouter();
const [isJoinAlbumContext, setIsJoinAlbumContext] = useState(false);
@@ -122,7 +121,7 @@ export const LoginContents: React.FC<LoginContentsProps> = ({
}
return (
- <Presentation
+ <LoginForm
email={formik.values.email}
emailError={formik.errors.email}
host={host}
diff --git a/web/packages/accounts/pages/login.tsx b/web/packages/accounts/pages/login.tsx
index d69e3d6cc2..392d104729 100644
--- a/web/packages/accounts/pages/login.tsx
+++ b/web/packages/accounts/pages/login.tsx
@@ -1,9 +1,5 @@
import { useAuthPageConfig } from "ente-accounts/components/auth/AuthPageProvider";
-import { LoginForm } from "ente-accounts/components/auth/LoginForm";
-import {
- LoginContents,
- type LoginPresentationProps,
-} from "ente-accounts/components/LoginContents";
+import { LoginContents } from "ente-accounts/components/LoginContents";
import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { LoadingIndicator } from "ente-base/components/loaders";
import { customAPIHost } from "ente-base/origins";
@@ -11,7 +7,8 @@ import { useRouter } from "next/router";
import React, { useCallback, useEffect, useState } from "react";
const Page: React.FC = () => {
- const { LoginFrame, keepLoginLoadingOnRedirect } = useAuthPageConfig();
+ const { Shell, LoginFrame, keepLoginLoadingOnRedirect } =
+ useAuthPageConfig();
const [loading, setLoading] = useState(true);
const [host, setHost] = useState<string | undefined>(undefined);
@@ -36,10 +33,9 @@ const Page: React.FC = () => {
if (loading) return <LoadingIndicator />;
const contents = (
- <LoginContents
- {...{ host, onSignUp }}
- presentation={ConfiguredLoginPresentation}
- />
+ <Shell>
+ <LoginContents {...{ host, onSignUp }} />
+ </Shell>
);
return LoginFrame ? (
@@ -50,14 +46,3 @@ const Page: React.FC = () => {
};
export default Page;
-
-function ConfiguredLoginPresentation(
- props: LoginPresentationProps,
-): React.JSX.Element {
- const { Shell } = useAuthPageConfig();
- return (
- <Shell>
- <LoginForm {...props} />
- </Shell>
- );
-}