Fix register pages: both have 2 steps with ID upload, OTP as modal overlay

app/register/owner/page.js

@@ -17,7 +17,8 @@ import { OwnerType, OwnerTypeLabels } from '../../enums';
 
 export default function OwnerRegisterPage() {
   const router = useRouter();
-  const [step, setStep] = useState(1); // 1=form, 2=id images, 3=OTP
+  const [step, setStep] = useState(1); // 1=form, 2=id images
+  const [showOtpModal, setShowOtpModal] = useState(false);
   const [showPassword, setShowPassword] = useState(false);
   const [showConfirmPassword, setShowConfirmPassword] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
@@ -134,7 +135,6 @@ export default function OwnerRegisterPage() {
       console.log('[OwnerRegister] addOwner response:', res);
 
       if (res.status === 200 || res.ok) {
-        // ── Store temp token for OTP flow ──
         const tempToken = res.data;
         if (tempToken) {
           AuthService.addToken(tempToken);
@@ -142,36 +142,26 @@ export default function OwnerRegisterPage() {
         }
 
         const apiMessage = res.message || res.data?.message;
-        toast.success(apiMessage || 'تم إنشاء الحساب! يرجى التحقق من بريدك الإلكتروني', {
-          duration: 4000,
-        });
+        toast.success(apiMessage || 'تم إنشاء الحساب! يرجى التحقق من بريدك الإلكتروني', { duration: 4000 });
 
-        // ── Auto-login to trigger OTP ──
+        // Auto-login to trigger OTP
         console.log('[OwnerRegister] Auto-login to send OTP...');
         const loginRes = await loginWithEmail(formData.email, formData.password);
         console.log('[OwnerRegister] login response:', loginRes);
 
         if (loginRes.status === 206) {
-          // OTP sent — move to OTP step
           const otpToken = loginRes.data;
-          if (otpToken) {
-            AuthService.addToken(otpToken);
-            console.log('[OwnerRegister] OTP token stored');
-          }
+          if (otpToken) AuthService.addToken(otpToken);
           const loginMsg = loginRes.message || loginRes.data?.message;
           toast(loginMsg || 'تم إرسال رمز التحقق إلى بريدك الإلكتروني', { icon: '📧' });
-          setStep(3);
+          setShowOtpModal(true);
         } else if (loginRes.status === 200) {
-          // Direct login success (no OTP needed)
           const loginToken = loginRes.data;
-          if (loginToken) {
-            AuthService.addToken(loginToken);
-          }
+          if (loginToken) AuthService.addToken(loginToken);
           toast.success(loginRes.message || 'تم تسجيل الدخول بنجاح!');
           router.push('/');
         }
       } else {
-        // Registration failed
         const errMsg = res.message || res.data?.message || 'فشل في إنشاء الحساب';
         console.error('[OwnerRegister] Registration failed:', errMsg);
         toast.error(errMsg);
@@ -199,17 +189,11 @@ export default function OwnerRegisterPage() {
       console.log('[OwnerRegister] VerifyEmail response:', res);
 
       if (res.status === 200) {
-        // ── Verified! Remove temp token, redirect to login ──
         AuthService.deleteToken();
         console.log('[OwnerRegister] Temp token removed after verification');
-
-        toast.success(res.message || 'تم التحقق من البريد الإلكتروني بنجاح!', {
-          duration: 3000,
-        });
-
-        setTimeout(() => {
-          router.push('/login');
-        }, 1500);
+        toast.success(res.message || 'تم التحقق من البريد الإلكتروني بنجاح!', { duration: 3000 });
+        setShowOtpModal(false);
+        setTimeout(() => router.push('/login'), 1500);
       } else {
         const errMsg = res.message || res.data?.message || 'رمز التحقق غير صحيح';
         console.error('[OwnerRegister] Verification failed:', errMsg);
@@ -223,11 +207,9 @@ export default function OwnerRegisterPage() {
     }
   };
 
-  // ─── Resend OTP ───
   const handleResendOTP = async () => {
     setIsLoading(true);
     console.log('[OwnerRegister] Resending email OTP...');
-
     try {
       await sendEmailOTP();
       toast.success('تم إرسال رمز تحقق جديد');
@@ -253,82 +235,58 @@ export default function OwnerRegisterPage() {
     <div className="min-h-screen bg-gradient-to-br from-gray-950 via-gray-900 to-gray-950 flex items-center justify-center p-4 relative overflow-hidden">
       <Toaster position="top-center" reverseOrder={false} />
 
-      {/* Background blobs */}
       <div className="absolute inset-0 overflow-hidden">
         {[...Array(20)].map((_, i) => (
-          <motion.div
-            key={i}
-            className="absolute rounded-full bg-amber-500/10"
-            style={{
-              left: `${Math.random() * 100}%`, top: `${Math.random() * 100}%`,
-              width: Math.random() * 200 + 50, height: Math.random() * 200 + 50,
-            }}
+          <motion.div key={i} className="absolute rounded-full bg-amber-500/10"
+            style={{ left: `${Math.random() * 100}%`, top: `${Math.random() * 100}%`, width: Math.random() * 200 + 50, height: Math.random() * 200 + 50 }}
             animate={{ x: [0, Math.random() * 100 - 50, 0], y: [0, Math.random() * 100 - 50, 0] }}
-            transition={{ duration: Math.random() * 15 + 15, repeat: Infinity, ease: "linear" }}
-          />
+            transition={{ duration: Math.random() * 15 + 15, repeat: Infinity, ease: "linear" }} />
         ))}
       </div>
 
-      <motion.div
-        initial={{ opacity: 0, scale: 0.95 }}
-        animate={{ opacity: 1, scale: 1 }}
-        transition={{ duration: 0.5 }}
-        className="relative z-10 w-full max-w-2xl"
-      >
-        {/* Progress bar */}
+      <motion.div initial={{ opacity: 0, scale: 0.95 }} animate={{ opacity: 1, scale: 1 }} transition={{ duration: 0.5 }}
+        className="relative z-10 w-full max-w-2xl">
+        {/* Progress */}
         <div className="mb-8">
           <div className="flex items-center justify-between mb-4">
             <Link href="/auth/choose-role" className="flex items-center gap-2 text-gray-400 hover:text-white transition-colors group">
               <motion.div whileHover={{ x: -5 }}><ArrowLeft className="w-4 h-4" /></motion.div>
               <span>العودة</span>
             </Link>
-            <span className="text-sm text-gray-400">خطوة {step} من 3</span>
+            <span className="text-sm text-gray-400">خطوة {step} من 2</span>
           </div>
           <div className="flex gap-2">
-            {[1, 2, 3].map((s) => (
+            {[1, 2].map((s) => (
               <motion.div key={s} className={`h-2 flex-1 rounded-full ${step >= s ? 'bg-amber-500' : 'bg-gray-700'}`} animate={{ scaleX: step >= s ? 1 : 0.5 }} />
             ))}
           </div>
         </div>
 
-        <motion.div
-          key={step}
-          initial={{ opacity: 0, x: 20 }}
-          animate={{ opacity: 1, x: 0 }}
-          exit={{ opacity: 0, x: -20 }}
-          transition={{ duration: 0.3 }}
-          className="bg-white/5 backdrop-blur-xl rounded-3xl shadow-2xl border border-white/10 overflow-hidden"
-        >
-          {/* Header */}
+        <motion.div key={step} initial={{ opacity: 0, x: 20 }} animate={{ opacity: 1, x: 0 }} exit={{ opacity: 0, x: -20 }} transition={{ duration: 0.3 }}
+          className="bg-white/5 backdrop-blur-xl rounded-3xl shadow-2xl border border-white/10 overflow-hidden">
           <div className="bg-gradient-to-r from-amber-500 to-amber-600 p-8 text-center relative overflow-hidden">
             <motion.div initial={{ scale: 0 }} animate={{ scale: 1 }} transition={{ delay: 0.2, type: "spring" }}
               className="absolute -top-10 -right-10 w-40 h-40 bg-white/10 rounded-full" />
             <motion.div initial={{ y: 20, opacity: 0 }} animate={{ y: 0, opacity: 1 }} className="relative z-10">
-              <motion.div
-                animate={{ rotate: [0, 10, -10, 0] }}
-                transition={{ duration: 2, repeat: Infinity }}
-                className="w-20 h-20 mx-auto mb-4 bg-white/20 rounded-2xl flex items-center justify-center backdrop-blur-sm"
-              >
-                {step === 3 ? <KeyRound className="w-10 h-10 text-white" /> : <Building className="w-10 h-10 text-white" />}
+              <motion.div animate={{ rotate: [0, 10, -10, 0] }} transition={{ duration: 2, repeat: Infinity }}
+                className="w-20 h-20 mx-auto mb-4 bg-white/20 rounded-2xl flex items-center justify-center backdrop-blur-sm">
+                <Building className="w-10 h-10 text-white" />
               </motion.div>
               <h1 className="text-3xl font-bold text-white mb-2">
-                {step === 1 ? 'معلومات المالك' : step === 2 ? 'الوثائق الرسمية' : 'التحقق من البريد'}
+                {step === 1 ? 'معلومات المالك' : 'الوثائق الرسمية'}
               </h1>
               <p className="text-amber-100">
-                {step === 1 ? 'أدخل معلوماتك الأساسية' : step === 2 ? 'يرجى رفع صور الهوية للتحقق' : 'أدخل رمز التحقق المرسل إلى بريدك'}
+                {step === 1 ? 'أدخل معلوماتك الأساسية' : 'يرجى رفع صور الهوية للتحقق'}
               </p>
             </motion.div>
           </div>
 
           <div className="p-8">
-            <motion.form
-              variants={staggerContainer}
-              initial="initial"
-              animate="animate"
-              onSubmit={step === 1 ? handleNextStep : step === 2 ? handleSubmit : (e) => { e.preventDefault(); handleVerifyOTP(); }}
-              className="space-y-6"
-            >
-              {/* ─── STEP 1: Form fields ─── */}
+            <motion.form variants={staggerContainer} initial="initial" animate="animate"
+              onSubmit={step === 1 ? (e) => { e.preventDefault(); handleNextStep(); } : handleSubmit}
+              className="space-y-6">
+
+              {/* ─── STEP 1: Form ─── */}
               {step === 1 && (
                 <>
                   <motion.div variants={fadeInUp}>
@@ -387,20 +345,15 @@ export default function OwnerRegisterPage() {
                     {errors.whatsapp && <p className="text-red-500 text-sm mt-1">{errors.whatsapp}</p>}
                   </motion.div>
 
-                  {/* Owner Type */}
                   <motion.div variants={fadeInUp}>
                     <label className="block text-sm font-medium text-gray-300 mb-2">نوع المالك <span className="text-red-500">*</span></label>
-                    <select
-                      value={formData.ownerType}
+                    <select value={formData.ownerType}
                       onChange={(e) => setFormData({...formData, ownerType: e.target.value})}
-                      className="w-full py-3 px-4 bg-white/5 border border-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500 focus:border-transparent text-white appearance-none cursor-pointer"
-                    >
+                      className="w-full py-3 px-4 bg-white/5 border border-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500 focus:border-transparent text-white appearance-none cursor-pointer">
                       {Object.entries(OwnerTypeLabels).map(([value, label]) => (
                         <option key={value} value={value} className="bg-gray-900 text-white">{label}</option>
                       ))}
                     </select>
-                    <p className="text-xs text-gray-500 mt-1">المحدد: {OwnerTypeLabels[formData.ownerType]}</p>
-                    <p className="text-xs text-gray-600">[Console] ownerType = {formData.ownerType}</p>
                   </motion.div>
 
                   <motion.div variants={fadeInUp}>
@@ -414,7 +367,7 @@ export default function OwnerRegisterPage() {
                         className={`w-full pr-12 pl-12 py-3 bg-white/5 border rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500 focus:border-transparent text-white placeholder-gray-500 transition-all ${errors.password ? 'border-red-500' : 'border-gray-700'}`}
                         placeholder="أدخل كلمة المرور" />
                       <button type="button" onClick={() => setShowPassword(!showPassword)} className="absolute inset-y-0 left-0 pl-3 flex items-center">
-                        {showPassword ? <EyeOff className="w-5 h-5 text-gray-400 hover:text-gray-300" /> : <Eye className="w-5 h-5 text-gray-400 hover:text-gray-300" />}
+                        {showPassword ? <EyeOff className="w-5 h-5 text-gray-400" /> : <Eye className="w-5 h-5 text-gray-400" />}
                       </button>
                     </div>
                     {errors.password && <p className="text-red-500 text-sm mt-1">{errors.password}</p>}
@@ -431,7 +384,7 @@ export default function OwnerRegisterPage() {
                         className={`w-full pr-12 pl-12 py-3 bg-white/5 border rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500 focus:border-transparent text-white placeholder-gray-500 transition-all ${errors.confirmPassword ? 'border-red-500' : 'border-gray-700'}`}
                         placeholder="أعد إدخال كلمة المرور" />
                       <button type="button" onClick={() => setShowConfirmPassword(!showConfirmPassword)} className="absolute inset-y-0 left-0 pl-3 flex items-center">
-                        {showConfirmPassword ? <EyeOff className="w-5 h-5 text-gray-400 hover:text-gray-300" /> : <Eye className="w-5 h-5 text-gray-400 hover:text-gray-300" />}
+                        {showConfirmPassword ? <EyeOff className="w-5 h-5 text-gray-400" /> : <Eye className="w-5 h-5 text-gray-400" />}
                       </button>
                       {formData.confirmPassword && (
                         <div className="absolute inset-y-0 left-12 flex items-center">
@@ -460,13 +413,7 @@ export default function OwnerRegisterPage() {
                             <X className="w-4 h-4 text-white" />
                           </button>
                         </div>
-                      ) : (
-                        <>
-                          <Camera className="w-12 h-12 text-gray-500 mx-auto mb-3" />
-                          <p className="text-gray-400">اضغط لرفع الصورة</p>
-                          <p className="text-xs text-gray-500 mt-2">JPEG, PNG, JPG • حتى 5MB</p>
-                        </>
-                      )}
+                      ) : (<><Camera className="w-12 h-12 text-gray-500 mx-auto mb-3" /><p className="text-gray-400">اضغط لرفع الصورة</p><p className="text-xs text-gray-500 mt-2">JPEG, PNG, JPG • حتى 5MB</p></>)}
                     </div>
                     {errors.front && <p className="text-red-500 text-sm mt-1">{errors.front}</p>}
                   </motion.div>
@@ -484,13 +431,7 @@ export default function OwnerRegisterPage() {
                             <X className="w-4 h-4 text-white" />
                           </button>
                         </div>
-                      ) : (
-                        <>
-                          <Camera className="w-12 h-12 text-gray-500 mx-auto mb-3" />
-                          <p className="text-gray-400">اضغط لرفع الصورة</p>
-                          <p className="text-xs text-gray-500 mt-2">JPEG, PNG, JPG • حتى 5MB</p>
-                        </>
-                      )}
+                      ) : (<><Camera className="w-12 h-12 text-gray-500 mx-auto mb-3" /><p className="text-gray-400">اضغط لرفع الصورة</p><p className="text-xs text-gray-500 mt-2">JPEG, PNG, JPG • حتى 5MB</p></>)}
                     </div>
                     {errors.back && <p className="text-red-500 text-sm mt-1">{errors.back}</p>}
                   </motion.div>
@@ -498,7 +439,7 @@ export default function OwnerRegisterPage() {
                   <motion.div variants={fadeInUp} className="flex items-center gap-2">
                     <input type="checkbox" id="terms" checked={formData.agreeTerms}
                       onChange={(e) => setFormData({...formData, agreeTerms: e.target.checked})}
-                      className="w-4 h-4 rounded border-gray-600 bg-white/5 text-amber-500 focus:ring-amber-500 focus:ring-offset-0" required />
+                      className="w-4 h-4 rounded border-gray-600 bg-white/5 text-amber-500 focus:ring-amber-500" required />
                     <label htmlFor="terms" className="text-sm text-gray-300">
                       أوافق على <Link href="/terms" className="text-amber-400 hover:text-amber-300">شروط الاستخدام</Link> و <Link href="/privacy" className="text-amber-400 hover:text-amber-300">سياسة الخصوصية</Link>
                     </label>
@@ -506,74 +447,75 @@ export default function OwnerRegisterPage() {
                 </>
               )}
 
-              {/* ─── STEP 3: OTP ─── */}
-              {step === 3 && (
-                <motion.div variants={fadeInUp} className="space-y-6">
-                  <div className="bg-amber-500/10 border border-amber-500/20 rounded-xl p-4 text-center">
-                    <Shield className="w-10 h-10 text-amber-500 mx-auto mb-2" />
-                    <p className="text-gray-300 text-sm">تم إرسال رمز التحقق إلى</p>
-                    <p className="text-amber-400 font-medium">{formData.email}</p>
-                  </div>
-
-                  <div>
-                    <label className="block text-sm font-medium text-gray-300 mb-2">رمز التحقق <span className="text-red-500">*</span></label>
-                    <div className="relative group">
-                      <div className="absolute inset-y-0 right-0 pr-3 flex items-center pointer-events-none">
-                        <KeyRound className="w-5 h-5 text-gray-400 group-focus-within:text-amber-500" />
-                      </div>
-                      <input type="text" value={otpCode} maxLength={6}
-                        onChange={(e) => setOtpCode(e.target.value)}
-                        className="w-full pr-12 pl-4 py-3 bg-white/5 border border-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500 focus:border-transparent text-white placeholder-gray-500 text-center tracking-[0.5em] text-xl transition-all"
-                        placeholder="------" />
-                    </div>
-                  </div>
-
-                  <button type="button" onClick={handleResendOTP} disabled={isLoading}
-                    className="w-full text-center text-amber-400 hover:text-amber-300 text-sm transition-colors disabled:opacity-50">
-                    إعادة إرسال الرمز
-                  </button>
-                </motion.div>
-              )}
-
-              {/* ─── Navigation Buttons ─── */}
+              {/* ─── Buttons ─── */}
               <motion.div variants={fadeInUp} className="flex gap-3 pt-4">
-                {step === 1 && (
+                {step === 1 ? (
                   <>
                     <button type="button" onClick={() => router.push('/auth/choose-role')}
                       className="flex-1 py-3 px-4 bg-white/5 border border-gray-700 rounded-xl text-gray-300 hover:bg-white/10 transition-colors">إلغاء</button>
-                    <button type="button" onClick={handleNextStep}
+                    <button type="submit"
                       className="flex-1 bg-gradient-to-r from-amber-500 to-amber-600 text-white py-3 px-4 rounded-xl font-medium hover:from-amber-600 hover:to-amber-700 transition-all">التالي</button>
                   </>
-                )}
-                {step === 2 && (
+                ) : (
                   <>
                     <button type="button" onClick={() => setStep(1)}
                       className="flex-1 py-3 px-4 bg-white/5 border border-gray-700 rounded-xl text-gray-300 hover:bg-white/10 transition-colors">السابق</button>
                     <button type="submit" disabled={isLoading || !formData.agreeTerms}
                       className="flex-1 bg-gradient-to-r from-amber-500 to-amber-600 text-white py-3 px-4 rounded-xl font-medium hover:from-amber-600 hover:to-amber-700 transition-all disabled:opacity-50 disabled:cursor-not-allowed">
-                      {isLoading ? (
-                        <div className="flex items-center justify-center gap-2">
-                          <Loader2 className="w-5 h-5 animate-spin" /><span>جاري التسجيل...</span>
-                        </div>
-                      ) : 'إنشاء حساب'}
+                      {isLoading ? (<div className="flex items-center justify-center gap-2"><Loader2 className="w-5 h-5 animate-spin" /><span>جاري التسجيل...</span></div>) : 'إنشاء حساب'}
                     </button>
                   </>
                 )}
-                {step === 3 && (
-                  <button type="submit" disabled={isLoading || !otpCode}
-                    className="flex-1 bg-gradient-to-r from-amber-500 to-amber-600 text-white py-3 px-4 rounded-xl font-medium hover:from-amber-600 hover:to-amber-700 transition-all disabled:opacity-50 disabled:cursor-not-allowed">
-                    {isLoading ? (
-                      <div className="flex items-center justify-center gap-2">
-                        <Loader2 className="w-5 h-5 animate-spin" /><span>جاري التحقق...</span>
-                      </div>
-                    ) : 'تحقق من الرمز'}
-                  </button>
-                )}
               </motion.div>
             </motion.form>
           </div>
         </motion.div>
       </motion.div>
+
+      {/* ─── OTP Modal ─── */}
+      <AnimatePresence>
+        {showOtpModal && (
+          <motion.div initial={{ opacity: 0 }} animate={{ opacity: 1 }} exit={{ opacity: 0 }}
+            className="fixed inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center p-4 z-50">
+            <motion.div initial={{ scale: 0.9, y: 20 }} animate={{ scale: 1, y: 0 }} exit={{ scale: 0.9, y: 20 }}
+              className="bg-gray-900 border border-white/10 rounded-2xl w-full max-w-md p-6 shadow-2xl">
+              <div className="text-center mb-6">
+                <div className="w-16 h-16 bg-amber-500/20 rounded-full flex items-center justify-center mx-auto mb-3">
+                  <Shield className="w-8 h-8 text-amber-500" />
+                </div>
+                <h2 className="text-xl font-bold text-white">التحقق من البريد</h2>
+                <p className="text-gray-400 text-sm mt-1">تم إرسال رمز التحقق إلى</p>
+                <p className="text-amber-400 font-medium text-sm">{formData.email}</p>
+              </div>
+
+              <div className="mb-6">
+                <label className="block text-sm font-medium text-gray-300 mb-2">رمز التحقق</label>
+                <div className="relative">
+                  <div className="absolute inset-y-0 right-0 pr-3 flex items-center pointer-events-none">
+                    <KeyRound className="w-5 h-5 text-gray-400" />
+                  </div>
+                  <input type="text" value={otpCode} maxLength={6}
+                    onChange={(e) => setOtpCode(e.target.value)}
+                    className="w-full pr-12 pl-4 py-3 bg-white/5 border border-gray-700 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500 text-white text-center tracking-[0.5em] text-xl"
+                    placeholder="------" />
+                </div>
+              </div>
+
+              <div className="flex gap-3">
+                <button onClick={handleVerifyOTP} disabled={isLoading || !otpCode}
+                  className="flex-1 bg-gradient-to-r from-amber-500 to-amber-600 text-white py-3 rounded-xl font-medium hover:from-amber-600 hover:to-amber-700 disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-2">
+                  {isLoading ? <><Loader2 className="w-5 h-5 animate-spin" /><span>جاري التحقق...</span></> : 'تحقق'}
+                </button>
+              </div>
+
+              <button onClick={handleResendOTP} disabled={isLoading}
+                className="w-full text-center text-amber-400 hover:text-amber-300 text-sm mt-3 disabled:opacity-50">
+                إعادة إرسال الرمز
+              </button>
+            </motion.div>
+          </motion.div>
+        )}
+      </AnimatePresence>
     </div>
   );
 }