From 7e2c18ca6c0f49416a47968d615f960454ea614a Mon Sep 17 00:00:00 2001
From: AmirHossein Mahmoodi <amir.mahmoodi74@gmail.com>
Date: Mon, 2 Oct 2023 16:09:05 +0330
Subject: [PATCH] CFE-6 Fixed any bugs

---
 .gitignore                                           | 1 +
 mocks/handler.js                                     | 4 +++-
 src/components/login-expert/LoginExpertComponent.jsx | 6 +++---
 src/core/data/apiRoutes.js                           | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3dfb407..a69bd26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ cypress/videos
 cypress/screenshots
 .next
 .env.local
+.env.test
 .env
 .idea
 package-lock.json
\ No newline at end of file
diff --git a/mocks/handler.js b/mocks/handler.js
index 49e0f99..3a8f75d 100644
--- a/mocks/handler.js
+++ b/mocks/handler.js
@@ -3,6 +3,8 @@ import {rest} from "msw";
 
 export const handler = [rest.get(GET_USER_ROUTE, (req, res, ctx) => {
     return res(ctx.json({
-        id: 10
+        data: {
+            id: 10
+        }
     }))
 })]
\ No newline at end of file
diff --git a/src/components/login-expert/LoginExpertComponent.jsx b/src/components/login-expert/LoginExpertComponent.jsx
index 9be301b..d2a2d13 100644
--- a/src/components/login-expert/LoginExpertComponent.jsx
+++ b/src/components/login-expert/LoginExpertComponent.jsx
@@ -10,7 +10,7 @@ import useRequest from "@/lib/app/hooks/useRequest";
 import useUser from "@/lib/app/hooks/useUser";
 import {useTranslations} from "next-intl";
 
-const LoginExpertComponent = () =>{
+const LoginExpertComponent = () => {
     const t = useTranslations();
     const requestServer = useRequest()
     const {setToken} = useUser(); // pass token to set token
@@ -24,7 +24,7 @@ const LoginExpertComponent = () =>{
                 notification: {show: false}
             }
         }).then((response) => {
-            setToken(response.data.token)
+            setToken(response.data.data.token)
         }).catch(() => {
             props.setSubmitting(false)
         })
@@ -38,7 +38,7 @@ const LoginExpertComponent = () =>{
         password: Yup.string().required(t("LoginPage.password_error_message_required")),
     });
 
-    return(
+    return (
         <Container maxWidth="sm">
             <Paper elevation={0}>
                 <Formik
diff --git a/src/core/data/apiRoutes.js b/src/core/data/apiRoutes.js
index 06dd4e9..b96b998 100644
--- a/src/core/data/apiRoutes.js
+++ b/src/core/data/apiRoutes.js
@@ -1,7 +1,7 @@
 const BASE_URL = process.env.NEXT_PUBLIC_BASE_URL;
 
 //login
-export const GET_USER_TOKEN = BASE_URL + "/dashboard/login";
+export const GET_USER_TOKEN = BASE_URL + "/api/auth/login";
 //end login
 
 //change password
@@ -9,5 +9,5 @@ export const SET_USER_PASSWORD = BASE_URL + "/dashboard/profile/change_password"
 //end change password
 
 //user data
-export const GET_USER_ROUTE = BASE_URL + "/dashboard/profile/info";
+export const GET_USER_ROUTE = BASE_URL + "/api/profile/info";
 //user data
\ No newline at end of file