From b44d879e5be8a9b4813f2b03505f9fa3c4569ad5 Mon Sep 17 00:00:00 2001 From: builtbysuraj Date: Sun, 10 Mar 2024 19:13:22 +0530 Subject: [PATCH] fix: Commented ServerStatus --- client/src/context/ServerStatusProvider.tsx | 94 +++++++++---------- client/src/hooks/useServerStatus.ts | 22 ++--- client/src/main.tsx | 10 +- .../components/place-order/PlaceOrder.tsx | 26 ++--- 4 files changed, 76 insertions(+), 76 deletions(-) diff --git a/client/src/context/ServerStatusProvider.tsx b/client/src/context/ServerStatusProvider.tsx index 5dc924c..7e03ee3 100644 --- a/client/src/context/ServerStatusProvider.tsx +++ b/client/src/context/ServerStatusProvider.tsx @@ -1,47 +1,47 @@ -import axios from 'axios' -import { PropsWithChildren, createContext, useEffect, useState } from 'react' - -import { ENV } from '@/conf' - -type ServerStateType = { - status: boolean - message: string -} - -export const ServerStatusContext = createContext(null) - -export default function ServerStatusProvider({ children }: PropsWithChildren) { - const [serverStatus, setServerStatus] = useState({ - status: false, - message: '', - }) - - useEffect(() => { - const checkServerStatus = async () => { - try { - const { data } = await axios.get(`${ENV.SERVER_URL}/status`) - - if (data.status) { - setServerStatus(data) - } else { - setServerStatus({ status: false, message: 'Server is not running' }) - } - } catch (error) { - setServerStatus({ status: false, message: 'Wait for server to start' }) - } - } - - checkServerStatus() - - const intervalId = setInterval(checkServerStatus, 10000) - - // Clear interval on component unmount - return () => clearInterval(intervalId) - }, []) - - return ( - - {children} - - ) -} +// import axios from 'axios' +// import { PropsWithChildren, createContext, useEffect, useState } from 'react' + +// import { ENV } from '@/conf' + +// type ServerStateType = { +// status: boolean +// message: string +// } + +// export const ServerStatusContext = createContext(null) + +// export default function ServerStatusProvider({ children }: PropsWithChildren) { +// const [serverStatus, setServerStatus] = useState({ +// status: false, +// message: '', +// }) + +// useEffect(() => { +// const checkServerStatus = async () => { +// try { +// const { data } = await axios.get(`${ENV.SERVER_URL}/status`) + +// if (data.status) { +// setServerStatus(data) +// } else { +// setServerStatus({ status: false, message: 'Server is not running' }) +// } +// } catch (error) { +// setServerStatus({ status: false, message: 'Wait for server to start' }) +// } +// } + +// checkServerStatus() + +// const intervalId = setInterval(checkServerStatus, 10000) + +// // Clear interval on component unmount +// return () => clearInterval(intervalId) +// }, []) + +// return ( +// +// {children} +// +// ) +// } diff --git a/client/src/hooks/useServerStatus.ts b/client/src/hooks/useServerStatus.ts index 4438f1b..4c941f5 100644 --- a/client/src/hooks/useServerStatus.ts +++ b/client/src/hooks/useServerStatus.ts @@ -1,12 +1,12 @@ -import { ServerStatusContext } from '@/context/ServerStatusProvider' -import { useContext } from 'react' +// import { ServerStatusContext } from '@/context/ServerStatusProvider' +// import { useContext } from 'react' -export default function useServerStatus() { - const context = useContext(ServerStatusContext) - if (context === undefined) { - throw new Error( - 'useServerStatus must be used within an ServerStatusProvider' - ) - } - return context -} +// export default function useServerStatus() { +// const context = useContext(ServerStatusContext) +// if (context === undefined) { +// throw new Error( +// 'useServerStatus must be used within an ServerStatusProvider' +// ) +// } +// return context +// } diff --git a/client/src/main.tsx b/client/src/main.tsx index d1960da..6154232 100644 --- a/client/src/main.tsx +++ b/client/src/main.tsx @@ -15,7 +15,7 @@ import router from './routes' import store from './state/store' // Context -import ServerStatusProvider from './context/ServerStatusProvider' +// import ServerStatusProvider from './context/ServerStatusProvider' if (process.env.NODE_ENV === 'production') { console.log = () => {} @@ -25,9 +25,9 @@ if (process.env.NODE_ENV === 'production') { createRoot(document.querySelector('#root')!).render( - - - - + {/* */} + + + {/* */} ) diff --git a/client/src/pages/cart/components/place-order/PlaceOrder.tsx b/client/src/pages/cart/components/place-order/PlaceOrder.tsx index d16fcc8..59e75b0 100644 --- a/client/src/pages/cart/components/place-order/PlaceOrder.tsx +++ b/client/src/pages/cart/components/place-order/PlaceOrder.tsx @@ -1,11 +1,11 @@ import axios from 'axios' -import useServerStatus from '@/hooks/useServerStatus' +// import useServerStatus from '@/hooks/useServerStatus' +import { ENV } from '@/conf' import { useAppSelector } from '@/state/store' import { totalCartPrice } from '@/utils' import toast from 'react-hot-toast' import styles from './PlaceOrder.module.css' -import { ENV } from '@/conf' declare global { interface Window { @@ -18,7 +18,7 @@ axios.defaults.withCredentials = true export default function PlaceOrder() { const cartData = useAppSelector((state) => state.cart) - const serverStatus = useServerStatus() + // const serverStatus = useServerStatus() const amount = totalCartPrice(cartData) @@ -53,16 +53,16 @@ export default function PlaceOrder() { } const handleCheckout = async () => { - if (!serverStatus?.status) { - // @ts-expect-error ... - return toast.error(serverStatus?.message) - } - if (serverStatus?.status) - toast.promise(performCheckout(), { - loading: 'Processing...', - success: 'Done!', - error: 'Server is not running', - }) + // if (!serverStatus?.status) { + // // @ts-expect-error ... + // return toast.error(serverStatus?.message) + // } + // if (serverStatus?.status) + toast.promise(performCheckout(), { + loading: 'Processing...', + success: 'Done!', + error: 'Server is not running', + }) } return (