diff --git a/apps/dashboard/src/app/auth/layout.tsx b/apps/dashboard/src/app/auth/layout.tsx index 1da4dfc..e3144bd 100644 --- a/apps/dashboard/src/app/auth/layout.tsx +++ b/apps/dashboard/src/app/auth/layout.tsx @@ -17,7 +17,12 @@ export default function RootLayout({ }>) { return ( - + {children} diff --git a/apps/dashboard/src/app/auth/login/_components/magic-link-form.tsx b/apps/dashboard/src/app/auth/login/_components/magic-link-form.tsx index 3bab670..2843607 100644 --- a/apps/dashboard/src/app/auth/login/_components/magic-link-form.tsx +++ b/apps/dashboard/src/app/auth/login/_components/magic-link-form.tsx @@ -1,8 +1,7 @@ 'use client'; -// eslint-disable-next-line import/named -- TODO: Review import { useFormState } from 'react-dom'; -import { Input, Label, Text } from '@ds-project/components'; +import { CardContent, CardFooter, Input, Label } from '@ds-project/components'; import { loginUser } from '../_actions'; import { Message } from './message'; import { SubmitButton } from './submit-button'; @@ -13,22 +12,21 @@ export const MagicLinkForm = () => { }); return ( -
- - -

Sign in instantly by getting a magic link sent to your email

- - - -

{state.error}

-
- + + + + + + + + {!state.ok ? : null} + ); }; diff --git a/apps/dashboard/src/app/auth/login/_components/submit-button.tsx b/apps/dashboard/src/app/auth/login/_components/submit-button.tsx index 6fb0638..15eb2df 100644 --- a/apps/dashboard/src/app/auth/login/_components/submit-button.tsx +++ b/apps/dashboard/src/app/auth/login/_components/submit-button.tsx @@ -1,5 +1,5 @@ 'use client'; -// eslint-disable-next-line import/named -- TODO: Review + import { useFormStatus } from 'react-dom'; import { Button, Icons } from '@ds-project/components'; @@ -8,6 +8,7 @@ export const SubmitButton = () => { return ( ); diff --git a/apps/dashboard/src/app/auth/login/page.tsx b/apps/dashboard/src/app/auth/login/page.tsx index 8a1ddf4..146305b 100644 --- a/apps/dashboard/src/app/auth/login/page.tsx +++ b/apps/dashboard/src/app/auth/login/page.tsx @@ -1,11 +1,23 @@ -import { Icons } from '@ds-project/components'; +import { + Card, + CardDescription, + CardHeader, + CardTitle, +} from '@ds-project/components'; import { MagicLinkForm } from './_components'; export default function Page() { return ( -
- + + + +

Login

+
+ +

Enter your email below to login to your account.

+
+
-
+ ); } diff --git a/packages/components/src/alert/alert.tsx b/packages/components/src/alert/alert.tsx index aaf7f97..6433309 100644 --- a/packages/components/src/alert/alert.tsx +++ b/packages/components/src/alert/alert.tsx @@ -10,7 +10,7 @@ const alertVariants = cva( variants: { variant: { default: 'ds-bg-background ds-text-foreground', - info: 'ds-border-yellow-500/50 ds-text-yellow-500 dark:ds-border-yellow-500 [&>svg]:ds-text-yellow-500', + info: 'ds-border-slate-800/50 ds-text-slate-800 dark:ds-border-slate-800 [&>svg]:ds-text-slate-800', destructive: 'ds-border-destructive/50 ds-text-destructive dark:ds-border-destructive [&>svg]:ds-text-destructive', },