fixed redirect

Author: 092vk

src/contexts/AuthContext.tsx

@@ -100,7 +100,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
     try {
       const { error } = await supabase.auth.signInWithPassword({ email, password });
       if (error) throw error;
-      navigate('/');
+      // Don't navigate here - let the Login component handle it via <Navigate>
     } catch (error: any) {
       toast({
         title: "Error signing in",
@@ -129,7 +129,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
         description: "Please check your email to verify your account.",
       });
 
-      navigate('/auth/login');
+      // Don't navigate here - let the Register component handle it via <Navigate>
     } catch (error: any) {
       toast({
         title: "Error signing up",

src/pages/auth/Login.tsx

@@ -1,7 +1,7 @@
 
 import React from 'react';
 import { useForm } from 'react-hook-form';
-import { Link, Navigate } from 'react-router-dom';
+import { Link, Navigate, useSearchParams } from 'react-router-dom';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
@@ -18,6 +18,7 @@ type LoginFormValues = z.infer<typeof loginSchema>;
 
 const Login = () => {
   const { user, signIn } = useAuth();
+  const [searchParams] = useSearchParams();
   const form = useForm<LoginFormValues>({
     resolver: zodResolver(loginSchema),
     defaultValues: {
@@ -38,6 +39,14 @@ const Login = () => {
   };
 
   if (user) {
+    const redirect = searchParams.get('redirect');
+    const showForm = searchParams.get('showForm');
+        
+    if (redirect) {
+      const redirectUrl = showForm ? `${redirect}?showForm=${showForm}` : redirect;
+      return <Navigate to={redirectUrl} replace />;
+    }
+    
     return <Navigate to="/" replace />;
   }
 
@@ -102,7 +111,10 @@ const Login = () => {
 
         <p className="mt-4 text-center text-sm text-muted-foreground">
           Don't have an account?{' '}
-          <Link to="/auth/register" className="font-medium text-primary hover:text-accent">
+          <Link 
+            to={`/auth/register${searchParams.toString() ? `?${searchParams.toString()}` : ''}`}
+            className="font-medium text-primary hover:text-accent"
+          >
             Sign up
           </Link>
         </p>

src/pages/auth/Register.tsx

@@ -1,7 +1,7 @@
 
 import React from 'react';
 import { useForm } from 'react-hook-form';
-import { Link, Navigate } from 'react-router-dom';
+import { Link, Navigate, useSearchParams } from 'react-router-dom';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
@@ -19,6 +19,7 @@ type RegisterFormValues = z.infer<typeof registerSchema>;
 
 const Register = () => {
   const { user, signUp } = useAuth();
+  const [searchParams] = useSearchParams();
   const form = useForm<RegisterFormValues>({
     resolver: zodResolver(registerSchema),
     defaultValues: {
@@ -40,6 +41,15 @@ const Register = () => {
   };
 
   if (user) {
+    // Check for redirect parameter
+    const redirect = searchParams.get('redirect');
+    const showForm = searchParams.get('showForm');
+    
+    if (redirect) {
+      const redirectUrl = showForm ? `${redirect}?showForm=${showForm}` : redirect;
+      return <Navigate to={redirectUrl} replace />;
+    }
+    
     return <Navigate to="/" replace />;
   }
 
@@ -122,7 +132,10 @@ const Register = () => {
 
         <p className="mt-4 text-center text-sm text-muted-foreground">
           Already have an account?{' '}
-          <Link to="/auth/login" className="font-medium text-primary hover:text-accent">
+          <Link 
+            to={`/auth/login${searchParams.toString() ? `?${searchParams.toString()}` : ''}`}
+            className="font-medium text-primary hover:text-accent"
+          >
             Sign in
           </Link>
         </p>

src/pages/categories/Architects.tsx

@@ -1,14 +1,16 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useRef } from "react";
 import { supabase } from "@/integrations/supabase/client";
 import { useAuth } from "@/contexts/AuthContext";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
 import Navbar from "@/components/Navbar";
 import Footer from "@/components/Footer";
 import { Loader2, CheckCircle2, Smile } from "lucide-react";
 
 const ArchitectsPage = () => {
   const { user } = useAuth();
   const navigate = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const formRef = useRef<HTMLElement>(null);
   const [architects, setArchitects] = useState<any[]>([]);
   const [loading, setLoading] = useState(true);
   const [search, setSearch] = useState("");
@@ -56,6 +58,25 @@ const ArchitectsPage = () => {
     if (user) checkIfRegistered();
   }, [user]);
 
+  useEffect(() => {
+    const shouldShowForm = searchParams.get("showForm");
+
+    if (shouldShowForm === "true" && user && !isAlreadyRegistered) {
+      setShowForm(true);
+
+      const newSearchParams = new URLSearchParams(searchParams);
+      newSearchParams.delete("showForm");
+      setSearchParams(newSearchParams, { replace: true });
+
+      setTimeout(() => {
+        formRef.current?.scrollIntoView({ 
+          behavior: "smooth", 
+          block: "start" 
+        });
+      }, 300);
+    }
+  }, [user, isAlreadyRegistered]);
+
   // ✅ Handle input
   const handleChange = (
     e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
@@ -179,11 +200,17 @@ const ArchitectsPage = () => {
 
   const handleRegisterClick = () => {
     if (!user) {
-      navigate("/auth/login");
+      navigate("/auth/login?redirect=/categories/architects&showForm=true");
     } else if (isAlreadyRegistered) {
       setMessage("You are already registered as an architect.");
     } else {
       setShowForm(true);
+      setTimeout(() => {
+        formRef.current?.scrollIntoView({ 
+          behavior: "smooth", 
+          block: "start" 
+        });
+      }, 100);
     }
   };
 
@@ -278,7 +305,10 @@ const ArchitectsPage = () => {
 
       {/* Registration Form */}
       {showForm && user && !isAlreadyRegistered && (
-        <section className="max-w-4xl mx-auto mt-10 bg-gray-50 p-6 rounded-2xl shadow-md border border-gray-200 relative">
+        <section 
+          ref={formRef}
+          className="max-w-4xl mx-auto mt-10 bg-gray-50 p-6 rounded-2xl shadow-md border border-gray-200 relative"
+        >
           <button
             onClick={() => setShowForm(false)}
             className="absolute top-4 right-4 text-gray-600 hover:text-gray-800 text-3xl font-bold"