WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-17 21:25:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'raktima-opensignlabs-patch-10' of https://github.com/OpenSignLabs/OpenSign into raktima-opensignlabs-patch-10

Browse Source
This commit is contained in:
prafull-opensignlabs
2024-06-24 16:14:37 +05:30
parent bfb7136c89 52b2cc6af4
commit d1992839a8
11 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/assets/images/newCeleb.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 234 KiB

apps/OpenSign/src/components/opensigndrive/DriveBody.js
+2 -2
View File
@@ -321,7 +321,7 @@ function DriveBody(props) {
return listType === "table" ? (
data.Type === "Folder" ? (
<tr onClick={() => handleOnclikFolder(data)}>
<td className="cursor-pointer flex items-center">
<td className="cursor-pointer flex items-center gap-2">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 512 512"
@@ -338,7 +338,7 @@ function DriveBody(props) {
</tr>
) : (
<tr onClick={() => checkPdfStatus(data)}>
<td className="cursor-pointer flex items-center">
<td className="cursor-pointer flex items-center gap-2">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 384 512"
apps/OpenSign/src/components/pdf/EditTemplate.js
+1 -1
View File
@@ -138,7 +138,7 @@ const EditTemplate = ({ template, onSuccess }) => {
{!isEnableSubscription && (
<PremiumAlertHeader
message={
"Disable Auto reminder is free in beta, this feature will incur a fee later."
"Auto reminder is free in beta, this feature will incur a fee later."
}
/>
)}
apps/OpenSign/src/components/pdf/EmailComponent.js
-11
View File
@@ -1,6 +1,5 @@
import React, { useState } from "react";
import { saveAs } from "file-saver";
import celebration from "../../assets/images/newCeleb.gif";
import axios from "axios";
import { getBase64FromUrl } from "../../constant/Utils";
import { themeColor } from "../../constant/const";
@@ -22,7 +21,6 @@ function EmailComponent({
const [emailList, setEmailList] = useState([]);
const [emailValue, setEmailValue] = useState();
const [isLoading, setIsLoading] = useState(false);
const [isEmailCelebration, setIsEmailCelebration] = useState(false);
//function for send email
const sendEmail = async () => {
setIsLoading(true);
@@ -63,10 +61,6 @@ function EmailComponent({
" target=_blank>here</a> </p></div></div></body></html>"
};
sendMail = await axios.post(url, params, { headers: headers });
setIsEmailCelebration(true);
setTimeout(() => {
setIsEmailCelebration(false);
}, 3000);
} catch (error) {
console.log("error", error);
setIsLoading(false);
@@ -205,11 +199,6 @@ function EmailComponent({
</div>
</div>
<div className="h-full p-[20px]">
{isEmailCelebration && (
<div className="absolute w-[100%] flex justify-center items-center">
<img alt="celeb" width={300} height={250} src={celebration} />
</div>
)}
<p className="font-medium text-[15px] mb-[5px] text-base-content align-baseline">
Recipients added here will get a copy of the signed document.
</p>
apps/OpenSign/src/components/pdf/Placeholder.js
+1
View File
@@ -776,6 +776,7 @@ function Placeholder(props) {
{isTabAndMobile ? (
<div
// className="sm:inline-block md:inline-block lg:hidden "
className="flex items-stretch"
style={{
left: xPos(props.pos, props.isSignYourself),
top: yPos(props.pos, props.isSignYourself),
apps/OpenSign/src/components/pdf/PlaceholderType.js
+47 -17
View File
@@ -14,7 +14,7 @@ import "react-datepicker/dist/react-datepicker.css";
import "../../styles/signature.css";
import RegexParser from "regex-parser";
const textWidgetCls =
"w-full h-full md:min-w-full md:min-h-full z-[999] text-[12px] rounded-[2px] border-[1px] border-[#007bff] overflow-hidden resize-none outline-none text-base-content bg-base-100 whitespace-pre-wrap";
"w-full h-full md:min-w-full md:min-h-full z-[999] text-[12px] rounded-[2px] border-[1px] border-[#007bff] overflow-hidden resize-none outline-none text-base-content item-center bg-base-100 whitespace-pre-wrap";
const selectWidgetCls =
"w-full h-full absolute left-0 top-0 border-[1px] border-[#007bff] rounded-[2px] focus:outline-none bg-base-100 text-base-content";
function PlaceholderType(props) {
@@ -309,10 +309,10 @@ function PlaceholderType(props) {
alt="signature"
draggable="false"
src={props.pos.SignUrl}
className="w-full h-full object-contain"
className="w-full h-full "
/>
) : (
<div className="text-[11px] text-black justify-center">
<div className="text-[11px] w-full h-full text-black flex flex-col justify-center items-center">
{props?.handleUserName &&
props?.handleUserName(
props?.data?.Id,
@@ -327,10 +327,10 @@ function PlaceholderType(props) {
alt="stamp"
draggable="false"
src={props.pos.SignUrl}
className="w-full h-full object-contain"
className="w-full h-full"
/>
) : (
<div className="text-[11px] text-black justify-center">
<div className="text-[11px] w-full h-full text-black flex flex-col justify-center items-center">
{props?.handleUserName &&
props?.handleUserName(
props?.data?.Id,
@@ -412,6 +412,12 @@ function PlaceholderType(props) {
);
}}
className={textWidgetCls}
style={{
fontSize: props.pos.options?.fontSize
? props.pos.options?.fontSize + "px"
: "12px",
color: props.pos.options?.fontColor || "black"
}}
cols="50"
/>
) : (
@@ -470,10 +476,10 @@ function PlaceholderType(props) {
alt="initials"
draggable="false"
src={props.pos.SignUrl}
className="w-full h-full object-contain"
className="w-full h-full"
/>
) : (
<div className="text-[11px] text-black justify-center">
<div className="text-[11px] w-full h-full text-black flex flex-col justify-center items-center">
{props?.handleUserName &&
props?.handleUserName(
props?.data?.Id,
@@ -505,6 +511,12 @@ function PlaceholderType(props) {
);
}}
className={textWidgetCls}
style={{
fontSize: props.pos.options?.fontSize
? props.pos.options?.fontSize + "px"
: "12px",
color: props.pos.options?.fontColor || "black"
}}
cols="50"
/>
) : (
@@ -539,6 +551,12 @@ function PlaceholderType(props) {
);
}}
className={textWidgetCls}
style={{
fontSize: props.pos.options?.fontSize
? props.pos.options?.fontSize + "px"
: "12px",
color: props.pos.options?.fontColor || "black"
}}
cols="50"
/>
) : (
@@ -573,6 +591,12 @@ function PlaceholderType(props) {
);
}}
className={textWidgetCls}
style={{
fontSize: props.pos.options?.fontSize
? props.pos.options?.fontSize + "px"
: "12px",
color: props.pos.options?.fontColor || "black"
}}
cols="50"
/>
) : (
@@ -650,10 +674,10 @@ function PlaceholderType(props) {
alt="image"
draggable="false"
src={props.pos.SignUrl}
className="w-full h-full object-contain"
className="w-full h-full"
/>
) : (
<div className="text-[11px] text-black justify-center">
<div className="text-[11px] w-full h-full text-black flex flex-col justify-center items-center">
{props?.handleUserName &&
props?.handleUserName(
props?.data?.Id,
@@ -685,6 +709,12 @@ function PlaceholderType(props) {
);
}}
className={textWidgetCls}
style={{
fontSize: props.pos.options?.fontSize
? props.pos.options?.fontSize + "px"
: "12px",
color: props.pos.options?.fontColor || "black"
}}
cols="50"
/>
) : (
@@ -749,6 +779,12 @@ function PlaceholderType(props) {
);
}}
className={textWidgetCls}
style={{
fontSize: props.pos.options?.fontSize
? props.pos.options?.fontSize + "px"
: "12px",
color: props.pos.options?.fontColor || "black"
}}
cols="50"
/>
);
@@ -759,17 +795,11 @@ function PlaceholderType(props) {
alt="image"
draggable="false"
src={props.pos.SignUrl}
className="w-full h-full object-contain"
className="w-full h-full"
/>
</div>
) : (
<div
style={{
fontSize: "10px",
color: "black",
justifyContent: "center"
}}
>
<div className="text-[11px] w-full h-full text-black flex flex-col justify-center items-center">
{props.pos.isStamp ? <div>stamp</div> : <div>signature</div>}
{props?.handleUserName &&
props?.handleUserName(props?.data?.Id, props?.data?.Role)}
apps/OpenSign/src/components/pdf/RenderAllPdfPage.js
+1 -4
View File
@@ -65,10 +65,7 @@ function RenderAllPdfPage({
};
return (
<div
ref={pageContainer}
className="hidden min-h-screen w-[20%] bg-base-100 h-full md:block"
>
<div ref={pageContainer} className="hidden w-[20%] bg-base-100 md:block">
<div className="mx-2 pr-2 pt-2 pb-1 text-[15px] text-base-content font-semibold border-b-[1px] border-base-300">
Pages
</div>
apps/OpenSign/src/components/pdf/WidgetComponent.js
+1 -1
View File
@@ -252,7 +252,7 @@ function WidgetComponent({
<div
data-tut={dataTut}
id="navbar"
className="fixed z-[99] bottom-0 righit-0"
className="fixed z-[99] bottom-0 right-0"
style={{ width: window.innerWidth + "px" }}
>
<div className="mx-1">
apps/OpenSign/src/constant/Utils.js
+1 -1
View File
@@ -421,7 +421,7 @@ export const defaultWidthHeight = (type) => {
case radioButtonWidget:
return { width: 5, height: 10 };
case textWidget:
return { width: 150, height: 17 };
return { width: 150, height: 25 };
default:
return { width: 150, height: 60 };
}
apps/OpenSign/src/pages/Form.js
+2 -2
View File
@@ -445,7 +445,7 @@ const Forms = (props) => {
setIsSubmit(false);
}
} else {
alert("Please wait until the PDF has been uploading.");
alert("Please wait while the document is being uploaded.");
}
};
@@ -834,7 +834,7 @@ const Forms = (props) => {
{!isEnableSubscription && (
<PremiumAlertHeader
message={
"Disable Auto reminder is free in beta, this feature will incur a fee later."
"Auto reminder is free in beta, this feature will incur a fee later."
}
/>
)}
apps/OpenSign/src/pages/SignyourselfPdf.js
+7 -7
View File
@@ -226,11 +226,15 @@ function SignYourSelf() {
}
isCompleted = documentData[0].IsCompleted && documentData[0].IsCompleted;
if (isCompleted) {
setIsCelebration(true);
setTimeout(() => {
setIsCelebration(false);
}, 5000);
setIsCompleted(true);
setPdfUrl(documentData[0].SignedUrl);
const alreadySign = {
status: true,
mssg: "You have successfully signed the document!"
mssg: "Congratulations! 🎉 This document has been successfully signed by you!"
};
if (showComplete) {
setShowAlreadySignDoc(alreadySign);
@@ -238,12 +242,8 @@ function SignYourSelf() {
setIsUiLoading(false);
setIsSignPad(false);
setIsEmail(true);
setIsCelebration(true);
setXyPostion([]);
setSignBtnPosition([]);
setTimeout(() => {
setIsCelebration(false);
}, 5000);
}
}
} else if (
@@ -1173,11 +1173,11 @@ function SignYourSelf() {
</div>
)}
{isCelebration && (
<div className="relative z-[999]">
<div className="relative z-[1000]">
<Confetti width={window.innerWidth} height={window.innerHeight} />
</div>
)}
{/* <div className="min-h-screen relative op-card overflow-hidden flex flex-col md:flex-row justify-between bg-base-300"> */}
<div className="relative op-card overflow-hidden flex flex-col md:flex-row justify-between bg-base-300">
{!isEmailVerified && (
<VerifyEmail