Merge pull request #26 from builtbysuraj/dev

fix: Commented ServerStatus
builtbysuraj · Mar 10, 2024 · fecb463 · fecb463
2 parents 19366c7 + b44d879
commit fecb463
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 76 deletions.
diff --git 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<ServerStateType | null>(null)
-
-export default function ServerStatusProvider({ children }: PropsWithChildren) {
-  const [serverStatus, setServerStatus] = useState<ServerStateType>({
-    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 (
-    <ServerStatusContext.Provider value={serverStatus}>
-      {children}
-    </ServerStatusContext.Provider>
-  )
-}
+// 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<ServerStateType | null>(null)
+
+// export default function ServerStatusProvider({ children }: PropsWithChildren) {
+//   const [serverStatus, setServerStatus] = useState<ServerStateType>({
+//     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 (
+//     <ServerStatusContext.Provider value={serverStatus}>
+//       {children}
+//     </ServerStatusContext.Provider>
+//   )
+// }
diff --git 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
@@ -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(
   <Provider store={store}>
-    <ServerStatusProvider>
-      <Toaster />
-      <RouterProvider router={router} />
-    </ServerStatusProvider>
+    {/* <ServerStatusProvider> */}
+    <Toaster />
+    <RouterProvider router={router} />
+    {/* </ServerStatusProvider> */}
   </Provider>
 )
diff --git 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 (