Changeset 3ae4bab

Timestamp:

07/02/26 19:57:47 (3 days ago)

Author:

kikisrbinoska <srbinoskakristina07@…>

Branches:

main

Children:

a6e33d1

Parents:

a8f4a2d

Message:

Changes for log in

Files:

• ChapterX.Application/Auth/LoginHandler.cs (modified) (1 diff)
• chapterx-frontend/src/pages/auth/LoginPage.tsx (modified) (5 diffs)
• chapterx-frontend/src/store/authStore.ts (modified) (2 diffs)

ChapterX.Application/Auth/LoginHandler.cs

@@ -18 +18 @@
         {
             var user = await _userRepository.GetByEmailAsync(request.Email, cancellationToken)
-                ?? throw new UnauthorizedAccessException("Invalid email or password.");
+                ?? throw new UnauthorizedAccessException("No account found with this email. Please register first.");
 
             if (!BCrypt.Net.BCrypt.Verify(request.Password, user.Password))
-                throw new UnauthorizedAccessException("Invalid email or password.");
+                throw new UnauthorizedAccessException("Incorrect password. Please try again.");
 
             var token = _jwtTokenService.GenerateToken(user);

chapterx-frontend/src/pages/auth/LoginPage.tsx

@@ -16 +16 @@
   const [loading, setLoading] = useState(false)
   const [errors, setErrors] = useState<{ email?: string; password?: string }>({})
+  const [noAccount, setNoAccount] = useState(false)
 
   const validate = () => {
     const e: typeof errors = {}
-    if (!email.trim()) e.email = 'Email or username is required'
+    if (!email.trim()) e.email = 'Email is required'
     if (!password.trim()) e.password = 'Password is required'
     setErrors(e)
@@ -28 +29 @@
     ev.preventDefault()
     if (!validate()) return
+    setNoAccount(false)
     setLoading(true)
     try {
@@ -34 +36 @@
       navigate('/')
     } catch (err: any) {
-      addToast(err.message || 'Login failed', 'error')
+      const message = err?.message || 'Incorrect email or password. Please try again.'
+      if (/no account found/i.test(message)) {
+        setNoAccount(true)
+        setErrors(p => ({ ...p, email: message }))
+      } else {
+        setErrors(p => ({ ...p, password: message }))
+      }
+      addToast(message, 'error')
     } finally {
       setLoading(false)
@@ -55 +64 @@
         <form onSubmit={handleSubmit} className="space-y-4">
           <div>
-            <label className="block text-sm text-slate-400 mb-1.5">Email or Username</label>
+            <label className="block text-sm text-slate-400 mb-1.5">Login with Email</label>
             <input
               type="text"
               value={email}
-              onChange={e => { setEmail(e.target.value); setErrors(p => ({ ...p, email: '' })) }}
+              onChange={e => { setEmail(e.target.value); setErrors(p => ({ ...p, email: '' })); setNoAccount(false) }}
               placeholder="you@example.com"
               className={`w-full px-4 py-3 bg-slate-800 border rounded-xl text-white placeholder-slate-500 focus:outline-none focus:border-indigo-500 transition-colors ${
@@ -95 +104 @@
         </form>
 
-        <p className="text-center text-slate-500 text-sm mt-6">
+        <p className={`text-center text-sm mt-6 ${noAccount ? 'text-rose-400' : 'text-slate-500'}`}>
           Don't have an account?{' '}
-          <Link to="/register" className="text-indigo-400 hover:text-indigo-300">
+          <Link to="/register" className="text-indigo-400 hover:text-indigo-300 font-medium">
             Create one
           </Link>

chapterx-frontend/src/store/authStore.ts

@@ -55 +55 @@
           // If the backend responded with an error (4xx/5xx), surface it to the user
           if (err?.response) {
-            const message = err.response.data?.message || err.response.data || 'Invalid email or password.'
-            throw new Error(typeof message === 'string' ? message : 'Invalid email or password.')
+            const message = err.response.data?.message || err.response.data || 'Incorrect email or password. Please try again.'
+            throw new Error(typeof message === 'string' ? message : 'Incorrect email or password. Please try again.')
           }
           // Network error / timeout — fall through to mock login
@@ -65 +65 @@
           u => u.username === emailOrUsername || u.email === emailOrUsername
         )
-        if (!user) throw new Error('User not found. Try using a quick-login option.')
+        if (!user) throw new Error('No account found with this email. Please register first.')
         set({ currentUser: user, token: null })
       },