diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx index 22daa93..613decc 100644 --- a/src/components/Home/index.jsx +++ b/src/components/Home/index.jsx @@ -1,4 +1,5 @@ import React, { useState, useEffect } from "react"; +import {Navigate} from 'react-router-dom' import datas from "../../data/product_data.json"; import Layout from "../Partials/Layout"; import usersService from "../../services/UsersService"; @@ -43,9 +44,10 @@ export default function Home(props) { } ) : ( -
- You are not logged in or your account type is not supported. -
+ //
+ // You are not logged in or your account type is not supported. + //
+ )} diff --git a/src/components/MarketPlace/PopUp/MarketPopUp.jsx b/src/components/MarketPlace/PopUp/MarketPopUp.jsx index 79f9aea..b0bc693 100644 --- a/src/components/MarketPlace/PopUp/MarketPopUp.jsx +++ b/src/components/MarketPlace/PopUp/MarketPopUp.jsx @@ -133,11 +133,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc // let addedIntDate = marketInt?.added?.split(" ")[0]; // let expireIntDate = marketInt?.expire?.split(" ")[0]; - let cleanedText = details?.job_description - ?.replace(/</g, "<") - .replace(/>/g, ">") - .replace(/"/g, '"') - .replace(/&/g, "&"); + let cleanedText = details?.job_description?.replace(/</g, "<").replace(/>/g, ">").replace(/"/g, '"').replace(/&/g, "&"); return ( @@ -197,8 +193,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx index 12687dd..2de8010 100644 --- a/src/components/Partials/Header.jsx +++ b/src/components/Partials/Header.jsx @@ -480,7 +480,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) { {/* end Language list items*/}
  • - +

    Account Settings diff --git a/src/middleware/AuthRoute.jsx b/src/middleware/AuthRoute.jsx index 9baf084..50ffc8e 100644 --- a/src/middleware/AuthRoute.jsx +++ b/src/middleware/AuthRoute.jsx @@ -90,7 +90,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => { apiCall .loadProfile() .then((res) => { - if (res?.data?.internal_return < 0) { + if (!res?.data?.internal_return || res?.data?.internal_return < 0) { setIsLogin({ loading: false, status: false }); return; }