+ Forgot Password
+
+ Enter your email to receive a Magic Link to reset your password.
+
+
+ {
+ execute({ email });
+ }}
+ isLoading={status === 'executing'}
+ view="forgot-password"
+ />
+
+
+ {emailSentSuccessMessage ? (
+
+ );
+}
diff --git a/src/app/(dynamic-pages)/(login-pages)/(login-pages)/login/NewLogin.tsx b/src/app/(dynamic-pages)/(login-pages)/(login-pages)/login/NewLogin.tsx
new file mode 100644
index 00000000..f6a5aa7e
--- /dev/null
+++ b/src/app/(dynamic-pages)/(login-pages)/(login-pages)/login/NewLogin.tsx
@@ -0,0 +1,190 @@
+import { Button } from '@/components/ui/button';
+import { Card } from '@/components/ui/card';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
+import Link from 'next/link';
+
+export function NewLoginPage() {
+ return (
+
+
+
+ Password
+ Magic Link
+ Social Login
+
+
+
+
+ Login to NextBase
+
+ Login with the account you used to signup.
+
+
+
+ {
+ executePassword({
+ email: data.email,
+ password: data.password,
+ });
+ }}
+ view="sign-in"
+ />
+
+
+
+
+
+
+
+ Login to NextBase
+
+ Login with magic link we will send to your email.
+
+
+
+ executeMagicLink({ email, next })}
+ isLoading={magicLinkStatus === 'executing'}
+ view="sign-in"
+ />
+
+
+
+
+
+
+ Login to NextBase
+
+ Login with your social account.
+
+
+
+ executeProvider({ provider, next })}
+ />
+
+
+
+
+
+ )}
+
+
+ );
+}
+
+function ChromeIcon(props) {
+ return (
+
+ );
+}
+
+function GithubIcon(props) {
+ return (
+
+ );
+}
+
+function TwitterIcon(props) {
+ return (
+
+ );
+}
+
+function XIcon(props) {
+ return (
+
+ );
+}
diff --git a/src/app/(dynamic-pages)/(login-pages)/(login-pages)/login/page.tsx b/src/app/(dynamic-pages)/(login-pages)/(login-pages)/login/page.tsx
new file mode 100644
index 00000000..47cc408d
--- /dev/null
+++ b/src/app/(dynamic-pages)/(login-pages)/(login-pages)/login/page.tsx
@@ -0,0 +1,12 @@
+import { z } from 'zod';
+import { Login } from './Login';
+
+const SearchParamsSchema = z.object({
+ next: z.string().optional(),
+ nextActionType: z.string().optional(),
+});
+
+export default function LoginPage({ searchParams }: { searchParams: unknown }) {
+ const { next, nextActionType } = SearchParamsSchema.parse(searchParams);
+ return
+
+
+
+ Magic Link
+ Email & Password
+
+
+
+
+
+
+
+
+
+
+
+
+ Welcome Back
++ Please log in to your account +
+
+
+
+ Or login with
+
+
+
+
+
+
+
+
+ Already have an account?
+
+
+ Forgot password?
+
+
+
+ 
+
+
+
+ {successMessage ? (
+
+ );
+}
diff --git a/src/app/(dynamic-pages)/(login-pages)/(login-pages)/sign-up/page.tsx b/src/app/(dynamic-pages)/(login-pages)/(login-pages)/sign-up/page.tsx
new file mode 100644
index 00000000..731c9081
--- /dev/null
+++ b/src/app/(dynamic-pages)/(login-pages)/(login-pages)/sign-up/page.tsx
@@ -0,0 +1,16 @@
+import { z } from 'zod';
+import { SignUp } from './Signup';
+
+const SearchParamsSchema = z.object({
+ next: z.string().optional(),
+ nextActionType: z.string().optional(),
+});
+
+export default function SignUpPage({
+ searchParams,
+}: {
+ searchParams: unknown;
+}) {
+ const { next, nextActionType } = SearchParamsSchema.parse(searchParams);
+ return
+
+
+ Password
+ Magic Link
+ Social Login
+
+
+
+
+
+ Register to NextBase
+
+ Create an account with your email and password
+
+
+
+ {
+ executeSignUp({ ...data, next });
+ }}
+ view="sign-up"
+ />
+
+
+
+
+
+
+ Register to NextBase
+
+ Create an account with magic link we will send to your email
+
+
+
+ executeMagicLink({ email, next })}
+ isLoading={magicLinkStatus === 'executing'}
+ view="sign-up"
+ />
+
+
+
+
+
+
+ Register to NextBase
+
+ Register with your social account
+
+
+
+
+ ) => executeProvider({ provider, next })}
+ />
+
+
+
+
+
+ )}
+
+
+ );
+}
diff --git a/src/app/(dynamic-pages)/(login-pages)/(login-pages)/update-password/page.tsx b/src/app/(dynamic-pages)/(login-pages)/(login-pages)/update-password/page.tsx
new file mode 100644
index 00000000..560a91fc
--- /dev/null
+++ b/src/app/(dynamic-pages)/(login-pages)/(login-pages)/update-password/page.tsx
@@ -0,0 +1,7 @@
+import { getCachedLoggedInVerifiedSupabaseUser } from '@/rsc-data/supabase';
+import { UpdatePassword } from './UpdatePassword';
+
+export default async function UpdatePasswordPage() {
+ await getCachedLoggedInVerifiedSupabaseUser();
+ return
+
+
+ Reset Password
+
+ Enter your email to receive a Magic Link to reset your password.
+
+
+
+ execute({ password })}
+ label="Create your new Password"
+ buttonLabel="Confirm Password"
+ />
+
+
+
+
-
- );
-}
diff --git a/src/app/(dynamic-pages)/(login-pages)/forgot-password/ForgotPassword.tsx b/src/app/(dynamic-pages)/(login-pages)/forgot-password/ForgotPassword.tsx
deleted file mode 100644
index 37e3bf33..00000000
--- a/src/app/(dynamic-pages)/(login-pages)/forgot-password/ForgotPassword.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-'use client';
-import { Email } from '@/components/Auth/Email';
-import { T } from '@/components/ui/Typography';
-import { useResetPassword } from '@/utils/react-query-hooks';
-import { useState } from 'react';
-
-export function ForgotPassword() {
- const [successMessage, setSuccessMessage] = useState
-
-
-
- {children}
-
- {/* Background Overlay */}
-
- {/* Blue Background Image */}
-
-
-
-
-
-
-
-
-
-
-
-
- ＂
- We are now able to ship our product quicker, allowing us to - focus on building the features that matter most to our - customers and not worry about the infrastructure. -
- ⭐️ ⭐️ ⭐️ ⭐️ ⭐️
-
- Jonathan Smith - CEO of Company
-
-
-
-
- );
-}
diff --git a/src/app/(dynamic-pages)/(login-pages)/init-auth/page.tsx b/src/app/(dynamic-pages)/(login-pages)/init-auth/page.tsx
deleted file mode 100644
index 72f72732..00000000
--- a/src/app/(dynamic-pages)/(login-pages)/init-auth/page.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-'use client';
-import { T } from '@/components/ui/Typography';
-import { useSession } from '@supabase/auth-helpers-react';
-import { useRouter } from 'next/navigation';
-import { useState } from 'react';
-import { useDidMount } from 'rooks';
-
-export default function HomePage() {
- const session = useSession();
- const router = useRouter();
- const [loadingState, setLoadingState] = useState<
- 'loading' | 'logged-in' | 'logged-out'
- >('loading');
-
- // Intentionally not using useEffect here because we want to run this
- // code only once, on mount and not interrupt auth flow.
- useDidMount(() => {
- if (session?.user) {
- setLoadingState('logged-in');
- router.push('/dashboard');
- } else {
- setLoadingState('logged-out');
- router.push('/login');
- }
- });
-
- let content = Please wait...;
- if (loadingState === 'logged-in') {
- content = Redirecting to dashboard...;
- } else if (loadingState === 'logged-out') {
- content = (
-
- {/* {
- magicLinkMutation.mutate({
- email,
- });
- }}
- successMessage={successMessage}
- isLoading={magicLinkMutation.isLoading}
- view="forgot-password"
- />
-
-
- Forgot Password
-
- Enter your email to recieve a Magic Link to reset your password.
-
-
-
-
- Not logged in
- Redirecting to login...
-
- );
- }
-
- return (
-
- {content}
-
- );
-}
diff --git a/src/app/(dynamic-pages)/(login-pages)/login/Login.tsx b/src/app/(dynamic-pages)/(login-pages)/login/Login.tsx
deleted file mode 100644
index 23444ec1..00000000
--- a/src/app/(dynamic-pages)/(login-pages)/login/Login.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-'use client';
-import { RenderProviders } from '@/components/Auth/RenderProviders';
-import { Email } from '@/components/Auth/Email';
-import { EmailAndPassword } from '@/components/Auth/EmailAndPassword';
-import {
- useSignInWithMagicLink,
- useSignInWithPassword,
- useSignInWithProvider,
-} from '@/utils/react-query-hooks';
-import { useState } from 'react';
-import { useRouter } from 'next/navigation';
-import { T } from '@/components/ui/Typography';
-
-export function Login() {
- const router = useRouter();
-
- function redirectToDashboard() {
- router.refresh();
- router.push('/auth/callback');
- }
- const [successMessage, setSuccessMessage] = useState
-
- );
-}
diff --git a/src/app/(dynamic-pages)/(login-pages)/login/page.tsx b/src/app/(dynamic-pages)/(login-pages)/login/page.tsx
deleted file mode 100644
index 911b2aa7..00000000
--- a/src/app/(dynamic-pages)/(login-pages)/login/page.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Login } from './Login';
-
-export default function LoginPage() {
- return
- {/* {
- providerMutation.mutate({
- provider,
- });
- }}
- />
-
- {
- magicLinkMutation.mutate({
- email,
- });
- }}
- successMessage={successMessage}
- isLoading={magicLinkMutation.isLoading}
- view="sign-in"
- />
-
- {
- passwordMutation.mutate(data);
- }}
- view="sign-in"
- />
-
-
- Login to Nextbase
-
- Login with the account you used to signup.
-
-
- -
-
- {isSuccessful ? (
-
- );
-}
diff --git a/src/app/(dynamic-pages)/(login-pages)/sign-up/page.tsx b/src/app/(dynamic-pages)/(login-pages)/sign-up/page.tsx
deleted file mode 100644
index f7756181..00000000
--- a/src/app/(dynamic-pages)/(login-pages)/sign-up/page.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SignUp } from './Signup';
-
-export default function SignupPage() {
- return - We sent you an email with a confirmation link. Please confirm your - email address. -
- ) : ( -
- {/* {
- providerMutation.mutate({
- provider,
- });
- }}
- />
-
- {
- magicLinkMutation.mutate({
- email,
- });
- }}
- successMessage={successMessage}
- isLoading={magicLinkMutation.isLoading}
- view="sign-up"
- />
-
- {
- passwordMutation.mutate(data);
- }}
- view="sign-up"
- />
-
- )}
-
-
- Signup to Nextbase
-- How would you like to signup? -
--
-
-
- );
-}
diff --git a/src/app/(dynamic-pages)/(login-pages)/update-password/page.tsx b/src/app/(dynamic-pages)/(login-pages)/update-password/page.tsx
deleted file mode 100644
index 72326472..00000000
--- a/src/app/(dynamic-pages)/(login-pages)/update-password/page.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { UpdatePassword } from './UpdatePassword';
-
-export default function UpdatePasswordPage() {
- return
- {/* {
- updatePasswordMutation.mutate({
- password,
- });
- }}
- label="Create your new Password"
- buttonLabel="Confirm Password"
- />
-
-
-
-
- Reset Password
-- Create a strong new password for your account -
-