Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-21 20:21:38 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: wip

Browse Source
This commit is contained in:
David Nguyen
2025-02-12 16:41:35 +11:00
parent 548d92c2fc
commit 15922d447b
70 changed files with 889 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/remix/app/components/forms/password.tsx
View File

@ -2,12 +2,12 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react';
import { Trans } from '@lingui/react/macro';
import type { User } from '@prisma/client';
import { useForm } from 'react-hook-form';
import { match } from 'ts-pattern';
import { z } from 'zod';
import { authClient } from '@documenso/auth/client';
import type { SessionUser } from '@documenso/auth/server/lib/session/session';
import { AppError } from '@documenso/lib/errors/app-error';
import { ZCurrentPasswordSchema, ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
import { cn } from '@documenso/ui/lib/utils';
@ -38,7 +38,7 @@ export type TPasswordFormSchema = z.infer<typeof ZPasswordFormSchema>;
export type PasswordFormProps = {
className?: string;
user: User;
user: SessionUser;
};
export const PasswordForm = ({ className }: PasswordFormProps) => {

6
apps/remix/app/components/forms/signin.tsx
View File

@ -97,7 +97,7 @@ export const SignInForm = ({
const [isPasskeyLoading, setIsPasskeyLoading] = useState(false);
const redirectUrl = useMemo(() => {
const redirectPath = useMemo(() => {
// Handle SSR
if (typeof window === 'undefined') {
return LOGIN_REDIRECT_PATH;
@ -171,7 +171,7 @@ export const SignInForm = ({
await authClient.passkey.signIn({
credential: JSON.stringify(credential),
csrfToken: sessionId,
redirectUrl,
redirectPath,
});
} catch (err) {
setIsPasskeyLoading(false);
@ -211,7 +211,7 @@ export const SignInForm = ({
password,
totpCode,
backupCode,
redirectUrl,
redirectPath,
});
} catch (err) {
console.log(err);

29
apps/remix/app/components/forms/team-branding-preferences-form.tsx
View File

@ -9,6 +9,8 @@ import { Loader } from 'lucide-react';
import { useForm } from 'react-hook-form';
import { z } from 'zod';
import { getFile } from '@documenso/lib/universal/upload/get-file';
import { putFile } from '@documenso/lib/universal/upload/put-file';
import { trpc } from '@documenso/trpc/react';
import { cn } from '@documenso/ui/lib/utils';
import { Button } from '@documenso/ui/primitives/button';
@ -78,8 +80,7 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
let uploadedBrandingLogo = settings?.brandingLogo;
if (brandingLogo) {
// Todo
// uploadedBrandingLogo = JSON.stringify(await putFile(brandingLogo));
uploadedBrandingLogo = JSON.stringify(await putFile(brandingLogo));
}
if (brandingLogo === null) {
@ -116,26 +117,12 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
const file = JSON.parse(settings.brandingLogo);
if ('type' in file && 'data' in file) {
// Todo
// Todo
// Todo
void fetch(`/api/file?key=${file.key}`, {
method: 'GET',
})
.then(async (res) => await res.json())
.then((data) => {
const objectUrl = URL.createObjectURL(new Blob([data.binaryData]));
void getFile(file).then((binaryData) => {
const objectUrl = URL.createObjectURL(new Blob([binaryData]));
setPreviewUrl(objectUrl);
setHasLoadedPreview(true);
});
// void getFile(file).then((binaryData) => {
// const objectUrl = URL.createObjectURL(new Blob([binaryData]));
// setPreviewUrl(objectUrl);
// setHasLoadedPreview(true);
// });
setPreviewUrl(objectUrl);
setHasLoadedPreview(true);
});
return;
}