Skip to content

Commit fc2eab7

Browse files
raktima-opensignlabsraktima-opensignlabs
committed
handled placeholder from all devices, remove underline from certificate,login page style,solved reactour issue for document owner from login flow, need your sign reports finish button issue,remove commented code, delete button(cross) on email documents popup issue and solve some minor design issue
1 parent a3ebe95 commit fc2eab7

File tree

16 files changed

+1708
-1711
lines changed

16 files changed

+1708
-1711
lines changed

‎microfrontends/SignDocuments/src/Component/Certificate/Certificate.js‎

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,31 @@ function Certificate({ pdfData }) {
3333
page: {
3434
borderRadius: "5px",
3535
padding: "10px",
36-
backgroundColor: "white",
36+
backgroundColor: "white"
3737
},
3838
section1: {
3939
border: "1px solid rgb(177, 174, 174)",
40-
padding: "20px",
40+
padding: "20px"
4141
},
4242
textStyle: {
4343
fontWeight: "bold",
4444
fontSize: "11px",
45-
marginBottom: "10px",
45+
marginBottom: "10px"
4646
},
4747
textStyle2: {
4848
fontWeight: "600",
4949
fontSize: "11px",
5050
marginBottom: "10px",
51-
color: "gray",
52-
},
51+
color: "gray"
52+
}
5353
});
5454

5555
const generatedDate = () => {
5656
const newDate = new Date();
5757
const localExpireDate = newDate.toLocaleDateString("en-US", {
5858
day: "numeric",
5959
month: "long",
60-
year: "numeric",
60+
year: "numeric"
6161
});
6262

6363
var currentOffset = newDate.getTimezoneOffset();
@@ -79,7 +79,7 @@ function Certificate({ pdfData }) {
7979
textAlign: "right",
8080
color: "gray",
8181
fontSize: "10px",
82-
marginBottom: "30px",
82+
marginBottom: "30px"
8383
}}
8484
>
8585
Generated On {localExpireDate} {hoursIST}:{minutesIST} IST
@@ -92,7 +92,7 @@ function Certificate({ pdfData }) {
9292
const localExpireDate = newDate.toLocaleDateString("en-US", {
9393
day: "numeric",
9494
month: "long",
95-
year: "numeric",
95+
year: "numeric"
9696
});
9797

9898
var currentOffset = newDate.getTimezoneOffset();
@@ -136,7 +136,7 @@ function Certificate({ pdfData }) {
136136
)
137137
);
138138
};
139-
139+
140140
return (
141141
isLoad && (
142142
<Document>
@@ -151,7 +151,7 @@ function Certificate({ pdfData }) {
151151
fontSize: "20px",
152152
fontWeight: "bold",
153153
color: "#31bceb",
154-
marginBottom: "10px",
154+
marginBottom: "10px"
155155
}}
156156
>
157157
{" "}
@@ -165,7 +165,7 @@ function Certificate({ pdfData }) {
165165
fontSize: "16px",
166166
fontWeight: "bold",
167167
color: "#31bceb",
168-
margin: "10px 0px 10px 0px",
168+
margin: "10px 0px 10px 0px"
169169
}}
170170
>
171171
Summary
@@ -203,36 +203,40 @@ function Certificate({ pdfData }) {
203203
fontSize: "16px",
204204
fontWeight: "bold",
205205
color: "#31bceb",
206-
margin: "10px 0px 10px 0px",
206+
margin: "10px 0px 10px 0px"
207207
}}
208208
>
209209
Recipients
210210
</Text>
211211

212212
<View>
213-
{multiSigner && multiSigner.map((data, ind) => {
214-
return (
215-
<View
216-
key={ind}
217-
style={{ display: "flex", flexDirection: "column" }}
218-
>
213+
{multiSigner &&
214+
multiSigner.map((data, ind) => {
215+
return (
219216
<View
217+
key={ind}
220218
style={{
221-
border: "0.4px solid #bdbbbb",
222-
marginBottom: "10px",
219+
display: "flex",
220+
flexDirection: "column"
223221
}}
224-
></View>
225-
{signerName(data)}
222+
>
223+
<View
224+
style={{
225+
border: "0.4px solid #bdbbbb",
226+
marginBottom: "10px"
227+
}}
228+
></View>
229+
{signerName(data)}
226230

227-
<Text style={styles.textStyle}>
228-
Accessed from : &nbsp;
229-
<Text style={styles.textStyle2}>
230-
{data.ipAddress}
231+
<Text style={styles.textStyle}>
232+
Accessed from : &nbsp;
233+
<Text style={styles.textStyle2}>
234+
{data.ipAddress}
235+
</Text>
231236
</Text>
232-
</Text>
233-
</View>
234-
);
235-
})}
237+
</View>
238+
);
239+
})}
236240
</View>
237241
</View>
238242
) : (
@@ -242,7 +246,7 @@ function Certificate({ pdfData }) {
242246
fontSize: "16px",
243247
fontWeight: "bold",
244248
color: "#31bceb",
245-
margin: "10px 0px 10px 0px",
249+
margin: "10px 0px 10px 0px"
246250
}}
247251
>
248252
Recipients
@@ -259,7 +263,8 @@ function Certificate({ pdfData }) {
259263
<Text style={styles.textStyle}>
260264
Accessed from : &nbsp;
261265
<Text style={styles.textStyle2}>
262-
{pdfData[0].AuditTrail && pdfData[0].AuditTrail[0].ipAddress}
266+
{pdfData[0].AuditTrail &&
267+
pdfData[0].AuditTrail[0].ipAddress}
263268
</Text>
264269
</Text>
265270

‎microfrontends/SignDocuments/src/Component/DraftDocument.js‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function DraftDocument() {
4242
.then((Listdata) => {
4343
const json = Listdata.data;
4444
const res = json.results;
45-
// console.log("res", res);
45+
4646
if (res[0] && res.length > 0) {
4747
setPdfDetails(res);
4848
const loadObj = {
@@ -74,20 +74,16 @@ function DraftDocument() {
7474

7575
//checking document is completed and signer exist then navigate to pdfRequestFiles file
7676
if (data.IsCompleted && checkSignerExist) {
77-
// window.location.hash = `/pdfRequestFiles`;
78-
79-
navigate(`${hostUrl}pdfRequestFiles`);
77+
navigate(`${hostUrl}pdfRequestFiles`);
8078
}
8179
//checking document is completed and signer does not exist then navigate to recipientSignPdf file
8280
else if (data.IsCompleted && !checkSignerExist) {
83-
// window.location.hash = `/recipientSignPdf/${data.objectId}/${data.ExtUserPtr.Phone}`;
8481
navigate(
8582
`${hostUrl}signaturePdf`
8683
);
8784
}
8885
//checking document is declined by someone then navigate to pdfRequestFiles file
8986
else if (isDecline) {
90-
// window.location.hash = `/pdfRequestFiles`;
9187
navigate(`${hostUrl}pdfRequestFiles`);
9288
}
9389
//checking document has expired and signers exist and placeholder does not set yet then navigate to pdfRequestFiles file
@@ -97,7 +93,6 @@ function DraftDocument() {
9793
checkSignerExist &&
9894
!isPlaceholder
9995
) {
100-
// window.location.hash = `/placeHolderSign`;
10196
navigate(`${hostUrl}placeHolderSign`);
10297
}
10398
//checking document has expired and signers does not exist and document not signed yet then navigate to pdfRequestFiles file

‎microfrontends/SignDocuments/src/Component/ManageSign.js‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import "../css/signature.css";
88
import axios from "axios";
99
import { toDataUrl } from "../utils/toDataUrl";
1010

11-
// console.log("appName ", appName)
11+
1212
const ManageSign = () => {
1313
let appName;
1414
const [penColor, setPenColor] = useState("blue");
@@ -68,7 +68,6 @@ const ManageSign = () => {
6868
if (res.data.results.length > 0) {
6969
setId(res.data.results[0].objectId);
7070
setSignName(res.data.results[0].SignatureName);
71-
// console.log(res.data.results[0].ImageURL);
7271
setImage(res.data.results[0].ImageURL);
7372
if (res.data.results[0] && res.data.results[0].Initials) {
7473
setInitials(res.data.results[0].Initials);
@@ -143,7 +142,7 @@ const ManageSign = () => {
143142

144143
if (!signName) {
145144
setNameWarning(true);
146-
// setTimeout(() => setNameWarning(false), 1000);
145+
147146
} else if (!isvalue) {
148147
setWarning(true);
149148
setTimeout(() => setWarning(false), 1000);
@@ -337,12 +336,8 @@ const ManageSign = () => {
337336
<div
338337
className="mainDiv"
339338
style={{
340-
// height: "100%",
341-
342339
width: "100%",
343340
paddingRight: "10px",
344-
345-
// maxHeight:"500px",
346341
}}
347342
>
348343
<div style={{ margin: 20 }}>

0 commit comments

Comments
 (0)