Skip to content

Commit d85ed95

Browse files
Merge pull request #339 from OpenSignLabs/staging
fix: remove logo from certificate for white labeled user
1 parent 369deb6 commit d85ed95

File tree

8 files changed

+52
-44
lines changed

8 files changed

+52
-44
lines changed

apps/OpenSign/package-lock.json

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/OpenSign/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"reactour": "^1.19.4",
5454
"redux": "^5.0.1",
5555
"redux-thunk": "^3.1.0",
56-
"regex-parser": "^2.3.1",
56+
"regex-parser": "^2.3.0",
5757
"serve": "^14.2.4",
5858
"styled-components": "^5.3.0",
5959
"web-vitals": "^4.2.4",

apps/OpenSign/src/pages/GuestLogin.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ function GuestLogin() {
6565
const handleServerUrl = async () => {
6666
setAppLogo(logo);
6767

68-
localStorage.clear();
68+
localStorage.clear(); // Clears everything
69+
localStorage.setItem(
70+
"appname",
71+
"OpenSign™"
72+
);
6973
//save isGuestSigner true in local to handle login flow header in mobile view
7074
localStorage.setItem("isGuestSigner", true);
7175
saveLanguageInLocal(i18n);
@@ -220,11 +224,15 @@ function GuestLogin() {
220224
{isLoading.isLoad ? (
221225
<LoaderWithMsg isLoading={isLoading} />
222226
) : (
223-
<div className="p-14 h">
224-
<div className="m-1 md:m-2 p-[30px] text-base-content bg-base-100 op-card shadow-md">
225-
<div className="md:w-[250px] md:h-[66px] inline-block overflow-hidden mt-2 mb-11">
227+
<div className="pb-1 md:pb-4 pt-10 md:px-10 lg:px-16">
228+
<div className="md:p-4 lg:p-10 p-4 text-base-content bg-base-100 op-card shadow-md">
229+
<div className="w-[250px] h-[66px] inline-block overflow-hidden mb-6">
226230
{appLogo && (
227-
<img src={appLogo} className="object-contain" alt="logo" />
231+
<img
232+
src={appLogo}
233+
className="object-contain h-full"
234+
alt="logo"
235+
/>
228236
)}
229237
</div>
230238
{contactId ? (

apps/OpenSign/src/primitives/DownloadPdfZip.js

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,18 @@ function DownloadPdfZip(props) {
6565
throw new Error(`Failed to fetch certificate PDF: ${certificateUrl}`);
6666
}
6767
const pdf2Blob = await pdf2Response.blob();
68-
// Add files to ZIP
69-
zip.file(
70-
`${sanitizeFileName(pdfName)}_signed_by_${appName}.pdf`,
71-
pdf1Blob
72-
);
73-
zip.file(`Certificate_signed_by_${appName}.pdf`, pdf2Blob);
74-
75-
// Generate the ZIP and trigger download
76-
const zipBlob = await zip.generateAsync({ type: "blob" });
77-
saveAs(
78-
zipBlob,
79-
`${sanitizeFileName(pdfName)}_signed_by_${appName}.zip`
80-
);
68+
// Add files to ZIP
69+
zip.file(
70+
`${sanitizeFileName(pdfName)}_signed_by_${appName}.pdf`,
71+
pdf1Blob
72+
);
73+
zip.file(`Certificate_signed_by_${appName}.pdf`, pdf2Blob);
74+
// Generate the ZIP and trigger download
75+
const zipBlob = await zip.generateAsync({ type: "blob" });
76+
saveAs(
77+
zipBlob,
78+
`${sanitizeFileName(pdfName)}_signed_by_${appName}.zip`
79+
);
8180
setSelectType(1);
8281
props.setIsDownloadModal(false);
8382
setIsDownloading("");

apps/OpenSignServer/Utils.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import { PDFDocument } from 'pdf-lib';
55
dotenv.config();
66

77
export const cloudServerUrl = 'http://localhost:8080/app';
8-
export const appName = process.env.APP_NAME || 'OpenSign™';
8+
export const appName =
9+
'OpenSign™';
910
export function customAPIurl() {
1011
const url = new URL(cloudServerUrl);
1112
return url.pathname === '/api/app' ? url.origin + '/api' : url.origin;

apps/OpenSignServer/cloud/parsefunction/pdf/GenerateCertificate.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import { PDFDocument, StandardFonts, rgb } from 'pdf-lib';
1+
import { PDFDocument, rgb } from 'pdf-lib';
22
import fs from 'node:fs';
33
import fontkit from '@pdf-lib/fontkit';
4-
import { formatTimeInTimezone } from '../../../Utils.js';
4+
import {
5+
formatTimeInTimezone,
6+
} from '../../../Utils.js';
57

68
export default async function GenerateCertificate(docDetails) {
79
const timezone = docDetails?.ExtUserPtr?.Timezone || '';
@@ -73,12 +75,12 @@ export default async function GenerateCertificate(docDetails) {
7375
borderColor: borderColor,
7476
borderWidth: 1,
7577
});
76-
page.drawImage(pngImage, {
77-
x: 30,
78-
y: 790,
79-
width: 100,
80-
height: 25,
81-
});
78+
page.drawImage(pngImage, {
79+
x: 30,
80+
y: 790,
81+
width: 100,
82+
height: 25,
83+
});
8284

8385
page.drawText(generatedOn, {
8486
x: 320,

apps/OpenSignServer/package-lock.json

Lines changed: 8 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/OpenSignServer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
},
5252
"type": "module",
5353
"devDependencies": {
54-
"@babel/eslint-parser": "^7.26.8",
55-
"eslint": "^9.20.1",
54+
"@babel/eslint-parser": "^7.26.5",
55+
"eslint": "^9.20.0",
5656
"jasmine": "^5.6.0",
5757
"mongodb-runner": "^5.7.1",
5858
"nodemon": "^3.1.9",

0 commit comments

Comments
 (0)