Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: esign alignment issue #289

Merged
merged 3 commits into from
May 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ import { PdfCanvas } from "@/components/template/pdf-canvas";
import { TemplateFieldForm } from "@/components/template/template-field-form";
import { Badge } from "@/components/ui/badge";
import { TemplateFieldProvider } from "@/providers/template-field-provider";
import { withServerSession } from "@/server/auth";
import { api } from "@/trpc/server";

const EsignTemplateDetailPage = async ({
params: { templatePublicId },
}: {
params: { templatePublicId: string };
}) => {
const session = await withServerSession();

const { name, status, url, fields, recipients } =
await api.template.get.query({
publicId: templatePublicId,
Expand All @@ -18,7 +21,10 @@ const EsignTemplateDetailPage = async ({

return (
<TemplateFieldProvider recipients={recipients} fields={fields}>
<TemplateFieldForm templatePublicId={templatePublicId}>
<TemplateFieldForm
companyPublicId={session.user.companyPublicId}
templatePublicId={templatePublicId}
>
<div className="grid grid-cols-12">
<div className="col-span-12 flex align-middle">
<Badge
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const ESignTable = ({ documents, companyPublicId }: ESignTableProps) => {
{item.status === "DRAFT" && (
<Link
className={buttonVariants()}
href={`/${companyPublicId}/esign/${item.publicId}`}
href={`/${companyPublicId}/documents/esign/${item.publicId}`}
>
Edit
</Link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export function AddRecipientStep({ companyPublicId }: AddRecipientStepProps) {
...data,
});

router.push(`/${companyPublicId}/esign/${template.publicId}`);
router.push(`/${companyPublicId}/documents/esign/${template.publicId}`);
};

const isDeleteDisabled = fields.length === 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const ReadOnlyTemplateField = ({
<img
src={prefilledValue ?? value}
alt="signature"
className="h-full w-full"
className="h-full "
/>
) : (
<p>{name}</p>
Expand Down
11 changes: 10 additions & 1 deletion src/components/template/template-field-form/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,26 @@
import { useToast } from "@/components/ui/use-toast";
import { type TemplateFieldForm as TTemplateFieldForm } from "@/providers/template-field-provider";
import { api } from "@/trpc/react";
import { useRouter } from "next/navigation";
import { type ReactNode } from "react";
import { useFormContext } from "react-hook-form";

interface TemplateFieldFormProps {
children: ReactNode;
templatePublicId: string;
companyPublicId: string;
}

export const TemplateFieldForm = ({
children,
templatePublicId,
companyPublicId,
}: TemplateFieldFormProps) => {
const router = useRouter();
const { toast } = useToast();

const { handleSubmit } = useFormContext<TTemplateFieldForm>();
const { handleSubmit, getValues } = useFormContext<TTemplateFieldForm>();
const status = getValues("status");

const { mutateAsync } = api.templateField.add.useMutation({
onSuccess: () => {
Expand All @@ -26,6 +31,10 @@ export const TemplateFieldForm = ({
title: "🎉 Successfully created",
description: "Your template fields has been created.",
});

if (status === "COMPLETE") {
router.push(`/${companyPublicId}/documents`);
}
},
});

Expand Down
18 changes: 8 additions & 10 deletions src/components/ui/pdf-viewer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";

import { Card } from "@/components/ui/card";
import { useResizeObserver } from "@wojtekmaj/react-hooks";
import { useCallback, useState } from "react";
import { Document, Page, pdfjs } from "react-pdf";
Expand Down Expand Up @@ -35,7 +34,7 @@ export const PdfViewer = ({
const [entry] = entries;

if (entry) {
setContainerWidth(entry.contentRect.width - 38);
setContainerWidth(entry.contentRect.width);
}
}, []);

Expand All @@ -60,14 +59,13 @@ export const PdfViewer = ({
className="w-full overflow-hidden rounded"
>
{Array.from(new Array(numPages), (el, index) => (
<Card className="my-5 p-3" key={`page_${index + 1}`}>
<Page
pageNumber={index + 1}
renderAnnotationLayer={false}
renderTextLayer={false}
width={containerWidth}
/>
</Card>
<Page
key={`page_${index + 1}`}
pageNumber={index + 1}
renderAnnotationLayer={false}
renderTextLayer={false}
width={containerWidth}
/>
))}
</Document>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/signature-pad.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function DrawingLine({ line }: { line: [Point] }) {
strokeLinecap="round"
strokeLinejoin="round"
stroke="black"
strokeWidth="1px"
strokeWidth="3px"
d={pathData}
/>
);
Expand Down
Loading