Compare commits
3 Commits
f206d54963
...
7b448558c0
| Author | SHA1 | Date |
|---|---|---|
=bhagwanSingh
|
7b448558c0 | |
 JaiPandey425
|
1ce24675ba | |
|
JaiPandey425
|
3b08c04463 |
|
|
@ -54,6 +54,12 @@ const App = () => {
|
|||
</ProtectedRoute>
|
||||
} />
|
||||
|
||||
<Route path="/process-step-one/:accountId/:transactionId/:signType" element={
|
||||
<ProtectedRoute>
|
||||
<ProcessStepOne />
|
||||
</ProtectedRoute>
|
||||
} />
|
||||
|
||||
<Route path="/process-step-one/:accountId/template/:templateId" element={
|
||||
<ProtectedRoute>
|
||||
<ProcessStepOne />
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@ const DocumentPages = ({ selectedDocuments, setDropDownTogglePage, dropDownToggl
|
|||
onClick={() => (`${(dropDownTogglePage === 'pageDropDown' + indx) ? '' : 'pageDropDown' + indx}`)}
|
||||
className={`p-2 ${(dropDownTogglePage === 'pageDropDown' + indx) ? "bg-[var(--primary)]" : "bg-slate-200"} flex flex-col justify-center items-center gap-2 rounded`}>
|
||||
{
|
||||
document.images != undefined && <img
|
||||
document.pages != undefined && <img
|
||||
key={indx}
|
||||
className='rounded-sm shadow'
|
||||
src={document.images[0].src}
|
||||
src={document.pages[0].src}
|
||||
alt="" />
|
||||
}
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ const DocumentPages = ({ selectedDocuments, setDropDownTogglePage, dropDownToggl
|
|||
{
|
||||
dropDownTogglePage === 'pageDropDown' + indx &&
|
||||
<div className='my-1 flex justify-center items-center gap-1 flex-wrap'>
|
||||
{document.images != undefined && document.images.map((img, indx) => (
|
||||
{document.pages != undefined && document.pages.map((img, indx) => (
|
||||
<a
|
||||
href={"#" + document.documentId + indx}
|
||||
className='max-w-max px-4 py-2 shadow cursor-pointer border-1 rounded-sm border-slate-200 hover:border-[var(--primary)] transition-all duration-300 bg-slate-300'
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ interface RecipientType {
|
|||
acceptedTerms: boolean;
|
||||
name: string | null;
|
||||
}
|
||||
interface ImagesType {
|
||||
interface pagesType {
|
||||
index: number;
|
||||
type: string;
|
||||
src: string;
|
||||
|
|
@ -56,7 +56,7 @@ interface ImagesType {
|
|||
}
|
||||
interface DocumentType {
|
||||
documentId: string;
|
||||
images: ImagesType[];
|
||||
pages: pagesType[];
|
||||
name: string;
|
||||
}
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ const fitObj = [
|
|||
|
||||
// Functions - LIST
|
||||
// handleSignClick - Handle when sign || Initial tag got clicked
|
||||
// fetchData - Fetch document images and tags data
|
||||
// fetchData - Fetch document pages and tags data
|
||||
// handleFormSubmit - handle form submit and send data to server
|
||||
|
||||
const SignDocument = () => {
|
||||
|
|
@ -144,6 +144,7 @@ const SignDocument = () => {
|
|||
const [transaction, setTransaction] = useState<TransactionType | null>(null);
|
||||
const [recSignStatus, setRecSignStatus] = useState<string | null>(null);
|
||||
const [droppedItems, setDroppedItems] = useState([]);
|
||||
const[signTagId , setSignTagId] = useState<number>(0)
|
||||
|
||||
const [stamp, setStamp] = useState<StampTypeObj>({ open: false, blob: "" });
|
||||
|
||||
|
|
@ -178,8 +179,12 @@ const SignDocument = () => {
|
|||
initial: null,
|
||||
});
|
||||
|
||||
|
||||
|
||||
const [signConfObj, setSignConfObj] = useState<SignConfTypeObj | {}>({});
|
||||
|
||||
console.log("signConfObj",signConfObj)
|
||||
|
||||
const zoom = (percentage: number, contentClass: string) => {
|
||||
const content = document.querySelector(`.${contentClass}`);
|
||||
if (content) {
|
||||
|
|
@ -239,7 +244,9 @@ const SignDocument = () => {
|
|||
}
|
||||
}, [saved])
|
||||
|
||||
const handleSignClick = (index: number) => {
|
||||
const handleSignClick = (index: number , id:number) => {
|
||||
console.log("IDNumber" , id)
|
||||
setSignTagId(id)
|
||||
if (saved.save) {
|
||||
if (index in signConfObj) {
|
||||
setOpenSign(true);
|
||||
|
|
@ -263,8 +270,11 @@ const SignDocument = () => {
|
|||
}
|
||||
}
|
||||
setSignConfObj({ ...newObj })
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
const handleStampClick = (index: number) => {
|
||||
console.log("Stamp Clicked", index)
|
||||
setStamp({
|
||||
|
|
@ -502,11 +512,12 @@ const SignDocument = () => {
|
|||
|
||||
const fetchSignatureData = async (signatureId: string) => {
|
||||
try {
|
||||
const response = await axios.get(`${import.meta.env.VITE_BASE_URI}/api/sign/signatures/${signatureId}`, {
|
||||
const response = await axios.get(`${import.meta.env.VITE_BASE_URI}/api/sign/signatures/${signatureId}?recipientId=${recipientId}`, {
|
||||
headers: { "ngrok-skip-browser-warning": "69420" }
|
||||
});
|
||||
if (response.status === 200) {
|
||||
return response.data.signature;
|
||||
console.log("line 516" , response.data)
|
||||
return response.data;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error fetching signature data:", error);
|
||||
|
|
@ -514,18 +525,19 @@ const SignDocument = () => {
|
|||
return null;
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
if (droppedItems) {
|
||||
for (const tag of droppedItems) {
|
||||
if (tag.type === "SIGNATURE" && "value" in tag) {
|
||||
const signatureData = await fetchSignatureData(tag.value);
|
||||
console.log(signatureData);
|
||||
}
|
||||
}
|
||||
}
|
||||
})()
|
||||
}, [droppedItems])
|
||||
// useEffect(() => {
|
||||
// (async () => {
|
||||
// if (droppedItems) {
|
||||
// for (const tag of droppedItems) {
|
||||
// if (tag.type === "SIGNATURE" && "value" in tag) {
|
||||
// console.log(tag, "line 533")
|
||||
// const signatureData = await fetchSignatureData(tag["value"]);
|
||||
// console.log("Currnet Signature",signatureData);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// })()
|
||||
// }, [droppedItems])
|
||||
|
||||
|
||||
const handleTagUpdate = (updateIndx: number, updateValue: string) => {
|
||||
|
|
@ -879,7 +891,7 @@ const SignDocument = () => {
|
|||
|
||||
<div className='flex flex-col gap-3 max-w-max relative left-[50%] translate-x-[-50%]'>
|
||||
{
|
||||
doc.images && doc.images.length > 0 && doc.images.map((page, indx) => {
|
||||
doc.pages && doc.pages.length > 0 && doc.pages.map((page, indx) => {
|
||||
const key = `${doc.documentId}_${page.index}`;
|
||||
console.log(droppedItems, "line 820")
|
||||
// const tagJsonData = [...droppedItems];
|
||||
|
|
@ -1012,7 +1024,7 @@ const SignDocument = () => {
|
|||
<div
|
||||
tabIndex={1}
|
||||
id={item.id}
|
||||
onClick={() => handleSignClick(index)}
|
||||
onClick={() => handleSignClick(index , item.id)}
|
||||
className={`flex justify-center items-center h-full w-full rounded cursor-pointer ${transparentTags || hideTags ? "pointer-events-none bg-transparent" : "bg-slate-200 shadow-sm border-slate-100 opacity-80"}`}
|
||||
// style={{ height: item.dimensions.height + "px" }}
|
||||
>
|
||||
|
|
@ -1028,7 +1040,9 @@ const SignDocument = () => {
|
|||
width: `${item.dimensions.width}px`,
|
||||
height: `${item.dimensions.height}px`,
|
||||
}}
|
||||
src={saved.signature as string} />
|
||||
// src={saved.signature as string} />
|
||||
src={`data:image/png;base64,${saved.signature}`}
|
||||
/>
|
||||
}
|
||||
</div>}
|
||||
{/* SIGNATURE FIELD - END */}
|
||||
|
|
@ -1039,7 +1053,7 @@ const SignDocument = () => {
|
|||
<div
|
||||
tabIndex={1}
|
||||
id={item.id}
|
||||
onClick={() => handleSignClick(index)}
|
||||
onClick={() => handleSignClick(index , item.id)}
|
||||
className={`flex justify-center items-center h-full w-full rounded cursor-pointer ${transparentTags || hideTags ? "pointer-events-none" : "bg-slate-200 shadow-sm border-slate-100 opacity-80"}`}
|
||||
// style={{ height: item.dimensions.height + "px" }}
|
||||
>
|
||||
|
|
@ -1052,7 +1066,9 @@ const SignDocument = () => {
|
|||
height: `${item.dimensions.height}px`,
|
||||
}}
|
||||
className="w-[100%] h-full"
|
||||
src={saved.initial as string} />
|
||||
// src={saved.initial as string}
|
||||
src={`data:image/png;base64,${saved.initial}`}
|
||||
/>
|
||||
}
|
||||
</div>}
|
||||
{/* INITIALS FIELD - END */}
|
||||
|
|
@ -1207,7 +1223,7 @@ const SignDocument = () => {
|
|||
|
||||
{/* Side details of documents Pages and document Name - START */}
|
||||
<p className='absolute top-[50%] translate-y-[-50%] rotate-[-90deg] text-xs left-[-60px] text-slate-600'>
|
||||
page {indx + 1} of {doc.images && doc.images.length}
|
||||
page {indx + 1} of {doc.pages && doc.pages.length}
|
||||
</p>
|
||||
{/* Side details of documents Pages and document Name - END */}
|
||||
|
||||
|
|
@ -1258,7 +1274,7 @@ const SignDocument = () => {
|
|||
|
||||
|
||||
<div style={{ display: `${openSign ? 'block' : 'none'}` }}>
|
||||
<SignCon recipientId={recipientId as string} setOpenSign={setOpenSign} saved={saved} setSaved={setSaved} />
|
||||
<SignCon recipientId={recipientId as string} setOpenSign={setOpenSign} saved={saved} setSaved={setSaved} signTagId={signTagId}/>
|
||||
</div>
|
||||
|
||||
<div style={{ display: `${stamp.open ? 'block' : 'none'}` }}>
|
||||
|
|
|
|||
|
|
@ -2,10 +2,14 @@ import React, { useEffect, useRef } from 'react'
|
|||
import { IoMdArrowDropdown } from "react-icons/io";
|
||||
import { IoIosSend } from "react-icons/io";
|
||||
import { useDispatch, useSelector } from 'react-redux';
|
||||
import { setSignType } from '../../store/slices/selectedDocsSlice';
|
||||
import { setSignType, SignType } from '../../store/slices/selectedDocsSlice';
|
||||
import { RootState } from '../../store/store';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { Bounce, toast } from 'react-toastify';
|
||||
import api from '../../config/api';
|
||||
import { StartCard } from '../home/StartSection';
|
||||
import { setTransactionId, TRANSACTION_STATUS_ENUMS, updateTransactionStatus } from '../../store/slices/transactionSlice';
|
||||
import { SignTypeEnum } from '../../utlity/types';
|
||||
// import { IoMdArrowDropright } from "react-icons/io";
|
||||
|
||||
interface Props {
|
||||
|
|
@ -22,31 +26,54 @@ const SendForSign: React.FC<Props> = ({ showSideBar }) => {
|
|||
sendForSignDropdown && dropDownRef.current?.focus();
|
||||
}, [sendForSignDropdown])
|
||||
|
||||
const user = useSelector((state: RootState) => state.user);
|
||||
if (!user.account || user.account === null) {
|
||||
window.location.href = "/login";
|
||||
return;
|
||||
}
|
||||
|
||||
const defaultAccountId = user.account.id;
|
||||
|
||||
const selectedDocuments = useSelector((state: RootState) => state.selectedDocuments.selectedDocuments);
|
||||
|
||||
const handleSendSignDispatch: (type: "self-sign" | "multiple-sign") => void = (signType) => {
|
||||
if (selectedDocuments === null || !selectedDocuments.length) {
|
||||
if (selectedDocuments === null || !selectedDocuments.length) {
|
||||
toast.dismiss();
|
||||
toast.error("Select 📄 Documents first!", {
|
||||
position: "bottom-right",
|
||||
autoClose: 5000,
|
||||
hideProgressBar: false,
|
||||
closeOnClick: false,
|
||||
pauseOnHover: true,
|
||||
draggable: true,
|
||||
progress: undefined,
|
||||
theme: "light",
|
||||
transition: Bounce,
|
||||
});
|
||||
return
|
||||
const handleStartSectionClick = (signType: SignTypeEnum) => {
|
||||
|
||||
api.post(`/api/accounts/${defaultAccountId}/transactions`)
|
||||
.then(res => {
|
||||
if (res.status === 200 || res.status === 201) {
|
||||
dispatch(updateTransactionStatus(TRANSACTION_STATUS_ENUMS.TRANSACTION_INITIATED));
|
||||
dispatch(setTransactionId(res.data));
|
||||
let navigateUrl = `/process-step-one/${defaultAccountId}/${res.data}`;
|
||||
if (signType === SignTypeEnum.selfSign) navigateUrl = `/process-step-one/${defaultAccountId}/${res.data}/self_sign`;
|
||||
setTimeout(() => navigate(navigateUrl), 0)
|
||||
}
|
||||
})
|
||||
.catch(err => console.log(err))
|
||||
}
|
||||
|
||||
if (selectedDocuments.length) {
|
||||
dispatch(setSignType(signType));
|
||||
}
|
||||
}
|
||||
// const handleSendSignDispatch: (type: "self-sign" | "multiple-sign") => void = (signType) => {
|
||||
// if (selectedDocuments === null || !selectedDocuments.length) {
|
||||
// if (selectedDocuments === null || !selectedDocuments.length) {
|
||||
// toast.dismiss();
|
||||
// toast.error("Select 📄 Documents first!", {
|
||||
// position: "bottom-right",
|
||||
// autoClose: 5000,
|
||||
// hideProgressBar: false,
|
||||
// closeOnClick: false,
|
||||
// pauseOnHover: true,
|
||||
// draggable: true,
|
||||
// progress: undefined,
|
||||
// theme: "light",
|
||||
// transition: Bounce,
|
||||
// });
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
|
||||
// if (selectedDocuments.length) {
|
||||
// dispatch(setSignType(signType));
|
||||
// }
|
||||
// }
|
||||
|
||||
return (
|
||||
<div className='relative max-h-max pb-3'
|
||||
|
|
@ -73,12 +100,12 @@ const SendForSign: React.FC<Props> = ({ showSideBar }) => {
|
|||
{
|
||||
sendForSignDropdown &&
|
||||
<div className={`w-[300px] rounded absolute z-40 bg-[var(--sendForSignDropDownBg)] shadow-lg top-[54px] text-left outline-none`}>
|
||||
<div className='py-3 px-8 leading-6 rounded-t-sm hover:bg-[var(--sendForSignDropDownHover)] cursor-pointer' onClick={() => handleSendSignDispatch('self-sign')}>
|
||||
<div className='py-3 px-8 leading-6 rounded-t-sm hover:bg-[var(--sendForSignDropDownHover)] cursor-pointer' onClick={() => handleStartSectionClick(SignTypeEnum.selfSign)}>
|
||||
<p>Self Sign</p>
|
||||
<p className='text-[var(--greyTextCol)] text-sm'>You're the only signer.</p>
|
||||
</div>
|
||||
<div className='w-full h-[1px] opacity-30 bg-[var(--greyTextCol)]'></div>
|
||||
<div className='py-3 px-8 leading-6 rounded-b-sm hover:bg-[var(--sendForSignDropDownHover)] cursor-pointer' onClick={() => handleSendSignDispatch('multiple-sign')}>
|
||||
<div className='py-3 px-8 leading-6 rounded-b-sm hover:bg-[var(--sendForSignDropDownHover)] cursor-pointer' onClick={() => handleStartSectionClick(SignTypeEnum.multipleSign)}>
|
||||
<p>Send for Sign</p>
|
||||
<p className='text-[var(--greyTextCol)] text-sm'>You and other need to sign.</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import api from '../../config/api';
|
|||
import { setTransactionId, TRANSACTION_STATUS_ENUMS, updateTransactionStatus } from '../../store/slices/transactionSlice';
|
||||
|
||||
|
||||
interface StartCard {
|
||||
export interface StartCard {
|
||||
icon: ReactNode;
|
||||
title: string;
|
||||
description: string;
|
||||
|
|
@ -57,7 +57,7 @@ const StartSection = () => {
|
|||
if (res.status === 200 || res.status === 201) {
|
||||
dispatch(updateTransactionStatus(TRANSACTION_STATUS_ENUMS.TRANSACTION_INITIATED));
|
||||
dispatch(setTransactionId(res.data));
|
||||
setTimeout(() => navigate(`/process-step-one/${defaultAccountId}/${res.data}`), 0)
|
||||
setTimeout(() => navigate(`/process-step-one/${defaultAccountId}/${res.data.id}`), 0)
|
||||
}
|
||||
})
|
||||
.catch(err => console.log(err))
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ const DocumentCompletionScreen = () => {
|
|||
<div className="flex items-center gap-4">
|
||||
<div className="w-10 h-10 bg-blue-100 rounded-lg flex items-center justify-center">
|
||||
{/* <FaFileAlt className="text-blue-600 text-xl" /> */}
|
||||
<img src={item.images[0].src} alt="document" className="h-10 w-10" />
|
||||
<img src={item.pages[0].src} alt="document" className="h-10 w-10" />
|
||||
</div>
|
||||
<div>
|
||||
<h3 className="text-md font-semibold text-gray-800">
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import { hideLoader, showLoader } from "../../../store/slices/loaderSlice";
|
|||
import Loader from "../../dashboard/Loader";
|
||||
import { Bounce, toast } from "react-toastify";
|
||||
import { fetchDocuments, resetDocuments, setDocuments, uploadDocuments } from "../../../store/slices/documentSlice";
|
||||
import { SignTypeEnum } from "../../../utlity/types";
|
||||
|
||||
const ProcessStepOne = () => {
|
||||
interface EmailDtls {
|
||||
|
|
@ -23,8 +24,8 @@ const ProcessStepOne = () => {
|
|||
}
|
||||
|
||||
let transactionTemplateToggle = TRANSACTION_TEMPLATE_TOGGLE.TRANSACTIONS;
|
||||
console.log("transactionTemplateToggle1", transactionTemplateToggle)
|
||||
console.log()
|
||||
|
||||
const signType = useParams<{ signType: string }>().signType;
|
||||
const templateId = useParams<{ templateId: string }>().templateId;
|
||||
let { accountId, transactionId } = useParams<{ accountId: string, transactionId: string }>();
|
||||
|
||||
|
|
@ -33,11 +34,11 @@ const ProcessStepOne = () => {
|
|||
|
||||
if (!transactionId) {
|
||||
transactionTemplateToggle = TRANSACTION_TEMPLATE_TOGGLE.TEMPLATES;
|
||||
console.log("transactionTemplateToggle2", transactionTemplateToggle)
|
||||
|
||||
transactionId = templateId;
|
||||
dispatch(toggleToTemplates());
|
||||
}
|
||||
console.log("ProcessStepOne called with accountId:", accountId, "and transactionId:", transactionId);
|
||||
|
||||
// if (!accountId || !transactionId) {
|
||||
// window.location.href = "/";
|
||||
// return null;
|
||||
|
|
@ -48,10 +49,10 @@ const ProcessStepOne = () => {
|
|||
|
||||
const selectedDocuments = useSelector((state: RootState) => state.documents.documents)
|
||||
const selectedRecipients = useSelector((state: RootState) => state.selectedRecipients.recipients)
|
||||
const userData = useSelector((state: RootState) => state.user)
|
||||
|
||||
console.log("selectedRecipients", selectedRecipients)
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
selectedRecipients.length === 0 && dispatch(fetchRecipients({ accountId, transactionId }));
|
||||
selectedDocuments.length === 0 && dispatch(fetchDocuments({ accountId, transactionId }));
|
||||
|
|
@ -85,6 +86,8 @@ const ProcessStepOne = () => {
|
|||
formError.subject = true
|
||||
}
|
||||
|
||||
if(SignTypeEnum.selfSign === signType) formError.recipients = false;
|
||||
|
||||
if (formError.documents || formError.recipients || formError.subject) {
|
||||
console.log(selectedDocuments, 'line 193')
|
||||
toast.dismiss();
|
||||
|
|
@ -149,7 +152,34 @@ const ProcessStepOne = () => {
|
|||
roleName: recipient.roleName
|
||||
}));
|
||||
|
||||
dispatch(addRecipientAsync({ recipientsData, accountId, transactionId }));
|
||||
let recipientsDataTemp = recipientsData;
|
||||
|
||||
if (signType === SignTypeEnum.selfSign) {
|
||||
recipientsDataTemp = [{
|
||||
id: null,
|
||||
routingOrder: 1,
|
||||
provideOwnTags: true,
|
||||
type: recipientType.SIGNER,
|
||||
firstName: userData.firstName,
|
||||
lastName: userData.lastName,
|
||||
authType: "NONE",
|
||||
deliveryMethod: "EMAIL",
|
||||
email: userData.email,
|
||||
hostName: "",
|
||||
hostEmail: "",
|
||||
company: "",
|
||||
title: "",
|
||||
website: "",
|
||||
phone: "",
|
||||
accessCode: "",
|
||||
accessCodeDelivery: true,
|
||||
language: "en",
|
||||
name: `${userData.firstName} ${userData.lastName}`,
|
||||
roleName: ""
|
||||
}]
|
||||
}
|
||||
|
||||
dispatch(addRecipientAsync({ recipientsData: recipientsDataTemp, accountId, transactionId }));
|
||||
dispatch(showLoader("Processing Message..."));
|
||||
|
||||
console.log(`1/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`)
|
||||
|
|
@ -202,6 +232,15 @@ const ProcessStepOne = () => {
|
|||
navigate('/')
|
||||
}
|
||||
|
||||
|
||||
const handleSelfSignCb = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
if (e.currentTarget.checked) {
|
||||
navigate("self_sign");
|
||||
} else {
|
||||
navigate("./../");
|
||||
}
|
||||
}
|
||||
|
||||
const globalLoader = useSelector((state: RootState) => state.loader)
|
||||
|
||||
return (
|
||||
|
|
@ -219,12 +258,15 @@ const ProcessStepOne = () => {
|
|||
</div>
|
||||
|
||||
<div className='flex items-center gap-3'>
|
||||
<button
|
||||
onClick={() => handleNextClick(true)}
|
||||
className="text-sm px-4 py-2 rounded border border-gray-300 hover:bg-gray-100 transition"
|
||||
>
|
||||
Send Now
|
||||
</button>
|
||||
<div className="flex items-center" >
|
||||
<input
|
||||
checked={signType === SignTypeEnum.selfSign}
|
||||
onChange={(e) => handleSelfSignCb(e)}
|
||||
id="default-checkbox" type="checkbox" value="" className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded-sm outline-none"
|
||||
/>
|
||||
|
||||
<label htmlFor="default-checkbox" className="ms-2 text-sm text-slate-600">SELF SIGN</label>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => handleNextClick(false)}
|
||||
className="text-sm px-4 py-2 rounded bg-[var(--primary)] text-white shadow hover:bg-[var(--primaryLight2)] transition"
|
||||
|
|
@ -244,6 +286,8 @@ const ProcessStepOne = () => {
|
|||
</section>
|
||||
|
||||
{/* Recipients */}
|
||||
{
|
||||
signType !== SignTypeEnum.selfSign &&
|
||||
< section className="mt-8">
|
||||
<h2 className="text-lg font-medium mb-4 pt-6 border-t text-[var(--processStepOneTextHead)]">Signers</h2>
|
||||
<div className="flex flex-col gap-4 align-start">
|
||||
|
|
@ -252,6 +296,7 @@ const ProcessStepOne = () => {
|
|||
<RecipientAddCard transactionTemplateToggle={transactionTemplateToggle} />
|
||||
</div>
|
||||
</section>
|
||||
}
|
||||
|
||||
{/* Email */}
|
||||
<section className="mt-8">
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import typeToIconMap from '../../../helper/iconMap';
|
|||
|
||||
import { IoAdd } from 'react-icons/io5';
|
||||
import Loader from '../../dashboard/Loader';
|
||||
// import { TRANSACTION_TEMPLATE_TOGGLE } from "../../../store/slices/selectedRecipientsSlice";
|
||||
import { handleGroupBorderPosition } from '../../../utlity/tagGroupConUtils';
|
||||
|
||||
export interface DroppedItemsObj {
|
||||
|
|
@ -290,7 +291,8 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ isSend }) => {
|
|||
sendTagsToRecipients(tagsData, accountId, transactionId);
|
||||
|
||||
(async () => {
|
||||
const res = await api.put(`/api/accounts/${accountId}/transactions/${transactionId}`, {status: "SENT"})
|
||||
const res = await api.put(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`, { status: "SENT" })
|
||||
// const res = await api.put(`/api/accounts/${accountId}/transactions/${transactionId}`, { status: "SENT" })
|
||||
console.log(res, "Check123")
|
||||
})()
|
||||
}, [isSend])
|
||||
|
|
@ -776,7 +778,7 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ isSend }) => {
|
|||
|
||||
<div className='flex flex-col gap-3 max-w-max relative left-[50%] translate-x-[-50%]'>
|
||||
{
|
||||
doc.images && doc.images.length > 0 && doc.images.map((page, indx) => {
|
||||
doc.pages && doc.pages.length > 0 && doc.pages.map((page, indx) => {
|
||||
const key = `${doc.id}_${page.index}`;
|
||||
return (
|
||||
<div
|
||||
|
|
@ -895,7 +897,7 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ isSend }) => {
|
|||
|
||||
{/* Side details of documents Pages and document Name - START */}
|
||||
<p className='absolute top-[50%] translate-y-[-50%] rotate-[-90deg] text-xs left-[-60px] text-slate-600'>
|
||||
page {indx + 1} of {doc.images && doc.images.length}
|
||||
page {indx + 1} of {doc.pages && doc.pages.length}
|
||||
</p>
|
||||
{/* <p className='absolute top-[50%] translate-y-[-50%] rotate-[-90deg] text-xs right-[-140px] text-slate-600'>
|
||||
Document {indxDoc + 1} {doc.name}
|
||||
|
|
|
|||
|
|
@ -133,10 +133,10 @@ const LeftSideBar: React.FC<LeftSideBarProps> = ({ isFields, selectedRecipientIn
|
|||
onClick={() => setDropDownTogglePage(`${(dropDownTogglePage === 'pageDropDown' + indx) ? '' : 'pageDropDown' + indx}`)}
|
||||
className={`p-2 ${(dropDownTogglePage === 'pageDropDown' + indx) ? "bg-[var(--primary)]" : "bg-slate-200"} flex flex-col justify-center items-center gap-2 rounded`}>
|
||||
{
|
||||
document.images != undefined && <img
|
||||
document.pages != undefined && <img
|
||||
key={indx}
|
||||
className='rounded-sm shadow'
|
||||
src={document.images[0].src}
|
||||
src={document.pages[0].src}
|
||||
alt="" />
|
||||
}
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ const LeftSideBar: React.FC<LeftSideBarProps> = ({ isFields, selectedRecipientIn
|
|||
{
|
||||
dropDownTogglePage === 'pageDropDown' + indx &&
|
||||
<div className='my-1 flex justify-center items-center gap-1 flex-wrap'>
|
||||
{document.images != undefined && document.images.map((img, indx) => (
|
||||
{document.pages != undefined && document.pages.map((img, indx) => (
|
||||
<a
|
||||
href={"#" + document.id + indx}
|
||||
className='max-w-max px-4 py-2 shadow cursor-pointer border-1 rounded-sm border-slate-200 hover:border-[var(--primary)] transition-all duration-300 bg-slate-300'
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import { Bounce, toast } from "react-toastify";
|
|||
import axios from 'axios';
|
||||
import { SaveType } from '../client/SignDocument';
|
||||
import { CiSaveDown1 } from 'react-icons/ci';
|
||||
import api from '../../config/api';
|
||||
|
||||
interface Signature {
|
||||
id: string;
|
||||
|
|
@ -54,6 +55,7 @@ interface AddSignatureModalProps {
|
|||
setOpenSign: React.Dispatch<React.SetStateAction<boolean>>;
|
||||
saved: SaveType;
|
||||
setSaved: React.Dispatch<React.SetStateAction<SaveType>>;
|
||||
signTagId: boolean
|
||||
}
|
||||
|
||||
interface Account {
|
||||
|
|
@ -80,9 +82,12 @@ const AddSignatureModal: React.FC<AddSignatureModalProps> = ({
|
|||
setOpenSign,
|
||||
recipientId,
|
||||
saved,
|
||||
setSaved
|
||||
setSaved,
|
||||
signTagId
|
||||
}) => {
|
||||
const [activeTab, setActiveTab] = useState<'TYPED' | 'DRAW' | 'UPLOAD'>('TYPED');
|
||||
|
||||
console.log("savedModal", saved)
|
||||
const [activeTab, setActiveTab] = useState<'TYPED' | 'DRAW' | 'UPLOAD' | 'SAVED'>('TYPED');
|
||||
const [fullName, setFullName] = useState('');
|
||||
const [initials, setInitials] = useState('');
|
||||
const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
|
||||
|
|
@ -100,6 +105,22 @@ const AddSignatureModal: React.FC<AddSignatureModalProps> = ({
|
|||
{ id: 6, name: 'classic', initials: 'LA', style: 'classic' },
|
||||
];
|
||||
|
||||
// User data
|
||||
const [user, setUser] = useState<UserData>({
|
||||
id: "",
|
||||
firstName: "",
|
||||
lastName: "",
|
||||
email: "",
|
||||
language: "",
|
||||
account: {
|
||||
id: 0,
|
||||
isDefault: false,
|
||||
name: "",
|
||||
},
|
||||
});
|
||||
|
||||
console.log("User data", user)
|
||||
|
||||
const [selectedSignature, setSelectedSignature] = useState<SelectStyle>(
|
||||
signatureOptions.length > 0 ? { id: signatureOptions[0].id, style: signatureOptions[0].style } : { id: 0, style: "" }
|
||||
);
|
||||
|
|
@ -112,21 +133,8 @@ const AddSignatureModal: React.FC<AddSignatureModalProps> = ({
|
|||
const [preview1, setPreview1] = useState<string | null>(null);
|
||||
const [preview2, setPreview2] = useState<string | null>(null);
|
||||
|
||||
// User data
|
||||
// const [user, setUser] = useState<UserData>({
|
||||
// id: "",
|
||||
// firstName: "",
|
||||
// lastName: "",
|
||||
// email: "",
|
||||
// language: "",
|
||||
// account: {
|
||||
// id: 0,
|
||||
// isDefault: false,
|
||||
// name: "",
|
||||
// },
|
||||
// });
|
||||
const [preSaveSignatures, setPreSaveSignatures] = useState([])
|
||||
|
||||
// const isEditMode = !!editingSignature;
|
||||
|
||||
// Navigation items
|
||||
const navigationItems = [
|
||||
|
|
@ -136,34 +144,6 @@ const AddSignatureModal: React.FC<AddSignatureModalProps> = ({
|
|||
{ id: 'SAVED', label: 'SAVED', icon: <CiSaveDown1 className="w-5 h-5" /> },
|
||||
];
|
||||
|
||||
// Initialize form with editing signature data
|
||||
// useEffect(() => {
|
||||
// if (editingSignature) {
|
||||
// setFullName(`${editingSignature.firstName} ${editingSignature.lastName}`);
|
||||
// setInitials(`${editingSignature.firstName.slice(0, 1)}${editingSignature.lastName.slice(0, 1)}`);
|
||||
// setActiveTab(editingSignature.signatureType as 'TYPED' | 'DRAW' | 'UPLOAD');
|
||||
|
||||
// // Set font for SELECT tab
|
||||
// const fontOption = signatureOptions.find(option => option.style === editingSignature.font);
|
||||
// if (fontOption) {
|
||||
// setSelectedSignature({ id: fontOption.id, style: fontOption.style });
|
||||
// }
|
||||
|
||||
// // Set signature blobs for all tabs
|
||||
// if (editingSignature.signatureBlob && editingSignature.initialsBlob) {
|
||||
// setSignatures({
|
||||
// fullSignature: `data:image/png;base64,${editingSignature.signatureBlob}`,
|
||||
// initials: `data:image/png;base64,${editingSignature.initialsBlob}`
|
||||
// });
|
||||
|
||||
// // Set preview URLs for UPLOAD tab
|
||||
// if (editingSignature.signatureType === 'UPLOAD') {
|
||||
// setPreview1(`data:image/png;base64,${editingSignature.signatureBlob}`);
|
||||
// setPreview2(`data:image/png;base64,${editingSignature.initialsBlob}`);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }, [editingSignature]);
|
||||
|
||||
const handleSignatureChange = (data: { fullSignature: string | null; initials: string | null }) => {
|
||||
setSignatures(data);
|
||||
|
|
@ -177,8 +157,10 @@ const AddSignatureModal: React.FC<AddSignatureModalProps> = ({
|
|||
"ngrok-skip-browser-warning": "69420"
|
||||
}
|
||||
})
|
||||
|
||||
console.log(res, "Geting Signatures")
|
||||
if (res?.data) {
|
||||
let preSavedSignatures = res?.data
|
||||
setPreSaveSignatures(preSavedSignatures)
|
||||
}
|
||||
})()
|
||||
}, [])
|
||||
// Getting Signatures - END
|
||||
|
|
@ -234,15 +216,18 @@ console.log("handleSubmit Called")
|
|||
|
||||
try {
|
||||
const payload = {
|
||||
signatureType: activeTab,
|
||||
signatureBase64: signatures.fullSignature,
|
||||
initialsBase64: signatures.initials,
|
||||
tagId: signTagId,
|
||||
// signatureId: signatureId,
|
||||
type: activeTab,
|
||||
firstName: fullName.split(' ')[0] || user.firstName,
|
||||
lastName: fullName.split(' ')[1] || user.lastName,
|
||||
initials: "",
|
||||
initialsBase64: signatures.initials,
|
||||
signatureBase64: signatures.fullSignature,
|
||||
font: selectedSignature.style
|
||||
};
|
||||
|
||||
let res;
|
||||
console.log("payload", payload)
|
||||
// if (isEditMode && editingSignature) {
|
||||
// // Update existing signature
|
||||
// const updatePayload = {
|
||||
|
|
@ -265,7 +250,7 @@ console.log("handleSubmit Called")
|
|||
// });
|
||||
// } else {
|
||||
// Create new signature
|
||||
res = await axios.post(`${import.meta.env.VITE_BASE_URI}/api/user/signatures`,
|
||||
let res = await axios.post(`${import.meta.env.VITE_BASE_URI}/api/sign/signatures?recipientId=${recipientId}`,
|
||||
payload,
|
||||
{
|
||||
headers: {
|
||||
|
|
@ -288,9 +273,19 @@ console.log("handleSubmit Called")
|
|||
// }
|
||||
|
||||
if (res?.data) {
|
||||
await getAllSignatures();
|
||||
setShowAddSignature?.(false);
|
||||
setSignatures({
|
||||
fullSignature:"",
|
||||
initials:"",
|
||||
})
|
||||
setSaved({
|
||||
saveType: res.data.signatureType ?? null,
|
||||
save: true,
|
||||
signature: res.data.signatureBlob ?? null,
|
||||
initial: res.data.initialsBlob ?? null,
|
||||
});
|
||||
setOpenSign(false);
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error("Error submitting signature:", error);
|
||||
// toast.error(isEditMode ? "Failed to update signature" : "Failed to create signature", {
|
||||
|
|
@ -431,32 +426,105 @@ console.log("handleSubmit Called")
|
|||
</div>
|
||||
</div>
|
||||
);
|
||||
case 'SAVED':
|
||||
return (
|
||||
<div className="h-full flex flex-col ">
|
||||
<div className="mb-6">
|
||||
<h2 className="text-xl font-semibold text-gray-900 mb-2">Saved Signature's</h2>
|
||||
{/* <p className="text-sm text-gray-600">Select from pre-designed signature styles</p> */}
|
||||
</div>
|
||||
|
||||
<div className="flex-1 overflow-y-auto">
|
||||
<div className="space-y-4">
|
||||
{preSaveSignatures.map((signature) => (
|
||||
<div key={signature?.id} className="grid grid-cols-12 gap-4 px-6 py-9 hover:bg-gray-50 transition-colors duration-150">
|
||||
{/* Signature Column */}
|
||||
<div className="col-span-5">
|
||||
<div className="flex flex-col space-y-2 relative ps-6 border-l-3 border-blue-600 rounded-bl-2xl rounded-tl-2xl">
|
||||
<div className="text-sm text-gray-600 font-medium mb-1">
|
||||
Signed by:
|
||||
</div>
|
||||
|
||||
{/* Signature Image or Fallback Text */}
|
||||
<div className="bg-white rounded-lg p-1 flex items-center justify-center">
|
||||
{signature?.signatureBlob ? (
|
||||
<img
|
||||
src={`data:${signature?.signatureMimeType || "image/png"};base64,${signature?.signatureBlob}`}
|
||||
className="h-[50px] w-[250px] object-contain"
|
||||
alt="Signature"
|
||||
/>
|
||||
) : (
|
||||
<div className="text-gray-400 italic text-sm">No Signature</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Name */}
|
||||
<div className="text-xs text-gray-500 truncate">
|
||||
{signature?.signatureHash ?? ' '}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Initial Column */}
|
||||
<div className="col-span-5">
|
||||
<div className="flex flex-col space-y-2 relative ps-6 border-l-3 border-green-600 rounded-bl-2xl rounded-tl-2xl">
|
||||
<div className="text-sm text-gray-600 font-medium mb-1">
|
||||
Initials
|
||||
</div>
|
||||
|
||||
{/* Initials Image */}
|
||||
<div className="bg-white rounded-lg p-1 flex items-center justify-center">
|
||||
{signature?.initialsBlob ? (
|
||||
<img
|
||||
src={`data:image/png;base64,${signature?.initialsBlob}`}
|
||||
className="h-[50px] object-contain"
|
||||
alt="Initials"
|
||||
/>
|
||||
) : (
|
||||
<div className="text-gray-400 italic text-sm">No Initials</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Optional initials hash or font */}
|
||||
<div className="text-xs text-gray-500 truncate">
|
||||
{signature?.initialsHash || " "}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
// const getUserDetails = async () => {
|
||||
// try {
|
||||
// let res = await api.get(`/api/user/details`);
|
||||
// console.log("getuser", res);
|
||||
// let currUser = res?.data;
|
||||
// setUser(currUser);
|
||||
const getUserDetails = async () => {
|
||||
try {
|
||||
let res = await axios.get(`/api/user/details`, {
|
||||
headers: {
|
||||
"ngrok-skip-browser-warning": "69420",
|
||||
}
|
||||
});
|
||||
console.log("getuser", res);
|
||||
let currUser = res?.data;
|
||||
setUser(currUser);
|
||||
|
||||
// // Only set default values if not in edit mode
|
||||
// if (!isEditMode) {
|
||||
// setFullName(currUser.firstName + " " + currUser.lastName);
|
||||
// setInitials(currUser.firstName.slice(0, 1) + currUser.lastName.slice(0, 1));
|
||||
// }
|
||||
// } catch (error) {
|
||||
// console.error("Error fetching user details:", error);
|
||||
// }
|
||||
// };
|
||||
setFullName(currUser.firstName + " " + currUser.lastName);
|
||||
setInitials(currUser.firstName.slice(0, 1) + currUser.lastName.slice(0, 1));
|
||||
} catch (error) {
|
||||
console.error("Error fetching user details:", error);
|
||||
}
|
||||
};
|
||||
|
||||
// useEffect(() => {
|
||||
// getUserDetails();
|
||||
// }, []);
|
||||
useEffect(() => {
|
||||
getUserDetails();
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 backdrop-blur-sm bg-opacity-50 flex items-center justify-center z-50 p-4">
|
||||
|
|
@ -468,7 +536,7 @@ console.log("handleSubmit Called")
|
|||
<div className="px-4 py-4 border-b border-gray-200">
|
||||
<div className="flex items-center space-x-3">
|
||||
<div className='px-1 py-1'>
|
||||
<h3 className="text-md font-semibold text-gray-900">Add Signature</h3>
|
||||
<h3 className="text-md font-semibold text-gray-900">Add Signature Sign</h3>
|
||||
<p className="text-xs text-gray-500">Create your digital signature</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -511,7 +579,7 @@ console.log("handleSubmit Called")
|
|||
{navigationItems.map((item) => (
|
||||
<button
|
||||
key={item.id}
|
||||
onClick={() => setActiveTab(item.id as 'TYPED' | 'DRAW' | 'UPLOAD')}
|
||||
onClick={() => setActiveTab(item.id as 'TYPED' | 'DRAW' | 'UPLOAD' | 'SAVED')}
|
||||
className={`w-full flex items-center space-x-3 px-2 py-2 text-sm font-medium rounded-lg cursor-pointer transition-colors ${activeTab === item.id
|
||||
? 'bg-blue-50 text-blue-700 border border-blue-200'
|
||||
: 'text-gray-600 hover:bg-gray-100 hover:text-gray-900'
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ canvas {
|
|||
|
||||
/* Group Border - END */
|
||||
|
||||
|
||||
/* Loader CSS */
|
||||
/* From Uiverse.io by Juanes200122 */
|
||||
.pl {
|
||||
|
|
@ -334,3 +335,12 @@ canvas {
|
|||
stroke-dashoffset: -440;
|
||||
}
|
||||
}
|
||||
.bottom-border>div:hover {
|
||||
background-color: var(--primaryLight2) ;
|
||||
opacity: 0.9;
|
||||
transition: all 0.3s ease-in-out;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* Group Border - END */
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ export interface SelectedDocument {
|
|||
extension: string;
|
||||
original: boolean;
|
||||
corrupted?: boolean;
|
||||
images?: Image[];
|
||||
pages?: Image[];
|
||||
}
|
||||
|
||||
export interface PayloadSelectedDocument {
|
||||
|
|
@ -30,7 +30,7 @@ export interface PayloadSelectedDocument {
|
|||
extension: string;
|
||||
original: boolean;
|
||||
corrupted?: boolean;
|
||||
images?: Image[];
|
||||
pages?: Image[];
|
||||
}
|
||||
|
||||
interface SelectedDocumentsState {
|
||||
|
|
@ -87,7 +87,7 @@ const selectedDocumentsSlice = createSlice({
|
|||
const docId = document.documentId;
|
||||
for (const [index, selDoc] of state.selectedDocuments.entries()) {
|
||||
if (selDoc.id === docId) {
|
||||
state.selectedDocuments[index].images = document.images;
|
||||
state.selectedDocuments[index].pages = document.pages;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -352,6 +352,7 @@ export interface Recipient {
|
|||
type: recipientType;
|
||||
color?: string;
|
||||
roleName:string
|
||||
provideOwnTags?: boolean;
|
||||
}
|
||||
|
||||
export interface SelectedRecipientInt {
|
||||
|
|
|
|||
|
|
@ -117,3 +117,9 @@ export enum TagsTypes {
|
|||
NAME = "name",
|
||||
COMPANY = "company",
|
||||
}
|
||||
|
||||
|
||||
export enum SignTypeEnum {
|
||||
selfSign = "self_sign",
|
||||
multipleSign = "multi_sign"
|
||||
}
|
||||
Loading…
Reference in New Issue