diff --git a/apps/OpenSign/public/index.html b/apps/OpenSign/public/index.html index 59e427774..61c83ee32 100644 --- a/apps/OpenSign/public/index.html +++ b/apps/OpenSign/public/index.html @@ -1,5 +1,5 @@ - + diff --git a/apps/OpenSign/src/components/AddSigner.js b/apps/OpenSign/src/components/AddSigner.js index c99eff406..eb6fbbb6a 100644 --- a/apps/OpenSign/src/components/AddSigner.js +++ b/apps/OpenSign/src/components/AddSigner.js @@ -238,15 +238,15 @@ const AddSigner = (props) => { )}
{isUserExist && ( -
+
-
@@ -267,7 +267,7 @@ const AddSigner = (props) => { onChange={(e) => setName(e.target.value)} required disabled={addYourself} - className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" />
@@ -285,7 +285,7 @@ const AddSigner = (props) => { onChange={(e) => setEmail(e.target.value?.toLowerCase())} required disabled={addYourself} - className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs lowercase" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" />
@@ -301,7 +301,7 @@ const AddSigner = (props) => { value={phone} onChange={(e) => setPhone(e.target.value)} disabled={addYourself} - className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" />
diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.js index 8d40db895..1d80fd7bc 100644 --- a/apps/OpenSign/src/components/AddUser.js +++ b/apps/OpenSign/src/components/AddUser.js @@ -221,7 +221,7 @@ const AddUser = (props) => { value={name} onChange={(e) => setName(e.target.value)} required - className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" />
@@ -238,7 +238,7 @@ const AddUser = (props) => { value={email} onChange={(e) => setEmail(e.target.value)} required - className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" />
@@ -255,7 +255,7 @@ const AddUser = (props) => { value={phone} onChange={(e) => setPhone(e.target.value)} required - className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" />
diff --git a/apps/OpenSign/src/components/LoginGoogle.js b/apps/OpenSign/src/components/LoginGoogle.js index 23af8bc1c..39a34f791 100644 --- a/apps/OpenSign/src/components/LoginGoogle.js +++ b/apps/OpenSign/src/components/LoginGoogle.js @@ -216,15 +216,12 @@ const GoogleSignInBtn = ({
-
-
-
diff --git a/apps/OpenSign/src/components/pdf/EmailBody.js b/apps/OpenSign/src/components/pdf/EmailBody.js index ce0f8442b..d4639e098 100644 --- a/apps/OpenSign/src/components/pdf/EmailBody.js +++ b/apps/OpenSign/src/components/pdf/EmailBody.js @@ -1,52 +1,42 @@ import React from "react"; import Tooltip from "../../primitives/Tooltip"; - import ReactQuill from "react-quill"; import "react-quill/dist/quill.snow.css"; import EditorToolbar, { module1, formats } from "./EditorToolbar"; export function EmailBody(props) { return ( - -
-
- -
-
- - props.setRequestSubject(e.target.value)} - placeholder='${senderName} has requested you to sign "${documentName}"' - className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" - /> - - -
- - -
-
-
- +
+
+ + props.setRequestSubject(e.target.value)} + placeholder='${senderName} has requested you to sign "${documentName}"' + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" + /> + +
+ +
- +
); } diff --git a/apps/OpenSign/src/components/shared/fields/SelectSigners.js b/apps/OpenSign/src/components/shared/fields/SelectSigners.js index f6ec88c82..2874fc1ca 100644 --- a/apps/OpenSign/src/components/shared/fields/SelectSigners.js +++ b/apps/OpenSign/src/components/shared/fields/SelectSigners.js @@ -4,13 +4,15 @@ import "../../../styles/AddUser.css"; import AsyncSelect from "react-select/async"; const customStyles = { - control: (provided) => ({ - ...provided, - fontSize: "13px" // Font size for the control + control: (baseStyles) => ({ + ...baseStyles, + backgroundColor: "inherit", + borderRadius: 10, + borderColor: "current" }), - option: (provided) => ({ - ...provided, - fontSize: "13px" // Font size for the options + option: (baseStyles) => ({ + ...baseStyles, + backgroundColor: "inherit" }) }; const SelectSigners = (props) => { @@ -79,10 +81,10 @@ const SelectSigners = (props) => { }; return ( -
-
-
- +
+
+
+ { styles={customStyles} />
- {isError ? ( -

- Please select signer -

- ) : ( -

- . -

- )} +

+ Please select signer +

-
diff --git a/apps/OpenSign/src/pages/Form.js b/apps/OpenSign/src/pages/Form.js index 236c85c3c..1ec79f513 100644 --- a/apps/OpenSign/src/pages/Form.js +++ b/apps/OpenSign/src/pages/Form.js @@ -484,6 +484,9 @@ const Forms = (props) => { setpercentage(0); setTimeout(() => setIsReset(false), 50); }; + const handleCancel = () => { + navigate("/dashboard/35KBoSgoAK"); + }; const handlePasswordSubmit = async (e) => { e.preventDefault(); setIsPassword(false); @@ -662,7 +665,7 @@ const Forms = (props) => {
handleFileInput(e)} ref={inputFileRef} accept={ @@ -690,7 +693,7 @@ const Forms = (props) => { handleStrInput(e)} required @@ -700,7 +703,7 @@ const Forms = (props) => { handleStrInput(e)} /> @@ -718,7 +721,7 @@ const Forms = (props) => { handleStrInput(e)} required @@ -740,7 +743,7 @@ const Forms = (props) => { handleStrInput(e)} required @@ -875,7 +878,7 @@ const Forms = (props) => { type="number" value={formData.remindOnceInEvery} name="remindOnceInEvery" - className="op-input op-input-bordered op-input-sm w-full text-xs" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" onChange={handleStrInput} required /> @@ -883,7 +886,7 @@ const Forms = (props) => { )} )} -
+
handleReset()} + className="op-btn op-btn-ghost" + onClick={() => handleCancel()} > - Reset + Cancel
diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.js index a3d57929b..7e38fe896 100644 --- a/apps/OpenSign/src/pages/Login.js +++ b/apps/OpenSign/src/pages/Login.js @@ -1122,7 +1122,7 @@ function Login() { @@ -1270,7 +1270,7 @@ function Login() { @@ -1292,7 +1292,7 @@ function Login() { diff --git a/apps/OpenSign/src/pages/Webhook.js b/apps/OpenSign/src/pages/Webhook.js index e8106bb85..9f6c065b5 100644 --- a/apps/OpenSign/src/pages/Webhook.js +++ b/apps/OpenSign/src/pages/Webhook.js @@ -4,7 +4,7 @@ import axios from "axios"; import { useNavigate } from "react-router-dom"; import Alert from "../primitives/Alert"; import ModalUi from "../primitives/ModalUi"; -import { isEnableSubscription, rejectBtn, submitBtn } from "../constant/const"; +import { isEnableSubscription } from "../constant/const"; import { checkIsSubscribed, openInNewTab } from "../constant/Utils"; import Parse from "parse"; import PremiumAlertHeader from "../primitives/PremiumAlertHeader"; @@ -97,8 +97,8 @@ function Webhook() { return ( - {isGenerate && <Alert type="success">Webhook added successfully!</Alert>} - {isErr && <Alert type="danger">Something went wrong!</Alert>} + {isGenerate && <Alert type="success">Webhook added successfully.</Alert>} + {isErr && <Alert type="danger">Something went wrong.</Alert>} {isLoader ? ( <div className="h-[100vh] flex justify-center items-center text-[45px] text-[#3dd3e0]"> @@ -140,7 +140,7 @@ function Webhook() { </li> </ul> - <div className="flex items-center justify-center "> + <div className="flex items-center justify-center "> <button type="button" onClick={() => @@ -190,24 +190,27 @@ function Webhook() { > {error && <Alert type="danger">{error}</Alert>} <div className="m-[20px]"> - <div className="text-lg font-normal text-black"> + <div className="text-lg font-normal text-base-content"> <label className="text-sm ml-2">Webhook</label> <input value={webhook} onChange={(e) => setWebhook(e.target.value)} placeholder="Enter webhook url" - className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" /> </div> - <hr className="bg-[#ccc] mt-4 " /> - <div className="flex items-center mt-3 gap-2 text-white"> + <hr className="bg-[#ccc] mt-3" /> + <div className="flex items-center mt-3 gap-2"> <button onClick={handleSubmit} - className={submitBtn + "ml-[2px]"} + className="op-btn op-btn-primary ml-[2px]" > Yes </button> - <button onClick={handleModal} className={rejectBtn}> + <button + onClick={handleModal} + className="op-btn op-btn-secondary" + > No </button> </div> diff --git a/apps/OpenSign/src/primitives/AddContact.js b/apps/OpenSign/src/primitives/AddContact.js index a7abdbab3..6b261e9c8 100644 --- a/apps/OpenSign/src/primitives/AddContact.js +++ b/apps/OpenSign/src/primitives/AddContact.js @@ -195,23 +195,16 @@ const AddContact = (props) => { }; return ( - <div className="addusercontainer"> + <div className="h-full px-[20px] py-[10px]"> {isLoader && ( - <div className="loaderdiv"> - <div - style={{ - fontSize: "45px", - color: "#3dd3e0" - }} - className="loader-37" - ></div> + <div className="fixed top-0 left-0 right-0 bottom-0 flex justify-center items-center bg-black bg-opacity-30 text-[45px] text-[#3dd3e0]"> + <div className="loader-37"></div> </div> )} - <div className="form-wrapper"> - <div style={{ fontSize: 14, fontWeight: "700" }}>Add User</div> - + <div className="w-full mx-auto p-[8px]"> + <div className="text-[14px] font-[700]">Add User</div> {isUserExist && ( - <div className="form-section"> + <div className="mb-[0.75rem]"> <input type="checkbox" id="addYourself" @@ -224,11 +217,11 @@ const AddContact = (props) => { </label> </div> )} - <form onSubmit={handleSubmit}> - <div className="form-section"> - <label htmlFor="name" style={{ fontSize: 13 }}> + <form className="text-base-content" onSubmit={handleSubmit}> + <div className="mb-[0.75rem]"> + <label htmlFor="name" className="text-[13px]"> Name - <span style={{ color: "red", fontSize: 13 }}> *</span> + <span className="text-[13px] text-[red]"> *</span> </label> <input type="text" @@ -237,13 +230,13 @@ const AddContact = (props) => { onChange={(e) => setName(e.target.value)} required disabled={addYourself} - className="addUserInput" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" /> </div> - <div className="form-section"> - <label htmlFor="email" style={{ fontSize: 13 }}> + <div className="mb-[0.75rem]"> + <label htmlFor="email" className="text-[13px]"> Email - <span style={{ color: "red", fontSize: 13 }}> *</span> + <span className="text-[13px] text-[red]"> *</span> </label> <input type="email" @@ -252,11 +245,11 @@ const AddContact = (props) => { onChange={(e) => setEmail(e.target.value?.toLowerCase())} required disabled={addYourself} - className="addUserInput lowercase" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs lowercase" /> </div> - <div className="form-section"> - <label htmlFor="phone" style={{ fontSize: 13 }}> + <div className="mb-[0.75rem]"> + <label htmlFor="phone" className="text-[13px]"> Phone </label> <input @@ -265,18 +258,18 @@ const AddContact = (props) => { value={phone} onChange={(e) => setPhone(e.target.value)} disabled={addYourself} - className="addUserInput" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" /> </div> - <div className="buttoncontainer"> - <button type="submit" className="submitbutton"> + <div className="mt-[1rem] flex justify-start gap-2"> + <button type="submit" className="op-btn op-btn-primary"> Submit </button> <button type="button" onClick={() => handleReset()} - className="resetbutton" + className="op-btn op-btn-secondary" > Reset </button> diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index a856dcb57..581757234 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -1474,7 +1474,7 @@ const ReportTable = (props) => { onSubmit={(e) => handleResendMail(e, item, user) } - className="w-full flex flex-col gap-2 p-3 text-black relative" + className="w-full flex flex-col gap-2 p-3 text-base-content relative" > <div className="absolute right-5 text-xs z-40"> <Tooltip @@ -1493,7 +1493,7 @@ const ReportTable = (props) => { </label> <input id="mailsubject" - className="w-full py-1.5 px-2 border-[1px] border-gray-300 rounded" + className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs" value={mail.subject} onChange={(e) => handleSubjectChange( @@ -1526,7 +1526,7 @@ const ReportTable = (props) => { </div> <button type="submit" - className="bg-[#32a3ac] w-[70px] font-semibold text-white py-2 rounded" + className="op-btn op-btn-primary" > Resend </button> diff --git a/apps/OpenSign/src/primitives/LinkUserModal.js b/apps/OpenSign/src/primitives/LinkUserModal.js index 4af32dad4..552582697 100644 --- a/apps/OpenSign/src/primitives/LinkUserModal.js +++ b/apps/OpenSign/src/primitives/LinkUserModal.js @@ -18,31 +18,7 @@ const LinkUserModal = (props) => { closePopup={props.closePopup} signersData={props?.signersData} /> - <div - style={{ - display: "flex", - alignItems: "center", - gap: 5, - margin: "0 30%", - color: "#808080" - }} - > - <span - style={{ - height: 1, - width: "100%", - backgroundColor: "#ccc" - }} - ></span> - <span>or</span> - <span - style={{ - height: 1, - width: "100%", - backgroundColor: "#ccc" - }} - ></span> - </div> + <div className="op-divider text-base-content mx-[25%] my-1">or</div> <AddContact details={props.handleAddUser} closePopup={props.closePopup} /> </ModalUi> );