Merge pull request #183 from mr-loop-1/feature/signup-errors2

Moved user exists error to email field on Signup page

backend/src/controllers/auth.controller.js

@@ -11,7 +11,7 @@ const register = async (req, res) => {
   try {
     const { name, surname, email, password } = req.body;
     const existingUser = await User.findOne({ where: { email } });
-    if (existingUser) return res.status(400).json({ error: "User already exists" });
+    if (existingUser) return res.status(400).json({ error: "Email already exists" });
 
     const hashedPassword = await bcrypt.hash(password, 10);
     const newUser = await User.create({ name, surname, email, password: hashedPassword });

frontend/src/scenes/login/CreateAccountPage.jsx

@@ -62,8 +62,8 @@ function CreateAccountPage() {
       navigate('/');
     } catch (error) {
       if (error.response && error.response.data) {
-        if (error.response.data.error === 'User already exists') {
-          setError('User already exists');
+        if (error.response.data.error === 'Email already exists') {
+          setError('Email already exists');
         } else {
           setError('An error occurred. Please try again.');
         }
@@ -89,7 +89,6 @@ function CreateAccountPage() {
           onChange={handleInputChange}
           placeholder="Enter your name"
         />
-        {error && <div className="error-message">{error}</div>}
       </div>
 
       <div className="form-group">
@@ -120,6 +119,7 @@ function CreateAccountPage() {
           onChange={handleInputChange}
           placeholder="Enter your email"
         />
+        {error && <div className="error-message">{error}</div>}
       </div>
 
       <div className="form-group">

frontend/src/tests/scenes/login/CreateAccountPage.test.jsx

@@ -110,10 +110,10 @@ describe('CreateAccountPage', () => {
     // Add more assertions as needed
   });
 
-  it('handles sign up failure with user already exists error', async () => {
+  it('handles sign up failure with email already exists error', async () => {
     signUp.mockRejectedValueOnce({
       response: {
-        data: { error: 'User already exists' },
+        data: { error: 'Email already exists' },
         status: 400,
       },
     });
@@ -135,7 +135,7 @@ describe('CreateAccountPage', () => {
     });
 
     await waitFor(() => {
-      expect(screen.getByText('User already exists')).to.exist;
+      expect(screen.getByText('Email already exists')).to.exist;
     });
 
     expect(signUp).toHaveBeenCalledWith({ name: 'testname', surname: 'testsurname', email: 'test@example.com', password: 'Password1!' });