From e836ada0d6c28294deb7c8798b53e3c4a156cd76 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 26 May 2024 20:01:23 +0530
Subject: [PATCH] Refactor

---
 web/apps/photos/src/pages/change-email.tsx            |  8 ++++++++
 web/apps/photos/src/pages/change-email/index.tsx      |  9 ---------
 web/apps/photos/src/pages/change-password.tsx         |  8 ++++++++
 web/apps/photos/src/pages/change-password/index.tsx   |  9 ---------
 web/apps/photos/src/pages/credentials.tsx             |  8 ++++++++
 web/apps/photos/src/pages/credentials/index.tsx       |  9 ---------
 web/apps/photos/src/pages/generate.tsx                |  8 ++++++++
 web/apps/photos/src/pages/generate/index.tsx          |  9 ---------
 web/apps/photos/src/pages/login.tsx                   |  8 ++++++++
 web/apps/photos/src/pages/login/index.tsx             |  9 ---------
 web/apps/photos/src/pages/passkeys/finish.tsx         |  3 +++
 web/apps/photos/src/pages/passkeys/finish/index.tsx   | 11 -----------
 web/apps/photos/src/pages/recover.tsx                 |  8 ++++++++
 web/apps/photos/src/pages/recover/index.tsx           | 10 ----------
 web/apps/photos/src/pages/signup.tsx                  |  8 ++++++++
 web/apps/photos/src/pages/signup/index.tsx            |  9 ---------
 web/apps/photos/src/pages/two-factor/recover.tsx      |  8 ++++++++
 .../photos/src/pages/two-factor/recover/index.tsx     | 11 -----------
 web/apps/photos/src/pages/two-factor/setup.tsx        |  8 ++++++++
 web/apps/photos/src/pages/two-factor/setup/index.tsx  |  9 ---------
 web/apps/photos/src/pages/two-factor/verify.tsx       |  8 ++++++++
 web/apps/photos/src/pages/two-factor/verify/index.tsx | 11 -----------
 web/apps/photos/src/pages/verify.tsx                  |  8 ++++++++
 web/apps/photos/src/pages/verify/index.tsx            |  9 ---------
 24 files changed, 91 insertions(+), 115 deletions(-)
 create mode 100644 web/apps/photos/src/pages/change-email.tsx
 delete mode 100644 web/apps/photos/src/pages/change-email/index.tsx
 create mode 100644 web/apps/photos/src/pages/change-password.tsx
 delete mode 100644 web/apps/photos/src/pages/change-password/index.tsx
 create mode 100644 web/apps/photos/src/pages/credentials.tsx
 delete mode 100644 web/apps/photos/src/pages/credentials/index.tsx
 create mode 100644 web/apps/photos/src/pages/generate.tsx
 delete mode 100644 web/apps/photos/src/pages/generate/index.tsx
 create mode 100644 web/apps/photos/src/pages/login.tsx
 delete mode 100644 web/apps/photos/src/pages/login/index.tsx
 create mode 100644 web/apps/photos/src/pages/passkeys/finish.tsx
 delete mode 100644 web/apps/photos/src/pages/passkeys/finish/index.tsx
 create mode 100644 web/apps/photos/src/pages/recover.tsx
 delete mode 100644 web/apps/photos/src/pages/recover/index.tsx
 create mode 100644 web/apps/photos/src/pages/signup.tsx
 delete mode 100644 web/apps/photos/src/pages/signup/index.tsx
 create mode 100644 web/apps/photos/src/pages/two-factor/recover.tsx
 delete mode 100644 web/apps/photos/src/pages/two-factor/recover/index.tsx
 create mode 100644 web/apps/photos/src/pages/two-factor/setup.tsx
 delete mode 100644 web/apps/photos/src/pages/two-factor/setup/index.tsx
 create mode 100644 web/apps/photos/src/pages/two-factor/verify.tsx
 delete mode 100644 web/apps/photos/src/pages/two-factor/verify/index.tsx
 create mode 100644 web/apps/photos/src/pages/verify.tsx
 delete mode 100644 web/apps/photos/src/pages/verify/index.tsx

diff --git a/web/apps/photos/src/pages/change-email.tsx b/web/apps/photos/src/pages/change-email.tsx
new file mode 100644
index 000000000..451c5ebfe
--- /dev/null
+++ b/web/apps/photos/src/pages/change-email.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/change-email";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/change-email/index.tsx b/web/apps/photos/src/pages/change-email/index.tsx
deleted file mode 100644
index 6225f053c..000000000
--- a/web/apps/photos/src/pages/change-email/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ChangeEmailPage from "@ente/accounts/pages/change-email";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function ChangeEmail() {
-    const appContext = useContext(AppContext);
-    return <ChangeEmailPage appContext={appContext} appName={APPS.PHOTOS} />;
-}
diff --git a/web/apps/photos/src/pages/change-password.tsx b/web/apps/photos/src/pages/change-password.tsx
new file mode 100644
index 000000000..ba8e1ac3d
--- /dev/null
+++ b/web/apps/photos/src/pages/change-password.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/change-password";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/change-password/index.tsx b/web/apps/photos/src/pages/change-password/index.tsx
deleted file mode 100644
index 8d8121d6a..000000000
--- a/web/apps/photos/src/pages/change-password/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ChangePasswordPage from "@ente/accounts/pages/change-password";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function ChangePassword() {
-    const appContext = useContext(AppContext);
-    return <ChangePasswordPage appContext={appContext} appName={APPS.PHOTOS} />;
-}
diff --git a/web/apps/photos/src/pages/credentials.tsx b/web/apps/photos/src/pages/credentials.tsx
new file mode 100644
index 000000000..7d21b33ac
--- /dev/null
+++ b/web/apps/photos/src/pages/credentials.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/credentials";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/credentials/index.tsx b/web/apps/photos/src/pages/credentials/index.tsx
deleted file mode 100644
index 776b2064b..000000000
--- a/web/apps/photos/src/pages/credentials/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import CredentialPage from "@ente/accounts/pages/credentials";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Credential() {
-    const appContext = useContext(AppContext);
-    return <CredentialPage appContext={appContext} appName={APPS.PHOTOS} />;
-}
diff --git a/web/apps/photos/src/pages/generate.tsx b/web/apps/photos/src/pages/generate.tsx
new file mode 100644
index 000000000..718172d49
--- /dev/null
+++ b/web/apps/photos/src/pages/generate.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/generate";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/generate/index.tsx b/web/apps/photos/src/pages/generate/index.tsx
deleted file mode 100644
index 5d62c93bc..000000000
--- a/web/apps/photos/src/pages/generate/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import GeneratePage from "@ente/accounts/pages/generate";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Generate() {
-    const appContext = useContext(AppContext);
-    return <GeneratePage appContext={appContext} appName={APPS.PHOTOS} />;
-}
diff --git a/web/apps/photos/src/pages/login.tsx b/web/apps/photos/src/pages/login.tsx
new file mode 100644
index 000000000..b40b9f914
--- /dev/null
+++ b/web/apps/photos/src/pages/login.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/login";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/login/index.tsx b/web/apps/photos/src/pages/login/index.tsx
deleted file mode 100644
index 84539e2f3..000000000
--- a/web/apps/photos/src/pages/login/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import LoginPage from "@ente/accounts/pages/login";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Login() {
-    const appContext = useContext(AppContext);
-    return <LoginPage appContext={appContext} appName={APPS.PHOTOS} />;
-}
diff --git a/web/apps/photos/src/pages/passkeys/finish.tsx b/web/apps/photos/src/pages/passkeys/finish.tsx
new file mode 100644
index 000000000..866dcf9e3
--- /dev/null
+++ b/web/apps/photos/src/pages/passkeys/finish.tsx
@@ -0,0 +1,3 @@
+import Page from "@ente/accounts/pages/passkeys/finish";
+
+export default Page;
diff --git a/web/apps/photos/src/pages/passkeys/finish/index.tsx b/web/apps/photos/src/pages/passkeys/finish/index.tsx
deleted file mode 100644
index 289f351de..000000000
--- a/web/apps/photos/src/pages/passkeys/finish/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import PasskeysFinishPage from "@ente/accounts/pages/passkeys/finish";
-
-const PasskeysFinish = () => {
-    return (
-        <>
-            <PasskeysFinishPage />
-        </>
-    );
-};
-
-export default PasskeysFinish;
diff --git a/web/apps/photos/src/pages/recover.tsx b/web/apps/photos/src/pages/recover.tsx
new file mode 100644
index 000000000..cc6d8da82
--- /dev/null
+++ b/web/apps/photos/src/pages/recover.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/recover";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/recover/index.tsx b/web/apps/photos/src/pages/recover/index.tsx
deleted file mode 100644
index 06d755f7e..000000000
--- a/web/apps/photos/src/pages/recover/index.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import RecoverPage from "@ente/accounts/pages/recover";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Recover() {
-    const appContext = useContext(AppContext);
-
-    return <RecoverPage appContext={appContext} appName={APPS.PHOTOS} />;
-}
diff --git a/web/apps/photos/src/pages/signup.tsx b/web/apps/photos/src/pages/signup.tsx
new file mode 100644
index 000000000..8cc5202a8
--- /dev/null
+++ b/web/apps/photos/src/pages/signup.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/signup";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/signup/index.tsx b/web/apps/photos/src/pages/signup/index.tsx
deleted file mode 100644
index 29b139f86..000000000
--- a/web/apps/photos/src/pages/signup/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import SignupPage from "@ente/accounts/pages/signup";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Sigup() {
-    const appContext = useContext(AppContext);
-    return <SignupPage appContext={appContext} appName={APPS.PHOTOS} />;
-}
diff --git a/web/apps/photos/src/pages/two-factor/recover.tsx b/web/apps/photos/src/pages/two-factor/recover.tsx
new file mode 100644
index 000000000..aa9c6faf9
--- /dev/null
+++ b/web/apps/photos/src/pages/two-factor/recover.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/two-factor/recover";
+import { useContext } from "react";
+import { AppContext } from "../_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/two-factor/recover/index.tsx b/web/apps/photos/src/pages/two-factor/recover/index.tsx
deleted file mode 100644
index f3f820d6e..000000000
--- a/web/apps/photos/src/pages/two-factor/recover/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import TwoFactorRecoverPage from "@ente/accounts/pages/two-factor/recover";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function TwoFactorRecover() {
-    const appContext = useContext(AppContext);
-    return (
-        <TwoFactorRecoverPage appContext={appContext} appName={APPS.PHOTOS} />
-    );
-}
diff --git a/web/apps/photos/src/pages/two-factor/setup.tsx b/web/apps/photos/src/pages/two-factor/setup.tsx
new file mode 100644
index 000000000..35a24149f
--- /dev/null
+++ b/web/apps/photos/src/pages/two-factor/setup.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/two-factor/setup";
+import { useContext } from "react";
+import { AppContext } from "../_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/two-factor/setup/index.tsx b/web/apps/photos/src/pages/two-factor/setup/index.tsx
deleted file mode 100644
index 2830560e9..000000000
--- a/web/apps/photos/src/pages/two-factor/setup/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import TwoFactorSetupPage from "@ente/accounts/pages/two-factor/setup";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function TwoFactorSetup() {
-    const appContext = useContext(AppContext);
-    return <TwoFactorSetupPage appContext={appContext} appName={APPS.PHOTOS} />;
-}
diff --git a/web/apps/photos/src/pages/two-factor/verify.tsx b/web/apps/photos/src/pages/two-factor/verify.tsx
new file mode 100644
index 000000000..3f4ed7e39
--- /dev/null
+++ b/web/apps/photos/src/pages/two-factor/verify.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/two-factor/verify";
+import { useContext } from "react";
+import { AppContext } from "../_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/two-factor/verify/index.tsx b/web/apps/photos/src/pages/two-factor/verify/index.tsx
deleted file mode 100644
index 65914dcdf..000000000
--- a/web/apps/photos/src/pages/two-factor/verify/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import TwoFactorVerifyPage from "@ente/accounts/pages/two-factor/verify";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function TwoFactorVerify() {
-    const appContext = useContext(AppContext);
-    return (
-        <TwoFactorVerifyPage appContext={appContext} appName={APPS.PHOTOS} />
-    );
-}
diff --git a/web/apps/photos/src/pages/verify.tsx b/web/apps/photos/src/pages/verify.tsx
new file mode 100644
index 000000000..5fb2ed10d
--- /dev/null
+++ b/web/apps/photos/src/pages/verify.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/verify";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/photos/src/pages/verify/index.tsx b/web/apps/photos/src/pages/verify/index.tsx
deleted file mode 100644
index 081ea9e5e..000000000
--- a/web/apps/photos/src/pages/verify/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import VerifyPage from "@ente/accounts/pages/verify";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Verify() {
-    const appContext = useContext(AppContext);
-    return <VerifyPage appContext={appContext} appName={APPS.PHOTOS} />;
-}