diff --git a/backend/app/routes/auth/login.js b/backend/app/routes/auth/login.js
index 3a8d8513..57001a07 100644
--- a/backend/app/routes/auth/login.js
+++ b/backend/app/routes/auth/login.js
@@ -32,6 +32,7 @@ module.exports = async (req, res, next) => {
name: `${userRecord.firstName} ${userRecord.lastName}`,
email: userRecord.email,
isSuperAdmin: userRecord.isSuperAdmin,
+ phone: userRecord.contact,
};
const JWT = generateJWT(JWTPayload);
const response = { ...JWTPayload, token: JWT };
diff --git a/frontend/src/pages/Admin/Admin.jsx b/frontend/src/pages/Admin/Admin.jsx
index 77fb9a2b..1769f666 100644
--- a/frontend/src/pages/Admin/Admin.jsx
+++ b/frontend/src/pages/Admin/Admin.jsx
@@ -30,6 +30,7 @@ export const Admin = (props) => {
const toggleNav = () => setIsMenuOpen(!isMenuOpen);
const closeMobileMenu = () => setIsMenuOpen(false);
const dispatch = useDispatch();
+ const firstName = localStorage.getItem("firstName");
useEffect(() => {
const token = localStorage.getItem("token");
@@ -55,7 +56,7 @@ export const Admin = (props) => {
className={style["img-admin"]}
alt="admin_img"
/>
-
Welcome Admin!
+ Welcome {firstName}!
{
+ setName(localStorage.getItem("firstName"));
+ setEmail(localStorage.getItem("email"));
+ setPhone(localStorage.getItem("phone"));
+ },[setName,setEmail,setPhone])
+
return (
My Profile
diff --git a/frontend/src/pages/Login/Login.jsx b/frontend/src/pages/Login/Login.jsx
index cf77035f..72e7577d 100644
--- a/frontend/src/pages/Login/Login.jsx
+++ b/frontend/src/pages/Login/Login.jsx
@@ -105,8 +105,12 @@ export function Login(props) {
.json()
.then((res) => {
if (response.status === 200) {
+ const firstName = res.name.split(' ')[0];
localStorage.setItem("token", res.token);
localStorage.setItem("isSuperAdmin", res.isSuperAdmin);
+ localStorage.setItem("firstName", firstName);
+ localStorage.setItem("email", res.email);
+ localStorage.setItem("phone", res.phone);
window.location = "/dashboard?loggedin";
} else if (response.status === 400) {
setOpenError2Toast(true);
@@ -114,7 +118,9 @@ export function Login(props) {
setOpenError3Toast(true);
}
})
- .catch((err) => setOpenError3Toast(true))
+ .catch((err) => {
+ console.error(err);
+ setOpenError3Toast(true)})
)
.catch((err) => {
setOpenError1Toast(true);