- 
AgroHelp
diff --git a/FrontEnd/src/components/common/Navbar.jsx b/FrontEnd/src/components/common/Navbar.jsx
index 58d20a2..3451d78 100644
--- a/FrontEnd/src/components/common/Navbar.jsx
+++ b/FrontEnd/src/components/common/Navbar.jsx
@@ -13,7 +13,7 @@ import {
FaLock,
FaPen,
} from 'react-icons/fa';
-import { ImLeaf } from 'react-icons/im';
+import logoLeaf from '../../assets/logoLeaf.svg';
import { HiMenu, HiOutlineX } from 'react-icons/hi';
import { useGlobalContext } from '../../context/ContextProvider';
import { logout } from '../../api/user';
@@ -100,7 +100,7 @@ const Navbar = () => {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ return (
+
-
-
-
-
-
- - USER LOGIN -
-Enter your login credentials
-
+
);
-};
+}
export default Login;
+
+
diff --git a/FrontEnd/src/pages/common/Register.jsx b/FrontEnd/src/pages/common/Register.jsx
index 140e548..3f1df43 100644
--- a/FrontEnd/src/pages/common/Register.jsx
+++ b/FrontEnd/src/pages/common/Register.jsx
@@ -2,21 +2,34 @@ import { useState, useEffect } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
import { useGlobalContext } from '../../context/ContextProvider';
import { register } from '../../api/user';
+import logo from '../../assets/logo.svg';
+import googleLogo from '../../assets/googleLogo.svg';
+import { IoIosEyeOff, IoIosEye } from 'react-icons/io';
const Register = () => {
const location = useLocation();
const navigate = useNavigate();
+
const [confirmPassword, setConfirmPassword] = useState('');
const [message, setMessage] = useState(null);
-
const [username, setUsername] = useState('');
const [email, setEmail] = useState('');
const [password, setPassword] = useState('');
const [firstName, setFirstName] = useState('');
const [lastName, setLastName] = useState('');
+ const [showPassword, setShowPassword] = useState(false);
+ const [showConfirmPassword, setShowConfirmPassword] = useState(false);
+
+ const togglePasswordVisibility = () => {
+ setShowPassword(!showPassword);
+ };
+
+ const toggleConfirmPasswordVisibility = () => {
+ setShowConfirmPassword(!showConfirmPassword);
+ };
const { setUser } = useGlobalContext();
- const { error, user } = useGlobalContext();
+ const { user } = useGlobalContext();
const redirect = location.search ? location.search.split('=')[1] : '/';
@@ -32,383 +45,199 @@ const Register = () => {
setMessage('Passwords do not match');
} else {
if (email && password) {
- const { data } = await register(
- username,
- firstName,
- lastName,
- email,
- password
- );
- if (data) {
- setUser(data);
+ try {
+ const { data } = await register(
+ username,
+ firstName,
+ lastName,
+ email,
+ password
+ );
+ if (data) {
+ setUser(data);
+ }
+ } catch (error) {
+ setMessage('Registration failed. Please try again.');
}
}
}
};
return (
- <>
-
-
-
+
+ 
+
-
+ Login to your account +
+ +
+
+ OR
+
+
+
+
+ {"Don't have an account?"}{" "}
+
+ Register
+
+
+
+
+ Register for an account +
+ {message &&{message}
} +