Skip to content

Commit 6fa4c47

Browse files
nxglabsnxglabs
authored
Merge pull request #853 from OpenSignLabs/resolve_stage
2 parents ffdd952 + f8d6547 commit 6fa4c47

File tree

16 files changed

+137
-491
lines changed

16 files changed

+137
-491
lines changed

‎apps/OpenSign/src/components/dashboard/DashboardButton.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from "react";
2-
import "../../styles/loader.css";
32
import { useNavigate } from "react-router-dom";
43
import { openInNewTab } from "../../constant/Utils";
54

‎apps/OpenSign/src/components/dashboard/DashboardCard.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useState, useEffect } from "react";
22
import axios from "axios";
33
import Parse from "parse";
44
import getReplacedHashQuery from "../../constant/getReplacedHashQuery";
5-
import "../../styles/loader.css";
65
import { useNavigate } from "react-router-dom";
76
import Tooltip from "../../primitives/Tooltip";
87

‎apps/OpenSign/src/components/pdf/EditTemplate.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ const EditTemplate = ({ template, onSuccess }) => {
6161
<div className="max-h-[300px] md:max-h-[400px] overflow-y-scroll p-[10px]">
6262
<div className="text-base-content">
6363
<form onSubmit={handleSubmit}>
64-
<div>
64+
<div className="mb-[0.35rem]">
6565
<label htmlFor="name" className="text-[13px]">
6666
File
6767
</label>
6868
<div className="op-input op-input-bordered op-input-sm focus:outline-none py-2 font-semibold w-full text-xs">
6969
{getFileName(template.URL)}
7070
</div>
7171
</div>
72-
<div className="form-section">
72+
<div className="mb-[0.35rem]">
7373
<label htmlFor="name" className="text-[13px]">
7474
Name
7575
<span className="text-[13px] text-[red]"> *</span>
@@ -83,7 +83,7 @@ const EditTemplate = ({ template, onSuccess }) => {
8383
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
8484
/>
8585
</div>
86-
<div className="form-section">
86+
<div className="mb-[0.35rem]">
8787
<label htmlFor="Note" className="text-[13px]">
8888
Note
8989
</label>
@@ -96,7 +96,7 @@ const EditTemplate = ({ template, onSuccess }) => {
9696
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
9797
/>
9898
</div>
99-
<div className="form-section">
99+
<div className="mb-[0.35rem]">
100100
<label htmlFor="Description" className="text-[13px]">
101101
Description
102102
</label>
@@ -109,7 +109,7 @@ const EditTemplate = ({ template, onSuccess }) => {
109109
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
110110
/>
111111
</div>
112-
<div className="form-section">
112+
<div className="mb-[0.35rem]">
113113
<label className="text-[13px]">Send In Order</label>
114114
<div className="flex items-center gap-[8px] ml-[8px] mb-[5px]">
115115
<input

‎apps/OpenSign/src/components/shared/fields/CreateFolder.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
124124
Name<span className="text-red-500 text-[13px]">*</span>
125125
</label>
126126
<input
127-
className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
127+
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
128128
value={name}
129129
onChange={(e) => setName(e.target.value)}
130130
required
@@ -135,7 +135,7 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
135135
<select
136136
value={selectedParent}
137137
onChange={handleOptions}
138-
className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
138+
className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content w-full text-xs"
139139
>
140140
<option>select</option>
141141
{folderList.length > 0 &&
@@ -150,9 +150,9 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
150150
<button
151151
onClick={handleCreateFolder}
152152
disabled={isLoader}
153-
className="flex items-center rounded p-2 bg-[#32a3ac] text-white mt-3"
153+
className="op-btn op-btn-primary op-btn-sm mt-3"
154154
>
155-
<i className="fa-solid fa-plus mr-1"></i>
155+
<i className="fa-solid fa-plus"></i>
156156
<span>Create</span>
157157
</button>
158158
</div>

‎apps/OpenSign/src/components/shared/fields/SelectFolder.js‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
178178
>
179179
<div>
180180
<i
181-
className="far fa-folder-open text-[40px] text-[#33bbff]"
181+
className="far fa-folder-open text-[40px] text-neutral"
182182
style={{ fontSize: "40px" }}
183183
aria-hidden="true"
184184
></i>
@@ -250,12 +250,12 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
250250
folderList.map((folder) => (
251251
<div
252252
key={folder.Name}
253-
className="border-[1px] border-[#8a8a8a] px-2 py-2 mb-2 cursor-pointer "
253+
className="border-b-[1px] border-[#8a8a8a] px-2 py-2 mb-2 cursor-pointer "
254254
onClick={() => handleSelect(folder)}
255255
>
256256
<div className="flex items-center gap-2">
257257
<i
258-
className="fa fa-folder text-[#33bbff] text-[1.4rem]"
258+
className="fa fa-folder text-neutral text-[1.4rem]"
259259
aria-hidden="true"
260260
></i>
261261
<span className="font-semibold">{folder.Name}</span>
@@ -280,22 +280,28 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
280280
<hr />
281281
<div className="flex justify-between items-center py-[.75rem] px-[1.25rem]">
282282
<div
283-
className="text-[30px] cursor-pointer text-[#32a3ac]"
283+
className="op-btn op-btn-seconday op-btn-sm"
284284
title="Save Here"
285285
onClick={handleCreate}
286286
>
287287
{isAdd ? (
288-
<i className="fa-solid fa-arrow-left" aria-hidden="true"></i>
288+
<>
289+
<i className="fa-solid fa-arrow-left" aria-hidden="true"></i>
290+
<span className="text-xs">Back</span>
291+
</>
289292
) : (
290-
<i className="fa-solid fa-square-plus" aria-hidden="true"></i>
293+
<>
294+
<i className="fa-solid fa-square-plus" aria-hidden="true"></i>
295+
<span className="">Add folder</span>
296+
</>
291297
)}
292298
</div>
293299
<div
294-
className="text-[30px] cursor-pointer"
300+
className="op-btn op-btn-primary op-btn-sm"
295301
title="Save Here"
296302
onClick={handleSubmit}
297303
>
298-
<i className="fas fa-save" aria-hidden="true"></i>
304+
<i className="fas fa-save" aria-hidden="true"></i>Save here
299305
</div>
300306
</div>
301307
</ModalUi>

‎apps/OpenSign/src/components/shared/fields/SelectSigners.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { useState } from "react";
22
import Parse from "parse";
3-
import "../../../styles/AddUser.css";
43
import AsyncSelect from "react-select/async";
54

65
const SelectSigners = (props) => {

‎apps/OpenSign/src/constant/Utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ export const getWidgetType = (item) => {
386386
{item.type}
387387
</span>
388388
</div>
389-
<div className="text-[20px] op-btn op-btn-primary w-[40px] h-full flex justify-center items-center">
389+
<div className="text-[20px] op-btn op-btn-primary rounded-none w-[40px] h-full flex justify-center items-center">
390390
<i className={item.icon}></i>
391391
</div>
392392
</div>

‎apps/OpenSign/src/pages/Dashboard.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React, { useState, useEffect } from "react";
2-
import "../styles/loader.css";
32
import GetDashboard from "../components/dashboard/GetDashboard";
43
import { useNavigate, useParams } from "react-router-dom";
54
import Title from "../components/Title";

‎apps/OpenSign/src/pages/DebugPdf.js‎

Lines changed: 26 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import React, { useEffect, useState } from "react";
22
import RenderAllPdfPage from "../components/pdf/RenderAllPdfPage";
3-
import "../styles/signature.css";
4-
import "../styles/AddUser.css";
53
import Title from "../components/Title";
64
import RenderDebugPdf from "../components/RenderDebugPdf";
75
import { pdfjs } from "react-pdf";
@@ -217,14 +215,18 @@ const DebugPdf = () => {
217215
};
218216
return (
219217
<div>
220-
{copied && <Alert type="success">Copied</Alert>}
218+
{copied && (
219+
<Alert type="success">
220+
<span className="ml-3">Copied</span>
221+
</Alert>
222+
)}
221223
<Title title={"Debug Pdf"} />
222224
{width < 800 ? (
223225
<HandleError handleError={"Debug PDF only availble for PC"} />
224226
) : (
225227
<>
226228
{!isModal && (
227-
<div className="signatureContainer">
229+
<div className="flex flex-row justify-between">
228230
{/* this component used to render all pdf pages in left side */}
229231
<RenderAllPdfPage
230232
signPdfUrl={pdf}
@@ -253,106 +255,55 @@ const DebugPdf = () => {
253255
/>
254256
</div>
255257
</div>
256-
<div style={{ backgroundColor: "white", width: 220 }}>
257-
<div
258-
style={{
259-
fontSize: 18,
260-
fontWeight: 500,
261-
padding: "10px 12px",
262-
borderBottom: "1px solid grey"
263-
}}
264-
>
258+
<div className="w-[220px] bg-base-100">
259+
<div className="text-[18px] font-medium py-[10px] px-[12px] border-b-[1px] border-[gray]">
265260
PDF details
266261
</div>
267-
<div style={{ fontSize: 14, padding: "5px 12px" }}>
262+
<div className="text-[14px] py-[5px] px-[12px]">
268263
Name: {pdfDetails?.name}
269264
</div>
270-
<div style={{ fontSize: 14, padding: "5px 12px" }}>
265+
<div className="text-[14px] py-[5px] px-[12px]">
271266
Pdf type: {pdfDetails?.pdftype}
272267
</div>
273-
<div style={{ fontSize: 14, padding: "5px 12px" }}>
268+
<div className="text-[14px] py-[5px] px-[12px]">
274269
Total Pages: {pdfDetails?.totalPages}
275270
</div>
276-
<div style={{ fontSize: 14, padding: "5px 12px" }}>
271+
<div className="text-[14px] py-[5px] px-[12px]">
277272
Current Page: {pdfDetails?.currentPage}
278273
</div>
279-
<div style={{ fontSize: 14, padding: "5px 12px" }}>
274+
<div className="text-[14px] py-[5px] px-[12px]">
280275
Base64 : {pdfDetails?.base64.slice(0, 10)}...
281276
<span
282-
style={{
283-
borderRadius: 4,
284-
padding: "3px 5px",
285-
border: "1px solid gray",
286-
fontSize: 12,
287-
margin: 2,
288-
cursor: "pointer"
289-
}}
277+
className="op-btn op-btn-outline op-btn-primary op-btn-xs rounded-md w-[25px] h-[25px] text-[12px] m-[2px] "
290278
onClick={() => copytoclipboard(pdfDetails?.base64)}
291279
>
292280
<i className="fa-solid fa-copy"></i>
293281
</span>
294282
</div>
295-
<div
296-
style={{
297-
fontSize: 18,
298-
fontWeight: 500,
299-
padding: "10px 12px",
300-
borderBottom: "1px solid grey"
301-
}}
302-
>
283+
<div className="text-[18px] font-medium py-[10px] px-[12px] border-b-[1px] border-[gray]">
303284
Last click
304285
</div>
305-
<div style={{ fontSize: 14, padding: "5px 12px" }}>
286+
<div className="text-[14px] py-[5px] px-[12px]">
306287
x co-ordinate: {pdfDetails?.x}
307288
</div>
308-
<div style={{ fontSize: 14, padding: "5px 12px" }}>
289+
<div className="text-[14px] py-[5px] px-[12px]">
309290
y co-ordinate: {pdfDetails?.y}
310291
</div>
311-
312-
<div
313-
style={{
314-
fontSize: 18,
315-
fontWeight: 500,
316-
padding: "10px 12px",
317-
borderBottom: "1px solid grey",
318-
borderTop: "1px solid grey"
319-
}}
320-
>
292+
<div className="text-[18px] font-medium py-[10px] px-[12px] border-y-[1px] border-[gray]">
321293
Annotation
322294
</div>
323-
<ul
324-
style={{
325-
listStyle: "none",
326-
padding: 10,
327-
height: 500,
328-
overflowY: "auto",
329-
scrollbarWidth: 5
330-
}}
331-
>
295+
<ul className=" list-none p-[10px] h-[500px] overflow-y-auto">
332296
{annotations.map((coord, index) => (
333297
<li key={index}>
334-
<span style={{ fontSize: 13, fontWeight: 500 }}>{`Box ${
298+
<span className="text-[13px] font-medium">{`Box ${
335299
index + 1
336300
}:`}</span>
337-
<code
338-
style={{
339-
fontSize: 12,
340-
color: "black",
341-
cursor: "pointer"
342-
}}
343-
>
301+
<code className="text-[12px] text-base-content select-none">
344302
{` ["page":${coord?.page}, "x": ${coord.x}, "y": ${coord.y}, "w": ${coord.width}, "h": ${coord.height}]`}
345303
</code>
346304
<div>
347305
<span
348-
style={{
349-
borderRadius: 4,
350-
padding: "3px 5px",
351-
border: "1px solid gray",
352-
fontSize: 12,
353-
margin: 2,
354-
cursor: "pointer"
355-
}}
306+
className="op-btn op-btn-outline op-btn-primary op-btn-xs rounded-md w-[23px] h-[20px] text-[12px] m-[2px] "
356307
onClick={() =>
357308
copytoclipboard(
358309
`"page":${coord?.page}, "x": ${coord.x}, "y": ${coord.y}, "w": ${coord.width}, "h": ${coord.height}`
@@ -362,14 +313,7 @@ const DebugPdf = () => {
362313
<i className="fa-solid fa-copy"></i>
363314
</span>
364315
<span
365-
style={{
366-
borderRadius: 4,
367-
padding: "3px 5px",
368-
border: "1px solid gray",
369-
fontSize: 12,
370-
margin: 2,
371-
cursor: "pointer"
372-
}}
316+
className="op-btn op-btn-outline op-btn-error op-btn-xs rounded-md w-[23px] h-[20px] text-[12px] m-[2px] "
373317
onClick={() => handleDelete(coord.key)}
374318
>
375319
<i className="fa-solid fa-trash-can"></i>
@@ -382,38 +326,16 @@ const DebugPdf = () => {
382326
</div>
383327
)}
384328
<ModalUi title={"Select PDF"} isOpen={isModal}>
385-
<form onSubmit={handleSubmit} style={{ margin: "10px" }}>
329+
<form onSubmit={handleSubmit} className="m-[10px]">
386330
<input
387331
type="file"
388332
onChange={(e) => handleFileChange(e.target.files)}
389-
style={{
390-
width: "100%",
391-
border: "1px solid grey",
392-
borderRadius: "4px",
393-
padding: "5px",
394-
fontSize: 12
395-
}}
333+
className="op-file-input op-file-input-bordered op-file-input-sm focus:outline-none hover:border-base-content w-full h-[40px] text-xs"
396334
accept=".pdf"
397335
required
398336
/>
399-
<div
400-
style={{ borderTop: "1px solid grey", margin: "10px 0" }}
401-
></div>
402337
<button
403-
style={{
404-
background: "#32a3ac",
405-
borderRadius: "2px",
406-
boxShadow:
407-
"0 2px 4px rgba(0, 0, 0, 0.1), 0 2px 4px rgba(0, 0, 0, 0.18)",
408-
border: "none",
409-
textTransform: "uppercase",
410-
fontSize: "13px",
411-
fontWeight: "600",
412-
padding: "0.375rem 0.75rem",
413-
textAlign: "center",
414-
color: "#ffffff",
415-
outline: "none"
416-
}}
338+
className="op-btn op-btn-primary w-full mt-3 mb-1"
417339
type="submit"
418340
>
419341
Submit

‎apps/OpenSign/src/pages/Login.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { useEffect, useState } from "react";
22
import Parse from "parse";
3-
import "../styles/loader.css";
43
import { useDispatch } from "react-redux";
54
import axios from "axios";
65
import Title from "../components/Title";

0 commit comments

Comments
 (0)