Merged in CR/Pricelist (pull request #80)

CR/Pricelist

1 files changed, 13 insertions, 28 deletions

diff --git a/src/pages/_app.jsx b/src/pages/_app.jsx
index 0062f7fc..afebc293 100644
--- a/src/pages/_app.jsx
+++ b/src/pages/_app.jsx
@@ -1,36 +1,27 @@
 import '../styles/globals.css'
 import 'react-loading-skeleton/dist/skeleton.css'
+
 import NextProgress from 'next-progress'
 import { useRouter, Router } from 'next/router'
 import { AnimatePresence, motion } from 'framer-motion'
 import { Toaster } from 'react-hot-toast'
 import { QueryClient, QueryClientProvider } from 'react-query'
 import useDevice from '@/core/hooks/useDevice'
-import { createContext, useContext, useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
 import LogoSpinner from '@/core/components/elements/Spinner/LogoSpinner'
 import { SessionProvider } from 'next-auth/react'
-import { getAuth } from '@/core/utils/auth'
 import { ProductProvider } from '@/contexts/ProductContext'
 import { ProductCartProvider } from '@/contexts/ProductCartContext'
+import { ChakraProvider } from '@chakra-ui/react'
+import theme from '../../chakra.theme'
 
 const queryClient = new QueryClient()
 
-export const AuthContext = createContext({
-  authenticated: false,
-  setAuthenticated: (auth) => {}
-})
-
 function MyApp({ Component, pageProps: { session, ...pageProps } }) {
   const router = useRouter()
   const { isMobile } = useDevice()
 
   const [animateLoader, setAnimateLoader] = useState(false)
-  const [authenticated, setAuthenticated] = useState(null)
-  const auth = getAuth()
-
-  // useEffect(() => {
-  //   setAuthenticated(auth)
-  // }, [auth])
 
   useEffect(() => {
     const handleRouteChangeStart = () => setAnimateLoader(true)
@@ -63,14 +54,13 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }) {
   }, [isMobile])
 
   return (
-    // <AuthContext.Provider value={{authenticated, setAuthenticated}}>
     <SessionProvider session={session}>
       <AnimatePresence>
         {animateLoader && (
           <motion.div
-            initial={{ opacity: 0 }}
+            initial={{ opacity: 0.4 }}
             animate={{ opacity: 1 }}
-            exit={{ opacity: 0 }}
+            exit={{ opacity: 0.4 }}
             transition={{
               duration: 0.1
             }}
@@ -90,20 +80,15 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }) {
       />
       <NextProgress color='#F01C21' options={{ showSpinner: false }} />
       <QueryClientProvider client={queryClient}>
-        <AnimatePresence
-          mode='popLayout'
-          initial={false}
-          onExitComplete={() => window.scrollTo(0, 0)}
-        >
-          <ProductProvider>
-            <ProductCartProvider>
-              {!animateLoader && <Component {...pageProps} key={router.asPath} />}
-            </ProductCartProvider>
-          </ProductProvider>
-        </AnimatePresence>
+        <ProductProvider>
+          <ProductCartProvider>
+            <ChakraProvider theme={theme}>
+              <Component {...pageProps} key={router.asPath} />
+            </ChakraProvider>
+          </ProductCartProvider>
+        </ProductProvider>
       </QueryClientProvider>
     </SessionProvider>
-    // </AuthContext.Provider>
   )
 }