@campxdev/shared 1.0.4 → 1.1.0

package/src/contexts/LoginFormProvider.tsx

@@ -1,39 +1,39 @@
-import { createContext, useContext } from 'react'
-import { LoginForm } from '../components'
-import { useModal } from '../components/DrawerWrapper/DrawerWrapper'
-
-const LoginContext = createContext<{
-  openLoginForm: () => void
-}>({
-  openLoginForm: () => {},
-})
-
-export default function LoginFormProvider({ children }) {
-  const modal = useModal()
-
-  const onLogin = () => {
-    modal({
-      title: 'Developer Login',
-      content({ close }) {
-        return <LoginForm />
-      },
-    })
-  }
-
-  return (
-    <LoginContext.Provider
-      value={{
-        openLoginForm: onLogin,
-      }}
-    >
-      {children}
-    </LoginContext.Provider>
-  )
-}
-
-export const useLoginForm = () => {
-  const context = useContext(LoginContext)
-  return {
-    openLoginForm: context.openLoginForm,
-  }
-}
+import { createContext, useContext } from 'react'
+import { LoginForm } from '../components'
+import { useModal } from '../components/DrawerWrapper/DrawerWrapper'
+
+const LoginContext = createContext<{
+  openLoginForm: (loginUrl: string) => void
+}>({
+  openLoginForm: (loginUrl: string) => {},
+})
+
+export default function LoginFormProvider({ children }) {
+  const modal = useModal()
+
+  const onLogin = (loginUrl: string) => {
+    modal({
+      title: 'Developer Login',
+      content({ close }) {
+        return <LoginForm loginUrl={loginUrl} />
+      },
+    })
+  }
+
+  return (
+    <LoginContext.Provider
+      value={{
+        openLoginForm: onLogin,
+      }}
+    >
+      {children}
+    </LoginContext.Provider>
+  )
+}
+
+export const useLoginForm = () => {
+  const context = useContext(LoginContext)
+  return {
+    openLoginForm: context.openLoginForm,
+  }
+}

package/src/contexts/Providers.tsx

@@ -1,59 +1,60 @@
-import MuiThemeProvider from '../theme/MuiThemeProvider'
-import ConfirmContextProvider from '../components/PopupConfirm/ConfirmContextProvider'
-import { CssBaseline } from '@mui/material'
-import { BrowserRouter } from 'react-router-dom'
-import QueryClientProvider from './QueryClientProvider'
-
-import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
-import { ToastContainer } from '../components'
-import LoginFormProvider from './LoginFormProvider'
-import { ReactNode } from 'react'
-import { isDevelopment } from '../constants'
-import useAppInit from '../hooks/useAppInit'
-import Cookies from 'js-cookie'
-
-export const campxTenantKey = Cookies.get('campx_tenant')
-export const urlTenantKey = window.location.pathname.split('/')[1]
-
-export default function Providers({ children }: { children: ReactNode }) {
-  const { isInvalid } = useAppInit()
-
-  return (
-    <BrowserRouter basename={isDevelopment ? 'campx_dev' : urlTenantKey}>
-      <QueryClientProvider>
-        <MuiThemeProvider>
-          <ConfirmContextProvider>
-            <DialogProvider>
-              <LoginFormProvider>
-                {isInvalid ? <InvalidClientKey /> : children}
-                <CssBaseline />
-              </LoginFormProvider>
-              <ToastContainer />
-            </DialogProvider>
-          </ConfirmContextProvider>
-        </MuiThemeProvider>
-      </QueryClientProvider>
-    </BrowserRouter>
-  )
-}
-
-const InvalidClientKey = () => {
-  return (
-    <div
-      style={{
-        height: '95vh',
-        width: '95vw',
-        display: 'grid',
-        placeItems: 'center',
-        fontFamily: 'sans-serif',
-      }}
-    >
-      <h1>Invalid Tenant Key</h1>
-      {!isDevelopment && (
-        <a href="https://id.campx.in">
-          <p style={{ textDecoration: 'underline' }}>Login to continue</p>
-        </a>
-      )}
-    </div>
-  )
-}
+import MuiThemeProvider from '../theme/MuiThemeProvider'
+import ConfirmContextProvider from '../components/PopupConfirm/ConfirmContextProvider'
+import { CssBaseline } from '@mui/material'
+import { BrowserRouter } from 'react-router-dom'
+import QueryClientProvider from './QueryClientProvider'
+
+import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
+import { ToastContainer } from '../components'
+import LoginFormProvider from './LoginFormProvider'
+import { ReactNode } from 'react'
+import { isDevelopment } from '../constants'
+import useAppInit from '../hooks/useAppInit'
+import Cookies from 'js-cookie'
+
+export const campxTenantKey = Cookies.get('campx_tenant')
+export const urlTenantKey = window.location.pathname.split('/')[1]
+
+export default function Providers({ children }: { children: ReactNode }) {
+  const { isInvalid } = useAppInit()
+
+  return (
+    <BrowserRouter basename={isDevelopment ? 'campx_dev' : urlTenantKey}>
+      <QueryClientProvider>
+        <MuiThemeProvider>
+          <ConfirmContextProvider>
+            <DialogProvider>
+              <LoginFormProvider>
+                {/* {isInvalid ? <InvalidClientKey /> : children} */}
+                {children}
+                <CssBaseline />
+              </LoginFormProvider>
+              <ToastContainer />
+            </DialogProvider>
+          </ConfirmContextProvider>
+        </MuiThemeProvider>
+      </QueryClientProvider>
+    </BrowserRouter>
+  )
+}
+
+const InvalidClientKey = () => {
+  return (
+    <div
+      style={{
+        height: '95vh',
+        width: '95vw',
+        display: 'grid',
+        placeItems: 'center',
+        fontFamily: 'sans-serif',
+      }}
+    >
+      <h1>Invalid Tenant Key</h1>
+      {!isDevelopment && (
+        <a href="https://id.campx.in">
+          <p style={{ textDecoration: 'underline' }}>Login to continue</p>
+        </a>
+      )}
+    </div>
+  )
+}

package/src/contexts/PublicProviders.tsx

@@ -1,30 +1,30 @@
-import { CssBaseline } from '@mui/material'
-import { BrowserRouter } from 'react-router-dom'
-import ConfirmContextProvider from '../components/PopupConfirm/ConfirmContextProvider'
-import MuiThemeProvider from '../theme/MuiThemeProvider'
-import QueryClientProvider from './QueryClientProvider'
-
-import { ReactNode } from 'react'
-import { ToastContainer } from '../components'
-import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
-
-// export const campxTenantKey = Cookies.get('campx_tenant')
-// export const urlTenantKey = window.location.pathname.split('/')[1]
-
-export default function PublicProviders({ children }: { children: ReactNode }) {
-  return (
-    <BrowserRouter>
-      <QueryClientProvider>
-        <MuiThemeProvider>
-          <ConfirmContextProvider>
-            <DialogProvider>
-              {children}
-              <CssBaseline />
-              <ToastContainer />
-            </DialogProvider>
-          </ConfirmContextProvider>
-        </MuiThemeProvider>
-      </QueryClientProvider>
-    </BrowserRouter>
-  )
-}
+import { CssBaseline } from '@mui/material'
+import { BrowserRouter } from 'react-router-dom'
+import ConfirmContextProvider from '../components/PopupConfirm/ConfirmContextProvider'
+import MuiThemeProvider from '../theme/MuiThemeProvider'
+import QueryClientProvider from './QueryClientProvider'
+
+import { ReactNode } from 'react'
+import { ToastContainer } from '../components'
+import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
+
+// export const campxTenantKey = Cookies.get('campx_tenant')
+// export const urlTenantKey = window.location.pathname.split('/')[1]
+
+export default function PublicProviders({ children }: { children: ReactNode }) {
+  return (
+    <BrowserRouter>
+      <QueryClientProvider>
+        <MuiThemeProvider>
+          <ConfirmContextProvider>
+            <DialogProvider>
+              {children}
+              <CssBaseline />
+              <ToastContainer />
+            </DialogProvider>
+          </ConfirmContextProvider>
+        </MuiThemeProvider>
+      </QueryClientProvider>
+    </BrowserRouter>
+  )
+}

package/src/contexts/QueryClientProvider.tsx

@@ -1,22 +1,22 @@
-import {
-  QueryClient,
-  QueryClientProvider as ReactQueryClientProvider,
-} from 'react-query'
-
-export const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      refetchOnWindowFocus: false,
-      retry: false,
-      useErrorBoundary: true,
-    },
-  },
-})
-
-export default function QueryClientProvider({ children }) {
-  return (
-    <ReactQueryClientProvider client={queryClient}>
-      {children}
-    </ReactQueryClientProvider>
-  )
-}
+import {
+  QueryClient,
+  QueryClientProvider as ReactQueryClientProvider,
+} from 'react-query'
+
+export const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      refetchOnWindowFocus: false,
+      retry: false,
+      useErrorBoundary: true,
+    },
+  },
+})
+
+export default function QueryClientProvider({ children }) {
+  return (
+    <ReactQueryClientProvider client={queryClient}>
+      {children}
+    </ReactQueryClientProvider>
+  )
+}

package/src/hooks/index.ts

@@ -1,3 +1,3 @@
-export { default as useFetch } from './useFetch'
-export * from './useRouter'
-export { default as useAuth } from './useAuth'
+export { default as useFetch } from './useFetch'
+export * from './useRouter'
+export { default as useAuth } from './useAuth'

package/src/hooks/useAppInit.ts

@@ -1,33 +1,33 @@
-import Cookies from 'js-cookie'
-import { useEffect, useState } from 'react'
-import { isDevelopment } from '../constants'
-import { campxTenantKey } from '../contexts/Providers'
-
-const urlTenantKey = window.location.pathname.split('/')[1]
-
-export default function useAppInit() {
-  const [isInvalid, setIsInvalid] = useState(false)
-
-  useEffect(() => {
-    if (!isDevelopment) {
-      if (!urlTenantKey && campxTenantKey) {
-        return window.location.replace(
-          window.location.origin + `/${campxTenantKey}`,
-        )
-      }
-
-      if (!urlTenantKey) {
-        setIsInvalid(true)
-      }
-    }
-
-    if (window.location.pathname === '/' && isDevelopment) {
-      Cookies.set('campx_tenant', 'campx_dev')
-      window.location.href = window.location.origin + '/campx_dev'
-    }
-  }, [])
-
-  return {
-    isInvalid,
-  }
-}
+import Cookies from 'js-cookie'
+import { useEffect, useRef, useState } from 'react'
+import { isDevelopment } from '../constants'
+import { campxTenantKey } from '../contexts/Providers'
+
+const urlTenantKey = window.location.pathname.split('/')[1]
+
+export default function useAppInit() {
+  const [isInvalid, setIsInvalid] = useState(false)
+
+  useEffect(() => {
+    if (!isDevelopment) {
+      if (!urlTenantKey && campxTenantKey) {
+        return window.location.replace(
+          window.location.origin + `/${campxTenantKey}`,
+        )
+      }
+
+      if (!urlTenantKey) {
+        setIsInvalid(true)
+      }
+    }
+
+    if (window.location.pathname === '/' && isDevelopment) {
+      Cookies.set('campx_tenant', 'campx_dev')
+      window.location.href = window.location.origin + '/campx_dev'
+    }
+  }, [])
+
+  return {
+    isInvalid,
+  }
+}

package/src/hooks/useAuth.ts

@@ -1,92 +1,96 @@
-import { useEffect, useState } from 'react'
-import { useQuery } from 'react-query'
-import { toast } from 'react-toastify'
-import axios from '../config/axios'
-import { isDevelopment } from '../constants'
-import { useLoginForm } from '../contexts/LoginFormProvider'
-import { PermissionsStore } from '../permissions'
-import { AssetsStore, UserStore } from '../shared-state'
-
-const url = window.location.origin
-
-function useAuth(): {
-  loading: boolean
-  data: {
-    user?: any
-    roles?: any
-    username?: any
-    permissions?: any
-    assets?: {
-      logo: string
-      logo_square: string
-    }
-  }
-} {
-  const { openLoginForm } = useLoginForm()
-  const [loading, setLoading] = useState<boolean>(false)
-  const [data, setData] = useState(null)
-  const appInit = async () => {
-    setLoading(true)
-
-    axios
-      .get('/auth/my-permissions')
-      
-      .then((res) => {
-        console.log(res.data)
-        setLoading(false)
-        setData(res.data)
-        UserStore.update((s) => {
-          s.username = res.data?.username
-          s.user = res.data?.user
-          s.roles = res.data?.roles
-        })
-
-        PermissionsStore.update((s) => {
-          s.permissions = {
-            ...res.data?.permissions,
-            can_settings_view: 1,
-            can_dashboard_view: 1,
-            can_individual_pages_view: 1,
-          } as any
-        })
-        AssetsStore.update((s) => {
-          s.logo = res.data?.assets.logo
-          s.logo_square = res.data?.assets.logo_square
-        })
-      })
-      .catch((err) => {
-        setLoading(false)
-        if (isDevelopment) {
-          openLoginForm()
-          return
-        } else {
-          window.location.replace(`https://www.id.campx.in/?redirect_to=${url}`)
-        }
-        if (err.response.status !== 401) {
-          if (err.response.status > 400 && err.response.status < 500) {
-            window.location.replace(
-              `https://www.id.campx.in/?redirect_to=${url}`,
-            )
-          } else {
-            toast.error('Server Error')
-          }
-        }
-      })
-  }
-
-  useEffect(() => {
-    if (window.location.pathname === '/') {
-      if (isDevelopment) {
-        window.location.replace(window.location.origin + '/campx_dev')
-      }
-    }
-    appInit()
-  }, [])
-
-  return {
-    loading: loading || !data?.permissions,
-    data,
-  }
-}
-
-export default useAuth
+import { AxiosError } from 'axios'
+import { useEffect, useState } from 'react'
+import { toast } from 'react-toastify'
+import axios from '../config/axios'
+import { isDevelopment } from '../constants'
+import { useLoginForm } from '../contexts/LoginFormProvider'
+import { PermissionsStore, AssetsStore, UserStore } from '../shared-state'
+
+const url = window.location.origin
+
+type AuthParams = {
+  serviceKey: string
+  loginUrl?: string
+}
+
+type AuthResponse = {
+  loading: boolean
+  data: {
+    user?: any
+    roles?: any
+    username?: any
+    permissions?: any
+    assets?: {
+      logo: string
+      logo_square: string
+    }
+  }
+}
+
+function useAuth({ serviceKey, loginUrl }: AuthParams): AuthResponse {
+  const { openLoginForm } = useLoginForm()
+  const [loading, setLoading] = useState<boolean>(false)
+  const [data, setData] = useState(null)
+
+  const appInit = async () => {
+    setLoading(true)
+    axios
+      .get(serviceKey + '/my-permissions')
+      .then((res) => {
+        setLoading(false)
+        setData(res.data)
+        UserStore.update((s) => {
+          s.username = res.data?.username
+          s.user = res.data?.user
+          s.roles = res.data?.roles
+        })
+
+        PermissionsStore.update((s) => {
+          s.permissions = {
+            ...res.data?.permissions,
+            can_settings_view: 1,
+            can_dashboard_view: 1,
+            can_individual_pages_view: 1,
+          } as any
+        })
+        AssetsStore.update((s) => {
+          s.logo = res.data?.assets.logo
+          s.logo_square = res.data?.assets.logo_square
+        })
+      })
+      .catch((err: AxiosError) => {
+        setLoading(false)
+        if (isDevelopment) {
+          openLoginForm(loginUrl)
+          return
+        } else {
+          window.location.replace(`https://www.id.campx.in/?redirect_to=${url}`)
+        }
+        if (err.response.status !== 401) {
+          if (err.response.status > 400 && err.response.status < 500) {
+            window.location.replace(
+              `https://www.id.campx.in/?redirect_to=${url}`,
+            )
+          } else {
+            toast.error('Server Error')
+          }
+        }
+      })
+  }
+
+  useEffect(() => {
+    if (window.location.pathname === '/') {
+      if (isDevelopment) {
+        window.location.replace(window.location.origin + '/campx_dev')
+      }
+    }
+    appInit()
+  }, [])
+
+  return {
+    loading: loading || !data?.permissions,
+    data,
+  }
+}
+
+export default useAuth