diff --git a/apps/web/app/auth/login/login.tsx b/apps/web/app/auth/login/login.tsx index fec973fc..e766cf51 100644 --- a/apps/web/app/auth/login/login.tsx +++ b/apps/web/app/auth/login/login.tsx @@ -10,11 +10,11 @@ import * as Form from '@radix-ui/react-form' import { useFormik } from 'formik' import { getOrgLogoMediaDirectory } from '@services/media/media' import React from 'react' -import { AlertTriangle } from 'lucide-react' +import { AlertTriangle, UserRoundPlus } from 'lucide-react' import { useRouter } from 'next/navigation' import Link from 'next/link' import { signIn } from "next-auth/react" -import { getUriWithOrg } from '@services/config/config' +import { getUriWithOrg, getUriWithoutOrg } from '@services/config/config' import { useLHSession } from '@components/Contexts/LHSessionContext' interface LoginClientProps { @@ -176,11 +176,18 @@ const LoginClient = (props: LoginClientProps) => { -
- +
+
OR
+
+ + + Sign up + + +
diff --git a/apps/web/app/auth/signup/InviteOnlySignUp.tsx b/apps/web/app/auth/signup/InviteOnlySignUp.tsx index 6827fc20..0ffa7952 100644 --- a/apps/web/app/auth/signup/InviteOnlySignUp.tsx +++ b/apps/web/app/auth/signup/InviteOnlySignUp.tsx @@ -13,6 +13,7 @@ import { AlertTriangle, Check, User } from 'lucide-react' import Link from 'next/link' import { signUpWithInviteCode } from '@services/auth/auth' import { useOrg } from '@components/Contexts/OrgContext' +import { signIn } from 'next-auth/react' const validate = (values: any) => { const errors: any = {} @@ -92,7 +93,7 @@ function InviteOnlySignUpComponent(props: InviteOnlySignUpProps) { }, }) - useEffect(() => {}, [org]) + useEffect(() => { }, [org]) return (
@@ -180,6 +181,13 @@ function InviteOnlySignUpComponent(props: InviteOnlySignUpProps) {
+
+
+ +
) } diff --git a/apps/web/app/auth/signup/OpenSignup.tsx b/apps/web/app/auth/signup/OpenSignup.tsx index eac8511c..36a2e821 100644 --- a/apps/web/app/auth/signup/OpenSignup.tsx +++ b/apps/web/app/auth/signup/OpenSignup.tsx @@ -89,7 +89,7 @@ function OpenSignUpComponent() { }, }) - useEffect(() => {}, [org]) + useEffect(() => { }, [org]) return (
@@ -178,11 +178,11 @@ function OpenSignUpComponent() {
-
- +
+
) diff --git a/apps/web/components/Contexts/OrgContext.tsx b/apps/web/components/Contexts/OrgContext.tsx index d20726ff..8296fc50 100644 --- a/apps/web/components/Contexts/OrgContext.tsx +++ b/apps/web/components/Contexts/OrgContext.tsx @@ -36,7 +36,7 @@ export function OrgProvider({ children, orgslug }: { children: React.ReactNode, return ( )