not even sure

This commit is contained in:
2025-09-20 09:49:54 -05:00
parent a8bbfebd00
commit d4d690eb15
10 changed files with 101 additions and 40 deletions

View File

@@ -39,7 +39,7 @@
"radix-ui": "^1.4.3",
"react": "^19.1.1",
"react-dom": "^19.1.1",
"react-hook-form": "^7.62.0",
"react-hook-form": "^7.63.0",
"react-image-crop": "^11.0.10",
"require-in-the-middle": "^7.5.2",
"sonner": "^2.0.7",

View File

@@ -18,8 +18,7 @@ const Profile = async () => {
<AvatarUpload preloadedUser={preloadedUser} />
<Separator />
<UserInfoForm preloadedUser={preloadedUser} />
<Separator />
<ResetPasswordForm />
<ResetPasswordForm preloadedUser={preloadedUser} />
<Separator />
<SignOutForm />
</Card>

View File

@@ -222,16 +222,22 @@ const SignIn = () => {
</SubmitButton>
</form>
</Form>
<div className='flex my-auto justify-center w-2/3'>
<div className='flex flex-row w-1/3 items-center my-2.5'>
<div className='flex justify-center'>
<div
className='flex flex-row items-center
my-2.5 mx-auto justify-center w-1/4'
>
<Separator className='py-0.5 mr-3' />
<span className='font-semibold text-lg'>or</span>
<Separator className='py-0.5 ml-3' />
</div>
</div>
<div className='flex my-auto justify-center'>
<div className='flex justify-center mb-3'>
<MicrosoftSignInButton />
</div>
<div className='flex justify-center mt-3'>
<GibsAuthSignInButton />
</div>
</CardContent>
</Card>
</TabsContent>
@@ -337,9 +343,12 @@ const SignIn = () => {
<Separator className='py-0.5 ml-3' />
</div>
</div>
<div className='flex my-auto justify-center'>
<div className='flex justify-center mb-3'>
<MicrosoftSignInButton type='signUp' />
</div>
<div className='flex justify-center mt-3'>
<GibsAuthSignInButton type='signUp' />
</div>
</CardContent>
</Card>
</TabsContent>

View File

@@ -20,7 +20,7 @@ export const MicrosoftSignInButton = ({
<Button
size='lg'
onClick={() => signIn('microsoft-entra-id')}
className='text-lg font-semibold mx-auto'
className='text-lg font-semibold'
{...buttonProps}
>
<div className='flex flex-row my-auto space-x-2'>

View File

@@ -3,6 +3,7 @@ import { useState } from 'react';
import { useAction } from 'convex/react';
import { api } from '~/convex/_generated/api';
import { z } from 'zod';
import { type Preloaded, usePreloadedQuery } from 'convex/react';
import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form';
import {
@@ -18,6 +19,7 @@ import {
FormLabel,
FormMessage,
Input,
Separator,
SubmitButton,
} from '@/components/ui';
import { toast } from 'sonner';
@@ -62,7 +64,12 @@ const formSchema = z
path: ['confirmPassword'],
});
export const ResetPasswordForm = () => {
type ResetFormProps = {
preloadedUser: Preloaded<typeof api.auth.getUser>;
};
export const ResetPasswordForm = ({ preloadedUser }: ResetFormProps) => {
const user = usePreloadedQuery(preloadedUser);
const [loading, setLoading] = useState(false);
const changePassword = useAction(api.auth.updateUserPassword);
@@ -94,9 +101,11 @@ export const ResetPasswordForm = () => {
setLoading(false);
}
};
return (
return user?.provider !== 'password' ? (
<div />
) : (
<>
<Separator />
<CardHeader>
<CardTitle className='text-2xl'>Change Password</CardTitle>
<CardDescription>

View File

@@ -133,7 +133,10 @@ export const UserInfoForm = ({ preloadedUser }: UserInfoFormProps) => {
<FormItem>
<FormLabel>Email</FormLabel>
<FormControl>
<Input {...field} />
<Input
{...field}
disabled={user?.provider !== 'password'}
/>
</FormControl>
<FormDescription>
Your email address associated with your account.