Skip to content

Commit 795e8a8

Browse files
nxglabsnxglabs
authored
Merge pull request #863 from OpenSignLabs/resolve_stage
feat: update design of signers Ui, style of some buttons and update primary, neutral color
2 parents d1d0f40 + e8b0b33 commit 795e8a8

File tree

11 files changed

+94
-54
lines changed

11 files changed

+94
-54
lines changed

‎apps/OpenSign/src/components/Header.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const Header = ({ showSidebar }) => {
115115
{!isSubscribe && (
116116
<div>
117117
<button
118-
className="text-xs bg-[#002864] p-2 text-white rounded shadow"
118+
className="text-xs md:text-sm shadow op-btn op-btn-outline op-btn-sm md:op-btn-md op-btn-accent"
119119
onClick={() => navigate("/subscription")}
120120
>
121121
Upgrade Now

‎apps/OpenSign/src/components/opensigndrive/DriveBody.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ function DriveBody(props) {
321321
<tr onClick={() => handleOnclikFolder(data)}>
322322
<td className="cursor-pointer flex items-center">
323323
<i
324-
className="fa fa-folder mr-[8px] text-[26px] text-[#f0ad26]"
324+
className="fa fa-folder mr-[8px] text-[26px] op-text-secondary"
325325
aria-hidden="true"
326326
></i>
327327
<span className="text-[12px] font-medium">{data.Name}</span>
@@ -334,7 +334,7 @@ function DriveBody(props) {
334334
) : (
335335
<tr onClick={() => checkPdfStatus(data)}>
336336
<td className="cursor-pointer flex items-center">
337-
<i className="fa-solid fa-file-lines mr-[8px] text-[26px] text-neutral"></i>
337+
<i className="fa-solid fa-file-lines mr-[8px] text-[26px] op-text-primary"></i>
338338
<span className="text-[12px] font-medium">{data.Name}</span>
339339
</td>
340340
<td>{createddate}</td>
@@ -364,7 +364,7 @@ function DriveBody(props) {
364364
className="w-full h-full"
365365
/> */}
366366
<i
367-
className="fa-solid fa-folder text-[100px] mx-auto text-secondary"
367+
className="fa-solid fa-folder text-[100px] mx-auto op-text-secondary"
368368
onClick={() => handleOnclikFolder(data)}
369369
></i>
370370
{rename === data.objectId ? (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
118118
<Loader />
119119
</div>
120120
)}
121-
<h1 className="text-base font-semibold">Create Folder</h1>
121+
<h1 className="text-base font-semibold mt-[0.4rem]">Create Folder</h1>
122122
<div className="text-xs mt-2">
123123
<label className="block">
124124
Name<span className="text-red-500 text-[13px]">*</span>

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

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
4444
const FolderQuery = new Parse.Query(folderCls);
4545
if (folderPtr) {
4646
FolderQuery.equalTo("Folder", folderPtr);
47-
FolderQuery.equalTo("Type", "Folder");
4847
FolderQuery.notEqualTo("IsArchive", true);
48+
FolderQuery.descending("Type");
4949
} else {
5050
FolderQuery.doesNotExist("Folder");
51-
FolderQuery.equalTo("Type", "Folder");
5251
FolderQuery.notEqualTo("IsArchive", true);
52+
FolderQuery.descending("Type");
5353
}
5454

5555
const res = await FolderQuery.find();
@@ -220,7 +220,7 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
220220
handleClose={handleCancel}
221221
>
222222
<div className="w-full min-w-[300px] md:min-w-[500px] max-w-[500px] px-3">
223-
<div className="py-2 text-[#ac4848] text-[14px] font-[500]">
223+
<div className="pt-1 text-[#ac4848] text-[14px] font-[500]">
224224
<span
225225
className="cursor-pointer"
226226
title="OpenSign™ Drive"
@@ -241,21 +241,31 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
241241
{" / "}
242242
</React.Fragment>
243243
))}
244-
<hr />
244+
<hr className="bg-[#8a8a8a] mt-[0.750rem]" />
245245
</div>
246-
<div className="mt-2 mb-3">
246+
<div className="mb-2">
247247
<div className="max-h-[210px] overflow-auto">
248248
{!isAdd &&
249249
folderList.length > 0 &&
250250
folderList.map((folder) => (
251251
<div
252-
key={folder.Name}
253-
className="border-b-[1px] border-[#8a8a8a] px-2 py-2 mb-2 cursor-pointer "
254-
onClick={() => handleSelect(folder)}
252+
key={folder.objectId}
253+
className={`${
254+
folder.Type === "Folder"
255+
? "cursor-pointer"
256+
: "cursor-default"
257+
} border-b-[1px] border-[#8a8a8a] py-2 mb-0.5"`}
258+
onClick={() =>
259+
folder.Type === "Folder" && handleSelect(folder)
260+
}
255261
>
256262
<div className="flex items-center gap-2">
257263
<i
258-
className="fa fa-folder text-neutral text-[1.4rem]"
264+
className={`${
265+
folder.Type === "Folder"
266+
? "fa fa-folder op-text-secondary"
267+
: "fa fa-file op-text-primary"
268+
} text-[1.4rem]`}
259269
aria-hidden="true"
260270
></i>
261271
<span className="font-semibold">{folder.Name}</span>

‎apps/OpenSign/src/index.css‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,22 @@ body {
5050
@apply text-warning;
5151
}
5252

53+
/* CSS for scrollbar customization */
54+
* {
55+
scrollbar-width: thin; /* For Firefox */
56+
scrollbar-color: gray; /* For Firefox */
57+
}
58+
59+
/* For webkit-based browsers like Chrome, Safari */
60+
*::-webkit-scrollbar {
61+
width: 5px;
62+
}
63+
64+
*::-webkit-scrollbar-track {
65+
background-color: transparent;
66+
}
67+
68+
*::-webkit-scrollbar-thumb {
69+
background-color: gray;
70+
border-radius: 10px;
71+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function GenerateToken() {
191191
<button
192192
type="button"
193193
onClick={() => navigation("/subscription")}
194-
className="rounded hover:bg-[#15b4e9] border-[1px] border-[#15b4e9] text-[#15b4e9] hover:text-white px-11 py-2 text-xs md:text-base focus:outline-none"
194+
className="text-xs md:text-sm shadow op-btn op-btn-outline op-btn-accent"
195195
>
196196
Upgrade Now
197197
</button>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ function Webhook() {
175175
<button
176176
type="button"
177177
onClick={() => navigation("/subscription")}
178-
className="rounded hover:bg-[#15b4e9] border-[1px] border-[#15b4e9] text-[#15b4e9] hover:text-white px-11 py-2 text-xs md:text-base focus:outline-none"
178+
className="text-xs md:text-sm shadow op-btn op-btn-outline op-btn-accent"
179179
>
180180
Upgrade Now
181181
</button>

‎apps/OpenSign/src/primitives/GetReportDisplay.js‎

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,46 +1303,56 @@ const ReportTable = (props) => {
13031303
))}
13041304
</div>
13051305
{isViewShare[item.objectId] && (
1306-
<div className="fixed z-[999] inset-0 w-full h-full bg-black bg-opacity-[75%]">
1307-
<div className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-sm bg-white rounded shadow-md max-h-90 min-w-[90%] md:min-w-[400px] overflow-y-auto max-h-[340px] md:max-h-[400px] hide-scrollbar">
1306+
<ModalUi
1307+
isOpen
1308+
showHeader={
1309+
props.ReportName === "Templates" && true
1310+
}
1311+
title={"Signers"}
1312+
reduceWidth={"md:max-w-[450px]"}
1313+
handleClose={() => setIsViewShare({})}
1314+
>
1315+
{props.ReportName !== "Templates" && (
13081316
<div
1309-
className="cursor-pointer absolute text-white text-[22px] font-medium rounded-full z-50 top-1 right-3"
1317+
className="op-btn op-btn-sm op-btn-circle op-btn-ghost text-base-content absolute right-2 top-1 z-40"
13101318
onClick={() => setIsViewShare({})}
13111319
>
1312-
&times;
1320+
✕
13131321
</div>
1314-
1315-
<table className="table-auto w-full">
1316-
<thead className="text-white h-[38px] sticky top-0 bg-[#32a3ac]">
1317-
<tr>
1322+
)}
1323+
<table className="op-table w-full overflow-auto">
1324+
<thead className="h-[38px] sticky top-0 text-base-content text-sm pt-[15px] px-[20px]">
1325+
<tr>
1326+
{props.ReportName === "Templates" && (
1327+
<th className="p-2 pl-3 w-[30%]">
1328+
Roles
1329+
</th>
1330+
)}
1331+
<th className="pl-3 py-2">
1332+
{props.ReportName === "Templates"
1333+
? "Email"
1334+
: "Signers"}
1335+
</th>
1336+
</tr>
1337+
</thead>
1338+
<tbody>
1339+
{item.Placeholders.map((x, i) => (
1340+
<tr key={i} className="text-sm font-medium">
13181341
{props.ReportName === "Templates" && (
1319-
<th className="p-2 pl-3">Roles</th>
1342+
<td className="text-[12px] p-2 pl-3 w-[30%]">
1343+
{x.Role && x.Role}
1344+
</td>
13201345
)}
1321-
<th className="p-2">Signers</th>
1346+
<td className="pl-3 text-[12px] py-2 break-all">
1347+
{x.email
1348+
? x.email
1349+
: x?.signerPtr?.Email || "-"}
1350+
</td>
13221351
</tr>
1323-
</thead>
1324-
<tbody>
1325-
{item.Placeholders.map((x, i) => (
1326-
<tr
1327-
key={i}
1328-
className="text-sm font-normal text-black odd:bg-white even:bg-gray-200"
1329-
>
1330-
{props.ReportName === "Templates" && (
1331-
<td className="text-[12px] p-2 pl-3">
1332-
{x.Role && x.Role}
1333-
</td>
1334-
)}
1335-
<td className="text-[12px] p-2 break-all">
1336-
{x.email
1337-
? x.email
1338-
: x?.signerPtr?.Email || "-"}
1339-
</td>
1340-
</tr>
1341-
))}
1342-
</tbody>
1343-
</table>
1344-
</div>
1345-
</div>
1352+
))}
1353+
</tbody>
1354+
</table>
1355+
</ModalUi>
13461356
)}
13471357
{isDeleteModal[item.objectId] && (
13481358
<ModalUi

‎apps/OpenSign/src/primitives/ModalUi.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ const ModalUi = ({
1212
reduceWidth,
1313
showHeaderMessage
1414
}) => {
15+
const width = reduceWidth;
1516
return (
1617
<>
1718
{isOpen && (
1819
<dialog className="op-modal op-modal-open">
1920
<div
2021
className={`${
21-
reduceWidth || "md:min-w-[500px]"
22-
} op-modal-box p-0 max-h-90 min-w-[90%] overflow-y-auto hide-scrollbar text-sm`}
22+
width || "md:min-w-[500px]"
23+
} op-modal-box p-0 max-h-90 overflow-y-auto hide-scrollbar text-sm`}
2324
>
2425
{showHeader && (
2526
<>

‎apps/OpenSign/src/primitives/Upgrade.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function Upgrade({ message }) {
99
const url = window.location.origin + "/subscription";
1010
openInNewTab(url);
1111
}}
12-
className="text-blue-800 text-sm cursor-pointer underline"
12+
className="op-link op-link-accent text-sm"
1313
>
1414
{message ? message : "Upgrade now"}
1515
</span>

0 commit comments

Comments
 (0)