diff --git a/app/component/uploadFile/index.js b/app/component/uploadFile/index.js index 420c065..964132b 100644 --- a/app/component/uploadFile/index.js +++ b/app/component/uploadFile/index.js @@ -42,6 +42,7 @@ function UploadFile({ image, setImage }) { diff --git a/app/globals.css b/app/globals.css index 99fd243..db2b5ae 100644 --- a/app/globals.css +++ b/app/globals.css @@ -280,6 +280,10 @@ html { max-width: 100%; } +.hover-sidebar .logout-btn { + max-width: 100% !important; +} + @media (max-width: 768px) { .res-field-account .MuiInputBase-input.MuiOutlinedInput-input { padding-top: 10px; diff --git a/components/icons/LogoutOrangeP.js b/components/icons/LogoutOrangeP.js index b16c031..0c76171 100644 --- a/components/icons/LogoutOrangeP.js +++ b/components/icons/LogoutOrangeP.js @@ -6,6 +6,7 @@ function LogoutOrangeP() { height="20" viewBox="0 0 20 20" fill="none" + className="min-w-[20px] min-h-[20px] max-w-[20px] max-h-[20px]" > { + removeToken(); + window.location.pathname = '/login' + handleClose(); + }; + return ( خروج diff --git a/components/layoutPanel/sidebar/index.js b/components/layoutPanel/sidebar/index.js index f9f22e1..43529a4 100644 --- a/components/layoutPanel/sidebar/index.js +++ b/components/layoutPanel/sidebar/index.js @@ -43,14 +43,14 @@ function Sidebar({ active, setActive, open, setOpen }) { خروج از حساب diff --git a/components/panel/userAccount/bank/head/modal/index.js b/components/panel/userAccount/bank/head/modal/index.js index 2f7bc2e..422c534 100644 --- a/components/panel/userAccount/bank/head/modal/index.js +++ b/components/panel/userAccount/bank/head/modal/index.js @@ -24,13 +24,12 @@ function ModalAddCard() { const updateNum = (value, type, name) => { const parseValue = +value; - const { max } = validate_phone_number; - const validateValue = parseValue > max ? data[name].value : value; - - changeData(validateValue, name); + changeData(parseValue, name); }; + const isValidData = data.card && data.shaba && data.value && data.value.value; + return ( <> {/* Button Modal */} @@ -69,6 +68,7 @@ function ModalAddCard() { ذخیره diff --git a/services/api.js b/services/api.js index 1227341..46d6b0f 100644 --- a/services/api.js +++ b/services/api.js @@ -13,8 +13,18 @@ const api = axios.create({ api.interceptors.request.use( (request) => { - if (cookies.get("token")) { - request.headers.authorization = `Bearer ${cookies.get("token")}`; + const token = cookies.get("token"); + const isLoginPage = window.location.pathname === "/login"; + + if (!token) { + if (!isLoginPage) { + window.location.pathname = "/login"; + } + } else { + if (isLoginPage) { + window.location.pathname = "/"; + } + request.headers.authorization = `Bearer ${token}`; } return request; }, @@ -26,10 +36,9 @@ api.interceptors.response.use( return response.data; }, (error) => { - console.log(error); if (error.data.status === 400) { cookies.remove("token", { path: "/" }); - window.location.reload(); + window.location.pathname = "/login"; } else { } } diff --git a/utils/index.js b/utils/index.js index e69de29..0ca58f5 100644 --- a/utils/index.js +++ b/utils/index.js @@ -0,0 +1,7 @@ +import Cookies from "universal-cookie"; + +const cookies = new Cookies(); + +const removeToken = () => cookies.remove("token", { path: "/" }); + +export { removeToken };