diff --git a/.github/workflows/Docker.yml b/.github/workflows/Docker.yml index 79ef3aa8a..e0b26b55c 100644 --- a/.github/workflows/Docker.yml +++ b/.github/workflows/Docker.yml @@ -2,7 +2,7 @@ name: ci on: push: branches: - - 'staging' + - 'main' jobs: docker: diff --git a/apps/OpenSign/package-lock.json b/apps/OpenSign/package-lock.json index 04c9c5cb9..6db5b56cf 100644 --- a/apps/OpenSign/package-lock.json +++ b/apps/OpenSign/package-lock.json @@ -34,7 +34,6 @@ "react-gtm-module": "^2.0.11", "react-helmet": "^6.1.0", "react-konva": "^18.2.10", - "react-modal": "^3.16.1", "react-pdf": "^9.0.0", "react-quill": "^2.0.0", "react-redux": "^9.1.2", @@ -58,6 +57,7 @@ "@babel/runtime-corejs2": "^7.24.7", "autoprefixer": "^10.4.19", "commitizen": "^4.3.0", + "daisyui": "^4.12.2", "eslint": "^8.57.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.34.1", @@ -9041,6 +9041,16 @@ "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==" }, + "node_modules/css-selector-tokenizer": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.8.0.tgz", + "integrity": "sha512-Jd6Ig3/pe62/qe5SBPTN8h8LeUg/pT4lLgtavPf7updwwHpvFzxvOQBHYj2LZDMjUnBzgvIUSjRcf6oT5HzHFg==", + "dev": true, + "dependencies": { + "cssesc": "^3.0.0", + "fastparse": "^1.1.2" + } + }, "node_modules/css-to-react-native": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz", @@ -9264,6 +9274,15 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, + "node_modules/culori": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/culori/-/culori-3.3.0.tgz", + "integrity": "sha512-pHJg+jbuFsCjz9iclQBqyL3B2HLCBF71BwVNujUYEvCeQMvV97R59MNK3R2+jgJ3a1fcZgI9B3vYgz8lzr/BFQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, "node_modules/cz-conventional-changelog": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-3.3.0.tgz", @@ -9284,6 +9303,25 @@ "@commitlint/load": ">6.1.1" } }, + "node_modules/daisyui": { + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.12.2.tgz", + "integrity": "sha512-ed3EFwPRLN+9+/MYPRB1pYjk6plRCBMobfBdSeB3voAS81KdL2pCKtbwJfUUpDdOnJ0F8T6oRdVX02P6UCD0Hg==", + "dev": true, + "dependencies": { + "css-selector-tokenizer": "^0.8", + "culori": "^3", + "picocolors": "^1", + "postcss-js": "^4" + }, + "engines": { + "node": ">=16.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/daisyui" + } + }, "node_modules/damerau-levenshtein": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", @@ -10928,11 +10966,6 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/exenv": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", - "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==" - }, "node_modules/exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", @@ -11119,6 +11152,12 @@ "punycode": "^1.3.2" } }, + "node_modules/fastparse": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", + "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", + "dev": true + }, "node_modules/fastq": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", @@ -20126,24 +20165,6 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, - "node_modules/react-modal": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz", - "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==", - "dependencies": { - "exenv": "^1.2.0", - "prop-types": "^15.7.2", - "react-lifecycles-compat": "^3.0.0", - "warning": "^4.0.3" - }, - "engines": { - "node": ">=8" - }, - "peerDependencies": { - "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18", - "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18" - } - }, "node_modules/react-native-crypto-js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/react-native-crypto-js/-/react-native-crypto-js-1.0.0.tgz", diff --git a/apps/OpenSign/package.json b/apps/OpenSign/package.json index 247198c26..c8ab8f436 100644 --- a/apps/OpenSign/package.json +++ b/apps/OpenSign/package.json @@ -29,7 +29,6 @@ "react-gtm-module": "^2.0.11", "react-helmet": "^6.1.0", "react-konva": "^18.2.10", - "react-modal": "^3.16.1", "react-pdf": "^9.0.0", "react-quill": "^2.0.0", "react-redux": "^9.1.2", @@ -88,6 +87,7 @@ "@babel/runtime-corejs2": "^7.24.7", "autoprefixer": "^10.4.19", "commitizen": "^4.3.0", + "daisyui": "^4.12.2", "eslint": "^8.57.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.34.1", diff --git a/apps/OpenSign/public/index.html b/apps/OpenSign/public/index.html index 91204d310..2559267fc 100644 --- a/apps/OpenSign/public/index.html +++ b/apps/OpenSign/public/index.html @@ -1,5 +1,5 @@ - + @@ -50,4 +50,4 @@ --> - + \ No newline at end of file diff --git a/apps/OpenSign/public/version.txt b/apps/OpenSign/public/version.txt index 652405d34..f07060562 100644 Binary files a/apps/OpenSign/public/version.txt and b/apps/OpenSign/public/version.txt differ diff --git a/apps/OpenSign/src/App.js b/apps/OpenSign/src/App.js index 66ad17926..452f9a061 100644 --- a/apps/OpenSign/src/App.js +++ b/apps/OpenSign/src/App.js @@ -17,6 +17,7 @@ import PdfRequestFiles from "./pages/PdfRequestFiles"; import LazyPage from "./primitives/LazyPage"; import { isEnableSubscription } from "./constant/const"; import SSOVerify from "./pages/SSOVerify"; +import Loader from "./primitives/Loader"; const DebugPdf = lazy(() => import("./pages/DebugPdf")); const ForgetPassword = lazy(() => import("./pages/ForgetPassword")); const GuestLogin = lazy(() => import("./pages/GuestLogin")); @@ -34,23 +35,10 @@ pdfjs.GlobalWorkerOptions.workerSrc = new URL( "pdfjs-dist/legacy/build/pdf.worker.min.mjs", import.meta.url ).toString(); -const Loader = () => { +const AppLoader = () => { return ( -
-
+
+
); }; @@ -79,9 +67,9 @@ function App() { }; return ( -
+
{isloading ? ( - + ) : ( diff --git a/apps/OpenSign/src/assets/gif/mail_sent.gif b/apps/OpenSign/src/assets/gif/mail_sent.gif new file mode 100644 index 000000000..20e21daa2 Binary files /dev/null and b/apps/OpenSign/src/assets/gif/mail_sent.gif differ diff --git a/apps/OpenSign/src/assets/images/loader2.gif b/apps/OpenSign/src/assets/images/loader2.gif deleted file mode 100644 index a32521144..000000000 Binary files a/apps/OpenSign/src/assets/images/loader2.gif and /dev/null differ diff --git a/apps/OpenSign/src/components/AddSigner.js b/apps/OpenSign/src/components/AddSigner.js index c99eff406..f5143eb93 100644 --- a/apps/OpenSign/src/components/AddSigner.js +++ b/apps/OpenSign/src/components/AddSigner.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from "react"; import Parse from "parse"; import axios from "axios"; -import { modalCancelBtnColor, modalSubmitBtnColor } from "../constant/const"; +import Loader from "../primitives/Loader"; const AddSigner = (props) => { const [name, setName] = useState(""); @@ -227,38 +227,29 @@ const AddSigner = (props) => {
{isLoader && (
-
+
)} -
+
{isUserExist && ( -
+
-
)}
-
-
-
- -
- diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.js index 8d40db895..088e9e786 100644 --- a/apps/OpenSign/src/components/AddUser.js +++ b/apps/OpenSign/src/components/AddUser.js @@ -3,6 +3,7 @@ import Parse from "parse"; import axios from "axios"; import Title from "./Title"; import Alert from "../primitives/Alert"; +import Loader from "../primitives/Loader"; const AddUser = (props) => { const [name, setName] = useState(""); @@ -195,13 +196,7 @@ const AddUser = (props) => { {isUserExist && User already exists!} {isLoader && (
-
+
)}
@@ -213,7 +208,7 @@ const AddUser = (props) => { className="block text-xs text-gray-700 font-semibold" > Name - * + * { 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" />
@@ -230,7 +225,7 @@ const AddUser = (props) => { className="block text-xs text-gray-700 font-semibold" > Email - * + * { 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" />
@@ -247,7 +242,7 @@ const AddUser = (props) => { className="block text-xs text-gray-700 font-semibold" > Phone - * + * { 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/BulkSendUi.js b/apps/OpenSign/src/components/BulkSendUi.js index 6e4aa5e76..020ab54fb 100644 --- a/apps/OpenSign/src/components/BulkSendUi.js +++ b/apps/OpenSign/src/components/BulkSendUi.js @@ -1,6 +1,7 @@ import React, { useState, useEffect, useRef } from "react"; import axios from "axios"; import SuggestionInput from "./shared/fields/SuggestionInput"; +import Loader from "../primitives/Loader"; const BulkSendUi = (props) => { const [forms, setForms] = useState([]); @@ -170,14 +171,8 @@ const BulkSendUi = (props) => { return ( <> {isSubmit && ( -
-
+
+
)} {props.Placeholders?.length > 0 ? ( @@ -185,14 +180,14 @@ const BulkSendUi = (props) => { <> {props.Placeholders?.some((x) => !x.signerObjId) ? ( -
+
{forms?.map((form, index) => (
{form?.fields?.map((field, fieldIndex) => ( -
+
{ {forms?.length > 1 && ( @@ -220,13 +215,13 @@ const BulkSendUi = (props) => {
-
+
+
+ +
+
{ />
-
+
{!isSubscribe && (
)} {isPro && ( -
+
PRO
)} @@ -140,60 +143,66 @@ const Header = ({ showSidebar }) => {
)} {width >= 768 && ( -
+
{username && username}
)} -
-
- +
+
+
-
-
    -
  • openInNewTab("https://docs.opensignlabs.com")} - > +
  • openInNewTab("https://docs.opensignlabs.com")}> + Docs -
    • -
  • { - setIsOpen(false); - navigate("/profile"); - }} - > + +
    • +
  • { + setIsOpen(false); + navigate("/profile"); + }} + > + Profile -
    • -
  • { - setIsOpen(false); - navigate("/changepassword"); - }} - > + +
    • +
  • { + setIsOpen(false); + navigate("/changepassword"); + }} + > + Change Password -
    • -
  • { - window.open("https://console.opensignlabs.com/"); - }} - > + +
    • +
  • { + window.open("https://console.opensignlabs.com/"); + }} + > + Console -
    • -
  • + +
    • +
  • + Log Out -
    • -
-
+ + +
diff --git a/apps/OpenSign/src/components/LoginFacebook.js b/apps/OpenSign/src/components/LoginFacebook.js index f9ca16a30..7b3e2aa92 100644 --- a/apps/OpenSign/src/components/LoginFacebook.js +++ b/apps/OpenSign/src/components/LoginFacebook.js @@ -1,5 +1,6 @@ import React, { useState } from "react"; import Parse from "parse"; +import Loader from "../primitives/Loader"; // import FacebookLogin from "react-facebook-login"; const LoginFacebook = ({ @@ -112,29 +113,10 @@ const LoginFacebook = ({ } }; return ( -
+
{thirdpartyLoader && ( -
-
+
+
)} {/* */} {isModal && (