feat: major login and signup changes

apps/web/components/Contexts/LHSessionContext.tsx

@@ -9,7 +9,6 @@ function LHSessionProvider({ children }: { children: React.ReactNode }) {
     const session = useSession();
 
     useEffect(() => {
-        console.log('useLHSession', session);
     }, [])
 
 
@@ -20,7 +19,6 @@ function LHSessionProvider({ children }: { children: React.ReactNode }) {
     else if (session) {
         return (
             <SessionContext.Provider value={session}>
-                {console.log('rendered')}
                 {children}
             </SessionContext.Provider>
         )

apps/web/components/Contexts/OrgContext.tsx

@@ -1,51 +1,48 @@
 'use client'
-import { getAPIUrl } from '@services/config/config'
+import { getAPIUrl, getUriWithoutOrg } from '@services/config/config'
 import { swrFetcher } from '@services/utils/ts/requests'
-import React, { useContext, useEffect, useState } from 'react'
+import React, { createContext, useContext, useEffect, useMemo, useState } from 'react'
 import useSWR from 'swr'
-import { createContext } from 'react'
-import { useRouter } from 'next/navigation'
 import { useLHSession } from '@components/Contexts/LHSessionContext'
 import ErrorUI from '@components/StyledElements/Error/Error'
+import InfoUI from '@components/StyledElements/Info/Info'
+import { usePathname } from 'next/navigation'
 
-export const OrgContext = createContext({}) as any
+export const OrgContext = createContext(null)
 
-export function OrgProvider({
-  children,
-  orgslug,
-}: {
-  children: React.ReactNode
-  orgslug: string
-}) {
-  const session = useLHSession() as any;
-  const access_token = session?.data?.tokens?.access_token;
-  const { data: org } = useSWR(`${getAPIUrl()}orgs/slug/${orgslug}`, (url) => swrFetcher(url, access_token))
-  const [isLoading, setIsLoading] = useState(true);
-  const [isOrgActive, setIsOrgActive] = useState(true);
+export function OrgProvider({ children, orgslug }: { children: React.ReactNode, orgslug: string }) {
+  const session = useLHSession() as any
+  const pathname = usePathname()
+  const accessToken = session?.data?.tokens?.access_token
+  const isAllowedPathname = ['/login', '/signup'].includes(pathname);
 
-  // Check if Org is Active 
-  const verifyIfOrgIsActive = () => {
-    if (org && org?.config.config.GeneralConfig.active === false) {
-      setIsOrgActive(false)
-    }
-    else {
-      setIsOrgActive(true)
-    }
+  const { data: org, error: orgError } = useSWR(
+    `${getAPIUrl()}orgs/slug/${orgslug}`,
+    (url) => swrFetcher(url, accessToken)
+  )
+  const { data: orgs, error: orgsError } = useSWR(
+    `${getAPIUrl()}orgs/user/page/1/limit/10`,
+    (url) => swrFetcher(url, accessToken)
+  )
+
+
+  const isOrgActive = useMemo(() => org?.config?.config?.GeneralConfig?.active !== false, [org])
+  const isUserPartOfTheOrg = useMemo(() => orgs?.some((userOrg: any) => userOrg.id === org?.id), [orgs, org?.id])
+
+  if (orgError || orgsError) return <ErrorUI message='An error occurred while fetching data' />
+  if (!org || !orgs || !session) return <div>Loading...</div>
+  if (!isOrgActive) return <ErrorUI message='This organization is no longer active' />
+  if (!isUserPartOfTheOrg && session.status == 'authenticated' && !isAllowedPathname) {
+    return (
+      <InfoUI
+        href={getUriWithoutOrg(`/signup?orgslug=${orgslug}`)}
+        message='You are not part of this Organization'
+        cta={`Join ${org?.name}`}
+      />
+    )
   }
 
-  useEffect(() => {
-    if (org && session) {
-      verifyIfOrgIsActive()
-      setIsLoading(false)
-    }
-  }, [org, session])
-
-  if (!isLoading) {
-    return <OrgContext.Provider value={org}>{children}</OrgContext.Provider>
-  }
-  if (!isOrgActive) {
-    return <ErrorUI message='This organization is no longer active' />
-  }
+  return <OrgContext.Provider value={org}>{children}</OrgContext.Provider>
 }
 
 export function useOrg() {