Merge pull request #506 from OpenSignLabs/api_signembed

fix: handle uncaught error in createdocument and createmplate API
2026-09-03 16:28:56 +02:00 · 2024-03-19 13:24:05 +05:30 · 2024-03-19 13:23:10 +05:30 · 2024-03-19 13:12:46 +05:30 · 2024-03-19 13:11:23 +05:30 · 2024-03-19 12:01:08 +05:30
284 changed files with 37366 additions and 46363 deletions
@@ -169,6 +169,42 @@
      "contributions": [
        "bug"
      ]
+    },
+    {
+      "login": "lsprr",
+      "name": "Luis Parra",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16653744?v=4",
+      "profile": "https://luisparra.dev",
+      "contributions": [
+        "a11y"
+      ]
+    },
+    {
+      "login": "Govinda04",
+      "name": "Govinda Kocharekar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/50038172?v=4",
+      "profile": "https://github.com/Govinda04",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "crediblebilal",
+      "name": "Bilal Ahmad Bhat",
+      "avatar_url": "https://avatars.githubusercontent.com/u/55330484?v=4",
+      "profile": "https://bilal.cc",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "VikramNagwal",
+      "name": "Vikram",
+      "avatar_url": "https://avatars.githubusercontent.com/u/123088024?v=4",
+      "profile": "https://github.com/VikramNagwal",
+      "contributions": [
+        "code"
+      ]
    }
  ]
 }
@@ -1,6 +1,5 @@
 # Frontend config ************************************************************************************************************************************************************************************************
-# Set CI to false while running the app locally
-CI=false
+
 # Set it to the URL form where the app home page will be accessed
 PUBLIC_URL=https://app.opensignlabs.com/
 # Set it to true if you want to generate the Sourcemap for debugging
@@ -8,13 +7,13 @@ GENERATE_SOURCEMAP=false
 # Set it to the URL from where APIs will be accessible, for local development it should be localhost:3000/api/app (use your local port number instead)
 REACT_APP_SERVERURL=https://app.opensignlabs.com/api/app
 # A 12 character long random app identifier. The value of this should be same as APP_ID which is a variable used by backend API.
-REACT_APP_APPID=aDsADsqweqwe
+REACT_APP_APPID=opensign
 # Google tag manager container id for configuring GTM on all pages of the app
 REACT_APP_GTM=GTM-123N7LD

 # Backend ExpressJS config ****************************************************************************************************************************************************************************************
 # A 12 character long random app identifier. The value of this should be same as REACT_APP_APPID which is a variable used by Frontend React App.
-APP_ID=aDsADsqweqwe
+APP_ID=opensign
 # Name of the app. It will be visible in the verification emails sent out.
 appName=open_sign_server
 # A 12 character long random secret key that allows access to all the data. It is used in Parse dashboard config to view all the data in the database. 
@@ -39,11 +38,21 @@ DO_ACCESS_KEY_ID=
 DO_SECRET_ACCESS_KEY=
 # Digital ocean spaces region or AWS s3 region
 DO_REGION=us-west
+# Set this to true id you are using local storage instead of s3 compatible storage
+# USE_LOCAL=TRUE

-# Email mailgun config (The app will not initialize if any of these 3 variables are not set) *********************************************************************************************************************
-MAILGUN_API_KEY=
+# Email mailgun or set SMTP_ENABLE true to use SMTP config (The app will not initialize if any of these 3 variables are not set) *********************************************************************************************************************
+MAILGUN_API_KEY=XXXXX
 MAILGUN_DOMAIN=mail.yourdomain.com
 MAILGUN_SENDER=postmaster@mail.yourdomain.com
+SMTP_ENABLE=
+SMTP_HOST=
+SMTP_PORT=
+SMTP_USER_EMAIL=
+SMTP_PASS=

 # Base64 encoded PFX or p12 document signing certificate file *********************************************************************************************************************
 PFX_BASE64=
+
+# Provide Pass pharse of above PFX or p12 document
+PASS_PHRASE= 
@@ -2,8 +2,6 @@
 # When used as it is, this env config will connect to our hosted UAT backend
 # Note that any data in staging will get cleared from time to time and you may have to sign up again and again

-# Set CI to false while running the app locally
-CI=false
 # Set it to the URL form where the app home page will be accessed
 PUBLIC_URL=http://localhost:3000
 # Set it to true if you want to generate the Sourcemap for debugging
@@ -11,4 +9,4 @@ GENERATE_SOURCEMAP=false
 # Set it to the URL from where APIs will be accessible, for local development it should be localhost:3000/api/app (use your local port number instead)
 REACT_APP_SERVERURL=https://staging-app.opensignlabs.com/api/app
 # A 12 character long random app identifier. The value of this should be same as APP_ID which is a variable used by backend API.
-REACT_APP_APPID=opensignstgn
+REACT_APP_APPID=opensign
@@ -2,8 +2,6 @@
 # When used as it is, this env config will connect to our hosted UAT backend
 # Note that any data in staging will get cleared from time to time and you may have to sign up again and again

-# Set CI to false while running the app locally
-CI=false
 # Set it to the URL form where the app home page will be accessed
 PUBLIC_URL=http://localhost:3000
 # Set it to true if you want to generate the Sourcemap for debugging
@@ -11,18 +9,18 @@ GENERATE_SOURCEMAP=false
 # Set it to the URL from where APIs will be accessible, for local development it should be localhost:3000/api/app (use your local port number instead)
 REACT_APP_SERVERURL=http://localhost:8080/app
 # A 12 character long random app identifier. The value of this should be same as APP_ID which is a variable used by backend API.
-REACT_APP_APPID=opensignstgn
+REACT_APP_APPID=opensign


 # Backend ExpressJS config ****************************************************************************************************************************************************************************************
 # A 12 character long random app identifier. The value of this should be same as REACT_APP_APPID which is a variable used by Frontend React App.
-APP_ID=opensignstgn
+APP_ID=opensign
 # Name of the app. It will be visible in the verification emails sent out.
 appName=open_sign_server
 # A 12 character long random secret key that allows access to all the data. It is used in Parse dashboard config to view all the data in the database.
 MASTER_KEY=XnAadwKxxByMr
 # Mongodb URI to connect to
-MONGODB_URI=mongodb://host.docker.internal:27017/OpenSignDB
+MONGODB_URI=mongodb://localhost:27017/OpenSignDB
 # Path on which APIs should be mounted. Do not change this. This variable shall be removed & value hardcoded in the source code in coming versions.
 PARSE_MOUNT=/app
 # Set it to the URL from where APIs will be accessible to the NodeJS functions, for local development it should be localhost:3000/api/app (use your local port number instead)
@@ -44,10 +42,72 @@ DO_REGION=us-west
 # local storage
 USE_LOCAL=TRUE

-# Email mailgun config (The app will not initialize if any of these 3 variables are not set) *********************************************************************************************************************
-MAILGUN_API_KEY=XXXXX
+# Email mailgun or set SMTP_ENABLE true to use SMTP config (The app will not initialize if any of these 3 variables are not set) *********************************************************************************************************************
+MAILGUN_API_KEY=
 MAILGUN_DOMAIN=mail.yourdomain.com
 MAILGUN_SENDER=postmaster@mail.yourdomain.com
+SMTP_ENABLE=
+SMTP_HOST=smtp.yourhost.com
+SMTP_PORT=443
+SMTP_USER_EMAIL=mailer@yourdomain.com
+SMTP_PASS=password   # if your password includes spaces then write password in single quotes ('asdf pasd asdf bgds'). 
+

 # Base64 encoded PFX or p12 document signing certificate file *********************************************************************************************************************
-PFX_BASE64=
+PFX_BASE64='MIIKCQIBAzCCCc8GCSqGSIb3DQEHAaCCCcAEggm8MIIJuDCCBG8GCSqGSIb3DQEH
+BqCCBGAwggRcAgEAMIIEVQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIpumu
+bFabBWACAggAgIIEKDqHS7Icd5MzIBk1dBokGK2s+5a2fA4308WA1QzEWmczqVYI
+z6lYmW8qsiZIw4PFkRzdIx1+zCmP8jgWiiqh5RKnbHYmh1JPNyx9SqmUDILDXmjg
+KxO9agRw9LXge4hgRL7YW0TxYZYw4EeXV9Yr7kcOq9DoO2MoRikJ+2Tuvvq/hfuV
+9zFHsz4jpf7W95k1IeH6bZ92klz5R1e/EK8JuHy592i/u+BxxW1vTkiPpTaHD6s9
+1lDSkT1j0LIDU6l9gVvJvFBV8j88vet/Z4QkTbHPMYvBnKNRstKuOvDasEJE4RkA
+PV4TfBwFF6uvREZI1vBboM/18pzeyjoRX+mlJNfcH3kh1tkck+Jg+M2bLXAH1EdD
+GRwENvnTNW1CFIn37VVja7SFBQNXA+E6rejmqtUmZ5XktSINDBUyjow9XuYTUtI/
+sgcRSC0aB0EKKpphbFPp1niKCLm1ef33e+bWyWbtR2L2Kc3ETmhjNADpyapAGmzc
+LP2BafGaKj18KiLAG4GL6+kXk0GUz7Fw5q8H8RY1T33o+xjWvC0+aJgvr65qWdKw
+ug6wuu4Cr2kFEuXxPKsnYqmE5NT/x+lfunlZ5iEQN3w2XO5J2u2eMXVRUsPH2T6
+0sJKomjY0RB1JsqZBnyleWm+tYo0RpVAyJ3NGBp9dVb7a3Qw6jNZBG/xMW+gvtUJ
+q6hfK/cD3cagD0NQFVD5STMOuGOSqq/bbwAKjZ/lrPmCCYATKwkjAFybYfHJVrrW
+Y2tQgCQ/zrZLIxQjp7F17hU0+gT54x0MpF6AoqIM/qqNnHrQ0fi50ECmLvx3SqYa
+nvjvt/HZhMZfqRXiXjeicIwpnNoG7+uQknySk+7cc9GNhHZR7cfPfkTpgvuuebrQ
+l5YW+k9tG+xrX8g72nvtFMnammlBixlFwECJaEszEQk5tc2ti8uG2z+kGnFoDoBV
+M6ZVMpKDJzXPxLdzT6ChIPyatjIkqOKe6vDpnmzcoEhbBhmtkVjWFA2dfX846ugV
+y1QiecWgk8pMNWhh3IDd05v/wzbFwNcq+Gi+1dZsPmFH+egIcrQKZu2r3jCJtGHh
+DNG/nyf/anqvKXF90bi4hRT3vdDXXuWgY7EUwfn9h5jYabCO6HsQxQOBjFYNmBrh
+MfaiBZe72E8fzNAfIlwDcJ4AWY1SOM7hi8bqfRWw1NtNxuMUiRFoR31O6XkQauye
+9hAmpdlZHZXtJ6LM0QaWkPJmG3058GMtIn/qS60V9nINh+zXhwza/1pnFB+e9MWc
+hAPgo0nn55FusM//g1nM31PKe+nOm3Jyp0nEQ4m8aDtJS63o2fvp3e2KJbPWQMHE
+a83W975diWg4NTdevV9lFpNllHclVoPoavUHIzHd7HF9TcPpjbXJSUZ7cITHHefr
+kQTa/2G9cWuRhN9GKIHBdr13nfEvMIIFQQYJKoZIhvcNAQcBoIIFMgSCBS4wggUq
+MIIFJgYLKoZIhvcNAQwKAQKgggTuMIIE6jAcBgoqhkiG9w0BDAEDMA4ECDgnjfOf
+AjArAgIIAASCBMgkbVuptroBdyMY5gl/eBQj5+iAV02YSaF969ihStLSWI4x5FAf
+HuDgqCyEMSl4RHG8ZvNaO9JoNfIpMK/TPQBoQRCzE2Vjf66VTERaQtU6h7tZrbQt
+K96n9eqvohm/vXbXe08fsodYp2s79kAvKgpuGG5iX77qYVzJHBPed87cvczo4ToP
+CpurDpByt8fGEmjtcikal8o+H9uoHjcFwqMigX1Q7IEjuKXrb5e6wTvxMRob8yfv
+LVl6ahteKSkWCMb6rLZ5f12jDoCGX/YXRrSsU9t/lXe0Nxv5i7c8flb2EsNtwygD
+fexVvn5u6ble6RDYNpuQkPgF41HyZh+JvGAF6i1r4tJPL9Pf4HnjEB8Y8IHgon+w
+T5I+8LTgcrWyhptzblXMjKySTEp9OEa2cCVwZkl4z43PWJ5oIAQ2IDTOQ603/5o/
+d9KA76/zMPQ5O0gv17OA7kwFv98v6sTcR4vgkQZqnyDpJSEPHyNxhw2MSBqS3jq3
+YPhRz+3Ei1oFp9uYFhzn39f9gzNi++X9pOjSrDb8v3mcDXZKNrxQLuoRMSf0eQNI
+dgJRqj/fuqNZ5ac3kd4P5BALCsnA1tM27zYrgUdpOnrc2D9FBthEjpRlQKMMzhQf
+cNMFWmoNjakDilvvLcsQeQ3P6cXbN1ODoNnjgK3VzcmeKyzW2PrTXEPHARUM3j4V
+sZzGaUOVKLqaaDrXWQKC0vrTvxP2WMfjQ1dTdXQP/kSZTXRC5rtB9tky38flBor0
+N9rhUDIGMs5qBvyrkV2hKXiW39G69p1KWY+Cw28AzY+CNSjePRi60TsnUxgcOS7i
+0AT25Gx3A4YqxmTY38MPB4wPcBPcw4hjNoQamaC9mqs+KVHcP5YHUlqykMeH0YVi
+J+ehytJE9xuDcfBOjxjadxp3/q/Lku4rky89gdJGFQWuuz75VulDywPRZRwmQTel
+sjEGMHR1zTOlPJdTDWhqaKmWvL4GhbCgEPIKwmqd1QKRTl/3Baa1nYllJeYVwiTT
+qLCkbA6qXrLGj1ENZxrKn9yqr8HwOoApjwhARu4LF/BRMgdkzelK2kOXHnZ26sZ2
+NY/MMtVmq4c59y6iQwmsbHr9tWGz3ahyXcZZufjNXU/AVnO1c92g7umAWZF4RohL
+gMmh57cAhN9PEbEv6j/6BT3XXp8jB0ywcRriYxfxwidviCKH/76Q4sytYJQaDFI1
+fnzmv0aDotbG2BdpWSiYPDOPm+3cmfjlULsn1FYWL4NDCX1f+C4lNtKVX9LU8c5M
+m8dA1DUlDfnuNO5/BShuoGXG2z4O/XwxIaRFizMxWS2sWurbAEFJ6oNw3kC7WSah
+NIe8aUC1umpc1Gk3X2f4Ytzj9OEqn0y55qoqLINJuejXMffF/gjopxHWadLVaVaj
+Q1SewrECuEXdSbBR/a10po24wmRtkmlvRJXJl7sG95xE5ZCqp+m6sRPWGdf1yKbV
+vyWNUe4Qvkxe4a0VAJpTyIGr980CKz/jkvtNQMobGl7AfhxKJ450wg454WcexMct
+BYXvZMSdUDCgMLlh0nHJHl5btrFWqE0Z/fqWmIknZL2jZ4J+2hdVl/xB/sUt6kcu
+txw+RfL+vNE8PxhTNaOdJFwD8yeN1mJ3yMUA8HHYpw9yljgxJTAjBgkqhkiG9w0B
+CRUxFgQUDYlgGVxSxuOknhQc256x3++7BDwwMTAhMAkGBSsOAwIaBQAEFFjASdYl
+3pXAXxZuvVvv9tsb4bdrBAhyb+KCIjp/gAICCAA='
+
+# Provide Pass pharse of above PFX or p12 document
+PASS_PHRASE=opensign 
@@ -0,0 +1,73 @@
+name: "Bug Report"
+labels: ["bug","up-for-grabs"]
+title: "[Bug]: "
+assignees:
+  - andrew-opensignlabs
+description: Create a bug report to help us make OpenSign™ the world's best document e-signature platform
+body:
+  - type: textarea
+    attributes:
+      label: Issue Description
+      description: Please provide a clear & concise description of the problem. 
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: Describe what you expected to happen.
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: Describe what is happening instead.
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Please provide step-by-step instructions to reproduce the issue. Include code snippets, URLs, error messages and any other relevant information.
+  - type: textarea
+    attributes:
+      label: Screenshots of the issue(optional)
+      description: Add screenshots to better explain the issue.
+  - type: input
+    attributes:
+      label: Operating System [e.g. MacOS Sonoma 14.1, Windows 11]
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browsers are you seeing the problem on?
+      multiple: true
+      options:
+        - Chrome
+        - Firefox
+        - Safari
+        - Microsoft Edge
+      default: 0
+  - type: input
+    attributes:
+      label: What version of OpenSign™ are you seeing this issue on? [e.g. 1.0.6]
+    validations:
+      required: true
+  - type: dropdown
+    id: environment
+    attributes:
+      label: What environment are you seeing the problem on?
+      multiple: true
+      options:
+        - Production (app.opensignlabs.com)
+        - Staging (staging-app.opensignlabs.com)
+        - Hosted (app.yourdomain.com)
+        - Dev (localhost or vercel)
+  - type: checkboxes
+    attributes:
+      label: Please check the boxes that apply to this issue report.
+      options:
+        - label: I have searched the existing issues & discussions to make sure that this is not a duplicate.
+    validations:
+      required: true
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://www.opensignlabs.com)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
+        - label: I have searched the existing issues & discussions to make sure that this is not a duplicate.
+          required: true
@@ -0,0 +1,70 @@
+name: Feature Request
+description: Suggest an idea for OpenSign™
+title: "Feature Request: [Short Description]"
+labels: [feature request, needs triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Thanks for taking the time to fill out this feature request!
+
+  - type: input
+    id: title
+    attributes:
+      label: Feature Title
+      description: What would you call this feature?
+      placeholder: e.g., Advanced Signature Verification
+    validations:
+      required: true
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Feature Description
+      description: |
+        Please provide a detailed description of the feature you're proposing.
+      placeholder: |
+        e.g., I'm proposing an advanced signature verification feature that...
+    validations:
+      required: true  
+  - type: dropdown
+    id: featuretype
+    attributes:
+      label: What type of feature are you requesting?
+      multiple: true
+      options:
+        - UI/UX Improvement
+        - Security / Compliance
+        - Performance / Optimization
+        - 3rd party integration
+        - Other
+  - type: dropdown
+    id: importance
+    attributes:
+      label: Importance
+      description: How important is this feature to you?
+      options:
+        - Critical
+        - High
+        - Medium
+        - Low
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Any other context or screenshots about the feature request here.
+      placeholder: Additional details, examples, or screenshots...
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://www.opensignlabs.com)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
+        - label: I have searched the existing issues & discussions to make sure that this is not a duplicate.
+          required: true
@@ -0,0 +1,22 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # maintain dependencies for frontend
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/apps/OpenSign" # Location of package manifests
+    schedule:
+      interval: "weekly"
+  # maintain dependencies for server
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/apps/OpenSignServer" # Location of package manifests
+    schedule:
+      interval: "weekly"
+  # maintain dependencies for microfrontends
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "microfrontends/SignDocuments" # Location of package manifests
+    schedule:
+      interval: "weekly"
@@ -2,7 +2,7 @@ name: ci
 on:
  push:
    branches:
-      - 'main'
+      - 'staging'

 jobs:
  docker:
@@ -11,9 +11,9 @@ jobs:
      matrix:
        include:
          - image: amolshejole/OpenSign
-            dockerfile: apps/OpenSign/Dockerfile
+            dockerfile: apps/OpenSign/Dockerhubfile
          - image: amolshejole/OpenSignServer
-            dockerfile: apps/OpenSignServer/Dockerfile
+            dockerfile: apps/OpenSignServer/Dockerhubfile
    steps:
      -
        name: Checkout
@@ -31,8 +31,11 @@ jobs:
        with:
          images: ${{ matrix.image }}
      -
-        name: Debug - List files
+        name: Debug - List files opensign
        run: ls -R apps/OpenSign/  # Adjust the path as needed
+      -
+        name: Debug - List files opensignserver
+        run: ls -R apps/OpenSignServer/  # Adjust the path as needed  
      -
        name: Build and push
        uses: docker/build-push-action@v4
@@ -22,3 +22,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+apps/OpenSign/public/mfbuild/*
+microfrontends/SignDocuments/build/*
+apps/OpenSignServer/files/files/*
@@ -1,5 +1,4 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"

-npx eslint '**/*.{js,jsx}'
-npx pretty-quick --staged '**/*.{js,jsx}'
+npm run lint-staged-changes
@@ -0,0 +1,3 @@
+{
+  "*.js": "prettier --write"
+}
@@ -1,92 +1,29 @@

-# INSTALLATON INSTRUCTIONS
+# INSTALLATON INSTRUCTIONS HAS A NEW HOME

-You can use our app as a cloud version from [OpenSignLabs](https://www.opensignlabs.com)
+We've updated our installation instructions and moved them to our dedicated documentation portal to provide you with a better experience and updated guidance. Whether you're looking to self-host OpenSign™ or contribute to its development, you can find detailed instructions tailored to your needs at [docs.opensignlabs.com](https://docs.opensignlabs.com).

-or follow below instructions to install it on your own infrastructure.
+## Self Hosting

- Localhost(Frontend only)
- Digital Ocean
- Localhost(Docker)
+If you're interested in self-hosting OpenSign™, our new documentation portal provides comprehensive, step-by-step instructions to help you set up OpenSign™ in your own environment. This section is designed for system administrators and those looking to deploy OpenSign™ within their organization or for personal use.

-## Localhost(Frontend only)
+- **Access Self Hosting Instructions:** [Self Hosting Guide](https://docs.opensignlabs.com/docs/category/docker)

-This is the easiest way to run the frontend application for development or testing purpose without the hassle of installing backend & DB. All the features including document upload, signing, email notifications will work seamlessly from staging backend.
+## Contributors

-**Warning:** All data, including user accounts and documents, is stored in the staging backend. This data will be erased every time there is a merge to the main branch. As a result, you may need to recreate user accounts repeatedly. If you find that login attempts are failing, it is likely because the data has been cleared due to a recent merge.
+For developers and contributors who are looking to build upon or contribute to OpenSign™, we've prepared a separate section that covers the setup, development environment configuration, and guidelines for contributing to the OpenSign™ project.

-Below are the steps to follow -
- [Clone the repository](https://help.github.com/articles/cloning-a-repository/) to your local machine using below command -
-  ```
-  git clone https://github.com/OpenSignLabs/OpenSign.git
-  ```
- Copy the .env.frontend_dev file to  apps/OpenSign/.env using below command(on mac & linux). For windows use COPY command instead.
-  ```
-  cp .env.frontend_dev apps/OpenSign/.env
-  ```
- CD to /apps/OpenSign directory
- Install NPM packages using
-  ```
-  npm install
-  ```
- Run the project locally using
-  ```
-  npm run start
-  ```
-You should be able to access the application from http://localhost:3000 after this.
-Create an account by signing-up and start contributing.
+- **Access Contributor Instructions:** [Contributors Guide](https://docs.opensignlabs.com/docs/contribute/INSTALLATION)

+## Additional Resources

-## Digital Ocean
+Should you need further assistance or have any questions, please feel free to reach out to us through our support channels:

-OpenSign application consistes of 3 components -
- ReactJS frontend
- NodeJS API
- MongoDB database
+- **Twitter:** [OpenSignHQ on Twitter](https://twitter.com/OpenSignHQ)
+- **Facebook:** [OpenSign on Facebook](https://www.facebook.com/profile.php?id=61551030403669)
+- **LinkedIn:** [OpenSign™ on LinkedIn](https://www.linkedin.com/company/opensign%E2%84%A2/)
+- **Discord:** [Join our Discord Community](https://discord.com/invite/opensign)
+- **YouTube:** [OpenSignHQ on YouTube](https://www.youtube.com/@opensignhq)

-You can install all 3 components on digital ocean using the button below -
+We are committed to providing you with the support you need to successfully install and use OpenSign™. Visit our website at [www.opensignlabs.com](https://www.opensignlabs.com) for more information about our project and its features.

-[![Deploy on DigitalOcean](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/OpenSignLabs/Deploy-OpenSign-to-Digital-Ocean/tree/main&refcode=30db1c901ab0)
-
-## You will need to create an AWS S3 bucket or digital ocean space in order to store your uploaded documents
-
-### AWS S3 -
- Step 1 : Create a S3 bucket
-  - Login to AWS console
-  - Navigate to S3 under services
-  - Hit "Create Bucket" button on upper right corner
-  - Remove the check from "block all public access" checkbox(we need this in order to provide access to not-logged in users after OTP verification)
-  - Set bucket versioning and tags as per your requirements
-  - Hit "Create bucket" button
- Step 2 : Create IAM user and provide access to AWS bucket
-  - Search for "IAM" on the search bar in AWS console
-  - On IAM dashboard, click the number of users(count) under IAM resources table
-  - Hit "create user" button on the upper right corner of the page
-  - Enter the user name & click next
-  - Click create policy, search for S3 and provide the Read, Write & list permissions
-  - Click next and click "Create user"
- - Step 3 : Generate Credentials
-  - Go to IAM/Users in AWS console
-  - Hit the hyperlink for the user created in the previous step
-  - Click the "Security credentials" tab
-  - Scroll down to "Access keys" and hit "Create access key"
-  - In the next step select "Application running outside AWS"
-  - Add a description tag if needed & hit "Create access key"
-  - In the next step you will see "Access key" and "Secret Access key". Copy both the values.
-  - Set the value of "Access key" to "DO_ACCESS_KEY_ID" environment variable
-  - Set the value of "Secret Access key" to "DO_SECRET_ACCESS_KEY" environment variable
- Step 3 : Copy bucket credentials
-  - Visit "Amazon S3 -> Buckets" in aws console
-  - Click the bucket created in previous steps & visit the properties tab
-  - Under "Bucket overview" you will find the value of AWS region(for ex. ap-south-1). Set that value to env variable "DO_REGION"
-  - You can create the value for "DO_ENDPOINT" env variable by appending the region value to amazonaws.com (for ex. s3.ap-south-1.amazonaws.com)
-  - You can create the value for "DO_BASEURL" by adding the bucketname in front of the endpoint value(for ex. https://bucketname.s3.ap-south-1.amazonaws.com)
-
- Visit below link if you face any issues while following the above instructions -
-  - https://repost.aws/knowledge-center/create-access-key
-
-
-## Localhost(Docker)
-
-Below are the steps to follow -
- Execute `make build`
@@ -1,3 +1,8 @@
 build:
+	cp .env.local_dev .env
+	cd apps/OpenSign && npm install && npm run build
+	docker compose up --build --force-recreate
+
+run:
 	cp .env.local_dev .env
 	docker compose up -d
@@ -1,8 +1,7 @@
-<h1 align="center"><a href='https://www.opensignlabs.com'>OpenSign™</a></h1>
-                    
-<div align="center">
+<h1 align="center"><a href='https://www.opensignlabs.com'><img src=https://github.com/OpenSignLabs/OpenSign/assets/5486116/e518cc9c-5de3-47da-950b-f93336b9f14e></a>
+</h1><div align="center">

-The free and open source alternative to DocuSign
+[The free and open source alternative to DocuSign](https://www.opensignlabs.com)

 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/opensignlabs/opensign.svg)](http://isitmaintained.com/project/opensignlabs/opensign "Average time to resolve an issue")
 [![All Contributors](https://img.shields.io/github/all-contributors/opensignlabs/opensign?color=ee8449&style=flat-square)](#contributors)
@@ -23,7 +22,7 @@ The free and open source alternative to DocuSign
  <a href="https://www.linkedin.com/company/opensign%E2%84%A2/about/">LinkedIn</a>


-## An open-source document e-signing solution
+## The open-source document e-signing solution

 ---
 </div>
@@ -39,23 +38,28 @@ The free and open source alternative to DocuSign
 7. [Acknowledgments](#acknowledgments)

 ---
+Please star ⭐ the repo to support us! 😀

 ### Introduction

-Welcome to OpenSign, an open-source document e-signing solution designed to provide a secure, reliable, and free alternative to commercial platforms like DocuSign, PandaDoc, SignNow, Adobe Sign, Smartwaiver, SignRequest, HelloSign & Zoho sign. Developed under the OpenSignLabs organization, our mission is to democratize the e-signing process, making it accessible and straightforward for everyone.
+Welcome to OpenSign, the premier open-source docusign alternative - document e-signing solution designed to provide a secure, reliable, and free alternative to commercial platforms like DocuSign, PandaDoc, SignNow, Adobe Sign, Smartwaiver, SignRequest, HelloSign & Zoho sign. Developed under the OpenSignLabs organization, our mission is to democratize the e-signing process, making it accessible and straightforward for everyone.

 ---

 ### Features

- **Secure Signing**: Utilizes state-of-the-art cryptographic algorithms to ensure the security & integrity of your documents.
- **User-Friendly Interface**: Designed with usability in mind, making it easy for both technical and non-technical users.
- **Multi-Platform Support**: Compatible with various browsers and devices.
- **Invite & collaborate users**: Bring multiple people from your team into the signing process, all within your own infrastructure.
- **Secure**: Allows for the easy, secure and seamless organization of your documents using 'OpenSigDrive'.
- **Audit Trails**: Keeps a detailed log of all activities related to the document signing process including IP addresses and access timings.
- **Completion Certificate**: Generate secure completion certificate as soon as a document is signed by all participants.
- **API Support**: Provides a robust API for integration into other software and services.
+- **Secure PDF E-Signing:** With the help of Robust encryption algorithms, OpenSign™ ensures maximum security, privacy & compatibility.
+- **Annotate Documents:** OpenSign™ allows you to annotate PDF documents with an advanced signing pad that comes with hand drawn signatures support as well as uploaded images & saved signatures for the simplest signing experience.
+- **User-Friendly Interface:** OpenSign™ was built while keeping Intuitive design in mind for ease of use. Features like "Sign yourself", "One click signatures" and "OpenSign Drive" makes it stand out of the crowd and even makes it better than a lot of so-called industry leaders.
+- **Multi-signer Support:** OpenSign's ability to invite multiple signers for signing along with the ability to invite witnesses & being able to enforce signing in a sequence makes it the only open source solution that is fully loaded and allows it to compete head-to-head with established players.
+- **Email Unique Code(OTP) verification support for guest signers:** With OpenSign™, your documents are fully secure even when being signed by guest users. Guest signers can only sign the document after entering a unique code sent to their email address. 
+- **"Expiring Docs" & "Rejection":** You can set documents to expire after certain number of days after which nobody will be able to sign it. Not just this, OpenSign also allows signers to reject signing a document.
+- **Beautiful email templates:** All document signing invitations, completion notifications & reminders are formatted using great looking email templates.
+- **PDF Template Creation(coming soon):** OpenSign™ allows you to create and store PDF document templates for repeated use thereby saving you a lot of time.
+- **OpenSign™ Drive:** It is a centralised secure vault for your signed documents that makes storing, signing, organizing, sharing & achieving your docs a breeze.
+- **Audit Trails & completion certificate:** Being a security focused solution, OpenSign™ makes it a top priority to save detailed logs for tracking document activities along with time-stamps, IP addresses, email IDs & phone numbers. A completion certificate is generated as soon as document is completed which contains all the document related logs for added safety.
+- **API Support(coming soon):** OpenSign™ API allows seamless integration into existing systems and software. APIs will soon be available as a cloud hosted solution.
+- **Integrations:** Seamless integrations with various Cloud storage systems, CRMs & enterprise platforms is coming soon.

 <img src=https://github.com/OpenSignLabs/OpenSign/assets/5486116/b37ff443-7099-4273-9aeb-21c46d7154cf height='200'>
 <img src=https://github.com/OpenSignLabs/OpenSign/assets/5486116/86db91b7-6c2f-4885-a33c-58f4fd35ec89 height='200'>
@@ -124,6 +128,12 @@ We would like to thank all our contributors and users for their support and feed
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrew-opensignlabs"><img src="https://avatars.githubusercontent.com/u/148278535?v=4?s=100" width="100px;" alt="Andrew"/><br /><sub><b>Andrew</b></sub></a><br /><a href="#code-andrew-opensignlabs" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rishabjasrotia"><img src="https://avatars.githubusercontent.com/u/33950743?v=4?s=100" width="100px;" alt="Rishab"/><br /><sub><b>Rishab</b></sub></a><br /><a href="#code-rishabjasrotia" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://session.it"><img src="https://avatars.githubusercontent.com/u/327285?v=4?s=100" width="100px;" alt="Maurizio Pillitu"/><br /><sub><b>Maurizio Pillitu</b></sub></a><br /><a href="#bug-maoo" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://luisparra.dev"><img src="https://avatars.githubusercontent.com/u/16653744?v=4?s=100" width="100px;" alt="Luis Parra"/><br /><sub><b>Luis Parra</b></sub></a><br /><a href="#a11y-lsprr" title="Accessibility">️️️️♿️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Govinda04"><img src="https://avatars.githubusercontent.com/u/50038172?v=4?s=100" width="100px;" alt="Govinda Kocharekar"/><br /><sub><b>Govinda Kocharekar</b></sub></a><br /><a href="#code-Govinda04" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://bilal.cc"><img src="https://avatars.githubusercontent.com/u/55330484?v=4?s=100" width="100px;" alt="Bilal Ahmad Bhat"/><br /><sub><b>Bilal Ahmad Bhat</b></sub></a><br /><a href="#code-crediblebilal" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/VikramNagwal"><img src="https://avatars.githubusercontent.com/u/123088024?v=4?s=100" width="100px;" alt="Vikram"/><br /><sub><b>Vikram</b></sub></a><br /><a href="#code-VikramNagwal" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -10,6 +10,7 @@

 # production
 /build
+/mfbuild

 # misc
 .env
@@ -1,5 +1,5 @@
 # Use an official Node runtime as the base image
-FROM node:16
+FROM node:18

 # Set the working directory inside the container
 WORKDIR /usr/src/app
@@ -21,5 +21,5 @@ EXPOSE 3000
 # ENV NODE_ENV production

 # Run the application
-CMD ["npm", "start"]
+ENTRYPOINT npm run start-dev

@@ -0,0 +1,27 @@
+# Use an official Node runtime as the base image
+FROM node:18
+
+# Set the working directory inside the container
+WORKDIR /usr/src/app
+
+# Copy package.json and package-lock.json first to leverage Docker cache
+COPY apps/OpenSign/package*.json ./
+
+# Install application dependencies
+RUN npm install
+
+# Copy the current directory contents into the container
+COPY apps/OpenSign/ .
+COPY apps/OpenSign/.husky .
+
+# build
+RUN npm run build
+
+# Make port 3000 available to the world outside this container
+EXPOSE 3000
+
+# Define environment variables if needed
+# ENV NODE_ENV production
+
+# Run the application
+CMD ["npm", "start"]
@@ -1,29 +0,0 @@
-const { dependencies } = require("./package.json");
-
-module.exports = {
-  name: "shell_app", // change me
-  filename: "remoteEntry.js",
-  exposes: {},
-  remotes: {},
-  shared: {
-    ...dependencies,
-    react: {
-      singleton: true,
-      import: "react", // fallback is also react
-      shareScope: "default",
-      requiredVersion: dependencies.react
-    },
-    "react-dom": {
-      singleton: true,
-      requiredVersion: dependencies["react-dom"]
-    },
-    "react-router-dom": {
-      singleton: true,
-      requiredVersion: dependencies["react-router-dom"]
-    },
-    "rjsf-conditionals": {
-      singleton: true,
-      requiredVersion: dependencies["rjsf-conditionals"]
-    }
-  }
-};
@@ -3,47 +3,57 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
-    "@reduxjs/toolkit": "^1.9.7",
-    "@rjsf/core": "^5.13.0",
-    "@rjsf/utils": "^5.13.0",
-    "@rjsf/validator-ajv8": "^5.13.0",
-    "axios": "^1.5.1",
+    "@radix-ui/themes": "^2.0.3",
+    "@react-pdf/renderer": "^3.3.8",
+    "@reduxjs/toolkit": "^2.2.1",
+    "axios": "^1.6.0",
    "daisyui": "^3.9.2",
    "file-saver": "^2.0.5",
    "html-react-parser": "^4.2.2",
-    "json-rules-engine-simplified": "^0.1.17",
-    "jwt-decode": "^3.1.2",
-    "mf-cra": "^0.0.5",
+    "jwt-decode": "^4.0.0",
    "moment": "^2.29.4",
-    "parse": "^4.2.0",
+    "parse": "^4.3.1",
+    "pdf-lib": "^1.17.1",
+    "print-js": "^1.6.0",
+    "radix-ui": "^1.0.1",
    "react": "^18.2.0",
-    "react-bootstrap": "^2.9.0",
+    "react-bootstrap": "^2.10.1",
+    "react-datepicker": "^6.2.0",
    "react-dnd": "^16.0.1",
    "react-dnd-html5-backend": "^16.0.1",
    "react-dnd-multi-backend": "^8.0.3",
    "react-dnd-touch-backend": "^16.0.1",
    "react-dom": "^18.2.0",
    "react-drag-listview": "^2.0.0",
+    "react-draggable": "^4.4.6",
    "react-gtm-module": "^2.0.11",
    "react-helmet": "^6.1.0",
+    "react-konva": "^18.2.10",
    "react-modal": "^3.16.1",
+    "react-pdf": "^7.7.1",
    "react-redux": "^8.1.3",
-    "react-router-dom": "^6.16.0",
+    "react-rnd": "^10.4.1",
+    "react-router-dom": "^6.22.3",
    "react-scripts": "5.0.1",
-    "react-select": "^5.7.7",
+    "react-scrollbars-custom": "^4.1.1",
+    "react-select": "^5.8.0",
+    "react-signature-canvas": "^1.0.6",
+    "react-tooltip": "^5.26.3",
    "reactour": "^1.19.2",
    "redux": "^4.2.1",
    "redux-thunk": "^2.4.2",
-    "rjsf-conditionals": "github:prafullnavkar-nxg/rjsf-conditionals",
+    "regex-parser": "^2.3.0",
    "serve": "^14.2.1",
    "styled-components": "^4.4.1",
    "web-vitals": "^2.1.4"
  },
  "scripts": {
-    "start": "mf-cra start",
-    "start-prod": "serve -s build",
-    "build": "rm -rf public/mfbuild && npm run micro && CI=false && mf-cra build",
-    "micro": "cd ../../microfrontends/SignDocuments && npm install && npm run build",
+    "start": "serve -s build",
+    "start-dev": "react-scripts start",
+    "version": "curl -s https://api.github.com/repos/opensignlabs/opensign/releases/latest | grep '\"tag_name\":' | awk -F '\"' '{print $4}' > ./public/version.txt",
+    "version-win": "powershell -Command \"Invoke-RestMethod -Uri 'https://api.github.com/repos/opensignlabs/opensign/releases/latest' | Select-Object -ExpandProperty tag_name | Out-File -FilePath ./public/version.txt\"",
+    "build": "npm run version && react-scripts build",
+    "build-win": "npm run version-win && react-scripts build",
    "test": "react-scripts test",
    "eject": "react-scripts eject",
    "release": "standard-version",
@@ -73,16 +83,16 @@
    }
  },
  "devDependencies": {
-    "@babel/runtime-corejs2": "^7.23.2",
-    "autoprefixer": "^10.4.16",
+    "@babel/runtime-corejs2": "^7.23.9",
+    "autoprefixer": "^10.4.18",
    "commitizen": "^4.3.0",
    "eslint": "^8.51.0",
    "eslint-plugin-prettier": "^4.2.1",
    "eslint-plugin-react": "^7.33.2",
-    "lint-staged": "^15.0.1",
-    "postcss": "^8.4.31",
+    "lint-staged": "^15.2.2",
+    "postcss": "^8.4.35",
    "prettier": "^2.8.0",
    "pretty-quick": "^3.1.3",
    "tailwindcss": "^3.3.3"
  }
-}
+}
@@ -31,7 +31,7 @@
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css"
    integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous" />

-  <title>Open sign</title>
+  <title>OpenSign™</title>
 </head>

 <body>
@@ -50,4 +50,4 @@
    -->
 </body>

-</html>
+</html>
@@ -1,20 +1,53 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, Suspense, lazy } from "react";
 import { Routes, Route, BrowserRouter } from "react-router-dom";
-import Pgsignup from "./routes/Pgsignup";
-import Login from "./routes/Login";
-import Microapp from "./routes/RemoteApp";
-import Signup from "./routes/Signup";
-import Form from "./routes/Form";
-import Report from "./routes/Report";
-import Dashboard from "./routes/Dashboard";
-import PlanSubscriptions from "./routes/PlanSubscriptions";
+import { pdfjs } from "react-pdf";
+import Login from "./pages/Login";
+import Form from "./pages/Form";
+import Report from "./pages/Report";
+import Dashboard from "./pages/Dashboard";
 import HomeLayout from "./layout/HomeLayout";
-import UserProfile from "./routes/UserProfile";
-import PageNotFound from "./routes/PageNotFound";
-import ForgetPassword from "./routes/ForgetPassword";
-import ChangePassword from "./routes/ChangePassword";
-import ReportMicroapp from "./components/ReportMicroapp";
+import PageNotFound from "./pages/PageNotFound";
+import ValidateRoute from "./primitives/ValidateRoute";
+import Validate from "./primitives/Validate";
+import ManageSign from "./pages/Managesign";
+import TemplatePlaceholder from "./pages/TemplatePlaceholder";
+import SignYourSelf from "./pages/SignyourselfPdf";
+import DraftDocument from "./components/pdf/DraftDocument";
+import PlaceHolderSign from "./pages/PlaceHolderSign";
+import PdfRequestFiles from "./pages/PdfRequestFiles";
+const DebugPdf = lazy(() => import("./pages/DebugPdf"));
+const ForgetPassword = lazy(() => import("./pages/ForgetPassword"));
+const GuestLogin = lazy(() => import("./pages/GuestLogin"));
+const Pgsignup = lazy(() => import("./pages/Pgsignup"));
+const Subscriptions = lazy(() => import("./pages/PlanSubscriptions"));
+const ChangePassword = lazy(() => import("./pages/ChangePassword"));
+const UserProfile = lazy(() => import("./pages/UserProfile"));
+const Signup = lazy(() => import("./pages/Signup"));
+const GenerateToken = lazy(() => import("./pages/GenerateToken"));
+const Webhook = lazy(() => import("./pages/Webhook"));
+const Opensigndrive = lazy(() => import("./pages/Opensigndrive"));
+pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;

+const Loader = () => {
+  return (
+    <div
+      style={{
+        height: "100vh",
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center"
+      }}
+    >
+      <div
+        style={{
+          fontSize: "45px",
+          color: "#3dd3e0"
+        }}
+        className="loader-37"
+      ></div>
+    </div>
+  );
+};
 function App() {
  const [isloading, setIsLoading] = useState(true);
  useEffect(() => {
@@ -22,12 +55,16 @@ function App() {
  }, []);

  const handleCredentials = () => {
-    const appId = process.env.REACT_APP_APPID;
-    const baseurl = process.env.REACT_APP_SERVERURL;
+    const appId = process.env.REACT_APP_APPID
+      ? process.env.REACT_APP_APPID
+      : "opensign";
+    const baseurl = process.env.REACT_APP_SERVERURL
+      ? process.env.REACT_APP_SERVERURL
+      : window.location.origin + "/api/app";
    const appName = "contracts";
    try {
-      localStorage.setItem("BaseUrl12", `${baseurl}/`);
-      localStorage.setItem("AppID12", appId);
+      localStorage.setItem("baseUrl", `${baseurl}/`);
+      localStorage.setItem("parseAppId", appId);
      localStorage.setItem("domain", appName);
      setIsLoading(false);
    } catch (error) {
@@ -38,107 +75,86 @@ function App() {
  return (
    <div className="bg-[#eef1f5]">
      {isloading ? (
-        <div
-          style={{
-            height: "100vh",
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center"
-          }}
-        >
-          <div
-            style={{
-              fontSize: "45px",
-              color: "#3dd3e0"
-            }}
-            className="loader-37"
-          ></div>
-        </div>
+        <Loader />
      ) : (
        <BrowserRouter>
-          <Routes>
-            <Route exact path="/" element={<Login />} />
-            <Route exact path="/signup" element={<Signup />} />
-            <Route exact path="/forgetpassword" element={<ForgetPassword />} />
-            {process.env.REACT_APP_ENABLE_SUBSCRIPTION && (
-              <>
-                <Route exact path="/pgsignup" element={<Pgsignup />} />
+          <Suspense fallback={<Loader />}>
+            <Routes>
+              <Route element={<ValidateRoute />}>
+                <Route exact path="/" element={<Login />} />
+                <Route exact path="/signup" element={<Signup />} />
+              </Route>
+              <Route element={<Validate />}>
+                <Route
+                  path="/load/template/:templateId"
+                  element={<TemplatePlaceholder />}
+                />
                <Route
                  exact
-                  path="/subscription"
-                  element={<PlanSubscriptions />}
+                  path="/load/placeholdersign/:docId"
+                  element={<PlaceHolderSign />}
                />
-              </>
-            )}
-            <Route
-              exact
-              path="/changepassword"
-              element={
-                <HomeLayout>
-                  <ChangePassword />
-                </HomeLayout>
-              }
-            />
-            <Route
-              path="/mf/:remoteApp/*"
-              element={
-                <HomeLayout>
-                  <Microapp />
-                </HomeLayout>
-              }
-            />
-            <Route
-              path="/asmf/:remoteApp/*"
-              element={
-                <HomeLayout>
-                  <Microapp />
-                </HomeLayout>
-              }
-            />
-            <Route
-              path="/rpmf/:remoteApp/*"
-              element={
-                <HomeLayout>
-                  <ReportMicroapp />
-                </HomeLayout>
-              }
-            />
-            <Route
-              path="/form/:id"
-              element={
-                <HomeLayout>
-                  <Form />
-                </HomeLayout>
-              }
-            />
-            <Route
-              path="/report/:id"
-              element={
-                <HomeLayout>
-                  <Report />
-                </HomeLayout>
-              }
-            />
-            <Route
-              path="/dashboard/:id"
-              element={
-                <HomeLayout>
-                  <Dashboard />
-                </HomeLayout>
-              }
-            />
-
-            <Route
-              path="/profile"
-              element={
-                <HomeLayout>
-                  <UserProfile />
-                </HomeLayout>
-              }
-            />
-            <Route path="*" element={<PageNotFound />} />
-            {/* <Route exact path="/ForgotPassword" element={<ForgotPassword />} /> */}
-          </Routes>
+                <Route
+                  exact
+                  path="/load/recipientSignPdf/:docId/:contactBookId"
+                  element={<PdfRequestFiles />}
+                />
+              </Route>
+              <Route
+                path="/loadmf/signmicroapp/login/:id/:userMail/:contactBookId/:serverUrl"
+                element={<GuestLogin />}
+              />
+              <Route
+                path="/login/:id/:userMail/:contactBookId/:serverUrl"
+                element={<GuestLogin />}
+              />
+              <Route path="/debugpdf" element={<DebugPdf />} />
+              <Route path="/forgetpassword" element={<ForgetPassword />} />
+              {process.env.REACT_APP_ENABLE_SUBSCRIPTION && (
+                <>
+                  <Route exact path="/pgsignup" element={<Pgsignup />} />
+                  <Route path="/subscription" element={<Subscriptions />} />
+                </>
+              )}
+              <Route element={<HomeLayout />}>
+                <Route path="/changepassword" element={<ChangePassword />} />
+                <Route path="/form/:id" element={<Form />} />
+                <Route path="/report/:id" element={<Report />} />
+                <Route path="/dashboard/:id" element={<Dashboard />} />
+                <Route path="/profile" element={<UserProfile />} />
+                <Route path="/generatetoken" element={<GenerateToken />} />
+                <Route path="/webhook" element={<Webhook />} />
+                <Route path="/managesign" element={<ManageSign />} />
+                <Route path="/opensigndrive" element={<Opensigndrive />} />
+                <Route
+                  path="/template/:templateId"
+                  element={<TemplatePlaceholder />}
+                />
+                {/* signyouself route with no rowlevel data using docId from url */}
+                <Route path="/signaturePdf/:docId" element={<SignYourSelf />} />
+                {/* draft document route to handle and navigate route page accordiing to document status */}
+                <Route path="/draftDocument" element={<DraftDocument />} />
+                {/* recipient placeholder set route with no rowlevel data using docId from url*/}
+                <Route
+                  path="/placeHolderSign/:docId"
+                  element={<PlaceHolderSign />}
+                />
+                {/* for user signature (need your sign route) with row level data */}
+                <Route path="/pdfRequestFiles" element={<PdfRequestFiles />} />
+                {/* for user signature (need your sign route) with no row level data */}
+                <Route
+                  path="/pdfRequestFiles/:docId"
+                  element={<PdfRequestFiles />}
+                />
+                {/* recipient signature route with no rowlevel data using docId from url */}
+                <Route
+                  path="/recipientSignPdf/:docId/:contactBookId"
+                  element={<PdfRequestFiles />}
+                />
+              </Route>
+              <Route path="*" element={<PageNotFound />} />
+            </Routes>
+          </Suspense>
        </BrowserRouter>
      )}
    </div>
@@ -1,62 +0,0 @@
-import React from "react";
-import ReactDOM from "react-dom/client";
-import "./index.css";
-import App from "./App";
-import { Provider } from "react-redux";
-import { store } from "./redux/store";
-import { HTML5Backend } from "react-dnd-html5-backend";
-import { TouchBackend } from "react-dnd-touch-backend";
-import {
-  DndProvider,
-  TouchTransition,
-  MouseTransition,
-  Preview
-} from "react-dnd-multi-backend";
-import DragElement from "./microappComponent/DragElement";
-import TagManager from "react-gtm-module";
-
-const HTML5toTouch = {
-  backends: [
-    {
-      id: "html5",
-      backend: HTML5Backend,
-      transition: MouseTransition
-    },
-    {
-      id: "touch",
-      backend: TouchBackend,
-      options: { enableMouseEvents: true },
-      preview: true,
-      transition: TouchTransition
-    }
-  ]
-};
-const generatePreview = (props) => {
-  const { item, style } = props;
-  const newStyle = {
-    ...style
-  };
-
-  return (
-    <div style={newStyle}>
-      <DragElement {...item} />
-    </div>
-  );
-};
-
-if (process.env.REACT_APP_GTM) {
-  const tagManagerArgs = {
-    gtmId: process.env.REACT_APP_GTM
-  };
-  TagManager.initialize(tagManagerArgs);
-}
-
-const root = ReactDOM.createRoot(document.getElementById("root"));
-root.render(
-  <Provider store={store}>
-    <DndProvider options={HTML5toTouch}>
-      <Preview>{generatePreview}</Preview>
-      <App />
-    </DndProvider>
-  </Provider>
-);
@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from "react";
 import Parse from "parse";
 import axios from "axios";
+import { modalCancelBtnColor, modalSubmitBtnColor } from "../constant/const";

-const AppendFormInForm = (props) => {
+const AddSigner = (props) => {
  const [name, setName] = useState("");
  const [phone, setPhone] = useState("");
  const [email, setEmail] = useState("");
@@ -32,6 +33,7 @@ const AppendFormInForm = (props) => {
    try {
      const query = new Parse.Query("contracts_Contactbook");
      query.equalTo("CreatedBy", user);
+      query.notEqualTo("IsDeleted", true);
      query.equalTo("Email", user.getEmail());
      const res = await query.first();
      // console.log(res);
@@ -45,9 +47,8 @@ const AppendFormInForm = (props) => {
  // Define a function to handle form submission
  const handleSubmit = async (e) => {
    e.preventDefault();
+    e.stopPropagation();
    setIsLoader(true);
-    Parse.serverURL = parseBaseUrl;
-    Parse.initialize(parseAppId);
    try {
      const contactQuery = new Parse.Object("contracts_Contactbook");
      contactQuery.set("Name", name);
@@ -104,13 +105,18 @@ const AppendFormInForm = (props) => {
          const res = await contactQuery.save();

          const parseData = JSON.parse(JSON.stringify(res));
-          props.details({
-            value: parseData[props.valueKey],
-            label: parseData[props.displayKey]
-          });
+          if (props.details) {
+            props.details({
+              value: parseData[props.valueKey],
+              label: parseData[props.displayKey]
+            });
+          }
          if (props.closePopup) {
            props.closePopup();
          }
+          if (props.handleUserData) {
+            props.handleUserData(parseData);
+          }

          setIsLoader(false);
          // Reset the form fields
@@ -157,13 +163,18 @@ const AppendFormInForm = (props) => {
          const res = await contactQuery.save();

          const parseData = JSON.parse(JSON.stringify(res));
-          props.details({
-            value: parseData[props.valueKey],
-            label: parseData[props.displayKey]
-          });
+          if (props.details) {
+            props.details({
+              value: parseData[props.valueKey],
+              label: parseData[props.displayKey]
+            });
+          }
          if (props.closePopup) {
            props.closePopup();
          }
+          if (props.handleUserData) {
+            props.handleUserData(parseData);
+          }
          setIsLoader(false);
          // Reset the form fields
          setAddYourself(false);
@@ -241,7 +252,24 @@ const AppendFormInForm = (props) => {
              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
            />
          </div>
-
+          <div className="mb-3">
+            <label
+              htmlFor="email"
+              className="block text-xs text-gray-700 font-semibold"
+            >
+              Email
+              <span style={{ color: "red", fontSize: 13 }}> *</span>
+            </label>
+            <input
+              type="email"
+              id="email"
+              value={email}
+              onChange={(e) => setEmail(e.target.value)}
+              required
+              disabled={addYourself}
+              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+            />
+          </div>
          <div className="mb-3">
            <label
              htmlFor="phone"
@@ -261,36 +289,19 @@ const AppendFormInForm = (props) => {
            />
          </div>

-          <div className="mb-3">
-            <label
-              htmlFor="email"
-              className="block text-xs text-gray-700 font-semibold"
-            >
-              Email
-              <span style={{ color: "red", fontSize: 13 }}> *</span>
-            </label>
-            <input
-              type="email"
-              id="email"
-              value={email}
-              onChange={(e) => setEmail(e.target.value)}
-              required
-              disabled={addYourself}
-              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-            />
-          </div>
-
          <div className="mt-4 flex justify-start">
            <button
              type="submit"
-              className="bg-[#1ab6ce] text-sm text-white px-4 py-2 rounded shadow focus:outline-none"
+              style={{ backgroundColor: modalSubmitBtnColor }}
+              className="mr-2 px-[20px] py-1.5 text-white rounded shadow-md text-center focus:outline-none "
            >
              Submit
            </button>
            <button
              type="button"
              onClick={() => handleReset()}
-              className="bg-[#188ae2] text-sm text-white px-4 py-2 rounded ml-2 shadow focus:outline-none"
+              style={{ backgroundColor: modalCancelBtnColor }}
+              className="px-4 py-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
            >
              Reset
            </button>
@@ -301,4 +312,4 @@ const AppendFormInForm = (props) => {
  );
 };

-export default AppendFormInForm;
+export default AddSigner;
@@ -0,0 +1,281 @@
+import React, { useState } from "react";
+import Parse from "parse";
+import axios from "axios";
+import Title from "./Title";
+import Alert from "../primitives/Alert";
+
+const AddUser = (props) => {
+  const [name, setName] = useState("");
+  const [phone, setPhone] = useState("");
+  const [email, setEmail] = useState("");
+  const [isLoader, setIsLoader] = useState(false);
+  const [isUserExist, setIsUserExist] = useState(false);
+  const parseBaseUrl = localStorage.getItem("baseUrl");
+  const parseAppId = localStorage.getItem("parseAppId");
+
+  const checkUserExist = async () => {
+    try {
+      const res = await Parse.Cloud.run("getUserDetails", {
+        email: email,
+        userId: Parse.User.current().id
+      });
+      if (res) {
+        return true;
+      } else {
+        return false;
+      }
+    } catch (err) {
+      console.log("err", err);
+    }
+  };
+  // Define a function to handle form submission
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setIsLoader(true);
+    const res = await checkUserExist();
+    if (res) {
+      setIsUserExist(true);
+      setIsLoader(false);
+      setTimeout(() => {
+        setIsUserExist(false);
+      }, 1000);
+    } else {
+      try {
+        const contactQuery = new Parse.Object("contracts_Users");
+        contactQuery.set("Name", name);
+        contactQuery.set("Phone", phone);
+        contactQuery.set("Email", email);
+        contactQuery.set("UserRole", "contracts_User");
+
+        if (localStorage.getItem("TenetId")) {
+          contactQuery.set("TenantId", {
+            __type: "Pointer",
+            className: "partners_Tenant",
+            objectId: localStorage.getItem("TenetId")
+          });
+        }
+
+        try {
+          const _users = Parse.Object.extend("User");
+          const _user = new _users();
+          _user.set("name", name);
+          _user.set("username", email);
+          _user.set("email", email);
+          _user.set("phone", phone);
+          _user.set("password", phone);
+
+          const user = await _user.save();
+          if (user) {
+            const roleurl = `${parseBaseUrl}functions/AddUserToRole`;
+            const headers = {
+              "Content-Type": "application/json",
+              "X-Parse-Application-Id": parseAppId,
+              sessionToken: localStorage.getItem("accesstoken")
+            };
+            const body = {
+              appName: localStorage.getItem("_appName"),
+              roleName: "contracts_User",
+              userId: user.id
+            };
+            await axios.post(roleurl, body, { headers: headers });
+            const currentUser = Parse.User.current();
+            contactQuery.set(
+              "CreatedBy",
+              Parse.User.createWithoutData(currentUser.id)
+            );
+
+            contactQuery.set("UserId", user);
+            const acl = new Parse.ACL();
+            acl.setPublicReadAccess(true);
+            acl.setPublicWriteAccess(true);
+            acl.setReadAccess(currentUser.id, true);
+            acl.setWriteAccess(currentUser.id, true);
+
+            contactQuery.setACL(acl);
+
+            const res = await contactQuery.save();
+
+            const parseData = JSON.parse(JSON.stringify(res));
+            if (props.details) {
+              props.details({
+                value: parseData[props.valueKey],
+                label: parseData[props.displayKey]
+              });
+            }
+            if (props.closePopup) {
+              props.closePopup();
+            }
+            if (props.handleUserData) {
+              props.handleUserData(parseData);
+            }
+
+            setIsLoader(false);
+
+            setName("");
+            setPhone("");
+            setEmail("");
+          }
+        } catch (err) {
+          console.log("err ", err);
+          if (err.code === 202) {
+            const params = { email: email };
+            const userRes = await Parse.Cloud.run("getUserId", params);
+            const roleurl = `${parseBaseUrl}functions/AddUserToRole`;
+            const headers = {
+              "Content-Type": "application/json",
+              "X-Parse-Application-Id": parseAppId,
+              sessionToken: localStorage.getItem("accesstoken")
+            };
+            const body = {
+              appName: localStorage.getItem("_appName"),
+              roleName: "contracts_User",
+              userId: userRes.id
+            };
+            await axios.post(roleurl, body, { headers: headers });
+            const currentUser = Parse.User.current();
+            contactQuery.set(
+              "CreatedBy",
+              Parse.User.createWithoutData(currentUser.id)
+            );
+
+            contactQuery.set("UserId", {
+              __type: "Pointer",
+              className: "_User",
+              objectId: userRes.id
+            });
+            const acl = new Parse.ACL();
+            acl.setPublicReadAccess(true);
+            acl.setPublicWriteAccess(true);
+            acl.setReadAccess(currentUser.id, true);
+            acl.setWriteAccess(currentUser.id, true);
+
+            contactQuery.setACL(acl);
+            const res = await contactQuery.save();
+
+            const parseData = JSON.parse(JSON.stringify(res));
+            if (props.details) {
+              props.details({
+                value: parseData[props.valueKey],
+                label: parseData[props.displayKey]
+              });
+            }
+            if (props.closePopup) {
+              props.closePopup();
+            }
+            if (props.handleUserData) {
+              props.handleUserData(parseData);
+            }
+            setIsLoader(false);
+            setName("");
+            setPhone("");
+            setEmail("");
+          }
+        }
+      } catch (err) {
+        // console.log("err", err);
+        setIsLoader(false);
+        alert("something went wrong!");
+      }
+    }
+  };
+
+  // Define a function to handle the "add yourself" checkbox
+  const handleReset = () => {
+    setName("");
+    setPhone("");
+    setEmail("");
+  };
+
+  return (
+    <div className="shadow-md rounded my-2 p-3 bg-[#ffffff] md:border-[1px] md:border-gray-600/50">
+      <Title title={"Add User"} />
+      {isUserExist && <Alert type="danger">User already exists!</Alert>}
+      {isLoader && (
+        <div className="fixed inset-0 flex justify-center items-center bg-black bg-opacity-30 z-50">
+          <div
+            style={{
+              fontSize: "45px",
+              color: "#3dd3e0"
+            }}
+            className="loader-37"
+          ></div>
+        </div>
+      )}
+      <div className="w-full mx-auto">
+        <form onSubmit={handleSubmit}>
+          <h1 className="text-[20px] font-semibold mb-4">Add User</h1>
+          <div className="mb-3">
+            <label
+              htmlFor="name"
+              className="block text-xs text-gray-700 font-semibold"
+            >
+              Name
+              <span style={{ color: "red", fontSize: 13 }}> *</span>
+            </label>
+            <input
+              type="text"
+              id="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"
+            />
+          </div>
+          <div className="mb-3">
+            <label
+              htmlFor="email"
+              className="block text-xs text-gray-700 font-semibold"
+            >
+              Email
+              <span style={{ color: "red", fontSize: 13 }}> *</span>
+            </label>
+            <input
+              type="email"
+              id="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"
+            />
+          </div>
+          <div className="mb-3">
+            <label
+              htmlFor="phone"
+              className="block text-xs text-gray-700 font-semibold"
+            >
+              Phone
+              <span style={{ color: "red", fontSize: 13 }}> *</span>
+            </label>
+            <input
+              type="text"
+              id="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"
+            />
+          </div>
+
+          <div className="flex items-center mt-3 gap-2 text-white">
+            <button
+              type="submit"
+              className="bg-[#1ab6ce] rounded-sm shadow-md text-[13px] font-semibold uppercase text-white py-1.5 px-2.5 focus:outline-none"
+            >
+              Submit
+            </button>
+            <div
+              type="button"
+              onClick={() => handleReset()}
+              className="bg-[#188ae2] rounded-sm shadow-md text-[13px] font-semibold uppercase text-white py-1.5 px-2.5 text-center ml-[2px] focus:outline-none"
+            >
+              Reset
+            </div>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+};
+
+export default AddUser;
@@ -1,49 +0,0 @@
-import React, { Component } from "react";
-
-export class ErrorBoundary extends Component {
-  constructor(props) {
-    super(props);
-    this.state = { hasError: false };
-  }
-
-  static getDerivedStateFromError() {
-    return {
-      hasError: true
-    };
-  }
-
-  componentDidCatch(error, info) {
-    console.log(error);
-    console.log(info);
-  }
-
-  render() {
-    if (this.state.hasError) {
-      return (
-        <div className="p-2">
-          <div
-            style={{
-              height: "100vh",
-              display: "flex",
-
-              flexFlow: "column"
-            }}
-          >
-            <h1
-              style={{
-                fontSize: "2em",
-                fontFamily: "sans-serif",
-                textShadow: "0 0 20px black"
-              }}
-            >
-              Something went wrong.
-            </h1>
-          </div>
-        </div>
-      );
-    }
-    return this.props.children;
-  }
-}
-
-export default ErrorBoundary;
@@ -1,8 +1,21 @@
 import React, { useEffect, useState } from "react";
 import Package from "../../package.json";
-
+import axios from "axios";
+import { openInNewTab } from "../constant/Utils";
 const Footer = () => {
  const [showButton, setShowButton] = useState(false);
+  const [version, setVersion] = useState("");
+  useEffect(() => {
+    axios
+      .get("/version.txt")
+      .then((response) => {
+        setVersion(response.data); // Set the retrieved data to the state variable
+      })
+      .catch((error) => {
+        console.error("Error reading the file:", error);
+      });
+  }, []);
+
  const handleScroll = () => {
    if (window.pageYOffset >= 50) {
      setShowButton(true);
@@ -25,16 +38,18 @@ const Footer = () => {
  }, []);

  const appName = "OpenSign™";
-  
+  const openUrl = () => {
+    openInNewTab(
+      "https://github.com/OpenSignLabs/OpenSign/releases/tag/" + version
+    );
+  };
  return (
    <>
      <div className="bg-[#222c3c] text-[#98a6ba] text-center text-[13px] py-3">
        All Rights Reserved &copy; {new Date().getFullYear()} &nbsp;
-        {appName}{" "}
-        (version:{" "}
-        {localStorage.getItem("appVersion") &&
-          `${Package.version}.${localStorage.getItem("appVersion")}`}
-        )
+        <span onClick={openUrl} className="hover:underline cursor-pointer">
+          {appName} ( version: {version ? version : `${Package.version} `})
+        </span>
      </div>
      <button
        className={`${
@@ -4,14 +4,13 @@ import FullScreenButton from "./FullScreenButton";
 import { useNavigate } from "react-router-dom";
 import Parse from "parse";
 import { useWindowSize } from "../hook/useWindowSize";
+import { openInNewTab } from "../constant/Utils";
 const Header = ({ showSidebar }) => {
  const navigation = useNavigate();
  const { width } = useWindowSize();
  let applogo = localStorage.getItem("appLogo") || "";
  let username = localStorage.getItem("username");
  const image = localStorage.getItem("profileImg") || dp;
-  const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
-  const [parseAppId] = useState(localStorage.getItem("parseAppId"));

  const [isOpen, setIsOpen] = useState(false);

@@ -21,8 +20,6 @@ const Header = ({ showSidebar }) => {

  const closeDropdown = () => {
    setIsOpen(false);
-    Parse.serverURL = parseBaseUrl;
-    Parse.initialize(parseAppId);
    Parse.User.logOut();
    let appdata = localStorage.getItem("userSettings");
    let applogo = localStorage.getItem("appLogo");
@@ -31,8 +28,8 @@ const Header = ({ showSidebar }) => {
    let PageLanding = localStorage.getItem("PageLanding");
    let domain = localStorage.getItem("domain");
    let _appName = localStorage.getItem("_appName");
-    let baseUrl = localStorage.getItem("BaseUrl12");
-    let appid = localStorage.getItem("AppID12");
+    let baseUrl = localStorage.getItem("baseUrl");
+    let appid = localStorage.getItem("parseAppId");

    localStorage.clear();

@@ -43,8 +40,8 @@ const Header = ({ showSidebar }) => {
    localStorage.setItem("PageLanding", PageLanding);
    localStorage.setItem("domain", domain);
    localStorage.setItem("userSettings", appdata);
-    localStorage.setItem("BaseUrl12", baseUrl);
-    localStorage.setItem("AppID12", appid);
+    localStorage.setItem("baseUrl", baseUrl);
+    localStorage.setItem("parseAppId", appid);

    navigation("/");
  };
@@ -118,6 +115,12 @@ const Header = ({ showSidebar }) => {
            <ul>
              <li
                className="hover:bg-gray-100 rounded-t-lg py-1 px-2 cursor-pointer font-normal"
+                onClick={() => openInNewTab("https://docs.opensignlabs.com")}
+              >
+                <i className="fa-solid fa-book"></i> Docs
+              </li>
+              <li
+                className="hover:bg-gray-100 py-1 px-2 cursor-pointer font-normal"
                onClick={() => {
                  setIsOpen(false);
                  navigation("/profile");
@@ -27,14 +27,14 @@ const LoginFacebook = ({
      setThirdpartyLoader(true);
      const details = {
        Email: response.email,
-        Name: response.name,
+        Name: response.name
      };
      setUserDetails({ ...userDetails, ...details });
      const fDetails = {
        Id: response.userID,
        AccessToken: response.accessToken,
        Name: response.name,
-        Email: response.email,
+        Email: response.email
      };
      setFBDetails({ ...fBDetails, ...fDetails });
      const res = await checkExtUser(fDetails);
@@ -42,9 +42,11 @@ const LoginFacebook = ({
  };

  const checkExtUser = async (details) => {
-    const extUser = new Parse.Query("contracts_Users");
-    extUser.equalTo("Email", details.Email);
-    const extRes = await extUser.first();
+    // const extUser = new Parse.Query("contracts_Users");
+    // extUser.equalTo("Email", details.Email);
+    // const extRes = await extUser.first();
+    const params = { email: details.Email };
+    const extRes = await Parse.Cloud.run("getUserDetails", params);
    // console.log("extRes ", extRes);
    if (extRes) {
      const params = { ...details, Phone: extRes.get("Phone") };
@@ -84,7 +86,7 @@ const LoginFacebook = ({
            email: userDetails.Email,
            // "passsword":userDetails.Phone,
            phone: userDetails.Phone,
-            role: "contracts_Admin",
+            role: "contracts_User",
            company: userDetails.Company
          }
        };
@@ -209,18 +211,19 @@ const LoginFacebook = ({
                  <div>
                    <button
                      type="button"
-                      className="btn btn-secondary"
-                      onClick={() => setIsModal(false)}
-                      style={{ marginRight: 10, width: 90 }}
+                      onClick={() => handleSubmitbtn()}
+                      className="btn btn-info"
+                      style={{ marginRight: 10 }}
                    >
-                      Cancel
+                      Sign up
                    </button>
                    <button
                      type="button"
-                      onClick={() => handleSubmitbtn()}
-                      className="btn btn-info"
+                      className="btn btn-secondary"
+                      onClick={() => setIsModal(false)}
+                      style={{ width: 90 }}
                    >
-                      Sign up
+                      Cancel
                    </button>
                  </div>
                </form>
@@ -1,7 +1,9 @@
 import React, { useState, useRef } from "react";
 import Parse from "parse";
-import jwtDecode from "jwt-decode";
+import { jwtDecode } from "jwt-decode";
 import { useScript } from "../hook/useScript";
+import ModalUi from "../primitives/ModalUi";
+import { modalCancelBtnColor, modalSubmitBtnColor } from "../constant/const";

 /*
 * `GoogleSignInBtn`as it's name indicates it render google sign in button
@@ -42,7 +44,42 @@ const GoogleSignInBtn = ({
      width: "187px"
    });
  });
+  const clearStorage = async () => {
+    if (Parse.User.current()) {
+      await Parse.User.logOut();
+    }
+    let baseUrl = localStorage.getItem("baseUrl");
+    let appid = localStorage.getItem("parseAppId");
+    let applogo = localStorage.getItem("appLogo");
+    let domain = localStorage.getItem("domain");
+    let appversion = localStorage.getItem("appVersion");
+    let appTitle = localStorage.getItem("appTitle");
+    let defaultmenuid = localStorage.getItem("defaultmenuid");
+    let PageLanding = localStorage.getItem("PageLanding");
+    let _appName = localStorage.getItem("_appName");
+    let _app_objectId = localStorage.getItem("_app_objectId");
+    let appName = localStorage.getItem("appName");
+    let userSettings = localStorage.getItem("userSettings");
+
+    localStorage.clear();
+
+    localStorage.setItem("baseUrl", baseUrl);
+    localStorage.setItem("parseAppId", appid);
+    localStorage.setItem("appLogo", applogo);
+    localStorage.setItem("domain", domain);
+    localStorage.setItem("appversion", appversion);
+    localStorage.setItem("appTitle", appTitle);
+    localStorage.setItem("defaultmenuid", defaultmenuid);
+    localStorage.setItem("PageLanding", PageLanding);
+    localStorage.setItem("_appName", _appName);
+    localStorage.setItem("_app_objectId", _app_objectId);
+    localStorage.setItem("appName", appName);
+    localStorage.setItem("userSettings", userSettings);
+    localStorage.setItem("baseUrl", baseUrl);
+    localStorage.setItem("parseAppId", appid);
+  };
  const responseGoogle = async (response) => {
+    clearStorage();
    setThirdpartyLoader(true);
    // console.log("response ", response);
    if (response.credential) {
@@ -66,9 +103,11 @@ const GoogleSignInBtn = ({
    }
  };
  const checkExtUser = async (details) => {
-    const extUser = new Parse.Query("contracts_Users");
-    extUser.equalTo("Email", details.Gmail);
-    const extRes = await extUser.first();
+    // const extUser = new Parse.Query("contracts_Users");
+    // extUser.equalTo("Email", details.Gmail);
+    // const extRes = await extUser.first();
+    const params = { email: details.Gmail };
+    const extRes = await Parse.Cloud.run("getUserDetails", params);
    // console.log("extRes ", extRes);
    if (extRes) {
      const params = { ...details, Phone: extRes.get("Phone") };
@@ -111,7 +150,7 @@ const GoogleSignInBtn = ({
            email: userDetails.Email,
            // "passsword":userDetails.Phone,
            phone: userDetails.Phone,
-            role: "contracts_Admin",
+            role: "contracts_User",
            company: userDetails.Company,
            jobTitle: userDetails.Destination
          }
@@ -141,6 +180,32 @@ const GoogleSignInBtn = ({
      alert("Please fill required details!");
    }
  };
+  const handleCloseModal = () => {
+    setIsModal(false);
+    Parse.User.logOut();
+
+    let appdata = localStorage.getItem("userSettings");
+    let applogo = localStorage.getItem("appLogo");
+    let appName = localStorage.getItem("appName");
+    let defaultmenuid = localStorage.getItem("defaultmenuid");
+    let PageLanding = localStorage.getItem("PageLanding");
+    let domain = localStorage.getItem("domain");
+    let _appName = localStorage.getItem("_appName");
+    let baseUrl = localStorage.getItem("baseUrl");
+    let appid = localStorage.getItem("parseAppId");
+
+    localStorage.clear();
+
+    localStorage.setItem("appLogo", applogo);
+    localStorage.setItem("appName", appName);
+    localStorage.setItem("_appName", _appName);
+    localStorage.setItem("defaultmenuid", defaultmenuid);
+    localStorage.setItem("PageLanding", PageLanding);
+    localStorage.setItem("domain", domain);
+    localStorage.setItem("userSettings", appdata);
+    localStorage.setItem("baseUrl", baseUrl);
+    localStorage.setItem("parseAppId", appid);
+  };
  return (
    <div style={{ position: "relative" }}>
      {thirdpartyLoader && (
@@ -168,117 +233,94 @@ const GoogleSignInBtn = ({
        </div>
      )}
      <div ref={googleBtn} className="text-sm"></div>
-
-      {isModal && (
-        <div
-          className="modal fade show"
-          id="exampleModal"
-          tabIndex="-1"
-          role="dialog"
-          style={{ display: "block", zIndex: 1 }}
-        >
-          <div className="modal-dialog" role="document">
-            <div className="modal-content">
-              <div className="modal-header">
-                <h5 className="modal-title">Sign up form</h5>
-                <span>
-                  <span></span>
-                </span>
-              </div>
-              <div className="modal-body">
-                <form>
-                  <div className="form-group">
-                    <label
-                      htmlFor="Phone"
-                      style={{ display: "flex" }}
-                      className="col-form-label"
-                    >
-                      Phone{" "}
-                      <span style={{ fontSize: 13, color: "red" }}>*</span>
-                    </label>
-                    <input
-                      type="tel"
-                      className="form-control"
-                      id="Phone"
-                      value={userDetails.Phone}
-                      onChange={(e) =>
-                        setUserDetails({
-                          ...userDetails,
-                          Phone: e.target.value
-                        })
-                      }
-                      required
-                    />
-                  </div>
-                  <div className="form-group">
-                    <label
-                      htmlFor="Company"
-                      style={{ display: "flex" }}
-                      className="col-form-label"
-                    >
-                      Company{" "}
-                      <span style={{ fontSize: 13, color: "red" }}>*</span>
-                    </label>
-                    <input
-                      type="text"
-                      className="form-control"
-                      id="Company"
-                      value={userDetails.Company}
-                      onChange={(e) =>
-                        setUserDetails({
-                          ...userDetails,
-                          Company: e.target.value
-                        })
-                      }
-                      required
-                    />
-                  </div>
-                  <div className="form-group">
-                    <label
-                      htmlFor="Destination"
-                      style={{ display: "flex" }}
-                      className="col-form-label"
-                    >
-                      Destination{" "}
-                      <span style={{ fontSize: 13, color: "red" }}>*</span>
-                    </label>
-                    <input
-                      type="text"
-                      className="form-control"
-                      id="Destination"
-                      value={userDetails.Destination}
-                      onChange={(e) =>
-                        setUserDetails({
-                          ...userDetails,
-                          Destination: e.target.value
-                        })
-                      }
-                      required
-                    />
-                  </div>
-                  <div>
-                    <button
-                      type="button"
-                      className="btn btn-secondary"
-                      onClick={() => setIsModal(false)}
-                      style={{ marginRight: 10, width: 90 }}
-                    >
-                      Cancel
-                    </button>
-                    <button
-                      type="button"
-                      onClick={() => handleSubmitbtn()}
-                      className="btn btn-info"
-                    >
-                      Sign up
-                    </button>
-                  </div>
-                </form>
-              </div>
-            </div>
+      <ModalUi showClose={false} isOpen={isModal} title="Sign up form">
+        <form className="px-4 py-3">
+          <div className="mb-3">
+            <label
+              htmlFor="Phone"
+              style={{ display: "flex" }}
+              className="block text-xs text-gray-700 font-semibold"
+            >
+              Phone <span style={{ fontSize: 13, color: "red" }}>*</span>
+            </label>
+            <input
+              type="tel"
+              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+              id="Phone"
+              value={userDetails.Phone}
+              onChange={(e) =>
+                setUserDetails({
+                  ...userDetails,
+                  Phone: e.target.value
+                })
+              }
+              required
+            />
          </div>
-        </div>
-      )}
+          <div className="mb-3">
+            <label
+              htmlFor="Company"
+              style={{ display: "flex" }}
+              className="block text-xs text-gray-700 font-semibold"
+            >
+              Company <span style={{ fontSize: 13, color: "red" }}>*</span>
+            </label>
+            <input
+              type="text"
+              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+              id="Company"
+              value={userDetails.Company}
+              onChange={(e) =>
+                setUserDetails({
+                  ...userDetails,
+                  Company: e.target.value
+                })
+              }
+              required
+            />
+          </div>
+          <div className="mb-3">
+            <label
+              htmlFor="JobTitle"
+              style={{ display: "flex" }}
+              className="block text-xs text-gray-700 font-semibold"
+            >
+              Job Title <span style={{ fontSize: 13, color: "red" }}>*</span>
+            </label>
+            <input
+              type="text"
+              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+              id="JobTitle"
+              value={userDetails.Destination}
+              onChange={(e) =>
+                setUserDetails({
+                  ...userDetails,
+                  Destination: e.target.value
+                })
+              }
+              required
+            />
+          </div>
+          <div>
+            <button
+              type="button"
+              className="px-3 py-1.5 text-white rounded shadow-md text-center focus:outline-none "
+              onClick={() => handleSubmitbtn()}
+              style={{ marginRight: 10, backgroundColor: modalSubmitBtnColor }}
+            >
+              Sign up
+            </button>
+            <button
+              type="button"
+              className="p-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
+              onClick={handleCloseModal}
+              style={{ width: 90, backgroundColor: modalCancelBtnColor }}
+            >
+              Cancel
+            </button>
+          </div>
+        </form>
+      </ModalUi>
    </div>
  );
 };
@@ -0,0 +1,84 @@
+import React from "react";
+import { Document, Page } from "react-pdf";
+import { Stage, Layer, Rect } from "react-konva";
+const RenderDebugPdf = (props) => {
+  return (
+    <div>
+      <div
+        style={{
+          position: "sticky",
+          top: 0,
+          padding: 10,
+          zIndex: 1,
+          backgroundColor: "white",
+          border: "1px solid grey",
+          margin: "5px 0"
+        }}
+      >
+        {`Co-ordinates: X - ${props.hoverCoordinates.x}, Y - ${props.hoverCoordinates.y}`}
+      </div>
+      <div
+        style={{
+          flex: 1,
+          position: "relative",
+          border: "1px solid grey",
+          overflow: "auto"
+        }}
+        onMouseMove={props.handleMouseMoveDiv}
+      >
+        <Document
+          onLoadError={() => {
+            const load = {
+              status: false,
+              type: "failed"
+            };
+            props.setPdfLoadFail(load);
+          }}
+          loading={"Loading Document.."}
+          onLoadSuccess={props.pageDetails}
+          ref={props.pdfRef}
+          file={props.pdfUrl}
+        >
+          <Page
+            onLoadSuccess={props.handlePageLoadSuccess}
+            pageNumber={props.pageNumber}
+            renderAnnotationLayer={false}
+            renderTextLayer={false}
+            onGetAnnotationsError={(error) => {
+              console.log("annotation error", error);
+            }}
+          />
+        </Document>
+
+        <Stage
+          onMouseMove={props.handleMouseMove}
+          onMouseDown={props.handleMouseDown}
+          onMouseUp={props.handleMouseUp}
+          width={props.pdfDimension.width}
+          height={props.pdfDimension.height}
+          style={{ position: "absolute", top: 0, left: 0 }}
+        >
+          <Layer>
+            {props.annotations
+              .filter((value) => value.page === props.pageNumber)
+              .map((value) => {
+                return (
+                  <Rect
+                    key={value.key}
+                    x={value.x}
+                    y={value.y}
+                    width={value.width}
+                    height={value.height}
+                    fill="transparent"
+                    stroke="black"
+                  />
+                );
+              })}
+          </Layer>
+        </Stage>
+      </div>
+    </div>
+  );
+};
+
+export default RenderDebugPdf;
@@ -1,90 +0,0 @@
-import useFederatedComponent from "mf-cra";
-import React, { Suspense, useEffect } from "react";
-import { useNavigate, useParams } from "react-router-dom";
-
-const MicroappModal = () => {
-  const { remoteApp } = useParams();
-
-  useEffect(() => {
-    return () => localStorage.removeItem("rowlevel");
-  }, []);
-  let paramString = remoteApp;
-  let queryString = new URLSearchParams(paramString);
-  let obj = {};
-  for (const [key, value] of queryString.entries()) {
-    // console.log("value ", key + ":" + value);
-
-    if (key === "remoteUrl") {
-      const url = window.location.origin + "/mfbuild/remoteEntry.js";
-      // console.log("atob(value) ", atob(value))
-      obj = { ...obj, [key]: url };
-    } else {
-      if (key === "moduleToLoad") {
-        obj = { ...obj, [key]: "./" + value };
-      } else {
-        obj = { ...obj, [key]: value };
-      }
-    }
-  }
-  // console.log("app ", remoteApp);
-  const { Component: RemoteComponent } = useFederatedComponent(obj);
-  const navigate = useNavigate();
-  // console.log("RemoteComponent ", RemoteComponent);
-  return (
-    <div className="w-full h-full flex items-center justify-center ">
-      {/* <!-- Modal Container --> */}
-      <div className="bg-white rounded-lg shadow-lg w-full">
-        {/* <!-- Modal Header --> */}
-        <div className="flex w-full items-center border-b-2 mb-2 p-2">
-          <button
-            className="focus:outline-none bg-blue-500 text-white text-sm shadow px-2.5 py-1 rounded"
-            id="closeModal"
-            onClick={(e) => {
-              e.preventDefault();
-              //   setIsModal(false);
-              navigate(-1);
-            }}
-          >
-            Back
-          </button>
-          {localStorage.getItem("domain") && (
-            <p className="flex-1 w-full text-sm md:text-base text-black text-center">
-              {localStorage.getItem("domain") === "contracts" ? "Document" : ""}
-            </p>
-          )}
-        </div>
-        {/* <!-- Modal Body --> */}
-        <div className="w-full">
-          <Suspense
-            fallback={
-              <div style={{ height: "300px" }}>
-                <div
-                  style={{
-                    marginLeft: "45%",
-                    marginTop: "150px",
-                    fontSize: "45px",
-                    color: "#3dd3e0"
-                  }}
-                  className="loader-37"
-                ></div>
-              </div>
-            }
-          >
-            <div
-              style={{
-                backgroundColor: "#ffffff",
-                width: "100%",
-                overflow: "hidden",
-                minHeight: "50vh"
-              }}
-            >
-              {RemoteComponent && <RemoteComponent />}
-            </div>
-          </Suspense>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default MicroappModal;
@@ -1,21 +1,11 @@
 import React from "react";
 import { Helmet } from "react-helmet";

-function Title(props) {
+function Title({ title, drive }) {
  return (
    <Helmet>
-      <title>{`${props.title} - OpenSign™`}</title>
-      {/* <title>
-        {`${localStorage.getItem("appTitle") ? localStorage.getItem("appTitle") : ""} - ${props.title}`}
-      </title> */}
-      <meta
-        name="description"
-        content={`${props.title} - OpenSign™`}
-      />
-      {/* <meta
-        name="description"
-        content={`${localStorage.getItem("appTitle")} - ${props.title}`}
-      /> */}
+      <title>{drive ? title : `${title} - OpenSign™`}</title>
+      <meta name="description" content={`${title} - OpenSign™`} />
      <link
        rel="icon"
        type="image/png"
@@ -1,391 +0,0 @@
-import React, { useState, useEffect } from "react";
-import Form from "@rjsf/core";
-import validator from "@rjsf/validator-ajv8";
-import Parse from "parse";
-import "../styles/loader.css";
-import LayoutField from "./fields/Rjsf-layout";
-import TimeWidget from "./fields/TimeWidget";
-import Level1Dropdown from "./fields/Level1Dropdown";
-import HiddenField from "./fields/HiddenField";
-import MultiSelectField from "./fields/MultiSelectField";
-import TreeWidget from "../components/TreeWidget";
-import { formJson } from "../json/FormJson";
-const TreeEditForm = (props) => {
-  const widget = {
-    TimeWidget: TimeWidget
-  };
-  const fields = {
-    layout: LayoutField,
-    Level1Dropdown: Level1Dropdown,
-    HiddenField: HiddenField,
-    MultiSelectField: MultiSelectField,
-    FolderComponent: TreeWidget
-  };
-
-  const [schema, setschema] = useState({});
-  const [ui_schema, setui_schema] = useState({});
-  const [title, settitle] = useState("");
-  const [schemaState, setschemaState] = useState({});
-  const [formData, setformData] = useState({});
-  const [active, setactive] = useState(true);
-  const [loading, setloading] = useState(false);
-  const [_validate, set_validate] = useState(null);
-  const [noValidate, setnoValidate] = useState(false);
-  const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
-  const [parseAppId] = useState(localStorage.getItem("parseAppId"));
-
-  const getForm = async (id) => {
-    setloading(true);
-    try {
-      //get json form data (schema ,uischema)
-      const results = formJson(id);
-      try {
-        let _record = Parse.Object.extend(results.class);
-        var query1 = new Parse.Query(_record);
-        await query1.get(props.objectId).then(
-          (x) => {
-            try {
-              if (x) {
-                let result = x.toJSON();
-                let new_result = result;
-                for (let [key, value] of Object.entries(result)) {
-                  if (value["__type"] === "Date") {
-                    let todayTime1 = new Date(value.iso);
-                    var month = String(todayTime1.getMonth() + 1);
-                    var day = String(todayTime1.getDate());
-                    var year = String(todayTime1.getFullYear());
-                    if (month.length < 2) month = "0" + month;
-                    if (day.length < 2) day = "0" + day;
-                    let date1 = year + "-" + month + "-" + day;
-                    let bindVar = date1;
-                    if (!results.jsonSchema.properties[key].format) {
-                      bindVar = todayTime1.toISOString();
-                    }
-                    new_result[key] = bindVar;
-                  }
-                }
-                setschemaState(results.jsonSchema);
-                setformData(new_result);
-              }
-            } catch (error) {
-              //alert(error.message);
-
-              setloading(false);
-            }
-          },
-          (error) => {
-            console.log("err", error);
-            setloading(false);
-          }
-        );
-        setschema(results.jsonSchema);
-        setui_schema(results.uiSchema);
-        set_validate(results.validFunction);
-        setnoValidate(results.noValidate);
-        settitle(results.class);
-        setloading(false);
-        setactive(true);
-      } catch (error) {
-        setloading(false);
-      }
-    } catch (e) {
-      setloading(false);
-      console.error("Problem", e);
-    }
-  };
-
-  const wrap = (s) => "{ return " + s + " };";
-
-  const dynamicValidate = (formData, errors) => {
-    try {
-      let body = atob(_validate);
-      let res = new Function(wrap(body))
-        .call(null)
-        .call(null, formData, errors);
-      return res;
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  const handleSubmit = async ({ formData }) => {
-    setactive(false);
-    setloading(true);
-    let RowData = formData;
-    RowData &&
-      Object.entries(RowData).forEach(([key, value]) => {
-        if (typeof value === "string") {
-          RowData[key] = value.trim();
-        }
-      });
-    let _scanData = schemaState;
-    if (_scanData.dependencies) {
-      Object.keys(_scanData.dependencies).forEach((key) => {
-        if (_scanData.dependencies[key].oneOf) {
-          _scanData.dependencies[key].oneOf.forEach((val) => {
-            Object.keys(val.properties).forEach((k) => {
-              if (typeof val.properties[k] === "object") {
-                if (val.properties[k].format === "date") {
-                  if (RowData[k]) {
-                    let newdate = new Date(RowData[k]);
-                    RowData[k] = newdate;
-                  }
-                }
-                if (val.properties[k].component === "HtmlEditor") {
-                  if (RowData[k]) {
-                    let newHtml = RowData[k]
-                      .replace(/<p[^>]*>/g, "")
-                      .replace(/<\/p>/g, " ");
-                    RowData[k] = newHtml;
-                  }
-                }
-                if (val.properties[k].component === "DateTime") {
-                  if (RowData[k]) {
-                    let newDate11 = new Date(RowData[k]);
-                    RowData[k] = newDate11;
-                  }
-                }
-                if (val.properties[k].component === "CurrencyInput") {
-                  if (val.properties[k].currencyColumn) {
-                    RowData[`${val.properties[k].currencyColumn}`] =
-                      val.properties[k].defaultcurrency;
-                  }
-                }
-                if (val.properties[k].type === "string") {
-                  if (typeof RowData[k] === "string")
-                    RowData[k] = RowData[k].trim();
-                }
-                if (val.properties[k].data !== undefined) {
-                  if (val.properties[k].data.isPointer) {
-                    let pointer = undefined;
-                    if (val.properties[k].data.class) {
-                      if (RowData[k]) {
-                        pointer = {
-                          __type: "Pointer",
-                          className: val.properties[k].data.class,
-                          objectId: RowData[k]
-                        };
-                      }
-                    } else {
-                      if (RowData[k]) {
-                        pointer = {
-                          __type: "Pointer",
-                          className: localStorage.getItem("extended_class"),
-                          objectId: RowData[k]
-                        };
-                      }
-                    }
-                    RowData[k] = pointer;
-                  }
-                  if (val.properties[k].data.FolderTypeValue) {
-                    if (RowData[k]) {
-                      let obj = {
-                        __type: "Pointer",
-                        className: val.properties[k].data.ClassName,
-                        objectId: RowData[k]
-                      };
-                      RowData[k] = obj;
-                    }
-                  }
-                }
-              }
-            });
-          });
-        }
-      });
-    }
-    let temp = [];
-
-    let _dd = _scanData.properties;
-    let allowed = [];
-    if (_dd) {
-      Object.keys(_dd).forEach(function (k) {
-        allowed.push(k);
-        if (RowData[k]) {
-          let pointer = {
-            __type: "Pointer",
-            className: _dd[k].class,
-            objectId: RowData[k]
-          };
-          RowData[k] = pointer;
-        }
-        if (_dd[k].format === "date") {
-          if (RowData[k]) {
-            let newdate = new Date(RowData[k]);
-            if (!isNaN(newdate.getTime())) {
-              RowData[k] = newdate;
-            }
-          }
-        }
-        if (_dd[k].component === "HtmlEditor") {
-          if (RowData[k]) {
-            let newHtml = RowData[k]
-              .replace(/<p[^>]*>/g, "")
-              .replace(/<\/p>/g, " ");
-            RowData[k] = newHtml;
-          }
-        }
-        if (_dd[k].component === "DateTime") {
-          if (RowData[k]) {
-            let newdate = new Date(RowData[k]);
-            if (!isNaN(newdate.getTime())) {
-              RowData[k] = newdate;
-            }
-          }
-        }
-        if (_dd[k].format === "date-time") {
-          let newdate = new Date(RowData[k]);
-          RowData[k] = newdate;
-        }
-        if (_dd[k].component === "CurrencyInput") {
-          if (_dd[k].currencyColumn) {
-            RowData[`${_dd[k].currencyColumn}`] = _dd[k].defaultcurrency;
-          }
-        }
-        if (_dd[k].data !== undefined) {
-          if (_dd[k].data.isPointer) {
-            let pointer = undefined;
-            if (typeof RowData[k] === "object") {
-              if (RowData[k]) {
-                if (RowData[k].objectId !== "Select") {
-                  let obj = {
-                    __type: "Pointer",
-                    className: RowData[k].className,
-                    objectId: RowData[k].objectId
-                  };
-                  pointer = obj;
-                }
-              }
-            } else if (_dd[k].data.class) {
-              if (RowData[k]) {
-                pointer = {
-                  __type: "Pointer",
-                  className: _dd[k].data.class,
-                  objectId: RowData[k]
-                };
-              }
-            } else {
-              if (RowData[k]) {
-                pointer = {
-                  __type: "Pointer",
-                  className: localStorage.getItem("extended_class"),
-                  objectId: RowData[k]
-                };
-              }
-            }
-
-            RowData[k] = pointer;
-          }
-          if (_dd[k].data.FolderTypeValue) {
-            if (RowData[k]) {
-              let obj = {
-                __type: "Pointer",
-                className: _dd[k].data.ClassName,
-                objectId: RowData[k]
-              };
-              RowData[k] = obj;
-            }
-          }
-        }
-        if (_dd[k].type === "string") {
-          if (typeof RowData[k] === "string") RowData[k] = RowData[k].trim();
-        }
-      });
-    }
-    const filtered = Object.keys(RowData)
-      .filter((key) => allowed.includes(key))
-      .reduce((obj, key) => {
-        obj[key] = RowData[key];
-        return obj;
-      }, {});
-
-    try {
-      Parse.serverURL = parseBaseUrl;
-      Parse.initialize(parseAppId);
-      const currentUser = Parse.User.current();
-      if (temp.length !== 0) {
-        let userPointer = {
-          __type: "Pointer",
-          className: "_User",
-          objectId: currentUser.id
-        };
-        filtered[[temp[0]]] = userPointer;
-      }
-      var data = Parse.Object.extend(title);
-      var query = new Parse.Query(data);
-      query.get(props.objectId).then(async (object) => {
-        object.save(filtered).then(
-          () => {
-            try {
-              alert("Record updated successfully");
-              props.HideView(false);
-              setloading(false);
-              setactive(true);
-            } catch (error) {
-              console.log("err", error);
-            }
-          },
-          (error) => {
-            console.log("err", error);
-            setloading(false);
-            setactive(true);
-          }
-        );
-      });
-    } catch (error) {
-      console.log("err", error);
-
-      alert(error.message);
-      setloading(false);
-      setactive(true);
-    }
-  };
-
-  useEffect(() => {
-    if (props.FormId) {
-      getForm(props.FormId);
-    }
-    // eslint-disable-next-line
-  }, [props.FormId]);
-
-  if (loading) {
-    return (
-      <div
-        className="loader-01"
-        style={{
-          marginTop: "50px",
-          marginLeft: "50%",
-          color: "rgb(0,28,28)",
-          fontSize: "35px"
-        }}
-      ></div>
-    );
-  }
-  return (
-    <Form
-      schema={schema}
-      uiSchema={ui_schema}
-      formData={formData}
-      showErrorList={false}
-      widgets={widget}
-      fields={fields}
-      validate={noValidate && dynamicValidate}
-      onSubmit={handleSubmit}
-      validator={validator}
-    >
-      <div>
-        {active ? (
-          <button className="bg-[#1ab6ce] px-3 py-2 rounded text-white text-sm" type="submit">
-            Update
-          </button>
-        ) : (
-          <button className="bg-[#1ab6ce] px-3 py-2 rounded text-white text-sm" type="submit" disabled>
-            Update
-          </button>
-        )}
-      </div>
-    </Form>
-  );
-};
-
-export default TreeEditForm;
@@ -1,237 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Form from "@rjsf/core";
-import validator from "@rjsf/validator-ajv8";
-import LayoutField from "./fields/Rjsf-layout";
-import Level1Dropdown from "./fields/Level1Dropdown";
-import HiddenField from "./fields/HiddenField";
-import MultiSelectField from "./fields/MultiSelectField";
-import "../styles/loader.css";
-import "../styles/form.css";
-import FileUpload from "./fields/FileUpload";
-import parse from "html-react-parser";
-import TimeWidget from "./fields/TimeWidget";
-import { formJson } from "../json/FormJson";
-function TreeFormComponent(props) {
-  const widget = {
-    TimeWidget: TimeWidget
-  };
-
-  const fields = {
-    layout: LayoutField,
-    FileUpload: FileUpload,
-    Level1Dropdown: Level1Dropdown,
-    HiddenField: HiddenField,
-    MultiSelectField: MultiSelectField
-  };
-
-  const [link, setLink] = useState("");
-  const [help, setHelp] = useState("");
-  const toastDescription = "";
-  const toastColor = "#5cb85c";
-  const [loading, setLoding] = useState(true);
-  const [schemaState, setSchemaState] = useState({});
-  const [formData, setFormData] = useState({});
-  const [ui_schema, setUi_schema] = useState({});
-  const active = true;
-
-  console.log("new form", props);
-
-  const getForm = async (id) => {
-    setLoding(true);
-    try {
-      // get json from data(jsonschema, uischema)
-      const results = formJson(id);
-      //   console.log("result", results);
-      if (results) {
-        let parentObject = {},
-          childObject = {};
-        const resultjson = results;
-        for (let [key, value] of Object.entries(
-          resultjson.jsonSchema.properties
-        )) {
-          if (key === props.ParentField) {
-            if (props.ParentValue[key]) {
-              parentObject = { [key]: props.ParentValue[key] };
-            }
-          } else {
-            if (props.ParentValue && typeof props.ParentValue === "object") {
-              Object.entries(props.ParentValue).forEach(([k, value]) => {
-                if (k === key) {
-                  let newO = { [k]: value };
-                  parentObject = { ...parentObject, ...newO };
-                }
-              });
-            }
-          }
-          if (props.ChildField) {
-            Object.entries(props.ChildField).forEach(([k, value]) => {
-              if (k === key) {
-                let newO = { [k]: value };
-                childObject = { ...childObject, ...newO };
-              }
-            });
-          }
-
-          if (typeof value === "object") {
-            for (let [k, v] of Object.entries(value)) {
-              if (k === "format" && v === "date") {
-                let today = new Date();
-                let date =
-                  today.getFullYear() +
-                  "-" +
-                  ("0" + (today.getMonth() + 1)).slice(-2) +
-                  "-" +
-                  ("0" + today.getDate()).slice(-2);
-                value.default = date;
-              }
-            }
-          }
-        }
-        if (props.ParentField) {
-          setFormData({ ...parentObject, ...childObject });
-        }
-
-        let txt, link;
-        if (resultjson.help) {
-          if (resultjson.help.htmlbody) {
-            txt = resultjson.help.htmlbody;
-          }
-          if (resultjson.help.link) {
-            link = resultjson.help.link;
-          }
-        }
-        setHelp(txt);
-        setLink(link);
-
-        props.ClassName(resultjson.class);
-        props.SchemaState(resultjson.jsonSchema);
-        setSchemaState(resultjson.jsonSchema);
-        setUi_schema(resultjson.uiSchema);
-        setLoding(false);
-      } else {
-        alert("form not found");
-        setLoding(false);
-      }
-    } catch (e) {
-      console.error("Problem", e);
-      setLoding(false);
-    }
-  };
-
-  useEffect(() => {
-    if (!props.IsEdit) {
-      getForm(props.Id);
-    }
-    // console.log("props tree", props);
-    // eslint-disable-next-line
-  }, []);
-
-  let formView = (
-    <React.Fragment>
-      <Form
-        schema={schemaState}
-        uiSchema={ui_schema}
-        showErrorList={false}
-        widgets={widget}
-        fields={fields}
-        formData={formData}
-        onSubmit={props.handleSubmit}
-        validator={validator}
-      >
-        {active ? (
-          <button className="btn btn-info submiBtn" type="submit">
-            {props.IsEdit ? "update folder" : "create folder"}
-          </button>
-        ) : (
-          <button className="btn btn-info submiBtn " type="submit" disabled>
-            submitting...
-          </button>
-        )}
-      </Form>
-    </React.Fragment>
-  );
-
-  if (loading) {
-    formView = (
-      <div style={{ height: "300px" }}>
-        <div
-          style={{
-            marginLeft: "45%",
-            marginTop: "150px",
-            fontSize: "45px",
-            color: "#3dd3e0"
-          }}
-          className="loader-37"
-        ></div>
-      </div>
-    );
-  }
-
-  return (
-    <React.Fragment>
-      <div className="row">
-        <div className="col-md-12">
-          <div className="card">
-            <div className="card-body no-padding height-9">
-              {help ? (
-                <div className="dropdown" style={{ marginTop: "-30px" }}>
-                  <i
-                    className="far fa-question-circle dropdown-toggle hovereffect"
-                    aria-hidden="true"
-                    id="dropdownMenuButton"
-                    data-toggle="dropdown"
-                    aria-haspopup="true"
-                    aria-expanded="false"
-                    style={{
-                      fontSize: "18px",
-                      color: "purple",
-                      cursor: "pointer !important",
-                      position: "relative",
-                      top: "40px",
-                      left: "98%"
-                    }}
-                  ></i>
-                  <div
-                    className="dropdown-menu"
-                    aria-labelledby="dropdownMenuButton"
-                    style={{
-                      marginleft: "-121px",
-                      margintop: "-14px",
-                      position: "absolute",
-                      padding: "10px",
-                      width: "300px",
-                      top: "102px!important"
-                    }}
-                  >
-                    {parse(`
-             ${help}
-           `)}
-                    <br />
-                    {link ? (
-                      <a
-                        onClick={(e) => {
-                          e.preventDefault();
-                          window.location.href = link;
-                        }}
-                        target="_blank"
-                        className="btn btn-xs btn-primary"
-                      >
-                        Read more..
-                      </a>
-                    ) : null}
-                  </div>
-                </div>
-              ) : null}
-              <div style={{ fontSize: "13px" }}>{formView}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div id="snackbar" style={{ backgroundColor: toastColor }}>
-        {toastDescription}
-      </div>
-    </React.Fragment>
-  );
-}
-
-export default TreeFormComponent;
@@ -1,894 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { connect } from "react-redux";
-import LabelField from "./fields/LabelField";
-import Parse from "parse";
-import axios from "axios";
-import "../styles/spinner.css";
-import TreeFormComponent from "./TreeFormComponent";
-import TreeEditForm from "./TreeEditForm";
-import "../styles/modal.css";
-import Modal from "react-modal";
-
-const TreeWidget = (props) => {
-  const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
-  const [parseAppId] = useState(localStorage.getItem("parseAppId"));
-  const [isAddField, setIsAddField] = useState(false);
-  const [folderList, setFolderList] = useState([]);
-  const [tabList, setTabList] = useState([]);
-  const [appId, setAppId] = useState(undefined);
-  const [selectedFolder, setSelectedFolder] = useState(undefined);
-  const [loader, setLoader] = useState(false);
-  const [className, setClassName] = useState("");
-  const [schemaState, setSchemaState] = useState({});
-  const [TabURL, setTabURL] = useState("");
-  const [editable, setEditable] = useState(false);
-  const [editId, setEditId] = useState("");
-  const [defaultState, setDefaultState] = useState(false);
-  const [isShowModal, setIsShowModal] = useState(false);
-  const selectFolderHandle = async () => {
-    setIsShowModal(true);
-    setIsAddField(false);
-    setDefaultState(false);
-    setFolderList([]);
-    setLoader(true);
-
-    if (tabList.length > 0) {
-      let len = tabList.length - 1;
-      selectedItemList(tabList[len]);
-    } else {
-      try {
-        var test;
-        if (props.schema.parent) {
-          try {
-            if (props.parent[props.schema.parent]) {
-              Parse.serverURL = parseBaseUrl;
-              Parse.initialize(parseAppId);
-              const currentUser = Parse.User.current();
-              let res;
-              if (localStorage.getItem("Extand_Class")) {
-                let data = JSON.parse(localStorage.getItem("Extand_Class"));
-                res = data[0];
-              } else {
-                var emp = Parse.Object.extend(
-                  localStorage.getItem("extended_class")
-                );
-                var q = new Parse.Query(emp);
-                q.equalTo("UserId", currentUser);
-                res = await q.first();
-                if (res) res = res.toJSON();
-              }
-              if (res) {
-                let json = res;
-                setAppId(json.AppId);
-              }
-              // eslint-disable-next-line
-              let reg = /(\#.*?\#)/gi;
-              let str = props.schema.data.Query;
-              if (str.includes("#")) {
-                test = str.replace(reg, props.parent[props.schema.parent]);
-              } else {
-                test = str;
-              }
-            } else {
-              if (props.child[props.schema.parent]) {
-                Parse.serverURL = parseBaseUrl;
-                Parse.initialize(parseAppId);
-                const currentUser = Parse.User.current();
-                let res;
-                if (localStorage.getItem("Extand_Class")) {
-                  let data = JSON.parse(localStorage.getItem("Extand_Class"));
-                  res = data[0];
-                } else {
-                  emp = Parse.Object.extend(
-                    localStorage.getItem("extended_class")
-                  );
-                  q = new Parse.Query(emp);
-                  q.equalTo("UserId", currentUser);
-                  res = await q.first();
-                  if (res) res = res.toJSON();
-                }
-
-                if (res) {
-                  let json = res;
-                  setAppId(json.AppId);
-                }
-                // eslint-disable-next-line
-                let reg = /(\#.*?\#)/gi;
-                let str = props.schema.data.Query;
-                if (str.includes("#")) {
-                  test = str.replace(reg, props.child[props.schema.parent]);
-                } else {
-                  test = str;
-                }
-              } else {
-                alert(`Please select ${props.schema.parent}`);
-                setLoader(false);
-                return;
-              }
-            }
-          } catch (error) {
-            console.log("error ", error);
-          }
-        } else {
-          Parse.serverURL = parseBaseUrl;
-          Parse.initialize(parseAppId);
-          const currentUser = Parse.User.current();
-          // eslint-disable-next-line
-          let reg = /(\#.*?\#)/gi;
-          let str = props.schema.data.Query;
-          let res;
-          if (localStorage.getItem("Extand_Class")) {
-            let data = JSON.parse(localStorage.getItem("Extand_Class"));
-            res = data[0];
-          } else {
-            emp = Parse.Object.extend(localStorage.getItem("extended_class"));
-            q = new Parse.Query(emp);
-            q.equalTo("UserId", currentUser);
-            res = await q.first();
-            if (res) res = res.toJSON();
-          }
-
-          if (res) {
-            let json = res;
-            setAppId(json.AppId);
-          }
-          if (str.includes("#")) {
-            if (res) {
-              let json = res.toJSON();
-              let output = str.match(reg);
-              if (output.length === 1) {
-                output = output.join();
-                output = output.substring(1, output.length - 1);
-                output = output.split(".");
-                if (output.length === 1) {
-                  let out = output[0];
-                  if (json[out]) {
-                    if (typeof json[out] === "object") {
-                      test = str.replace(reg, JSON.stringify(json[out]));
-                    } else {
-                      test = str.replace(reg, json[out]);
-                    }
-                  } else {
-                    test = str.replace(reg, currentUser.id);
-                  }
-                } else if (output.length === 2) {
-                  let out1 = json[output[0]][output[1]];
-                  if (out1) {
-                    test = str.replace(reg, out1);
-                  }
-                }
-              }
-            }
-          } else {
-            test = str;
-          }
-        }
-
-        let url = `${parseBaseUrl}classes/${props.schema.data.ClassName}?${test}`;
-        const headers = {
-          "Content-Type": "application/json",
-          "X-Parse-Application-Id": parseAppId,
-          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-        };
-        await axios
-          .get(url, { headers: headers })
-          .then((res) => {
-            if (res) {
-              setFolderList(res.data.results);
-              setLoader(false);
-            }
-          })
-          .catch((err) => {
-            setLoader(false);
-            console.log(err);
-          });
-      } catch (error) {
-        setLoader(false);
-      }
-    }
-  };
-
-  const selectedItemList = async (folder) => {
-    setLoader(true);
-    setFolderList([]);
-    try {
-      let url = `${parseBaseUrl}classes/${props.schema.data.ClassName}?where={"${props.schema.data.ParentFolderField}":{"__type":"Pointer","className":"${props.schema.data.ClassName}","objectId":"${folder.objectId}"}}`;
-      const headers = {
-        "Content-Type": "application/json",
-        "X-Parse-Application-Id": parseAppId,
-        "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-      };
-      await axios.get(url, { headers: headers }).then((result) => {
-        if (result) {
-          setFolderList(result.data.results);
-          setLoader(false);
-        }
-      });
-    } catch (error) {
-      setLoader(false);
-    }
-  };
-
-  const removeTabListItem = async (e, i) => {
-    e.preventDefault();
-    setEditable(false);
-    setLoader(true);
-    setFolderList([]);
-    let list = tabList.filter((itm, j) => {
-      if (j <= i) {
-        return itm;
-      }
-    });
-    setTabList(list);
-    setIsAddField(false);
-    try {
-      let _len = list.length - 1;
-      let url = `${parseBaseUrl}classes/${props.schema.data.ClassName}?where={"${props.schema.data.ParentFolderField}":{"__type":"Pointer","className":"${props.schema.data.ClassName}","objectId":"${list[_len].objectId}"}}`;
-      const headers = {
-        "Content-Type": "application/json",
-        "X-Parse-Application-Id": parseAppId,
-        "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-      };
-      await axios.get(url, { headers: headers }).then((result) => {
-        if (result) {
-          setFolderList(result.data.results);
-          setLoader(false);
-        }
-        setLoader(false);
-      });
-    } catch (error) {
-      setLoader(false);
-    }
-  };
-
-  const onDeleteFolder = async (e) => {
-    e.preventDefault();
-    if (folderList.length > 0) {
-      alert(
-        "Folder should not delete. To delete first delete sub items in it."
-      );
-    } else if (window.confirm(`Are you sure you want to delete this record`)) {
-      try {
-        setLoader(true);
-        let len = tabList.length - 1;
-
-        Parse.serverURL = parseBaseUrl;
-        Parse.initialize(parseAppId);
-        var deleted = Parse.Object.extend(props.schema.data.ClassName);
-        var query = new Parse.Query(deleted);
-        await query.get(tabList[len].objectId).then(
-          (del) => {
-            del.destroy().then(
-              (y) => {
-                if (y) {
-                  setLoader(false);
-                  let list = tabList.filter((itm, j) => {
-                    if (j !== len) return itm;
-                  });
-                  setTabList(list);
-                  if (list.length > 0) {
-                    let len = list.length - 1;
-                    selectedItemList(list[len]);
-                  } else {
-                    selectFolderHandle();
-                  }
-                  alert("Folder deleted successfully.");
-                }
-              },
-              (error) => {
-                alert(error.message);
-                setLoader(false);
-              }
-            );
-          },
-          (error) => {
-            console.log("error ", error);
-            // The object was not retrieved successfully.
-            setLoader(false);
-          }
-        );
-      } catch (error) {
-        setLoader(false);
-        console.log(error);
-      }
-    }
-  };
-
-  const onSubmitResult = async (e) => {
-    setIsShowModal(false);
-    e.preventDefault();
-    //console.log("tabList ", tabList);
-    if (tabList.length > 0) {
-      try {
-        let len = tabList.length - 1;
-        setSelectedFolder({
-          Topic: tabList[len][`${props.schema.data.FolderNameField}`],
-          description: tabList[len][`${props.schema.data.FolderDescription}`]
-        });
-        props.onChange(tabList[len]["objectId"]);
-        let url = "Folders";
-        tabList.forEach((t) => {
-          url = url + " / " + t[`${props.schema.data.FolderNameField}`];
-        });
-        setTabURL(url);
-        setIsAddField(false);
-        if (!props.formData) {
-          setTabList([]);
-        }
-      } catch (error) {
-        setIsAddField(false);
-        alert(error.message);
-      }
-    } else {
-      setIsAddField(false);
-    }
-  };
-
-  const editFolderDisplay = async (formData) => {
-    try {
-      let objectId = formData.objectId;
-      let className = formData.className;
-      Parse.serverURL = parseBaseUrl;
-      Parse.initialize(parseAppId);
-      const fldr = Parse.Object.extend(className);
-      let query = new Parse.Query(fldr);
-      query.equalTo("objectId", objectId);
-      const result = await query.first();
-      let resultJson = result.toJSON();
-      let CustomTabList = [];
-      if (resultJson) {
-        CustomTabList.push(resultJson);
-        if (resultJson[`${props.schema.data.ParentFolderField}`]) {
-          let tabsRes = resultJson[`${props.schema.data.ParentFolderField}`];
-          let looping = false;
-          do {
-            let fldttr = Parse.Object.extend(tabsRes.className);
-            let query2 = new Parse.Query(fldttr);
-            query2.equalTo("objectId", tabsRes.objectId);
-            let custome_res = await query2.first();
-            if (custome_res) {
-              let tabsData = custome_res.toJSON();
-              CustomTabList.push(tabsData);
-              if (tabsData[`${props.schema.data.ParentFolderField}`]) {
-                tabsRes = tabsData[`${props.schema.data.ParentFolderField}`];
-                looping = true;
-              } else {
-                looping = false;
-              }
-            }
-          } while (looping);
-        }
-        let url = "Folders";
-        CustomTabList.length > 0 &&
-          CustomTabList.reverse().forEach(
-            (t) => (url = url + " / " + t[props.schema.data.FolderNameField])
-          );
-        setTabURL(url);
-        setSelectedFolder({
-          Topic: resultJson[`${props.schema.data.FolderNameField}`],
-          description: resultJson[`${props.schema.data.FolderDescription}`]
-        });
-        setTabList(CustomTabList);
-        props.onChange(resultJson.objectId);
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  const handleSubmit = async ({ formData }) => {
-    setLoader(true);
-
-    try {
-      let RowData = formData;
-      let _scanData = schemaState;
-      Object.keys(_scanData).forEach(function (key) {
-        let _dd = _scanData[key];
-        Object.keys(_dd).forEach(function (k) {
-          if (_dd[k].component === "AutoSuggest" && _dd[k].isPointer) {
-            let pointer = {
-              __type: "Pointer",
-              className: _dd[k].class,
-              objectId: RowData[k]
-            };
-            RowData[k] = pointer;
-          }
-          if (_dd[k].format === "date") {
-            let newdate = new Date(RowData[k]);
-            RowData[k] = newdate;
-          }
-          if (_dd[k].component === "DateTime") {
-            let newDate11;
-            if (!RowData[k]) {
-              newDate11 = new Date();
-            } else {
-              newDate11 = new Date(RowData[k]);
-            }
-            RowData[k] = newDate11;
-          }
-          if (_dd[k].component === "CurrencyInput") {
-            if (_dd[k].currencyColumn) {
-              RowData[`${_dd[k].currencyColumn}`] = _dd[k].defaultcurrency;
-            }
-          }
-          if (_dd[k].data !== undefined) {
-            if (_dd[k].data.isPointer) {
-              let pointer = {};
-              if (RowData[k] && RowData[k] !== "Select") {
-                if (_dd[k].data.class) {
-                  if (RowData[k]) {
-                    pointer = {
-                      __type: "Pointer",
-                      className: _dd[k].data.class,
-                      objectId: RowData[k]
-                    };
-                  }
-                } else {
-                  pointer = {
-                    __type: "Pointer",
-                    className: localStorage.getItem("extended_class"),
-                    objectId: RowData[k]
-                  };
-                }
-
-                RowData[k] = pointer;
-              }
-            }
-            if (_dd[k].data.FolderTypeValue) {
-              let obj = {
-                __type: "Pointer",
-                className: _dd[k].data.ClassName,
-                objectId: RowData[k]
-              };
-              RowData[k] = obj;
-            }
-          }
-          if (_dd[k].type === "string") {
-            let d = RowData[k];
-            if (typeof d === "string") {
-              RowData[k] = d.trim();
-            }
-          }
-        });
-      });
-
-      Parse.serverURL = parseBaseUrl;
-      Parse.initialize(parseAppId);
-
-      var forms = Parse.Object.extend(className);
-      var folder = new forms();
-      folder.set(
-        props.schema.data.FolderNameField,
-        formData[props.schema.data.FolderNameField]
-      );
-      if (props.schema.data.FolderDescription) {
-        folder.set(
-          props.schema.data.FolderDescription,
-          formData[props.schema.data.FolderDescription]
-        );
-      }
-
-      folder.set("AppId", appId);
-      folder.set(
-        props.schema.data.FolderTypeField,
-        props.schema.data.FolderTypeValue
-      );
-      if (tabList.length > 0) {
-        let len = tabList.length - 1;
-        folder.set(props.schema.data.ParentFolderField, {
-          __type: "Pointer",
-          className: props.schema.data.ClassName,
-          objectId: tabList[len]["objectId"]
-        });
-      }
-      folder.save(RowData).then(
-        (result) => {
-          RowData = {};
-          if (result) {
-            setIsAddField(false);
-            setLoader(false);
-            if (tabList.length > 0) {
-              let len = tabList.length - 1;
-              selectedItemList(tabList[len]);
-            } else {
-              selectFolderHandle();
-            }
-          }
-        },
-        (error) => {
-          console.log("error ", error);
-          setLoader(false);
-        }
-      );
-    } catch (error) {
-      setLoader(false);
-    }
-  };
-
-  useEffect(() => {
-    if (props.formData) {
-      editFolderDisplay(props.formData);
-    }
-
-    // eslint-disable-next-line
-  }, [props.formData]);
-
-  useEffect(() => {
-    if (defaultState) {
-      selectFolderHandle();
-    }
-
-    // eslint-disable-next-line
-  }, [defaultState]);
-  const customStyles = {
-    content: {
-      top: "50%",
-      left: "50%",
-      right: "auto",
-      bottom: "auto",
-      marginRight: "-50%",
-      transform: "translate(-50%, -50%)",
-      backgroundColor: "white",
-      padding: 0
-    },
-    overlay: {
-      width:"100%",
-      backgroundColor: "rgba(0, 0, 0, 0.75)",
-      zIndex: 50
-    }
-  };
-
-  return (
-    <React.Fragment>
-      <LabelField
-        Title={props.schema.title}
-        Name={props.name}
-        Required={props.required}
-        HelpBody={props.schema.helpbody}
-        HelpLink={props.schema.helplink}
-      />
-      <br />
-      <div className="block max-w-sm  bg-white border border-gray-200  shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700">
-        <div
-          style={{
-            display: "flex",
-            color: "black",
-            fontWeight: "bold",
-            fontSize: "13px",
-            padding: "2%",
-            alignItems: "center"
-          }}
-        >
-          <div style={{ width: "20%" }}>
-            <div
-              className="pull-left"
-              title="Select Folder"
-              style={{
-                color: "#33bbff",
-                margin: "auto",
-                padding: "10px 10px",
-                textAlign: "center"
-              }}
-            >
-              <i
-                className="far fa-folder-open"
-                style={{ fontSize: "40px" }}
-                aria-hidden="true"
-              ></i>
-            </div>
-          </div>
-          <div style={{ margin: "0px 10px 0 20px", width: "80%" }}>
-            <div>
-              {selectedFolder && selectedFolder.Topic
-                ? selectedFolder.Topic
-                : "Root"}
-              <i
-                className="fa fa-pencil"
-                title="Select Folder"
-                style={{ fontSize: 17, cursor: "pointer", marginLeft: 12 }}
-                onClick={selectFolderHandle}
-              ></i>
-              {selectedFolder && (
-                <a
-                  className="pull-right"
-                  onClick={() => {
-                    setSelectedFolder(undefined);
-                    setTabURL(undefined);
-                    props.onChange(undefined);
-                  }}
-                >
-                  <i
-                    className="fa fa-times-circle-o"
-                    aria-hidden="true"
-                    style={{ fontSize: 17 }}
-                  ></i>
-                </a>
-              )}
-            </div>
-            {TabURL && (
-              <div
-                style={{ fontSize: "10px", color: "gray", fontWeight: "bold" }}
-              >
-                ({TabURL})
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-      {/* save document in folder and add new folder modal */}
-      <Modal
-        isOpen={isShowModal}
-        onRequestClose={() => setIsShowModal(false)}
-        shouldCloseOnOverlayClick={false}
-        contentLabel="Modal"
-        style={customStyles}
-      >
-        <div className="w-full min-w-[300px] md:min-w-[500px]">
-          {/* header */}
-          <div
-            style={{
-              display: "flex",
-              justifyContent: "space-between",
-              alignItems: "center",
-              backgroundColor: "rgba(203, 200, 200, 0.09)"
-            }}
-          >
-            <div style={{ padding: "10px" }}>
-              <h4 className=" text-black">Select Folder</h4>
-            </div>
-            <div style={{ padding: "10px" }}>
-              <button
-                className="btn btn-sm pull-right"
-                data-dismiss="modal"
-                title="Select Folder"
-                style={{
-                  width: "auto",
-                  backgroundColor: "white",
-                  border: "1px solid  gray",
-                  boxshadow: "rgba(100, 100, 111, 0.2) 0px 7px 29px 0px"
-                }}
-                onClick={(e) => {
-                  e.preventDefault();
-                  setIsAddField(false);
-                  setFolderList([]);
-                  setEditable(false);
-                  if (!props.formData) {
-                    setTabList([]);
-                  }
-                  setIsShowModal(false);
-                }}
-              >
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-          </div>
-          <hr />
-          {/* body */}
-          <div className="p-3 space-y-6">
-            <div
-              style={{
-                color: "#ac4848",
-                cursor: "pointer",
-                fontSize: "14px",
-                fontWeight: "500"
-              }}
-            >
-              <a
-                onClick={() => {
-                  setTabList([]);
-                  setIsAddField(false);
-                  setDefaultState(true);
-                  setEditable(false);
-                }}
-              >
-                Folders
-              </a>
-              {" / "}
-
-              {tabList &&
-                tabList.map((tab, i) => (
-                  <React.Fragment key={`${tab.objectId}-${i}`}>
-                    <a
-                      title={tab[`${props.schema.data.FolderNameField}`]}
-                      onClick={(e) => removeTabListItem(e, i)}
-                    >
-                      {tab[`${props.schema.data.FolderNameField}`]}
-                    </a>
-                    {" / "}
-                  </React.Fragment>
-                ))}
-              <hr />
-            </div>
-            {editable && (
-              <TreeEditForm
-                FormId={props.schema.data.FormId}
-                objectId={editId}
-                HideView={(cl) => {
-                  setEditable(cl);
-                  selectFolderHandle();
-                }}
-              />
-            )}
-            {isAddField && !loader && !editable && (
-              <TreeFormComponent
-                Id={props.schema.data.FormId}
-                handleSubmit={handleSubmit}
-                ParentField={props.schema.parent && props.schema.parent}
-                ParentValue={props.schema.parent && props.parent}
-                ChildField={props.child && props.child}
-                ClassName={(cls) => setClassName(cls)}
-                SchemaState={(cls) => setSchemaState(cls)}
-              />
-            )}
-            {loader && (
-              <div
-                className="loader-01"
-                style={{
-                  marginTop: "50px",
-                  marginLeft: "50%",
-                  color: "rgb(0,28,28)",
-                  fontSize: "35px"
-                }}
-              ></div>
-            )}
-
-            {!isAddField && !editable && (
-              <div
-                style={{
-                  maxHeight: "280px",
-                  overflowY: "auto",
-                  marginTop: "5px"
-                }}
-              >
-                <ul>
-                  {folderList &&
-                    folderList.map(
-                      (fldr) =>
-                        fldr[props.schema.data.FolderTypeField] ===
-                          props.schema.data.FolderTypeValue && (
-                          <li
-                            key={`${fldr.objectId}`}
-                            style={{
-                              listStyle: "none",
-                              padding: "10px 20px",
-                              textTransform: "capitalize",
-                              fontWeight: 300,
-                              border: "1px solid gray",
-                              borderRadius: "1px",
-                              marginTop: "8px",
-                              transition: "all 0.75s ease",
-                              WebkitTransition: "all 0.5s ease",
-                              MozTransition: "all 0.5s ease",
-                              MsTransition: "all 0.5s ease",
-                              OTransition: "all 0.5 ease",
-                              display: "flex",
-                              alignItems: "center",
-                              justifyContent: "space-between"
-                            }}
-                          >
-                            <div
-                              style={{
-                                display: "flex",
-                                alignItems: "center"
-                              }}
-                            >
-                              <i
-                                className={"fa fa-folder"}
-                                style={{
-                                  fontSize: "1.4rem",
-                                  color: "skyblue"
-                                }}
-                                aria-hidden="true"
-                              ></i>
-                              <a
-                                style={{
-                                  fontWeight: "bold",
-                                  fontSize: "12px",
-                                  marginLeft: "4px",
-                                  cursor: "pointer"
-                                }}
-                                onClick={() => {
-                                  setTabList((tabs) => tabs.concat(fldr));
-                                  selectedItemList(fldr);
-                                }}
-                              >
-                                {fldr[`${props.schema.data.FolderNameField}`]}
-                              </a>
-                            </div>
-
-                            {fldr[props.schema.data.FolderTypeField] ===
-                              props.schema.data.FolderTypeValue && (
-                              <a
-                                className="float-right"
-                                onClick={() => {
-                                  setEditable(true);
-                                  setEditId(fldr.objectId);
-                                }}
-                              >
-                                <i
-                                  className={"fa fa-pencil"}
-                                  title={"Edit Folder"}
-                                  style={{
-                                    fontSize: "0.9rem",
-                                    color: "purple",
-                                    cursor: "pointer"
-                                  }}
-                                  aria-hidden="true"
-                                ></i>
-                              </a>
-                            )}
-                          </li>
-                        )
-                    )}
-                </ul>
-              </div>
-            )}
-          </div>
-          {/* footer */}
-
-          <div className="flex items-center p-3 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600 justify-between">
-            <button
-              className="btn btn-sm float-left  createFolder"
-              title="Create New Folder"
-              onClick={(e) => {
-                e.preventDefault();
-                setIsAddField(true);
-              }}
-            >
-              {" "}
-              <i
-                className="fa fa-plus"
-                style={{ fontSize: "1.5rem" }}
-                aria-hidden="true"
-              ></i>
-            </button>
-            {!isAddField && !editable && (
-              <div className="flex">
-                {tabList.length > 0 && (
-                  <button
-                    className="btn btn-sm float-right deleteFolder"
-                    title="Delete Folder"
-                    onClick={onDeleteFolder}
-                  >
-                    {" "}
-                    <i
-                      className="fa fa-trash"
-                      style={{ fontSize: "1rem" }}
-                      aria-hidden="true"
-                    ></i>
-                  </button>
-                )}
-                <button
-                  className="btn btn-sm float-right saveFolder"
-                  title="Save Here"
-                  onClick={onSubmitResult}
-                >
-                  {" "}
-                  {/* <i
-                    className="fa fa-floppy-o"
-                    style={{ fontSize: "2rem" }}
-                    aria-hidden="true"
-                  ></i> */}
-                  <i
-                    className="fas fa-save"
-                    aria-hidden="true"
-                    style={{ fontSize: "20px" }}
-                  ></i>
-                </button>
-              </div>
-            )}
-          </div>
-        </div>
-      </Modal>
-    </React.Fragment>
-  );
-};
-
-const mapStateToProps = (state) => {
-  return {
-    parent: state.Level1_Dropdown,
-    child: state.Level2_Dropdown
-  };
-};
-
-export default connect(mapStateToProps)(TreeWidget);
@@ -0,0 +1,47 @@
+import React from "react";
+import "../../styles/loader.css";
+import { useNavigate } from "react-router-dom";
+import { openInNewTab } from "../../constant/Utils";
+
+const DashboardButton = (props) => {
+  const navigate = useNavigate();
+
+  function openReport() {
+    if (props.Data && props.Data.Redirect_type) {
+      const Redirect_type = props.Data.Redirect_type;
+      const id = props.Data.Redirect_id;
+      if (Redirect_type === "Form") {
+        navigate(`/form/${id}`);
+      } else if (Redirect_type === "Report") {
+        navigate(`/report/${id}`);
+      } else if (Redirect_type === "Url") {
+        openInNewTab(id);
+      }
+    }
+  }
+  return (
+    <div
+      onClick={() => openReport()}
+      className={`${
+        props.Data && props.Data.Redirect_type
+          ? "cursor-pointer"
+          : "cursor-default"
+      } w-full px-3 py-2 flex text-white rounded-md shadow overflow-hidden`}
+    >
+      <div className="flex items-center justify-start gap-5">
+        <span className="rounded-full bg-black bg-opacity-20 w-[60px] h-[60px]  self-start flex justify-center items-center">
+          <i
+            className={`${
+              props.Icon ? props.Icon : "fa fa-solid fa-info"
+            } text-[25px] lg:text-[30px]`}
+          ></i>
+        </span>
+        <div className="">
+          <div className="text-base lg:text-lg text-black"> {props.Label}</div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default DashboardButton;
@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from "react";
 import axios from "axios";
 import Parse from "parse";
-import onSearchFilter from "../../constant/searchQuery";
 import getReplacedHashQuery from "../../constant/getReplacedHashQuery";
 import "../../styles/loader.css";
 import { useNavigate } from "react-router-dom";
@@ -25,9 +24,6 @@ const DashboardCard = (props) => {
        };
        let body = {};
        let currentUser;
-
-        Parse.serverURL = parseBaseUrl;
-        Parse.initialize(parseAppId);
        let currentUser1 = Parse.User.current();
        currentUser = currentUser1.id;
        let res;
@@ -35,14 +31,9 @@ const DashboardCard = (props) => {
          let data = JSON.parse(localStorage.getItem("Extand_Class"));
          res = data[0];
        } else {
-          var emp = Parse.Object.extend(localStorage.getItem("extended_class"));
-          var q = new Parse.Query(emp);
-          q.equalTo("UserId", {
-            __type: "Pointer",
-            className: "_User",
-            objectId: currentUser
+          res = await Parse.Cloud.run("getUserDetails", {
+            email: currentUser.get("email")
          });
-          res = await q.first();
          if (res) res = res.toJSON();
        }
        if (res) {
@@ -50,12 +41,7 @@ const DashboardCard = (props) => {
          var reg = /(\#.*?\#)/gi; // eslint-disable-line
          var str = props.Data.query;
          var test = "";
-          if (str.includes("#filterCondition#")) {
-            str = str.replace(
-              "#filterCondition#",
-              onSearchFilter(props.DefaultQuery)
-            );
-          }
+
          if (props.Data.extendkey) {
            let a = props.Data.extendkey.split(".");
            if (a.length > 0) {
@@ -93,8 +79,6 @@ const DashboardCard = (props) => {
    } else {
      setLoading(true);
      try {
-        Parse.serverURL = parseBaseUrl;
-        Parse.initialize(parseAppId);
        const currentUser = Parse.User.current();
        let reg1 = /(\#.*?\#)/gi; // eslint-disable-line
        let _query = props.Data.query;
@@ -110,13 +94,10 @@ const DashboardCard = (props) => {
            let data = JSON.parse(localStorage.getItem("Extand_Class"));
            resr = data[0];
          } else {
-            let emp = Parse.Object.extend(
-              localStorage.getItem("extended_class")
-            );
-            let q = new Parse.Query(emp);
-            q.equalTo("UserId", currentUser);
-            let t = await q.first();
-            resr = t.toJSON();
+            resr = await Parse.Cloud.run("getUserDetails", {
+              email: currentUser.get("email")
+            });
+            if (resr) resr = resr.toJSON();
          }

          let json = resr;
@@ -150,47 +131,65 @@ const DashboardCard = (props) => {
          "X-Parse-Application-Id": parseAppId,
          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
        };
-        await axios.get(url, { headers: headers }).then((res) => {
-          if (res.data.results.length > 0) {
-            setLoading(false);
-            if (props.Data.key !== "count") {
-              setresponse(res.data.results[0][props.Data.key]);
-            } else {
-              if (props.Label === "Need your Signature") {
-                const listData = res.data?.results.filter(
-                  (x) => x.Signers.length > 0
+        // handle need your sign report count
+        if (props.Data.Redirect_id === "4Hhwbp482K") {
+          const params = {
+            reportId: props.Data.Redirect_id,
+            skip: 0,
+            limit: 200
+          };
+          const url = `${parseBaseUrl}/functions/getReport`;
+          await axios
+            .post(url, params, {
+              headers: {
+                "Content-Type": "application/json",
+                "X-Parse-Application-Id": parseAppId,
+                sessiontoken: localStorage.getItem("accesstoken")
+              }
+            })
+            .then((res) => {
+              const listData = res.data?.result.filter(
+                (x) => x.Signers.length > 0
+              );
+              let arr = [];
+              for (const obj of listData) {
+                const isSigner = obj.Signers.some(
+                  (item) => item.UserId.objectId === currentUser.id
                );
-                let arr = [];
-                for (const obj of listData) {
-                  const isSigner = obj.Signers.some(
-                    (item) => item.UserId.objectId === currentUser.id
-                  );
-                  if (isSigner) {
-                    let isRecord;
-                    if (obj?.AuditTrail && obj?.AuditTrail.length > 0) {
-                      isRecord = obj?.AuditTrail.some(
-                        (item) =>
-                          item?.UserPtr?.UserId?.objectId === currentUser.id &&
-                          item.Activity === "Signed"
-                      );
-                    } else {
-                      isRecord = false;
-                    }
-                    if (isRecord === false) {
-                      arr.push(obj);
-                    }
+                if (isSigner) {
+                  let isRecord;
+                  if (obj?.AuditTrail && obj?.AuditTrail.length > 0) {
+                    isRecord = obj?.AuditTrail.some(
+                      (item) =>
+                        item?.UserPtr?.UserId?.objectId === currentUser.id &&
+                        item.Activity === "Signed"
+                    );
+                  } else {
+                    isRecord = false;
+                  }
+                  if (isRecord === false) {
+                    arr.push(obj);
                  }
                }
-                setresponse(arr.length);
+              }
+              setresponse(arr.length);
+              setLoading(false);
+            });
+        } else {
+          await axios.get(url, { headers: headers }).then((res) => {
+            if (res.data.results.length > 0) {
+              setLoading(false);
+              if (props.Data.key !== "count") {
+                setresponse(res.data.results[0][props.Data.key]);
              } else {
                setresponse(res.data[props.Data.key]);
              }
+            } else {
+              setresponse(0);
+              setLoading(false);
            }
-          } else {
-            setresponse(0);
-            setLoading(false);
-          }
-        });
+          });
+        }
      } catch (e) {
        console.error("Problem", e);
        setLoading(false);
@@ -219,21 +218,16 @@ const DashboardCard = (props) => {

        if (restr.includes("#")) {
          try {
-            Parse.serverURL = parseBaseUrl;
-            Parse.initialize(parseAppId);
            const currentUser = Parse.User.current();
            let res;
            if (localStorage.getItem("Extand_Class")) {
              let data = JSON.parse(localStorage.getItem("Extand_Class"));
              res = data[0];
            } else {
-              var emp = Parse.Object.extend(
-                localStorage.getItem("extended_class")
-              );
-              var q = new Parse.Query(emp);
-              q.equalTo("UserId", currentUser);
-              let resr = await q.first();
-              res = resr.toJSON();
+              let resr = await Parse.Cloud.run("getUserDetails", {
+                email: currentUser.get("email")
+              });
+              if (res) res = resr.toJSON();
            }

            let json = res;
@@ -9,39 +9,58 @@ function DashboardReport(props) {
  const [isLoader, setIsLoader] = useState(true);
  const [reportName, setReportName] = useState("");
  const [actions, setActions] = useState([]);
+  const [heading, setHeading] = useState([]);
+  const [isNextRecord, setIsNextRecord] = useState(false);
+  const [isMoreDocs, setIsMoreDocs] = useState(true);
+  const abortController = new AbortController();
+  const docPerPage = 5;
+
  useEffect(() => {
    setReportName("");
    getReportData(props.Record.reportId);
+
+    // Function returned from useEffect is called on unmount
+    return () => {
+      setIsLoader(true);
+      setList([]);
+      setIsNextRecord(false);
+      // Here it'll abort the fetch
+      abortController.abort();
+    };
+    // eslint-disable-next-line
  }, [props.Record.reportId]);

-  const getReportData = async (id) => {
+  // below useEffect call when isNextRecord state is true and fetch next record
+  useEffect(() => {
+    if (isNextRecord) {
+      getReportData(props.Record.reportId, List.length, 200);
+    }
+    // eslint-disable-next-line
+  }, [isNextRecord]);
+
+  const getReportData = async (id, skipUserRecord = 0, limit = 200) => {
    setIsLoader(true);
    const json = reportJson(id);
    if (json) {
      setActions(json.actions);
      setReportName(json.reportName);
-      const { className, params, keys, orderBy } = json;
-      Parse.serverURL = localStorage.getItem("BaseUrl12");
-      Parse.initialize(localStorage.getItem("AppID12"));
-      const serverURL =
-        localStorage.getItem("BaseUrl12") + "classes/" + className;
+      setHeading(json.heading);
+      const currentUser = Parse.User.current().id;

-      const strParams = JSON.stringify(params);
-      const strKeys = keys.join();
      const headers = {
        "Content-Type": "application/json",
-        "X-Parse-Application-Id": localStorage.getItem("AppID12"),
-        "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+        "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+        sessiontoken: localStorage.getItem("accesstoken")
      };
      try {
-        const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}&include=AuditTrail.UserPtr`;
-        const res = await axios.get(url, { headers: headers });
-        // console.log("res ", res.data?.results);
+        const params = { reportId: id, skip: skipUserRecord, limit: limit };
+        const url = `${localStorage.getItem("baseUrl")}/functions/getReport`;
+        const res = await axios.post(url, params, {
+          headers: headers,
+          signal: abortController.signal // is used to cancel fetch query
+        });
        if (id === "5Go51Q7T8r") {
-          const currentUser = Parse.User.current().id;
-          const listData = res.data?.results.filter(
-            (x) => x.Signers.length > 0
-          );
+          const listData = res.data?.result.filter((x) => x.Signers.length > 0);
          let arr = [];
          for (const obj of listData) {
            const isSigner = obj.Signers.some(
@@ -63,14 +82,34 @@ function DashboardReport(props) {
              }
            }
          }
-          setList(arr);
+          if (arr.length === docPerPage) {
+            setIsMoreDocs(true);
+          } else {
+            setIsMoreDocs(false);
+          }
+          setList((prevRecord) =>
+            prevRecord.length > 0 ? [...prevRecord, ...arr] : arr
+          );
        } else {
-          setList(res.data?.results);
+          if (res.data.result.length === docPerPage) {
+            setIsMoreDocs(true);
+          } else {
+            setIsMoreDocs(false);
+          }
+          setIsNextRecord(false);
+          setList((prevRecord) =>
+            prevRecord.length > 0
+              ? [...prevRecord, ...res.data.result]
+              : res.data.result
+          );
        }
        setIsLoader(false);
      } catch (err) {
-        console.log("err ", err);
-        setIsLoader(false);
+        const isCancel = axios.isCancel(err);
+        if (!isCancel) {
+          console.log("err ", err);
+          setIsLoader(false);
+        }
      }
    } else {
      setIsLoader(false);
@@ -101,8 +140,12 @@ function DashboardReport(props) {
            <ReportTable
              ReportName={reportName}
              List={List}
-              act={"Sign"}
+              setList={setList}
              actions={actions}
+              heading={heading}
+              setIsNextRecord={setIsNextRecord}
+              isMoreDocs={isMoreDocs}
+              docPerPage={docPerPage}
            />
          ) : (
            <div className="flex items-center justify-center h-[100px] w-full bg-white rounded">
@@ -1,278 +1,72 @@
-import React, { useState, Suspense, lazy } from "react";
-import moment from "moment";
-import ErrorBoundary from "../ErrorBoundary";
-
+import React, { Suspense, lazy } from "react";
+const DashboardButton = lazy(() => import("./DashboardButton"));
 const DashboardCard = lazy(() => import("./DashboardCard"));
-
 const DashboardReport = lazy(() => import("./DashboardReport"));
-
+const buttonList = [
+  {
+    label: "Sign yourself",
+    redirectId: "sHAnZphf69",
+    redirectType: "Form"
+  },
+  {
+    label: "Request signature",
+    redirectId: "8mZzFxbG1z",
+    redirectType: "Form"
+  }
+];
 const GetDashboard = (props) => {
-  const [filter, setfilter] = useState("");
-  const [option, setoption] = useState("");
-
-  const onSearchFilter = (e) => {
-    let _search = e.target.value;
-    localStorage.setItem("DashboardDefaultFilter", _search);
-    switch (_search) {
-      case "Today": {
-        let d = new Date();
-        let formDate = new Date(
-          Date.UTC(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0, 0)
-        ).toISOString();
-        let Todate = new Date(
-          Date.UTC(d.getFullYear(), d.getMonth(), d.getDate(), 23, 59, 59)
-        ).toISOString();
-        let Query = `'$gte':'${formDate}','$lte':'${Todate}'`;
-        setfilter(Query);
-        setoption(_search);
-        break;
-      }
-      case "Yesterday": {
-        let d1 = new Date();
-        d1.setDate(d1.getDate() - 1);
-        let yesFrDate = new Date(
-          Date.UTC(d1.getFullYear(), d1.getMonth(), d1.getDate(), 0, 0, 0)
-        ).toISOString();
-
-        let YesTodate = new Date(
-          Date.UTC(d1.getFullYear(), d1.getMonth(), d1.getDate(), 23, 59, 59)
-        ).toISOString();
-        let Query1 = `'$gte':'${yesFrDate}','$lte':'${YesTodate}'`;
-        setfilter(Query1);
-        setoption(_search);
-        break;
-      }
-      case "This week": {
-        let oneDay = 24 * 60 * 60 * 1000;
-        let curr = new Date(); // get current date
-        let first = curr.getDate() - curr.getDay(); // First day is the day of the month - the day of the week
-
-        let firstday = new Date(
-          new Date(
-            Date.UTC(
-              curr.getFullYear(),
-              curr.getMonth(),
-              curr.getDate(),
-              0,
-              0,
-              0
-            )
-          ).setDate(first)
-        ).toISOString();
-        let diffDays = Math.round(
-          Math.abs(
-            (new Date(
-              Date.UTC(
-                curr.getFullYear(),
-                curr.getMonth(),
-                curr.getDate(),
-                23,
-                59,
-                59
-              )
-            ) -
-              new Date(firstday)) /
-              oneDay
-          )
-        ); //Days since last week
-        let last = first + diffDays;
-        let lastday = new Date(
-          new Date(
-            Date.UTC(
-              curr.getFullYear(),
-              curr.getMonth(),
-              curr.getDate(),
-              23,
-              59,
-              59
-            )
-          ).setDate(last)
-        ).toISOString();
-        let Query2 = `'$gte':'${firstday}','$lte':'${lastday}'`;
-        setfilter(Query2);
-        setoption(_search);
-        break;
-      }
-      case "Last 7 days": {
-        let d7 = new Date();
-        let d7l = new Date();
-        d7.setDate(d7.getDate() - 7);
-        let l7t = new Date(
-          Date.UTC(d7l.getFullYear(), d7l.getMonth(), d7l.getDate(), 23, 59, 59)
-        ).toISOString();
-        let date7 = new Date(
-          Date.UTC(d7.getFullYear(), d7.getMonth(), d7.getDate(), 0, 0, 0)
-        ).toISOString();
-        let Query7 = `'$gte':'${date7}','$lte':'${l7t}'`;
-        setfilter(Query7);
-        setoption(_search);
-        break;
-      }
-      case "Last 14 days": {
-        let d14 = new Date();
-        let d14l = new Date();
-        let l14t = new Date(
-          Date.UTC(
-            d14l.getFullYear(),
-            d14l.getMonth(),
-            d14l.getDate(),
-            23,
-            59,
-            59
-          )
-        ).toISOString();
-        d14.setDate(d14.getDate() - 14);
-        let date14 = new Date(
-          Date.UTC(d14.getFullYear(), d14.getMonth(), d14.getDate(), 0, 0, 0)
-        ).toISOString();
-
-        let Query14 = `'$gte':'${date14}','$lte':'${l14t}'`;
-        setfilter(Query14);
-        setoption(_search);
-        break;
-      }
-      case "Last 30 days": {
-        let d30 = new Date();
-        let d30l = new Date();
-        let l30t = new Date(
-          Date.UTC(
-            d30l.getFullYear(),
-            d30l.getMonth(),
-            d30l.getDate(),
-            23,
-            59,
-            59
-          )
-        ).toISOString();
-        d30.setDate(d30.getDate() - 30);
-        let date30 = new Date(
-          Date.UTC(d30.getFullYear(), d30.getMonth(), d30.getDate(), 0, 0, 0)
-        ).toISOString();
-        let Query30 = `'$gte':'${date30}','$lte':'${l30t}'`;
-        setfilter(Query30);
-        setoption(_search);
-        break;
-      }
-      case "Last week": {
-        const from_date = moment().startOf("week").subtract(7, "days");
-        const to_date = moment().endOf("week").subtract(7, "days");
-        let Queryl = `'$gte':'${from_date.toISOString()}','$lte':'${to_date.toISOString()}'`;
-        setfilter(Queryl);
-        setoption(_search);
-        break;
-      }
-      case "This month": {
-        const tdate = new Date();
-        let tfirstDay = new Date(
-          tdate.getFullYear(),
-          tdate.getMonth(),
-          1
-        ).toISOString();
-        let tlastDay = new Date(
-          tdate.getFullYear(),
-          tdate.getMonth() + 1,
-          0
-        ).toISOString();
-        let Querylt = `'$gte':'${tfirstDay}','$lte':'${tlastDay}'`;
-        setfilter(Querylt);
-        setoption(_search);
-        break;
-      }
-      case "Last month": {
-        const ldate = new Date();
-        var lfirstDay = new Date(
-          ldate.getFullYear(),
-          ldate.getMonth() - 1,
-          2
-        ).toISOString();
-        var llastDay = new Date(
-          ldate.getFullYear(),
-          ldate.getMonth(),
-          1
-        ).toISOString();
-        let Queryltl = `'$gte':'${lfirstDay}','$lte':'${llastDay}'`;
-        setfilter(Queryltl);
-        setoption(_search);
-        break;
-      }
-      case "All": {
-        let fall = new Date(
-          new Date().getFullYear() - 100,
-          0,
-          1,
-          0,
-          0,
-          0
-        ).toISOString();
-        let fall_year = `'$gte':'${fall}'`;
-        setfilter(fall_year);
-        setoption(_search);
-        break;
-      }
-      case "This year": {
-        let fcy = new Date(
-          new Date().getFullYear(),
-          0,
-          1,
-          0,
-          0,
-          0
-        ).toISOString();
-        let lcy = new Date(
-          new Date().getFullYear(),
-          11,
-          31,
-          23,
-          59,
-          59
-        ).toISOString();
-        let cur_year = `'$gte':'${fcy}','$lte':'${lcy}'`;
-        setfilter(cur_year);
-        setoption(_search);
-        break;
-      }
-      case "Last year": {
-        let fly = new Date(
-          new Date().getFullYear() - 1,
-          0,
-          1,
-          0,
-          0,
-          0
-        ).toISOString();
-        let lly = new Date(
-          new Date().getFullYear() - 1,
-          11,
-          31,
-          23,
-          59,
-          59
-        ).toISOString();
-        let last_year = `'$gte':'${fly}','$lte':'${lly}'`;
-        setfilter(last_year);
-        setoption(_search);
-        break;
-      }
-      default: {
-        setoption(_search);
-        break;
-      }
-    }
-  };
+  const Button = ({ label, redirectId, redirectType }) => (
+    <div className={"bg-white rounded-md shadow  w-full"}>
+      <Suspense
+        fallback={
+          <div style={{ height: "300px" }}>
+            <div
+              style={{
+                marginLeft: "45%",
+                marginTop: "150px",
+                fontSize: "45px",
+                color: "#3dd3e0"
+              }}
+              className="loader-37"
+            ></div>
+          </div>
+        }
+      >
+        <DashboardButton
+          Icon={"fa-solid fa-plus"}
+          Label={label}
+          Data={{ Redirect_type: redirectType, Redirect_id: redirectId }}
+        />
+      </Suspense>
+    </div>
+  );
  const renderSwitchWithTour = (col) => {
    switch (col.widget.type) {
      case "Card":
        return (
          <div
-            className={"bg-[#2ed8b6] rounded-md shadow mb-4 md:mb-0"}
+            className={"bg-[#2ed8b6] rounded-md shadow mb-3 md:mb-0"}
            data-tut={col.widget.data.tourSection}
            style={{ background: col.widget.bgColor }}
          >
-            <Suspense fallback={<div>please wait</div>}>
+            <Suspense
+              fallback={
+                <div style={{ height: "300px" }}>
+                  <div
+                    style={{
+                      marginLeft: "45%",
+                      marginTop: "150px",
+                      fontSize: "45px",
+                      color: "#3dd3e0"
+                    }}
+                    className="loader-37"
+                  ></div>
+                </div>
+              }
+            >
              <DashboardCard
                Icon={col.widget.icon}
                Label={col.widget.label}
-                Filter={filter}
                Format={col.widget.format && col.widget.format}
                Data={col.widget.data}
                FilterData={col.widget.filter}
@@ -281,50 +75,12 @@ const GetDashboard = (props) => {
            </Suspense>
          </div>
        );
-      case "customeHtml":
-        return (
-          <div data-tut={col.widget.data.tourSection}>
-            <select
-              id="searchFiltr"
-              className="form-control"
-              value={
-                option ||
-                localStorage.getItem("DashboardDefaultFilter") ||
-                col.widget.data[0].default
-              }
-              onChange={onSearchFilter}
-            >
-              {col.widget.data[0].options.map((opt) => (
-                <option key={opt} value={opt}>
-                  {opt}
-                </option>
-              ))}
-            </select>
-
-            <br />
-          </div>
-        );
-
-      case "customeTag":
-        return (
-          <h3
-            data-tut={col.widget.data.tourSection}
-            style={{
-              marginBottom: "4px",
-              color: "currentColor",
-              marginLeft: "4px"
-            }}
-          >
-            {col.widget.label}
-          </h3>
-        );
      case "report": {
-        let _filter = `${col.widget.filterKey}:${filter}`;
        return (
          <div data-tut={col.widget.data.tourSection}>
            <Suspense fallback={<div>please wait</div>}>
-              <div className="mb-4 md:mb-0">
-                <DashboardReport Filter={_filter} Record={col.widget} />
+              <div className="mb-3 md:mb-0">
+                <DashboardReport Record={col.widget} />
              </div>
            </Suspense>
          </div>
@@ -339,14 +95,13 @@ const GetDashboard = (props) => {
      case "Card":
        return (
          <div
-            className={"bg-[#2ed8b6] rounded-md shadow mb-4 md:mb-0"}
+            className={"bg-[#2ed8b6] rounded-md shadow mb-3 md:mb-0"}
            style={{ background: col.widget.bgColor }}
          >
            <Suspense fallback={<div>please wait</div>}>
              <DashboardCard
                Icon={col.widget.icon}
                Label={col.widget.label}
-                Filter={filter}
                Format={col.widget.format && col.widget.format}
                Data={col.widget.data}
                FilterData={col.widget.filter}
@@ -355,48 +110,11 @@ const GetDashboard = (props) => {
            </Suspense>
          </div>
        );
-      case "customeHtml":
-        return (
-          <div>
-            <select
-              id="searchFiltr"
-              className="form-control"
-              value={
-                option ||
-                localStorage.getItem("DashboardDefaultFilter") ||
-                col.widget.data[0].default
-              }
-              onChange={onSearchFilter}
-            >
-              {col.widget.data[0].options.map((opt) => (
-                <option key={opt} value={opt}>
-                  {opt}
-                </option>
-              ))}
-            </select>
-
-            <br />
-          </div>
-        );
-
-      case "customeTag":
-        return (
-          <h3
-            style={{
-              marginBottom: "4px",
-              color: "currentColor",
-              marginLeft: "4px"
-            }}
-          >
-            {col.widget.label}
-          </h3>
-        );
      case "report": {
-        let _filter = `${col.widget.filterKey}:${filter}`;
        return (
          <Suspense fallback={<div>please wait</div>}>
-            <div className="mb-4 md:mb-0">
-              <DashboardReport Filter={_filter} Record={col.widget} />
+            <div className="mb-3 md:mb-0">
+              <DashboardReport Record={col.widget} />
            </div>
          </Suspense>
        );
@@ -406,25 +124,38 @@ const GetDashboard = (props) => {
    }
  };
  return (
-    <ErrorBoundary>
-      <div>
-        {props.dashboard.map((val, key) => (
-          <div key={"a" + key} className="row">
-            {val.columns.map((col, i) =>
-              col.widget.data && col.widget.data.tourSection ? (
-                <div key={i} className={props.classnameArray[key][i]}>
-                  {renderSwitchWithTour(col)}
-                </div>
-              ) : (
-                <div key={i} className={props.classnameArray[key][i]}>
-                  {renderSwitch(col)}
-                </div>
-              )
-            )}
-          </div>
-        ))}
+    <div>
+      <div className="mb-3">
+        <div
+          data-tut={"tourbutton"}
+          className="flex flex-col md:flex-row gap-6 md:gap-8"
+        >
+          {buttonList.map((btn) => (
+            <Button
+              key={btn.label}
+              label={btn.label}
+              redirectType={btn.redirectType}
+              redirectId={btn.redirectId}
+            />
+          ))}
+        </div>
      </div>
-    </ErrorBoundary>
+      {props.dashboard.map((val, key) => (
+        <div key={"a" + key} className="row">
+          {val.columns.map((col, i) =>
+            col.widget.data && col.widget.data.tourSection ? (
+              <div key={i} className={props.classnameArray[key][i]}>
+                {renderSwitchWithTour(col)}
+              </div>
+            ) : (
+              <div key={i} className={props.classnameArray[key][i]}>
+                {renderSwitch(col)}
+              </div>
+            )
+          )}
+        </div>
+      ))}
+    </div>
  );
 };

@@ -1,265 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { SaveFileSize } from "../../constant/saveFileSize";
-import Parse from "parse";
-import sanitizeFileName from "../../primitives/sanitizeFileName";
-
-const FileUpload = (props) => {
-  const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
-  const [parseAppId] = useState(localStorage.getItem("parseAppId"));
-  const [_fileupload, setFileUpload] = useState("");
-  const [fileload, setfileload] = useState(false);
-
-  const [localValue, setLocalValue] = useState("");
-  const [Message] = useState(false);
-  const [percentage, setpercentage] = useState(0);
-
-  const REQUIRED_FIELD_SYMBOL = "*";
-
-  useEffect(() => {
-    if (!props.formData) {
-      setFileUpload([]);
-      props.onChange(undefined);
-    }
-    // eslint-disable-next-line
-  }, [props.formData]);
-  const onChange = (e) => {
-    try {
-      let files = e.target.files;
-      setLocalValue(e.target.files);
-      if (typeof files[0] !== "undefined") {
-        if (props.schema.filetypes && props.schema.filetypes.length > 0) {
-          var fileName = files[0].name;
-          var fileNameExt = fileName
-            .substr(fileName.lastIndexOf(".") + 1)
-            .toLowerCase();
-          let Extensions = props.schema.filetypes.map((x) => x.toLowerCase());
-          let arr = Extensions.filter((x) => x === fileNameExt);
-          if (arr.length > 0) {
-            console.log("multiple type");
-          } else {
-            alert(
-              "Only these file types are accepted : " + Extensions.join(", ")
-            );
-          }
-        }
-        if (props.schema.maxfilesizeKB && props.schema.maxfilesizeKB !== "") {
-          // console.log(Math.round(files[0].size / 1024));
-          if (
-            Math.round(Number(files[0].size) / 1024) >=
-            props.schema.maxfilesizeKB
-          ) {
-            alert(
-              `The selected file size is too large. Please select a file less than ${Math.round(
-                props.schema.maxfilesizeKB / 1024
-              )} MB`
-            );
-            return;
-          }
-        }
-        handleFileUpload(files[0]);
-      } else {
-        alert("Please select file.");
-        return false;
-      }
-    } catch (error) {
-      alert(error.message);
-      return false;
-    }
-  };
-
-  const handleFileUpload = async (file) => {
-    Parse.serverURL = parseBaseUrl;
-    Parse.initialize(parseAppId);
-    setfileload(true);
-    const size = file.size;
-    const fileName = file.name;
-    const name = sanitizeFileName(fileName);
-    const pdfFile = file;
-    const parseFile = new Parse.File(name, pdfFile);
-
-    try {
-      const response = await parseFile.save({
-        progress: (progressValue, loaded, total, { type }) => {
-          if (type === "upload" && progressValue !== null) {
-            const percentCompleted = Math.round((loaded * 100) / total);
-            console.log("percentCompleted ", percentCompleted);
-            setpercentage(percentCompleted);
-          }
-        }
-      });
-
-      setFileUpload(response.url());
-      props.onChange(response.url());
-      setfileload(false);
-      // The response object will contain information about the uploaded file
-      // console.log("File uploaded:", response);
-
-      // You can access the URL of the uploaded file using response.url()
-      // console.log("File URL:", response.url());
-      if (response.url()) {
-        SaveFileSize(size, response.url());
-        return response.url();
-      }
-    } catch (error) {
-      setfileload(false);
-      setpercentage(0);
-      console.error("Error uploading file:", error);
-    }
-  };
-  let fileView =
-    props.formData &&
-    props.schema.uploadtype === "s3viajw" ? null : props.formData &&
-      props.formData ? (
-      <React.Fragment>
-        <a
-          href={props.formData}
-          title={props.formData}
-          style={{ paddingBottom: "10px", color: "blue" }}
-        >
-          Download
-        </a>
-      </React.Fragment>
-    ) : fileload === false ? null : (
-      <React.Fragment>
-        <a
-          href={_fileupload}
-          title={_fileupload}
-          style={{ paddingBottom: "10px" }}
-        >
-          Download
-        </a>
-        <br />
-      </React.Fragment>
-    );
-
-  return (
-    <React.Fragment>
-      <div style={{ display: "inline-block" }}>
-        <label htmlFor={props.name}>
-          {props.schema.title}
-          {props.required && (
-            <span className="required">{REQUIRED_FIELD_SYMBOL}</span>
-          )}
-          {fileload ? (
-            <div className="flex items-center gap-x-2">
-              <div className="h-2 rounded-full w-[200px] md:w-[400px] bg-gray-200">
-                <div
-                  className="h-2 rounded-full bg-blue-500"
-                  style={{ width: `${percentage}%` }}
-                ></div>
-              </div>
-              <span className="text-black text-sm">{percentage}%</span>
-            </div>
-          ) : (
-            Message && (
-              <span style={{ fontSize: "9px", marginLeft: "4px" }}>
-                Processing will take 5-10 mins....
-              </span>
-            )
-          )}
-          {props.schema.helpbody ? (
-            <div className="dropdown pull-right">
-              <i
-                className="far fa-question-circle dropdown-toggle hovereffect"
-                aria-hidden="true"
-                id="dropdownMenuButton"
-                data-toggle="dropdown"
-                aria-haspopup="true"
-                aria-expanded="false"
-                style={{
-                  fontSize: "12px",
-                  color: "purple",
-                  cursor: "pointer !important",
-                  position: "relative",
-                  bottom: "0px",
-                  left: "0px",
-                  paddingBottom: "4px",
-                  paddingLeft: "4px"
-                }}
-              ></i>
-              <div
-                className="dropdown-menu"
-                aria-labelledby="dropdownMenuButton"
-                style={{
-                  marginleft: "-121px",
-                  margintop: "-14px",
-                  position: "absolute",
-                  padding: "10px",
-                  top: "102px!important"
-                }}
-              >
-                <br />
-                {props.schema.helplink ? (
-                  <a
-                    href={props.schema.helplink}
-                    target="_blank"
-                    rel="noreferrer"
-                    className="btn btn-xs btn-primary"
-                  >
-                    Read more..
-                  </a>
-                ) : null}
-              </div>
-            </div>
-          ) : null}
-          <span style={{ marginLeft: "10px" }}>{fileView}</span>
-        </label>
-      </div>
-
-      <>
-        {localValue ? (
-          <input
-            type="file"
-            id="hashfile"
-            style={{
-              border: "1px solid #ccc",
-              color: "gray",
-              backgroundColor: "white",
-              padding: "5px 10px",
-              borderRadius: "4px",
-              fontSize: "13px",
-              width: "100%",
-              fontWeight: "bold"
-            }}
-            accept="application/pdf,application/vnd.ms-excel"
-            onChange={onChange}
-          />
-        ) : props.formData ? (
-          <div
-            style={{
-              border: "1px solid #ccc",
-              color: "gray",
-              backgroundColor: "white",
-              padding: "5px 10px",
-              borderRadius: "4px",
-              fontSize: "13px",
-              width: "100%",
-              fontWeight: "bold"
-            }}
-          >
-            file selected : {props.formData.split("/")[3]}
-          </div>
-        ) : (
-          <input
-            type="file"
-            id="hashfile"
-            style={{
-              border: "1px solid #ccc",
-              color: "gray",
-              backgroundColor: "white",
-              padding: "5px 10px",
-              borderRadius: "4px",
-              fontSize: "13px",
-              width: "100%",
-              fontWeight: "bold"
-            }}
-            accept="application/pdf,application/vnd.ms-excel"
-            onChange={onChange}
-          />
-        )}
-      </>
-    </React.Fragment>
-  );
-};
-
-export default FileUpload;
@@ -1,83 +0,0 @@
-import React, { Component } from "react";
-import Parse from "parse";
-import axios from "axios";
-
-export class HiddenField extends Component {
-  state = {
-    baseUrl: localStorage.getItem("baseUrl"),
-    parseAppId: localStorage.getItem("parseAppId"),
-    _fields: ""
-  };
-  loadData = async () => {
-    if (this.props.schema.default) {
-      this.setState({ _fields: this.props.schema.default });
-    } else {
-      try {
-        Parse.serverURL = this.state.baseUrl;
-        Parse.initialize(this.state.parseAppId);
-        let currentUser = await Parse.User.current();
-        if (localStorage.getItem("Extand_Class")) {
-          let _rdata = JSON.parse(localStorage.getItem("Extand_Class"));
-          let custome_Filed = "";
-          let splitArray = this.props.schema.data.valueKey.split(".");
-          if (splitArray.length > 1) {
-            custome_Filed = _rdata[0][splitArray[0]][splitArray[1]];
-          } else {
-            let _Filed = _rdata[0][splitArray[0]];
-            if (typeof _Filed === "object") {
-              custome_Filed = {
-                __type: "Pointer",
-                className: _Filed["className"],
-                objectId: _Filed["objectId"]
-              };
-            } else {
-              custome_Filed = _rdata[0][splitArray[0]];
-            }
-          }
-          this.setState({ _fields: custome_Filed });
-        } else {
-          if (currentUser) {
-            let url = `${this.state.baseUrl}classes/${localStorage.getItem(
-              "extended_class"
-            )}?where={"UserId":{"__type":"Pointer","className":"_User","objectId":"${
-              currentUser.id
-            }"}}&keys=${this.props.schema.data.valueKey}`;
-            const headers = {
-              "Content-Type": "application/json",
-              "X-Parse-Application-Id": this.state.parseAppId
-            };
-            await axios.get(url, { headers: headers }).then((res) => {
-              let custome_Filed = "";
-              let _rdata = res.data.results;
-              let splitArray = this.props.schema.data.valueKey.split(".");
-              if (splitArray.length > 1) {
-                custome_Filed = _rdata[0][splitArray[0]][splitArray[1]];
-              } else {
-                console.log(_rdata[0][splitArray[0]]);
-                custome_Filed = _rdata[0][splitArray[0]];
-              }
-              this.setState({ _fields: custome_Filed });
-            });
-          }
-        }
-      } catch (error) {
-        console.log('err', error)
-      }
-    }
-  };
-  componentDidMount() {
-    this.loadData();
-  }
-
-  render() {
-    return (
-      <input
-        type="hidden"
-        value={this.state._fields}
-        onChange={this.props.onChange(this.state._fields)}
-      />
-    );
-  }
-}
-
-export default HiddenField;
@@ -1,70 +0,0 @@
-import React from "react";
-import parse from "html-react-parser";
-import PropTypes from "prop-types";
-
-const LabelField = (props) => {
-  const { Title, Name, Required, HelpBody, HelpLink } = props;
-  const REQUIRED_FIELD_SYMBOL = "*";
-  return (
-    <div style={{ display: "inline-block" }}>
-      <label htmlFor={Name}>
-        {Title}
-        {Required && <span className="required">{REQUIRED_FIELD_SYMBOL}</span>}
-        {HelpBody ? (
-          <div className="dropdown pull-right">
-            <i
-              className="far fa-question-circle dropdown-toggle hovereffect pull-right"
-              aria-hidden="true"
-              id="dropdownMenuButton"
-              data-toggle="dropdown"
-              aria-haspopup="true"
-              aria-expanded="false"
-              style={{
-                fontSize: "12px",
-                color: "purple",
-                cursor: "pointer !important",
-                position: "relative",
-                bottom: "0px",
-                left: "0px",
-                paddingBottom: "4px",
-                paddingLeft: "4px"
-              }}
-            ></i>
-            <div
-              className="dropdown-menu"
-              aria-labelledby="dropdownMenuButton"
-              style={{
-                marginleft: "-121px",
-                margintop: "-14px",
-                position: "absolute",
-                padding: "10px",
-                top: "102px!important"
-              }}
-            >
-              {parse(`
-             ${HelpBody}
-           `)}
-              <br />
-              {HelpLink ? (
-                <a
-                  href={HelpLink}
-                  target="_blank"
-                  rel="noreferrer"
-                  className="btn btn-xs btn-primary"
-                >
-                  Read more..
-                </a>
-              ) : null}
-            </div>
-          </div>
-        ) : null}
-      </label>
-    </div>
-  );
-};
-
-LabelField.propTypes = {
-  Name: PropTypes.string.isRequired,
-  Title: PropTypes.string.isRequired
-};
-export default LabelField;
@@ -1,484 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { connect } from "react-redux";
-import { onChangeLevel1Dropdown } from "../../redux/actions/index";
-import axios from "axios";
-import Parse from "parse";
-import parse from "html-react-parser";
-
-const Level1Dropdown = (props) => {
-  const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
-  const [parseAppId] = useState(localStorage.getItem("parseAppId"));
-  const [Level1_DD, setLevel1_DD] = useState([]);
-  const [toastColor] = useState("#d9534f");
-  const [toastDescription, setToastDescription] = useState("");
-  const [active, setActive] = useState(false);
-
-  const getParams = (offset) => {
-    const params = {
-      skip: offset
-    };
-    return params;
-  };
-
-  const Level1DropdownData = async () => {
-    try {
-      if (
-        props.formData &&
-        props.uiSchema["ui:disabled"] &&
-        props.formData !== "Select"
-      ) {
-        let url = `${parseBaseUrl}classes/${props.schema.data.class}/${props.formData}`;
-        if (typeof props.formData === "object") {
-          url = `${parseBaseUrl}classes/${props.schema.data.class}/${props.formData.objectId}`;
-        }
-        let headers1 = {
-          "Content-Type": "application/json",
-          "X-Parse-Application-Id": parseAppId,
-          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-        };
-        let data = [];
-        let response = [];
-        await axios.get(url, { headers: headers1 }).then((res) => {
-          if (res) {
-            data.push(res.data);
-          }
-        });
-
-        if (data.length > 0) {
-          let temp = [];
-          data.forEach((x) => {
-            let opt = "";
-            if (Array.isArray(x[props.schema.data.valueKey])) {
-              x[props.schema.data.valueKey].forEach((tt) => {
-                if (typeof tt === "object") {
-                  opt = {
-                    objectId: tt[props.schema.data.displayKey],
-                    option: tt[props.schema.data.displayKey]
-                  };
-                } else {
-                  opt = {
-                    objectId: tt,
-                    option: tt
-                  };
-                }
-                temp.push(opt);
-              });
-            } else if (props.schema.data.isPointer) {
-              if (props.schema.data.valueKey.includes(".")) {
-                let newArr = props.schema.data.valueKey.split(".");
-                if (newArr.length === 2) {
-                  opt = {
-                    objectId: x[newArr[0]][newArr[1]],
-                    option: x[props.schema.data.displayKey]
-                  };
-                } else {
-                  opt = {
-                    objectId: x[newArr[0]],
-                    option: x[props.schema.data.displayKey]
-                  };
-                }
-              } else {
-                opt = {
-                  objectId: x[props.schema.data.valueKey],
-                  option: x[props.schema.data.displayKey]
-                };
-              }
-              temp.push(opt);
-            } else {
-              opt = {
-                objectId: x[props.schema.data.valueKey],
-                option: x[props.schema.data.displayKey]
-              };
-              temp.push(opt);
-            }
-          });
-          response = temp;
-          setLevel1_DD(response);
-          setActive(false);
-          if (response.length === 1) {
-            props.onChangeLevel1Dropdown(response[0].objectId, props.name);
-            props.onChange(response[0].objectId);
-          } else if (response.length === 0) {
-            props.onChangeLevel1Dropdown("", props.name);
-            props.onChange("");
-          }
-        }
-      } else {
-        let response = [];
-        setActive(true);
-        Parse.serverURL = parseBaseUrl;
-        Parse.initialize(parseAppId);
-        const currentUser = Parse.User.current();
-
-        // eslint-disable-next-line
-        var reg = /(\#.*?\#)/gi;
-        let str = props.schema.data.query;
-        var test;
-        if (str.includes("#")) {
-          let res;
-          if (localStorage.getItem("Extand_Class")) {
-            let data = JSON.parse(localStorage.getItem("Extand_Class"));
-            res = data[0];
-          } else {
-            var emp = Parse.Object.extend(
-              localStorage.getItem("extended_class")
-            );
-            var q = new Parse.Query(emp);
-            q.equalTo("UserId", currentUser);
-            res = await q.first();
-            if (res) res = res.toJSON();
-          }
-
-          if (res) {
-            let json = res;
-            let output = str.match(reg);
-            if (output.length === 1) {
-              output = output.join();
-              output = output.substring(1, output.length - 1);
-              output = output.split(".");
-              if (output.length === 1) {
-                let out = output[0];
-                if (json[out]) {
-                  if (typeof json[out] === "object") {
-                    test = str.replace(reg, JSON.stringify(json[out]));
-                  } else {
-                    test = str.replace(reg, json[out]);
-                  }
-                } else {
-                  test = str.replace(reg, currentUser.id);
-                }
-              } else if (output.length === 2) {
-                let out1 = json[output[0]][output[1]];
-                if (out1) {
-                  test = str.replace(reg, out1);
-                }
-              }
-            } else if (output.length === 2) {
-              let output1 = output[0];
-              output1 = output1.substring(1, output1.length - 1);
-              output1 = output1.split(".");
-              if (output1.length === 1) {
-                let out = output1[0];
-                if (json[out]) {
-                  if (typeof json[out] === "object") {
-                    str = str.replace(output[0], JSON.stringify(json[out]));
-                  } else {
-                    str = str.replace(output[0], json[out]);
-                  }
-                } else {
-                  str = str.replace(output[0], currentUser.id);
-                }
-              } else if (output1.length === 2) {
-                let out1 = json[output1[0]][output1[1]];
-                if (out1) {
-                  str = str.replace(output[0], out1);
-                }
-              }
-              let output2 = output[1];
-              output2 = output2.substring(1, output2.length - 1);
-              output2 = output2.split(".");
-              if (output2.length === 1) {
-                let out = output2[0];
-                if (json[out]) {
-                  if (typeof json[out] === "object") {
-                    str = str.replace(output[1], JSON.stringify(json[out]));
-                  } else {
-                    str = str.replace(output[1], json[out]);
-                  }
-                } else {
-                  str = str.replace(output[1], currentUser.id);
-                }
-              } else if (output2.length === 2) {
-                let out1 = json[output2[0]][output2[1]];
-                if (out1) {
-                  str = str.replace(output[1], out1);
-                }
-              }
-              test = str;
-            }
-          } else {
-            setToastDescription(
-              `User not found in ${localStorage.getItem("extended_class")}`
-            );
-            setActive(false);
-            var x = document.getElementById("Level_1");
-            x.className = "show";
-            setTimeout(function () {
-              x.className = x.className.replace("show", "");
-            }, 5000);
-            return;
-          }
-        } else {
-          test = str;
-        }
-        let url = `${parseBaseUrl}classes/${props.schema.data.class}?${test}`;
-        const headers = {
-          "Content-Type": "application/json",
-          "X-Parse-Application-Id": parseAppId,
-          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-        };
-        let fetchCount = 0;
-        let offset = 0;
-        let data = [];
-        /* eslint-disable no-constant-condition */
-        while (true) {
-          const params = getParams(offset);
-          await axios
-            .get(url, { params: params, headers: headers })
-            .then((response) => {
-              fetchCount = response.data.results.length;
-              offset += response.data.results.length;
-
-              if (fetchCount > 0) {
-                response.data.results.forEach((x) => {
-                  data.push(x);
-                });
-              }
-            })
-            .catch((err) => {
-              console.error("Problem", err.response);
-              setToastDescription(err.response.data.message);
-              setActive(false);
-              var x = document.getElementById("Level_1");
-              x.className = "show";
-              setTimeout(function () {
-                x.className = x.className.replace("show", "");
-              }, 5000);
-            });
-          if (fetchCount === 0 || fetchCount < 100) {
-            break;
-          }
-        }
-        if (data.length > 0) {
-          let temp = [];
-          data.forEach((x) => {
-            let opt = "";
-            if (Array.isArray(x[props.schema.data.valueKey])) {
-              x[props.schema.data.valueKey].forEach((tt) => {
-                if (typeof tt === "object") {
-                  if (props.schema.data.isPointer) {
-                    opt = {
-                      objectId: tt["objectId"],
-                      option: tt[props.schema.data.displayKey]
-                    };
-                  } else {
-                    opt = {
-                      objectId: tt[props.schema.data.displayKey],
-                      option: tt[props.schema.data.displayKey]
-                    };
-                  }
-                } else {
-                  opt = {
-                    objectId: tt,
-                    option: tt
-                  };
-                }
-                temp.push(opt);
-              });
-            } else if (props.schema.data.isPointer) {
-              if (props.schema.data.valueKey.includes(".")) {
-                let newArr = props.schema.data.valueKey.split(".");
-                if (newArr.length === 2) {
-                  let _dis = props.schema.data.displayKey.split(".");
-                  if (_dis.length === 2) {
-                    opt = {
-                      objectId: x[newArr[0]][newArr[1]],
-                      option: x[_dis[0]][_dis[1]]
-                    };
-                  } else {
-                    opt = {
-                      objectId: x[newArr[0]][newArr[1]],
-                      option: x[props.schema.data.displayKey]
-                    };
-                  }
-                } else {
-                  opt = {
-                    objectId: x[newArr[0]],
-                    option: x[props.schema.data.displayKey]
-                  };
-                }
-              } else {
-                opt = {
-                  objectId: x[props.schema.data.valueKey],
-                  option: x[props.schema.data.displayKey]
-                };
-              }
-              temp.push(opt);
-            } else {
-              opt = {
-                objectId: x[props.schema.data.valueKey],
-                option: x[props.schema.data.displayKey]
-              };
-              temp.push(opt);
-            }
-          });
-          response = temp;
-          setLevel1_DD(response);
-          setActive(false);
-          if (!props.formData) {
-            props.onChangeLevel1Dropdown("", props.name);
-          }
-          if (response.length === 1) {
-            props.onChangeLevel1Dropdown(response[0].objectId, props.name);
-            props.onChange(response[0].objectId);
-          } else if (response.length === 0) {
-            props.onChangeLevel1Dropdown("", props.name);
-            props.onChange("");
-          }
-        } else {
-          setActive(false);
-        }
-      }
-    } catch (e) {
-      try {
-        setToastDescription(e.message);
-        setActive(false);
-        x = document.getElementById("Level_1");
-        x.className = "show";
-        setTimeout(function () {
-          x.className = x.className.replace("show", "");
-        }, 5000);
-      } catch (error) {
-        console.log("Err", error)
-      }
-    }
-  };
-
-  useEffect(() => {
-    Level1DropdownData();
-    // eslint-disable-next-line
-  }, []);
-
-  useEffect(() => {
-    if (props.formData && props.formData[`objectId`]) {
-      props.onChangeLevel1Dropdown(props.formData.objectId, props.name);
-    } else if (props.formData) {
-      props.onChangeLevel1Dropdown(props.formData, props.name);
-    }
-
-    // eslint-disable-next-line
-  }, [props.formData]);
-
-  const selectDefault = () => {
-    props.onChange(Level1_DD[0].objectId);
-    props.onChangeLevel1Dropdown(Level1_DD[0].objectId, props.name);
-  };
-
-  const REQUIRED_FIELD_SYMBOL = "*";
-  return (
-    <React.Fragment>
-      <div style={{ display: "inline-block" }}>
-        <label htmlFor={props.name}>
-          {props.schema.title}
-          {props.required && (
-            <span className="required">{REQUIRED_FIELD_SYMBOL}</span>
-          )}
-          {props.schema.data.helpbody ? (
-            <div className="dropdown pull-right">
-              <i
-                className="far fa-question-circle dropdown-toggle hovereffect pull-right"
-                aria-hidden="true"
-                id="dropdownMenuButton"
-                data-toggle="dropdown"
-                aria-haspopup="true"
-                aria-expanded="false"
-                style={{
-                  fontSize: "12px",
-                  color: "purple",
-                  cursor: "pointer !important",
-                  position: "relative",
-                  bottom: "0px",
-                  left: "0px",
-                  paddingBottom: "4px",
-                  paddingLeft: "4px"
-                }}
-              ></i>
-              <div
-                className="dropdown-menu"
-                aria-labelledby="dropdownMenuButton"
-                style={{
-                  marginleft: "-121px",
-                  margintop: "-14px",
-                  position: "absolute",
-                  padding: "10px",
-                  top: "102px!important"
-                }}
-              >
-                {parse(`
-             ${props.schema.data.helpbody}
-           `)}
-                <br />
-                {props.schema.data.helplink ? (
-                  <a
-                    href={props.schema.data.helplink}
-                    target="_blank"
-                    rel="noreferrer"
-                    className="btn btn-xs btn-primary"
-                  >
-                    Read more..
-                  </a>
-                ) : null}
-              </div>
-            </div>
-          ) : null}
-        </label>
-      </div>
-
-      {Level1_DD && (
-        <select
-          className="form-control"
-          name={props.name}
-          value={props.value}
-          required={props.required}
-          disabled={props.uiSchema["ui:disabled"]}
-          onChange={(e) => {
-            if (!e.target.value) {
-              if (props.schema.data.isPointer) {
-                localStorage.setItem("Level1", undefined);
-                props.onChangeLevel1Dropdown(undefined, props.name);
-                return props.onChange(undefined);
-              } else {
-                localStorage.setItem("Level1", e.target.value);
-                props.onChangeLevel1Dropdown(e.target.value, props.name);
-                return props.onChange(e.target.value);
-              }
-            } else {
-              localStorage.setItem("Level1", e.target.value);
-              props.onChangeLevel1Dropdown(e.target.value, props.name);
-              return props.onChange(e.target.value);
-            }
-          }}
-          readOnly={props.uiSchema["ui:disabled"] ? true : false}
-          defaultValue={Level1_DD.length === 1 && selectDefault}
-        >
-          <option value="">{!active ? "Select" : "loading..."}</option>
-          {Level1_DD &&
-            Level1_DD.map((x, i) => (
-              <React.Fragment key={i}>
-                {props.formData && props.formData.objectId ? (
-                  props.formData.objectId === x.objectId ? (
-                    <option value={x.objectId} selected>
-                      {x.option}
-                    </option>
-                  ) : (
-                    <option value={x.objectId}>{x.option}</option>
-                  )
-                ) : props.formData && props.formData === x.objectId ? (
-                  <option value={x.objectId} selected>
-                    {x.option}
-                  </option>
-                ) : (
-                  <option value={x.objectId}>{x.option}</option>
-                )}
-              </React.Fragment>
-            ))}
-        </select>
-      )}
-      <div id="Level_1" style={{ backgroundColor: toastColor }}>
-        {toastDescription}
-      </div>
-    </React.Fragment>
-  );
-};
-
-export default connect(null, { onChangeLevel1Dropdown })(Level1Dropdown);
@@ -1,709 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { connect } from "react-redux";
-import Select from "react-select";
-import axios from "axios";
-import LabelField from "./LabelField";
-import ReactDragListView from "react-drag-listview";
-import AppendFormInForm from "../AppendFormInForm";
-import Modal from "react-modal";
-function arrayMove(array, from, to) {
-  array = array.slice();
-  array.splice(to < 0 ? array.length + to : to, 0, array.splice(from, 1)[0]);
-  return array;
-}
-
-/**
- * react-sortable-hoc is depcreated not usable from react 18.x.x
- *  need to replace it with @dnd-kit
- * code changes required
- */
-
-const MultiSelectField = (props) => {
-  Modal.setAppElement("body");
-  const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
-  const [parseAppId] = useState(localStorage.getItem("parseAppId"));
-  const [state, setState] = useState(undefined);
-  // const [editFormData, setEditFormData] = useState([]);
-  const [selected, setSelected] = React.useState([]);
-  const [isModal, setIsModel] = useState(false);
-  const onChange = (selectedOptions) => setSelected(selectedOptions);
-  const [modalIsOpen, setModalIsOpen] = useState(false);
-
-  const onSortEnd = ({ oldIndex, newIndex }) => {
-    const newValue = arrayMove(selected, oldIndex, newIndex);
-    setSelected(newValue);
-  };
-  //  console.log("props",props)
-  const GetSelectListData = async () => {
-    try {
-      let response = [];
-      let str = props.schema.data.query;
-      let _query;
-      /* eslint-disable no-useless-escape */
-      let reg = /(\#.*?\#)/gi;
-      let extclass =
-        localStorage.getItem("Extand_Class") &&
-        JSON.parse(localStorage.getItem("Extand_Class"));
-      let extRow = extclass.length && extclass[0];
-      if (str.includes("#")) {
-        let output = str.match(reg);
-        output = output.join();
-        output = output.substring(1, output.length - 1);
-        output = output.split(".");
-
-        if (output.length === 2) {
-          let out1 = extRow[output[0]][output[1]];
-          _query = str.replace(reg, out1 && out1);
-        } else {
-          let out1 = extRow[output[0]];
-          _query = str.replace(reg, out1 && out1);
-        }
-      } else {
-        _query = str;
-      }
-      let url = `${parseBaseUrl}classes/${props.schema.data.class}?${_query}`;
-      const headers = {
-        "Content-Type": "application/json",
-        "X-Parse-Application-Id": parseAppId,
-        "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-      };
-      await axios.get(url, { headers: headers }).then((res) => {
-        let temp = [];
-        let formArray = [];
-        let _selected = [];
-        if (props.schema.uiLayout === "MultiDropdownList") {
-          if (props.formData) {
-            props.formData.forEach((x) => {
-              if (typeof x === "object") {
-                formArray.push(x.objectId);
-              } else {
-                formArray.push(x);
-              }
-            });
-          }
-          res.data.results.forEach((x) => {
-            let obj = {};
-            if (formArray.includes(x[props.schema.data.valueKey])) {
-              obj = {
-                name: x[props.schema.data.displayKey],
-                value: x[props.schema.data.valueKey],
-                isChecked: true
-              };
-            } else {
-              if (props.schema.selectAll) {
-                obj = {
-                  name: x[props.schema.data.displayKey],
-                  value: x[props.schema.data.valueKey],
-                  isChecked: true
-                };
-              } else {
-                obj = {
-                  name: x[props.schema.data.displayKey],
-                  value: x[props.schema.data.valueKey],
-                  isChecked: false
-                };
-              }
-            }
-            temp.push(obj);
-          });
-          response = temp;
-          if (props.formData) {
-            let checkData = [];
-            response.forEach((x) => {
-              if (x.isChecked) {
-                checkData.push(x.value);
-              }
-            });
-            setSelected(checkData);
-          }
-          setState({ [`${props.name}_DD`]: response });
-        } else {
-          res.data.results.forEach((x) => {
-            let obj = {};
-            if (props.formData) {
-              props.formData.forEach((x) => {
-                if (typeof x === "object") {
-                  formArray.push(x.objectId);
-                } else {
-                  formArray.push(x);
-                }
-              });
-            }
-
-            obj = {
-              label: x[props.schema.data.displayKey],
-              value: x[props.schema.data.valueKey]
-            };
-            if (formArray.includes(x[props.schema.data.valueKey])) {
-              _selected.push(obj);
-            }
-            if (props.schema.selectAll) {
-              _selected.push(obj);
-            }
-            temp.push(obj);
-          });
-          response = temp;
-          setState({ [`${props.name}_DD`]: response });
-          setSelected(_selected);
-        }
-      });
-    } catch (error) {
-      console.log("err", error);
-    }
-  };
-
-  const handleCheckChieldElement = (event) => {
-    let SelectLists = state[`${props.name}_DD`];
-    let List = [];
-    SelectLists.forEach((select) => {
-      if (select.value === event.target.value) {
-        select.isChecked = event.target.checked;
-      }
-      if (select.isChecked) {
-        List.push(select.value);
-      }
-    });
-    setSelected(List);
-    setState({ [`${props.name}_DD`]: SelectLists });
-  };
-
-  // const Level1CheckList = async (id) => {
-  //   try {
-  //     let response = [];
-  //     // eslint-disable-next-line
-  //     let reg = /(\#.*?\#)/gi;
-  //     let _query = props.schema.data.query;
-  //     let output = _query.match(reg);
-  //     if (output.length === 2) {
-  //       let res;
-  //       if (localStorage.getItem("Extand_Class")) {
-  //         let data = JSON.parse(localStorage.getItem("Extand_Class"));
-  //         res = data[0];
-  //       }
-  //       output = output.filter((x) => x !== "#queryString#");
-  //       if (output.length === 1) {
-  //         _query = _query.replace("#queryString#", id);
-  //         output = output.join();
-  //         output = output.substring(1, output.length - 1);
-  //         output = output.split(".");
-  //         if (output.length > 0) {
-  //           _query = _query.replace(reg, res[output[0]][output[1]]);
-  //         } else {
-  //           _query = _query.replace(reg, res[output[0]]);
-  //         }
-  //       }
-  //     } else {
-  //       _query = props.schema.data.query.replace(reg, id);
-  //     }
-
-  //     let url = `${parseBaseUrl}classes/${props.schema.data.class}?${_query}`;
-  //     const headers = {
-  //       "Content-Type": "application/json",
-  //       "X-Parse-Application-Id": parseAppId,
-  //       "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-  //     };
-  //     await axios.get(url, { headers: headers }).then(async (res) => {
-  //       let temp = [];
-  //       let formArray = [];
-  //       let _selected = [];
-  //       if (editFormData.length > 0) {
-  //         editFormData.forEach((x) => {
-  //           if (typeof x === "object") {
-  //             formArray.push(x.objectId);
-  //           } else {
-  //             formArray.push(x);
-  //           }
-  //         });
-  //       } else if (
-  //         props.schema.selectedData &&
-  //         Object.keys(props.schema.selectedData).length !== 0 &&
-  //         props.schema.selectedData.constructor === Object
-  //       ) {
-  //         try {
-  //           let selectedDataQuery = props.schema.selectedData.query.replace(
-  //             reg,
-  //             id
-  //           );
-  //           let selectedDataUrl = `${parseBaseUrl}classes/${props.schema.selectedData.class}?${selectedDataQuery}`;
-
-  //           await axios.get(selectedDataUrl, { headers }).then((sltres) => {
-  //             let sltData = sltres.data.results;
-  //             sltData.forEach((x) => {
-  //               if (props.schema.selectedData.valueKey.includes(".")) {
-  //                 let sltArr = props.schema.selectedData.valueKey.split(".");
-
-  //                 if (Array.isArray(x[sltArr[0]])) {
-  //                   x[sltArr[0]].forEach((l) => {
-  //                     formArray.push(l[sltArr[1]]);
-  //                   });
-  //                 } else {
-  //                   formArray.push(x[sltArr[0][sltArr[1]]]);
-  //                 }
-  //               } else {
-  //                 formArray.push(x[props.schema.selectedData.valueKey]);
-  //               }
-  //             });
-  //           });
-  //         } catch (error) {}
-  //       }
-  //       res.data.results.forEach((x) => {
-  //         let obj = {};
-  //         if (props.schema.data.valueKey.includes(".")) {
-  //           let newArr = props.schema.data.valueKey.split(".");
-  //           if (Array.isArray(x[newArr[0]])) {
-  //             if (props.schema.data.displayKey.includes(".")) {
-  //               let _dis = props.schema.data.displayKey.split(".");
-  //               x[newArr[0]].forEach((l) => {
-  //                 if (formArray.includes(l[newArr[1]])) {
-  //                   obj = {
-  //                     label: l[_dis[1]],
-  //                     value: l[newArr[1]],
-  //                     isChecked: true
-  //                   };
-  //                   _selected.push(obj);
-  //                 } else {
-  //                   if (props.schema.selectAll) {
-  //                     obj = {
-  //                       label: l[_dis[1]],
-  //                       value: l[newArr[1]],
-  //                       isChecked: true
-  //                     };
-  //                     _selected.push(obj);
-  //                   } else {
-  //                     obj = {
-  //                       label: l[_dis[1]],
-  //                       value: l[newArr[1]],
-  //                       isChecked: false
-  //                     };
-  //                   }
-  //                 }
-  //                 temp.push(obj);
-  //               });
-  //             } else {
-  //               x[newArr[0]].forEach((l) => {
-  //                 if (formArray.includes(l[newArr[1]])) {
-  //                   obj = {
-  //                     label: x[props.schema.data.displayKey],
-  //                     value: l[newArr[1]],
-  //                     isChecked: true
-  //                   };
-  //                   _selected.push(obj);
-  //                 } else {
-  //                   if (props.schema.selectAll) {
-  //                     obj = {
-  //                       label: x[props.schema.data.displayKey],
-  //                       value: l[newArr[1]],
-  //                       isChecked: true
-  //                     };
-  //                     _selected.push(obj);
-  //                   } else {
-  //                     obj = {
-  //                       label: x[props.schema.data.displayKey],
-  //                       value: l[newArr[1]],
-  //                       isChecked: false
-  //                     };
-  //                   }
-  //                 }
-  //                 temp.push(obj);
-  //               });
-  //             }
-  //           } else {
-  //             if (props.schema.data.displayKey.includes(".")) {
-  //               let disArr = props.schema.data.displayKey.split(".");
-  //               if (formArray.includes(x[newArr[0]][newArr[1]])) {
-  //                 obj = {
-  //                   label: x[disArr[0]][disArr[1]],
-  //                   value: x[newArr[0]][newArr[1]],
-  //                   isChecked: true
-  //                 };
-  //                 _selected.push(obj);
-  //               } else {
-  //                 if (props.schema.selectAll) {
-  //                   obj = {
-  //                     label: x[disArr[0]][disArr[1]],
-  //                     value: x[newArr[0]][newArr[1]],
-  //                     isChecked: true
-  //                   };
-  //                   _selected.push(obj);
-  //                 } else {
-  //                   obj = {
-  //                     label: x[disArr[0]][disArr[1]],
-  //                     value: x[newArr[0]][newArr[1]],
-  //                     isChecked: false
-  //                   };
-  //                 }
-  //               }
-  //             } else {
-  //               if (formArray.includes(x[newArr[0]][newArr[1]])) {
-  //                 obj = {
-  //                   label: x[props.schema.data.displayKey],
-  //                   value: x[newArr[0]][newArr[1]],
-  //                   isChecked: true
-  //                 };
-  //                 _selected.push(obj);
-  //               } else {
-  //                 if (props.schema.selectAll) {
-  //                   obj = {
-  //                     label: x[props.schema.data.displayKey],
-  //                     value: x[newArr[0]][newArr[1]],
-  //                     isChecked: true
-  //                   };
-  //                   _selected.push(obj);
-  //                 } else {
-  //                   obj = {
-  //                     label: x[props.schema.data.displayKey],
-  //                     value: x[newArr[0]][newArr[1]],
-  //                     isChecked: false
-  //                   };
-  //                 }
-  //               }
-  //             }
-  //           }
-  //         } else {
-  //           if (Array.isArray(x[props.schema.data.valueKey])) {
-  //             x[props.schema.data.valueKey].forEach((t) => {
-  //               if (formArray.includes(t)) {
-  //                 obj = {
-  //                   label: t,
-  //                   value: t,
-  //                   isChecked: true
-  //                 };
-  //                 _selected.push(obj);
-  //               } else {
-  //                 if (props.schema.selectAll) {
-  //                   obj = {
-  //                     label: t,
-  //                     value: t,
-  //                     isChecked: true
-  //                   };
-  //                   _selected.push(obj);
-  //                 } else {
-  //                   obj = {
-  //                     label: t,
-  //                     value: t,
-  //                     isChecked: false
-  //                   };
-  //                 }
-  //               }
-  //               temp.push(obj);
-  //             });
-  //           } else if (formArray.includes(x[props.schema.data.valueKey])) {
-  //             obj = {
-  //               label: x[props.schema.data.displayKey],
-  //               value: x[props.schema.data.valueKey],
-  //               isChecked: true
-  //             };
-  //             _selected.push(obj);
-  //           } else {
-  //             if (props.schema.selectAll) {
-  //               obj = {
-  //                 label: x[props.schema.data.displayKey],
-  //                 value: x[props.schema.data.valueKey],
-  //                 isChecked: true
-  //               };
-  //               _selected.push(obj);
-  //             } else {
-  //               obj = {
-  //                 label: x[props.schema.data.displayKey],
-  //                 value: x[props.schema.data.valueKey],
-  //                 isChecked: false
-  //               };
-  //             }
-  //           }
-  //           temp.push(obj);
-  //         }
-  //       });
-  //       response = temp;
-  //       if (props.schema.uiLayout === "MultiDropdownList") {
-  //         if (editFormData) {
-  //           let checkData = [];
-  //           response.forEach((x) => {
-  //             if (x.isChecked) {
-  //               checkData.push(x.value);
-  //             }
-  //           });
-  //           setSelected(checkData);
-  //         }
-  //         setState({ [`${props.name}_DD`]: response });
-  //       } else {
-  //         setState({ [`${props.name}_DD`]: response });
-  //         setSelected(_selected);
-  //       }
-  //     });
-  //   } catch (error) {}
-  // };
-
-  const dragProps = {
-    onDragEnd(fromIndex, toIndex) {
-      const data = [...state[`${props.name}_DD`]];
-      const item = data.splice(fromIndex, 1)[0];
-      data.splice(toIndex, 0, item);
-      let NewList = [];
-      data.forEach((x) => {
-        if (x.isChecked) {
-          NewList.push(x.value);
-        }
-      });
-
-      setState({ [`${props.name}_DD`]: data });
-      setSelected(NewList);
-    },
-    nodeSelector: "li",
-    handleSelector: "a"
-  };
-
-  useEffect(() => {
-    if (!props.schema.parent) GetSelectListData();
-    // eslint-disable-next-line
-  }, []);
-
-  useEffect(() => {
-    if (props.schema.uiLayout === "MultiDropdownList") {
-      props.onChange(selected);
-    } else {
-      if (selected && selected.length) {
-        let newData = [];
-        selected.forEach((x) => {
-          newData.push(x.value);
-        });
-        props.onChange(newData);
-      }
-    }
-    // eslint-disable-next-line
-  }, [selected]);
-
-  // useState(() => {
-  //   if (props.formData) {
-  //     if (props.formData === "Select") {
-  //     } else {
-  //       setEditFormData(props.formData);
-  //     }
-  //   }
-  //   // eslint-disable-next-line
-  // }, [props.formData]);
-
-  const handleModalCloseClick = () => {
-    setIsModel(false);
-    setModalIsOpen(false);
-  };
-
-  const openModal = () => {
-    setModalIsOpen(true);
-  };
-
-  // `handleNewDetails` is used to set just save from quick form to selected option in dropdown
-  const handleNewDetails = (data) => {
-    setState({ [`${props.name}_DD`]: [...state[`${props.name}_DD`], data] });
-    if (selected.length > 0) {
-      setSelected([...selected, data]);
-    } else {
-      setSelected([data]);
-    }
-  };
-  if (props.schema.uiLayout === "MultiDropdownList") {
-    return (
-      <React.Fragment>
-        <LabelField
-          Title={props.schema.title}
-          Name={props.name}
-          Required={props.required}
-          HelpBody={props.schema.helpbody}
-          HelpLink={props.schema.helplink}
-        />
-        <ReactDragListView {...dragProps}>
-          <ul
-            style={{
-              listStyleType: "square",
-              listStylePosition: "outside",
-              maxHeight: "250px",
-              overflow: "auto",
-              paddingTop: "10px",
-              paddingBottom: "10px",
-              border: "0px solid #b3b3b3",
-              borderRadius: "5px"
-            }}
-          >
-            {state && state[`${props.name}_DD`].length > 0 ? (
-              state[`${props.name}_DD`].map((x, i) => {
-                return (
-                  <li key={i} className="multiSelectList">
-                    <input
-                      key={x.value}
-                      onClick={handleCheckChieldElement}
-                      type="checkbox"
-                      checked={x.isChecked}
-                      style={{ marginTop: "7px" }}
-                      value={x.value}
-                      disabled={props.disabled}
-                    />{" "}
-                    <span style={{ marginTop: "7px" }}>{x.name}</span>
-                    {props.schema.isSortable && !props.disabled && (
-                      <a
-                        onClick={(e) => e.preventDefault()}
-                        className="pull-right"
-                        title="Sort List"
-                        style={{ textDecoration: "none" }}
-                      >
-                        <i
-                          className="fa fa-bars"
-                          style={{
-                            fontSize: "30px",
-                            color: "skyblue",
-                            paddingTop: "11px"
-                          }}
-                        ></i>
-                      </a>
-                    )}
-                  </li>
-                );
-              })
-            ) : (
-              <li className="multiSelectList">No Record Found</li>
-            )}
-          </ul>
-        </ReactDragListView>
-      </React.Fragment>
-    );
-  }
-
-  return (
-    <React.Fragment>
-      <LabelField
-        Title={props.schema.title}
-        Name={props.name}
-        Required={props.required}
-        HelpBody={props.schema.helpbody}
-        HelpLink={props.schema.helplink}
-      />
-      <div style={{ display: "flex", gap: 5 }}>
-        <div style={{ flexWrap: "wrap", width: "100%" }}>
-          <Select
-            onSortEnd={onSortEnd}
-            distance={4}
-            isMulti
-            options={(state && state[`${props.name}_DD`]) || []}
-            value={selected}
-            onChange={onChange}
-            closeMenuOnSelect={false}
-          />
-        </div>
-
-        {props.schema.data.quickAddFormId && (
-          <div
-            onClick={() => {
-              setIsModel(true);
-              openModal();
-            }}
-            style={{
-              cursor: "pointer",
-              borderRadius: 4,
-              border: "1px solid #ccc",
-              minHeight: 38,
-              minWidth: 48,
-              display: "flex",
-              justifyContent: "center",
-              alignItems: "center"
-            }}
-          >
-            <i className="fas fa-plus"></i>
-          </div>
-        )}
-        {/* {props.schema.data.quickAddFormId && (
-          <div
-            className="modal fade"
-            id={"multiSelectModal" + props.schema.data.quickAddFormId}
-            tabIndex="-1"
-            role="dialog"
-            aria-labelledby="exampleModalLabel"
-            aria-hidden="true"
-          >
-            <div className="modal-dialog modal-lg" role="document">
-              <div className="modal-content">
-                <div className="modal-header">
-                  <button
-                    type="button"
-                    className="close"
-                    data-dismiss="modal"
-                    aria-label="Close"
-                    onClick={handleModalCloseClick}
-                  >
-                    <i className="fa fa-times-circle" aria-hidden="true"></i>
-                  </button>
-                </div>
-                <div className="modal-body">
-                  {isModal && (
-                    <AppendFormInForm
-                      id={props.schema.data.quickAddFormId}
-                      valueKey={props.schema.data.valueKey}
-                      displayKey={props.schema.data.displayKey}
-                      details={handleNewDetails}
-                      closePopup={handleModalCloseClick}
-                    />
-                  )}
-                </div>
-              </div>
-            </div>
-          </div>
-        )} */}
-        <Modal
-          isOpen={modalIsOpen}
-          onRequestClose={handleModalCloseClick}
-          shouldCloseOnOverlayClick={false}
-          contentLabel="Modal"
-          style={{
-            content: {
-              top: "50%",
-              left: "50%",
-              right: "auto",
-              bottom: "auto",
-              transform: "translate(-50%, -50%)",
-              padding: 0
-            },
-            overlay: {
-              width: "100%",
-              backgroundColor: "rgba(0, 0, 0, 0.75)",
-              zIndex: 50
-            }
-          }}
-        >
-          <div className="min-w-full md:min-w-[500px]">
-            <div
-              type="button"
-              className="flex justify-between items-center p-3 border-b-[1px] border-gray-300"
-            >
-              <div className=" text-black text-xl font-semibold pl-3">
-                Add Signer
-              </div>
-              <button onClick={handleModalCloseClick}>
-                <i
-                  style={{ fontSize: 25 }}
-                  className="fa fa-times-circle"
-                  aria-hidden="true"
-                ></i>
-              </button>
-            </div>
-
-            {isModal && (
-              <AppendFormInForm
-                id={props.schema.data.quickAddFormId}
-                valueKey={props.schema.data.valueKey}
-                displayKey={props.schema.data.displayKey}
-                details={handleNewDetails}
-                closePopup={handleModalCloseClick}
-              />
-            )}
-          </div>
-        </Modal>
-      </div>
-    </React.Fragment>
-  );
-};
-
-const mapStateToProps = (state) => {
-  return {
-    Level1_Dropdown: state.Level1_Dropdown,
-    Level2_Dropdown: state.Level2_Dropdown,
-    Level3_Dropdown: state.Level3_Dropdown
-  };
-};
-export default connect(mapStateToProps, null)(MultiSelectField);
@@ -1,92 +0,0 @@
-import React from "react";
-import ObjectField from "@rjsf/core/lib/components/fields/ObjectField";
-import validator from "@rjsf/validator-ajv8";
-import { Col } from "react-bootstrap";
-import { retrieveSchema } from "@rjsf/utils";
-
-class GridField extends ObjectField {
-  state = {};
-  render() {
-    const {
-      uiSchema,
-      errorSchema,
-      idSchema,
-
-      disabled,
-      readonly,
-      onBlur,
-      formData
-    } = this.props;
-    const { fields, rootSchema } = this.props.registry;
-
-    const { SchemaField } = fields;
-    const schema = retrieveSchema(validator, this.props.schema, rootSchema);
-    const title = schema.title === undefined ? "" : schema.title;
-    const description =
-      schema && schema.description === undefined ? "" : schema.description;
-    // console.log('this.props.schema ', this.props.schema)
-    // console.log("schema ", schema);
-    const layout = uiSchema["ui:layout"];
-
-    return (
-      <fieldset>
-        {title ? <h4>{title}</h4> : null}
-        {description ? <h6>{description}</h6> : null}
-        {layout.map((row, index) => {
-          return (
-            <div className="row" key={index}>
-              {Object.keys(row).map((name, index) => {
-                const { doShow, ...rowProps } = row[name];
-                let style = {};
-                if (doShow && !doShow({ formData })) {
-                  style = { display: "none" };
-                }
-                if (schema.properties[name]) {
-                  return (
-                    <Col {...rowProps} key={index} style={style}>
-                      <SchemaField
-                        name={name}
-                        required={this.isRequired(name)}
-                        schema={schema.properties[name]}
-                        uiSchema={uiSchema[name]}
-                        errorSchema={errorSchema[name]}
-                        idSchema={idSchema[name]}
-                        formData={formData[name]}
-                        onChange={this.onPropertyChange(name)}
-                        onBlur={onBlur}
-                        registry={this.props.registry}
-                        disabled={disabled}
-                        readonly={readonly}
-                      />
-                    </Col>
-                  );
-                } else {
-                  const { render, ...rowProps } = row[name];
-                  let UIComponent = () => null;
-
-                  if (render) {
-                    UIComponent = render;
-                  }
-
-                  return (
-                    <Col {...rowProps} key={index} style={style}>
-                      <UIComponent
-                        name={name}
-                        formData={formData}
-                        errorSchema={errorSchema}
-                        uiSchema={uiSchema}
-                        schema={schema}
-                        registry={this.props.registry}
-                      />
-                    </Col>
-                  );
-                }
-              })}
-            </div>
-          );
-        })}
-      </fieldset>
-    );
-  }
-}
-export default GridField;
@@ -1,26 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-
-function TimeWidget(props) {
-  const {
-    onChange,
-    registry: {
-      widgets: { BaseInput }
-    }
-  } = props;
-  return (
-    <BaseInput
-      type="time"
-      {...props}
-      onChange={(value) => onChange(value || undefined)}
-    />
-  );
-}
-
-if (process.env.NODE_ENV !== "production") {
-  TimeWidget.propTypes = {
-    value: PropTypes.string
-  };
-}
-
-export default TimeWidget;
@@ -1,34 +1,43 @@
 import React, { useState, useEffect, useRef } from "react";
-import folder from "../../../assests/folder.png";
-import "../LegaDrive.css";
-import draftDoc from "../../../assests/draftDoc1.png";
-import pdfLogo from "../../../assests/pdf3.png";
+import folder from "../../assets/images/folder.png";
+import "../../styles/opensigndrive.css";
+import pdfLogo from "../../assets/images/pdf3.png";
 import axios from "axios";
 import * as ContextMenu from "@radix-ui/react-context-menu";
 import { saveAs } from "file-saver";
-import { getHostUrl } from "../../../utils/Utils";
 import { useNavigate } from "react-router-dom";
 import Table from "react-bootstrap/Table";
 import * as HoverCard from "@radix-ui/react-hover-card";
+import SelectFolder from "../shared/fields/SelectFolder"; //check this one
+import ModalUi from "../../primitives/ModalUi";
+import { themeColor } from "../../constant/const";

-function PdfFileComponent({
+function DriveBody({
  pdfData,
  setFolderName,
  setDocId,
  setIsLoading,
  setPdfData,
  isList,
+  setIsAlert
 }) {
  const [rename, setRename] = useState("");
  const [renameValue, setRenameValue] = useState("");
  const inputRef = useRef(null);
-
+  const [isOpenMoveModal, setIsOpenMoveModal] = useState(false);
+  const [selectDoc, setSelectDoc] = useState();
+  const [isDeleteDoc, setIsDeleteDoc] = useState(false);
+  const contextMenu = [
+    { type: "Download", icon: "fa-solid fa-arrow-down" },
+    { type: "Rename", icon: "fa-solid fa-font" },
+    { type: "Move", icon: "fa-solid fa-file-export" },
+    { type: "Delete", icon: "fa-solid fa-trash" }
+  ];
  const navigate = useNavigate();

  //to focus input box on press rename to change doc name
  useEffect(() => {
    if (rename && inputRef.current) {
-      // console.log("ref", inputRef.current)
      setTimeout(() => {
        inputRef.current.focus();
      }, 10);
@@ -39,12 +48,12 @@ function PdfFileComponent({
  const handleOnclikFolder = (data) => {
    const folderData = {
      name: data.Name,
-      objectId: data.objectId,
+      objectId: data.objectId
    };
    setFolderName((prev) => [...prev, folderData]);
    const loadObj = {
      isLoad: true,
-      message: "This might take some time",
+      message: "This might take some time"
    };

    setIsLoading(loadObj);
@@ -57,7 +66,7 @@ function PdfFileComponent({

    if (trimmedValue.length > 0) {
      const updateName = {
-        Name: renameValue,
+        Name: renameValue
      };
      const docId = data.objectId;

@@ -83,98 +92,207 @@ function PdfFileComponent({
            headers: {
              "Content-Type": "application/json",
              "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-              "X-Parse-Session-Token": localStorage.getItem("accesstoken"),
-            },
+              "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+            }
          }
        )
-        .then((result) => {
+        .then(() => {
          // const res = result.data;
          // console.log("res", res);
        })
        .catch((err) => {
-          console.log("error updating field is decline ", err);
+          console.log("Err ", err);
+          setIsAlert({
+            isShow: true,
+            alertMessage: "something went wrong"
+          });
        });
    }
  };

  //function for navigate user to microapp-signature component
  const checkPdfStatus = async (data) => {
-    
-    const hostUrl = getHostUrl();
-    const expireDate = data.ExpiryDate.iso;
-    const expireUpdateDate = new Date(expireDate).getTime();
-    const currDate = new Date().getTime();
    const signerExist = data.Signers && data.Signers;
-    const signUrl = data.SignedUrl && data.SignedUrl;
    const isDecline = data.IsDeclined && data.IsDeclined;
    const isPlaceholder = data.Placeholders && data.Placeholders;
-    //checking and navigate to signyouself page
-    const checkPlaceHolder = data.Placeholders;
-    //checking if document has completed
-    if (data.IsCompleted && signerExist) {
-      navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
-
-      // window.location.hash = `/pdfRequestFiles/${data.objectId}`;
-    } else if (data.IsCompleted && !signerExist) {
-      navigate(
-        `${hostUrl}signaturePdf/${data.objectId}`
-      );
-      // window.location.hash = `/recipientSignPdf/${data.objectId}/${data.ExtUserPtr.Phone}`;
+    const signedUrl = data.SignedUrl;
+    //checking if document has completed and request signature flow
+    if (data?.IsCompleted && signerExist?.length > 0) {
+      navigate(`/pdfRequestFiles/${data.objectId}`);
+    }
+    //checking if document has completed and signyour-self flow
+    else if (!signerExist && !isPlaceholder) {
+      navigate(`/signaturePdf/${data.objectId}`);
    }
    //checking if document has declined by someone
    else if (isDecline) {
-      navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
-      // window.location.hash = `/pdfRequestFiles/${data.objectId}`;
-    } else if (currDate > expireUpdateDate && signerExist && !isPlaceholder) {
-      // window.location.hash = `/placeHolderSign/${data.objectId}`;
-      navigate(`${hostUrl}placeHolderSign/${data.objectId}`);
+      navigate(`/pdfRequestFiles/${data.objectId}`);
+      //checking draft type document
    } else if (
-      currDate > expireUpdateDate &&
-      !signerExist &&
-      !isPlaceholder &&
-      !signUrl
+      signerExist?.length > 0 &&
+      isPlaceholder?.length > 0 &&
+      !signedUrl
    ) {
-      navigate(`${hostUrl}signaturePdf/${data.objectId}`);
-      // window.location.hash = `/signaturePdf/${data.objectId}`;
+      navigate(`/placeHolderSign/${data.objectId}`);
    }
-    //checking if document has expired
-    else if (currDate > expireUpdateDate) {
-      navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
-      // window.location.hash = `/pdfRequestFiles/${data.objectId}`;
-    } //checking if document is draft signers type and signers placeholder does not placed yet
-    else if (!signUrl && signerExist) {
-      // window.location.hash = `/placeHolderSign/${data.objectId}`;
-      navigate(`${hostUrl}placeHolderSign/${data.objectId}`);
-    }
-    //checking if document is request type and signers placeholder exist and does not completed yet
-    //then user can check progress of document and sign also
+    //Inprogress document
+    else if (isPlaceholder?.length > 0 && signerExist?.length > 0) {
+      navigate(`/pdfRequestFiles/${data.objectId}`);
+    } //placeholder draft document
    else if (
-      checkPlaceHolder &&
-      checkPlaceHolder.length > 0 &&
-      !data.IsCompleted
+      (signerExist?.length > 0 &&
+        (!isPlaceholder || isPlaceholder?.length === 0)) ||
+      ((!signerExist || signerExist?.length === 0) && isPlaceholder?.length > 0)
    ) {
-      navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
-      // window.location.hash = `/pdfRequestFiles/${data.objectId}`;
+      navigate(`/placeHolderSign/${data.objectId}`);
    }
-    //checking document is draft and signyourself type then user can sign document
-    else {
-      navigate(`${hostUrl}signaturePdf/${data.objectId}`);
-      // navigate(`/signaturePdf/${data.objectId}`);
-      // window.location.hash = `/signaturePdf/${data.objectId}`;
+  };
+
+  const handleMenuItemClick = (selectType, data) => {
+    switch (selectType) {
+      case "Download": {
+        const pdfName = data && data.Name;
+        const pdfUrl = data && data.SignedUrl ? data.SignedUrl : data.URL;
+        saveAs(pdfUrl, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
+        break;
+      }
+      case "Rename": {
+        setRenameValue(data.Name);
+        setRename(data.objectId);
+        break;
+      }
+      case "Delete": {
+        setIsDeleteDoc(true);
+        setSelectDoc(data);
+        break;
+      }
+      case "Move": {
+        handleMoveDocument(data);
+        break;
+      }
+      default:
+        null;
+    }
+  };
+  //function for delete document
+  const handleDeleteDocument = async (docData) => {
+    setIsDeleteDoc(false);
+    const docId = docData.objectId;
+    const data = {
+      IsArchive: true
+    };
+
+    await axios
+      .put(
+        `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
+          "_appName"
+        )}_Document/${docId}`,
+        data,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+            "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+          }
+        }
+      )
+      .then((result) => {
+        const res = result.data;
+        if (res) {
+          const updatedData = pdfData.filter((x) => x.objectId !== docId);
+          setPdfData(updatedData);
+        }
+      })
+      .catch((err) => {
+        console.log("Err ", err);
+        setIsAlert({
+          isShow: true,
+          alertMessage: "something went wrong"
+        });
+      });
+  };
+  const handleMoveDocument = async (docData) => {
+    setIsOpenMoveModal(true);
+    setSelectDoc(docData);
+  };
+  //function for move document from one folder to another folder
+  const handleMoveFolder = async (selectFolderData) => {
+    const selecFolderId = selectDoc?.Folder?.objectId;
+    const moveFolderId = selectFolderData?.ObjectId;
+    let updateDocId = selectDoc?.objectId;
+    let updateData;
+    const checkExist = moveFolderId
+      ? selecFolderId === moveFolderId
+        ? true
+        : false
+      : selecFolderId
+        ? false
+        : true;
+    if (!checkExist) {
+      if (moveFolderId) {
+        updateData = {
+          Folder: {
+            __type: "Pointer",
+            className: `${localStorage.getItem("_appName")}_Document`,
+            objectId: moveFolderId
+          }
+        };
+      } else {
+        updateData = {
+          Folder: { __op: "Delete" }
+        };
+      }
+
+      await axios
+        .put(
+          `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
+            "_appName"
+          )}_Document/${updateDocId}`,
+          updateData,
+          {
+            headers: {
+              "Content-Type": "application/json",
+              "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+              "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+            }
+          }
+        )
+
+        .then((Listdata) => {
+          // console.log("Listdata ", Listdata);
+          const res = Listdata.data;
+          if (res) {
+            const updatedData = pdfData.filter(
+              (x) => x.objectId !== updateDocId
+            );
+            setPdfData(updatedData);
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+        });
+
+      setIsOpenMoveModal(false);
+    } else {
+      alert("folder already exist!");
+      setIsOpenMoveModal(false);
+    }
+  };
+
+  const sanitizeFileName = (pdfName) => {
+    // Replace spaces with underscore
+    return pdfName.replace(/ /g, "_");
+  };
+
+  const handleEnterPress = (e, data) => {
+    if (e.key === "Enter") {
+      handledRenameDoc(data);
    }
  };

  //component to handle type of document and render according to type
  const handleFolderData = (data, ind, listType) => {
-    // console.log("data", data);
-    let createddate,
-      status,
-      isDecline,
-      signerExist,
-      isExpire,
-      isComplete,
-      signUrl,
-      isPlaceholder;
+    let createddate, status, isDecline, signerExist, isComplete, isPlaceholder;
    if (data.Type !== "Folder") {
      const expireDate = data.ExpiryDate && data.ExpiryDate.iso;
      const createdDate = data.createdAt && data.createdAt;
@@ -183,61 +301,58 @@ function PdfFileComponent({
      isDecline = data.IsDeclined && data.IsDeclined;
      isPlaceholder = data.Placeholders && data.Placeholders;
      signerExist = data.Signers && data.Signers;
-      signUrl = data.SignedUrl && data.SignedUrl;
+      const signedUrl = data.SignedUrl;
+
      const expireUpdateDate = new Date(expireDate).getTime();
      const currDate = new Date().getTime();
-
+      let isExpire = false;
      if (currDate > expireUpdateDate) {
        isExpire = true;
-      } else {
-        isExpire = false;
      }
+
      if (isComplete) {
        status = "Completed";
      } else if (isDecline) {
        status = "Declined";
-      } else if (isExpire && !isPlaceholder && signerExist) {
-        // status = "Expired";
+      } else if (!signerExist || signerExist?.length === 0) {
        status = "Draft";
-      } else if (isExpire && !isPlaceholder && !signerExist && !signUrl) {
-        // status = "Expired";
+      } else if (
+        signerExist?.length > 0 &&
+        (!isPlaceholder || isPlaceholder?.length === 0)
+      ) {
+        status = "Draft";
+      } else if (
+        signerExist?.length > 0 &&
+        isPlaceholder?.length > 0 &&
+        !signedUrl
+      ) {
        status = "Draft";
      } else if (isExpire) {
        status = "Expired";
-      } else if (!signUrl) {
-        status = "Draft";
      } else {
-        status = "InComplete";
+        status = "In Progress";
      }
    }

-    const handleDraftDoc = (data) => {
-      window.location.hash = `/mf/remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9MZWdhR2VuaWUtTWljcm9hcHBWMi9yZW1vdGVFbnRyeS5qcw==&moduleToLoad=AppRoutes&remoteName=legageniemicroapp/legagenie?${data.objectId}`;
-    };
+    const signersName = () => {
+      const getSignersName = signerExist.map((data) => data.Name);
+      const signerName = getSignersName.join(",");

-    const handleMenuItemClick = (selectType, data) => {
-      // console.log("data",data)
-      if (selectType === "Download") {
-        // console.log("download")
-        const pdfName = data && data.Name;
-        const pdfUrl = data && data.SignedUrl ? data.SignedUrl : data.URL;
-        saveAs(pdfUrl, `${pdfName}_signed_by_OpenSign™.pdf`);
-      } else if (selectType === "Rename") {
-        // console.log("rename")
-        setRenameValue(data.Name);
-        setRename(data.objectId);
-      }
+      return (
+        <span
+          className="statusSpan"
+          style={{ width: "90%", wordWrap: "break-word" }}
+        >
+          {signerName}{" "}
+        </span>
+      );
    };
-    const handleEnterPress = (e, data) => {
-      if (e.key === "Enter") {
-        handledRenameDoc(data);
-      }
-    };
-
    return listType === "table" ? (
      data.Type === "Folder" ? (
        <tr onClick={() => handleOnclikFolder(data)}>
-          <td>
+          <td
+            style={{ cursor: "pointer", display: "flex", alignItems: "center" }}
+          >
            <i
              className="fa fa-folder"
              aria-hidden="true"
@@ -253,26 +368,11 @@ function PdfFileComponent({
          <td>_</td>
          <td>_</td>
        </tr>
-      ) : data.Type === "AIDoc" ? (
-        <tr onClick={() => handleDraftDoc(data)}>
-          <td>
-            <i
-              className="fa fa-file-text"
-              style={{ color: "#0ea3ed", marginRight: "8px", fontSize: "26px" }}
-            ></i>
-
-            <span style={{ fontSize: "12px", fontWeight: "500" }}>
-              {data.Name}
-            </span>
-          </td>
-          <td>{createddate}</td>
-          <td>LegaGenie Draft</td>
-          <td>_</td>
-          <td>_</td>
-        </tr>
      ) : (
        <tr onClick={() => checkPdfStatus(data)}>
-          <td>
+          <td
+            style={{ cursor: "pointer", display: "flex", alignItems: "center" }}
+          >
            <i
              className="fa fa-file-pdf"
              style={{ color: "#ed4d0e", marginRight: "8px", fontSize: "26px" }}
@@ -306,7 +406,7 @@ function PdfFileComponent({
              style={{
                display: "flex",
                flexDirection: "column",
-                cursor: "pointer",
+                cursor: "pointer"
              }}
            >
              <img
@@ -327,7 +427,6 @@ function PdfFileComponent({
                  }}
                  autoFocus={true}
                  type="text"
-                  // onFocus={()=>console.log("focus")}
                  onBlur={() => handledRenameDoc(data)}
                  onKeyDown={(e) => handleEnterPress(e, data)}
                  ref={inputRef}
@@ -338,7 +437,7 @@ function PdfFileComponent({
                    width: "100px",
                    border: "1.5px solid black",
                    borderRadius: "2px",
-                    fontSize: "10px",
+                    fontSize: "10px"
                  }}
                />
              ) : (
@@ -353,99 +452,19 @@ function PdfFileComponent({
              sideOffset={5}
              align="end"
            >
-              {/* <ContextMenu.Item
-                    onClick={() => handleMenuItemClick("Download", data)}
-                    onSelect={(e) => console.log("event", e)}
-                    className="ContextMenuItem"
-                  >
-                    Download
-                  </ContextMenu.Item> */}
-
              <ContextMenu.Item
                onClick={() => handleMenuItemClick("Rename", data)}
                className="ContextMenuItem"
              >
-                Rename
-              </ContextMenu.Item>
-            </ContextMenu.Content>
-          </ContextMenu.Portal>
-        </ContextMenu.Root>
-      </div>
-    ) : data.Type === "AIDoc" ? (
-      <div key={ind} className="folderBox">
-        <ContextMenu.Root>
-          <ContextMenu.Trigger className="ContextMenuTrigger">
-            <div
-              style={{
-                display: "flex",
-                flexDirection: "column",
-                cursor: "pointer",
-              }}
-            >
-              <img
-                alt="no img"
-                onClick={() => handleDraftDoc(data)}
-                src={draftDoc}
-                width={100}
-                height={103}
-              />
-              {rename === data.objectId ? (
-                <input
-                  onFocus={() => {
-                    inputRef.current.setSelectionRange(0, 0);
-                    const input = inputRef.current;
-                    if (input) {
-                      input.select();
-                    }
-                  }}
-                  autoFocus={true}
-                  type="text"
-                  // onFocus={()=>console.log("focus")}
-                  onBlur={() => handledRenameDoc(data)}
-                  onKeyDown={(e) => handleEnterPress(e, data)}
-                  ref={inputRef}
-                  defaultValue={renameValue}
-                  // value={renameValue}
-                  onChange={(e) => setRenameValue(e.target.value)}
-                  style={{
-                    width: "100px",
-                    border: "1.5px solid black",
-                    borderRadius: "2px",
-                    fontSize: "10px",
-                  }}
-                />
-              ) : (
-                <span className="foldName">{data.Name}</span>
-              )}
-            </div>
-          </ContextMenu.Trigger>
-
-          <ContextMenu.Portal>
-            <ContextMenu.Content
-              className="ContextMenuContent"
-              sideOffset={5}
-              align="end"
-            >
-              {/* <ContextMenu.Item
-               onClick={() => handleMenuItemClick("Download", data)}
-               onSelect={(e) => console.log("event", e)}
-               className="ContextMenuItem"
-             >
-               Download
-             </ContextMenu.Item> */}
-
-              <ContextMenu.Item
-                onClick={() => handleMenuItemClick("Rename", data)}
-                className="ContextMenuItem"
-              >
-                Rename
+                <i className="fa-solid fa-font"></i>
+                <span style={{ marginLeft: "8px" }}>Rename</span>
              </ContextMenu.Item>
            </ContextMenu.Content>
          </ContextMenu.Portal>
        </ContextMenu.Root>
      </div>
    ) : (
-      <HoverCard.Root>
+      <HoverCard.Root openDelay={0} closeDelay={100}>
        <HoverCard.Trigger asChild>
          <div>
            <ContextMenu.Root>
@@ -478,7 +497,7 @@ function PdfFileComponent({
                        width: "100px",
                        border: "1.5px solid black",
                        borderRadius: "2px",
-                        fontSize: "10px",
+                        fontSize: "10px"
                      }}
                    />
                  ) : (
@@ -502,7 +521,7 @@ function PdfFileComponent({
                    <i className="fa fa-file"></i>
                  </div>
                ) : (
-                  status === "InComplete" && (
+                  status === "In Progress" && (
                    <div className="status-badge in-progress">
                      <i className="fa fa-paper-plane"></i>
                    </div>
@@ -516,20 +535,18 @@ function PdfFileComponent({
                  sideOffset={5}
                  align="end"
                >
-                  <ContextMenu.Item
-                    onClick={() => handleMenuItemClick("Download", data)}
-                    onSelect={(e) => console.log("event", e)}
-                    className="ContextMenuItem"
-                  >
-                    Download
-                  </ContextMenu.Item>
-
-                  <ContextMenu.Item
-                    onClick={() => handleMenuItemClick("Rename", data)}
-                    className="ContextMenuItem"
-                  >
-                    Rename
-                  </ContextMenu.Item>
+                  {contextMenu.map((menu, ind) => {
+                    return (
+                      <ContextMenu.Item
+                        key={ind}
+                        onClick={() => handleMenuItemClick(menu.type, data)}
+                        className="ContextMenuItem"
+                      >
+                        <i className={menu.icon}></i>
+                        <span style={{ marginLeft: "8px" }}>{menu.type}</span>
+                      </ContextMenu.Item>
+                    );
+                  })}
                </ContextMenu.Content>
              </ContextMenu.Portal>
            </ContextMenu.Root>
@@ -552,57 +569,111 @@ function PdfFileComponent({
            {signerExist && (
              <>
                <strong style={{ fontSize: "13px" }}>Signers: </strong>
-                {signerExist.map((data, key) => {
-                  return (
-                    <React.Fragment key={key}>
-                      <span className="statusSpan">{data.Name}, </span>
-                    </React.Fragment>
-                  );
-                })}
+                {/* <span className="statusSpan">kjefjjnejkfnkbjs bbfjkdsbjbfjkbjk kscbjkbjkb</span> */}
+                {signersName()}
              </>
            )}
+
            <HoverCard.Arrow className="HoverCardArrow" />
          </HoverCard.Content>
        </HoverCard.Portal>
      </HoverCard.Root>
    );
  };
-  //component to handle type of document and render according to type

-  return isList ? (
-    <div className="container" style={{overflowX:"auto"}}>
-      <Table striped bordered hover  >
-        <thead>
-          <tr>
-            <th>Name</th>
-            <th>Created Date</th>
-            <th>Type</th>
-            <th>Status</th>
-            <th>Action</th>
-          </tr>
-        </thead>
-        <tbody>
+  //component to handle type of document and render according to type
+  return (
+    <>
+      {isList ? (
+        <div className="container" style={{ overflowX: "auto" }}>
+          <Table striped bordered hover>
+            <thead>
+              <tr>
+                <th>Name</th>
+                <th>Created Date</th>
+                <th>Type</th>
+                <th>Status</th>
+                <th>Action</th>
+              </tr>
+            </thead>
+            <tbody>
+              {pdfData.map((data, ind) => {
+                return (
+                  <React.Fragment key={ind}>
+                    {handleFolderData(data, ind, "table")}
+                  </React.Fragment>
+                );
+              })}
+            </tbody>
+          </Table>
+        </div>
+      ) : (
+        <div className="pdfContainer">
          {pdfData.map((data, ind) => {
            return (
-              <React.Fragment key={ind}>
-                {handleFolderData(data, ind, "table")}
-              </React.Fragment>
+              <div className="box" key={ind}>
+                {handleFolderData(data, ind, "list")}
+              </div>
            );
          })}
-        </tbody>
-      </Table>
-    </div>
-  ) : (
-    <div className="pdfContainer">
-      {pdfData.map((data, ind) => {
-        return (
-          <div className="box" key={ind}>
-            {handleFolderData(data, ind, "list")}
-          </div>
-        );
-      })}
-    </div>
+        </div>
+      )}
+      {isOpenMoveModal && (
+        <SelectFolder
+          onSuccess={handleMoveFolder}
+          isOpenModal={isOpenMoveModal}
+          folderCls={"contracts_Document"}
+          setIsOpenMoveModal={setIsOpenMoveModal}
+          setPdfData={setPdfData}
+        />
+      )}
+      <ModalUi
+        isOpen={isDeleteDoc}
+        headerColor={themeColor}
+        title={"Delete Document"}
+        handleClose={() => {
+          setIsDeleteDoc(false);
+        }}
+      >
+        <div style={{ height: "100%", padding: 20 }}>
+          <p>Are you sure you want to delete this document?</p>
+
+          <div
+            style={{
+              height: "1px",
+              backgroundColor: "#9f9f9f",
+              width: "100%",
+              marginTop: "15px",
+              marginBottom: "15px"
+            }}
+          ></div>
+
+          <button
+            onClick={() => {
+              handleDeleteDocument(selectDoc);
+            }}
+            style={{
+              background: themeColor,
+              color: "white"
+            }}
+            type="button"
+            className="finishBtn"
+          >
+            Yes
+          </button>
+          <button
+            onClick={() => {
+              setIsDeleteDoc(false);
+            }}
+            type="button"
+            className="finishBtn cancelBtn"
+          >
+            No
+          </button>
+        </div>
+      </ModalUi>
+    </>
  );
 }

-export default PdfFileComponent;
+export default DriveBody;
@@ -0,0 +1,67 @@
+import React from "react";
+import ModalUi from "../../primitives/ModalUi";
+
+const AddRoleModal = (props) => {
+  return (
+    <ModalUi
+      title={"Add Role"}
+      isOpen={props.isModalRole}
+      handleClose={props.handleCloseRoleModal}
+    >
+      <div className="addusercontainer">
+        <form
+          style={{ display: "flex", flexDirection: "column" }}
+          onSubmit={props.handleAddRole}
+        >
+          <input
+            value={props.roleName}
+            onChange={(e) => props.setRoleName(e.target.value)}
+            placeholder={
+              props.signersdata.length > 0
+                ? "User " + (props.signersdata.length + 1)
+                : "User 1"
+            }
+            className="addUserInput"
+          />
+          <p
+            style={{
+              color: "grey",
+              fontSize: 11,
+              margin: "10px 0 10px 5px"
+            }}
+          >
+            e.g: Hr, Director, Manager, New joinee, Accountant, etc...
+          </p>
+          <div>
+            <div
+              style={{
+                height: "1px",
+                backgroundColor: "#9f9f9f",
+                width: "100%",
+                marginBottom: "15px"
+              }}
+            ></div>
+            <button
+              type="submit"
+              style={{
+                background: "#00a2b7"
+              }}
+              className="finishBtn"
+            >
+              Add
+            </button>
+            <button
+              onClick={props.handleCloseRoleModal}
+              type="button"
+              className="finishBtn cancelBtn"
+            >
+              Close
+            </button>
+          </div>
+        </form>
+      </div>
+    </ModalUi>
+  );
+};
+
+export default AddRoleModal;
@@ -0,0 +1,17 @@
+import React from "react";
+
+function BorderResize({ right, top }) {
+  return (
+    <div
+      className="borderResize"
+      style={{
+        right: right ? right + "px" : "-1px",
+        bottom: top ? top + "px" : "-1px",
+        borderRight: "3px solid  #188ae2",
+        borderBottom: "3px solid #188ae2"
+      }}
+    ></div>
+  );
+}
+
+export default BorderResize;
@@ -1,7 +1,13 @@
 import React, { useEffect, useState } from "react";
-import "./certificate.css";
-
-import { Page, Text, View, Document, StyleSheet } from "@react-pdf/renderer";
+import opensignLogo from "../../assets/images/logo.png";
+import {
+  Page,
+  Text,
+  View,
+  Document,
+  StyleSheet,
+  Image
+} from "@react-pdf/renderer";

 function Certificate({ pdfData }) {
  const [isMultiSigners, setIsMultiSigners] = useState();
@@ -10,6 +16,7 @@ function Certificate({ pdfData }) {

  useEffect(() => {
    handleSignerData();
+    // eslint-disable-next-line
  }, []);

  const handleSignerData = () => {
@@ -49,70 +56,34 @@ function Certificate({ pdfData }) {
      fontSize: "11px",
      marginBottom: "10px",
      color: "gray"
+    },
+    image: {
+      width: "71px",
+      height: "17px"
    }
  });

  const generatedDate = () => {
    const newDate = new Date();
-    const localExpireDate = newDate.toLocaleDateString("en-US", {
-      day: "numeric",
-      month: "long",
-      year: "numeric"
-    });
-
-    var currentOffset = newDate.getTimezoneOffset();
-
-    var ISTOffset = 330; // IST offset UTC +5:30
-
-    var ISTTime = new Date(
-      newDate.getTime() + (ISTOffset + currentOffset) * 60000
-    );
-
-    // ISTTime now represents the time in IST coordinates
-
-    var hoursIST = ISTTime.getHours();
-    var minutesIST = ISTTime.getMinutes();
+    const utcTime = newDate.toUTCString();

    return (
      <Text
        style={{
-          textAlign: "right",
          color: "gray",
-          fontSize: "10px",
-          marginBottom: "30px"
+          fontSize: "10px"
        }}
      >
-        Generated On {localExpireDate} {hoursIST}:{minutesIST} IST
+        Generated On {utcTime}
      </Text>
    );
  };
  const changeCompletedDate = () => {
    const completedOn = pdfData[0].updatedAt;
    const newDate = new Date(completedOn);
-    const localExpireDate = newDate.toLocaleDateString("en-US", {
-      day: "numeric",
-      month: "long",
-      year: "numeric"
-    });
+    const utcTime = newDate.toUTCString();

-    var currentOffset = newDate.getTimezoneOffset();
-
-    var ISTOffset = 330; // IST offset UTC +5:30
-
-    var ISTTime = new Date(
-      newDate.getTime() + (ISTOffset + currentOffset) * 60000
-    );
-
-    // ISTTime now represents the time in IST coordinates
-
-    var hoursIST = ISTTime.getHours();
-    var minutesIST = ISTTime.getMinutes();
-
-    return (
-      <Text style={styles.textStyle2}>
-        {localExpireDate} {hoursIST}:{minutesIST} IST
-      </Text>
-    );
+    return <Text style={styles.textStyle2}>{utcTime}</Text>;
  };

  const signerName = (data) => {
@@ -143,7 +114,19 @@ function Certificate({ pdfData }) {
        {/** Page defines a single page of content. */}
        <Page size="A4" style={styles.page}>
          <View style={styles.section1}>
-            {generatedDate()}
+            <View
+              style={{
+                display: "flex",
+                flexDirection: "row",
+                justifyContent: "space-between",
+                alignItems: "center",
+                marginBottom: "30px"
+              }}
+            >
+              <Image src={opensignLogo} style={styles.image} />
+              {generatedDate()}
+            </View>
+
            <View style={{ justifyContent: "center" }}>
              <Text
                style={{
@@ -182,7 +165,9 @@ function Certificate({ pdfData }) {
                  </Text>
                  <Text style={styles.textStyle}>
                    Organization : &nbsp;
-                    <Text style={styles.textStyle2}>__</Text>
+                    <Text style={styles.textStyle2}>
+                      {pdfData[0].ExtUserPtr.Company}
+                    </Text>
                  </Text>
                  <Text style={styles.textStyle}>
                    Completed on : &nbsp;{changeCompletedDate()}
@@ -260,6 +245,12 @@ function Certificate({ pdfData }) {
                        {pdfData[0].ExtUserPtr.Name}
                      </Text>
                    </Text>
+                    <Text style={styles.textStyle}>
+                      Email : &nbsp;
+                      <Text style={styles.textStyle2}>
+                        {pdfData[0].ExtUserPtr.Email}
+                      </Text>
+                    </Text>
                    <Text style={styles.textStyle}>
                      Accessed from : &nbsp;
                      <Text style={styles.textStyle2}>
@@ -0,0 +1,74 @@
+import React from "react";
+import { themeColor } from "../../constant/const";
+function DefaultSignature({ defaultSignImg, xyPostion, setDefaultSignAlert }) {
+  const confirmToaddDefaultSign = () => {
+    if (xyPostion.length > 0) {
+      setDefaultSignAlert({
+        isShow: true,
+        alertMessage:
+          "Are you sure you want to auto sign at requested all locations?"
+      });
+    } else {
+      setDefaultSignAlert({
+        isShow: true,
+        alertMessage: "please select position!"
+      });
+    }
+  };
+
+  return (
+    <div>
+      <div
+        style={{
+          background: themeColor,
+          color: "white",
+          padding: "5px",
+          fontFamily: "sans-serif",
+          marginTop: "5px"
+        }}
+      >
+        Signature
+      </div>
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "column",
+          alignItems: "center",
+          marginTop: "10px",
+          fontWeight: "600"
+        }}
+      >
+        <>
+          <p>Your Signature</p>
+          <div className="defaultSignBox">
+            <img
+              alt="default img"
+              style={{
+                width: "100%",
+                height: "100%",
+                objectFit: "contain"
+              }}
+              src={defaultSignImg}
+            />
+          </div>
+          <button
+            style={{
+              background: themeColor,
+              color: "white",
+              marginTop: "20px",
+              cursor: "pointer",
+              marginBottom: "10px"
+            }}
+            type="button"
+            className="finishBtn finishnHover"
+            onClick={() => confirmToaddDefaultSign()}
+          >
+            Auto Sign All
+          </button>
+        </>
+      </div>
+    </div>
+  );
+}
+
+export default DefaultSignature;
@@ -0,0 +1,97 @@
+import React, { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import Loader from "../../primitives/LoaderWithMsg";
+import { contractDocument } from "../../constant/Utils";
+import HandleError from "../../primitives/HandleError";
+function DraftDocument() {
+  const navigate = useNavigate();
+  const [isLoading, setIsLoading] = useState({
+    isLoader: true,
+    message: "This might take some time"
+  });
+
+  const rowLevel =
+    localStorage.getItem("rowlevel") &&
+    JSON.parse(localStorage.getItem("rowlevel"));
+  const docId =
+    rowLevel && rowLevel?.id
+      ? rowLevel.id
+      : rowLevel?.objectId && rowLevel.objectId;
+
+  useEffect(() => {
+    getDocumentDetails();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  //get document details
+  const getDocumentDetails = async () => {
+    //getting document details
+    const documentData = await contractDocument(docId);
+    if (documentData && documentData.length > 0) {
+      handleDraftDoc(documentData);
+    } else if (
+      documentData === "Error: Something went wrong!" ||
+      (documentData.result && documentData.result.error)
+    ) {
+      setIsLoading({
+        isLoader: false,
+        message: "Error: Something went wrong!"
+      });
+    } else {
+      setIsLoading({
+        isLoader: false,
+        message: "No data found!"
+      });
+    }
+  };
+
+  //check document type and render on signyour self and placeholder route
+  const handleDraftDoc = (documentData) => {
+    const data = documentData[0];
+    const signerExist = data.Signers && data.Signers;
+    const isDecline = data.IsDeclined && data.IsDeclined;
+    const isPlaceholder = data.Placeholders && data.Placeholders;
+    const signedUrl = data.SignedUrl;
+    //checking if document has completed and request signature flow
+    if (data?.IsCompleted && signerExist?.length > 0) {
+      navigate(`/pdfRequestFiles/${data.objectId}`);
+    }
+    //checking if document has completed and signyour-self flow
+    else if (!signerExist && !isPlaceholder) {
+      navigate(`/signaturePdf/${data.objectId}`);
+    }
+    //checking if document has declined by someone
+    else if (isDecline) {
+      navigate(`/pdfRequestFiles/${data.objectId}`);
+      //checking draft type document
+    } else if (
+      signerExist?.length > 0 &&
+      isPlaceholder?.length > 0 &&
+      !signedUrl
+    ) {
+      navigate(`/placeHolderSign/${data.objectId}`);
+    }
+    //Inprogress document
+    else if (isPlaceholder?.length > 0 && signerExist?.length > 0) {
+      navigate(`/pdfRequestFiles/${data.objectId}`);
+    } //placeholder draft document
+    else if (
+      (signerExist?.length > 0 &&
+        (!isPlaceholder || isPlaceholder?.length === 0)) ||
+      ((!signerExist || signerExist?.length === 0) && isPlaceholder?.length > 0)
+    ) {
+      navigate(`/placeHolderSign/${data.objectId}`);
+    }
+  };
+
+  return (
+    <div>
+      {isLoading.isLoader ? (
+        <Loader isLoading={isLoading} />
+      ) : (
+        <HandleError handleError={isLoading.message} />
+      )}
+    </div>
+  );
+}
+
+export default DraftDocument;
@@ -0,0 +1,13 @@
+import React from "react";
+import { getWidgetType, widgets } from "../../constant/Utils";
+
+function DragElement(item) {
+  const getWidgets = widgets;
+  const filterWidgetPreview = getWidgets.filter(
+    (data) => data.type === item?.text
+  );
+
+  return <div>{getWidgetType(filterWidgetPreview[0])}</div>;
+}
+
+export default DragElement;
@@ -0,0 +1,425 @@
+import React, { useEffect, useState } from "react";
+import { themeColor } from "../../constant/const";
+import ModalUi from "../../primitives/ModalUi";
+import { radioButtonWidget } from "../../constant/Utils";
+function DropdownWidgetOption(props) {
+  const [dropdownOptionList, setDropdownOptionList] = useState([
+    "option-1",
+    "option-2"
+  ]);
+  const [minCount, setMinCount] = useState(0);
+  const [maxCount, setMaxCount] = useState(0);
+  const [dropdownName, setDropdownName] = useState(props.type);
+  const [isReadOnly, setIsReadOnly] = useState(false);
+  const [isHideLabel, setIsHideLabel] = useState(false);
+  const [status, setStatus] = useState("required");
+  const [defaultValue, setDefaultValue] = useState("");
+  const statusArr = ["required", "optional"];
+  const [defaultCheckbox, setDefaultCheckbox] = useState([]);
+
+  const resetState = () => {
+    setDropdownOptionList(["option-1", "option-2"]);
+    setDropdownName(props.type);
+    setIsReadOnly(false);
+    setIsHideLabel(false);
+    setMinCount(0);
+    setMaxCount(0);
+    setDefaultCheckbox([]);
+    setDefaultValue("");
+  };
+
+  useEffect(() => {
+    if (
+      props.currWidgetsDetails?.options?.name &&
+      props.currWidgetsDetails?.options?.values
+    ) {
+      setDropdownName(props.currWidgetsDetails?.options?.name);
+      setDropdownOptionList(props.currWidgetsDetails?.options?.values);
+      setMinCount(
+        props.currWidgetsDetails?.options?.validation?.minRequiredCount
+      );
+      setMaxCount(
+        props.currWidgetsDetails?.options?.validation?.maxRequiredCount
+      );
+      setIsReadOnly(props.currWidgetsDetails?.options?.isReadOnly);
+      setIsHideLabel(props.currWidgetsDetails?.options?.isHideLabel);
+      setStatus(props.currWidgetsDetails?.options?.status || "required");
+      setDefaultValue(props.currWidgetsDetails?.options?.defaultValue || "");
+      setDefaultCheckbox(props.currWidgetsDetails?.options?.defaultValue || []);
+    } else {
+      setStatus("required");
+      resetState();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [props.currWidgetsDetails]);
+  const handleInputChange = (index, value) => {
+    setDropdownOptionList((prevInputs) => {
+      const newInputs = [...prevInputs];
+      newInputs[index] = value;
+      return newInputs;
+    });
+  };
+
+  //function add add checkbox option and add width of checkbox
+  const handleAddInput = () => {
+    const deleteOption = false;
+    const addOption = true;
+    setDropdownOptionList((prevInputs) => [...prevInputs, ""]);
+    props.handleSaveWidgetsOptions(
+      null,
+      null,
+      null,
+      null,
+      null,
+      addOption,
+      deleteOption
+    );
+  };
+
+  //function add add checkbox option and delete width of checkbox
+  const handleDeleteInput = (ind) => {
+    const deleteOption = true;
+    const addOption = false;
+    const getUpdatedOptions = dropdownOptionList.filter(
+      (data, index) => index !== ind
+    );
+    setDropdownOptionList(getUpdatedOptions);
+    props.handleSaveWidgetsOptions(
+      null,
+      null,
+      null,
+      null,
+      null,
+      addOption,
+      deleteOption
+    );
+  };
+
+  const handleSaveOption = () => {
+    const defaultData =
+      defaultCheckbox && defaultCheckbox.length > 0
+        ? defaultCheckbox
+        : defaultValue;
+
+    props.handleSaveWidgetsOptions(
+      dropdownName,
+      dropdownOptionList,
+      minCount,
+      maxCount,
+      isReadOnly,
+      null,
+      null,
+      status,
+      defaultData,
+      isHideLabel
+    );
+    //  props.setShowDropdown(false);
+    setDropdownOptionList(["option-1", "option-2"]);
+    setDropdownName(props.type);
+    //  props.setCurrWidgetsDetails({});
+    setIsReadOnly(false);
+    setIsHideLabel(false);
+    setMinCount(0);
+    setMaxCount(0);
+    setDefaultCheckbox([]);
+    setDefaultValue("");
+  };
+
+  const handleSetMinMax = (e) => {
+    const minValue = e.target.value;
+    if (minValue > dropdownOptionList.length) {
+      return "";
+    } else {
+      return minValue;
+    }
+  };
+
+  const handleDefaultCheck = (index) => {
+    const getDefaultCheck = defaultCheckbox.includes(index);
+    if (getDefaultCheck) {
+      return true;
+    } else {
+      return false;
+    }
+  };
+
+  return (
+    //props.showDropdown
+    <ModalUi
+      //   styleClass={"dropdownModal"}
+      isOpen={props.showDropdown}
+      title={props.title}
+      showClose={false}
+    >
+      <div style={{ height: "100%", padding: 20 }}>
+        <form
+          onSubmit={(e) => {
+            e.preventDefault();
+            handleSaveOption();
+          }}
+        >
+          <div className="dropdownContainer">
+            <label style={{ fontSize: "13px", fontWeight: "600" }}>
+              Name<span style={{ color: "red", fontSize: 13 }}> *</span>
+            </label>
+            <input
+              required
+              defaultValue={dropdownName}
+              value={dropdownName}
+              onChange={(e) => setDropdownName(e.target.value)}
+              className="drodown-input"
+            />
+
+            <label
+              style={{ fontSize: "13px", fontWeight: "600", marginTop: "5px" }}
+            >
+              Options
+            </label>
+
+            <div
+              style={{
+                display: "flex",
+                flexDirection: "column"
+              }}
+            >
+              {dropdownOptionList.map((option, index) => (
+                <div
+                  key={index}
+                  style={{
+                    display: "flex",
+                    flexDirection: "row",
+                    marginBottom: "5px",
+                    alignItems: "center"
+                  }}
+                >
+                  {props.type === "checkbox" && !props.isSignYourself && (
+                    <input
+                      type="checkbox"
+                      checked={handleDefaultCheck(index)}
+                      onChange={(e) => {
+                        if (e.target.checked) {
+                          const getDefaultCheck =
+                            defaultCheckbox?.includes(index);
+                          if (!getDefaultCheck) {
+                            setDefaultCheckbox((prev) => [...prev, index]);
+                          }
+                        } else {
+                          const removeOption = defaultCheckbox.filter(
+                            (data) => data !== index
+                          );
+                          setDefaultCheckbox(removeOption);
+                        }
+                      }}
+                      style={{
+                        width: "23px",
+                        height: "19px",
+                        marginRight: "5px"
+                      }}
+                    />
+                  )}
+                  <input
+                    required
+                    className="drodown-input"
+                    type="text"
+                    value={option}
+                    onChange={(e) => handleInputChange(index, e.target.value)}
+                  />
+
+                  <i
+                    className="fa-solid fa-rectangle-xmark"
+                    onClick={() => handleDeleteInput(index)}
+                    style={{
+                      color: "red",
+                      fontSize: "25px",
+                      marginLeft: "10px"
+                    }}
+                  ></i>
+                </div>
+              ))}
+              <i
+                onClick={handleAddInput}
+                style={{
+                  cursor: "pointer",
+                  color: themeColor,
+                  fontSize: "25px",
+                  marginLeft: "10px"
+                }}
+                className="fa-solid fa-square-plus"
+              ></i>
+              {props.type === "checkbox" && !props.isSignYourself && (
+                <>
+                  <label style={{ fontSize: "13px", fontWeight: "600" }}>
+                    Minimun check
+                  </label>
+                  <input
+                    required
+                    defaultValue={0}
+                    value={minCount}
+                    onChange={(e) => {
+                      const count = handleSetMinMax(e);
+                      setMinCount(count);
+                    }}
+                    className="drodown-input"
+                  />
+                  <label style={{ fontSize: "13px", fontWeight: "600" }}>
+                    Maximum check
+                  </label>
+                  <input
+                    required
+                    defaultValue={0}
+                    value={maxCount}
+                    onChange={(e) => {
+                      const count = handleSetMinMax(e);
+                      setMaxCount(count);
+                    }}
+                    className="drodown-input"
+                  />
+                </>
+              )}
+            </div>
+            {["dropdown", radioButtonWidget].includes(props.type) && (
+              <>
+                <label
+                  style={{
+                    fontSize: "13px",
+                    fontWeight: "600",
+                    marginTop: "5px"
+                  }}
+                >
+                  Default value
+                </label>
+                <select
+                  onChange={(e) => setDefaultValue(e.target.value)}
+                  className="drodown-input"
+                  name="defaultvalue"
+                  value={defaultValue}
+                  placeholder="select default value"
+                >
+                  <option value="" disabled hidden style={{ fontSize: "13px" }}>
+                    Select...
+                  </option>
+                  {dropdownOptionList.map((data, ind) => {
+                    return (
+                      <option
+                        style={{ fontSize: "13px" }}
+                        key={ind}
+                        value={data}
+                      >
+                        {data}
+                      </option>
+                    );
+                  })}
+                </select>
+              </>
+            )}
+            {props.type !== "checkbox" && props.type !== radioButtonWidget && (
+              <>
+                <div
+                  style={{
+                    display: "flex",
+                    flexDirection: "row",
+                    gap: 10,
+                    marginTop: "0.5rem"
+                  }}
+                >
+                  {statusArr.map((data, ind) => {
+                    return (
+                      <div
+                        key={ind}
+                        style={{
+                          display: "flex",
+                          flexDirection: "row",
+                          gap: 5,
+                          alignItems: "center"
+                        }}
+                      >
+                        <input
+                          style={{ accentColor: "red" }}
+                          type="radio"
+                          name="status"
+                          onChange={() => setStatus(data.toLowerCase())}
+                          checked={status.toLowerCase() === data.toLowerCase()}
+                        />
+                        <div style={{ fontSize: "13px", fontWeight: "500" }}>
+                          {data}
+                        </div>
+                      </div>
+                    );
+                  })}
+                </div>
+              </>
+            )}
+            {["checkbox", radioButtonWidget].includes(props.type) && (
+              <div className="flex flex-row gap-5 mt-2 items-center text-center">
+                {!props.isSignYourself && (
+                  <div>
+                    <input
+                      id="isreadonly"
+                      type="checkbox"
+                      checked={isReadOnly}
+                      onChange={(e) => {
+                        setIsReadOnly(e.target.checked);
+                      }}
+                    />
+                    <label className="ml-1" htmlFor="isreadonly">
+                      Is read only
+                    </label>
+                  </div>
+                )}
+                <div>
+                  <input
+                    id="ishidelabel"
+                    type="checkbox"
+                    checked={isHideLabel}
+                    onChange={(e) => {
+                      setIsHideLabel(e.target.checked);
+                    }}
+                  />
+
+                  <label className="ml-1" htmlFor="ishidelabel">
+                    Hide labels
+                  </label>
+                </div>
+              </div>
+            )}
+          </div>
+          <div
+            style={{
+              height: "1px",
+              backgroundColor: "#9f9f9f",
+              width: "100%",
+              marginTop: "15px",
+              marginBottom: "15px"
+            }}
+          ></div>
+          <button
+            // onClick={() => handleSaveOption()}
+            disabled={dropdownOptionList.length === 0 && true}
+            style={{
+              background: themeColor,
+              color: "white"
+            }}
+            type="submit"
+            className={"finishBtn"}
+          >
+            Save
+          </button>
+          {props.currWidgetsDetails?.options?.values?.length > 0 && (
+            <button
+              type="submit"
+              className="finishBtn cancelBtn"
+              onClick={() => {
+                props.handleClose && props.handleClose();
+                resetState();
+              }}
+            >
+              Cancel
+            </button>
+          )}
+        </form>
+      </div>
+    </ModalUi>
+  );
+}
+
+export default DropdownWidgetOption;
@@ -0,0 +1,142 @@
+import React, { useState } from "react";
+import "../../styles/AddUser.css";
+// import SelectFolder from "../../premitives/SelectFolder";
+
+const EditTemplate = ({ template, onSuccess }) => {
+  // const [folder, setFolder] = useState({ ObjectId: "", Name: "" });
+  const [formData, setFormData] = useState({
+    Name: template?.Name || "",
+    Note: template?.Note || "",
+    Description: template?.Description || "",
+    SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false"
+  });
+
+  const handleStrInput = (e) => {
+    setFormData({ ...formData, [e.target.name]: e.target.value });
+  };
+  // const handleFolder = (data) => {
+  //   console.log("handleFolder ", data)
+  //   setFolder(data);
+  // };
+
+  // Define a function to handle form submission
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    const isChecked = formData.SendinOrder === "true" ? true : false;
+    const data = { ...formData, SendinOrder: isChecked };
+    onSuccess(data);
+  };
+
+  return (
+    <div className="addusercontainer">
+      <div className="form-wrapper">
+        <form onSubmit={handleSubmit}>
+          <div>
+            <label htmlFor="name" style={{ fontSize: 13 }}>
+              File
+            </label>
+            <div
+              style={{
+                padding: "0.5rem 0.75rem",
+                border: "1px solid #d1d5db",
+                borderRadius: "0.375rem",
+                fontSize: "0.75rem",
+                fontWeight: "700"
+              }}
+            >
+              {template.URL?.split("/")?.pop()?.split("_")[1]}
+            </div>
+          </div>
+          <div className="form-section">
+            <label htmlFor="name" style={{ fontSize: 13 }}>
+              Name
+              <span style={{ color: "red", fontSize: 13 }}> *</span>
+            </label>
+            <input
+              type="text"
+              name="Name"
+              value={formData.Name}
+              onChange={(e) => handleStrInput(e)}
+              required
+              className="addUserInput"
+            />
+          </div>
+          <div className="form-section">
+            <label htmlFor="Note" style={{ fontSize: 13 }}>
+              Note
+            </label>
+            <input
+              type="text"
+              name="Note"
+              id="Note"
+              value={formData.Note}
+              onChange={(e) => handleStrInput(e)}
+              className="addUserInput"
+            />
+          </div>
+          <div className="form-section">
+            <label htmlFor="Description" style={{ fontSize: 13 }}>
+              Description
+            </label>
+            <input
+              type="text"
+              name="Description"
+              id="Description"
+              value={formData.Description}
+              onChange={(e) => handleStrInput(e)}
+              className="addUserInput"
+            />
+          </div>
+          <div className="form-section">
+            <label style={{ fontSize: 13 }}>Send In Order</label>
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                gap: 8,
+                marginLeft: 8,
+                marginBottom: 5
+              }}
+            >
+              <input
+                type="radio"
+                value={"true"}
+                name="SendinOrder"
+                checked={formData.SendinOrder === "true"}
+                onChange={handleStrInput}
+              />
+              <div style={{ fontSize: 12 }}>Yes</div>
+            </div>
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                gap: 8,
+                marginLeft: 8,
+                marginBottom: 5
+              }}
+            >
+              <input
+                type="radio"
+                value={"false"}
+                name="SendinOrder"
+                checked={formData.SendinOrder === "false"}
+                onChange={handleStrInput}
+              />
+              <div style={{ fontSize: 12 }}>No</div>
+            </div>
+          </div>
+          {/* <SelectFolder onSuccess={handleFolder} folderCls={"contracts_Template"} /> */}
+          <div className="buttoncontainer">
+            <button type="submit" className="submitbutton">
+              Submit
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+};
+
+export default EditTemplate;
@@ -0,0 +1,429 @@
+import React, { useState } from "react";
+import { saveAs } from "file-saver";
+import celebration from "../../assets/images/newCeleb.gif";
+import axios from "axios";
+import { getBase64FromUrl } from "../../constant/Utils";
+import { themeColor } from "../../constant/const";
+import printModule from "print-js";
+import loader from "../../assets/images/loader2.gif";
+
+function EmailComponent({
+  isEmail,
+  pdfUrl,
+  isCeleb,
+  setIsEmail,
+  setSuccessEmail,
+  pdfName,
+  sender,
+  setIsAlert
+}) {
+  const [emailList, setEmailList] = useState([]);
+  const [emailValue, setEmailValue] = useState();
+  const [isLoading, setIsLoading] = useState(false);
+  //function for send email
+  const sendEmail = async () => {
+    setIsLoading(true);
+    let sendMail;
+    for (let i = 0; i < emailList.length; i++) {
+      try {
+        const imgPng =
+          "https://qikinnovation.ams3.digitaloceanspaces.com/logo.png";
+
+        let url = `${localStorage.getItem("baseUrl")}functions/sendmailv3/`;
+        const headers = {
+          "Content-Type": "application/json",
+          "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+          sessionToken: localStorage.getItem("accesstoken")
+        };
+        const openSignUrl = "https://www.opensignlabs.com/contact-us";
+        const themeBGcolor = themeColor;
+        let params = {
+          pdfName: pdfName,
+          url: pdfUrl,
+          recipient: emailList[i],
+          subject: `${sender.name} has signed the doc - ${pdfName}`,
+          from: sender.email,
+          html:
+            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>  <div style='background-color:#f5f5f5;padding:20px'>    <div style='box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background-color:white;'> <div><img src=" +
+            imgPng +
+            "  height='50' style='padding:20px,width:170px,height:40px'/> </div><div style='padding:2px;font-family:system-ui; background-color:" +
+            themeBGcolor +
+            ";'>    <p style='font-size:20px;font-weight:400;color:white;padding-left:20px',>  Document Copy</p></div><div><p style='padding:20px;font-family:system-ui;font-size:14px'>A copy of the document <strong>" +
+            pdfName +
+            " </strong>is attached to this email. Kindly download the document from the attachment.</p></div> </div><div><p>This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
+            sender.email +
+            " directly. If you think this email is inappropriate or spam, you may file a complaint with OpenSign™  <a href= " +
+            openSignUrl +
+            " target=_blank>here</a> </p></div></div></body></html>"
+        };
+        sendMail = await axios.post(url, params, { headers: headers });
+      } catch (error) {
+        console.log("error", error);
+        setIsLoading(false);
+        setIsEmail(false);
+        setIsAlert({
+          isShow: true,
+          alertMessage: "something went wrong"
+        });
+      }
+    }
+
+    if (sendMail && sendMail.data.result.status === "success") {
+      setSuccessEmail(true);
+      setTimeout(() => {
+        setSuccessEmail(false);
+        setIsEmail(false);
+        setEmailValue("");
+        setEmailList([]);
+      }, 1500);
+
+      setIsLoading(false);
+    } else if (sendMail && sendMail.data.result.status === "error") {
+      setIsLoading(false);
+      setIsEmail(false);
+      setIsAlert({
+        isShow: true,
+        alertMessage: "something went wrong"
+      });
+      setEmailValue("");
+      setEmailList([]);
+    } else {
+      setIsLoading(false);
+      setIsEmail(false);
+      setIsAlert({
+        isShow: true,
+        alertMessage: "something went wrong"
+      });
+      setEmailValue("");
+      setEmailList([]);
+    }
+  };
+
+  //function for remove email
+  const removeChip = (index) => {
+    const updateEmailCount = emailList.filter((data, key) => key !== index);
+    setEmailList(updateEmailCount);
+  };
+  //function for get email value
+  const handleEmailValue = (e) => {
+    const value = e.target.value;
+    setEmailValue(value);
+  };
+
+  //function for save email in array after press enter
+  const handleEnterPress = (e) => {
+    if (e.key === "Enter" && emailValue) {
+      setEmailList((prev) => [...prev, emailValue]);
+      setEmailValue("");
+    } else if (e === "add" && emailValue) {
+      setEmailList((prev) => [...prev, emailValue]);
+      setEmailValue("");
+    }
+  };
+
+  // function for print signed pdf
+  const handleToPrint = async (event) => {
+    event.preventDefault();
+
+    const pdf = await getBase64FromUrl(pdfUrl);
+    const isAndroidDevice = navigator.userAgent.match(/Android/i);
+    const isAppleDevice =
+      (/iPad|iPhone|iPod/.test(navigator.platform) ||
+        (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1)) &&
+      !window.MSStream;
+    if (isAndroidDevice || isAppleDevice) {
+      const byteArray = Uint8Array.from(
+        atob(pdf)
+          .split("")
+          .map((char) => char.charCodeAt(0))
+      );
+      const blob = new Blob([byteArray], { type: "application/pdf" });
+      const blobUrl = URL.createObjectURL(blob);
+      window.open(blobUrl, "_blank");
+    } else {
+      printModule({ printable: pdf, type: "pdf", base64: true });
+    }
+  };
+
+  //handle download signed pdf
+  const handleDownloadPdf = () => {
+    saveAs(pdfUrl, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
+  };
+
+  const sanitizeFileName = (pdfName) => {
+    // Replace spaces with underscore
+    return pdfName.replace(/ /g, "_");
+  };
+
+  const isAndroid = /Android/i.test(navigator.userAgent);
+
+  return (
+    <div>
+      {/* isEmail */}
+      {isEmail && (
+        <div className="modaloverlay">
+          <div className="modalcontainer">
+            {isLoading && (
+              <div
+                style={{
+                  position: "absolute",
+                  height: "100%",
+                  width: "100%",
+                  display: "flex",
+                  justifyContent: "center",
+                  flexDirection: "column",
+                  alignItems: "center",
+                  zIndex: "20",
+                  backgroundColor: "#e6f2f2",
+                  opacity: 0.8
+                }}
+              >
+                <img
+                  alt="no img"
+                  src={loader}
+                  style={{ width: "70px", height: "70px" }}
+                />
+                <span style={{ fontSize: "12px", fontWeight: "bold" }}>
+                  This might take some time
+                </span>
+              </div>
+            )}
+            <div style={{ background: "#32a3ac" }} className="modalheader">
+              <span style={{ color: "white" }}>Successfully signed!</span>
+
+              <div style={{ display: "flex", flexDirection: "row" }}>
+                <div></div>
+                {!isAndroid && (
+                  <button
+                    onClick={handleToPrint}
+                    style={{
+                      display: "flex",
+                      flexDirection: "row",
+                      alignItems: "center"
+                    }}
+                    className="btn btn-primary btn-sm"
+                  >
+                    <i
+                      className="fa fa-print"
+                      style={{
+                        fontSize: "15px",
+                        marginRight: "3px",
+                        color: "white"
+                      }}
+                      aria-hidden="true"
+                    ></i>
+                    Print
+                  </button>
+                )}
+
+                <button
+                  className="btn btn-danger btn-sm"
+                  onClick={() => handleDownloadPdf()}
+                  style={{
+                    display: "flex",
+                    flexDirection: "row",
+                    alignItems: "center",
+                    marginLeft: "10px"
+                  }}
+                >
+                  <i
+                    className="fa fa-download"
+                    style={{
+                      color: "white",
+                      fontSize: "15px",
+                      marginRight: "3px"
+                    }}
+                    aria-hidden="true"
+                  ></i>
+                  Download
+                </button>
+              </div>
+            </div>
+            <div style={{ height: "100%", padding: 20 }}>
+              {isCeleb && (
+                <div
+                  style={{
+                    position: "absolute",
+                    marginLeft: "50px"
+                  }}
+                >
+                  <img
+                    alt="print img"
+                    width={300}
+                    height={250}
+                    // style={styles.gifCeleb}
+                    src={celebration}
+                  />
+                </div>
+              )}
+              <p
+                style={{
+                  fontFamily: "system-ui",
+                  verticalAlign: "baseline",
+                  fontWeight: "500",
+                  color: "#403f3e",
+                  fontSize: "15px",
+                  marginBottom: "5px"
+                }}
+              >
+                Recipients added here will get a copy of the signed document.
+              </p>
+              {emailList.length > 0 ? (
+                <>
+                  <div className="addEmail">
+                    <div
+                      style={{
+                        display: "flex",
+                        flexDirection: "row",
+
+                        flexWrap: "wrap"
+                      }}
+                    >
+                      {emailList.map((data, ind) => {
+                        return (
+                          <div
+                            className="emailChip"
+                            style={{
+                              display: "flex",
+                              flexDirection: "row",
+                              alignItems: "center"
+                            }}
+                            key={ind}
+                          >
+                            <span
+                              style={{
+                                color: "white",
+                                fontSize: "13px"
+                              }}
+                            >
+                              {data}
+                            </span>
+                            <span
+                              style={{
+                                color: "white",
+                                fontSize: 13,
+                                fontWeight: 600,
+                                marginLeft: 7,
+                                cursor: "pointer"
+                              }}
+                              onClick={() => removeChip(ind)}
+                            >
+                              <i className="fa-solid fa-xmark"></i>
+                            </span>
+                          </div>
+                        );
+                      })}
+                    </div>
+                    {emailList.length <= 9 && (
+                      <input
+                        type="text"
+                        value={emailValue}
+                        className="addEmailInput"
+                        onChange={handleEmailValue}
+                        onKeyDown={handleEnterPress}
+                        onBlur={() => {
+                          if (emailValue) {
+                            handleEnterPress("add");
+                          }
+                        }}
+                        required
+                      />
+                    )}
+                  </div>
+                </>
+              ) : (
+                <div>
+                  <input
+                    type="text"
+                    value={emailValue}
+                    className="emailInput"
+                    onChange={handleEmailValue}
+                    onKeyDown={handleEnterPress}
+                    placeholder="Add the email addresses"
+                    onBlur={() => {
+                      if (emailValue) {
+                        handleEnterPress("add");
+                      }
+                    }}
+                    required
+                  />
+                </div>
+              )}
+              <span
+                style={{
+                  cursor: emailValue && "pointer"
+                }}
+                onClick={() => {
+                  if (emailValue) {
+                    handleEnterPress("add");
+                  }
+                }}
+              >
+                <i
+                  style={{
+                    backgroundColor: themeColor,
+                    padding: "5px 7px",
+                    marginTop: "10px",
+                    color: "white",
+                    borderRadius: "2px"
+                  }}
+                  className="fa fa-plus"
+                  aria-hidden="true"
+                ></i>
+              </span>
+
+              <div
+                style={{
+                  background: "#e3e2e1",
+                  marginTop: "10px",
+                  padding: "5px",
+                  borderRadius: "3px"
+                }}
+              >
+                <span style={{ fontWeight: "700" }}>Note:</span>
+                <span style={{ fontSize: "15px" }}>
+                  {" "}
+                  You can only send to ten recipients at a time.
+                </span>
+              </div>
+              <div
+                style={{
+                  height: "1px",
+                  backgroundColor: "#9f9f9f",
+                  width: "100%",
+                  marginTop: "15px",
+                  marginBottom: "15px"
+                }}
+              ></div>
+              <button
+                disabled={emailList.length === 0 && true}
+                style={{
+                  background: themeColor,
+                  color: "white"
+                }}
+                type="button"
+                className={emailList.length === 0 ? "defaultBtn" : "finishBtn"}
+                onClick={() => sendEmail()}
+              >
+                Send
+              </button>
+              <button
+                type="button"
+                className="finishBtn cancelBtn"
+                onClick={() => {
+                  setIsEmail(false);
+                  setEmailValue("");
+                  setEmailList([]);
+                }}
+              >
+                Close
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
+
+export default EmailComponent;
@@ -1,14 +1,14 @@
 import React from "react";
-import PrevNext from "./prevNext";
+import PrevNext from "./PrevNext";
 import { PDFDownloadLink } from "@react-pdf/renderer";
-import Certificate from "../Certificate/Certificate";
+import Certificate from "./Certificate";
 import printModule from "print-js";
-import { getBase64FromUrl } from "../../utils/Utils";
+import { getBase64FromUrl } from "../../constant/Utils";
 import { saveAs } from "file-saver";
-import "../../css/signature.css";
+import "../../styles/signature.css";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import { useNavigate } from "react-router-dom";
-import { themeColor } from "../../utils/ThemeColor/backColor";
+import { themeColor } from "../../constant/const";

 function Header({
  isPdfRequestFiles,
@@ -21,23 +21,28 @@ function Header({
  changePage,
  pdfUrl,
  documentStatus,
-  embedImages,
+  embedWidgetsData,
  pdfDetails,
  signerPos,
  signersdata,
  isMailSend,
  alertSendEmail,
-  isSigned,
  isCompleted,
  isShowHeader,
  decline,
  currentSigner,
  dataTut4,
-  alreadySign
+  alreadySign,
+  isSignYourself,
+  setIsEmail,
+  completeBtnTitle,
+  setIsEditTemplate
 }) {
+  const filterPrefill =
+    signerPos && signerPos?.filter((data) => data.Role !== "prefill");
  const isMobile = window.innerWidth < 767;
  const navigate = useNavigate();
-
+  const isGuestSigner = localStorage.getItem("isGuestSigner");
  //for go to previous page
  function previousPage() {
    changePage(-1);
@@ -60,27 +65,149 @@ function Header({
    event.preventDefault();

    const pdf = await getBase64FromUrl(pdfUrl);
-
-    printModule({ printable: pdf, type: "pdf", base64: true });
+    const isAndroidDevice = navigator.userAgent.match(/Android/i);
+    const isAppleDevice =
+      (/iPad|iPhone|iPod/.test(navigator.platform) ||
+        (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1)) &&
+      !window.MSStream;
+    if (isAndroidDevice || isAppleDevice) {
+      const byteArray = Uint8Array.from(
+        atob(pdf)
+          .split("")
+          .map((char) => char.charCodeAt(0))
+      );
+      const blob = new Blob([byteArray], { type: "application/pdf" });
+      const blobUrl = URL.createObjectURL(blob);
+      window.open(blobUrl, "_blank");
+    } else {
+      printModule({ printable: pdf, type: "pdf", base64: true });
+    }
  };

  //handle download signed pdf
  const handleDownloadPdf = () => {
    const pdfName = pdfDetails[0] && pdfDetails[0].Name;
-
-    saveAs(pdfUrl, `${pdfName}_signed_by_OpenSign™.pdf`);
+    saveAs(pdfUrl, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
  };

+  const sanitizeFileName = (pdfName) => {
+    // Replace spaces with underscore
+    return pdfName.replace(/ /g, "_");
+  };
+  //certificate generate and download component in mobile view
+  const CertificateDropDown = () => {
+    //after generate download certifcate pdf
+    const handleDownload = (pdfBlob, fileName) => {
+      if (pdfBlob) {
+        const url = window.URL.createObjectURL(pdfBlob);
+        // Create a temporary anchor element
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = fileName;
+        // Append the anchor to the body
+        document.body.appendChild(link);
+        // Programmatically click the anchor to trigger the download
+        link.click();
+        // Remove the anchor from the body
+        document.body.removeChild(link);
+        // Release the object URL to free up resources
+        window.URL.revokeObjectURL(url);
+      }
+    };
+
+    return (
+      <PDFDownloadLink
+        onClick={(e) => e.preventDefault()}
+        style={{ textDecoration: "none", zIndex: "35" }}
+        document={<Certificate pdfData={pdfDetails} />}
+      >
+        {({ blob, loading }) => (
+          <>
+            {loading ? (
+              <div
+                style={{
+                  border: "none",
+                  backgroundColor: "#fff"
+                }}
+              >
+                <i
+                  className="fa-solid fa-award"
+                  style={{ marginRight: "2px" }}
+                  aria-hidden="true"
+                ></i>
+                Certificate
+              </div>
+            ) : (
+              <div
+                style={{ border: "none", backgroundColor: "#fff" }}
+                onClick={() =>
+                  handleDownload(
+                    blob,
+                    `completion certificate-${
+                      pdfDetails[0] && pdfDetails[0].Name
+                    }.pdf`
+                  )
+                }
+              >
+                <i
+                  className="fa-solid fa-award"
+                  style={{ marginRight: "2px" }}
+                  aria-hidden="true"
+                ></i>
+                Certificate
+              </div>
+            )}
+          </>
+        )}
+      </PDFDownloadLink>
+    );
+  };
+  const CertificateComponent = () => {
+    return (
+      <PDFDownloadLink
+        style={{ textDecoration: "none" }}
+        document={<Certificate pdfData={pdfDetails} />}
+        fileName={`completion certificate-${
+          pdfDetails[0] && pdfDetails[0].Name
+        }.pdf`}
+      >
+        {({ loading }) => (
+          <button
+            type="button"
+            className="defaultBtn certificateBtn"
+            disabled={loading}
+            style={{
+              display: "flex",
+              flexDirection: "row",
+              alignItems: "center"
+            }}
+          >
+            <i
+              className="fa-solid fa-award"
+              style={{
+                color: "white",
+                fontSize: "15px",
+                marginRight: "3px"
+              }}
+              aria-hidden="true"
+            ></i>
+            Certificate
+          </button>
+        )}
+      </PDFDownloadLink>
+    );
+  };
  return (
-    <div
-      style={{ paddingBottom: "5px", paddingTop: "5px" }}
-      className="mobileHead"
-    >
+    <div style={{ padding: "5px 0px 5px 0px" }} className="mobileHead">
      {isMobile && isShowHeader ? (
        <div
          id="navbar"
-          className="stickyHead"
-          style={{ width: window.innerWidth - 30 + "px" }}
+          className={isGuestSigner ? "stickySignerHead" : "stickyHead"}
+          style={{
+            width: isGuestSigner
+              ? window.innerWidth
+              : window.innerWidth - 30 + "px"
+          }}
        >
          <div className="preBtn2">
            <div
@@ -91,7 +218,7 @@ function Header({
              <i
                className="fa fa-arrow-left"
                aria-hidden="true"
-                style={{ color: themeColor(), cursor: "pointer" }}
+                style={{ color: themeColor, cursor: "pointer" }}
              ></i>
            </div>
            <div>
@@ -124,16 +251,16 @@ function Header({
                style={{ color: "gray", cursor: "pointer" }}
              ></i>
            </div>
-            {pdfUrl ? (
+            {pdfUrl && alreadySign ? (
              <DropdownMenu.Root>
                <DropdownMenu.Trigger asChild>
                  <div
-                    // onClick={() => handleDownloadPdf()}
                    style={{
-                      color: themeColor(),
+                      color: themeColor,
                      border: "none",
                      fontWeight: "650",
-                      fontSize: "16px"
+                      fontSize: "16px",
+                      padding: "0px 3px 0px 5px"
                    }}
                  >
                    <i className="fa fa-ellipsis-v" aria-hidden="true"></i>
@@ -163,44 +290,61 @@ function Header({
                        Download
                      </div>
                    </DropdownMenu.Item>
-                    <DropdownMenu.Item className="DropdownMenuItem">
-                      <PDFDownloadLink
-                        style={{ textDecoration: "none" }}
-                        document={<Certificate pdfData={pdfDetails} />}
-                        fileName={`completion certificate-${
-                          pdfDetails[0] && pdfDetails[0].Name
-                        }.pdf`}
+                    {recipient && pdfDetails[0] && pdfDetails.length > 0 ? (
+                      <DropdownMenu.Item className="DropdownMenuItem">
+                        <CertificateDropDown />
+                      </DropdownMenu.Item>
+                    ) : isPdfRequestFiles &&
+                      alreadySign &&
+                      isCompleted.isCertificate ? (
+                      <DropdownMenu.Item className="DropdownMenuItem">
+                        <CertificateDropDown />
+                      </DropdownMenu.Item>
+                    ) : (
+                      isSignYourself && (
+                        <>
+                          <DropdownMenu.Item className="DropdownMenuItem">
+                            <CertificateDropDown />
+                          </DropdownMenu.Item>
+                          <DropdownMenu.Item
+                            className="DropdownMenuItem"
+                            onClick={() => setIsEmail(true)}
+                          >
+                            <div
+                              style={{
+                                display: "flex",
+                                flexDirection: "row"
+                              }}
+                            >
+                              <i
+                                className="fa fa-envelope"
+                                style={{ marginRight: "2px" }}
+                                aria-hidden="true"
+                              ></i>
+                              Mail
+                            </div>
+                          </DropdownMenu.Item>
+                        </>
+                      )
+                    )}
+                    <DropdownMenu.Item
+                      className="DropdownMenuItem"
+                      onClick={handleToPrint}
+                    >
+                      <div
+                        style={{
+                          display: "flex",
+                          flexDirection: "row"
+                        }}
                      >
-                        {({ blob, url, loading, error }) => (
-                          <>
-                            {console.log("error", error)}
-                            {loading ? (
-                              "Loading document..."
-                            ) : (
-                              <button
-                                type="button"
-                                className="defaultBtn certificateBtn"
-                                style={{
-                                  display: "flex",
-                                  flexDirection: "row",
-                                  alignItems: "center"
-                                }}
-                              >
-                                <i
-                                  className="fa fa-certificate"
-                                  style={{
-                                    color: "white",
-                                    fontSize: "15px",
-                                    marginRight: "3px"
-                                  }}
-                                  aria-hidden="true"
-                                ></i>
-                                Certificate
-                              </button>
-                            )}
-                          </>
-                        )}
-                      </PDFDownloadLink>
+                        {" "}
+                        <i
+                          className="fa fa-print"
+                          aria-hidden="true"
+                          style={{ marginRight: "2px" }}
+                        ></i>
+                        Print
+                      </div>
                    </DropdownMenu.Item>
                  </DropdownMenu.Content>
                </DropdownMenu.Portal>
@@ -236,25 +380,27 @@ function Header({
                          }
                        }}
                        style={{
-                          color: isMailSend ? "gray" : themeColor(),
+                          color: isMailSend ? "gray" : themeColor,
                          border: "none",
                          fontWeight: "650",
                          fontSize: "16px"
                        }}
                        data-tut={dataTut4}
                      >
-                        Send
+                        {completeBtnTitle ? completeBtnTitle : "Send"}
                      </div>
                    ) : (
                      <div
                        data-tut="reactourThird"
                        onClick={() => {
                          if (!pdfUrl) {
-                            embedImages();
+                            embedWidgetsData();
+                          } else if (isPdfRequestFiles) {
+                            embedWidgetsData();
                          }
                        }}
                        style={{
-                          color: themeColor(),
+                          color: themeColor,
                          border: "none",
                          fontWeight: "650",
                          fontSize: "16px"
@@ -280,41 +426,8 @@ function Header({
          {recipient ? (
            pdfUrl || isAlreadySign.mssg ? (
              <div style={{ display: "flex", flexDirection: "row" }}>
-                {pdfDetails[0] && pdfDetails.length > 0 && (
-                  <PDFDownloadLink
-                    style={{ textDecoration: "none" }}
-                    document={<Certificate pdfData={pdfDetails} />}
-                    fileName={`completion certificate-${
-                      pdfDetails[0] && pdfDetails[0].Name
-                    }.pdf`}
-                  >
-                    {({ blob, url, loading, error }) =>
-                      loading ? (
-                        "Loading document..."
-                      ) : (
-                        <button
-                          type="button"
-                          className="defaultBtn certificateBtn"
-                          style={{
-                            display: "flex",
-                            flexDirection: "row",
-                            alignItems: "center"
-                          }}
-                        >
-                          <i
-                            className="fa fa-certificate"
-                            style={{
-                              color: "white",
-                              fontSize: "15px",
-                              marginRight: "3px"
-                            }}
-                            aria-hidden="true"
-                          ></i>
-                          Certificate
-                        </button>
-                      )
-                    }
-                  </PDFDownloadLink>
+                {pdfDetails && pdfDetails.length > 0 && (
+                  <CertificateComponent />
                )}
                <button
                  onClick={handleToPrint}
@@ -381,7 +494,7 @@ function Header({
                  className="finishBtn sendHover"
                  onClick={() => {
                    if (!pdfUrl) {
-                      embedImages();
+                      embedWidgetsData();
                    }
                  }}
                >
@@ -392,17 +505,17 @@ function Header({
          ) : isPlaceholder ? (
            <>
              {!isMailSend &&
-                signersdata.Signers &&
-                signersdata.Signers.length !== signerPos.length && (
+                signersdata.length > 0 &&
+                signersdata.length !== filterPrefill.length && (
                  <div>
-                    {signerPos.length === 0 ? (
+                    {filterPrefill.length === 0 ? (
                      <span style={{ fontSize: "13px", color: "#f5405e" }}>
-                        Add all {signersdata.Signers.length - signerPos.length}{" "}
+                        Add {signersdata.length - filterPrefill.length}{" "}
                        recipients signature
                      </span>
                    ) : (
                      <span style={{ fontSize: "13px", color: "#f5405e" }}>
-                        Add {signersdata.Signers.length - signerPos.length} more
+                        Add {signersdata.length - filterPrefill.length} more
                        recipients signature
                      </span>
                    )}
@@ -410,6 +523,18 @@ function Header({
                )}

              <div>
+                {setIsEditTemplate && (
+                  <button
+                    onClick={() => setIsEditTemplate(true)}
+                    style={{
+                      border: "none",
+                      outline: "none",
+                      textAlign: "center"
+                    }}
+                  >
+                    <i className="fa-solid fa-gear fa-lg"></i>
+                  </button>
+                )}
                <button
                  onClick={() => {
                    navigate(-1);
@@ -432,49 +557,14 @@ function Header({
                  }}
                  className={isMailSend ? "sendMail" : "sendMail sendHover"}
                >
-                  Send
+                  {completeBtnTitle ? completeBtnTitle : "Send"}
                </button>
              </div>
            </>
          ) : isPdfRequestFiles ? (
            alreadySign ? (
              <div style={{ display: "flex", flexDirection: "row" }}>
-                {isCompleted.isCertificate && (
-                  <PDFDownloadLink
-                    style={{ textDecoration: "none" }}
-                    document={<Certificate pdfData={pdfDetails} />}
-                    fileName={`completion certificate-${
-                      pdfDetails[0] && pdfDetails[0].Name
-                    }.pdf`}
-                  >
-                    {({ blob, url, loading, error }) =>
-                      loading ? (
-                        "Loading document..."
-                      ) : (
-                        <button
-                          type="button"
-                          className="defaultBtn certificateBtn"
-                          style={{
-                            display: "flex",
-                            flexDirection: "row",
-                            alignItems: "center"
-                          }}
-                        >
-                          <i
-                            className="fa fa-certificate"
-                            style={{
-                              color: "white",
-                              fontSize: "15px",
-                              marginRight: "3px"
-                            }}
-                            aria-hidden="true"
-                          ></i>
-                          Certificate
-                        </button>
-                      )
-                    }
-                  </PDFDownloadLink>
-                )}
+                {isCompleted.isCertificate && <CertificateComponent />}
                <button
                  onClick={handleToPrint}
                  type="button"
@@ -550,7 +640,7 @@ function Header({
                      type="button"
                      className="finishBtn sendHover"
                      onClick={() => {
-                        embedImages();
+                        embedWidgetsData();
                      }}
                    >
                      Finish
@@ -561,40 +651,7 @@ function Header({
            )
          ) : pdfUrl || (documentStatus && documentStatus.isCompleted) ? (
            <div style={{ display: "flex", flexDirection: "row" }}>
-              <PDFDownloadLink
-                style={{ textDecoration: "none" }}
-                document={<Certificate pdfData={pdfDetails} />}
-                fileName={`completion certificate-${
-                  pdfDetails[0] && pdfDetails[0].Name
-                }.pdf`}
-              >
-                {({ blob, url, loading, error }) =>
-                  loading ? (
-                    "Loading document..."
-                  ) : (
-                    <button
-                      type="button"
-                      style={{
-                        display: "flex",
-                        flexDirection: "row",
-                        alignItems: "center"
-                      }}
-                      className="defaultBtn certificateBtn"
-                    >
-                      <i
-                        className="fa fa-certificate"
-                        style={{
-                          color: "white",
-                          fontSize: "15px",
-                          marginRight: "3px"
-                        }}
-                        aria-hidden="true"
-                      ></i>
-                      Certificate
-                    </button>
-                  )
-                }
-              </PDFDownloadLink>
+              <CertificateComponent />
              <button
                onClick={handleToPrint}
                type="button"
@@ -638,6 +695,28 @@ function Header({
                ></i>
                Download
              </button>
+              <button
+                type="button"
+                className="defaultBtn mailBtn"
+                style={{
+                  display: "flex",
+                  flexDirection: "row",
+                  alignItems: "center",
+                  marginLeft: "10px"
+                }}
+                onClick={() => setIsEmail(true)}
+              >
+                <i
+                  className="fa fa-envelope"
+                  style={{
+                    color: "white",
+                    fontSize: "15px",
+                    marginRight: "3px"
+                  }}
+                  aria-hidden="true"
+                ></i>
+                Mail
+              </button>
            </div>
          ) : (
            <div>
@@ -659,7 +738,7 @@ function Header({
                className="finishBtn sendHover"
                onClick={() => {
                  if (!pdfUrl) {
-                    embedImages();
+                    embedWidgetsData();
                  }
                }}
              >
@@ -0,0 +1,728 @@
+import React, { useState, useEffect } from "react";
+import BorderResize from "./BorderResize";
+import PlaceholderBorder from "./PlaceholderBorder";
+import { Rnd } from "react-rnd";
+import {
+  defaultWidthHeight,
+  isMobile,
+  onChangeInput,
+  radioButtonWidget,
+  textInputWidget,
+  textWidget
+} from "../../constant/Utils";
+import PlaceholderType from "./PlaceholderType";
+import moment from "moment";
+import "../../styles/opensigndrive.css";
+
+const selectFormat = (data) => {
+  switch (data) {
+    case "L":
+      return "MM/dd/yyyy";
+    case "DD-MM-YYYY":
+      return "dd-MM-yyyy";
+    case "DD/MM/YYYY":
+      return "dd/MM/yyyy";
+    case "LL":
+      return "MMMM dd, yyyy";
+    case "DD MMM, YYYY":
+      return "dd MMM, yyyy";
+    case "YYYY-MM-DD":
+      return "yyyy-MM-dd";
+    case "MM-DD-YYYY":
+      return "MM-dd-yyyy";
+    case "MM.DD.YYYY":
+      return "MM.dd.yyyy";
+    case "MMM DD, YYYY":
+      return "MMM dd, yyyy";
+    case "DD MMMM, YYYY":
+      return "dd MMMM, yyyy";
+    default:
+      return "MM/dd/yyyy";
+  }
+};
+
+const changeDateToMomentFormat = (format) => {
+  switch (format) {
+    case "MM/dd/yyyy":
+      return "L";
+    case "dd-MM-yyyy":
+      return "DD-MM-YYYY";
+    case "dd/MM/yyyy":
+      return "DD/MM/YYYY";
+    case "MMMM dd, yyyy":
+      return "LL";
+    case "dd MMM, yyyy":
+      return "DD MMM, YYYY";
+    case "yyyy-MM-dd":
+      return "YYYY-MM-DD";
+    case "MM-dd-yyyy":
+      return "MM-DD-YYYY";
+    case "MM.dd.yyyy":
+      return "MM.DD.YYYY";
+    case "MMM dd, yyyy":
+      return "MMM DD, YYYY";
+    case "dd MMMM, yyyy":
+      return "DD MMMM, YYYY";
+    default:
+      return "L";
+  }
+};
+
+//function to get default date
+const getDefaultdate = (selectedDate, format = "dd-MM-yyyy") => {
+  let date;
+  if (format && format === "dd-MM-yyyy") {
+    const newdate = selectedDate
+      ? selectedDate
+      : moment(new Date()).format(changeDateToMomentFormat(format));
+    const [day, month, year] = newdate.split("-");
+    date = new Date(`${year}-${month}-${day}`);
+  } else {
+    date = new Date(selectedDate);
+  }
+  const value = date;
+  return value;
+};
+//function to get default format
+const getDefaultFormat = (dateFormat) => dateFormat || "MM/dd/yyyy";
+
+function Placeholder(props) {
+  const [isDraggingEnabled, setDraggingEnabled] = useState(true);
+  const [isShowDateFormat, setIsShowDateFormat] = useState(false);
+  const [selectDate, setSelectDate] = useState({
+    date:
+      props.pos.type === "date"
+        ? moment(
+            getDefaultdate(
+              props?.pos?.options?.response,
+              props.pos?.options?.validation?.format
+            ).getTime()
+          ).format(
+            changeDateToMomentFormat(props.pos?.options?.validation?.format)
+          )
+        : "",
+    format:
+      props.pos.type === "date"
+        ? getDefaultFormat(props.pos?.options?.validation?.format)
+        : ""
+  });
+  const [dateFormat, setDateFormat] = useState([]);
+  const [startDate, setStartDate] = useState(
+    props.pos.type === "date" &&
+      getDefaultdate(
+        props?.pos?.options?.response,
+        props.pos?.options?.validation?.format
+      )
+  );
+  const [getCheckboxRenderWidth, setGetCheckboxRenderWidth] = useState({
+    width: null,
+    height: null
+  });
+  const dateFormatArr = [
+    "L",
+    "DD-MM-YYYY",
+    "YYYY-MM-DD",
+    "MM.DD.YYYY",
+    "MM-DD-YYYY",
+    "MMM DD, YYYY",
+    "LL",
+    "DD MMM, YYYY",
+    "DD MMMM, YYYY"
+  ];
+
+  useEffect(() => {
+    const updateWidth = () => {
+      const rndElement = document.getElementById(props.pos.key);
+      if (rndElement) {
+        const { width, height } = rndElement.getBoundingClientRect();
+        setGetCheckboxRenderWidth({ width: width, height: height });
+      }
+    };
+
+    // Delay to ensure rendering is complete
+    const timer = setTimeout(updateWidth, 0);
+
+    return () => clearTimeout(timer);
+  }, [props.pos]);
+
+  useEffect(() => {
+    const closeMenuOnOutsideClick = (e) => {
+      if (!isDraggingEnabled && !e.target.closest("#changeIsDragging")) {
+        setDraggingEnabled(true);
+      }
+    };
+
+    document.addEventListener("click", closeMenuOnOutsideClick);
+
+    return () => {
+      // Cleanup the event listener when the component unmounts
+      document.removeEventListener("click", closeMenuOnOutsideClick);
+    };
+  }, [isDraggingEnabled]);
+  //function change format array list with selected date and format
+  const changeDateFormat = () => {
+    const updateDate = [];
+    dateFormatArr.map((data) => {
+      let date;
+      if (selectDate && selectDate.format === "dd-MM-yyyy") {
+        const [day, month, year] = selectDate.date.split("-");
+        date = new Date(`${year}-${month}-${day}`);
+      } else {
+        date = new Date(selectDate?.date);
+      }
+      const milliseconds = date.getTime();
+      const newDate = moment(milliseconds).format(data);
+      const dateObj = {
+        date: newDate,
+        format: selectFormat(data)
+      };
+      updateDate.push(dateObj);
+    });
+    setDateFormat(updateDate);
+  };
+
+  useEffect(() => {
+    if (props.isPlaceholder || props.isSignYourself) {
+      selectDate && changeDateFormat();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selectDate]);
+
+  //it detect outside click of date dropdown menu
+  useEffect(() => {
+    const closeMenuOnOutsideClick = (e) => {
+      if (isShowDateFormat && !e.target.closest("#menu-container")) {
+        setIsShowDateFormat(!isShowDateFormat);
+      }
+    };
+    document.addEventListener("click", closeMenuOnOutsideClick);
+    return () => {
+      // Cleanup the event listener when the component unmounts
+      document.removeEventListener("click", closeMenuOnOutsideClick);
+    };
+  }, [isShowDateFormat]);
+
+  //`handleWidgetIdandPopup` is used to set current widget id and open relative popup
+  const handleWidgetIdandPopup = () => {
+    if (props.setSelectWidgetId) {
+      props.setSelectWidgetId(props.pos.key);
+    }
+
+    const widgetTypeExist = [
+      textInputWidget,
+      "checkbox",
+      "name",
+      "company",
+      "job title",
+      "date",
+      "email",
+      textWidget
+    ].includes(props.pos.type);
+
+    if (widgetTypeExist) {
+      setDraggingEnabled(false);
+    }
+    if ((props.isNeedSign || props.isSignYourself) && !props.isDragging) {
+      if (props.pos.type) {
+        if (
+          props.pos.type === "signature" ||
+          props.pos.type === "stamp" ||
+          props.pos.type === "image"
+        ) {
+          props.setIsSignPad(true);
+          props.setSignKey(props.pos.key);
+          props.setIsStamp(props.pos.isStamp);
+        } else if (props.pos.type === "initials") {
+          props.setIsSignPad(true);
+          props.setSignKey(props.pos.key);
+          props.setIsStamp(props.pos.isStamp);
+          props.setIsInitial(true);
+        }
+      } else {
+        props.setIsSignPad(true);
+        props.setSignKey(props.pos.key);
+        props.setIsStamp(props.pos?.isStamp ? props.pos.isStamp : false);
+      }
+    } else if (
+      props.isPlaceholder &&
+      !props.isDragging &&
+      props.pos.type !== textWidget
+    ) {
+      if (props.pos.key === props.selectWidgetId) {
+        props.handleLinkUser(props.data.Id);
+        props.setUniqueId(props.data.Id);
+      }
+    } else if (!props.pos.type) {
+      if (
+        !props.pos.type &&
+        props.isNeedSign &&
+        props.data.signerObjId === props.signerObjId
+      ) {
+        props.setIsSignPad(true);
+        props.setSignKey(props.pos.key);
+        props.setIsStamp(props.pos.isStamp);
+      } else if (
+        (props.isNeedSign && props.pos.type === "signature") ||
+        props.pos.type === "stamp"
+      ) {
+        props.setIsSignPad(true);
+        props.setSignKey(props.pos.key);
+        props.setIsStamp(props.pos.isStamp);
+      } else if (props.isNeedSign && props.pos.type === "dropdown") {
+        props.setSignKey(props.pos.key);
+      }
+    }
+  };
+  const handleOnClickPlaceholder = () => {
+    if (!props.isNeedSign) {
+      props.setWidgetType(props.pos.type);
+    }
+    if (props.isNeedSign && props.data?.signerObjId === props.signerObjId) {
+      handleWidgetIdandPopup();
+    } else if (props.isPlaceholder || props.isSignYourself) {
+      handleWidgetIdandPopup();
+    }
+  };
+  //`handleOnClickSettingIcon` is used set current widget details and open setting of it
+  const handleOnClickSettingIcon = () => {
+    if (props.pos.type === radioButtonWidget) {
+      props.setIsRadio(true);
+    } else if (props.pos.type === "dropdown") {
+      props?.setShowDropdown(true);
+    } else if (props.pos.type === "checkbox") {
+      props?.setIsCheckbox(true);
+    } else {
+      props?.handleNameModal(true);
+    }
+
+    if (props.isPlaceholder && props.type !== textWidget) {
+      props.setUniqueId(props.data.Id);
+    }
+    props.setSignKey(props.pos.key);
+    props.setWidgetType(props.pos.type);
+    props.setCurrWidgetsDetails(props.pos);
+  };
+  //function ro set state value of onclick on widget's copy icon
+  const handleCopyPlaceholder = (e) => {
+    if (props.data && props?.pos?.type !== textWidget) {
+      props.setSignerObjId(props?.data?.signerObjId);
+      props.setUniqueId(props?.data?.Id);
+    } else if (props.data && props.pos.type === textWidget) {
+      props.setTempSignerId(props.uniqueId);
+      props.setSignerObjId(props?.data?.signerObjId);
+      props.setUniqueId(props?.data?.Id);
+    }
+    e.stopPropagation();
+    props.setIsPageCopy(true);
+    props.setSignKey(props.pos.key);
+  };
+
+  //function to save date and format on local array onchange date and onclick format
+  const handleSaveDate = (data, isDateChange) => {
+    let updateDate = data.date;
+    //check if date change by user
+    if (isDateChange) {
+      //`changeDateToMomentFormat` is used to convert date as per required to moment package
+      updateDate = moment(data.date).format(
+        changeDateToMomentFormat(data.format)
+      );
+    }
+    //using moment package is used to change date as per the format provided in selectDate obj e.g. - MM/dd/yyyy -> 03/12/2024
+    //`getDefaultdate` is used to convert update date in new Date() format
+    const date = moment(
+      getDefaultdate(updateDate, data?.format).getTime()
+    ).format(changeDateToMomentFormat(data?.format));
+
+    //`onChangeInput` is used to save data related to date in a placeholder field
+    onChangeInput(
+      date,
+      props.pos.key,
+      props.xyPostion,
+      props.index,
+      props.setXyPostion,
+      props.data && props.data.Id,
+      false,
+      data?.format
+    );
+    setSelectDate({ date: date, format: data?.format });
+  };
+  const PlaceholderIcon = () => {
+    return (
+      props.isShowBorder && (
+        <>
+          {(props.isPlaceholder || props.isSignYourself) && (
+            <>
+              {props.pos.type === "checkbox" && props.isSignYourself ? (
+                <i
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    handleOnClickSettingIcon();
+                  }}
+                  onTouchEnd={(e) => {
+                    e.stopPropagation();
+                    handleOnClickSettingIcon();
+                  }}
+                  className="fa-solid fa-gear settingIcon"
+                  style={{
+                    color: "#188ae2",
+                    right: "29px",
+                    top: "-19px"
+                  }}
+                ></i>
+              ) : (
+                ((!props?.pos?.type && props.pos.isStamp) ||
+                  (props?.pos?.type &&
+                    !["date", textWidget, "signature"].includes(
+                      props.pos.type
+                    ) &&
+                    !props.isSignYourself)) && (
+                  <i
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      handleOnClickSettingIcon();
+                    }}
+                    onTouchEnd={(e) => {
+                      e.stopPropagation();
+                      handleOnClickSettingIcon();
+                    }}
+                    className="fa-solid fa-gear settingIcon"
+                    style={{ color: "#188ae2", right: "47px", top: "-19px" }}
+                  ></i>
+                )
+              )}
+
+              {props.pos.type !== textWidget && !props.isSignYourself && (
+                <i
+                  data-tut="reactourLinkUser"
+                  className="fa-regular fa-user signUserIcon"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    props.handleLinkUser(props.data.Id);
+                    props.setUniqueId(props.data.Id);
+                  }}
+                  onTouchEnd={(e) => {
+                    e.stopPropagation();
+                    props.handleLinkUser(props.data.Id);
+                    props.setUniqueId(props.data.Id);
+                  }}
+                  style={{ color: "#188ae2", right: "32px", top: "-18px" }}
+                ></i>
+              )}
+            </>
+          )}
+          {props.pos.type === "date" && selectDate && (
+            <div
+              id="menu-container"
+              style={{
+                zIndex: "99",
+                top: "-19px",
+                right: props.isPlaceholder ? "60px" : "44px"
+              }}
+              className={
+                isShowDateFormat
+                  ? "dropdown signUserIcon show"
+                  : "dropdown signUserIcon"
+              }
+              onClick={(e) => {
+                setIsShowDateFormat(!isShowDateFormat);
+                e.stopPropagation();
+                if (props.data) {
+                  props.setSignKey(props.pos.key);
+                  props.setUniqueId(props.data.Id);
+                }
+              }}
+              onTouchEnd={(e) => {
+                e.stopPropagation();
+                setIsShowDateFormat(!isShowDateFormat);
+                if (props.data) {
+                  props.setSignKey(props.pos.key);
+                  props.setUniqueId(props.data.Id);
+                }
+              }}
+            >
+              <i
+                className="fa-solid fa-gear settingIcon"
+                style={{
+                  color: "#188ae2",
+                  fontSize: "14px"
+                }}
+              ></i>
+              <div
+                className={
+                  isShowDateFormat ? "dropdown-menu show" : "dropdown-menu"
+                }
+                aria-labelledby="dropdownMenuButton"
+                aria-expanded={isShowDateFormat ? "true" : "false"}
+              >
+                {dateFormat.map((data, ind) => {
+                  return (
+                    <span
+                      key={ind}
+                      onTouchEnd={(e) => {
+                        e.stopPropagation();
+                        setIsShowDateFormat(!isShowDateFormat);
+                        setSelectDate(data);
+                        handleSaveDate(data);
+                      }}
+                      onClick={() => {
+                        setIsShowDateFormat(!isShowDateFormat);
+                        setSelectDate(data);
+                        handleSaveDate(data);
+                      }}
+                      className="dropdown-item itemColor"
+                      style={{ fontSize: "12px" }}
+                    >
+                      {data?.date ? data?.date : "nodata"}
+                    </span>
+                  );
+                })}
+              </div>
+            </div>
+          )}
+          <i
+            className="fa-regular fa-copy signCopy"
+            onClick={(e) => handleCopyPlaceholder(e)}
+            onTouchEnd={(e) => handleCopyPlaceholder(e)}
+            style={{ color: "#188ae2", right: "12px", top: "-18px" }}
+          ></i>
+          <i
+            className="fa-regular fa-circle-xmark signCloseBtn"
+            onClick={(e) => {
+              e.stopPropagation();
+
+              if (props.data) {
+                props.handleDeleteSign(props.pos.key, props.data.Id);
+              } else {
+                props.handleDeleteSign(props.pos.key);
+                props.setIsStamp(false);
+              }
+            }}
+            onTouchEnd={(e) => {
+              e.stopPropagation();
+              if (props.data) {
+                props.handleDeleteSign(props.pos.key, props.data?.Id);
+              } else {
+                props.handleDeleteSign(props.pos.key);
+                props.setIsStamp(false);
+              }
+            }}
+            style={{ color: "#188ae2", right: "-8px", top: "-18px" }}
+          ></i>
+        </>
+      )
+    );
+  };
+
+  return (
+    <Rnd
+      id={props.pos.key}
+      data-tut={props.pos.key === props.unSignedWidgetId ? "IsSigned" : ""}
+      key={props.pos.key}
+      lockAspectRatio={
+        props.pos.type !== textWidget &&
+        (props.pos.Width
+          ? props.pos.Width / props.pos.Height
+          : defaultWidthHeight(props.pos.type).width /
+            defaultWidthHeight(props.pos.type).height)
+      }
+      enableResizing={{
+        top: false,
+        right: false,
+        bottom: false,
+        left: false,
+        topRight: false,
+        bottomRight:
+          props.data && props.isNeedSign
+            ? props.data?.signerObjId === props.signerObjId &&
+              props.pos.type !== "checkbox" &&
+              props.pos.type !== radioButtonWidget
+              ? true
+              : false
+            : props.pos.type !== radioButtonWidget &&
+              props.pos.type !== "checkbox" &&
+              props.pos.key === props.selectWidgetId &&
+              true,
+        bottomLeft: false,
+        topLeft: false
+      }}
+      bounds="parent"
+      className="signYourselfBlock"
+      style={{
+        border: "1px solid #007bff",
+        borderRadius: "2px",
+        textAlign:
+          props.pos.type !== "name" &&
+          props.pos.type !== "company" &&
+          props.pos.type !== "job title" &&
+          "center",
+        cursor:
+          props.data && props.isNeedSign
+            ? props.data?.signerObjId === props.signerObjId
+              ? "pointer"
+              : "not-allowed"
+            : "all-scroll",
+        zIndex:
+          props.pos.type === "date"
+            ? props.pos.key === props.selectWidgetId
+              ? 99 + 1
+              : 99
+            : props?.pos?.zIndex
+              ? props.pos.zIndex
+              : "5",
+        background: props.data ? props.data.blockColor : "rgb(203 233 237)"
+      }}
+      onDrag={() => {
+        setDraggingEnabled(true);
+        props.handleTabDrag && props.handleTabDrag(props.pos.key);
+      }}
+      size={{
+        width:
+          props.pos.type === radioButtonWidget || props.pos.type === "checkbox"
+            ? "auto"
+            : props.posWidth(props.pos, props.isSignYourself),
+        height:
+          props.pos.type === radioButtonWidget || props.pos.type === "checkbox"
+            ? "auto"
+            : props.posHeight(props.pos, props.isSignYourself)
+      }}
+      onResizeStart={() => {
+        setDraggingEnabled(true);
+        props.setIsResize && props.setIsResize(true);
+      }}
+      onResizeStop={() => {
+        props.setIsResize && props.setIsResize(false);
+      }}
+      disableDragging={
+        props.isNeedSign
+          ? true
+          : props.isPlaceholder && ![textWidget].includes(props.pos.type)
+            ? false
+            : !isDraggingEnabled
+      }
+      onDragStop={(event, dragElement) =>
+        props.handleStop &&
+        props.handleStop(event, dragElement, props.data?.Id, props.pos?.key)
+      }
+      default={{
+        x: props.xPos(props.pos, props.isSignYourself),
+        y: props.yPos(props.pos, props.isSignYourself)
+      }}
+      onResize={(e, direction, ref) => {
+        props.handleSignYourselfImageResize &&
+          props.handleSignYourselfImageResize(
+            ref,
+            props.pos.key,
+            props.xyPostion,
+            props.setXyPostion,
+            props.index,
+            props.data && props.data.Id,
+            false
+          );
+      }}
+      onClick={() => handleOnClickPlaceholder()}
+    >
+      {props.isShowBorder &&
+      props.pos.type !== radioButtonWidget &&
+      props.pos.type !== "checkbox" &&
+      props.pos.key === props.selectWidgetId ? (
+        <BorderResize right={-12} top={-11} />
+      ) : props.data && props.isNeedSign && props.pos.type !== "checkbox" ? (
+        props.data?.signerObjId === props.signerObjId &&
+        props.pos.type !== radioButtonWidget &&
+        props.pos.type !== "checkbox" ? (
+          <BorderResize />
+        ) : (
+          <></>
+        )
+      ) : (
+        props.pos.type !== radioButtonWidget &&
+        props.pos.type !== "checkbox" &&
+        props.pos.key === props.selectWidgetId && <BorderResize />
+      )}
+
+      {props.isShowBorder && props.pos.key === props.selectWidgetId && (
+        <PlaceholderBorder
+          setDraggingEnabled={setDraggingEnabled}
+          pos={props.pos}
+          isPlaceholder={props.isPlaceholder}
+          getCheckboxRenderWidth={getCheckboxRenderWidth}
+        />
+      )}
+      {isMobile ? (
+        <div
+          style={{
+            left: props.xPos(props.pos, props.isSignYourself),
+            top: props.yPos(props.pos, props.isSignYourself),
+            width:
+              props.pos.type === radioButtonWidget ||
+              props.pos.type === "checkbox"
+                ? "auto"
+                : props.posWidth(props.pos, props.isSignYourself),
+            //  "auto", //props.posWidth(props.pos, props.isSignYourself),
+            // height: props.posHeight(props.pos, props.isSignYourself),
+            height:
+              props.pos.type === radioButtonWidget ||
+              props.pos.type === "checkbox"
+                ? "auto"
+                : props.posHeight(props.pos, props.isSignYourself),
+            zIndex: "10"
+          }}
+          onTouchEnd={() => handleOnClickPlaceholder()}
+        >
+          {props.pos.key === props.selectWidgetId && <PlaceholderIcon />}
+
+          <PlaceholderType
+            pos={props.pos}
+            xyPostion={props.xyPostion}
+            index={props.index}
+            setXyPostion={props.setXyPostion}
+            data={props.data}
+            setSignKey={props.setSignKey}
+            isShowDropdown={props?.isShowDropdown}
+            isPlaceholder={props.isPlaceholder}
+            isSignYourself={props.isSignYourself}
+            signerObjId={props.signerObjId}
+            handleUserName={props.handleUserName}
+            setDraggingEnabled={setDraggingEnabled}
+            pdfDetails={props?.pdfDetails && props?.pdfDetails[0]}
+            isNeedSign={props.isNeedSign}
+            setSelectDate={setSelectDate}
+            selectDate={selectDate}
+            setValidateAlert={props.setValidateAlert}
+            setStartDate={setStartDate}
+            startDate={startDate}
+            handleSaveDate={handleSaveDate}
+          />
+        </div>
+      ) : (
+        <>
+          {props.pos.key === props.selectWidgetId && <PlaceholderIcon />}
+          <PlaceholderType
+            pos={props.pos}
+            xyPostion={props.xyPostion}
+            index={props.index}
+            setXyPostion={props.setXyPostion}
+            data={props.data}
+            setSignKey={props.setSignKey}
+            isShowDropdown={props?.isShowDropdown}
+            isPlaceholder={props.isPlaceholder}
+            isSignYourself={props.isSignYourself}
+            signerObjId={props.signerObjId}
+            handleUserName={props.handleUserName}
+            setDraggingEnabled={setDraggingEnabled}
+            pdfDetails={props?.pdfDetails && props?.pdfDetails[0]}
+            isNeedSign={props.isNeedSign}
+            setSelectDate={setSelectDate}
+            selectDate={selectDate}
+            setValidateAlert={props.setValidateAlert}
+            setStartDate={setStartDate}
+            startDate={startDate}
+            handleSaveDate={handleSaveDate}
+          />
+        </>
+      )}
+    </Rnd>
+  );
+}
+
+export default Placeholder;
@@ -0,0 +1,52 @@
+import React from "react";
+import { themeColor } from "../../constant/const";
+import {
+  defaultWidthHeight,
+  isMobile,
+  radioButtonWidget,
+  resizeBorderExtraWidth,
+  textWidget
+} from "../../constant/Utils";
+function PlaceholderBorder(props) {
+  const getResizeBorderExtraWidth = resizeBorderExtraWidth();
+  const defaultWidth = defaultWidthHeight(props.pos.type).width;
+  const defaultHeight = defaultWidthHeight(props.pos.type).height;
+
+  const handleMinWidth = () => {
+    if (props.pos.type === "checkbox" || props.pos.type === radioButtonWidget) {
+      return props.getCheckboxRenderWidth.width + getResizeBorderExtraWidth;
+    } else {
+      return props.pos.Width
+        ? props.pos.Width + getResizeBorderExtraWidth
+        : defaultWidth + getResizeBorderExtraWidth;
+    }
+  };
+  const handleMinHeight = () => {
+    if (props.pos.type === "checkbox" || props.pos.type === radioButtonWidget) {
+      return props.getCheckboxRenderWidth.height + getResizeBorderExtraWidth;
+    } else {
+      return props.pos.Height
+        ? props.pos.Height + getResizeBorderExtraWidth
+        : defaultHeight + getResizeBorderExtraWidth;
+    }
+  };
+  return (
+    <div
+      onMouseEnter={() => !isMobile && props?.setDraggingEnabled(true)}
+      onTouchEnd={() =>
+        props.pos.type === textWidget && props?.setDraggingEnabled(true)
+      }
+      className="borderResize"
+      style={{
+        borderColor: themeColor,
+        borderStyle: "dashed",
+        minWidth: handleMinWidth(),
+        minHeight: handleMinHeight(),
+        borderWidth: "0.2px",
+        overflow: "hidden"
+      }}
+    ></div>
+  );
+}
+
+export default PlaceholderBorder;
@@ -0,0 +1,252 @@
+import React, { useState } from "react";
+import { themeColor } from "../../constant/const";
+import ModalUi from "../../primitives/ModalUi";
+import { randomId, textWidget } from "../../constant/Utils";
+
+function PlaceholderCopy(props) {
+  const copyType = ["All pages", "All pages but last", "All pages but first"];
+  const [selectCopyType, setSelectCopyType] = useState("");
+
+  //function for get copy placeholder position
+  const getCopyPlaceholderPosition = (
+    type,
+    currentPlaceholder,
+    newPageNumber,
+    existPlaceholderPosition
+  ) => {
+    const filterPosition =
+      existPlaceholderPosition &&
+      existPlaceholderPosition.filter(
+        (data) => data.xPosition !== currentPlaceholder.xPosition
+      );
+    //copy all page placeholder at requested position except first page
+    if (newPageNumber === 1 && type === "first") {
+      if (filterPosition && filterPosition.length > 0) {
+        return {
+          pageNumber: newPageNumber,
+          pos: [...filterPosition]
+        };
+      }
+    }
+    //copy all page placeholder at requested position except  last page
+    else if (newPageNumber === props.allPages && type === "last") {
+      if (existPlaceholderPosition) {
+        return {
+          pageNumber: newPageNumber,
+          pos: [...filterPosition]
+        };
+      }
+    }
+    //copy all page placeholder at requested position with existing placeholder position
+    else if (existPlaceholderPosition) {
+      return {
+        pageNumber: newPageNumber,
+        pos: [...filterPosition, currentPlaceholder]
+      };
+    }
+    //copy all page placeholder at requested position
+    else {
+      return {
+        pageNumber: newPageNumber,
+        pos: [currentPlaceholder]
+      };
+    }
+  };
+
+  //function for copy placeholder as per select copy type
+  const copyPlaceholder = (type) => {
+    let newPlaceholderPosition = [];
+    let newPageNumber = 1;
+    const signerPosition = props.xyPostion;
+    const signerId = props.signerObjId ? props.signerObjId : props.Id;
+
+    //handle placeholder array and copy for multiple signers placeholder at requested location
+    if (signerId) {
+      //get current signers data
+      let filterSignerPosition;
+      if (props?.signerObjId) {
+        filterSignerPosition = signerPosition.filter(
+          (data) => data.signerObjId === signerId
+        );
+      } else {
+        filterSignerPosition = signerPosition.filter(
+          (item) => item.Id === signerId
+        );
+      }
+      //get current pagenumber's all placeholder position data
+      const placeholderPosition = filterSignerPosition[0].placeHolder.filter(
+        (data) => data.pageNumber === props.pageNumber
+      );
+      //get current placeholder position data which user want to copy
+      const currentPlaceholder = placeholderPosition[0].pos.find(
+        (position) => position.key === props.signKey
+      );
+
+      for (let i = 0; i < props.allPages; i++) {
+        const newId = randomId();
+        currentPlaceholder.key = newId;
+        //get exist placeholder position for particular page
+        const existPlaceholder = filterSignerPosition[0].placeHolder.filter(
+          (data) => data.pageNumber === newPageNumber
+        );
+        const existPlaceholderPosition =
+          existPlaceholder[0] && existPlaceholder[0].pos;
+
+        //function for get copy to requested location of placeholder position
+        const getPlaceholderObj = getCopyPlaceholderPosition(
+          type,
+          currentPlaceholder,
+          newPageNumber,
+          existPlaceholderPosition
+        );
+        if (getPlaceholderObj) {
+          newPlaceholderPosition.push(getPlaceholderObj);
+        }
+        newPageNumber++;
+      }
+      let updatedSignerPlaceholder;
+      if (props?.signerObjId) {
+        updatedSignerPlaceholder = signerPosition.map((signersData) => {
+          if (signersData.signerObjId === props.signerObjId) {
+            return {
+              ...signersData,
+              placeHolder: newPlaceholderPosition
+            };
+          }
+          return signersData;
+        });
+      } else {
+        updatedSignerPlaceholder = signerPosition.map((signersData) => {
+          if (signersData.Id === props.Id) {
+            return {
+              ...signersData,
+              placeHolder: newPlaceholderPosition
+            };
+          }
+          return signersData;
+        });
+      }
+
+      const signersData = signerPosition;
+      signersData.splice(0, signerPosition.length, ...updatedSignerPlaceholder);
+      props.setXyPostion(signersData);
+    }
+    //handle signyourself array and copy for single signers placeholder at requested location
+    else {
+      const xyPostion = props.xyPostion;
+
+      const placeholderPosition = xyPostion.filter(
+        (data) => data.pageNumber === props.pageNumber
+      );
+      //get current placeholder position data which user want to copy
+      const currentPlaceholder = placeholderPosition[0].pos.find(
+        (pos) => pos.key === props.signKey
+      );
+
+      for (let i = 0; i < props.allPages; i++) {
+        //get exist placeholder position for particular page
+        const existPlaceholder = xyPostion.filter(
+          (data) => data.pageNumber === newPageNumber
+        );
+        const existPlaceholderPosition =
+          existPlaceholder[0] && existPlaceholder[0].pos;
+
+        const newId = randomId();
+        currentPlaceholder.key = newId;
+        //function for get copy to requested location of placeholder position
+        const getPlaceholderObj = getCopyPlaceholderPosition(
+          type,
+          currentPlaceholder,
+          newPageNumber,
+          existPlaceholderPosition
+        );
+        if (getPlaceholderObj) {
+          newPlaceholderPosition.push(getPlaceholderObj);
+        }
+
+        newPageNumber++;
+      }
+      props.setXyPostion(newPlaceholderPosition);
+    }
+  };
+
+  //function for getting selected type placeholder copy
+  const handleApplyCopy = () => {
+    if (selectCopyType === "All pages") {
+      copyPlaceholder("all");
+    } else if (selectCopyType === "All pages but last") {
+      copyPlaceholder("last");
+    } else if (selectCopyType === "All pages but first") {
+      copyPlaceholder("first");
+    }
+  };
+  const handleUniqueId = () => {
+    if (props.widgetType === textWidget) {
+      props.setUniqueId(props?.tempSignerId);
+      props.setTempSignerId("");
+    }
+    props.setIsPageCopy(false);
+  };
+  return (
+    <ModalUi
+      isOpen={props.isPageCopy}
+      title={"Copy to all pages"}
+      handleClose={() => {
+        props.setIsPageCopy(false);
+      }}
+    >
+      <div style={{ height: "100%", padding: 20 }}>
+        {copyType.map((data, key) => {
+          return (
+            <div key={key} style={{ display: "flex", flexDirection: "column" }}>
+              <label key={key} style={{ fontSize: "16px", fontWeight: "500" }}>
+                <input
+                  style={{ accentColor: "red", marginRight: "10px" }}
+                  type="radio"
+                  value={data}
+                  onChange={() => setSelectCopyType(data)}
+                  checked={selectCopyType === data}
+                />
+
+                {data}
+              </label>
+            </div>
+          );
+        })}
+
+        <div
+          style={{
+            height: "1px",
+            backgroundColor: "#9f9f9f",
+            width: "100%",
+            marginTop: "15px",
+            marginBottom: "15px"
+          }}
+        ></div>
+        <button
+          onClick={() => {
+            handleApplyCopy();
+            handleUniqueId();
+          }}
+          style={{ background: themeColor }}
+          type="button"
+          disabled={!selectCopyType}
+          className="finishBtn"
+        >
+          Apply
+        </button>
+        <button
+          type="button"
+          className="finishBtn cancelBtn"
+          onClick={() => {
+            handleUniqueId();
+          }}
+        >
+          Cancel
+        </button>
+      </div>
+    </ModalUi>
+  );
+}
+
+export default PlaceholderCopy;
@@ -0,0 +1,796 @@
+import React, { useEffect, useState, forwardRef, useRef } from "react";
+import {
+  getMonth,
+  getYear,
+  isMobile,
+  onChangeInput,
+  radioButtonWidget,
+  range,
+  textInputWidget,
+  textWidget
+} from "../../constant/Utils";
+import DatePicker from "react-datepicker";
+import "react-datepicker/dist/react-datepicker.css";
+import "../../styles/signature.css";
+import RegexParser from "regex-parser";
+
+function PlaceholderType(props) {
+  const type = props?.pos?.type;
+  const [selectOption, setSelectOption] = useState("");
+  const [validatePlaceholder, setValidatePlaceholder] = useState("");
+  const inputRef = useRef(null);
+  const [textValue, setTextValue] = useState();
+  const [selectedCheckbox, setSelectedCheckbox] = useState([]);
+  const years = range(1990, getYear(new Date()) + 16, 1);
+  const months = [
+    "January",
+    "February",
+    "March",
+    "April",
+    "May",
+    "June",
+    "July",
+    "August",
+    "September",
+    "October",
+    "November",
+    "December"
+  ];
+  const validateExpression = (regexValidation) => {
+    let regexObject = regexValidation;
+    if (props.pos?.options.validation.type === "regex") {
+      regexObject = RegexParser(regexValidation);
+    }
+    // new RegExp(regexValidation);
+    let isValidate = regexObject.test(textValue);
+    if (!isValidate) {
+      props?.setValidateAlert(true);
+      inputRef.current.focus();
+    }
+  };
+
+  const handleInputBlur = () => {
+    props.setDraggingEnabled(true);
+    const validateType = props.pos?.options?.validation?.type;
+    let regexValidation;
+    if (validateType) {
+      switch (validateType) {
+        case "email":
+          regexValidation = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+          validateExpression(regexValidation);
+          break;
+        case "number":
+          regexValidation = /^\d+$/;
+          validateExpression(regexValidation);
+          break;
+        case "text":
+          regexValidation = /^[a-zA-Z\s]+$/;
+          validateExpression(regexValidation);
+          break;
+        default:
+          regexValidation = props.pos?.options.validation.pattern;
+          validateExpression(regexValidation);
+      }
+    }
+  };
+
+  const handleTextValid = (e) => {
+    const textInput = e.target.value;
+    setTextValue(textInput);
+  };
+  function checkRegularExpress(validateType) {
+    switch (validateType) {
+      case "email":
+        setValidatePlaceholder("demo@gmail.com");
+        break;
+      case "number":
+        setValidatePlaceholder("12345");
+        break;
+      case textInputWidget:
+        setValidatePlaceholder("enter text");
+        break;
+      default:
+        setValidatePlaceholder("enter text");
+    }
+  }
+
+  useEffect(() => {
+    if (type && type === "checkbox" && props.isNeedSign) {
+      const isDefaultValue = props.pos.options?.defaultValue;
+      if (isDefaultValue) {
+        setSelectedCheckbox(isDefaultValue);
+      }
+    } else if (props.pos?.options?.hint) {
+      setValidatePlaceholder(props.pos?.options.hint);
+    } else if (props.pos?.options?.validation?.type) {
+      checkRegularExpress(props.pos?.options?.validation?.type);
+    }
+    setTextValue(
+      props.pos?.options?.response
+        ? props.pos?.options?.response
+        : props.pos?.options?.defaultValue
+          ? props.pos?.options?.defaultValue
+          : ""
+    );
+    setSelectOption(
+      props.pos?.options?.response
+        ? props.pos?.options?.response
+        : props.pos?.options?.defaultValue
+          ? props.pos?.options?.defaultValue
+          : ""
+    );
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    if (
+      ["name", "email", "job title", "company"].includes(props.pos?.type) &&
+      props.isNeedSign &&
+      props.data?.signerObjId === props?.signerObjId
+    ) {
+      const defaultData = props.pos?.options?.defaultValue;
+      if (defaultData) {
+        setTextValue(defaultData);
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [props.pos]);
+
+  const ExampleCustomInput = forwardRef(({ value, onClick }, ref) => (
+    <div
+      className="inputPlaceholder"
+      style={{ overflow: "hidden", fontSize: calculateFontSize() }}
+      onClick={onClick}
+      ref={ref}
+    >
+      {value}
+      <i className="fa-regular fa-calendar" style={{ marginLeft: "5px" }}></i>
+    </div>
+  ));
+  ExampleCustomInput.displayName = "ExampleCustomInput";
+
+  useEffect(() => {
+    if (
+      ["name", "email", "job title", "company"].includes(type) &&
+      props.isNeedSign &&
+      props.data?.signerObjId === props.signerObjId
+    ) {
+      const isDefault = true;
+      const senderUser = localStorage.getItem(`Extand_Class`);
+      const jsonSender = JSON.parse(senderUser);
+      onChangeInput(
+        jsonSender && jsonSender[0],
+        null,
+        props.xyPostion,
+        null,
+        props.setXyPostion,
+        props.data.Id,
+        isDefault
+      );
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [type]);
+
+  const calculateFontSize = () => {
+    const fontSize = 10 + Math.min(props.pos.Width, props.pos.Height) * 0.1;
+    const size = fontSize ? fontSize : 12;
+    return size + "px";
+  };
+  //function for show checked checkbox
+  const selectCheckbox = (ind) => {
+    const res = props.pos.options?.response;
+    const defaultCheck = props.pos.options?.defaultValue;
+    if (res && res?.length > 0) {
+      const isSelectIndex = res.indexOf(ind);
+      if (isSelectIndex > -1) {
+        return true;
+      } else {
+        return false;
+      }
+      // }
+    } else if (defaultCheck) {
+      const isSelectIndex = defaultCheck.indexOf(ind);
+      if (isSelectIndex > -1) {
+        return true;
+      } else {
+        return false;
+      }
+    } else {
+      return false;
+    }
+  };
+
+  const handleRadioCheck = (data) => {
+    const defaultData = props.pos.options?.defaultValue;
+    if (textValue === data) {
+      return true;
+    } else if (defaultData === data) {
+      return true;
+    } else {
+      return false;
+    }
+  };
+
+  //function for set checked and unchecked value of checkbox
+  const handleCheckboxValue = (isChecked, ind) => {
+    let updateSelectedCheckbox = [],
+      checkedList;
+    let isDefaultValue, isDefaultEmpty;
+    if (type === "checkbox") {
+      updateSelectedCheckbox = selectedCheckbox ? selectedCheckbox : [];
+
+      if (isChecked) {
+        updateSelectedCheckbox.push(ind);
+        setSelectedCheckbox(updateSelectedCheckbox);
+      } else {
+        checkedList = selectedCheckbox.filter((data) => data !== ind);
+        setSelectedCheckbox(checkedList);
+      }
+      if (props.isNeedSign) {
+        isDefaultValue = props.pos.options?.defaultValue;
+      }
+      if (isDefaultValue && isDefaultValue.length > 0) {
+        isDefaultEmpty = true;
+      }
+      onChangeInput(
+        checkedList ? checkedList : updateSelectedCheckbox,
+        props.pos.key,
+        props.xyPostion,
+        props.index,
+        props.setXyPostion,
+        props.data && props.data.Id,
+        false,
+        null,
+        isDefaultEmpty
+      );
+    }
+  };
+
+  //function to handle select radio widget and set value seletced by user
+  const handleCheckRadio = (isChecked, data) => {
+    let isDefaultValue,
+      isDefaultEmpty,
+      isRadio = true;
+    if (props.isNeedSign) {
+      isDefaultValue = props.pos.options?.defaultValue;
+    }
+    if (isDefaultValue) {
+      isDefaultEmpty = true;
+    }
+    if (isChecked) {
+      setTextValue(data);
+    } else {
+      setTextValue("");
+    }
+    onChangeInput(
+      data,
+      props.pos.key,
+      props.xyPostion,
+      props.index,
+      props.setXyPostion,
+      props.data && props.data.Id,
+      false,
+      null,
+      isDefaultEmpty,
+      isRadio
+    );
+  };
+  //function to set onchange date
+  const handleOnDateChange = (date) => {
+    props.setStartDate(date);
+    const isDateChange = true;
+    const dateObj = {
+      date: date,
+      format: props.selectDate.format
+    };
+    props.handleSaveDate(dateObj, isDateChange);
+  };
+  switch (type) {
+    case "signature":
+      return props.pos.SignUrl ? (
+        <img
+          alt="signimg"
+          src={props.pos.SignUrl}
+          style={{
+            width: "99%",
+            height: "100%",
+            objectFit: "contain"
+          }}
+        />
+      ) : (
+        <div style={{ fontSize: 11, color: "black", justifyContent: "center" }}>
+          {props?.handleUserName &&
+            props?.handleUserName(
+              props?.data?.Id,
+              props?.data?.Role,
+              props?.pos?.type
+            )}
+        </div>
+      );
+    case "stamp":
+      return props.pos.SignUrl ? (
+        <img
+          alt="signimg"
+          src={props.pos.SignUrl}
+          style={{
+            width: "99%",
+            height: "100%",
+            objectFit: "contain"
+          }}
+        />
+      ) : (
+        <div style={{ fontSize: 11, color: "black", justifyContent: "center" }}>
+          {props?.handleUserName &&
+            props?.handleUserName(
+              props?.data?.Id,
+              props?.data?.Role,
+              props?.pos?.type
+            )}
+        </div>
+      );
+    case "checkbox":
+      return (
+        <div style={{ zIndex: props.isSignYourself && "99" }}>
+          {props.pos.options?.values?.map((data, ind) => {
+            return (
+              <div key={ind} className="flex items-center text-center gap-0.5">
+                <input
+                  style={{
+                    width: props.pos.Width,
+                    display: "flex",
+                    justifyContent: "center",
+                    marginTop: ind === 0 ? 0 : "5px"
+                  }}
+                  onBlur={handleInputBlur}
+                  disabled={
+                    props.isNeedSign &&
+                    (props.pos.options?.isReadOnly ||
+                      props.data?.signerObjId !== props.signerObjId)
+                  }
+                  type="checkbox"
+                  checked={selectCheckbox(ind)}
+                  onChange={(e) => {
+                    if (e.target.checked) {
+                      if (!props.isPlaceholder) {
+                        const maxRequired =
+                          props.pos.options?.validation?.maxRequiredCount;
+                        const maxCountInt =
+                          maxRequired && parseInt(maxRequired);
+
+                        if (maxCountInt > 0) {
+                          if (
+                            selectedCheckbox &&
+                            selectedCheckbox?.length <= maxCountInt - 1
+                          ) {
+                            handleCheckboxValue(e.target.checked, ind);
+                          }
+                        } else {
+                          handleCheckboxValue(e.target.checked, ind);
+                        }
+                      }
+                    } else {
+                      handleCheckboxValue(e.target.checked, ind);
+                    }
+                  }}
+                />
+                {!props.pos.options?.isHideLabel && (
+                  <label className="text-xs mb-0 text-center">{data}</label>
+                )}
+              </div>
+            );
+          })}
+        </div>
+      );
+    case textInputWidget:
+      return props.isSignYourself ||
+        (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
+        <input
+          className="inputPlaceholder"
+          ref={inputRef}
+          placeholder={validatePlaceholder}
+          style={{ fontSize: calculateFontSize() }}
+          value={textValue}
+          type="text"
+          tabIndex="0"
+          disabled={
+            props.isNeedSign && props.data?.signerObjId !== props.signerObjId
+              ? true
+              : props.isPlaceholder
+          }
+          onBlur={handleInputBlur}
+          onChange={(e) => {
+            setTextValue(e.target.value);
+            onChangeInput(
+              e.target.value,
+              props.pos.key,
+              props.xyPostion,
+              props.index,
+              props.setXyPostion,
+              props.data && props.data?.Id,
+              false
+            );
+          }}
+        />
+      ) : (
+        <div
+          style={{
+            color: "black",
+            fontSize: calculateFontSize()
+          }}
+        >
+          <span>{type}</span>
+        </div>
+      );
+    case "dropdown":
+      return props.data?.signerObjId === props.signerObjId ? (
+        <select
+          className="inputPlaceholder"
+          id="myDropdown"
+          style={{ fontSize: "12px" }}
+          value={selectOption}
+          onChange={(e) => {
+            setSelectOption(e.target.value);
+            onChangeInput(
+              e.target.value,
+              props.pos.key,
+              props.xyPostion,
+              props.index,
+              props.setXyPostion,
+              props.data && props.data?.Id,
+              false
+            );
+          }}
+        >
+          {/* Default/Title option */}
+          <option value="" disabled hidden>
+            {props.pos.options.name}
+          </option>
+
+          {props.pos?.options?.values.map((data, ind) => {
+            return (
+              <option key={ind} value={data}>
+                {data}
+              </option>
+            );
+          })}
+        </select>
+      ) : (
+        <div
+          className="inputPlaceholder"
+          style={{ fontSize: calculateFontSize() }}
+        >
+          {props.pos?.options?.name ? props.pos.options.name : type}
+        </div>
+      );
+    case "initials":
+      return props.pos.SignUrl ? (
+        <img
+          alt="signimg"
+          src={props.pos.SignUrl}
+          style={{
+            width: "99%",
+            height: "100%",
+            objectFit: "contain"
+          }}
+        />
+      ) : (
+        <div style={{ fontSize: 11, color: "black", justifyContent: "center" }}>
+          {props?.handleUserName &&
+            props?.handleUserName(
+              props?.data?.Id,
+              props?.data?.Role,
+              props?.pos?.type
+            )}
+        </div>
+      );
+    case "name":
+      return props.isSignYourself ||
+        (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
+        <input
+          tabIndex="0"
+          ref={inputRef}
+          placeholder={"name"}
+          style={{ fontSize: calculateFontSize() }}
+          className="inputPlaceholder"
+          type="text"
+          value={textValue}
+          onBlur={handleInputBlur}
+          onChange={(e) => {
+            const isDefault = false;
+            handleTextValid(e);
+            onChangeInput(
+              e.target.value,
+              props.pos.key,
+              props.xyPostion,
+              props.index,
+              props.setXyPostion,
+              props.data && props.data?.Id,
+              isDefault
+            );
+          }}
+        />
+      ) : (
+        <div
+          style={{
+            color: "black",
+            fontSize: calculateFontSize()
+          }}
+        >
+          <span>{type}</span>
+        </div>
+      );
+    case "company":
+      return props.isSignYourself ||
+        (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
+        <input
+          className="inputPlaceholder"
+          type="text"
+          ref={inputRef}
+          placeholder={"company"}
+          style={{ fontSize: calculateFontSize() }}
+          value={textValue}
+          onBlur={handleInputBlur}
+          onChange={(e) => {
+            handleTextValid(e);
+            onChangeInput(
+              e.target.value,
+              props.pos.key,
+              props.xyPostion,
+              props.index,
+              props.setXyPostion,
+              props.data && props.data?.Id,
+              false
+            );
+          }}
+        />
+      ) : (
+        <div
+          style={{
+            color: "black",
+            fontSize: calculateFontSize()
+          }}
+        >
+          <span>{type}</span>
+        </div>
+      );
+    case "job title":
+      return props.isSignYourself ||
+        (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
+        <input
+          className="inputPlaceholder"
+          type="text"
+          ref={inputRef}
+          placeholder={"job title"}
+          style={{ fontSize: calculateFontSize() }}
+          value={textValue}
+          onBlur={handleInputBlur}
+          onChange={(e) => {
+            handleTextValid(e);
+            onChangeInput(
+              e.target.value,
+              props.pos.key,
+              props.xyPostion,
+              props.index,
+              props.setXyPostion,
+              props.data && props.data?.Id,
+              false
+            );
+          }}
+        />
+      ) : (
+        <div
+          style={{
+            color: "black",
+            fontSize: calculateFontSize()
+          }}
+        >
+          <span>{type}</span>
+        </div>
+      );
+    case "date":
+      return (
+        <div>
+          <DatePicker
+            renderCustomHeader={({ date, changeYear, changeMonth }) => (
+              <div className="flex justify-start ml-2 ">
+                <select
+                  className="bg-transparent outline-none"
+                  value={months[getMonth(date)]}
+                  onChange={({ target: { value } }) =>
+                    changeMonth(months.indexOf(value))
+                  }
+                >
+                  {months.map((option) => (
+                    <option key={option} value={option}>
+                      {option}
+                    </option>
+                  ))}
+                </select>
+                <select
+                  className="bg-transparent outline-none"
+                  value={getYear(date)}
+                  onChange={({ target: { value } }) => changeYear(value)}
+                >
+                  {years.map((option) => (
+                    <option key={option} value={option}>
+                      {option}
+                    </option>
+                  ))}
+                </select>
+              </div>
+            )}
+            disabled={
+              props.isPlaceholder ||
+              (props.isNeedSign &&
+                props.data?.signerObjId !== props.signerObjId)
+            }
+            onBlur={handleInputBlur}
+            closeOnScroll={true}
+            className="inputPlaceholder"
+            style={{ outlineColor: "#007bff" }}
+            selected={
+              props?.startDate
+                ? props?.startDate
+                : props.pos.options?.response &&
+                  new Date(props.pos.options.response)
+            }
+            onChange={(date) => handleOnDateChange(date)}
+            popperPlacement="top-end"
+            customInput={<ExampleCustomInput />}
+            dateFormat={
+              props.selectDate
+                ? props.selectDate?.format
+                : props.pos?.options?.validation?.format
+                  ? props.pos?.options?.validation?.format
+                  : "MM/dd/yyyy"
+            }
+          />
+        </div>
+      );
+    case "image":
+      return props.pos.SignUrl ? (
+        <img
+          alt="signimg"
+          src={props.pos.SignUrl}
+          style={{
+            width: "99%",
+            height: "100%",
+            objectFit: "contain"
+          }}
+        />
+      ) : (
+        <div style={{ fontSize: 11, color: "black", justifyContent: "center" }}>
+          {props?.handleUserName &&
+            props?.handleUserName(
+              props?.data?.Id,
+              props?.data?.Role,
+              props?.pos?.type
+            )}
+        </div>
+      );
+    case "email":
+      return props.isSignYourself ||
+        (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
+        <input
+          className="inputPlaceholder"
+          type="text"
+          ref={inputRef}
+          placeholder={"email"}
+          style={{ fontSize: calculateFontSize() }}
+          value={textValue}
+          onBlur={handleInputBlur}
+          onChange={(e) => {
+            handleTextValid(e);
+            onChangeInput(
+              e.target.value,
+              props.pos.key,
+              props.xyPostion,
+              props.index,
+              props.setXyPostion,
+              props.data && props.data?.Id,
+              false
+            );
+          }}
+        />
+      ) : (
+        <div
+          style={{
+            color: "black",
+            fontSize: calculateFontSize()
+          }}
+        >
+          <span>{type}</span>
+        </div>
+      );
+    case radioButtonWidget:
+      return (
+        <div>
+          {props.pos.options?.values.map((data, ind) => {
+            return (
+              <div key={ind} className="flex items-center text-center gap-0.5">
+                <input
+                  style={{
+                    width: props.pos.Width,
+                    display: "flex",
+                    justifyContent: "center",
+                    marginTop: ind === 0 ? 0 : "5px"
+                  }}
+                  type="radio"
+                  disabled={
+                    props.isNeedSign &&
+                    (props.pos.options?.isReadOnly ||
+                      props.data?.signerObjId !== props.signerObjId)
+                  }
+                  checked={handleRadioCheck(data)}
+                  onChange={(e) => {
+                    if (!props.isPlaceholder) {
+                      handleCheckRadio(e.target.checked, data);
+                    }
+                  }}
+                />
+                {!props.pos.options?.isHideLabel && (
+                  <label className="text-xs mb-0">{data}</label>
+                )}
+              </div>
+            );
+          })}
+        </div>
+      );
+    case textWidget:
+      return (
+        <textarea
+          placeholder="Enter label"
+          rows={1}
+          value={textValue}
+          onBlur={handleInputBlur}
+          onChange={(e) => {
+            setTextValue(e.target.value);
+            onChangeInput(
+              e.target.value,
+              props.pos.key,
+              props.xyPostion,
+              props.index,
+              props.setXyPostion,
+              props.data && props.data?.Id,
+              false
+            );
+          }}
+          className={
+            isMobile
+              ? "labelTextArea labelWidthMobile"
+              : "labelTextArea labelWidthDesktop"
+          }
+          style={{ whiteSpace: "pre-wrap" }}
+          cols="50"
+        />
+      );
+    default:
+      return props.pos.SignUrl ? (
+        <div style={{ pointerEvents: "none" }}>
+          <img
+            alt="signimg"
+            src={props.pos.SignUrl}
+            style={{
+              width: "99%",
+              height: "100%",
+              objectFit: "contain"
+            }}
+          />
+        </div>
+      ) : (
+        <div
+          style={{
+            fontSize: "10px",
+            color: "black",
+            justifyContent: "center"
+          }}
+        >
+          {props.pos.isStamp ? <div>stamp</div> : <div>signature</div>}
+          {props?.handleUserName &&
+            props?.handleUserName(props?.data?.Id, props?.data?.Role)}
+        </div>
+      );
+  }
+}
+
+export default PlaceholderType;
@@ -21,7 +21,7 @@ function PrevNext({ pageNumber, allPages, changePage }) {
            fontWeight: "600",

            border: "0px",
-            marginRight: "5px",
+            marginRight: "5px"
          }}
          disabled={pageNumber <= 1}
          onClick={previousPage}
@@ -31,7 +31,7 @@ function PrevNext({ pageNumber, allPages, changePage }) {
        <span
          style={{
            fontSize: "13px",
-            fontWeight: "600",
+            fontWeight: "600"
          }}
        >
          {pageNumber || (allPages ? 1 : "--")} of {allPages || "--"}
@@ -43,7 +43,7 @@ function PrevNext({ pageNumber, allPages, changePage }) {
            background: "#d3edeb",
            fontWeight: "600",
            marginLeft: "5px",
-            border: "0px",
+            border: "0px"
          }}
          disabled={pageNumber >= allPages}
          onClick={nextPage}
@@ -0,0 +1,207 @@
+import React, { useRef, useState } from "react";
+import { darkenColor, getFirstLetter } from "../../constant/Utils";
+
+const RecipientList = (props) => {
+  const color = [
+    "#93a3db",
+    "#e6c3db",
+    "#c0e3bc",
+    "#bce3db",
+    "#b8ccdb",
+    "#ceb8db",
+    "#ffccff",
+    "#99ffcc",
+    "#cc99ff",
+    "#ffcc99",
+    "#66ccff",
+    "#ffffcc"
+  ];
+
+  const nameColor = [
+    "#304fbf",
+    "#7d5270",
+    "#5f825b",
+    "#578077",
+    "#576e80",
+    "#6d527d",
+    "#cc00cc",
+    "#006666",
+    "#cc00ff",
+    "#ff9900",
+    "#336699",
+    "#cc9900"
+  ];
+  const [isHover, setIsHover] = useState();
+  const [isEdit, setIsEdit] = useState(false);
+  //function for onhover signer name change background color
+  const inputRef = useRef(null);
+  const onHoverStyle = (ind, blockColor) => {
+    const style = {
+      background: blockColor ? blockColor : color[ind % color.length],
+      padding: "10px",
+      marginTop: "2px",
+      display: "flex",
+      flexDirection: "row",
+      borderBottom: "1px solid #e3e1e1",
+      alignItems: "center"
+    };
+    return style;
+  };
+  //function for onhover signer name remove background color
+  const nonHoverStyle = () => {
+    const style = {
+      padding: "10px",
+      marginTop: "2px",
+      display: "flex",
+      flexDirection: "row",
+      borderBottom: "1px solid #e3e1e1",
+      alignItems: "center"
+    };
+    return style;
+  };
+  const isWidgetExist = (Id) => {
+    return props.signerPos.some((x) => x.Id === Id);
+  };
+
+  return (
+    <>
+      {props.signersdata.length > 0 &&
+        props.signersdata.map((obj, ind) => {
+          return (
+            <div
+              data-tut="reactourFirst"
+              onMouseEnter={() => setIsHover(ind)}
+              onMouseLeave={() => setIsHover(null)}
+              key={ind}
+              style={
+                isHover === ind || props.isSelectListId === ind
+                  ? onHoverStyle(ind, obj.blockColor)
+                  : nonHoverStyle(ind)
+              }
+              onClick={() => {
+                props.setSignerObjId(obj?.objectId || "");
+                props.setIsSelectId(ind);
+                props.setContractName(obj?.className || "");
+                props.setUniqueId(obj.Id);
+                props.setRoleName(obj.Role);
+                if (props.handleModal) {
+                  props.handleModal();
+                }
+              }}
+            >
+              <div
+                style={{
+                  display: "flex",
+                  flexDirection: "row",
+                  alignItems: "center",
+                  width: "100%"
+                }}
+              >
+                <div
+                  className="signerStyle"
+                  style={{
+                    background: obj.blockColor
+                      ? darkenColor(obj.blockColor, 0.4)
+                      : nameColor[ind % nameColor.length],
+                    width: 30,
+                    height: 30,
+                    display: "flex",
+                    borderRadius: 30 / 2,
+                    justifyContent: "center",
+                    alignItems: "center",
+                    marginRight: "12px"
+                  }}
+                >
+                  <span
+                    style={{
+                      fontSize: "12px",
+                      textAlign: "center",
+                      fontWeight: "bold",
+                      color: "white",
+                      textTransform: "uppercase"
+                    }}
+                  >
+                    {isWidgetExist(obj.Id) ? (
+                      <i className="fa-solid fa-check"></i>
+                    ) : (
+                      <>
+                        {obj.Name
+                          ? getFirstLetter(obj.Name)
+                          : getFirstLetter(obj.Role)}
+                      </>
+                    )}
+                  </span>
+                </div>
+                <div
+                  style={{
+                    display: "flex",
+                    flexDirection: obj.Name ? "column" : "row",
+                    alignItems: "center"
+                  }}
+                >
+                  {obj.Name ? (
+                    <span className="userName" style={{ cursor: "default" }}>
+                      {obj.Name}
+                    </span>
+                  ) : (
+                    <>
+                      <span
+                        className="userName"
+                        onClick={() => {
+                          setIsEdit({ [obj.Id]: true });
+                          props.setRoleName(obj.Role);
+                        }}
+                      >
+                        {isEdit?.[obj.Id] && props.handleRoleChange ? (
+                          <input
+                            ref={inputRef}
+                            style={{
+                              backgroundColor: "transparent",
+                              width: "inherit"
+                            }}
+                            value={obj.Role}
+                            onChange={(e) => props.handleRoleChange(e, obj.Id)}
+                            onBlur={() => {
+                              setIsEdit({});
+                              props.handleOnBlur(obj.Role, obj.Id);
+                            }}
+                            onKeyDown={(e) => {
+                              if (e.key === "Enter") {
+                                e.preventDefault();
+                                inputRef.current.blur();
+                              }
+                            }}
+                          />
+                        ) : (
+                          obj.Role
+                        )}
+                      </span>
+                    </>
+                  )}
+                  {obj.Name && (
+                    <span className="useEmail" style={{ cursor: "default" }}>
+                      {obj.Role}
+                    </span>
+                  )}
+                </div>
+              </div>
+              {props.handleDeleteUser && (
+                <div
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    props.handleDeleteUser(obj.Id);
+                  }}
+                  style={{ cursor: "pointer" }}
+                >
+                  <i className="fa-regular fa-trash-can"></i>
+                </div>
+              )}
+              <hr />
+            </div>
+          );
+        })}
+    </>
+  );
+};
+
+export default RecipientList;
@@ -0,0 +1,101 @@
+import React from "react";
+import RSC from "react-scrollbars-custom";
+import { Document, Page } from "react-pdf";
+import { themeColor } from "../../constant/const";
+
+function RenderAllPdfPage({
+  pdfUrl,
+  signPdfUrl,
+  allPages,
+  setAllPages,
+  setPageNumber,
+  setSignBtnPosition,
+  pageNumber
+}) {
+  //set all number of pages after load pdf
+  function onDocumentLoad({ numPages }) {
+    setAllPages(numPages);
+  }
+
+  return (
+    <div className="showPages">
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "row",
+          boxShadow: "rgba(17, 12, 46, 0.15) 0px 48px 100px 0px",
+          backgroundColor: "white",
+          height: "100%"
+        }}
+      >
+        <div style={{ width: "140px" }}>
+          <div
+            style={{
+              background: themeColor
+              //  color:"white"
+            }}
+            className="signedStyle"
+          >
+            Pages
+          </div>
+
+          <div>
+            <RSC
+              id="RSC-Example"
+              style={{
+                width: "135px",
+                height: window.innerHeight - 130 + "px"
+              }}
+            >
+              <Document
+                loading={"Loading Document.."}
+                onLoadSuccess={onDocumentLoad}
+                file={pdfUrl ? pdfUrl : signPdfUrl}
+                //   file="https://api.printnode.com/static/test/pdf/multipage.pdf"
+              >
+                {Array.from(new Array(allPages), (el, index) => (
+                  <div
+                    key={index}
+                    style={{
+                      width: "100px",
+                      border:
+                        pageNumber - 1 === index
+                          ? "2px solid red"
+                          : "2px solid #878787",
+                      // padding: "5px",
+                      margin: "10px",
+
+                      display: "flex",
+                      justifyContent: "center",
+                      alignItems: "center",
+                      contain: "content"
+                    }}
+                    onClick={() => {
+                      setPageNumber(index + 1);
+                      if (setSignBtnPosition) {
+                        setSignBtnPosition([]);
+                      }
+                    }}
+                  >
+                    <Page
+                      key={`page_${index + 1}`}
+                      pageNumber={index + 1}
+                      width={100}
+                      height={100}
+                      scale={1}
+                      renderAnnotationLayer={false}
+                      renderTextLayer={false}
+                    />
+                  </div>
+                ))}
+              </Document>
+            </RSC>
+          </div>
+          <hr />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default RenderAllPdfPage;
@@ -0,0 +1,693 @@
+import React from "react";
+import RSC from "react-scrollbars-custom";
+import { Document, Page } from "react-pdf";
+import {
+  defaultWidthHeight,
+  handleImageResize,
+  handleSignYourselfImageResize
+} from "../../constant/Utils";
+import Placeholder from "./Placeholder";
+import Alert from "../../primitives/Alert";
+
+function RenderPdf({
+  pageNumber,
+  pdfOriginalWidth,
+  pdfNewWidth,
+  drop,
+  signerPos,
+  successEmail,
+  handleTabDrag,
+  handleStop,
+  isDragging,
+  setIsSignPad,
+  setIsStamp,
+  handleDeleteSign,
+  setSignKey,
+  pdfDetails,
+  xyPostion,
+  pdfUrl,
+  numPages,
+  pageDetails,
+  pdfRequest,
+  setCurrentSigner,
+  signerObjectId,
+  signedSigners,
+  setPdfLoadFail,
+  placeholder,
+  pdfLoadFail,
+  setSignerPos,
+  setXyPostion,
+  index,
+  containerWH,
+  setIsResize,
+  handleLinkUser,
+  setUniqueId,
+  signersdata,
+  setIsPageCopy,
+  setSignerObjId,
+  setShowDropdown,
+  setIsInitial,
+  setIsValidate,
+  setWidgetType,
+  setValidateAlert,
+  setIsRadio,
+  setCurrWidgetsDetails,
+  setSelectWidgetId,
+  selectWidgetId,
+  unSignedWidgetId,
+  setIsCheckbox,
+  handleNameModal,
+  setTempSignerId,
+  uniqueId
+}) {
+  const isMobile = window.innerWidth < 767;
+  const newWidth = containerWH.width;
+  const scale = isMobile ? pdfOriginalWidth / newWidth : 1;
+  //check isGuestSigner is present in local if yes than handle login flow header in mobile view
+  const isGuestSigner = localStorage.getItem("isGuestSigner");
+
+  // handle signature block width and height according to screen
+  const posWidth = (pos, signYourself) => {
+    const defaultWidth = defaultWidthHeight(pos.type).width;
+    const posWidth = pos.Width ? pos.Width : defaultWidth;
+    let width;
+    if (signYourself) {
+      width = posWidth;
+      return width;
+    } else {
+      if (isMobile) {
+        if (!pos.isMobile) {
+          if (pos.IsResize) {
+            width = posWidth ? posWidth : defaultWidth;
+            return width;
+          } else {
+            width = (posWidth || defaultWidth) / scale;
+
+            return width;
+          }
+        } else {
+          width = posWidth;
+          return width;
+        }
+      } else {
+        if (pos.isMobile) {
+          if (pos.IsResize) {
+            width = posWidth ? posWidth : defaultWidth;
+            return width;
+          } else {
+            width = (posWidth || defaultWidth) * pos.scale;
+            return width;
+          }
+        } else {
+          width = posWidth ? posWidth : defaultWidth;
+          return width;
+        }
+      }
+    }
+  };
+  const posHeight = (pos, signYourself) => {
+    let height;
+    const posHeight = pos.Height;
+    const defaultHeight = defaultWidthHeight(pos.type).height;
+
+    if (signYourself) {
+      height = posHeight ? posHeight : defaultHeight;
+
+      return height;
+    } else {
+      if (isMobile) {
+        if (!pos.isMobile) {
+          if (pos.IsResize) {
+            height = posHeight ? posHeight : defaultHeight;
+            return height;
+          } else {
+            height = (posHeight || defaultHeight) / scale;
+
+            return height;
+          }
+        } else {
+          height = posHeight ? posHeight : defaultHeight;
+          return height;
+        }
+      } else {
+        if (pos.isMobile) {
+          if (pos.IsResize) {
+            height = posHeight ? posHeight : defaultHeight;
+            return height;
+          } else {
+            height = (posHeight || defaultHeight) * pos.scale;
+            return height;
+          }
+        } else {
+          height = posHeight ? posHeight : defaultHeight;
+          return height;
+        }
+      }
+    }
+  };
+
+  const xPos = (pos, signYourself) => {
+    const resizePos = pos.xPosition;
+    if (signYourself) {
+      return resizePos;
+    } else {
+      //checking both condition mobile and desktop view
+      if (isMobile) {
+        //if pos.isMobile false -- placeholder saved from desktop view then handle position in mobile view divided by scale
+        if (!pos.isMobile) {
+          return resizePos / scale;
+        }
+        //pos.isMobile true -- placeholder save from mobile view(small device)  handle position in mobile view(small screen) view divided by scale
+        else {
+          return resizePos * (pos.scale / scale);
+        }
+      } else {
+        //else if pos.isMobile true -- placeholder saved from mobile or tablet view then handle position in desktop view divide by scale
+
+        if (pos.isMobile) {
+          return pos.scale && resizePos * pos.scale;
+        }
+        //else placeholder save from desktop(bigscreen) and show in desktop(bigscreen)
+        else {
+          return resizePos;
+        }
+      }
+    }
+  };
+  const yPos = (pos, signYourself) => {
+    const resizePos = pos.yPosition;
+    if (signYourself) {
+      return resizePos;
+    } else {
+      //checking both condition mobile and desktop view
+      if (isMobile) {
+        //if pos.isMobile false -- placeholder saved from desktop view then handle position in mobile view divided by scale
+        if (!pos.isMobile) {
+          return resizePos / scale;
+        }
+        //pos.isMobile true -- placeholder save from mobile view(small device)  handle position in mobile view(small screen) view divided by scale
+        else {
+          return resizePos * (pos.scale / scale);
+        }
+      } else {
+        //else if pos.isMobile true -- placeholder saved from mobile or tablet view then handle position in desktop view divide by scale
+
+        if (pos.isMobile) {
+          return pos.scale && resizePos * pos.scale;
+        }
+        //else placeholder save from desktop(bigscreen) and show in desktop(bigscreen)
+        else {
+          return resizePos;
+        }
+      }
+    }
+  };
+  //function for render placeholder block over pdf document
+  const checkSignedSignes = (data) => {
+    const checkSign = signedSigners.filter(
+      (sign) => sign.objectId === data.signerObjId
+    );
+    if (data.signerObjId === signerObjectId) {
+      setCurrentSigner(true);
+    }
+    const handleAllUserName = (Id, Role, type) => {
+      return pdfDetails[0].Signers.map((signerData, key) => {
+        return (
+          signerData.objectId === data.signerObjId && (
+            <React.Fragment key={key}>
+              {signerData?.Name && (
+                <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
+                  {signerData.Name}
+                </div>
+              )}
+              {type && (
+                <div style={{ fontWeight: "700", fontSize: 11 }}>{type}</div>
+              )}
+              {Role && (
+                <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
+                  {`(${Role})`}
+                </div>
+              )}
+            </React.Fragment>
+          )
+        );
+      });
+    };
+
+    return (
+      checkSign.length === 0 &&
+      data.placeHolder.map((placeData, key) => {
+        return (
+          <React.Fragment key={key}>
+            {placeData.pageNumber === pageNumber &&
+              placeData.pos.map((pos) => {
+                return (
+                  pos && (
+                    <React.Fragment key={pos.key}>
+                      <Placeholder
+                        pos={pos}
+                        setSignKey={setSignKey}
+                        setIsSignPad={setIsSignPad}
+                        setIsStamp={setIsStamp}
+                        handleSignYourselfImageResize={handleImageResize}
+                        index={pageNumber}
+                        xyPostion={signerPos}
+                        setXyPostion={setSignerPos}
+                        data={data}
+                        setIsResize={setIsResize}
+                        isShowBorder={false}
+                        signerObjId={signerObjectId}
+                        isShowDropdown={true}
+                        isNeedSign={true}
+                        isSignYourself={false}
+                        xPos={xPos}
+                        yPos={yPos}
+                        posWidth={posWidth}
+                        posHeight={posHeight}
+                        handleUserName={handleAllUserName}
+                        isDragging={false}
+                        pdfDetails={pdfDetails}
+                        setIsInitial={setIsInitial}
+                        setValidateAlert={setValidateAlert}
+                        unSignedWidgetId={unSignedWidgetId}
+                        setSelectWidgetId={setSelectWidgetId}
+                        selectWidgetId={selectWidgetId}
+                      />
+                    </React.Fragment>
+                  )
+                );
+              })}
+          </React.Fragment>
+        );
+      })
+    );
+  };
+
+  const handleUserName = (Id, Role, type) => {
+    if (Id) {
+      const checkSign = signersdata.find((sign) => sign.Id === Id);
+      if (checkSign?.Name) {
+        return (
+          <>
+            <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
+              {checkSign?.Name}
+            </div>
+            {type && (
+              <div style={{ fontWeight: "700", fontSize: 11 }}>{type}</div>
+            )}
+            <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
+              {`(${Role})`}
+            </div>
+          </>
+        );
+      } else {
+        return (
+          <>
+            {type && (
+              <div style={{ fontWeight: "700", fontSize: 11 }}>{type}</div>
+            )}
+            <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
+              {Role}
+            </div>
+          </>
+        );
+      }
+    } else {
+      return (
+        <>
+          {type && (
+            <div style={{ fontWeight: "700", fontSize: 11 }}>{type}</div>
+          )}
+          <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
+            {Role}
+          </div>
+        </>
+      );
+    }
+  };
+
+  return (
+    <>
+      {successEmail && <Alert type={"success"}>Email sent successfully!</Alert>}
+      {isMobile && scale ? (
+        <div
+          style={{
+            border: "0.1px solid #ebe8e8",
+            marginTop: isGuestSigner && "30px"
+          }}
+          ref={drop}
+          id="container"
+        >
+          {pdfLoadFail.status &&
+            (pdfRequest
+              ? signerPos.map((data, key) => {
+                  return (
+                    <React.Fragment key={key}>
+                      {checkSignedSignes(data)}
+                    </React.Fragment>
+                  );
+                })
+              : placeholder // placeholder mobile
+                ? signerPos.map((data, ind) => {
+                    return (
+                      <React.Fragment key={ind}>
+                        {data.placeHolder.map((placeData, index) => {
+                          return (
+                            <React.Fragment key={index}>
+                              {placeData.pageNumber === pageNumber &&
+                                placeData.pos.map((pos) => {
+                                  return (
+                                    <React.Fragment key={pos.key}>
+                                      <Placeholder
+                                        pos={pos}
+                                        setIsPageCopy={setIsPageCopy}
+                                        setSignKey={setSignKey}
+                                        handleDeleteSign={handleDeleteSign}
+                                        setIsStamp={setIsStamp}
+                                        handleTabDrag={handleTabDrag}
+                                        handleStop={handleStop}
+                                        handleSignYourselfImageResize={
+                                          handleImageResize
+                                        }
+                                        index={pageNumber}
+                                        xyPostion={signerPos}
+                                        setXyPostion={setSignerPos}
+                                        setSignerObjId={setSignerObjId}
+                                        data={data}
+                                        setIsResize={setIsResize}
+                                        setShowDropdown={setShowDropdown}
+                                        isShowBorder={true}
+                                        isPlaceholder={true}
+                                        setUniqueId={setUniqueId}
+                                        handleLinkUser={handleLinkUser}
+                                        handleUserName={handleUserName}
+                                        isSignYourself={false}
+                                        xPos={xPos}
+                                        yPos={yPos}
+                                        posWidth={posWidth}
+                                        posHeight={posHeight}
+                                        isDragging={isDragging}
+                                        setIsValidate={setIsValidate}
+                                        setWidgetType={setWidgetType}
+                                        setIsRadio={setIsRadio}
+                                        setIsCheckbox={setIsCheckbox}
+                                        setCurrWidgetsDetails={
+                                          setCurrWidgetsDetails
+                                        }
+                                        setSelectWidgetId={setSelectWidgetId}
+                                        selectWidgetId={selectWidgetId}
+                                        handleNameModal={handleNameModal}
+                                        setTempSignerId={setTempSignerId}
+                                        uniqueId={uniqueId}
+                                      />
+                                    </React.Fragment>
+                                  );
+                                })}
+                            </React.Fragment>
+                          );
+                        })}
+                      </React.Fragment>
+                    );
+                  })
+                : xyPostion.map((data, ind) => {
+                    return (
+                      <React.Fragment key={ind}>
+                        {data.pageNumber === pageNumber &&
+                          data.pos.map((pos) => {
+                            return (
+                              pos && (
+                                <Placeholder
+                                  pos={pos}
+                                  setIsPageCopy={setIsPageCopy}
+                                  setSignKey={setSignKey}
+                                  handleDeleteSign={handleDeleteSign}
+                                  setIsStamp={setIsStamp}
+                                  handleTabDrag={handleTabDrag}
+                                  handleStop={handleStop}
+                                  handleSignYourselfImageResize={
+                                    handleSignYourselfImageResize
+                                  }
+                                  index={index}
+                                  xyPostion={xyPostion}
+                                  setXyPostion={setXyPostion}
+                                  pdfOriginalWidth={pdfOriginalWidth}
+                                  containerWH={containerWH}
+                                  setIsSignPad={setIsSignPad}
+                                  isShowBorder={true}
+                                  isSignYourself={true}
+                                  xPos={xPos}
+                                  yPos={yPos}
+                                  posWidth={posWidth}
+                                  posHeight={posHeight}
+                                  pdfDetails={pdfDetails[0]}
+                                  isDragging={isDragging}
+                                  setIsInitial={setIsInitial}
+                                  setWidgetType={setWidgetType}
+                                  setSelectWidgetId={setSelectWidgetId}
+                                  selectWidgetId={selectWidgetId}
+                                  handleUserName={handleUserName}
+                                  setIsCheckbox={setIsCheckbox}
+                                  setValidateAlert={setValidateAlert}
+                                  setCurrWidgetsDetails={setCurrWidgetsDetails}
+                                />
+                              )
+                            );
+                          })}
+                      </React.Fragment>
+                    );
+                  }))}
+
+          {/* this component for render pdf document is in middle of the component */}
+          <div
+            style={{
+              display: "flex",
+              justifyContent: "center",
+              alignItems: "center"
+            }}
+          >
+            <Document
+              onLoadError={() => {
+                setPdfLoadFail(true);
+              }}
+              loading={"Loading Document.."}
+              onLoadSuccess={pageDetails}
+              // ref={pdfRef}'
+              onClick={() => {
+                if (setSelectWidgetId) {
+                  setSelectWidgetId("");
+                }
+              }}
+              file={
+                pdfUrl
+                  ? pdfUrl
+                  : pdfDetails[0] && pdfDetails[0].SignedUrl
+                    ? pdfDetails[0].SignedUrl
+                    : pdfDetails[0].URL
+              }
+            >
+              {Array.from(new Array(numPages), (el, index) => (
+                <Page
+                  key={index}
+                  pageNumber={pageNumber}
+                  width={containerWH.width}
+                  height={containerWH.height}
+                  renderAnnotationLayer={false}
+                  renderTextLayer={false}
+                  onGetAnnotationsError={(error) => {
+                    console.log("annotation error", error);
+                  }}
+                />
+              ))}
+            </Document>
+          </div>
+        </div>
+      ) : (
+        <RSC
+          style={{
+            position: "relative",
+            boxShadow: "rgba(17, 12, 46, 0.15) 0px 48px 100px 0px",
+            width:
+              pdfOriginalWidth > pdfNewWidth ? pdfNewWidth : pdfOriginalWidth,
+            height: window.innerHeight - 110 + "px"
+          }}
+          noScrollY={false}
+          noScrollX={pdfNewWidth < pdfOriginalWidth ? false : true}
+        >
+          <div
+            style={{
+              border: "0.1px solid #ebe8e8",
+              width: pdfOriginalWidth
+            }}
+            ref={drop}
+            id="container"
+          >
+            {pdfLoadFail.status &&
+              (pdfRequest
+                ? signerPos.map((data, key) => {
+                    return (
+                      <React.Fragment key={key}>
+                        {checkSignedSignes(data)}
+                      </React.Fragment>
+                    );
+                  })
+                : placeholder
+                  ? signerPos.map((data, ind) => {
+                      return (
+                        <React.Fragment key={ind}>
+                          {data.placeHolder.map((placeData, index) => {
+                            return (
+                              <React.Fragment key={index}>
+                                {placeData.pageNumber === pageNumber &&
+                                  placeData.pos.map((pos) => {
+                                    return (
+                                      <React.Fragment key={pos.key}>
+                                        <Placeholder
+                                          pos={pos}
+                                          setIsPageCopy={setIsPageCopy}
+                                          setSignKey={setSignKey}
+                                          handleDeleteSign={handleDeleteSign}
+                                          setIsStamp={setIsStamp}
+                                          handleTabDrag={handleTabDrag}
+                                          handleStop={handleStop}
+                                          handleSignYourselfImageResize={
+                                            handleImageResize
+                                          }
+                                          index={pageNumber}
+                                          xyPostion={signerPos}
+                                          setXyPostion={setSignerPos}
+                                          setSignerObjId={setSignerObjId}
+                                          data={data}
+                                          setIsResize={setIsResize}
+                                          setShowDropdown={setShowDropdown}
+                                          isShowBorder={true}
+                                          isPlaceholder={true}
+                                          setUniqueId={setUniqueId}
+                                          handleLinkUser={handleLinkUser}
+                                          handleUserName={handleUserName}
+                                          isSignYourself={false}
+                                          xPos={xPos}
+                                          yPos={yPos}
+                                          posWidth={posWidth}
+                                          posHeight={posHeight}
+                                          isDragging={isDragging}
+                                          setIsValidate={setIsValidate}
+                                          setWidgetType={setWidgetType}
+                                          setIsRadio={setIsRadio}
+                                          setIsCheckbox={setIsCheckbox}
+                                          setCurrWidgetsDetails={
+                                            setCurrWidgetsDetails
+                                          }
+                                          setSelectWidgetId={setSelectWidgetId}
+                                          selectWidgetId={selectWidgetId}
+                                          handleNameModal={handleNameModal}
+                                          setTempSignerId={setTempSignerId}
+                                          uniqueId={uniqueId}
+                                        />
+                                      </React.Fragment>
+                                    );
+                                  })}
+                              </React.Fragment>
+                            );
+                          })}
+                        </React.Fragment>
+                      );
+                    })
+                  : xyPostion.map((data, ind) => {
+                      return (
+                        <React.Fragment key={ind}>
+                          {data.pageNumber === pageNumber &&
+                            data.pos.map((pos) => {
+                              return (
+                                pos && (
+                                  <React.Fragment key={pos.key}>
+                                    <Placeholder
+                                      pos={pos}
+                                      setIsPageCopy={setIsPageCopy}
+                                      setSignKey={setSignKey}
+                                      handleDeleteSign={handleDeleteSign}
+                                      setIsStamp={setIsStamp}
+                                      handleTabDrag={handleTabDrag}
+                                      handleStop={(event, dragElement) =>
+                                        handleStop(event, dragElement, pos.type)
+                                      }
+                                      handleSignYourselfImageResize={
+                                        handleSignYourselfImageResize
+                                      }
+                                      index={index}
+                                      xyPostion={xyPostion}
+                                      setXyPostion={setXyPostion}
+                                      pdfOriginalWidth={pdfOriginalWidth}
+                                      containerWH={containerWH}
+                                      setIsSignPad={setIsSignPad}
+                                      isShowBorder={true}
+                                      isSignYourself={true}
+                                      xPos={xPos}
+                                      yPos={yPos}
+                                      posWidth={posWidth}
+                                      posHeight={posHeight}
+                                      pdfDetails={pdfDetails[0]}
+                                      isDragging={isDragging}
+                                      setIsInitial={setIsInitial}
+                                      setWidgetType={setWidgetType}
+                                      setSelectWidgetId={setSelectWidgetId}
+                                      selectWidgetId={selectWidgetId}
+                                      handleUserName={handleUserName}
+                                      setIsCheckbox={setIsCheckbox}
+                                      setValidateAlert={setValidateAlert}
+                                      setCurrWidgetsDetails={
+                                        setCurrWidgetsDetails
+                                      }
+                                    />
+                                  </React.Fragment>
+                                )
+                              );
+                            })}
+                        </React.Fragment>
+                      );
+                    }))}
+
+            {/* this component for render pdf document is in middle of the component */}
+            <Document
+              onLoadError={() => {
+                const load = {
+                  status: false,
+                  type: "failed"
+                };
+                setPdfLoadFail(load);
+              }}
+              loading={"Loading Document.."}
+              onLoadSuccess={pageDetails}
+              onClick={() => {
+                if (setSelectWidgetId) {
+                  setSelectWidgetId("");
+                }
+              }}
+              // ref={pdfRef}
+              file={
+                pdfUrl
+                  ? pdfUrl
+                  : pdfDetails[0] && pdfDetails[0].SignedUrl
+                    ? pdfDetails[0].SignedUrl
+                    : pdfDetails[0].URL
+              }
+            >
+              {Array.from(new Array(numPages), (el, index) => (
+                <Page
+                  key={index}
+                  pageNumber={pageNumber}
+                  renderAnnotationLayer={false}
+                  renderTextLayer={false}
+                  onGetAnnotationsError={(error) => {
+                    console.log("annotation error", error);
+                  }}
+                />
+              ))}
+            </Document>
+          </div>
+        </RSC>
+      )}
+    </>
+  );
+}
+
+export default RenderPdf;
@@ -0,0 +1,670 @@
+import React, { useRef, useState, useEffect } from "react";
+import SignatureCanvas from "react-signature-canvas";
+import { themeColor } from "../../constant/const";
+
+function SignPad({
+  isSignPad,
+  isStamp,
+  setIsImageSelect,
+  onSaveSign,
+  setIsSignPad,
+  setImage,
+  isImageSelect,
+  imageRef,
+  onImageChange,
+  onSaveImage,
+  image,
+  defaultSign,
+  setSignature,
+  myInitial,
+  isInitial,
+  setIsInitial,
+  setIsStamp,
+  widgetType
+}) {
+  const [penColor, setPenColor] = useState("blue");
+  const allColor = ["blue", "red", "black"];
+  const canvasRef = useRef(null);
+  const [isDefaultSign, setIsDefaultSign] = useState(false);
+  const [isTab, setIsTab] = useState("draw");
+  const [isSignImg, setIsSignImg] = useState("");
+  const [signValue, setSignValue] = useState("");
+  const [textWidth, setTextWidth] = useState(null);
+  const [textHeight, setTextHeight] = useState(null);
+  const fontOptions = [
+    { value: "Fasthand" },
+    { value: "Dancing Script" },
+    { value: "Cedarville Cursive" },
+    { value: "Delicious Handrawn" }
+    // Add more font options as needed
+  ];
+  const [fontSelect, setFontSelect] = useState(fontOptions[0].value);
+
+  const senderUser =
+    localStorage.getItem(
+      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
+    ) &&
+    localStorage.getItem(
+      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
+    );
+  const jsonSender = JSON.parse(senderUser);
+
+  const currentUserName = jsonSender && jsonSender.name;
+
+  useEffect(() => {
+    const trimmedName = currentUserName.trim();
+    const firstCharacter = trimmedName.charAt(0);
+    const userName = isInitial ? firstCharacter : currentUserName;
+    setSignValue(userName);
+    setFontSelect("Fasthand");
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  //function for clear signature image
+  const handleClear = () => {
+    if (isTab === "draw") {
+      if (canvasRef.current) {
+        canvasRef.current.clear();
+      } else if (isStamp) {
+        setImage("");
+      }
+
+      setIsSignImg("");
+    } else if (isTab === "uploadImage") {
+      setImage("");
+    }
+    setIsInitial(false);
+  };
+  //function for set signature url
+  const handleSignatureChange = () => {
+    // canvasRef.current.backgroundColor = 'rgb(165, 26, 26)'
+    setSignature(canvasRef.current.toDataURL());
+    setIsSignImg(canvasRef.current.toDataURL());
+  };
+
+  //save button component
+  const SaveBtn = () => {
+    return (
+      <div style={{ marginTop: "2px" }}>
+        {(isTab === "draw" || isTab === "uploadImage") && (
+          <button
+            style={{
+              color: "black",
+              border: "1px solid #ccc"
+            }}
+            type="button"
+            className="finishBtn saveBtn"
+            onClick={() => handleClear()}
+          >
+            Clear
+          </button>
+        )}
+
+        <button
+          onClick={() => {
+            if (!image) {
+              if (isTab === "mysignature") {
+                setIsSignImg("");
+                if (isInitial) {
+                  onSaveSign("initials");
+                } else {
+                  onSaveSign("default");
+                }
+              } else {
+                if (isTab === "type") {
+                  setIsSignImg("");
+                  onSaveSign(false, textWidth, textHeight);
+                } else {
+                  setIsSignImg("");
+                  onSaveSign();
+                }
+              }
+
+              setPenColor("blue");
+            } else {
+              setIsSignImg("");
+              onSaveImage();
+            }
+            setIsSignPad(false);
+            setIsInitial(false);
+            setIsImageSelect(false);
+            setIsDefaultSign(false);
+            setImage();
+            setIsTab("draw");
+            setSignValue("");
+            setIsStamp(false);
+          }}
+          style={{
+            background: themeColor,
+            color: "white"
+          }}
+          disabled={
+            isSignImg || image || isDefaultSign || textWidth ? false : true
+          }
+          type="button"
+          className={
+            isSignImg || image || isDefaultSign || textWidth
+              ? "finishBtn saveBtn"
+              : "disabledFinish saveBtn"
+          }
+        >
+          Save
+        </button>
+      </div>
+    );
+  };
+
+  useEffect(() => {
+    const loadFont = async () => {
+      try {
+        await document.fonts.load(`20px ${fontSelect}`);
+        const selectFontSTyle = fontOptions.find(
+          (font) => font.value === fontSelect
+        );
+        setFontSelect(selectFontSTyle?.value || fontOptions[0].value);
+      } catch (error) {
+        console.error("Error loading font:", error);
+      }
+    };
+
+    loadFont();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [fontSelect]);
+
+  useEffect(() => {
+    // Load the default signature after the component mounts
+    if (canvasRef.current) {
+      canvasRef.current.fromDataURL(isSignImg);
+    }
+    if (isTab === "type") {
+      const trimmedName = signValue ? signValue.trim() : currentUserName.trim();
+      const firstCharacter = trimmedName.charAt(0);
+      const userName = isInitial ? firstCharacter : signValue;
+      setSignValue(userName);
+      convertToImg(fontSelect, userName);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isTab]);
+
+  //function for convert input text value in image
+  const convertToImg = async (fontStyle, text) => {
+    //get text content to convert in image
+    const textContent = text;
+    const fontfamily = fontStyle
+      ? fontStyle
+      : fontSelect
+        ? fontSelect
+        : "Fasthand";
+
+    //creating span for getting text content width
+    const span = document.createElement("span");
+    span.textContent = textContent;
+    span.style.font = `20px ${fontfamily}`; // here put your text size and font family
+    span.style.display = "hidden";
+    document.body.appendChild(span); // Replace 'container' with the ID of the container element
+
+    //create canvas to render text in canvas and convert in image
+    const canvasElement = document.createElement("canvas");
+    // Draw the text content on the canvas
+    const ctx = canvasElement.getContext("2d");
+    const pixelRatio = window.devicePixelRatio || 1;
+    const width = span.offsetWidth;
+    const height = span.offsetHeight;
+    setTextWidth(width);
+    setTextHeight(height);
+    const font = span.style["font"];
+    // Set the canvas dimensions to match the span
+    canvasElement.width = width * pixelRatio;
+    canvasElement.height = height * pixelRatio;
+
+    // Render the content of the span onto the canvas
+    // ctx.fillStyle = "white"; // Set the background color of the canvas
+    // ctx.fillRect(0, 0, width*pixelRatio, height*pixelRatio);
+
+    // You can customize text styles if needed
+    ctx.font = font;
+    ctx.fillStyle = "black"; // Set the text color
+    ctx.textAlign = "center";
+    ctx.textBaseline = "middle";
+    ctx.scale(pixelRatio, pixelRatio);
+    // Draw the content of the span onto the canvas
+    ctx.fillText(span.textContent, width / 2, height / 2); // Adjust the x,y-coordinate as needed
+    //remove span tag
+    document.body.removeChild(span);
+    // Convert the canvas to image data
+    const dataUrl = canvasElement.toDataURL("image/png");
+    setSignature(dataUrl);
+  };
+
+  return (
+    <div>
+      {isSignPad && (
+        <div className="modaloverlay">
+          <div className="modalcontainer">
+            <div
+              className="modalheader"
+              style={{ padding: "0 13px", marginTop: "5px" }}
+            >
+              <div className="modaltitle">
+                <div
+                  style={{
+                    display: "flex",
+                    flexDirection: "row",
+                    justifyContent: "space-between",
+                    background: "white",
+                    marginTop: "3px"
+                  }}
+                >
+                  <div
+                    style={{
+                      display: "flex",
+                      flexDirection: "row",
+                      justifyContent: "space-around",
+                      alignItems: "end",
+                      gap: 10
+                    }}
+                  >
+                    {isStamp ? (
+                      <span style={{ color: themeColor }} className="signTab">
+                        {widgetType === "image"
+                          ? "Upload image"
+                          : "Upload stamp image"}
+                      </span>
+                    ) : (
+                      <>
+                        <div>
+                          <span
+                            onClick={() => {
+                              setIsDefaultSign(false);
+                              setIsImageSelect(false);
+                              setIsTab("draw");
+                              setImage();
+                            }}
+                            style={{
+                              color: isTab === "draw" ? themeColor : "#515252",
+                              marginLeft: "2px"
+                            }}
+                            className="signTab"
+                          >
+                            Draw
+                          </span>
+
+                          <div
+                            style={{
+                              border:
+                                isTab === "draw"
+                                  ? "1.5px solid #108783"
+                                  : "1.5px solid #ffffff"
+                            }}
+                          ></div>
+                        </div>
+                        <div>
+                          <span
+                            onClick={() => {
+                              setIsDefaultSign(false);
+                              setIsImageSelect(true);
+                              setIsTab("uploadImage");
+                            }}
+                            style={{
+                              color:
+                                isTab === "uploadImage" ? themeColor : "#515252"
+                            }}
+                            className="signTab"
+                          >
+                            Upload Image
+                          </span>
+                          <div
+                            style={{
+                              border:
+                                isTab === "uploadImage"
+                                  ? "1.5px solid #108783"
+                                  : "1.5px solid #ffffff"
+                            }}
+                          ></div>
+                        </div>
+                        <div>
+                          <span
+                            onClick={() => {
+                              setIsDefaultSign(false);
+                              setIsImageSelect(false);
+                              setIsTab("type");
+                              setImage();
+                            }}
+                            style={{
+                              color: isTab === "type" ? themeColor : "#515252",
+                              marginLeft: "2px"
+                            }}
+                            className="signTab"
+                          >
+                            Type
+                          </span>
+
+                          <div
+                            style={{
+                              border:
+                                isTab === "type"
+                                  ? "1.5px solid #108783"
+                                  : "1.5px solid #ffffff"
+                            }}
+                          ></div>
+                        </div>
+                        {!isInitial && defaultSign ? (
+                          <div>
+                            <span
+                              onClick={() => {
+                                setIsDefaultSign(true);
+                                setIsImageSelect(true);
+                                setIsTab("mysignature");
+                                setImage();
+                              }}
+                              style={{
+                                color:
+                                  isTab === "mysignature"
+                                    ? themeColor
+                                    : "#515252"
+                              }}
+                              className="signTab"
+                            >
+                              My Signature
+                            </span>
+                            <div
+                              style={{
+                                border:
+                                  isTab === "mysignature"
+                                    ? "1.5px solid #108783"
+                                    : "1.5px solid #ffffff"
+                              }}
+                            ></div>
+                          </div>
+                        ) : (
+                          isInitial &&
+                          myInitial && (
+                            <div>
+                              <span
+                                onClick={() => {
+                                  setIsDefaultSign(true);
+                                  setIsImageSelect(true);
+                                  setIsTab("mysignature");
+                                  setImage();
+                                }}
+                                style={{
+                                  color:
+                                    isTab === "mysignature"
+                                      ? themeColor
+                                      : "#515252"
+                                }}
+                                className="signTab"
+                              >
+                                My Initials
+                              </span>
+                              <div
+                                style={{
+                                  border:
+                                    isTab === "mysignature"
+                                      ? "1.5px solid #108783"
+                                      : "1.5px solid #ffffff"
+                                }}
+                              ></div>
+                            </div>
+                          )
+                        )}
+                      </>
+                    )}
+                  </div>
+                </div>
+              </div>
+              <div
+                className="closebtn"
+                style={{ color: "black" }}
+                onClick={() => {
+                  setPenColor("blue");
+                  setIsSignPad(false);
+                  setIsInitial(false);
+                  setIsImageSelect(false);
+                  setIsDefaultSign(false);
+                  setImage();
+                  setIsTab("draw");
+                  setSignValue("");
+                  setIsStamp(false);
+                }}
+              >
+                &times;
+              </div>
+            </div>
+            <div style={{ height: "100%", padding: 20 }}>
+              {isDefaultSign ? (
+                <>
+                  <div style={{ display: "flex", justifyContent: "center" }}>
+                    <div
+                      style={{
+                        border: "1.3px solid #007bff",
+                        borderRadius: "2px",
+                        display: "flex",
+                        flexDirection: "column",
+                        justifyContent: "center",
+                        alignItems: "center",
+                        marginBottom: 6,
+                        cursor: "pointer"
+                      }}
+                      className={
+                        isInitial ? "intialSignatureCanvas" : "signatureCanvas"
+                      }
+                    >
+                      <img
+                        alt="stamp img"
+                        style={{
+                          width: "100%",
+                          height: "100%",
+                          background: "rgb(255, 255, 255)",
+                          objectFit: "contain"
+                        }}
+                        src={isInitial ? myInitial : defaultSign}
+                      />
+                    </div>
+                  </div>
+                  <div style={{ display: "flex", justifyContent: "flex-end" }}>
+                    <SaveBtn />
+                  </div>
+                </>
+              ) : isImageSelect || isStamp ? (
+                !image ? (
+                  <div style={{ display: "flex", justifyContent: "center" }}>
+                    <div
+                      style={{
+                        border: "1.3px solid #007bff",
+                        borderRadius: "2px",
+
+                        display: "flex",
+                        flexDirection: "column",
+                        justifyContent: "center",
+                        alignItems: "center",
+                        marginBottom: 6,
+                        cursor: "pointer"
+                      }}
+                      className={
+                        isInitial ? "intialSignatureCanvas" : "signatureCanvas"
+                      }
+                      onClick={() => imageRef.current.click()}
+                    >
+                      <input
+                        type="file"
+                        onChange={onImageChange}
+                        className="filetype"
+                        accept="image/*"
+                        ref={imageRef}
+                        hidden
+                      />
+                      <i className="fas fa-cloud-upload-alt uploadImgLogo"></i>
+                      <div className="uploadImg">Upload</div>
+                    </div>
+                  </div>
+                ) : (
+                  <>
+                    <div style={{ display: "flex", justifyContent: "center" }}>
+                      <div
+                        style={{
+                          border: "1.3px solid #007bff",
+                          borderRadius: "2px",
+                          marginBottom: 6,
+                          overflow: "hidden"
+                        }}
+                        className={
+                          isInitial
+                            ? "intialSignatureCanvas"
+                            : "signatureCanvas"
+                        }
+                      >
+                        <img
+                          alt="print img"
+                          ref={imageRef}
+                          src={image.src}
+                          style={{
+                            objectFit: "contain",
+                            height: "100%",
+                            width: "100%"
+                          }}
+                        />
+                      </div>
+                    </div>
+                    <div
+                      style={{ display: "flex", justifyContent: "flex-end" }}
+                    >
+                      <SaveBtn />
+                    </div>
+                  </>
+                )
+              ) : isTab === "type" ? (
+                <div>
+                  <div
+                    style={{
+                      display: "flex",
+                      justifyContent: "space-between",
+                      alignItems: "center"
+                    }}
+                  >
+                    <span className="signatureText">
+                      {isInitial ? "Initials" : "Signature"}:
+                    </span>
+
+                    <input
+                      maxLength={isInitial ? 3 : 30}
+                      style={{ fontFamily: fontSelect }}
+                      type="text"
+                      className="signatureInput"
+                      placeholder="Your signature"
+                      value={signValue}
+                      onChange={(e) => {
+                        setSignValue(e.target.value);
+                        convertToImg(fontSelect, e.target.value);
+                      }}
+                    />
+                  </div>
+
+                  <div className="fontOptionContainer">
+                    {fontOptions.map((font, ind) => {
+                      return (
+                        <div
+                          key={ind}
+                          style={{
+                            cursor: "pointer",
+                            fontFamily: font.value,
+                            backgroundColor:
+                              fontSelect === font.value && "rgb(206 225 247)"
+                          }}
+                          onClick={() => {
+                            setFontSelect(font.value);
+                            convertToImg(font.value, signValue);
+                          }}
+                        >
+                          <div
+                            style={{
+                              padding: "5px 10px 5px 10px",
+                              fontSize: "20px"
+                            }}
+                          >
+                            {signValue ? signValue : "Your signature"}
+                          </div>
+                        </div>
+                      );
+                    })}
+                  </div>
+
+                  <div style={{ display: "flex", justifyContent: "flex-end" }}>
+                    <SaveBtn />
+                  </div>
+                </div>
+              ) : (
+                <>
+                  <div style={{ display: "flex", justifyContent: "center" }}>
+                    <SignatureCanvas
+                      ref={canvasRef}
+                      penColor={penColor}
+                      canvasProps={{
+                        className: isInitial
+                          ? "intialSignatureCanvas"
+                          : "signatureCanvas",
+                        style: {
+                          border: "1.6px solid #007bff",
+                          borderRadius: "2px"
+                        }
+                      }}
+                      backgroundColor="rgb(255, 255, 255)"
+                      onEnd={() =>
+                        handleSignatureChange(canvasRef.current.toDataURL())
+                      }
+                      dotSize={1}
+                    />
+                  </div>
+                  <div
+                    style={{
+                      display: "flex",
+                      flexDirection: "row",
+                      justifyContent: "space-between",
+                      marginTop: "10px"
+                    }}
+                  >
+                    <div style={{ display: "flex", flexDirection: "row" }}>
+                      {allColor.map((data, key) => {
+                        return (
+                          <i
+                            style={{
+                              margin: "5px",
+                              color: data,
+                              borderBottom:
+                                key === 0 && penColor === "blue"
+                                  ? "2px solid blue"
+                                  : key === 1 && penColor === "red"
+                                    ? "2px solid red"
+                                    : key === 2 && penColor === "black"
+                                      ? "2px solid black"
+                                      : "2px solid white"
+                            }}
+                            onClick={() => {
+                              if (key === 0) {
+                                setPenColor("blue");
+                              } else if (key === 1) {
+                                setPenColor("red");
+                              } else if (key === 2) {
+                                setPenColor("black");
+                              }
+                            }}
+                            key={key}
+                            className="fa solid fa-pen-nib"
+                            width={20}
+                            height={20}
+                          ></i>
+                        );
+                      })}
+                    </div>
+                    <SaveBtn />
+                  </div>
+                </>
+              )}
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
+
+export default SignPad;
@@ -0,0 +1,64 @@
+import React from "react";
+import { themeColor } from "../../constant/const";
+import "../../styles/signature.css";
+function Signedby({ pdfDetails }) {
+  const getFirstLetter = (name) => {
+    const firstLetter = name.charAt(0);
+    return firstLetter;
+  };
+
+  return (
+    <div className="signerComponent">
+      <div
+        style={{
+          background: themeColor,
+          color: "white"
+        }}
+        className="signedStyle"
+      >
+        Signed By
+      </div>
+      <div style={{ marginTop: "2px", background: "white" }}>
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "row",
+            padding: "10px",
+            background: "#93a3db"
+          }}
+        >
+          <div
+            className="signerStyle"
+            style={{
+              background: "#abd1d0",
+              width: 20,
+              height: 20,
+              display: "flex",
+              borderRadius: 30 / 2,
+              justifyContent: "center",
+              alignItems: "center",
+              marginRight: "20px",
+              marginTop: "5px"
+            }}
+          >
+            <span
+              style={{
+                fontSize: "8px",
+                textAlign: "center",
+                fontWeight: "bold"
+              }}
+            >
+              {getFirstLetter(pdfDetails.ExtUserPtr.Name)}
+            </span>
+          </div>
+          <div style={{ display: "flex", flexDirection: "column" }}>
+            <span className="userName">{pdfDetails.ExtUserPtr.Name}</span>
+            <span className="useEmail">{pdfDetails.ExtUserPtr.Email}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default Signedby;
@@ -0,0 +1,35 @@
+import React from "react";
+import { themeColor } from "../../constant/const";
+import RecipientList from "./RecipientList";
+
+function SignerListPlace(props) {
+  return (
+    <div>
+      <div
+        style={{
+          background: themeColor,
+          padding: "5px"
+        }}
+      >
+        <span className="signedStyle">
+          {props.title ? props.title : "Recipients"}
+        </span>
+      </div>
+      <div className="signerList">
+        <RecipientList {...props} />
+      </div>
+      {props.handleAddSigner && (
+        <div
+          data-tut="reactourAddbtn"
+          className="p-[10px] my-[2px] flex flex-row items-center justify-center border-[1px] border-[#47a3ad] hover:bg-[#47a3ad] text-[#47a3ad]  hover:text-white cursor-pointer"
+          onClick={() => props.handleAddSigner()}
+        >
+          <i className="fa-solid fa-plus"></i>
+          <span style={{ marginLeft: 2 }}>Add role</span>
+        </div>
+      )}
+    </div>
+  );
+}
+
+export default SignerListPlace;
@@ -0,0 +1,421 @@
+import React, { useState, useRef, useEffect } from "react";
+import ModalUi from "../../primitives/ModalUi";
+import RecipientList from "./RecipientList";
+import { useDrag } from "react-dnd";
+import WidgetList from "./WidgetList";
+import {
+  radioButtonWidget,
+  textInputWidget,
+  textWidget,
+  widgets
+} from "../../constant/Utils";
+import { themeColor } from "../../constant/const";
+function WidgetComponent({
+  dragSignature,
+  signRef,
+  handleDivClick,
+  handleMouseLeave,
+  dragStamp,
+  isSignYourself,
+  addPositionOfSignature,
+  signersdata,
+  isSelectListId,
+  setSignerObjId,
+  setIsSelectId,
+  setContractName,
+  isSigners,
+  dataTut,
+  isMailSend,
+  handleAddSigner,
+  setUniqueId,
+  setRoleName,
+  handleDeleteUser,
+  signerPos,
+  handleRoleChange,
+  handleOnBlur,
+  title,
+
+  isTemplateFlow
+}) {
+  const [isSignersModal, setIsSignersModal] = useState(false);
+
+  const [, dropdown] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 5,
+      text: "dropdown"
+    },
+
+    collect: (monitor) => ({
+      isDragDropdown: !!monitor.isDragging()
+    })
+  });
+  const [, checkbox] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 6,
+      text: "checkbox"
+    },
+
+    collect: (monitor) => ({
+      isDragCheck: !!monitor.isDragging()
+    })
+  });
+  const [, textInput] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 7,
+      text: textInputWidget
+    },
+    collect: (monitor) => ({
+      isDragTextInput: !!monitor.isDragging()
+    })
+  });
+  const [, initials] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 8,
+      text: "initials"
+    },
+
+    collect: (monitor) => ({
+      isDragInitial: !!monitor.isDragging()
+    })
+  });
+  const [, name] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 9,
+      text: "name"
+    },
+
+    collect: (monitor) => ({
+      isDragName: !!monitor.isDragging()
+    })
+  });
+  const [, company] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 10,
+      text: "company"
+    },
+
+    collect: (monitor) => ({
+      isDragCompany: !!monitor.isDragging()
+    })
+  });
+  const [, jobTitle] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 11,
+      text: "job title"
+    },
+
+    collect: (monitor) => ({
+      isDragJobtitle: !!monitor.isDragging()
+    })
+  });
+  const [, date] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 12,
+      text: "date"
+    },
+
+    collect: (monitor) => ({
+      isDragDate: !!monitor.isDragging()
+    })
+  });
+  const [, image] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 13,
+      text: "image"
+    },
+
+    collect: (monitor) => ({
+      isDragImage: !!monitor.isDragging()
+    })
+  });
+  const [, email] = useDrag({
+    type: "BOX",
+    item: {
+      type: "BOX",
+      id: 14,
+      text: "email"
+    },
+    collect: (monitor) => ({
+      isDragEmail: !!monitor.isDragging()
+    })
+  });
+  const [, radioButton] = useDrag({
+    type: "BOX",
+
+    item: {
+      type: "BOX",
+      id: 15,
+      text: radioButtonWidget
+    },
+    collect: (monitor) => ({
+      isDragRadiotton: !!monitor.isDragging()
+    })
+  });
+  const [, text] = useDrag({
+    type: "BOX",
+
+    item: {
+      type: "BOX",
+      id: 16,
+      text: textWidget
+    },
+    collect: (monitor) => ({
+      isDragText: !!monitor.isDragging()
+    })
+  });
+  const isMobile = window.innerWidth < 767;
+  const scrollContainerRef = useRef(null);
+  const [widget, setWidget] = useState([]);
+
+  const color = [
+    "#93a3db",
+    "#e6c3db",
+    "#c0e3bc",
+    "#bce3db",
+    "#b8ccdb",
+    "#ceb8db",
+    "#ffccff",
+    "#99ffcc",
+    "#cc99ff",
+    "#ffcc99",
+    "#66ccff",
+    "#ffffcc"
+  ];
+  const handleModal = () => {
+    setIsSignersModal(!isSignersModal);
+  };
+
+  useEffect(() => {
+    const widgetRef = [
+      dragSignature,
+      dragStamp,
+      initials,
+      name,
+      jobTitle,
+      company,
+      date,
+      text,
+      textInput,
+      checkbox,
+      dropdown,
+      radioButton,
+      image,
+      email
+    ];
+    const getWidgetArray = widgets;
+    const newUpdateSigner = getWidgetArray.map((obj, ind) => {
+      return { ...obj, ref: widgetRef[ind] };
+    });
+
+    setWidget(newUpdateSigner);
+    // eslint-disable-next-line
+  }, []);
+
+  const filterWidgets = widget.filter(
+    (data) =>
+      data.type !== "dropdown" &&
+      data.type !== radioButtonWidget &&
+      data.type !== textWidget
+  );
+  const textWidgetData = widget.filter((data) => data.type !== textWidget);
+  const updateWidgets = isSignYourself
+    ? filterWidgets
+    : isTemplateFlow
+    ? textWidgetData
+    : widget;
+
+  return (
+    <>
+      {isMobile ? (
+        !isMailSend && (
+          <div
+            data-tut={dataTut}
+            id="navbar"
+            className="stickyfooter"
+            style={{ width: window.innerWidth + "px" }}
+          >
+            {isSigners && (
+              <div
+                data-tut={dataTut}
+                style={{
+                  background: isSelectListId
+                    ? color[isSelectListId % color.length]
+                    : color[0],
+                  padding: "10px 20px",
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center"
+                }}
+                onClick={() => handleModal()}
+              >
+                <span
+                  style={{
+                    fontSize: "13px",
+                    fontWeight: "700",
+                    textAlign: "center"
+                  }}
+                >
+                  {title ? title : "Recipient"}
+                </span>
+                <span
+                  style={{
+                    fontSize: "13px",
+                    fontWeight: "700",
+                    display: "flex",
+                    alignItems: "center"
+                  }}
+                >
+                  {signersdata[isSelectListId]?.Role && (
+                    <div>
+                      {signersdata[isSelectListId]?.Name ? (
+                        <>
+                          :{" "}
+                          {signersdata[isSelectListId]?.Name?.length > 12
+                            ? `${signersdata[isSelectListId].Name.slice(
+                                0,
+                                12
+                              )}...`
+                            : signersdata[isSelectListId]?.Name}
+                        </>
+                      ) : (
+                        <>
+                          :{" "}
+                          {signersdata[isSelectListId]?.Role?.length > 12
+                            ? `${signersdata[isSelectListId].Role.slice(
+                                0,
+                                12
+                              )}...`
+                            : signersdata[isSelectListId]?.Role}
+                        </>
+                      )}
+                    </div>
+                  )}
+                  <div style={{ marginLeft: 6, fontSize: 16 }}>
+                    <i className="fa-solid fa-angle-down"></i>
+                  </div>
+                </span>
+              </div>
+            )}
+            {handleAddSigner && (
+              <div
+                data-tut="reactourAddbtn"
+                style={{
+                  margin: "5px 0 5px 0",
+                  backgroundColor: themeColor,
+                  color: "white"
+                }}
+                className="p-[10px] my-[2px] flex flex-row items-center justify-center border-[1px] border-[#47a3ad] hover:bg-[#47a3ad] text-[#47a3ad] hover:text-white cursor-pointer"
+                onClick={() => handleAddSigner()}
+              >
+                <i className="fa-solid fa-plus"></i>
+                <span style={{ marginLeft: 2 }}>Add role</span>
+              </div>
+            )}
+
+            <div
+              ref={scrollContainerRef}
+              style={{
+                background: "white",
+                borderTop: `2px solid ${themeColor}`
+              }}
+            >
+              <div
+                style={{
+                  display: "flex",
+                  overflowX: "scroll",
+                  whiteSpace: "nowrap",
+                  padding: "10px 5px 10px 1px"
+                }}
+              >
+                <WidgetList
+                  updateWidgets={updateWidgets}
+                  handleDivClick={handleDivClick}
+                  handleMouseLeave={handleMouseLeave}
+                  signRef={signRef}
+                  marginLeft={5}
+                  addPositionOfSignature={addPositionOfSignature}
+                  isMobile={isMobile}
+                />
+              </div>
+            </div>
+          </div>
+        )
+      ) : (
+        <div data-tut={dataTut} className="signerComponent">
+          <div
+            style={{
+              background: themeColor,
+              padding: "5px"
+            }}
+          >
+            <span className="signedStyle">Fields</span>
+          </div>
+
+          <div className="signLayoutContainer1">
+            <WidgetList
+              updateWidgets={updateWidgets}
+              handleDivClick={handleDivClick}
+              handleMouseLeave={handleMouseLeave}
+              signRef={signRef}
+            />
+          </div>
+        </div>
+      )}
+      {isSignersModal && (
+        <ModalUi
+          title={"Roles"}
+          isOpen={isSignersModal}
+          handleClose={handleModal}
+        >
+          {signersdata.length > 0 ? (
+            <RecipientList
+              signerPos={signerPos}
+              signersdata={signersdata}
+              isSelectListId={isSelectListId}
+              setSignerObjId={setSignerObjId}
+              setIsSelectId={setIsSelectId}
+              setContractName={setContractName}
+              setUniqueId={setUniqueId}
+              setRoleName={setRoleName}
+              handleDeleteUser={handleDeleteUser}
+              handleRoleChange={handleRoleChange}
+              handleOnBlur={handleOnBlur}
+              handleModal={handleModal}
+            />
+          ) : (
+            <div
+              style={{
+                padding: 20,
+                fontSize: 15,
+                fontWeight: "500",
+                textAlign: "center"
+              }}
+            >
+              Please add a role
+            </div>
+          )}
+        </ModalUi>
+      )}
+    </>
+  );
+}
+
+export default WidgetComponent;
@@ -0,0 +1,36 @@
+import React from "react";
+import { getWidgetType } from "../../constant/Utils";
+
+function WidgetList(props) {
+  return props.updateWidgets.map((item, ind) => {
+    return (
+      <div key={ind} style={{ marginBottom: "5px" }}>
+        <div
+          className="widgets"
+          onClick={() => {
+            props.addPositionOfSignature &&
+              props.addPositionOfSignature("onclick", item);
+          }}
+          ref={(element) => {
+            if (!props.isMobile) {
+              item.ref(element);
+              if (element) {
+                if (props?.signRef) {
+                  props.signRef.current = element;
+                }
+              }
+            }
+          }}
+          onMouseMove={props?.handleDivClick}
+          onMouseDown={() => {
+            props?.handleMouseLeave();
+          }}
+        >
+          {item.ref && getWidgetType(item, props?.marginLeft)}
+        </div>
+      </div>
+    );
+  });
+}
+
+export default WidgetList;
@@ -0,0 +1,273 @@
+import React, { useEffect, useState } from "react";
+import ModalUi from "../../primitives/ModalUi";
+import "../../styles/AddUser.css";
+import RegexParser from "regex-parser";
+import { textInputWidget } from "../../constant/Utils";
+
+const WidgetNameModal = (props) => {
+  const [formdata, setFormdata] = useState({
+    name: "",
+    defaultValue: "",
+    status: "required",
+    hint: "",
+    textvalidate: "text"
+  });
+  const [isValid, setIsValid] = useState(true);
+  const statusArr = ["Required", "Optional"];
+  const inputOpt = ["email", "number"];
+
+  useEffect(() => {
+    if (props.defaultdata) {
+      setFormdata({
+        name: props.defaultdata?.options?.name || props?.widgetName || "",
+        defaultValue: props.defaultdata?.options?.defaultValue || "",
+        status: props.defaultdata?.options?.status || "required",
+        hint: props.defaultdata?.options?.hint || "",
+        textvalidate:
+          props.defaultdata?.options?.validation?.type === "regex"
+            ? props.defaultdata?.options?.validation?.pattern
+            : props.defaultdata?.options?.validation?.type || ""
+      });
+    } else {
+      setFormdata({
+        ...formdata,
+        name: props.defaultdata?.options?.name || props?.widgetName || ""
+      });
+    }
+    // eslint-disable-next-line
+  }, [props.defaultdata, props.widgetName]);
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    if (props.handleData) {
+      props.handleData(formdata);
+      setFormdata({
+        name: "",
+        defaultValue: "",
+        status: "required",
+        hint: "",
+        textvalidate: "text"
+      });
+    }
+  };
+  const handleChange = (e) => {
+    setFormdata({ ...formdata, [e.target.name]: e.target.value });
+  };
+
+  const handledefaultChange = (e) => {
+    if (formdata.textvalidate) {
+      const regexObject = RegexParser(handleValidation(formdata.textvalidate));
+      const isValidate = regexObject?.test(e.target.value);
+      setIsValid(isValidate);
+    } else {
+      setIsValid(true);
+    }
+    setFormdata({ ...formdata, [e.target.name]: e.target.value });
+  };
+
+  function handleValidation(type) {
+    switch (type) {
+      case "email":
+        return "/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,}$/";
+      case "number":
+        return "/^\\d+$/";
+      case textInputWidget:
+        return "/^[a-zA-Zs]+$/";
+      default:
+        return type;
+    }
+  }
+
+  function handleBlurRegex() {
+    if (!formdata.textvalidate) {
+      setFormdata({ ...formdata, textvalidate: "text" });
+    } else {
+      if (formdata.defaultValue) {
+        const regexObject = RegexParser(
+          handleValidation(formdata.textvalidate)
+        );
+        const isValidate = regexObject?.test(formdata.defaultValue);
+        if (isValidate === false) {
+          setFormdata({ ...formdata, defaultValue: "" });
+        }
+      }
+    }
+  }
+  return (
+    <ModalUi
+      isOpen={props.isOpen}
+      handleClose={props.handleClose && props.handleClose}
+      title={"Widget info"}
+    >
+      <form onSubmit={handleSubmit} style={{ padding: 20 }}>
+        <div className="form-section">
+          <label htmlFor="name" style={{ fontSize: 13 }}>
+            Name
+            <span style={{ color: "red", fontSize: 13 }}> *</span>
+          </label>
+          <input
+            className="addUserInput"
+            name="name"
+            value={formdata.name}
+            onChange={(e) => handleChange(e)}
+            required
+          />
+        </div>
+        {(props.defaultdata?.type === textInputWidget ||
+          props.widgetName === textInputWidget) && (
+          <>
+            <div className="form-section">
+              <label htmlFor="textvalidate" style={{ fontSize: 13 }}>
+                Validation
+              </label>
+              <div
+                style={{
+                  display: "flex",
+                  flexDirection: "row",
+                  gap: 10,
+                  marginBottom: "0.5rem"
+                }}
+              >
+                <div style={{ width: "100%", position: "relative" }}>
+                  <input
+                    className="relative z-20 w-[87%] md:w-[92%] p-2.5 border-[1px] border-[#d1d5db] rounded-l-md outline-none text-xs"
+                    name="textvalidate"
+                    placeholder="Enter custom expression"
+                    value={formdata.textvalidate}
+                    onChange={(e) => handleChange(e)}
+                    // onBlur={() => handleBlurRegex()}
+                  />
+                  <select
+                    className="validationlist addUserInput"
+                    name="textvalidate"
+                    value={formdata.textvalidate}
+                    onChange={(e) => handleChange(e)}
+                    onBlur={() => handleBlurRegex()}
+                  >
+                    <option disabled style={{ fontSize: "13px" }}>
+                      Select...
+                    </option>
+                    {inputOpt.map((data, ind) => {
+                      return (
+                        <option
+                          style={{ fontSize: "13px" }}
+                          key={ind}
+                          value={data}
+                        >
+                          {data}
+                        </option>
+                      );
+                    })}
+                  </select>
+                </div>
+              </div>
+            </div>
+            <div className="form-section">
+              <label htmlFor="name" style={{ fontSize: 13 }}>
+                Default value
+              </label>
+              <input
+                className="addUserInput"
+                name="defaultValue"
+                value={formdata.defaultValue}
+                onChange={(e) => handledefaultChange(e)}
+                onBlur={() =>
+                  isValid === false &&
+                  setFormdata({ ...formdata, defaultValue: "" })
+                }
+              />
+              {isValid === false ? (
+                <p style={{ color: "Red", fontSize: 8 }}>
+                  invalid default value
+                </p>
+              ) : (
+                <p
+                  style={{
+                    color: "transparent",
+                    fontSize: 10,
+                    margin: "3px 8px"
+                  }}
+                >
+                  .
+                </p>
+              )}
+            </div>
+          </>
+        )}
+        <div className="form-section">
+          <div
+            style={{
+              display: "flex",
+              flexDirection: "row",
+              gap: 10,
+              marginBottom: "0.5rem"
+            }}
+          >
+            {statusArr.map((data, ind) => {
+              return (
+                <div
+                  key={ind}
+                  style={{
+                    display: "flex",
+                    flexDirection: "row",
+                    gap: 5,
+                    alignItems: "center"
+                  }}
+                >
+                  <input
+                    style={{ accentColor: "red", marginRight: "10px" }}
+                    type="radio"
+                    name="status"
+                    onChange={() =>
+                      setFormdata({ ...formdata, status: data.toLowerCase() })
+                    }
+                    checked={
+                      formdata.status.toLowerCase() === data.toLowerCase()
+                    }
+                  />
+                  <div style={{ fontSize: "13px", fontWeight: "500" }}>
+                    {data}
+                  </div>
+                </div>
+              );
+            })}
+          </div>
+        </div>
+        {(props.defaultdata?.type === textInputWidget ||
+          props?.widgetName === textInputWidget) && (
+          <div className="form-section">
+            <label htmlFor="hint" style={{ fontSize: 13 }}>
+              Hint
+            </label>
+            <input
+              className="addUserInput"
+              name="hint"
+              value={formdata.hint}
+              onChange={(e) => handleChange(e)}
+            />
+          </div>
+        )}
+        <div
+          style={{
+            height: 1,
+            backgroundColor: "#b7b3b3",
+            width: "100%",
+            marginBottom: "16px"
+          }}
+        ></div>
+        <button
+          style={{
+            color: "white",
+            padding: "5px 20px",
+            backgroundColor: "#32a3ac"
+          }}
+          type="submit"
+          className="finishBtn"
+        >
+          Save
+        </button>
+      </form>
+    </ModalUi>
+  );
+};
+
+export default WidgetNameModal;
@@ -0,0 +1,163 @@
+import React, { useEffect, useState } from "react";
+import Parse from "parse";
+import Alert from "../../../primitives/Alert";
+
+const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
+  const folderPtr = {
+    __type: "Pointer",
+    className: folderCls,
+    objectId: parentFolderId
+  };
+  const [name, setName] = useState("");
+  const [folderList, setFolderList] = useState([]);
+  const [isAlert, setIsAlert] = useState(false);
+  const [isLoader, setIsLoader] = useState(false);
+  const [selectedParent, setSelectedParent] = useState();
+  const [alert, setAlert] = useState({ type: "info", message: "" });
+  useEffect(() => {
+    fetchFolder();
+    // eslint-disable-next-line
+  }, []);
+
+  const fetchFolder = async () => {
+    try {
+      const FolderQuery = new Parse.Query(folderCls);
+      if (parentFolderId) {
+        FolderQuery.equalTo("Folder", folderPtr);
+        FolderQuery.equalTo("Type", "Folder");
+      } else {
+        FolderQuery.doesNotExist("Folder");
+        FolderQuery.equalTo("Type", "Folder");
+      }
+
+      const res = await FolderQuery.find();
+      if (res) {
+        const result = JSON.parse(JSON.stringify(res));
+        if (result) {
+          setFolderList(result);
+        }
+      }
+    } catch (error) {
+      console.log("Err ", error);
+    }
+  };
+  const handleCreateFolder = async (event) => {
+    event.preventDefault();
+    handleLoader(true);
+    if (name) {
+      const currentUser = Parse.User.current();
+      const exsitQuery = new Parse.Query(folderCls);
+      exsitQuery.equalTo("Name", name);
+      exsitQuery.equalTo("Type", "Folder");
+      if (parentFolderId) {
+        exsitQuery.equalTo("Folder", folderPtr);
+      }
+      const templExist = await exsitQuery.first();
+      if (templExist) {
+        setAlert({ type: "danger", message: "Folder already exist!" });
+        setIsAlert(true);
+        setTimeout(() => {
+          setIsAlert(false);
+        }, 1000);
+      } else {
+        const template = new Parse.Object(folderCls);
+        template.set("Name", name);
+        template.set("Type", "Folder");
+
+        if (selectedParent) {
+          template.set("Folder", {
+            __type: "Pointer",
+            className: folderCls,
+            objectId: selectedParent
+          });
+        } else if (parentFolderId) {
+          template.set("Folder", folderPtr);
+        }
+        template.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
+        const res = await template.save();
+        if (res) {
+          handleLoader(false);
+          setAlert({
+            type: "success",
+            message: "Folder created successfully!"
+          });
+          setIsAlert(true);
+          setTimeout(() => {
+            setIsAlert(false);
+          }, 1000);
+          if (onSuccess) {
+            onSuccess(res);
+          }
+        }
+      }
+    } else {
+      handleLoader(false);
+      setAlert({ type: "info", message: "Please fill folder name" });
+      setIsAlert(true);
+      setTimeout(() => {
+        setIsAlert(false);
+      }, 1000);
+    }
+  };
+  const handleOptions = (e) => {
+    setSelectedParent(e.target.value);
+  };
+  const handleLoader = (status) => {
+    setIsLoader(status);
+  };
+  return (
+    <div>
+      {isAlert && <Alert type={alert.type}>{alert.message}</Alert>}
+      <div id="createFolder" className="relative">
+        {isLoader && (
+          <div className="absolute h-full w-full flex justify-center items-center ">
+            <div
+              style={{ fontSize: "45px", color: "#3dd3e0" }}
+              className="loader-37"
+            ></div>
+          </div>
+        )}
+        <h1 className="text-base font-semibold">Create Folder</h1>
+        <div className="text-xs mt-2">
+          <label className="block">
+            Name<span className="text-red-500 text-[13px]">*</span>
+          </label>
+          <input
+            className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+            value={name}
+            onChange={(e) => setName(e.target.value)}
+            required
+          />
+        </div>
+        <div className="text-xs mt-2">
+          <label className="block">Parent Folder</label>
+          <select
+            value={selectedParent}
+            onChange={handleOptions}
+            className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+          >
+            <option>select</option>
+            {folderList.length > 0 &&
+              folderList.map((x) => (
+                <option key={x.objectId} value={x.objectId}>
+                  {x.Name}
+                </option>
+              ))}
+          </select>
+        </div>
+        <div>
+          <button
+            onClick={handleCreateFolder}
+            disabled={isLoader}
+            className="flex items-center rounded p-2 bg-[#32a3ac] text-white mt-3"
+          >
+            <i className="fa-solid fa-plus mr-1"></i>
+            <span>Create</span>
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default CreateFolder;
@@ -0,0 +1,63 @@
+import React, { useCallback, useMemo } from "react";
+import { useDropScript } from "../../../hook/useScript";
+
+const DROPBOX_APP_KEY = process.env.REACT_APP_DROPBOX_API_KEY; // App key
+const DROPBOX_SDK_URL = "https://www.dropbox.com/static/api/2/dropins.js";
+const DROPBOX_SCRIPT_ID = "dropboxjs";
+
+export default function DropboxChooser({ children, onSuccess, onCancel }) {
+  useDropScript(DROPBOX_SDK_URL, {
+    attrs: {
+      id: DROPBOX_SCRIPT_ID,
+      "data-app-key": DROPBOX_APP_KEY
+    }
+  });
+
+  const options = useMemo(
+    () => ({
+      // Required. Called when a user selects an item in the Chooser.
+      success: (files) => {
+        // console.log("success", files);
+        onSuccess && onSuccess(files);
+      },
+      // Optional. Called when the user closes the dialog without selecting a file
+      // and does not include any parameters.
+      cancel: () => {
+        console.log("cancel");
+        onCancel && onCancel();
+      },
+
+      // Optional. "preview" (default) is a preview link to the document for sharing,
+      // "direct" is an expiring link to download the contents of the file. For more
+      linkType: "direct", // or "preview"
+      multiselect: false, // 是否支持多选
+      extensions: [".pdf"],
+
+      // Optional. A value of false (default) limits selection to files,
+      // while true allows the user to select both folders and files.
+      // You cannot specify `linkType: "direct"` when using `folderselect: true`.
+      folderselect: false // or true
+    }),
+    [onSuccess, onCancel]
+  );
+
+  const handleChoose = useCallback(
+    (e) => {
+      e.preventDefault();
+      if (window.Dropbox) {
+        window.Dropbox.choose(options);
+      }
+    },
+    [options]
+  );
+
+  return (
+    <div onClick={handleChoose}>
+      {children || (
+        <button className="px-2 py-[2px] text-2xl rounded border-[1px] text-blue-400 border-gray-300 w-full">
+          <i className="fa-brands fa-dropbox"></i>
+        </button>
+      )}
+    </div>
+  );
+}
@@ -0,0 +1,296 @@
+import React, { useEffect, useState } from "react";
+import Parse from "parse";
+import CreateFolder from "./CreateFolder";
+import ModalUi from "../../../primitives/ModalUi";
+import Tooltip from "../../../primitives/Tooltip";
+
+const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
+  const [isOpen, SetIsOpen] = useState(false);
+  const [clickFolder, setClickFolder] = useState("");
+  const [selectFolder, setSelectedFolder] = useState({});
+  const [folderList, setFolderList] = useState([]);
+  const [tabList, setTabList] = useState([]);
+  const [isLoader, setIsLoader] = useState(false);
+  const [folderPath, setFolderPath] = useState("");
+  const [isAdd, setIsAdd] = useState(false);
+  useEffect(() => {
+    if (isOpen) {
+      setIsAdd(false);
+      setClickFolder({});
+      setFolderList([]);
+      setTabList([]);
+      fetchFolder();
+    }
+    // eslint-disable-next-line
+  }, [isOpen]);
+  // below useEffect is used to reset folder selection if user pass isReset = true from parent component
+  useEffect(() => {
+    if (isReset == true) {
+      handleReset();
+    }
+  }, [isReset]);
+  const handleReset = () => {
+    setFolderPath({});
+    setSelectedFolder("");
+    setClickFolder("");
+    setIsAdd(false);
+    setFolderList([]);
+    setTabList([]);
+  };
+  // `fetchFolder` is used to fetch of folder list created by user on basis of folderPtr or without folderPtr
+  const fetchFolder = async (folderPtr) => {
+    setIsLoader(true);
+    try {
+      const FolderQuery = new Parse.Query(folderCls);
+      if (folderPtr) {
+        FolderQuery.equalTo("Folder", folderPtr);
+        FolderQuery.equalTo("Type", "Folder");
+      } else {
+        FolderQuery.doesNotExist("Folder");
+        FolderQuery.equalTo("Type", "Folder");
+      }
+
+      const res = await FolderQuery.find();
+      if (res) {
+        const result = JSON.parse(JSON.stringify(res));
+        if (result) {
+          setFolderList(result);
+          setIsLoader(false);
+        }
+        setIsLoader(false);
+      }
+    } catch (error) {
+      setIsLoader(false);
+    }
+  };
+
+  // `handleSelect` is used to save pointer of folder selected by user and it's path in state
+  const handleSelect = (item) => {
+    setFolderList([]);
+    setClickFolder({ ObjectId: item.objectId, Name: item.Name });
+    if (tabList.length > 0) {
+      const tab = tabList.some((x) => x.objectId === item.objectId);
+      if (!tab) {
+        setTabList((tabs) => [...tabs, item]);
+        const folderPtr = {
+          __type: "Pointer",
+          className: folderCls,
+          objectId: item.objectId
+        };
+        fetchFolder(folderPtr);
+      }
+    } else {
+      setTabList((tabs) => [...tabs, item]);
+      const folderPtr = {
+        __type: "Pointer",
+        className: folderCls,
+        objectId: item.objectId
+      };
+
+      fetchFolder(folderPtr);
+    }
+  };
+
+  // `handleSubmit` is used to pass folderPtr to parent component
+  const handleSubmit = () => {
+    let url = "OpenSign™ Drive";
+    tabList.forEach((t) => {
+      url = url + " / " + t.Name;
+    });
+    setFolderPath(url);
+    setSelectedFolder(clickFolder);
+    if (onSuccess) {
+      onSuccess(clickFolder);
+    }
+    SetIsOpen(false);
+  };
+
+  // `handleCancel` is used to clear list of folder, close popup and folderUrl
+  const handleCancel = () => {
+    SetIsOpen(false);
+    setClickFolder({});
+    setFolderList([]);
+    setTabList([]);
+  };
+
+  // `handleCancel` is call when user click on folder name from path/tab in popup
+  const removeTabListItem = async (e, i) => {
+    e.preventDefault();
+    // setEditable(false);
+    if (!isAdd) {
+      setIsLoader(true);
+      let folderPtr;
+      if (i) {
+        setFolderList([]);
+        let list = tabList.filter((itm, j) => {
+          if (j <= i) {
+            return itm;
+          }
+        });
+        let _len = list.length - 1;
+        folderPtr = {
+          __type: "Pointer",
+          className: folderCls,
+          objectId: list[_len].objectId
+        };
+        setTabList(list);
+      } else {
+        setClickFolder({});
+        setSelectedFolder({});
+        setFolderList([]);
+        setTabList([]);
+      }
+      fetchFolder(folderPtr);
+    }
+  };
+  // `handleCreate` is used to open folder creation form in popup
+  const handleCreate = () => {
+    setIsAdd(!isAdd);
+  };
+  // `handleAddFolder` is call when user folder created successfully and it fetch folder list on the basis of folderPtr or without folderPtr
+  const handleAddFolder = () => {
+    setFolderList([]);
+    if (clickFolder && clickFolder.ObjectId) {
+      fetchFolder({
+        __type: "Pointer",
+        className: folderCls,
+        objectId: clickFolder.ObjectId
+      });
+    } else {
+      fetchFolder();
+    }
+    handleCreate();
+  };
+  return (
+    <div className="text-xs mt-2 ">
+      <div>
+        <label className="block">
+          Select Folder
+          {required && <span className="text-red-500 text-[13px]">*</span>}
+        </label>
+      </div>
+      <div className="relative rounded px-[20px] py-[20px] bg-white border border-gray-200 shadow flex max-w-sm gap-8 items-center">
+        <div>
+          <i
+            className="far fa-folder-open text-[40px] text-[#33bbff]"
+            style={{ fontSize: "40px" }}
+            aria-hidden="true"
+          ></i>
+        </div>
+        <div className="font-semibold ">
+          <div className="flex items-center gap-2">
+            <p>
+              {selectFolder && selectFolder.Name
+                ? selectFolder.Name
+                : "OpenSign™ Drive"}
+            </p>
+            <div className="text-black text-sm" onClick={() => SetIsOpen(true)}>
+              <i
+                className="fa fa-pencil"
+                title="Select Folder"
+                aria-hidden="true"
+              ></i>
+            </div>
+          </div>
+          <p className="text-[10px] text-gray-400">
+            {selectFolder && selectFolder.Name ? `(${folderPath})` : ""}
+          </p>
+        </div>
+        <div className="absolute top-1 right-1 cursor-pointer">
+          <Tooltip
+            message={
+              "If you do not select a folder, your signed document will be saved in the Main OpenSign drive folder."
+            }
+          />
+        </div>
+      </div>
+      <ModalUi
+        title={"Select Folder"}
+        isOpen={isOpen}
+        handleClose={handleCancel}
+      >
+        <div className="w-full min-w-[300px] md:min-w-[500px] max-w-[500px] px-3">
+          <div className="py-2 text-[#ac4848] text-[14px] font-[500]">
+            <span
+              className="cursor-pointer"
+              title="OpenSign™ Drive"
+              onClick={(e) => removeTabListItem(e)}
+            >
+              OpenSign™ Drive /{" "}
+            </span>
+            {tabList &&
+              tabList.map((tab, i) => (
+                <React.Fragment key={`${tab.objectId}-${i}`}>
+                  <span
+                    className="cursor-pointer"
+                    title={tab.Name}
+                    onClick={(e) => removeTabListItem(e, i)}
+                  >
+                    {tab.Name}
+                  </span>
+                  {" / "}
+                </React.Fragment>
+              ))}
+            <hr />
+          </div>
+          <div className="mt-2 mb-3">
+            <div className="max-h-[210px] overflow-auto">
+              {!isAdd &&
+                folderList.length > 0 &&
+                folderList.map((folder) => (
+                  <div
+                    key={folder.Name}
+                    className="border-[1px] border-[#8a8a8a] px-2 py-2 mb-2 cursor-pointer "
+                    onClick={() => handleSelect(folder)}
+                  >
+                    <div className="flex items-center gap-2">
+                      <i
+                        className="fa fa-folder text-[#33bbff] text-[1.4rem]"
+                        aria-hidden="true"
+                      ></i>
+                      <span className="font-semibold">{folder.Name}</span>
+                    </div>
+                  </div>
+                ))}
+            </div>
+            {isAdd && (
+              <CreateFolder
+                parentFolderId={clickFolder && clickFolder.ObjectId}
+                folderCls={folderCls}
+                onSuccess={handleAddFolder}
+              />
+            )}
+            {isLoader && (
+              <div className="flex justify-center">
+                <i className="fa-solid fa-spinner fa-spin-pulse text-[30px]"></i>
+              </div>
+            )}
+          </div>
+        </div>
+        <hr />
+        <div className="flex justify-between items-center py-[.75rem] px-[1.25rem]">
+          <div
+            className="text-[30px] cursor-pointer text-[#32a3ac]"
+            title="Save Here"
+            onClick={handleCreate}
+          >
+            {isAdd ? (
+              <i className="fa-solid fa-arrow-left" aria-hidden="true"></i>
+            ) : (
+              <i className="fa-solid fa-square-plus" aria-hidden="true"></i>
+            )}
+          </div>
+          <div
+            className="text-[30px] cursor-pointer"
+            title="Save Here"
+            onClick={handleSubmit}
+          >
+            <i className="fas fa-save" aria-hidden="true"></i>
+          </div>
+        </div>
+      </ModalUi>
+    </div>
+  );
+};
+
+export default SelectFolder;
@@ -0,0 +1,103 @@
+import React, { useState } from "react";
+import Parse from "parse";
+import "../../../styles/AddUser.css";
+import AsyncSelect from "react-select/async";
+
+const customStyles = {
+  control: (provided) => ({
+    ...provided,
+    fontSize: "13px" // Font size for the control
+  }),
+  option: (provided) => ({
+    ...provided,
+    fontSize: "13px" // Font size for the options
+  })
+};
+const SelectSigners = (props) => {
+  const [userList, setUserList] = useState([]);
+  const [selected, setSelected] = useState();
+  const [userData, setUserData] = useState({});
+  const [isError, setIsError] = useState(false);
+  // `handleOptions` is used to set just save from quick form to selected option in dropdown
+  const handleOptions = (item) => {
+    setSelected(item);
+    const userData = userList.find((x) => x.objectId === item.value);
+    if (userData) {
+      setUserData(userData);
+    }
+  };
+  const handleAdd = () => {
+    if (userData && userData.objectId) {
+      props.details(userData);
+      if (props.closePopup) {
+        props.closePopup();
+      }
+    } else {
+      setIsError(true);
+      setTimeout(() => setIsError(false), 1000);
+    }
+  };
+
+  const loadOptions = async (inputValue) => {
+    try {
+      const currentUser = Parse.User.current();
+      const contactbook = new Parse.Query("contracts_Contactbook");
+      contactbook.equalTo(
+        "CreatedBy",
+        Parse.User.createWithoutData(currentUser.id)
+      );
+      if (inputValue.length > 1) {
+        contactbook.matches("Name", new RegExp(inputValue, "i"));
+      }
+      contactbook.notEqualTo("IsDeleted", true);
+      const contactRes = await contactbook.find();
+      if (contactRes) {
+        const res = JSON.parse(JSON.stringify(contactRes));
+        // console.log("userList ", res);
+        setUserList(res);
+        return await res.map((item) => ({
+          label: item.Email,
+          value: item.objectId
+        }));
+      }
+    } catch (error) {
+      console.log("err", error);
+    }
+  };
+
+  return (
+    <div className="addusercontainer">
+      <div className="form-wrapper">
+        <div className="form-section" style={{ marginBottom: 0 }}>
+          <label style={{ fontSize: 14, fontWeight: "700" }}>Choose User</label>
+          <AsyncSelect
+            cacheOptions
+            defaultOptions
+            value={selected}
+            loadingMessage={() => "Loading..."}
+            noOptionsMessage={() => "User not Found"}
+            loadOptions={loadOptions}
+            onChange={handleOptions}
+            styles={customStyles}
+          />
+        </div>
+        {isError ? (
+          <p style={{ color: "red", fontSize: "12px", margin: "5px" }}>
+            Please select signer
+          </p>
+        ) : (
+          <p style={{ color: "transparent", fontSize: "12px", margin: "5px" }}>
+            .
+          </p>
+        )}
+        <div>
+          <button className="submitbutton" onClick={() => handleAdd()}>
+            Submit
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default SelectSigners;
@@ -0,0 +1,194 @@
+import React, { useState, useEffect } from "react";
+import Select from "react-select";
+import AddSigner from "../../AddSigner";
+import Modal from "react-modal";
+import Parse from "parse";
+function arrayMove(array, from, to) {
+  array = array.slice();
+  array.splice(to < 0 ? array.length + to : to, 0, array.splice(from, 1)[0]);
+  return array;
+}
+
+/**
+ * react-sortable-hoc is depcreated not usable from react 18.x.x
+ *  need to replace it with @dnd-kit
+ * code changes required
+ */
+
+const SignersInput = (props) => {
+  Modal.setAppElement("body");
+  const [state, setState] = useState(undefined);
+  // const [editFormData, setEditFormData] = useState([]);
+  const [selected, setSelected] = useState([]);
+  const [isModal, setIsModel] = useState(false);
+  const onChange = (selectedOptions) => setSelected(selectedOptions);
+  const [modalIsOpen, setModalIsOpen] = useState(false);
+
+  const onSortEnd = ({ oldIndex, newIndex }) => {
+    const newValue = arrayMove(selected, oldIndex, newIndex);
+    setSelected(newValue);
+  };
+
+  const GetSelectListData = async () => {
+    try {
+      const currentUser = Parse.User.current();
+      const contactbook = new Parse.Query("contracts_Contactbook");
+      contactbook.equalTo(
+        "CreatedBy",
+        Parse.User.createWithoutData(currentUser.id)
+      );
+      contactbook.notEqualTo("IsDeleted", true);
+      const contactRes = await contactbook.find();
+      if (contactRes) {
+        const res = JSON.parse(JSON.stringify(contactRes));
+        let list = [];
+
+        // let _selected = [];
+        res.forEach((x) => {
+          let obj = {
+            label: x.Name,
+            value: x.objectId,
+            isChecked: true
+          };
+
+          list.push(obj);
+        });
+        setState(list);
+      }
+    } catch (error) {
+      console.log("err", error);
+    }
+  };
+
+  useEffect(() => {
+    GetSelectListData();
+  }, []);
+  useEffect(() => {
+    if (props.isReset && props.isReset === true) {
+      setSelected([]);
+    }
+  }, [props.isReset]);
+
+  useEffect(() => {
+    if (selected && selected.length) {
+      let newData = [];
+      selected.forEach((x) => {
+        newData.push(x.value);
+      });
+      if (props.onChange) {
+        props.onChange(newData);
+      }
+    }
+
+    // eslint-disable-next-line
+  }, [selected]);
+
+  const handleModalCloseClick = () => {
+    setIsModel(false);
+    setModalIsOpen(false);
+  };
+
+  const openModal = () => {
+    setModalIsOpen(true);
+  };
+
+  // `handleNewDetails` is used to set just save from quick form to selected option in dropdown
+  const handleNewDetails = (data) => {
+    setState([...state, data]);
+    if (selected.length > 0) {
+      setSelected([...selected, data]);
+    } else {
+      setSelected([data]);
+    }
+  };
+
+  return (
+    <div className="text-xs mt-2 ">
+      <label className="block">
+        Signers
+        {props.required && <span className="text-red-500 text-[13px]">*</span>}
+      </label>
+      <div style={{ display: "flex", gap: 5 }}>
+        <div style={{ flexWrap: "wrap", width: "100%" }}>
+          <Select
+            onSortEnd={onSortEnd}
+            distance={4}
+            isMulti
+            options={state || []}
+            value={selected}
+            onChange={onChange}
+            closeMenuOnSelect={false}
+            required={props.required}
+          />
+        </div>
+        <div
+          onClick={() => {
+            setIsModel(true);
+            openModal();
+          }}
+          style={{
+            cursor: "pointer",
+            borderRadius: 4,
+            border: "1px solid #ccc",
+            minHeight: 38,
+            minWidth: 48,
+            display: "flex",
+            justifyContent: "center",
+            alignItems: "center"
+          }}
+        >
+          <i className="fas fa-plus"></i>
+        </div>
+        <Modal
+          isOpen={modalIsOpen}
+          onRequestClose={handleModalCloseClick}
+          shouldCloseOnOverlayClick={false}
+          id="modal1"
+          contentLabel="Modal"
+          style={{
+            content: {
+              top: "50%",
+              left: "50%",
+              right: "auto",
+              bottom: "auto",
+              transform: "translate(-50%, -50%)",
+              border: "1px transparent",
+              padding: 0
+            },
+            overlay: {
+              width: "100%",
+              backgroundColor: "rgba(0, 0, 0, 0.75)",
+              zIndex: 50
+            }
+          }}
+        >
+          <div className="min-w-full md:min-w-[500px]">
+            <div
+              className="flex justify-between rounded-t items-center py-[10px] px-[20px] text-white"
+              style={{ background: "#32a3ac" }}
+            >
+              <div className="text-[1.2rem] font-normal">Add Signer</div>
+              <button
+                onClick={handleModalCloseClick}
+                className="text-[1.5rem] cursor-pointer focus:outline-none"
+              >
+                &times;
+              </button>
+            </div>
+
+            {isModal && (
+              <AddSigner
+                valueKey={"objectId"}
+                displayKey={"Name"}
+                details={handleNewDetails}
+                closePopup={handleModalCloseClick}
+              />
+            )}
+          </div>
+        </Modal>
+      </div>
+    </div>
+  );
+};
+
+export default SignersInput;
@@ -0,0 +1,25 @@
+import React from "react";
+import { NavLink } from "react-router-dom";
+
+const Menu = ({ item, isOpen, closeSidebar }) => {
+  return (
+    <li key={item.title} role="none">
+      <NavLink
+        to={
+          item.pageType
+            ? `/${item.pageType}/${item.objectId}`
+            : `/${item.objectId}`
+        }
+        className="mx-auto flex items-center hover:bg-[#eef1f5] p-3 lg:p-4 cursor-pointer"
+        onClick={closeSidebar}
+        tabIndex={isOpen ? 0 : -1}
+        role="menuitem"
+      >
+        <i className={`${item.icon} text-[18px]`} aria-hidden="true"></i>
+        <span className="ml-3 lg:ml-4">{item.title}</span>
+      </NavLink>
+    </li>
+  );
+};
+
+export default Menu;
@@ -1,32 +1,31 @@
 import React, { useState, useEffect } from "react";
-import { Link, NavLink } from "react-router-dom";
+
+import Menu from "./Menu";
 import Submenu from "./SubMenu";
-import dp from "../../assets/images/dp.png";
+import SocialMedia from "./SocialMedia";
+
 import Parse from "parse";
+import dp from "../../assets/images/dp.png";
+
 const Sidebar = ({ isOpen, closeSidebar }) => {
+  const [menuList, setmenuList] = useState([]);
  let username = localStorage.getItem("username");
  const image = localStorage.getItem("profileImg") || dp;
  const tenantname = localStorage.getItem("TenantName");
-  const [menuList, setmenuList] = useState([]);

  useEffect(() => {
    if (localStorage.getItem("accesstoken")) {
      menuItem();
    }
  }, []);
+
  const menuItem = async () => {
-    const parseBaseUrl = localStorage.getItem("baseUrl");
-    const parseAppId = localStorage.getItem("parseAppId");
    try {
-      Parse.serverURL = parseBaseUrl;
-      Parse.initialize(parseAppId);
      var sideMenu = Parse.Object.extend("w_menu");
      var query = new Parse.Query(sideMenu);
      query.equalTo("objectId", localStorage.getItem("defaultmenuid"));
-   
      const results = await query.first();
      const resultjson = results.toJSON();
-      // console.log("resultjson ", resultjson);
      let result = resultjson;
      setmenuList(result.menuItems);
    } catch (e) {
@@ -35,81 +34,53 @@ const Sidebar = ({ isOpen, closeSidebar }) => {
  };

  return (
-    <div
-      className={`${
-        isOpen ? "block" : "hidden"
-      } bg-white text-[#444] h-screen w-full md:w-[300px] overflow-y-auto transform transition-transform z-40 ${
-        isOpen ? "translate-x-0" : "-translate-x-full"
-      }`}
+    <aside
+      className={`bg-white text-[#444] h-screen w-full md:w-[300px] overflow-y-auto transform transition-transform z-40 md:translate-x-0
+      ${isOpen ? "translate-x-0 block" : "-translate-x-full hidden"}`}
    >
      <div className="flex px-2 py-3 gap-2 items-center shadow-md">
        <div className="w-[75px] h-[75px] rounded-full ring-[2px] ring-offset-2 ring-gray-400 overflow-hidden">
-          <img className="w-full h-full object-contain" src={image} alt="img" />
+          <img
+            className="w-full h-full object-cover"
+            src={image}
+            alt="Profile"
+          />
        </div>
        <div>
-          <p className="text-[14px] font-bold">{username && username}</p>
-          <p
-            className={`text-[12px] ${tenantname && tenantname ? "mt-2" : ""}`}
-          >
-            {tenantname && tenantname}
+          <p className="text-[14px] font-bold">{username}</p>
+          <p className={`text-[12px] ${tenantname ? "mt-2" : ""}`}>
+            {tenantname}
          </p>
        </div>
      </div>
-      <ul className="text-sm">
-        {menuList.length > 0 && (
-          <>
-            {menuList.map((item) =>
-              !item.children ? (
-                <li key={item.title} onClick={() => closeSidebar()}>
-                  <Link
-                    className={`mx-auto flex items-center hover:bg-[#eef1f5] p-3 lg:p-4 hover:no-underline cursor-pointer`}
-                    to={`/${item.pageType}/${item.objectId}`}
-                  >
-                    <i className={item.icon + " text-[18px]"}></i>
-                    <span title={item.description} className="ml-3 lg:ml-4">
-                      {item.title}
-                    </span>
-                  </Link>
-                </li>
-              ) : (
-                <Submenu key={item.title} icon={item.icon} title={item.title}>
-                  {item.children.map((item) => (
-                    <li key={item.title} onClick={() => closeSidebar()} className="pl-6 md:pl-8 hover:bg-[#eef1f5] cursor-pointer">
-                      <Link
-                        className={`mx-auto flex items-center p-2 lg:p-3 hover:no-underline`}
-                        to={`/${item.pageType}/${item.objectId}`}
-                      >
-                        <i className={item.icon + " text-[18px]"}></i>
-                        <span title={item.description} className="ml-3 lg:ml-4">
-                          {item.title}
-                        </span>
-                      </Link>
-                    </li>
-                  ))}
-                </Submenu>
-              )
-            )}
-          </>
-        )}
-      </ul>
-      <div className="mt-4 flex justify-center items-center text-[25px] text-black gap-3">
-        <NavLink to="https://github.com/opensignlabs/opensign" target="_blank">
-          <i className="fa-brands fa-github"></i>
-        </NavLink>
-        <NavLink
-          to="https://www.linkedin.com/company/opensign%E2%84%A2/"
-          target="_blank"
+      <nav aria-label="OpenSign Sidebar Navigation">
+        <ul
+          className="text-sm"
+          role="menubar"
+          aria-label="OpenSign Sidebar Navigation"
        >
-          <i className="fa-brands fa-linkedin"></i>
-        </NavLink>
-        <NavLink to="https://www.twitter.com/opensignlabs" target="_blank">
-          <i className="fa-brands fa-square-x-twitter"></i>
-        </NavLink>
-        <NavLink to="https://discord.com/invite/xe9TDuyAyj" target="_blank">
-          <i className="fa-brands fa-discord"></i>
-        </NavLink>
-      </div>
-    </div>
+          {menuList.map((item) =>
+            !item.children ? (
+              <Menu
+                key={item.title}
+                item={item}
+                isOpen={isOpen}
+                closeSidebar={closeSidebar}
+              />
+            ) : (
+              <Submenu
+                key={item.title}
+                item={item}
+                closeSidebar={closeSidebar}
+              />
+            )
+          )}
+        </ul>
+      </nav>
+      <footer className="mt-4 flex justify-center items-center text-[25px] text-black gap-3">
+        <SocialMedia />
+      </footer>
+    </aside>
  );
 };

@@ -0,0 +1,27 @@
+import React from "react";
+import { NavLink } from "react-router-dom";
+
+const SocialMedia = () => {
+    return (
+        <React.Fragment>
+            <NavLink to="https://github.com/opensignlabs/opensign" target="_blank" rel="noopener noreferrer">
+                <i aria-hidden="true" className="fa-brands fa-github"></i>
+                <span className="fa-sr-only">OpenSign&apos;s Github</span>
+            </NavLink>
+            <NavLink to="https://www.linkedin.com/company/opensign%E2%84%A2/" target="_blank" rel="noopener noreferrer">
+                <i aria-hidden="true" className="fa-brands fa-linkedin"></i>
+                <span className="fa-sr-only">OpenSign&apos;s LinkedIn</span>
+            </NavLink>
+            <NavLink to="https://www.twitter.com/opensignlabs" target="_blank" rel="noopener noreferrer">
+                <i aria-hidden="true" className="fa-brands fa-square-x-twitter"></i>
+                <span className="fa-sr-only">OpenSign&apos;s Twitter</span>
+            </NavLink>
+            <NavLink to="https://discord.com/invite/xe9TDuyAyj" target="_blank" rel="noopener noreferrer">
+                <i aria-hidden="true" className="fa-brands fa-discord"></i>
+                <span className="fa-sr-only">OpenSign&apos;s Discord</span>
+            </NavLink>
+        </React.Fragment>
+    )
+}
+
+export default SocialMedia;
@@ -1,30 +1,60 @@
 import React, { useState } from "react";
+import { NavLink } from "react-router-dom";

-const Submenu = ({ icon, title, children }) => {
-  const [isOpen, setIsOpen] = useState(false);
+const Submenu = ({ item, closeSidebar }) => {
+  const [submenuOpen, setSubmenuOpen] = useState(false);
+  const { title, icon, children } = item;

  const toggleSubmenu = () => {
-    setIsOpen(!isOpen);
+    setSubmenuOpen(!submenuOpen);
  };

  return (
-    <div>
+    <li role="none">
      <button
        onClick={toggleSubmenu}
-        className="w-full mx-auto flex items-center text-left text-[#444] p-3 lg:p-4 hover:bg-[#eef1f5] focus:outline-none"
+        className="w-full flex items-center text-left text-[#444] p-3 lg:p-4 hover:bg-[#eef1f5] focus:ring-2 focus:ring-blue-600"
+        aria-expanded={submenuOpen}
+        aria-haspopup="true"
+        aria-controls={`submenu-${title}`}
      >
-        <i className={icon + " text-[18px]"}></i>
+        <i className={`${icon} text-[18px]`}></i>
        <div className="flex justify-between items-center w-full">
          <span className="ml-3 lg:ml-4">{title}</span>
          <i
-            className={
-              isOpen ? "fa-solid fa-angle-down" : "fa-solid fa-angle-right"
-            }
+            className={`${
+              submenuOpen ? "fa-solid fa-angle-down" : "fa-solid fa-angle-right"
+            }`}
+            aria-hidden="true"
          ></i>
        </div>
      </button>
-      {isOpen && <ul>{children}</ul>}
-    </div>
+      {submenuOpen && (
+        <ul id={`submenu-${title}`} role="menu" aria-label={`${title} submenu`}>
+          {children.map((childItem) => (
+            <li key={childItem.title} role="none">
+              <NavLink
+                to={
+                  childItem.pageType
+                    ? `/${childItem.pageType}/${childItem.objectId}`
+                    : `/${childItem.objectId}`
+                }
+                className="block pl-6 md:pl-8 py-2 text-sm text-gray-700 hover:bg-blue-500 hover:text-white cursor-pointer"
+                onClick={closeSidebar}
+                role="menuitem"
+                tabIndex={submenuOpen ? 0 : -1}
+              >
+                <i
+                  className={`${childItem.icon} text-[18px]`}
+                  aria-hidden="true"
+                ></i>
+                <span className="ml-3 lg:ml-4">{childItem.title}</span>
+              </NavLink>
+            </li>
+          ))}
+        </ul>
+      )}
+    </li>
  );
 };

@@ -3,7 +3,10 @@ export const appInfo = {
  appTitle: "contracts",
  applogo: logo,
  appname: "contracts",
-  baseurl: process.env.REACT_APP_SERVERURL,
+  appId: process.env.REACT_APP_APPID ? process.env.REACT_APP_APPID : "opensign",
+  baseUrl: process.env.REACT_APP_SERVERURL
+    ? process.env.REACT_APP_SERVERURL
+    : window.location.origin + "/api/app",
  defaultRole: "contracts_User",
  fbAppId: process.env.REACT_APP_FBAPPID
    ? `${process.env.REACT_APP_FBAPPID}`
@@ -0,0 +1,11 @@
+export const contactCls = "contracts_Contactbook";
+export const templateCls = "contracts_Template";
+export const documentCls = "contracts_Document";
+export const rejectBtn =
+  "bg-[#ffffff] rounded-sm shadow-md text-[12px] font-semibold uppercase text-black py-1.5 px-4 focus:outline-none text-center border-[1px] border-[#b4b4b4]";
+export const submitBtn =
+  "bg-[#32a3ac] rounded-sm shadow-md text-[12px] font-semibold uppercase text-white py-1.5 px-4 focus:outline-none text-center";
+export const modalSubmitBtnColor = "#17a2b8";
+export const modalCancelBtnColor = "white";
+export const themeColor = "#47a3ad";
+export const iconColor = "#686968";
@@ -1,9 +1,6 @@
 import axios from "axios";
-import Parse from "parse";
-const parseAppId = localStorage.getItem("AppID12");
-const serverUrl = localStorage.getItem("BaseUrl12");
-Parse.serverURL = serverUrl;
-Parse.initialize(parseAppId);
+const parseAppId = localStorage.getItem("parseAppId");
+const serverUrl = localStorage.getItem("baseUrl");

 export const SaveFileSize = async (size, imageUrl) => {
  //checking server url and save file's size
@@ -1,210 +0,0 @@
-import moment from "moment";
-
-export default function onSearchFilter(_search) {
-  switch (_search) {
-    case "Today": {
-      let d = new Date();
-      let formDate = new Date(
-        Date.UTC(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0, 0)
-      ).toISOString();
-      let Todate = new Date(
-        Date.UTC(d.getFullYear(), d.getMonth(), d.getDate(), 23, 59, 59)
-      ).toISOString();
-      let Query = `'$gte':'${formDate}','$lte':'${Todate}'`;
-      return Query;
-    }
-    case "Yesterday": {
-      let d1 = new Date();
-      d1.setDate(d1.getDate() - 1);
-      let yesFrDate = new Date(
-        Date.UTC(d1.getFullYear(), d1.getMonth(), d1.getDate(), 0, 0, 0)
-      ).toISOString();
-
-      let YesTodate = new Date(
-        Date.UTC(d1.getFullYear(), d1.getMonth(), d1.getDate(), 23, 59, 59)
-      ).toISOString();
-      let Query1 = `'$gte':'${yesFrDate}','$lte':'${YesTodate}'`;
-      return Query1;
-    }
-
-    case "This week": {
-      let oneDay = 24 * 60 * 60 * 1000;
-      let curr = new Date(); // get current date
-      let first = curr.getDate() - curr.getDay(); // First day is the day of the month - the day of the week
-
-      let firstday = new Date(
-        new Date(
-          Date.UTC(curr.getFullYear(), curr.getMonth(), curr.getDate(), 0, 0, 0)
-        ).setDate(first)
-      ).toISOString();
-      let diffDays = Math.round(
-        Math.abs(
-          (new Date(
-            Date.UTC(
-              curr.getFullYear(),
-              curr.getMonth(),
-              curr.getDate(),
-              23,
-              59,
-              59
-            )
-          ) -
-            new Date(firstday)) /
-            oneDay
-        )
-      ); //Days since last week
-      let last = first + diffDays;
-      let lastday = new Date(
-        new Date(
-          Date.UTC(
-            curr.getFullYear(),
-            curr.getMonth(),
-            curr.getDate(),
-            23,
-            59,
-            59
-          )
-        ).setDate(last)
-      ).toISOString();
-      let Query2 = `'$gte':'${firstday}','$lte':'${lastday}'`;
-      return Query2;
-    }
-
-    case "Last 7 days": {
-      let d7 = new Date();
-      let d7l = new Date();
-      d7.setDate(d7.getDate() - 7);
-      let l7t = new Date(
-        Date.UTC(d7l.getFullYear(), d7l.getMonth(), d7l.getDate(), 23, 59, 59)
-      ).toISOString();
-      let date7 = new Date(
-        Date.UTC(d7.getFullYear(), d7.getMonth(), d7.getDate(), 0, 0, 0)
-      ).toISOString();
-      let Query7 = `'$gte':'${date7}','$lte':'${l7t}'`;
-      return Query7;
-    }
-    case "Last 14 days": {
-      let d14 = new Date();
-      let d14l = new Date();
-      let l14t = new Date(
-        Date.UTC(
-          d14l.getFullYear(),
-          d14l.getMonth(),
-          d14l.getDate(),
-          23,
-          59,
-          59
-        )
-      ).toISOString();
-      d14.setDate(d14.getDate() - 14);
-      let date14 = new Date(
-        Date.UTC(d14.getFullYear(), d14.getMonth(), d14.getDate(), 0, 0, 0)
-      ).toISOString();
-
-      let Query14 = `'$gte':'${date14}','$lte':'${l14t}'`;
-      return Query14;
-    }
-
-    case "Last 30 days": {
-      let d30 = new Date();
-      let d30l = new Date();
-      let l30t = new Date(
-        Date.UTC(
-          d30l.getFullYear(),
-          d30l.getMonth(),
-          d30l.getDate(),
-          23,
-          59,
-          59
-        )
-      ).toISOString();
-      d30.setDate(d30.getDate() - 30);
-      let date30 = new Date(
-        Date.UTC(d30.getFullYear(), d30.getMonth(), d30.getDate(), 0, 0, 0)
-      ).toISOString();
-      return `'$gte':'${date30}','$lte':'${l30t}'`;
-    }
-    case "Last week": {
-      const from_date = moment().startOf("week").subtract(7, "days");
-      const to_date = moment().endOf("week").subtract(7, "days");
-      return `'$gte':'${from_date.toISOString()}','$lte':'${to_date.toISOString()}'`;
-    }
-    case "This month": {
-      var tdate = new Date();
-      var tfirstDay = new Date(
-        tdate.getFullYear(),
-        tdate.getMonth(),
-        1
-      ).toISOString();
-      var tlastDay = new Date(
-        tdate.getFullYear(),
-        tdate.getMonth() + 1,
-        0
-      ).toISOString();
-      let Querylt = `'$gte':'${tfirstDay}','$lte':'${tlastDay}'`;
-      return Querylt;
-    }
-    case "Last month": {
-      var ldate = new Date();
-      var lfirstDay = new Date(
-        ldate.getFullYear(),
-        ldate.getMonth() - 1,
-        2
-      ).toISOString();
-      var llastDay = new Date(
-        ldate.getFullYear(),
-        ldate.getMonth(),
-        1
-      ).toISOString();
-      let Queryltl = `'$gte':'${lfirstDay}','$lte':'${llastDay}'`;
-      return Queryltl;
-    }
-    case "All": {
-      let fall = new Date(
-        new Date().getFullYear() - 100,
-        0,
-        1,
-        0,
-        0,
-        0
-      ).toISOString();
-      let fall_year = `'$gte':'${fall}'`;
-      return fall_year;
-    }
-    case "This year": {
-      let fcy = new Date(new Date().getFullYear(), 0, 1, 0, 0, 0).toISOString();
-      let lcy = new Date(
-        new Date().getFullYear(),
-        11,
-        31,
-        23,
-        59,
-        59
-      ).toISOString();
-      let cur_year = `'$gte':'${fcy}','$lte':'${lcy}'`;
-      return cur_year;
-    }
-    case "Last year": {
-      let fly = new Date(
-        new Date().getFullYear() - 1,
-        0,
-        1,
-        0,
-        0,
-        0
-      ).toISOString();
-      let lly = new Date(
-        new Date().getFullYear() - 1,
-        11,
-        31,
-        23,
-        59,
-        59
-      ).toISOString();
-      let last_year = `'$gte':'${fly}','$lte':'${lly}'`;
-      return last_year;
-    }
-    default:
-      return "";
-  }
-}
@@ -15,3 +15,20 @@ export const useScript = (url, onload) => {
    };
  }, [url, onload]);
 };
+
+/**`useScript` hook is generated scripte for google sign in button */
+export const useDropScript = (url, onload) => {
+  useEffect(() => {
+    const script = document.createElement("script");
+    //add url parameter to the script src, for load and it will remove after load in return
+    script.src = url;
+    script.async = true;
+    script.defer = true;
+    script.id = "dropboxjs";
+    script.setAttribute("data-app-key", "8k0thg9r1t7asqg");
+    document.head.appendChild(script);
+    return () => {
+      document.head.removeChild(script);
+    };
+  }, [url, onload]);
+};
@@ -4,4 +4,15 @@

 body{
    background-color: white;
-}
+}
+
+/* Custom CSS to hide scrollbar */
+.hide-scrollbar::-webkit-scrollbar {
+    display: none;
+  }
+  
+.hide-scrollbar {
+    -ms-overflow-style: none; /* IE and Edge */
+    scrollbar-width: none; /* Firefox */
+}
+  
@@ -1 +1,71 @@
-import("./Bootstrap");
+import React from "react";
+import ReactDOM from "react-dom/client";
+import "./index.css";
+import App from "./App";
+import { Provider } from "react-redux";
+import { store } from "./redux/store";
+import { HTML5Backend } from "react-dnd-html5-backend";
+import { TouchBackend } from "react-dnd-touch-backend";
+import {
+  DndProvider,
+  TouchTransition,
+  MouseTransition,
+  Preview
+} from "react-dnd-multi-backend";
+import DragElement from "./components/pdf/DragElement";
+import TagManager from "react-gtm-module";
+import Parse from "parse";
+const appId = process.env.REACT_APP_APPID
+  ? process.env.REACT_APP_APPID
+  : "opensign";
+const serverUrl = process.env.REACT_APP_SERVERURL
+  ? process.env.REACT_APP_SERVERURL
+  : window.location.origin + "/api/app";
+Parse.initialize(appId);
+Parse.serverURL = serverUrl;
+
+const HTML5toTouch = {
+  backends: [
+    {
+      id: "html5",
+      backend: HTML5Backend,
+      transition: MouseTransition
+    },
+    {
+      id: "touch",
+      backend: TouchBackend,
+      options: { enableMouseEvents: true },
+      preview: true,
+      transition: TouchTransition
+    }
+  ]
+};
+const generatePreview = (props) => {
+  const { item, style } = props;
+  const newStyle = {
+    ...style
+  };
+
+  return (
+    <div style={newStyle}>
+      <DragElement {...item} />
+    </div>
+  );
+};
+
+if (process.env.REACT_APP_GTM) {
+  const tagManagerArgs = {
+    gtmId: process.env.REACT_APP_GTM
+  };
+  TagManager.initialize(tagManagerArgs);
+}
+
+const root = ReactDOM.createRoot(document.getElementById("root"));
+root.render(
+  <Provider store={store}>
+    <DndProvider options={HTML5toTouch}>
+      <Preview>{generatePreview}</Preview>
+      <App />
+    </DndProvider>
+  </Provider>
+);
@@ -1,585 +1,26 @@
-import Parse from "parse";
-export const formJson = (id) => {
-  let formData;
+import { documentCls, templateCls } from "../constant/const";
+export const formJson = {
  //json form for signYourself
-  if (id === "sHAnZphf69") {
-    formData = {
-      jsonSchema: {
-        title: "Sign Yourself",
-        description: "",
-        type: "object",
-        required: ["URL", "Name"],
-        properties: {
-          URL: {
-            type: "string",
-            title: "Select Document",
-            filetypes: [],
-            maxfilesizeKB: "5000",
-            uploadtype: "regular",
-            helpbody: "",
-            helplink: ""
-          },
-          Name: {
-            type: "string",
-            title: "Title",
-            maxLength: 50
-          },
-          Description: {
-            type: "string",
-            title: "Description",
-            maxLength: 500
-          },
-          Folder: {
-            title: "Folder",
-            parent: null,
-            data: {
-              ClassName: "contracts_Document",
-              FolderNameField: "Name",
-              FolderTypeField: "Type",
-              FolderTypeValue: "Folder",
-              FolderDescription: "Description",
-              ParentFolderField: "Folder",
-              FormId: "YjIB7W7Xs6",
-              Query: 'where={"Folder":{"$exists":false},"Type":"Folder"}'
-            }
-          },
-          ExtUserPtr: {
-            data: {
-              valueKey: "objectId",
-              isPointer: true
-            }
-          }
-        }
-      },
-      uiSchema: {
-        URL: {
-          "ui:field": "FileUpload"
-        },
-        Description: {
-          "ui:widget": "textarea",
-          "ui:options": {
-            rows: 2
-          }
-        },
-        Note: {
-          "ui:widget": "textarea",
-          "ui:options": {
-            rows: 2
-          }
-        },
-        Folder: {
-          "ui:field": "FolderComponent"
-        },
-        ExtUserPtr: {
-          "ui:field": "HiddenField"
-        }
-      },
-      userSchema: {},
-      rules: null,
-      noValidate: false,
-      liveValidate: false,
-      isRegisterForm: false,
-      help: { htmlbody: "" },
-      description: "",
-      class: "contracts_Document",
-      buttons: {
-        add: {
-          resetText: "Reset",
-          submitText: "Submit"
-        },
-        edit: { submitText: "Update", cancelText: "Cancel" }
-      },
-      formACL: {
-        "#currentUser#": { read: true, write: true },
-        "*": { read: true, write: true }
-      },
-      redirect_id:
-        "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/signaturePdf",
-      success_message: "Success!",
-      success_redirect: "Microapp",
-      validFunction:
-        "ZnVuY3Rpb24gdmFsaWRhdGUoZm9ybURhdGEsIGVycm9ycykgeyBpZiAoZm9ybURhdGEucGFzczEgIT09IGZvcm1EYXRhLnBhc3MyKSB7IGVycm9ycy5wYXNzMi5hZGRFcnJvcignUGFzc3dvcmRzIGRvbid0IG1hdGNoJyk7IH0gcmV0dXJuIGVycm9yczsgfQ=="
-    };
+  sHAnZphf69: {
+    title: "Sign Yourself",
+    redirectRoute: "signaturePdf",
+    msgVar: "Document",
+    Cls: documentCls
+  },

-    return formData;
-  }
-  //json form for request signature
-  else if (id === "8mZzFxbG1z") {
-    const user = Parse.User.current();
-    const userPtr = JSON.stringify({
-      __type: "Pointer",
-      className: "_User",
-      objectId: user.id
-    });
-    formData = {
-      jsonSchema: {
-        title: "New Document",
-        description: "",
-        type: "object",
-        required: ["URL", "Name", "Note", "TimeToCompleteDays", "Signers"],
-        properties: {
-          URL: {
-            type: "string",
-            title: "Select Document",
-            filetypes: [],
-            maxfilesizeKB: "5000",
-            uploadtype: "regular",
-            helpbody: "",
-            helplink: ""
-          },
-          Name: {
-            type: "string",
-            title: "Title",
-            maxLength: 100
-          },
-          Description: {
-            type: "string",
-            title: "Description",
-            maxLength: 500
-          },
-          Signers: {
-            type: "array",
-            title: "Signers",
-            isSortable: false,
-            selectAll: false,
-            selectedData: null,
-            data: {
-              class: "contracts_Contactbook",
-              displayKey: "Name",
-              valueKey: "objectId",
-              query: `where={"CreatedBy":${userPtr}}&keys=Name`,
-              isPointer: true,
-              helpbody: "",
-              helplink: "",
-              quickAddFormId: "qUGywSWd8e"
-            }
-          },
-          Note: {
-            type: "string",
-            title: "Note",
-            default: "Please review and sign this document",
-            maxLength: 500
-          },
-          Folder: {
-            title: "Folder",
-            data: {
-              ClassName: "contracts_Document",
-              FolderNameField: "Name",
-              FolderTypeField: "Type",
-              FolderTypeValue: "Folder",
-              FolderDescription: "Description",
-              ParentFolderField: "Folder",
-              FormId: "YjIB7W7Xs6",
-              Query: 'where={"Folder":{"$exists":false},"Type":"Folder"}'
-            }
-          },
-          TimeToCompleteDays: {
-            type: "number",
-            title: "Time To Complete (Days)",
-            default: 15,
-            maxLength: 5000
-          },
-          ExtUserPtr: {
-            data: {
-              valueKey: "objectId",
-              isPointer: true
-            }
-          }
-        }
-      },
-      uiSchema: {
-        URL: {
-          "ui:field": "FileUpload"
-        },
-        Description: {
-          "ui:widget": "textarea",
-          "ui:options": {
-            rows: 2
-          }
-        },
-        Note: {
-          "ui:widget": "textarea",
-          "ui:options": {
-            rows: 2
-          }
-        },
-        Signers: {
-          "ui:field": "MultiSelectField"
-        },
-        Folder: {
-          "ui:field": "FolderComponent"
-        },
-        TimeToCompleteDays: {
-          "ui:placeholder": "No. of days",
-          "ui:widget": "updown"
-        },
-        ExtUserPtr: {
-          "ui:field": "HiddenField"
-        }
-      },
-      userSchema: {},
-      rules: null,
-      noValidate: false,
-      liveValidate: false,
-      isRegisterForm: false,
-      help: { htmlbody: "" },
-      description: "",
-      class: "contracts_Document",
-      buttons: {
-        add: {
-          resetText: "Reset",
-          submitText: "Submit"
-        },
-        edit: { submitText: "Update", cancelText: "Cancel" }
-      },
-      formACL: {
-        "#currentUser#": { read: true, write: true },
-        "*": { read: true, write: true }
-      },
-      redirect_id:
-        "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/placeHolderSign",
-      success_message: "Success!",
-      success_redirect: "Microapp",
-      validFunction:
-        "ZnVuY3Rpb24gdmFsaWRhdGUoZm9ybURhdGEsIGVycm9ycykgeyBpZiAoZm9ybURhdGEucGFzczEgIT09IGZvcm1EYXRhLnBhc3MyKSB7IGVycm9ycy5wYXNzMi5hZGRFcnJvcignUGFzc3dvcmRzIGRvbid0IG1hdGNoJyk7IH0gcmV0dXJuIGVycm9yczsgfQ=="
-    };
-
-    return formData;
-  }
-  //json form for create new folder
-  else if (id === "YjIB7W7Xs6") {
-    formData = {
-      jsonSchema: {
-        title: "New Folder",
-        description: "",
-        type: "object",
-        required: ["Name"],
-        properties: {
-          Name: {
-            type: "string",
-            title: "Name",
-            maxLength: 50
-          },
-          Type: {
-            type: "string",
-            data: {
-              valueKey: "Type",
-              isPointer: false
-            },
-            default: "Folder"
-          },
-          Folder: {
-            title: "Parent Folder",
-            data: {
-              class: "contracts_Document",
-              displayKey: "Name",
-              valueKey: "objectId",
-              query: 'where={"Type":"Folder"}&keys=Name',
-              isPointer: true,
-              savePointerClass: "",
-              helpbody: "",
-              helplink: ""
-            }
-          }
-        }
-      },
-      uiSchema: {
-        Type: {
-          "ui:field": "HiddenField"
-        },
-        Folder: {
-          "ui:field": "Level1Dropdown"
-        }
-      },
-      userSchema: {},
-      rules: null,
-      noValidate: false,
-      liveValidate: false,
-      isRegisterForm: false,
-      help: { htmlbody: "" },
-      description: "",
-      class: "contracts_Document",
-      buttons: {
-        add: {
-          resetText: "Reset",
-          submitText: "Submit"
-        },
-        edit: { submitText: "Update", cancelText: "Cancel" }
-      },
-      formACL: {
-        "#currentUser#": { read: true, write: true },
-        "*": { read: true, write: true }
-      },
-      redirect_id: "",
-      success_message: "Success!",
-      success_redirect: "",
-      validFunction:
-        "ZnVuY3Rpb24gdmFsaWRhdGUoZm9ybURhdGEsIGVycm9ycykgeyBpZiAoZm9ybURhdGEucGFzczEgIT09IGZvcm1EYXRhLnBhc3MyKSB7IGVycm9ycy5wYXNzMi5hZGRFcnJvcignUGFzc3dvcmRzIGRvbid0IG1hdGNoJyk7IH0gcmV0dXJuIGVycm9yczsgfQ=="
-    };
-    return formData;
-  }
-  //json form for add signers
-  else if (id === "fICciRuUcB") {
-    formData = {
-      jsonSchema: {
-        title: "Add Signer",
-        description: "",
-        type: "object",
-        required: ["Name", "Email", "Phone", "Company"],
-        properties: {
-          Name: {
-            type: "string",
-            title: "Name",
-            maxLength: 50
-          },
-          Email: {
-            type: "string",
-            title: "Email",
-            maxLength: 50
-          },
-          Phone: {
-            type: "string",
-            title: "Phone",
-            maxLength: 50
-          },
-          Company: {
-            type: "string",
-            title: "Company",
-            maxLength: 50
-          },
-          JobTitle: {
-            type: "string",
-            title: "JobTitle",
-            maxLength: 50
-          },
-          IsContactEntry: {
-            type: "boolean",
-            data: {
-              valueKey: "IsContactEntry",
-              isPointer: false
-            },
-            default: true
-          }
-        }
-      },
-      uiSchema: {
-        Email: {
-          "ui:widget": "email"
-        },
-        IsContactEntry: {
-          "ui:field": "HiddenField"
-        }
-      },
-      userSchema: {
-        email: "$Email",
-        name: "$Name",
-        password: "$Phone",
-        phone: "$Phone",
-        role: "contracts_User",
-        username: "$Email"
-      },
-      rules: null,
-      noValidate: false,
-      liveValidate: false,
-      isRegisterForm: true,
-      help: {},
-      description: "",
-      class: "contracts_Users",
-      buttons: {
-        add: {
-          resetText: "Reset",
-          submitText: "Submit"
-        },
-        edit: { submitText: "Update", cancelText: "Cancel" }
-      },
-      formACL: {
-        "#currentUser#": { read: true, write: true },
-        "*": { read: true, write: true }
-      },
-      redirect_id: "",
-      success_message: "Success!",
-      success_redirect: "",
-      validFunction:
-        "ZnVuY3Rpb24gdmFsaWRhdGUoZm9ybURhdGEsIGVycm9ycykgeyBpZiAoZm9ybURhdGEucGFzczEgIT09IGZvcm1EYXRhLnBhc3MyKSB7IGVycm9ycy5wYXNzMi5hZGRFcnJvcignUGFzc3dvcmRzIGRvbid0IG1hdGNoJyk7IH0gcmV0dXJuIGVycm9yczsgfQ=="
-    };
-    return formData;
-  }
-  //json form for add users
-  else if (id === "lM0xRnM3iE") {
-    formData = {
-      jsonSchema: {
-        title: "Add User",
-        description: "",
-        type: "object",
-        required: ["Name", "Email", "Phone", "JobTitle"],
-        properties: {
-          Name: {
-            type: "string",
-            title: "Name",
-            maxLength: 50
-          },
-          Email: {
-            type: "string",
-            title: "Email",
-            maxLength: 50
-          },
-          Phone: {
-            type: "string",
-            title: "Phone",
-            maxLength: 50
-          },
-          JobTitle: {
-            type: "string",
-            title: "Job Title",
-            maxLength: 50
-          },
-          Company: {
-            type: "string",
-            title: "Company",
-            maxLength: 50
-          }
-        }
-      },
-      uiSchema: {
-        Email: {
-          "ui:widget": "email"
-        },
-        Phone: {
-          "ui:options": {
-            inputType: "tel"
-          }
-        }
-      },
-      userSchema: {
-        email: "$Email",
-        name: "$Name",
-        password: "$Phone",
-        phone: "$Phone",
-        role: "contracts_User",
-        username: "$Email"
-      },
-      rules: null,
-      noValidate: false,
-      liveValidate: false,
-      isRegisterForm: true,
-      help: {},
-      description: "",
-      class: "contracts_Users",
-      buttons: {
-        add: {
-          resetText: "Reset",
-          submitText: "Submit"
-        },
-        edit: { submitText: "Update", cancelText: "Cancel" }
-      },
-      formACL: {
-        "#currentUser#": { read: true, write: true },
-        "*": { read: true, write: true }
-      },
-      redirect_id: "",
-      success_message: "Success!",
-      success_redirect: "",
-      validFunction:
-        "ZnVuY3Rpb24gdmFsaWRhdGUoZm9ybURhdGEsIGVycm9ycykgeyBpZiAoZm9ybURhdGEucGFzczEgIT09IGZvcm1EYXRhLnBhc3MyKSB7IGVycm9ycy5wYXNzMi5hZGRFcnJvcignUGFzc3dvcmRzIGRvbid0IG1hdGNoJyk7IH0gcmV0dXJuIGVycm9yczsgfQ=="
-    };
-    return formData;
-  } else if (id === "qUGywSWd8e") {
-    formData = {
-      jsonSchema: {
-        title: "Add Contact",
-        description: "",
-        type: "object",
-        required: ["Name", "Email", "Phone"],
-        properties: {
-          Name: {
-            type: "string",
-            title: "Name",
-            maxLength: 50
-          },
-          Email: {
-            type: "string",
-            title: "Email",
-            maxLength: 50
-          },
-          Phone: {
-            type: "string",
-            title: "Phone",
-            maxLength: 50
-          }
-        }
-      },
-      uiSchema: {
-        Email: {
-          "ui:widget": "email"
-        },
-        Phone: {
-          "ui:options": {
-            inputType: "tel"
-          }
-        }
-      },
-      userSchema: {
-        name: "$Name",
-        username: "$Email",
-        email: "$Email",
-        password: "$Phone",
-        phone: "$Phone",
-        role: "contracts_Guest"
-      },
-      restrict_form_entry: {
-        enable_captcha: false,
-        allow_one_entry_per_ip_address: false,
-        allow_one_entry_per_user: false,
-        enable_geo_fence: false
-      },
-      restrict_form_access: {
-        entryCount: ""
-      },
-      help: {},
-      email_template: {
-        from: "",
-        to: "",
-        subject: "",
-        message: ""
-      },
-      buttons: {
-        add: {
-          submitText: "Submit",
-          resetText: "Reset"
-        },
-        edit: {
-          submitText: "Update",
-          cancelText: "Cancel"
-        }
-      },
-      appId: {
-        __type: "Pointer",
-        className: "w_appinfo",
-        objectId: "aIPmIvMzGM"
-      },
-      formACL: {
-        "*": {
-          read: true,
-          write: true
-        },
-        "#currentUser#": {
-          read: true,
-          write: true
-        }
-      },
-      class: "contracts_Contactbook",
-      description: "",
-      success_message: "Success!",
-      form_permission: "private",
-      success_redirect: "",
-      redirect_id: "",
-      isRegisterForm: true,
-      liveValidate: false,
-      noValidate: false,
-      validFunction:
-        "ZnVuY3Rpb24gdmFsaWRhdGUoZm9ybURhdGEsIGVycm9ycykgeyBpZiAoZm9ybURhdGEucGFzczEgIT09IGZvcm1EYXRhLnBhc3MyKSB7IGVycm9ycy5wYXNzMi5hZGRFcnJvcignUGFzc3dvcmRzIGRvbid0IG1hdGNoJyk7IH0gcmV0dXJuIGVycm9yczsgfQ=="
-    };
-    return formData;
+  //json form for request signatures
+  "8mZzFxbG1z": {
+    title: "Request Signatures",
+    msgVar: "Document",
+    redirectRoute: "placeHolderSign",
+    Cls: documentCls,
+    signers: true
+  },
+  //json form for template
+  template: {
+    title: "New Template",
+    redirectRoute: "template",
+    msgVar: "Template",
+    Cls: templateCls
  }
 };
-
@@ -1,43 +1,22 @@
-import Parse from "parse";
 export default function reportJson(id) {
-  const currentUserId = Parse.User.current().id;
  // console.log("json ", json);
+  const head = ["Sr.No", "Title", "Note", "Folder", "File", "Owner", "Signers"];
+  const contactbook = ["Sr.No", "Title", "Email", "Phone"];
+  const dashboardReportHead = ["Title", "File", "Owner", "Signers"];

  switch (id) {
    // draft documents report
    case "ByHuevtCFY":
      return {
        reportName: "Draft Documents",
-        className: "contracts_Document",
-        params: {
-          Type: null,
-          $or: [
-            { Signers: null, SignedUrl: null },
-            { Signers: { $exists: true }, Placeholders: null }
-          ],
-          CreatedBy: {
-            __type: "Pointer",
-            className: "_User",
-            objectId: currentUserId
-          }
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name"
-        ],
-        orderBy: "-updatedAt",
+        heading: head,
        actions: [
          {
            btnLabel: "sign",
            btnColor: "#4bd396",
            textColor: "white",
            btnIcon: "fa fa-plus",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/draftDocument"
+            redirectUrl: "draftDocument"
          }
        ]
      };
@@ -45,35 +24,14 @@ export default function reportJson(id) {
    case "4Hhwbp482K":
      return {
        reportName: "Need your sign",
-        className: "contracts_Document",
-        params: {
-          Type: { $ne: "Folder" },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          ExpiryDate: {
-            $gt: { __type: "Date", iso: new Date().toISOString() }
-          },
-          Placeholders: { $ne: null }
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name",
-          "Signers.UserId",
-          "AuditTrail"
-        ],
-        orderBy: "-updatedAt",
+        heading: head,
        actions: [
          {
            btnLabel: "sign",
            btnColor: "#3ac9d6",
            textColor: "white",
            btnIcon: "fa fa-eye",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/pdfRequestFiles"
+            redirectUrl: "pdfRequestFiles"
          }
        ]
      };
@@ -81,39 +39,14 @@ export default function reportJson(id) {
    case "1MwEuxLEkF":
      return {
        reportName: "In-progress documents",
-        className: "contracts_Document",
-        params: {
-          Type: { $ne: "Folder" },
-          Signers: { $ne: null },
-          Placeholders: { $ne: null },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          CreatedBy: {
-            __type: "Pointer",
-            className: "_User",
-            objectId: currentUserId
-          },
-          ExpiryDate: {
-            $gt: { __type: "Date", iso: new Date().toISOString() }
-          }
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name"
-        ],
-        orderBy: "-updatedAt",
+        heading: head,
        actions: [
          {
            btnLabel: "View",
            btnColor: "#3ac9d6",
            textColor: "white",
            btnIcon: "fa fa-eye",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/pdfRequestFiles"
+            redirectUrl: "pdfRequestFiles"
          }
        ]
      };
@@ -121,72 +54,14 @@ export default function reportJson(id) {
    case "kQUoW4hUXz":
      return {
        reportName: "Completed Documents",
-        className: "contracts_Document",
-        params: {
-          Type: null,
-          IsCompleted: true,
-          CreatedBy: {
-            __type: "Pointer",
-            className: "_User",
-            objectId: currentUserId
-          },
-          IsDeclined: { $ne: true }
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name",
-          "TimeToCompleteDays"
-        ],
-        orderBy: "-updatedAt",
+        heading: head,
        actions: [
          {
            btnLabel: "View",
            btnColor: "#4bd396",
            textColor: "white",
            btnIcon: "fa fa-eye",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/draftDocument"
-          }
-        ]
-      };
-    // OpenSignDrive™ documents Drafts
-    case "VRFDmUmw5B":
-      return {
-        reportName: "OpenSignDrive™ Drafts",
-        className: "contracts_Document",
-        params: {
-          Type: "AIDoc",
-          $or: [
-            { Signers: null, SignedUrl: null },
-            { Signers: { $exists: true }, Placeholders: null }
-          ],
-          CreatedBy: {
-            __type: "Pointer",
-            className: "_User",
-            objectId: currentUserId
-          }
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name"
-        ],
-        orderBy: "-updatedAt",
-        actions: [
-          {
-            btnLabel: "edit",
-            btnColor: "#3ac9d6",
-            textColor: "white",
-            btnIcon: "fa fa-plus",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9MZWdhR2VuaWUtTWljcm9hcHBWMi9yZW1vdGVFbnRyeS5qcw==&moduleToLoad=AppRoutes&remoteName=legageniemicroapp/legagenie"
+            redirectUrl: "draftDocument"
          }
        ]
      };
@@ -194,30 +69,14 @@ export default function reportJson(id) {
    case "UPr2Fm5WY3":
      return {
        reportName: "Declined Documents",
-        className: "contracts_Document",
-        params: { Type: null, IsDeclined: true },
-        CreatedBy: {
-          __type: "Pointer",
-          className: "_User",
-          objectId: currentUserId
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name"
-        ],
-        orderBy: "-updatedAt",
+        heading: head,
        actions: [
          {
            btnLabel: "View",
            btnColor: "#4bd396",
            textColor: "white",
            btnIcon: "fa fa-eye",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/draftDocument"
+            redirectUrl: "draftDocument"
          }
        ]
      };
@@ -225,47 +84,14 @@ export default function reportJson(id) {
    case "zNqBHXHsYH":
      return {
        reportName: "Expired Documents",
-        className: "contracts_Document",
-        params: {
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          Type: { $ne: "Folder" },
-          $and: [
-            {
-              $or: [
-                { Signers: { $ne: null }, SignedUrl: { $ne: null } },
-                { Placeholders: { $ne: null } }
-              ]
-            },
-            {
-              ExpiryDate: {
-                $lt: { __type: "Date", iso: new Date().toISOString() }
-              }
-            }
-          ],
-          CreatedBy: {
-            __type: "Pointer",
-            className: "_User",
-            objectId: currentUserId
-          }
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name"
-        ],
-        orderBy: "-updatedAt",
+        heading: head,
        actions: [
          {
            btnLabel: "View",
            btnColor: "#4bd396",
            textColor: "white",
            btnIcon: "fa fa-eye",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/draftDocument"
+            redirectUrl: "draftDocument"
          }
        ]
      };
@@ -273,39 +99,14 @@ export default function reportJson(id) {
    case "d9k3UfYHBc":
      return {
        reportName: "Recently sent for signatures",
-        className: "contracts_Document",
-        params: {
-          Type: { $ne: "Folder" },
-          Signers: { $ne: null },
-          Placeholders: { $ne: null },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          CreatedBy: {
-            __type: "Pointer",
-            className: "_User",
-            objectId: currentUserId
-          },
-          ExpiryDate: {
-            $gt: { __type: "Date", iso: new Date().toISOString() }
-          }
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name"
-        ],
-        orderBy: "-updatedAt",
+        heading: dashboardReportHead,
        actions: [
          {
            btnLabel: "View",
            btnColor: "#4bd396",
            textColor: "white",
            btnIcon: "fa fa-eye",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/pdfRequestFiles"
+            redirectUrl: "pdfRequestFiles"
          }
        ]
      };
@@ -313,35 +114,14 @@ export default function reportJson(id) {
    case "5Go51Q7T8r":
      return {
        reportName: "Recent signature requests",
-        className: "contracts_Document",
-        params: {
-          Type: { $ne: "Folder" },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          ExpiryDate: {
-            $gt: { __type: "Date", iso: new Date().toISOString() }
-          },
-          Placeholders: { $ne: null }
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name",
-          "Signers.UserId",
-          "AuditTrail"
-        ],
-        orderBy: "-updatedAt",
+        heading: dashboardReportHead,
        actions: [
          {
            btnLabel: "Sign",
            btnColor: "#4bd396",
            textColor: "white",
            btnIcon: "fa fa-eye",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/pdfRequestFiles"
+            redirectUrl: "pdfRequestFiles"
          }
        ]
      };
@@ -349,36 +129,51 @@ export default function reportJson(id) {
    case "kC5mfynCi4":
      return {
        reportName: "Drafts",
-        className: "contracts_Document",
-        params: {
-          Type: null,
-          $or: [
-            { Signers: null, SignedUrl: null },
-            { Signers: { $exists: true }, Placeholders: null }
-          ],
-          CreatedBy: {
-            __type: "Pointer",
-            className: "_User",
-            objectId: currentUserId
-          }
-        },
-        keys: [
-          "Name",
-          "Note",
-          "Folder.Name",
-          "URL",
-          "ExtUserPtr.Name",
-          "Signers.Name"
-        ],
-        orderBy: "-updatedAt",
+        heading: ["Title", "Note", "Folder", "File", "Owner", "Signers"],
        actions: [
          {
            btnLabel: "sign",
            btnColor: "#4bd396",
            textColor: "white",
            btnIcon: "fa fa-plus",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/draftDocument"
+            redirectUrl: "draftDocument"
+          }
+        ]
+      };
+    // contactbook report
+    case "5KhaPr482K":
+      return {
+        reportName: "Contactbook",
+        heading: contactbook,
+        actions: [
+          {
+            btnLabel: "",
+            btnColor: "#f55a42",
+            textColor: "white",
+            btnIcon: "fa-solid fa-trash"
+          }
+        ],
+        form: "ContactBook"
+      };
+    // template report
+    case "6TeaPr321t":
+      return {
+        reportName: "Templates",
+        heading: head,
+        actions: [
+          {
+            btnLabel: "Use",
+            btnColor: "#4bd396",
+            textColor: "white",
+            btnIcon: "fa fa-plus",
+            redirectUrl: "placeHolderSign"
+          },
+          {
+            btnLabel: "Edit",
+            btnColor: "#00c9d5",
+            textColor: "white",
+            btnIcon: "fa fa-plus",
+            redirectUrl: "template"
          }
        ]
      };
@@ -6,6 +6,7 @@
        "subtitle": "Free for life One click install.",
        "btnText": "Visit github",
        "url": "https://github.com/opensignlabs/opensign",
+        "target": "_blank",
        "benefits": [
            "Sign Unlimited Documents",
            "S3 Doc Storage",
@@ -26,12 +27,13 @@
        "planName": "THANKS PLAN",
        "currency": "$",
        "price": "29.99",
-        "subtitle": "Use code 'FREEBETA' to get this for free(First 100 users)",
+        "subtitle": "Use code <span style='background-color: yellow;'>'FREEBETA'</span> to get this for free(First 1000 users)",
        "btnText": "Subscribe",
        "url": "https://subscriptions.zoho.in/subscribe/ef798486e6a0a11ea65f2bae8f2af901dbadf3175d495584fd25b9af5d2f2b9e/thanks",
+        "target": "_self",
        "benefits": [
            "Sign Unlimited Documents",
-            "Unlimited Secure Doc Storage with OpenSignDrive",
+            "Unlimited Secure Doc Storage with OpenSign™ Drive",
            "Unlimited Guest Signers",
            "Unlimited completion certificates",
            "Unique Code(OTP) verification for guest signers",
@@ -50,6 +52,7 @@
        "subtitle": "Customization available Priority support.",
        "btnText": "Contact us",
        "url": "https://www.opensignlabs.com/contact-us",
+        "target": "_blank",
        "benefits": [
            "All features",
            "Custom domain",
@@ -6,11 +6,38 @@ import { useWindowSize } from "../hook/useWindowSize";
 import Tour from "reactour";
 import axios from "axios";
 import { useSelector } from "react-redux";
+import Parse from "parse";
+import ModalUi from "../primitives/ModalUi";
+import { useNavigate, useLocation, Outlet } from "react-router-dom";

-const HomeLayout = ({ children }) => {
+const HomeLayout = () => {
+  const navigate = useNavigate();
+  const location = useLocation();
  const { width } = useWindowSize();
-  const [isOpen, setIsOpen] = useState(false);
+  const [isOpen, setIsOpen] = useState(true);
  const arr = useSelector((state) => state.TourSteps);
+  const [isUserValid, setIsUserValid] = useState(true);
+  const [isLoader, setIsLoader] = useState(true);
+  useEffect(() => {
+    (async () => {
+      try {
+        // Use the session token to validate the user
+        const userQuery = new Parse.Query(Parse.User);
+        const user = await userQuery.get(Parse.User.current().id, {
+          sessionToken: localStorage.getItem("accesstoken")
+        });
+        if (user) {
+          setIsUserValid(true);
+          setIsLoader(false);
+        } else {
+          setIsUserValid(false);
+        }
+      } catch (error) {
+        // Session token is invalid or there was an error
+        setIsUserValid(false);
+      }
+    })();
+  }, []);

  // reactour state
  const [isCloseBtn, setIsCloseBtn] = useState(true);
@@ -19,20 +46,16 @@ const HomeLayout = ({ children }) => {
  const [tourConfigs, setTourConfigs] = useState([]);

  const showSidebar = () => {
-    setIsOpen(!isOpen);
+    setIsOpen((value) => !value);
  };
  useEffect(() => {
    if (width && width <= 768) {
      setIsOpen(false);
-    } else {
-      setIsOpen(true);
    }
  }, [width]);

  useEffect(() => {
-    if (localStorage.getItem("domain") === "sign" && arr && arr.length > 0) {
-      handleDynamicSteps();
-    } else if (
+    if (
      localStorage.getItem("domain") === "contracts" &&
      arr &&
      arr.length > 0
@@ -71,10 +94,16 @@ const HomeLayout = ({ children }) => {
          position: "top"
          // style: { backgroundColor: "#abd4d2" },
        },
+        {
+          selector: '[data-tut="tourbutton"]',
+          content: `To upload documents for self-signing or to request others’ signatures, simply select the respective buttons.`,
+          position: "top"
+          // style: { backgroundColor: "#abd4d2" },
+        },
        ...resArr,
        {
          selector: '[data-tut="reactourLast"]',
-          content: `You are good to go`,
+          content: `You are ready to start using OpenSign! If you need support feel free to contact us.`,
          position: "top"
          // style: { backgroundColor: "#abd4d2" },
        }
@@ -87,7 +116,7 @@ const HomeLayout = ({ children }) => {
    // console.log("closeTour");
    setIsTour(false);
    const serverUrl = localStorage.getItem("baseUrl");
-    const appId = localStorage.getItem("AppID12");
+    const appId = localStorage.getItem("parseAppId");
    const extUserClass = localStorage.getItem("extended_class");
    const json = JSON.parse(localStorage.getItem("Extand_Class"));
    const extUserId = json && json.length > 0 && json[0].objectId;
@@ -124,20 +153,11 @@ const HomeLayout = ({ children }) => {
  };

  async function checkTourStatus() {
-    const serverUrl = localStorage.getItem("baseUrl");
-    const appId = localStorage.getItem("AppID12");
-    const extUserClass = localStorage.getItem("extended_class");
-    const json = JSON.parse(localStorage.getItem("Extand_Class"));
-    const extUserId = json && json.length > 0 && json[0].objectId;
-    // console.log("extUserId ", extUserId);
-    const res = await axios.get(
-      serverUrl + "classes/" + extUserClass + "/" + extUserId,
-      {
-        headers: {
-          "X-Parse-Application-Id": appId
-        }
-      }
-    );
+    const currentUser = Parse.User.current();
+    const cloudRes = await Parse.Cloud.run("getUserDetails", {
+      email: currentUser.get("email")
+    });
+    const res = { data: cloudRes.toJSON() };
    if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
      const tourStatus = res.data.TourStatus;
      // console.log("res ", res.data.TourStatus);
@@ -164,32 +184,80 @@ const HomeLayout = ({ children }) => {
      setIsOpen(false);
    }
  };
+
+  const handleLoginBtn = () => {
+    try {
+      Parse.User.logOut();
+    } catch (err) {
+      console.log("err ", err);
+    } finally {
+      localStorage.removeItem("accesstoken");
+      navigate("/", { replace: true, state: { from: location } });
+    }
+  };
  return (
    <div>
      <div className="sticky top-0 z-50">
        <Header showSidebar={showSidebar} />
      </div>
-      <div className="flex md:flex-row flex-col z-50">
-        <Sidebar isOpen={isOpen} closeSidebar={closeSidebar} />
+      {isUserValid ? (
+        <>
+          {isLoader ? (
+            <div
+              style={{
+                height: "100vh",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center"
+              }}
+            >
+              <div
+                style={{
+                  fontSize: "45px",
+                  color: "#3dd3e0"
+                }}
+                className="loader-37"
+              ></div>
+            </div>
+          ) : (
+            <>
+              <div className="flex md:flex-row flex-col z-50">
+                <Sidebar isOpen={isOpen} closeSidebar={closeSidebar} />

-        <div className="relative h-screen flex flex-col justify-between w-full overflow-y-auto">
-          <div className="bg-[#eef1f5] p-3">{children}</div>
-          <div className="z-30">
-            <Footer />
+                <div className="relative h-screen flex flex-col justify-between w-full overflow-y-auto">
+                  <div className="bg-[#eef1f5] p-3">{<Outlet />}</div>
+                  <div className="z-30">
+                    <Footer />
+                  </div>
+                </div>
+              </div>
+              <Tour
+                onRequestClose={closeTour}
+                steps={tourConfigs}
+                isOpen={isTour}
+                closeWithMask={false}
+                disableKeyboardNavigation={["esc"]}
+                // disableInteraction={true}
+                scrollOffset={-100}
+                rounded={5}
+                showCloseButton={isCloseBtn}
+              />
+            </>
+          )}
+        </>
+      ) : (
+        <ModalUi title={"Session Expired"} isOpen={true} showClose={false}>
+          <div className="flex flex-col justify-center items-center py-4 md:py-5 gap-5">
+            <p className="text-xl font-normal">Your session has expired.</p>
+            <button
+              onClick={handleLoginBtn}
+              className="text-base px-3 py-1.5 rounded shadow-md text-white bg-[#1ab6ce]"
+            >
+              Login
+            </button>
          </div>
-        </div>
-      </div>
-      <Tour
-        onRequestClose={closeTour}
-        steps={tourConfigs}
-        isOpen={isTour}
-        closeWithMask={false}
-        disableKeyboardNavigation={["esc"]}
-        // disableInteraction={true}
-        scrollOffset={-100}
-        rounded={5}
-        showCloseButton={isCloseBtn}
-      />
+        </ModalUi>
+      )}
    </div>
  );
 };
@@ -1,58 +0,0 @@
-import React from "react";
-import stamp from "./stamp2.png";
-import sign from "./sign3.png";
-import { themeColor } from "./IconColor.js";
-
-function DragElement({ id }) {
-  const selectedId = id;
-
-  return (
-    <div>
-      {selectedId === 3 ? (
-        <div
-          style={{
-            display: "flex",
-            flexDirection: "column",
-            alignItems: "center",
-            userSelect: "none"
-          }}
-        >
-          <img
-            alt="sign img"
-            style={{
-              width: "25px",
-              height: "23px",
-              background: themeColor()
-            }}
-            src={sign}
-          />
-          <span style={{ color: themeColor(), fontSize: "12px" }}>
-            Signature
-          </span>
-        </div>
-      ) : (
-        <div
-          style={{
-            display: "flex",
-            flexDirection: "column",
-            alignItems: "center",
-            userSelect: "none"
-          }}
-        >
-          <img
-            alt="stamp img"
-            style={{
-              width: "25px",
-              height: "23px",
-              background: themeColor()
-            }}
-            src={stamp}
-          />
-          <span style={{ color: themeColor(), fontSize: "12px" }}>Stamp</span>
-        </div>
-      )}
-    </div>
-  );
-}
-
-export default DragElement;
@@ -1,3 +0,0 @@
-export const themeColor = () => {
-  return "#47a3ad";
-};
--- a/Show More
+++ b/Show More