merge-master

Author: Fryingpannn

app/(auth)/reset-password/layout.tsx

@@ -1,7 +1,11 @@
 import Page from "./page";
-export const metadata = {
-  title: "Reset Password - Open PRO",
-  description: "Page description",
-};
+import { constructMetadata } from "@/lib/utils"
+import { Metadata } from "next/types"
+
+export const metadata: Metadata = constructMetadata({
+  title: 'Reset Password',
+  description: 'Reset your password',
+  canonical: '/reset-password',
+})
 
 export default Page;

app/(auth)/signin/layout.tsx

@@ -1,7 +1,11 @@
 import Page from "./page";
-export const metadata = {
-  title: "Sign In - Open PRO",
-  description: "Page description",
-};
+import { constructMetadata } from "@/lib/utils"
+import { Metadata } from "next/types"
+
+export const metadata: Metadata = constructMetadata({
+  title: 'Sign In',
+  description: 'Sign in to your account',
+  canonical: '/signin',
+})
 
 export default Page;

app/(auth)/signin/page.tsx

@@ -6,11 +6,6 @@ export default async function SignIn() {
   const supabase = createClient();
   const { data } = await supabase.auth.getUser();
 
-  if (process.env.NODE_ENV === "production") {
-    // Temporarily redirect to home page in production until we have a proper backend auth flow
-    redirect("/");
-  }
-
   if (data?.user) {
     redirect("/");
   }

app/(auth)/signup/layout.tsx

@@ -1,7 +1,11 @@
 import Page from "./page";
-export const metadata = {
-  title: "Sign Up - Open PRO",
-  description: "Page description",
-};
+import { constructMetadata } from "@/lib/utils"
+import { Metadata } from "next/types"
+
+export const metadata: Metadata = constructMetadata({
+  title: 'Sign Up',
+  description: 'Sign up for an account',
+  canonical: '/signup',
+})
 
 export default Page;

app/(auth)/signup/page.tsx

@@ -3,14 +3,9 @@ import { createClient } from "@/utils/supabase/server";
 import SignUpComponent from "@/components/auth/signup";
 
 export default async function SignUp() {
-  const supabase = createClient();
-  const { data } = await supabase.auth.getUser();
-
-  if (process.env.NODE_ENV === "production") {
-    // Temporarily redirect to home page in production until we have a proper backend auth flow
-    redirect("/");
-  }
-
+  const supabase = createClient()
+  const { data } = await supabase.auth.getUser()
+  
   if (data?.user) {
     redirect("/");
   }

app/(profile)/settings/layout.tsx

@@ -0,0 +1,11 @@
+import Page from "./page";
+import { constructMetadata } from "@/lib/utils"
+import { Metadata } from "next/types"
+
+export const metadata: Metadata = constructMetadata({
+  title: 'Settings',
+  description: 'Settings for your account.',
+  canonical: '/settings',
+})
+
+export default Page;

app/(profile)/settings/page.tsx

@@ -0,0 +1,39 @@
+import { redirect } from 'next/navigation'
+import { createClient } from '@/utils/supabase/server'
+
+export default async function Settings() {
+  const supabase = createClient()
+
+  const { data, error } = await supabase.auth.getUser()
+  if (error || !data?.user) {
+    redirect('/signin')
+  }
+  
+  return (
+    <section className="relative">
+      <div className="max-w-6xl mx-auto px-4 sm:px-6">
+        <div className="pt-32 pb-12 md:pt-40 md:pb-20">
+
+          {/* Page header */}
+          <div className="max-w-3xl mx-auto text-center pb-12 md:pb-20">
+          <h1 className="h1">Settings</h1>
+          </div>
+
+          {/* Settings */}
+          <div className="max-w-sm mx-auto">
+            <div className="flex flex-wrap -mx-3 mb-4">
+              <div className="w-full px-3">
+                <p className="text-gray-300 text-sm font-medium mb-1">
+                  Full Name: {data.user.user_metadata.full_name}
+                </p>
+                <p className="text-gray-300 text-sm font-medium mb-1">
+                  Email: {data.user.email}
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </section>
+  )
+}

components/ui/authbutton.tsx

@@ -31,11 +31,21 @@ export default async function AuthButton() {
           </Link>
         </>
       ) : (
+        <>
+          <Link
+            href="/settings"
+            className="font-medium inline-flex items-center justify-center border border-transparent px-4 py-2 my-2 mx-4 rounded-sm text-white bg-purple-600 hover:bg-purple-700 transition duration-150 ease-in-out"
+          >
+            Settings
+          </Link>
         <form action={handleSignOut}>
-          <button className="my-2 ml-4 inline-flex items-center justify-center rounded-sm border border-transparent bg-purple-600 px-4 py-2 font-medium text-white transition duration-150 ease-in-out hover:bg-purple-700">
+          <button
+            className="font-medium inline-flex items-center justify-center border border-transparent px-4 py-2 my-2  rounded-sm text-white bg-gray-700 hover:bg-gray-800 transition duration-150 ease-in-out"
+          >
             Sign out
           </button>
         </form>
+        </>
       )}
     </div>
   );

middleware.ts

@@ -3,8 +3,10 @@ import { updateSession } from "./utils/supabase/middleware";
 
 export async function middleware(request: NextRequest) {
   if (
-    request.nextUrl.pathname.startsWith("/signin") ||
-    request.nextUrl.pathname.startsWith("/signup")
+    (request.nextUrl.pathname.startsWith("/signin") ||
+    request.nextUrl.pathname.startsWith("/signup"))
+    // FEATURE FLAG
+    && process.env.NODE_ENV === "production"
   ) {
     return NextResponse.redirect(new URL("/", request.url));
   }