Compare commits

...

5 Commits

9 changed files with 114 additions and 95 deletions
+9 -4
View File
@@ -1,28 +1,33 @@
import {Suspense, lazy} from 'react'
import { Navigate, useLocation } from "react-router-dom"; import { Navigate, useLocation } from "react-router-dom";
import Routers from "./Routers"; // import Routers from "./Routers";
// import SocketIOContextProvider from "./components/Contexts/SocketIOContext";
import Toaster from "./components/Helpers/Toaster"; import Toaster from "./components/Helpers/Toaster";
import Default from "./components/Partials/Default"; import Default from "./components/Partials/Default";
import SocketIOContextProvider from "./components/Contexts/SocketIOContext";
import { disableReactDevTools } from '@fvilers/disable-react-devtools'; import { disableReactDevTools } from '@fvilers/disable-react-devtools';
import LoadingSpinner from './components/Spinners/LoadingSpinner';
if (process.env.REACT_APP_NODE_ENV === 'production') { if (process.env.REACT_APP_NODE_ENV === 'production') {
disableReactDevTools(); disableReactDevTools();
} }
const Routers = lazy(()=>import('./Routers'))
function App() { function App() {
const { pathname } = useLocation(); const { pathname } = useLocation();
return ( return (
<Default> <Default>
<SocketIOContextProvider> {/* <SocketIOContextProvider> */}
<> <>
{pathname.startsWith("/@") ? ( {pathname.startsWith("/@") ? (
<Navigate to="/app" replace={true} /> <Navigate to="/app" replace={true} />
) : ( ) : (
<Suspense fallback={<LoadingSpinner size="32" color="sky-blue" height="h-screen" />}>
<Routers /> <Routers />
</Suspense>
)} )}
<Toaster /> <Toaster />
</> </>
</SocketIOContextProvider> {/* </SocketIOContextProvider> */}
</Default> </Default>
); );
} }
+3
View File
@@ -4,6 +4,7 @@ import { lazy } from "react";
import LoginLandingPage from './views/LoginLandingPage' import LoginLandingPage from './views/LoginLandingPage'
import LoginPage from "./views/LoginPage"; import LoginPage from "./views/LoginPage";
import HomePages from "./views/HomePages"; import HomePages from "./views/HomePages";
import SocketConnection from "./middleware/SocketConnection";
const FourZeroFour = lazy(() => import("./components/FourZeroFour")); const FourZeroFour = lazy(() => import("./components/FourZeroFour"));
@@ -129,6 +130,7 @@ export default function Routers() {
<Route exact path="/app" element={<AppDownloadPage />} /> <Route exact path="/app" element={<AppDownloadPage />} />
{/* private route */} {/* private route */}
<Route element={<SocketConnection />}>
<Route element={<AuthRoute />}> <Route element={<AuthRoute />}>
<Route exact path="/" element={<HomePages />} /> <Route exact path="/" element={<HomePages />} />
{/* <Route exact path="/active-bids" element={<AcitveBidsPage />} /> {/* <Route exact path="/active-bids" element={<AcitveBidsPage />} />
@@ -218,6 +220,7 @@ export default function Routers() {
<Route exact path="/referral" element={<ReferralPage />} /> <Route exact path="/referral" element={<ReferralPage />} />
<Route exact path="/job-groups" element={<JobGroupsPage />} /> <Route exact path="/job-groups" element={<JobGroupsPage />} />
</Route> </Route>
</Route>
<Route path="*" element={<FourZeroFour />} /> <Route path="*" element={<FourZeroFour />} />
</Routes> </Routes>
</ScrollToTop> </ScrollToTop>
@@ -8,7 +8,7 @@ import AuthLayout from "../AuthLayout";
function FbookRedirect() { function FbookRedirect() {
const location = useLocation(); const location = useLocation();
const navigate = useNavigate(); const navigate = useNavigate();
const userApi = useMemo(()=>{new usersService()},[]); const userApi = useMemo(()=> new usersService(),[]);
const dispatch = useDispatch() const dispatch = useDispatch()
const queryParams = new URLSearchParams(location?.search); const queryParams = new URLSearchParams(location?.search);
@@ -8,7 +8,7 @@ import AuthLayout from "../AuthLayout";
function Redirect() { function Redirect() {
const location = useLocation(); const location = useLocation();
const navigate = useNavigate(); const navigate = useNavigate();
const userApi = useMemo(()=>{new usersService()},[]); const userApi = useMemo(()=> new usersService(),[]);
const dispatch = useDispatch(); const dispatch = useDispatch();
const queryParams = new URLSearchParams(location?.search); const queryParams = new URLSearchParams(location?.search);
+1 -1
View File
@@ -15,7 +15,7 @@ export default function MarketPlace({ commonHeadData }) {
const marketData = jobLists?.result_list; const marketData = jobLists?.result_list;
const categories = jobLists?.categories; const categories = jobLists?.categories;
const image_server = jobLists?.session_image_server; const image_server = jobLists?.session_image_server;
console.log('Lenth', marketData?.length ) // console.log('Lenth', marketData?.length )
useEffect(()=>{ useEffect(()=>{
if(!jobLists.loading && (marketData?.length < 1 || !marketData)){ if(!jobLists.loading && (marketData?.length < 1 || !marketData)){
+11
View File
@@ -0,0 +1,11 @@
import React from 'react'
import SocketIOContextProvider from '../components/Contexts/SocketIOContext'
import { Navigate, Outlet, useNavigate } from "react-router-dom";
export default function SocketConnection() {
return (
<SocketIOContextProvider>
<Outlet />
</SocketIOContextProvider>
)
}
+1 -1
View File
@@ -9,7 +9,7 @@ export default function MyWalletPage() {
useEffect(()=>{ useEffect(()=>{
let walletExist = wallet_available_status || localStorage.getItem('wallet_available_status') let walletExist = wallet_available_status || localStorage.getItem('wallet_available_status')
console.log(walletExist) // console.log(walletExist)
if(account_type == 'FULL' && walletExist != 'WALLET_AVAILABLE'){ if(account_type == 'FULL' && walletExist != 'WALLET_AVAILABLE'){
navigate('/', {replace: true}) navigate('/', {replace: true})
} }
+1 -1
View File
@@ -15,7 +15,7 @@ export default function OffersInterestPage() {
let {joinRoom} = SocketValues() // function to join room for socket let {joinRoom} = SocketValues() // function to join room for socket
const apiCall = useMemo(()=>{new usersService()},[]) const apiCall = useMemo(()=> new usersService(),[])
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner) let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
+1 -1
View File
@@ -5,7 +5,7 @@ import { useLocation } from "react-router-dom";
export default function ResourcePage() { export default function ResourcePage() {
const {state} = useLocation() // CHECKS IF THERE IS AN ACTIVE TAB WITH LINK BACK TO RESOURCES const {state} = useLocation() // CHECKS IF THERE IS AN ACTIVE TAB WITH LINK BACK TO RESOURCES
const [MyResourceData, setMyResourceData] = useState([]); const [MyResourceData, setMyResourceData] = useState([]);
const api = useMemo(()=>{new usersService()},[]); const api = useMemo(()=> new usersService(),[]);
const getMyResourceData = useCallback( async () => { const getMyResourceData = useCallback( async () => {
try { try {
const res = await api.getResourceList(); const res = await api.getResourceList();