Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

Merge branch 'main' into sso-followup

React-Admin CI1843939bf219
diff --cc src/components/atomic-crm/login/LoginPage.tsx
index fa96a19b,d040dee1..4ce0eb4b
--- a/src/components/atomic-crm/login/LoginPage.tsx
+++ b/src/components/atomic-crm/login/LoginPage.tsx
@@@ -67,44 -64,46 +67,44 @@@ export const LoginPage = (props: { redi
{title}
</div>
</div>
- <div className="lg:p-8">
- <div className="mx-auto flex w-full flex-col justify-center space-y-6 sm:w-[350px]">
- <div className="flex flex-col space-y-2 text-center">
+ <div className="flex flex-col justify-center w-full p-4 lg:p-8">
+ <div className="w-full space-y-6 lg:mx-auto lg:w-[350px]">
+ <div className="text-center">
<h1 className="text-2xl font-semibold tracking-tight">Sign in</h1>
</div>
- <Form className="space-y-8" onSubmit={handleSubmit}>
- <TextInput
- label="Email"
- source="email"
- type="email"
- validate={required()}
- />
- <TextInput
- label="Password"
- source="password"
- type="password"
- validate={required()}
- />
- <div className="flex flex-col gap-4">
- <Button
- type="submit"
- className="w-full cursor-pointer"
- disabled={loading}
- >
- Sign in
- </Button>
- {googleWorkplaceDomain ? (
- <SSOAuthButton
- className="w-full"
- domain={googleWorkplaceDomain}
+ {disableEmailPasswordAuthentication ? null : (
+ <Form className="space-y-8" onSubmit={handleSubmit}>
+ <TextInput
+ label="Email"
+ source="email"
+ type="email"
+ validate={required()}
+ />
+ <TextInput
+ label="Password"
+ source="password"
+ type="password"
+ validate={required()}
+ />
+ <div className="flex flex-col gap-4">
+ <Button
+ type="submit"
+ className="cursor-pointer"
+ disabled={loading}
>
- Sign in with Google Workplace
- </SSOAuthButton>
- ) : null}
- </div>
- </Form>
-
+ Sign in
+ </Button>
+ </div>
+ </Form>
+ )}
+ {googleWorkplaceDomain ? (
+ <SSOAuthButton className="w-full" domain={googleWorkplaceDomain}>
+ Sign in with Google Workplace
+ </SSOAuthButton>
+ ) : null}
<Link
to={"/forgot-password"}
- className="text-sm text-center hover:underline"
+ className="block text-sm text-center hover:underline"
>
Forgot your password?
</Link>