Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7f534556be | |||
| 2bf8b2fe06 | |||
| 4718b7962e | |||
| 9cbf797ab0 |
@@ -1,4 +1,5 @@
|
|||||||
import React, { useState, useEffect } from "react";
|
import React, { useState, useEffect } from "react";
|
||||||
|
import {Navigate} from 'react-router-dom'
|
||||||
import datas from "../../data/product_data.json";
|
import datas from "../../data/product_data.json";
|
||||||
import Layout from "../Partials/Layout";
|
import Layout from "../Partials/Layout";
|
||||||
import usersService from "../../services/UsersService";
|
import usersService from "../../services/UsersService";
|
||||||
@@ -43,9 +44,10 @@ export default function Home(props) {
|
|||||||
}
|
}
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<div>
|
// <div>
|
||||||
You are not logged in or your account type is not supported.
|
// You are not logged in or your account type is not supported.
|
||||||
</div>
|
// </div>
|
||||||
|
<Navigate to='/login' />
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -133,11 +133,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
|
|||||||
// let addedIntDate = marketInt?.added?.split(" ")[0];
|
// let addedIntDate = marketInt?.added?.split(" ")[0];
|
||||||
// let expireIntDate = marketInt?.expire?.split(" ")[0];
|
// let expireIntDate = marketInt?.expire?.split(" ")[0];
|
||||||
|
|
||||||
let cleanedText = details?.job_description
|
let cleanedText = details?.job_description?.replace(/</g, "<").replace(/>/g, ">").replace(/"/g, '"').replace(/&/g, "&");
|
||||||
?.replace(/</g, "<")
|
|
||||||
.replace(/>/g, ">")
|
|
||||||
.replace(/"/g, '"')
|
|
||||||
.replace(/&/g, "&");
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ModalCom action={onClose} situation={situation}>
|
<ModalCom action={onClose} situation={situation}>
|
||||||
@@ -197,8 +193,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
|
|||||||
<div
|
<div
|
||||||
className={`w-full p-2 md:w-3/4 text-slate-900 dark:text-white market-pop rounded-2xl ${
|
className={`w-full p-2 md:w-3/4 text-slate-900 dark:text-white market-pop rounded-2xl ${
|
||||||
name == "Description"
|
name == "Description"
|
||||||
? "min-h-[150px] max-h-[150px] h-full overflow-y-auto break-words bg-slate-50"
|
? "min-h-[100px] max-h-[100px] h-full overflow-y-auto break-words bg-slate-50"
|
||||||
: name == "Delivery Detail" ? " overflow-y-auto h-full min-h-[150px] max-h-[150px] bg-slate-50"
|
: name == "Delivery Detail" ? " overflow-y-auto h-full min-h-[200px] max-h-[200px] bg-slate-50"
|
||||||
: "h-full flex items-center"
|
: "h-full flex items-center"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -480,7 +480,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
|
|||||||
{/* end Language list items*/}
|
{/* end Language list items*/}
|
||||||
</li>
|
</li>
|
||||||
<li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
|
<li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
|
||||||
<Link to="#" className="notifications">
|
<Link to="/settings" className="notifications">
|
||||||
<div className="name">
|
<div className="name">
|
||||||
<p className="text-sm py-2 px-4 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
|
<p className="text-sm py-2 px-4 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
|
||||||
Account Settings
|
Account Settings
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
/* Regular Weight */
|
/* Regular Weight */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "Product Sans";
|
font-family: Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif,"Product Sans";
|
||||||
src: url("./assets/fonts/Product Sans Regular.ttf");
|
src: url("./assets/fonts/Product Sans Regular.ttf");
|
||||||
}
|
}
|
||||||
.nft-main-container {
|
.nft-main-container {
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
}
|
}
|
||||||
/* Bold Weight */
|
/* Bold Weight */
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "Product Sans";
|
font-family: Roboto,"Product Sans";
|
||||||
src: url("./assets/fonts/Product Sans Bold.ttf");
|
src: url("./assets/fonts/Product Sans Bold.ttf");
|
||||||
}
|
}
|
||||||
.SENDER {
|
.SENDER {
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
|
|||||||
apiCall
|
apiCall
|
||||||
.loadProfile()
|
.loadProfile()
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res?.data?.internal_return < 0) {
|
if (!res?.data?.internal_return || res?.data?.internal_return < 0) {
|
||||||
setIsLogin({ loading: false, status: false });
|
setIsLogin({ loading: false, status: false });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1695,7 +1695,7 @@ class usersService {
|
|||||||
if(localStorage && localStorage.getItem('myloc')){
|
if(localStorage && localStorage.getItem('myloc')){
|
||||||
reqData.loc = localStorage.getItem('myloc')
|
reqData.loc = localStorage.getItem('myloc')
|
||||||
}
|
}
|
||||||
return Axios.post(endPoint, reqData)
|
return Axios.post(endPoint, reqData,{timeout: 7000 })
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
// console.log(response);
|
// console.log(response);
|
||||||
// console.log("~~~~~~~ WrenchBoard::POST ~~~~~~~~");
|
// console.log("~~~~~~~ WrenchBoard::POST ~~~~~~~~");
|
||||||
|
|||||||
Reference in New Issue
Block a user