From 0fbe6aeb6cce3d6371f5013dc645d7858b19644a Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Tue, 4 Jun 2024 19:38:41 +0530 Subject: [PATCH 01/23] feat: implement dasyui in header, footer & report --- apps/OpenSign/package-lock.json | 45 +++ apps/OpenSign/package.json | 1 + apps/OpenSign/public/index.html | 4 +- apps/OpenSign/src/components/Footer.js | 16 +- apps/OpenSign/src/components/Header.js | 114 +++--- .../components/shared/fields/SignersInput.js | 15 +- .../src/components/sidebar/Sidebar.js | 4 +- apps/OpenSign/src/index.css | 17 +- apps/OpenSign/src/pages/Form.js | 48 ++- .../src/primitives/GetReportDisplay.js | 349 +++++++++--------- apps/OpenSign/tailwind.config.js | 6 +- 11 files changed, 350 insertions(+), 269 deletions(-) diff --git a/apps/OpenSign/package-lock.json b/apps/OpenSign/package-lock.json index 94f9c1c8c..b93585b6f 100644 --- a/apps/OpenSign/package-lock.json +++ b/apps/OpenSign/package-lock.json @@ -58,6 +58,7 @@ "@babel/runtime-corejs2": "^7.24.6", "autoprefixer": "^10.4.19", "commitizen": "^4.3.0", + "daisyui": "^4.11.1", "eslint": "^8.57.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.34.1", @@ -9041,6 +9042,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 +9275,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 +9304,25 @@ "@commitlint/load": ">6.1.1" } }, + "node_modules/daisyui": { + "version": "4.11.1", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.11.1.tgz", + "integrity": "sha512-obT9CUbQdW6eoHwSeT5VwaRrWlwrM4OT5qlfdJ0oQlSIEYhwnEl2+L2fwu5PioLbitwuMdYC2X8I1cyy8Pf6LQ==", + "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", @@ -11119,6 +11158,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", diff --git a/apps/OpenSign/package.json b/apps/OpenSign/package.json index 91ee1589d..dd8666c98 100644 --- a/apps/OpenSign/package.json +++ b/apps/OpenSign/package.json @@ -88,6 +88,7 @@ "@babel/runtime-corejs2": "^7.24.6", "autoprefixer": "^10.4.19", "commitizen": "^4.3.0", + "daisyui": "^4.11.1", "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..59e427774 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/src/components/Footer.js b/apps/OpenSign/src/components/Footer.js index 31753698c..56373cebd 100644 --- a/apps/OpenSign/src/components/Footer.js +++ b/apps/OpenSign/src/components/Footer.js @@ -45,12 +45,16 @@ const Footer = () => { }; return ( <> -
- All Rights Reserved © {new Date().getFullYear()}   - - {appName} ( version: {version ? version : `${Package.version} `}) - -
+ -
+
+
+ +
+
{ />
-
+
{!isSubscribe && (
)} -
-
- +
+
+
+ +
-
-
    -
  • 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/shared/fields/SignersInput.js b/apps/OpenSign/src/components/shared/fields/SignersInput.js index 97d77e3fa..835a81db8 100644 --- a/apps/OpenSign/src/components/shared/fields/SignersInput.js +++ b/apps/OpenSign/src/components/shared/fields/SignersInput.js @@ -111,7 +111,9 @@ const SignersInput = (props) => { @@ -133,16 +135,7 @@ const SignersInput = (props) => { setIsModel(true); openModal(); }} - style={{ - cursor: "pointer", - borderRadius: 4, - border: "1px solid #ccc", - minHeight: 38, - minWidth: 48, - display: "flex", - justifyContent: "center", - alignItems: "center" - }} + className="cursor-pointer rounded border-[1px] border-[#ccc] min-h-[38px] min-w-[48px] flex justify-center items-center" >
diff --git a/apps/OpenSign/src/components/sidebar/Sidebar.js b/apps/OpenSign/src/components/sidebar/Sidebar.js index 766ed00dc..31b2a4124 100644 --- a/apps/OpenSign/src/components/sidebar/Sidebar.js +++ b/apps/OpenSign/src/components/sidebar/Sidebar.js @@ -35,8 +35,8 @@ const Sidebar = ({ isOpen, closeSidebar }) => { return (