diff --git a/apps/OpenSign/src/routes/Login.js b/apps/OpenSign/src/routes/Login.js index 9ca1a2eb0..6da17e83c 100644 --- a/apps/OpenSign/src/routes/Login.js +++ b/apps/OpenSign/src/routes/Login.js @@ -129,7 +129,7 @@ function Login(props) { ); if (rolesfiltered.length > 0) { _currentRole = rolesfiltered[0]; - } + } } else { const rolesfiltered = userRoles.filter( (x) => !valuesToExclude.includes(x) @@ -472,7 +472,7 @@ function Login(props) { ); if (rolesfiltered.length > 0) { _currentRole = rolesfiltered[0]; - } + } } else { const rolesfiltered = userRoles.filter( (x) => !valuesToExclude.includes(x) @@ -655,7 +655,6 @@ function Login(props) { } else { setThirdpartyLoader(false); setState({ ...state, loading: false }); - } }) .catch((err) => { @@ -1171,7 +1170,7 @@ function Login(props) {
-
Login form
+
Additional Info
@@ -1227,18 +1226,19 @@ function Login(props) {
diff --git a/apps/OpenSign/src/routes/Signup.js b/apps/OpenSign/src/routes/Signup.js index 1f52261b6..d688eaacc 100644 --- a/apps/OpenSign/src/routes/Signup.js +++ b/apps/OpenSign/src/routes/Signup.js @@ -118,7 +118,7 @@ const Signup = (props) => { await Parse.User.requestPasswordReset(email).then( async function (res1) { if (res1.data === undefined) { - alert("Email has been sent to your mail!"); + alert("Verification mail has been sent to your E-mail!"); } } ); diff --git a/microfrontends/SignDocuments/src/Component/SignYourselfPdf.js b/microfrontends/SignDocuments/src/Component/SignYourselfPdf.js index 92eec4b8f..d4cb37df9 100644 --- a/microfrontends/SignDocuments/src/Component/SignYourselfPdf.js +++ b/microfrontends/SignDocuments/src/Component/SignYourselfPdf.js @@ -500,7 +500,6 @@ function SignYourSelf() { removeBase64Fromjpeg, "" ); - //function for call to embed signature in pdf and get digital signature pdf signPdfFun(newImgUrl, documentId, data, pdfBase64, pageNo); }) @@ -575,14 +574,18 @@ function SignYourSelf() { const scale = isMobile ? pdfOriginalWidth / newWidth : 1; const posY = () => { - if (id === 0) { - return ( - page.getHeight() - - imgUrlList[id].yPosition * scale - - imgHeight - ); - } else if (id > 0) { - return page.getHeight() - imgUrlList[id].yPosition * scale; + if (isMobile) { + if (id === 0) { + return ( + page.getHeight() - + imgUrlList[id].yPosition * scale - + imgHeight + ); + } else if (id > 0) { + return page.getHeight() - imgUrlList[id].yPosition * scale; + } + } else { + return page.getHeight() - imgUrlList[id].yPosition - imgHeight; } }; page.drawImage(img, { @@ -596,7 +599,6 @@ function SignYourSelf() { }); } const pdfBytes = await pdfDoc.saveAsBase64({ useObjectStreams: false }); - signPdfFun(pdfBytes, documentId); } setIsSignPad(false); @@ -615,10 +617,11 @@ function SignYourSelf() { pageNo ) => { let singleSign; + const isMobile = window.innerWidth < 767; const newWidth = window.innerWidth; const scale = isMobile ? pdfOriginalWidth / newWidth : 1; - const imgWidth = xyPosData.Width.Width ? xyPosData.Width.Width : 150; + const imgWidth = xyPosData ? xyPosData.Width : 150; if (xyPostion.length === 1 && xyPostion[0].pos.length === 1) { const height = xyPosData.Height ? xyPosData.Height : 60; const bottomY = xyPosData.isDrag @@ -1115,6 +1118,8 @@ function SignYourSelf() { pdfDetails={pdfDetails} isShowHeader={true} currentSigner={true} + alreadySign={pdfUrl ? true : false} + isSignYourself={true} /> {/* className="hidePdf" */}