update default cert base64

update default pfx passkey
change default value of USE_LOCAL to True
2026-09-04 08:48:55 +02:00 · 2023-11-18 01:39:35 +05:30 · 2023-11-18 01:19:02 +05:30 · 2023-11-18 00:59:03 +05:30 · 2023-11-13 17:13:48 +05:30 · 2023-11-10 02:52:04 +05:30
201 changed files with 16262 additions and 24222 deletions
@@ -178,33 +178,6 @@
      "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"
-      ]
    }
  ]
 }
@@ -39,18 +39,11 @@ 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 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
+# Email mailgun 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_PORT=
-SMTP_USER_EMAIL=
-SMTP_PASS=

 # Base64 encoded PFX or p12 document signing certificate file *********************************************************************************************************************
 PFX_BASE64=
@@ -44,16 +44,10 @@ DO_REGION=us-west
 # local storage
 USE_LOCAL=TRUE

-# 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=
+# Email mailgun 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.yourhost.com
-SMTP_PORT=443
-SMTP_USER_EMAIL=mailer@yourdomain.com
-SMTP_PASS=password
-

 # Base64 encoded PFX or p12 document signing certificate file *********************************************************************************************************************
 PFX_BASE64='MIIKCQIBAzCCCc8GCSqGSIb3DQEHAaCCCcAEggm8MIIJuDCCBG8GCSqGSIb3DQEH
@@ -1,73 +0,0 @@
-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
@@ -1,70 +0,0 @@
-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
@@ -1,22 +0,0 @@
-# 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"
@@ -1,4 +1,5 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"

-npm run lint-staged-changes
+npx eslint '**/*.{js,jsx}'
+npx pretty-quick --staged '**/*.{js,jsx}'
@@ -1,3 +0,0 @@
-{
-  "*.js": "prettier --write"
-}
@@ -98,7 +98,8 @@ Environment Varaibles:
 | PUBLIC_URL  | http://localhost:3000  | Set it to the URL form where the app home page will be accessed |
 | GENERATE_SOURCEMAP  | false | Set it to true if you want to generate the Sourcemap for debugging |
 | REACT_APP_SERVERURL  | http://localhost:8080/app  | 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_APPID  | opensignstgn  | 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  | http://localhost:3000  | Set it to the URL form where the app home page will be accessed |
+| PUBLIC_URL  | opensignstgn  | 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. |
 | APP_ID  | opensignstgn  | 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. |
 | appName  | open_sign_server  | Name of the app. It will be visible in the verification emails sent out. |
 | MASTER_KEY  | XnAadwKxxByMr  | 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. |
@@ -1,7 +1,8 @@
-<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">
+<h1 align="center"><a href='https://www.opensignlabs.com'>OpenSign™</a></h1>
+                    
+<div align="center">

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

 [![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)
@@ -22,7 +23,7 @@
  <a href="https://www.linkedin.com/company/opensign%E2%84%A2/about/">LinkedIn</a>


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

 ---
 </div>
@@ -38,11 +39,10 @@
 7. [Acknowledgments](#acknowledgments)

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

 ### Introduction

-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.
+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.

 ---

@@ -129,11 +129,6 @@ 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/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,7 +10,6 @@

 # production
 /build
-/mfbuild

 # misc
 .env
@@ -20,6 +20,10 @@ module.exports = {
    "react-router-dom": {
      singleton: true,
      requiredVersion: dependencies["react-router-dom"]
+    },
+    "rjsf-conditionals": {
+      singleton: true,
+      requiredVersion: dependencies["rjsf-conditionals"]
    }
  }
 };
@@ -9,6 +9,9 @@
      "version": "0.1.0",
      "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",
        "daisyui": "^3.9.2",
        "file-saver": "^2.0.5",
@@ -36,6 +39,7 @@
        "reactour": "^1.19.2",
        "redux": "^4.2.1",
        "redux-thunk": "^2.4.2",
+        "rjsf-conditionals": "github:prafullnavkar-nxg/rjsf-conditionals",
        "serve": "^14.2.1",
        "styled-components": "^4.4.1",
        "web-vitals": "^2.1.4"
@@ -3917,6 +3921,85 @@
        "react": ">=16.14.0"
      }
    },
+    "node_modules/@rjsf/core": {
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-5.13.0.tgz",
+      "integrity": "sha512-rCpJGR0yPP/ip9LKcr3SmDMkbLx4QIaRA+ag0rcalSw1XLXBSzh53SpfgaB2HN++1xhUvWtIUERRHpWjQp1E7w==",
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "markdown-to-jsx": "^7.3.2",
+        "nanoid": "^3.3.6",
+        "prop-types": "^15.8.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@rjsf/utils": "^5.12.x",
+        "react": "^16.14.0 || >=17"
+      }
+    },
+    "node_modules/@rjsf/utils": {
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/@rjsf/utils/-/utils-5.13.0.tgz",
+      "integrity": "sha512-tG2OuOJUJZ0W7VMZceD0I2SOjfMRRT1tRtG+SKbdNqhtH/gpg40aOMUj9cWgSQnYISEkNZjZq/z7NWln5RxW6A==",
+      "dependencies": {
+        "json-schema-merge-allof": "^0.8.1",
+        "jsonpointer": "^5.0.1",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "react-is": "^18.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "react": "^16.14.0 || >=17"
+      }
+    },
+    "node_modules/@rjsf/utils/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
+    "node_modules/@rjsf/validator-ajv8": {
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/@rjsf/validator-ajv8/-/validator-ajv8-5.13.0.tgz",
+      "integrity": "sha512-8j0xLsxJA/k1UADeDYZ2aMVrswvOCEYNC++YchoAgWRHqDiaGAUyRbbk7oxMi6QUXnhnlCIepzNeTclHnSfPXQ==",
+      "dependencies": {
+        "ajv": "^8.12.0",
+        "ajv-formats": "^2.1.1",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@rjsf/utils": "^5.12.x"
+      }
+    },
+    "node_modules/@rjsf/validator-ajv8/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@rjsf/validator-ajv8/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
    "node_modules/@rollup/plugin-babel": {
      "version": "5.3.1",
      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -6882,6 +6965,27 @@
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
    },
+    "node_modules/compute-gcd": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/compute-gcd/-/compute-gcd-1.2.1.tgz",
+      "integrity": "sha512-TwMbxBNz0l71+8Sc4czv13h4kEqnchV9igQZBi6QUaz09dnz13juGnnaWWJTRsP3brxOoxeB4SA2WELLw1hCtg==",
+      "dependencies": {
+        "validate.io-array": "^1.0.3",
+        "validate.io-function": "^1.0.2",
+        "validate.io-integer-array": "^1.0.0"
+      }
+    },
+    "node_modules/compute-lcm": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/compute-lcm/-/compute-lcm-1.1.2.tgz",
+      "integrity": "sha512-OFNPdQAXnQhDSKioX8/XYT6sdUlXwpeMjfd6ApxMJfyZ4GxmLR1xvMERctlYhlHwIiz6CSpBc2+qYKjHGZw4TQ==",
+      "dependencies": {
+        "compute-gcd": "^1.2.1",
+        "validate.io-array": "^1.0.3",
+        "validate.io-function": "^1.0.2",
+        "validate.io-integer-array": "^1.0.0"
+      }
+    },
    "node_modules/concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -7572,6 +7676,14 @@
      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
    },
+    "node_modules/deepcopy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/deepcopy/-/deepcopy-2.1.0.tgz",
+      "integrity": "sha512-8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ==",
+      "dependencies": {
+        "type-detect": "^4.0.8"
+      }
+    },
    "node_modules/deepmerge": {
      "version": "4.3.1",
      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
@@ -13306,6 +13418,27 @@
      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
    },
+    "node_modules/json-schema-compare": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/json-schema-compare/-/json-schema-compare-0.2.2.tgz",
+      "integrity": "sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==",
+      "dependencies": {
+        "lodash": "^4.17.4"
+      }
+    },
+    "node_modules/json-schema-merge-allof": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/json-schema-merge-allof/-/json-schema-merge-allof-0.8.1.tgz",
+      "integrity": "sha512-CTUKmIlPJbsWfzRRnOXz+0MjIqvnleIXwFTzz+t9T86HnYX/Rozria6ZVGLktAU9e+NygNljveP+yxqtQp/Q4w==",
+      "dependencies": {
+        "compute-lcm": "^1.1.2",
+        "json-schema-compare": "^0.2.2",
+        "lodash": "^4.17.20"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
    "node_modules/json-schema-traverse": {
      "version": "0.4.1",
      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -13801,11 +13934,21 @@
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
    "node_modules/lodash.debounce": {
      "version": "4.0.8",
      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
    },
+    "node_modules/lodash.isequalwith": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequalwith/-/lodash.isequalwith-4.4.0.tgz",
+      "integrity": "sha512-dcZON0IalGBpRmJBmMkaoV7d3I80R2O+FrzsZyHdNSFrANq/cgDqKQNmAHE8UEj4+QYWwwhkQOVdLHiAopzlsQ=="
+    },
    "node_modules/lodash.isplainobject": {
      "version": "4.0.6",
      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
@@ -14167,6 +14310,17 @@
        "tmpl": "1.0.5"
      }
    },
+    "node_modules/markdown-to-jsx": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.3.2.tgz",
+      "integrity": "sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q==",
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "react": ">= 0.14.0"
+      }
+    },
    "node_modules/mdn-data": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -18048,6 +18202,26 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
+    "node_modules/rjsf-conditionals": {
+      "version": "1.5.0",
+      "resolved": "git+ssh://git@github.com/prafullnavkar-nxg/rjsf-conditionals.git#439aa44e3ece077b1c8098278f86f454ad7185cf",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@rjsf/validator-ajv8": "^5.13.0",
+        "deepcopy": "^2.0.0",
+        "lodash.isequalwith": "^4.4.0",
+        "selectn": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@rjsf/core": ">=2.0.0",
+        "core-js": "^2.5.7",
+        "prop-types": "^15.7.2",
+        "react": "^18.2.0"
+      }
+    },
    "node_modules/rollup": {
      "version": "2.79.1",
      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
@@ -20249,6 +20423,38 @@
      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
    },
+    "node_modules/validate.io-array": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/validate.io-array/-/validate.io-array-1.0.6.tgz",
+      "integrity": "sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg=="
+    },
+    "node_modules/validate.io-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/validate.io-function/-/validate.io-function-1.0.2.tgz",
+      "integrity": "sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ=="
+    },
+    "node_modules/validate.io-integer": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/validate.io-integer/-/validate.io-integer-1.0.5.tgz",
+      "integrity": "sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==",
+      "dependencies": {
+        "validate.io-number": "^1.0.3"
+      }
+    },
+    "node_modules/validate.io-integer-array": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/validate.io-integer-array/-/validate.io-integer-array-1.0.0.tgz",
+      "integrity": "sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==",
+      "dependencies": {
+        "validate.io-array": "^1.0.3",
+        "validate.io-integer": "^1.0.4"
+      }
+    },
+    "node_modules/validate.io-number": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/validate.io-number/-/validate.io-number-1.0.3.tgz",
+      "integrity": "sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg=="
+    },
    "node_modules/vary": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -4,6 +4,9 @@
  "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",
    "daisyui": "^3.9.2",
    "file-saver": "^2.0.5",
@@ -31,6 +34,7 @@
    "reactour": "^1.19.2",
    "redux": "^4.2.1",
    "redux-thunk": "^2.4.2",
+    "rjsf-conditionals": "github:prafullnavkar-nxg/rjsf-conditionals",
    "serve": "^14.2.1",
    "styled-components": "^4.4.1",
    "web-vitals": "^2.1.4"
@@ -38,8 +42,7 @@
  "scripts": {
    "start": "serve -s build",
    "start-dev": "mf-cra start",
-    "version": "curl -s https://api.github.com/repos/opensignlabs/opensign/releases/latest | grep '\"tag_name\":' | awk -F '\"' '{print $4}' > ./public/version.txt",
-    "build": "npm run version && rm -rf public/mfbuild && npm run micro && CI=false && mf-cra build",
+    "build": "rm -rf public/mfbuild && npm run micro && CI=false && mf-cra build",
    "micro": "cd ../../microfrontends/SignDocuments && npm install && npm run build",
    "test": "react-scripts test",
    "eject": "react-scripts eject",
@@ -82,4 +85,4 @@
    "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>OpenSign™</title>
+  <title>Open sign</title>
 </head>

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

-</html>
+</html>
@@ -1 +0,0 @@
-v1.1.1-beta
@@ -7,7 +7,7 @@ import Signup from "./routes/Signup";
 import Form from "./routes/Form";
 import Report from "./routes/Report";
 import Dashboard from "./routes/Dashboard";
-import Subscriptions from "./routes/PlanSubscriptions";
+import PlanSubscriptions from "./routes/PlanSubscriptions";
 import HomeLayout from "./layout/HomeLayout";
 import UserProfile from "./routes/UserProfile";
 import PageNotFound from "./routes/PageNotFound";
@@ -15,10 +15,6 @@ import ForgetPassword from "./routes/ForgetPassword";
 import ChangePassword from "./routes/ChangePassword";
 import ReportMicroapp from "./components/ReportMicroapp";
 import LoadMf from "./routes/LoadMf";
-import GenerateToken from "./routes/GenerateToken";
-import ValidateRoute from "./primitives/ValidateRoute";
-import Webhook from "./routes/Webhook";
-import Validate from "./primitives/Validate";

 function App() {
  const [isloading, setIsLoading] = useState(true);
@@ -62,34 +58,88 @@ function App() {
      ) : (
        <BrowserRouter>
          <Routes>
-            <Route element={<ValidateRoute />}>
-              <Route exact path="/" element={<Login />} />
-              <Route exact path="/signup" element={<Signup />} />
-            </Route>
-            <Route element={<Validate />}>
-              <Route exact path="/load/:remoteApp/*" element={<LoadMf />} />
-            </Route>
+            <Route exact path="/" element={<Login />} />
+            <Route exact path="/signup" element={<Signup />} />
            <Route exact path="/loadmf/:remoteApp/*" element={<LoadMf />} />
            <Route exact path="/forgetpassword" element={<ForgetPassword />} />
            {process.env.REACT_APP_ENABLE_SUBSCRIPTION && (
              <>
                <Route exact path="/pgsignup" element={<Pgsignup />} />
-                <Route exact path="/subscription" element={<Subscriptions />} />
+                <Route
+                  exact
+                  path="/subscription"
+                  element={<PlanSubscriptions />}
+                />
              </>
            )}
-            <Route element={<HomeLayout />}>
-              <Route path="/changepassword" element={<ChangePassword />} />
-              <Route path="/mf/:remoteApp/*" element={<Microapp />} />
-              <Route path="/asmf/:remoteApp/*" element={<Microapp />} />
-              <Route path="/rpmf/:remoteApp/*" element={<ReportMicroapp />} />
-              <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>
+            <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>
        </BrowserRouter>
      )}
@@ -1,283 +0,0 @@
-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");
-  Parse.serverURL = parseBaseUrl;
-  Parse.initialize(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,7 +1,6 @@
 import React, { useState, useEffect } from "react";
 import Parse from "parse";
 import axios from "axios";
-import { modalCancelBtnColor, modalSubmitBtnColor } from "../constant/const";

 const AppendFormInForm = (props) => {
  const [name, setName] = useState("");
@@ -33,7 +32,6 @@ 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);
@@ -47,7 +45,6 @@ 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);
@@ -107,18 +104,13 @@ const AppendFormInForm = (props) => {
          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]
-            });
-          }
+          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
@@ -165,18 +157,13 @@ const AppendFormInForm = (props) => {
          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]
-            });
-          }
+          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);
@@ -254,24 +241,7 @@ 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"
@@ -291,19 +261,36 @@ 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"
-              style={{ backgroundColor: modalSubmitBtnColor }}
-              className="mr-2 px-[20px] py-1.5 text-white rounded shadow-md text-center focus:outline-none "
+              className="bg-[#1ab6ce] text-sm text-white px-4 py-2 rounded shadow focus:outline-none"
            >
              Submit
            </button>
            <button
              type="button"
              onClick={() => handleReset()}
-              style={{ backgroundColor: modalCancelBtnColor }}
-              className="px-4 py-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
+              className="bg-[#188ae2] text-sm text-white px-4 py-2 rounded ml-2 shadow focus:outline-none"
            >
              Reset
            </button>
@@ -1,21 +1,8 @@
 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);
@@ -38,18 +25,16 @@ 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;
-        <span onClick={openUrl} className="hover:underline cursor-pointer">
-          {appName} ( version: {version ? version : `${Package.version} `})
-        </span>
+        {appName}{" "}
+        (version:{" "}
+        {localStorage.getItem("appVersion") &&
+          `${Package.version}.${localStorage.getItem("appVersion")}`}
+        )
      </div>
      <button
        className={`${
@@ -4,7 +4,6 @@ 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();
@@ -119,12 +118,6 @@ 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,11 +42,9 @@ const LoginFacebook = ({
  };

  const checkExtUser = async (details) => {
-    // 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);
+    const extUser = new Parse.Query("contracts_Users");
+    extUser.equalTo("Email", details.Email);
+    const extRes = await extUser.first();
    // console.log("extRes ", extRes);
    if (extRes) {
      const params = { ...details, Phone: extRes.get("Phone") };
@@ -86,7 +84,7 @@ const LoginFacebook = ({
            email: userDetails.Email,
            // "passsword":userDetails.Phone,
            phone: userDetails.Phone,
-            role: "contracts_User",
+            role: "contracts_Admin",
            company: userDetails.Company
          }
        };
@@ -211,19 +209,18 @@ const LoginFacebook = ({
                  <div>
                    <button
                      type="button"
-                      onClick={() => handleSubmitbtn()}
-                      className="btn btn-info"
-                      style={{ marginRight: 10 }}
+                      className="btn btn-secondary"
+                      onClick={() => setIsModal(false)}
+                      style={{ marginRight: 10, width: 90 }}
                    >
-                      Sign up
+                      Cancel
                    </button>
                    <button
                      type="button"
-                      className="btn btn-secondary"
-                      onClick={() => setIsModal(false)}
-                      style={{ width: 90 }}
+                      onClick={() => handleSubmitbtn()}
+                      className="btn btn-info"
                    >
-                      Cancel
+                      Sign up
                    </button>
                  </div>
                </form>
@@ -2,8 +2,6 @@ import React, { useState, useRef } from "react";
 import Parse from "parse";
 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
@@ -44,42 +42,7 @@ const GoogleSignInBtn = ({
      width: "187px"
    });
  });
-  const clearStorage = async () => {
-    if (Parse.User.current()) {
-      await Parse.User.logOut();
-    }
-    let baseUrl = localStorage.getItem("BaseUrl12");
-    let appid = localStorage.getItem("AppID12");
-    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("BaseUrl12", baseUrl);
-    localStorage.setItem("AppID12", 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) {
@@ -103,11 +66,9 @@ const GoogleSignInBtn = ({
    }
  };
  const checkExtUser = async (details) => {
-    // 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);
+    const extUser = new Parse.Query("contracts_Users");
+    extUser.equalTo("Email", details.Gmail);
+    const extRes = await extUser.first();
    // console.log("extRes ", extRes);
    if (extRes) {
      const params = { ...details, Phone: extRes.get("Phone") };
@@ -150,7 +111,7 @@ const GoogleSignInBtn = ({
            email: userDetails.Email,
            // "passsword":userDetails.Phone,
            phone: userDetails.Phone,
-            role: "contracts_User",
+            role: "contracts_Admin",
            company: userDetails.Company,
            jobTitle: userDetails.Destination
          }
@@ -233,94 +194,117 @@ const GoogleSignInBtn = ({
        </div>
      )}
      <div ref={googleBtn} className="text-sm"></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
-            />
+
+      {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="bg-[#6c757d] p-2 text-white rounded"
+                      onClick={handleCloseModal}
+                      style={{ marginRight: 10, width: 90 }}
+                    >
+                      Cancel
+                    </button>
+                    <button
+                      type="button"
+                      className="bg-[#17a2b8] p-2 text-white rounded"
+                      onClick={() => handleSubmitbtn()}
+                    >
+                      Sign up
+                    </button>
+                  </div>
+                </form>
+              </div>
+            </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>
+      )}
    </div>
  );
 };
@@ -0,0 +1,391 @@
+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;
@@ -0,0 +1,237 @@
+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;
@@ -0,0 +1,894 @@
+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);
@@ -1,6 +1,7 @@
 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";
@@ -34,9 +35,14 @@ const DashboardCard = (props) => {
          let data = JSON.parse(localStorage.getItem("Extand_Class"));
          res = data[0];
        } else {
-          res = await Parse.Cloud.run("getUserDetails", {
-            email: currentUser.get("email")
+          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 q.first();
          if (res) res = res.toJSON();
        }
        if (res) {
@@ -44,7 +50,12 @@ 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) {
@@ -99,10 +110,13 @@ const DashboardCard = (props) => {
            let data = JSON.parse(localStorage.getItem("Extand_Class"));
            resr = data[0];
          } else {
-            resr = await Parse.Cloud.run("getUserDetails", {
-              email: currentUser.get("email")
-            });
-            if (resr) resr = resr.toJSON();
+            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();
          }

          let json = resr;
@@ -136,65 +150,47 @@ const DashboardCard = (props) => {
          "X-Parse-Application-Id": parseAppId,
          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
        };
-        // 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
+        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
                );
-                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);
+                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);
+                    }
                  }
                }
-              }
-              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]);
+                setresponse(arr.length);
              } 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);
@@ -231,10 +227,13 @@ const DashboardCard = (props) => {
              let data = JSON.parse(localStorage.getItem("Extand_Class"));
              res = data[0];
            } else {
-              let resr = await Parse.Cloud.run("getUserDetails", {
-                email: currentUser.get("email")
-              });
-              if (res) res = resr.toJSON();
+              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 json = res;
@@ -9,60 +9,39 @@ 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]);

-  // 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) => {
+  const getReportData = async (id) => {
    setIsLoader(true);
    const json = reportJson(id);
    if (json) {
      setActions(json.actions);
      setReportName(json.reportName);
-      setHeading(json.heading);
+      const { className, params, keys, orderBy } = json;
      Parse.serverURL = localStorage.getItem("BaseUrl12");
      Parse.initialize(localStorage.getItem("AppID12"));
-      const currentUser = Parse.User.current().id;
+      const serverURL =
+        localStorage.getItem("BaseUrl12") + "classes/" + className;

+      const strParams = JSON.stringify(params);
+      const strKeys = keys.join();
      const headers = {
        "Content-Type": "application/json",
        "X-Parse-Application-Id": localStorage.getItem("AppID12"),
-        sessiontoken: localStorage.getItem("accesstoken")
+        "X-Parse-Session-Token": localStorage.getItem("accesstoken")
      };
      try {
-        const params = { reportId: id, skip: skipUserRecord, limit: limit };
-        const url = `${localStorage.getItem("BaseUrl12")}/functions/getReport`;
-        const res = await axios.post(url, params, {
-          headers: headers,
-          signal: abortController.signal // is used to cancel fetch query
-        });
+        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);
        if (id === "5Go51Q7T8r") {
-          const listData = res.data?.result.filter((x) => x.Signers.length > 0);
+          const currentUser = Parse.User.current().id;
+          const listData = res.data?.results.filter(
+            (x) => x.Signers.length > 0
+          );
          let arr = [];
          for (const obj of listData) {
            const isSigner = obj.Signers.some(
@@ -84,34 +63,14 @@ function DashboardReport(props) {
              }
            }
          }
-          if (arr.length === docPerPage) {
-            setIsMoreDocs(true);
-          } else {
-            setIsMoreDocs(false);
-          }
-          setList((prevRecord) =>
-            prevRecord.length > 0 ? [...prevRecord, ...arr] : arr
-          );
+          setList(arr);
        } else {
-          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
-          );
+          setList(res.data?.results);
        }
        setIsLoader(false);
      } catch (err) {
-        const isCancel = axios.isCancel(err);
-        if (!isCancel) {
-          console.log("err ", err);
-          setIsLoader(false);
-        }
+        console.log("err ", err);
+        setIsLoader(false);
      }
    } else {
      setIsLoader(false);
@@ -142,12 +101,8 @@ function DashboardReport(props) {
            <ReportTable
              ReportName={reportName}
              List={List}
-              setList={setList}
+              act={"Sign"}
              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,4 +1,5 @@
-import React, { Suspense, lazy } from "react";
+import React, { useState, Suspense, lazy } from "react";
+import moment from "moment";
 import ErrorBoundary from "../ErrorBoundary";

 const DashboardCard = lazy(() => import("./DashboardCard"));
@@ -6,6 +7,258 @@ const DashboardCard = lazy(() => import("./DashboardCard"));
 const DashboardReport = lazy(() => import("./DashboardReport"));

 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 renderSwitchWithTour = (col) => {
    switch (col.widget.type) {
      case "Card":
@@ -19,6 +272,7 @@ const GetDashboard = (props) => {
              <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}
@@ -27,12 +281,50 @@ 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 Record={col.widget} />
+                <DashboardReport Filter={_filter} Record={col.widget} />
              </div>
            </Suspense>
          </div>
@@ -54,6 +346,7 @@ const GetDashboard = (props) => {
              <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}
@@ -62,11 +355,48 @@ 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 Record={col.widget} />
+              <DashboardReport Filter={_filter} Record={col.widget} />
            </div>
          </Suspense>
        );
@@ -1,147 +0,0 @@
-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 [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();
-    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: "dange", 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) {
-          setAlert({
-            type: "success",
-            message: "Folder created successfully!"
-          });
-          setIsAlert(true);
-          setTimeout(() => {
-            setIsAlert(false);
-          }, 1000);
-          if (onSuccess) {
-            onSuccess(res);
-          }
-        }
-      }
-    } else {
-      setAlert({ type: "info", message: "Please fill folder name" });
-      setIsAlert(true);
-      setTimeout(() => {
-        setIsAlert(false);
-      }, 1000);
-    }
-  };
-  const handleOptions = (e) => {
-    setSelectedParent(e.target.value);
-  };
-  return (
-    <div>
-      {isAlert && <Alert type={alert.type}>{alert.message}</Alert>}
-      <div id="createFolder">
-        <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}
-            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;
@@ -1,60 +0,0 @@
-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,265 @@
+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;
@@ -0,0 +1,83 @@
+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;
@@ -0,0 +1,70 @@
+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;
@@ -0,0 +1,484 @@
+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);
@@ -0,0 +1,709 @@
+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);
@@ -0,0 +1,92 @@
+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,261 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Parse from "parse";
-import CreateFolder from "./CreateFolder";
-import ModalUi from "../../primitives/ModalUi";
-
-const SelectFolder = ({ required, onSuccess, folderCls }) => {
-  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]);
-  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);
-    }
-  };
-  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);
-    }
-  };
-
-  const handleSubmit = () => {
-    let url = "Root";
-    tabList.forEach((t) => {
-      url = url + " / " + t.Name;
-    });
-    setFolderPath(url);
-    setSelectedFolder(clickFolder);
-    if (onSuccess) {
-      onSuccess(clickFolder);
-    }
-    SetIsOpen(false);
-  };
-  const handleCancel = () => {
-    SetIsOpen(false);
-    setClickFolder({});
-    setFolderList([]);
-    setTabList([]);
-  };
-
-  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);
-    }
-  };
-  const handleCreate = () => {
-    setIsAdd(!isAdd);
-  };
-  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="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 : "Root"}
-            </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>
-      <ModalUi
-        title={"Select Folder"}
-        isOpen={isOpen}
-        handleClose={handleCancel}
-      >
-        <div className="w-full min-w-[300px] md:min-w-[500px] px-3">
-          <div className="py-2 text-[#ac4848] text-[14px] font-[500]">
-            <span
-              className="cursor-pointer"
-              title="Root"
-              onClick={(e) => removeTabListItem(e)}
-            >
-              Root /{" "}
-            </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">
-            {!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>
-              ))}
-            {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;
@@ -1,189 +0,0 @@
-import React, { useState, useEffect } from "react";
-import Select from "react-select";
-import AppendFormInForm from "../AppendFormInForm";
-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] = 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);
-  };
-
-  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 (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 && (
-              <AppendFormInForm
-                valueKey={"objectId"}
-                displayKey={"Name"}
-                details={handleNewDetails}
-                closePopup={handleModalCloseClick}
-              />
-            )}
-          </div>
-        </Modal>
-      </div>
-    </div>
-  );
-};
-
-export default SignersInput;
@@ -0,0 +1,26 @@
+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;
@@ -42,8 +42,9 @@ const Sidebar = ({ isOpen, closeSidebar }) => {

  return (
    <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"}`}
+      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"
+        }`}
    >
      <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">
@@ -1,3 +0,0 @@
-export const openInNewTab = (url) => {
-  window.open(url, "_blank", "noopener,noreferrer");
-};
@@ -1,9 +0,0 @@
-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";
@@ -0,0 +1,210 @@
+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,20 +15,3 @@ 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,15 +4,4 @@

 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,26 +1,585 @@
-import { documentCls, templateCls } from "../constant/const";
-export const formJson = {
+import Parse from "parse";
+export const formJson = (id) => {
+  let formData;
  //json form for signYourself
-  sHAnZphf69: {
-    title: "Sign Yourself",
-    redirectRoute: "signaturePdf",
-    msgVar: "Document",
-    Cls: documentCls
-  },
+  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=="
+    };

-  //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
+    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;
  }
 };
+
@@ -1,15 +1,35 @@
+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",
-        heading: head,
+        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",
        actions: [
          {
            btnLabel: "sign",
@@ -25,7 +45,27 @@ export default function reportJson(id) {
    case "4Hhwbp482K":
      return {
        reportName: "Need your sign",
-        heading: head,
+        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",
        actions: [
          {
            btnLabel: "sign",
@@ -41,7 +81,31 @@ export default function reportJson(id) {
    case "1MwEuxLEkF":
      return {
        reportName: "In-progress documents",
-        heading: head,
+        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",
        actions: [
          {
            btnLabel: "View",
@@ -57,7 +121,27 @@ export default function reportJson(id) {
    case "kQUoW4hUXz":
      return {
        reportName: "Completed Documents",
-        heading: head,
+        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",
        actions: [
          {
            btnLabel: "View",
@@ -69,11 +153,63 @@ export default function reportJson(id) {
          }
        ]
      };
+    // 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"
+          }
+        ]
+      };
    //  declined documents report
    case "UPr2Fm5WY3":
      return {
        reportName: "Declined Documents",
-        heading: head,
+        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",
        actions: [
          {
            btnLabel: "View",
@@ -89,7 +225,39 @@ export default function reportJson(id) {
    case "zNqBHXHsYH":
      return {
        reportName: "Expired Documents",
-        heading: head,
+        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",
        actions: [
          {
            btnLabel: "View",
@@ -105,7 +273,31 @@ export default function reportJson(id) {
    case "d9k3UfYHBc":
      return {
        reportName: "Recently sent for signatures",
-        heading: dashboardReportHead,
+        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",
        actions: [
          {
            btnLabel: "View",
@@ -121,7 +313,27 @@ export default function reportJson(id) {
    case "5Go51Q7T8r":
      return {
        reportName: "Recent signature requests",
-        heading: dashboardReportHead,
+        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",
        actions: [
          {
            btnLabel: "Sign",
@@ -137,7 +349,28 @@ export default function reportJson(id) {
    case "kC5mfynCi4":
      return {
        reportName: "Drafts",
-        heading: ["Title", "Note", "Folder", "File", "Owner", "Signers"],
+        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",
        actions: [
          {
            btnLabel: "sign",
@@ -149,45 +382,6 @@ export default function reportJson(id) {
          }
        ]
      };
-    // 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:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/placeHolderSign"
-          },
-          {
-            btnLabel: "Edit",
-            btnColor: "#00c9d5",
-            textColor: "white",
-            btnIcon: "fa fa-plus",
-            redirectUrl:
-              "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/template"
-          }
-        ]
-      };
    default:
      return null;
  }
@@ -6,7 +6,6 @@
        "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",
@@ -27,13 +26,12 @@
        "planName": "THANKS PLAN",
        "currency": "$",
        "price": "29.99",
-        "subtitle": "Use code <span style='background-color: yellow;'>'FREEBETA'</span> to get this for free(First 1000 users)",
+        "subtitle": "Use code 'FREEBETA' to get this for free(First 100 users)",
        "btnText": "Subscribe",
        "url": "https://subscriptions.zoho.in/subscribe/ef798486e6a0a11ea65f2bae8f2af901dbadf3175d495584fd25b9af5d2f2b9e/thanks",
-        "target": "_self",
        "benefits": [
            "Sign Unlimited Documents",
-            "Unlimited Secure Doc Storage with OpenSign™ Drive",
+            "Unlimited Secure Doc Storage with OpenSignDrive",
            "Unlimited Guest Signers",
            "Unlimited completion certificates",
            "Unique Code(OTP) verification for guest signers",
@@ -52,7 +50,6 @@
        "subtitle": "Customization available Priority support.",
        "btnText": "Contact us",
        "url": "https://www.opensignlabs.com/contact-us",
-        "target": "_blank",
        "benefits": [
            "All features",
            "Custom domain",
@@ -6,38 +6,11 @@ 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 = () => {
-  const navigate = useNavigate();
-  const location = useLocation();
+const HomeLayout = ({ children }) => {
  const { width } = useWindowSize();
-  const [isOpen, setIsOpen] = useState(true);
+  const [isOpen, setIsOpen] = useState(false);
  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);
@@ -46,16 +19,20 @@ const HomeLayout = () => {
  const [tourConfigs, setTourConfigs] = useState([]);

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

  useEffect(() => {
-    if (
+    if (localStorage.getItem("domain") === "sign" && arr && arr.length > 0) {
+      handleDynamicSteps();
+    } else if (
      localStorage.getItem("domain") === "contracts" &&
      arr &&
      arr.length > 0
@@ -147,11 +124,20 @@ const HomeLayout = () => {
  };

  async function checkTourStatus() {
-    const currentUser = Parse.User.current();
-    const cloudRes = await Parse.Cloud.run("getUserDetails", {
-      email: currentUser.get("email")
-    });
-    const res = { data: cloudRes.toJSON() };
+    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
+        }
+      }
+    );
    if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
      const tourStatus = res.data.TourStatus;
      // console.log("res ", res.data.TourStatus);
@@ -178,80 +164,32 @@ const HomeLayout = () => {
      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>
-      {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="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">{<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 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>
-        </ModalUi>
-      )}
+        </div>
+      </div>
+      <Tour
+        onRequestClose={closeTour}
+        steps={tourConfigs}
+        isOpen={isTour}
+        closeWithMask={false}
+        disableKeyboardNavigation={["esc"]}
+        // disableInteraction={true}
+        scrollOffset={-100}
+        rounded={5}
+        showCloseButton={isCloseBtn}
+      />
    </div>
  );
 };
@@ -1,30 +0,0 @@
-import React from "react";
-
-const Alert = ({ children, type }) => {
-  const textcolor = type ? theme(type) : theme();
-  function theme(color) {
-    switch (color) {
-      case "success":
-        return "border-[#c3e6cb] bg-[#d4edda] text-[#155724]";
-      case "info":
-        return "border-[#adcdeb] bg-[#c1daf0] text-[#153756]";
-      case "danger":
-        return "border-[#f0a8a8] bg-[#f4bebe] text-[#c42121]";
-      default:
-        return "border-[#d6d6d6] bg-[#d9d9d9] text-[#575757]";
-    }
-  }
-  return (
-    <>
-      {children && (
-        <div
-          className={`z-40 fixed top-20 left-1/2 transform -translate-x-1/2 border-[1px] text-sm ${textcolor} rounded py-[.75rem] px-[1.25rem] `}
-        >
-          {children}
-        </div>
-      )}
-    </>
-  );
-};
-
-export default Alert;
@@ -1,31 +1,18 @@
 import React, { useState, useEffect, useMemo } from "react";
 import pad from "../assets/images/pad.svg";
 import { useNavigate } from "react-router-dom";
-import axios from "axios";
-import "../styles/report.css";
-import ModalUi from "./ModalUi";
-import AppendFormInForm from "../components/AppendFormInForm";
-import { modalSubmitBtnColor, modalCancelBtnColor } from "../constant/const";
+
 const ReportTable = ({
  ReportName,
  List,
-  setList,
  actions,
-  heading,
  setIsNextRecord,
-  isMoreDocs,
-  docPerPage,
-  form
+  isMoreDocs
 }) => {
  const navigate = useNavigate();
  const [currentPage, setCurrentPage] = useState(1);
-  const [actLoader, setActLoader] = useState({});
-  const [isAlert, setIsAlert] = useState(false);
-  const [isErr, setIsErr] = useState(false);
-  const [isDocErr, setIsDocErr] = useState(false);
-  const [isContactform, setIsContactform] = useState(false);
-  const [isDeleteModal, setIsDeleteModal] = useState({});
-  const startIndex = (currentPage - 1) * docPerPage;
+  const docPerPage = 10;
+  // const pageNumbers = [];

  // For loop is used to calculate page numbers visible below table
  // Initialize pageNumbers using useMemo to avoid unnecessary re-creation
@@ -35,7 +22,7 @@ const ReportTable = ({
      calculatedPageNumbers.push(i);
    }
    return calculatedPageNumbers;
-  }, [List, docPerPage]);
+  }, [List]);
  //  below useEffect reset currenpage to 1 if user change route
  useEffect(() => {
    return () => setCurrentPage(1);
@@ -64,129 +51,14 @@ const ReportTable = ({
  }, [isMoreDocs, pageNumbers, currentPage, setIsNextRecord]);

  // `handlemicroapp` is used to open microapp
-  const handlemicroapp = async (item, url, btnLabel) => {
-    if (ReportName === "Templates") {
-      if (btnLabel === "Edit") {
-        navigate(`/asmf/${url}/${item.objectId}`);
-      } else {
-        setActLoader({ [`${item.objectId}_${btnLabel}`]: true });
-        try {
-          const params = {
-            templateId: item.objectId
-          };
-          const templateDeatils = await axios.post(
-            `${localStorage.getItem("baseUrl")}functions/getTemplate`,
-            params,
-            {
-              headers: {
-                "Content-Type": "application/json",
-                "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-                sessionToken: localStorage.getItem("accesstoken")
-              }
-            }
-          );
-
-          // console.log("templateDeatils.data ", templateDeatils.data);
-          const templateData =
-            templateDeatils.data && templateDeatils.data.result;
-          if (!templateData.error) {
-            const Doc = templateData;
-
-            let signers = [];
-            if (Doc.Signers?.length > 0) {
-              Doc.Signers?.forEach((x) => {
-                if (x.objectId) {
-                  const obj = {
-                    __type: "Pointer",
-                    className: "contracts_Contactbook",
-                    objectId: x.objectId
-                  };
-                  signers.push(obj);
-                }
-              });
-            }
-
-            let placeholdersArr = [];
-            if (Doc.Placeholders?.length > 0) {
-              placeholdersArr = Doc.Placeholders;
-              const data = {
-                Name: Doc.Name,
-                URL: Doc.URL,
-                SignedUrl: Doc.SignedUrl,
-                Description: Doc.Description,
-                Note: Doc.Note,
-                Placeholders: placeholdersArr,
-                ExtUserPtr: {
-                  __type: "Pointer",
-                  className: "contracts_Users",
-                  objectId: Doc.ExtUserPtr.objectId
-                },
-                CreatedBy: {
-                  __type: "Pointer",
-                  className: "_User",
-                  objectId: Doc.CreatedBy.objectId
-                },
-                Signers: signers
-              };
-              try {
-                const res = await axios.post(
-                  `${localStorage.getItem(
-                    "baseUrl"
-                  )}classes/${localStorage.getItem("_appName")}_Document`,
-                  data,
-                  {
-                    headers: {
-                      "Content-Type": "application/json",
-                      "X-Parse-Application-Id":
-                        localStorage.getItem("parseAppId"),
-                      "X-Parse-Session-Token":
-                        localStorage.getItem("accesstoken")
-                    }
-                  }
-                );
-
-                // console.log("Res ", res.data);
-                if (res.data && res.data.objectId) {
-                  setActLoader({});
-                  setIsAlert(true);
-                  navigate(`/asmf/${url}/${res.data.objectId}`, {
-                    state: { title: "Use Template" }
-                  });
-                }
-              } catch (err) {
-                console.log("Err", err);
-                setIsAlert(true);
-                setIsErr(true);
-                setActLoader({});
-              }
-            } else {
-              setIsDocErr(true);
-              setActLoader({});
-            }
-          } else {
-            setIsAlert(true);
-            setIsErr(true);
-            setActLoader({});
-          }
-        } catch (err) {
-          console.log("err", err);
-          setIsAlert(true);
-          setIsErr(true);
-          setActLoader({});
-        }
-      }
-    } else {
-      localStorage.removeItem("rowlevel");
-      navigate("/rpmf/" + url);
-      localStorage.setItem("rowlevel", JSON.stringify(item));
-    }
-
+  const handlemicroapp = (item, url) => {
+    localStorage.removeItem("rowlevel");
+    navigate("/rpmf/" + url);
+    localStorage.setItem("rowlevel", JSON.stringify(item));
    // localStorage.setItem("rowlevelMicro");
  };
-  const handlebtn = async (item) => {
-    if (ReportName === "Contactbook") {
-      setIsDeleteModal({ [item.objectId]: true });
-    }
+  const handlebtn = () => {
+    console.log("clicked");
  };

  // Get current list
@@ -199,83 +71,19 @@ const ReportTable = ({
  const paginateFront = () => setCurrentPage(currentPage + 1);
  const paginateBack = () => setCurrentPage(currentPage - 1);

-  const handleContactFormModal = () => {
-    setIsContactform(!isContactform);
-  };
-
-  const handleUserData = (data) => {
-    setList((prevData) => [data, ...prevData]);
-  };
-
-  const handleDelete = async (item) => {
-    setIsDeleteModal({});
-    setActLoader({ [item.objectId]: true });
-    try {
-      const url =
-        process.env.REACT_APP_SERVERURL + "/classes/contracts_Contactbook/";
-      const body = { IsDeleted: true };
-      const res = await axios.put(url + item.objectId, body, {
-        headers: {
-          "Content-Type": "application/json",
-          "X-Parse-Application-Id": localStorage.getItem("AppID12"),
-          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-        }
-      });
-      // console.log("Res ", res.data);
-      if (res.data && res.data.updatedAt) {
-        setActLoader({});
-        setIsAlert(true);
-        const upldatedList = List.filter((x) => x.objectId !== item.objectId);
-        setList(upldatedList);
-      }
-    } catch (err) {
-      console.log("err", err);
-      setIsAlert(true);
-      setIsErr(true);
-      setActLoader({});
-    }
-  };
-  const handleCloseDeleteModal = () => setIsDeleteModal({});
-
  return (
    <div className="p-2 overflow-x-scroll w-full bg-white rounded-md">
-      {isAlert && (
-        <div
-          className={`alert alert-${isErr ? "danger" : "success"} alertBox`}
-          role="alert"
-          onAnimationEnd={() => setIsAlert(false)}
-        >
-          {isErr
-            ? "Something went wrong, Please try again later!"
-            : "Record deleted successfully!"}
-        </div>
-      )}
-
-      <div className="flex flex-row items-center justify-between my-2 mx-3 text-[20px] md:text-[23px]">
-        <div className="font-light">{ReportName}</div>
-        {ReportName === "Templates" && (
-          <i
-            onClick={() => navigate("/form/template")}
-            className="fa-solid fa-square-plus text-sky-400 text-[25px]"
-          ></i>
-        )}
-        {form && (
-          <div
-            className="cursor-pointer"
-            onClick={() => handleContactFormModal()}
-          >
-            <i className="fa-solid fa-square-plus text-sky-400 text-[25px]"></i>
-          </div>
-        )}
-      </div>
+      <h2 className="text-[23px] font-light my-2">{ReportName}</h2>
      <table className="table-auto w-full border-collapse">
        <thead className="text-[14px]">
          <tr className="border-y-[1px]">
-            {heading?.map((item, index) => (
-              <React.Fragment key={index}>
-                <th className="px-4 py-2 font-thin">{item}</th>
-              </React.Fragment>
-            ))}
+            <th className="px-4 py-2 font-thin">Sr.No</th>
+            <th className="px-4 py-2 font-thin">Name</th>
+            <th className="px-4 py-2 font-thin">Note</th>
+            <th className="px-4 py-2 font-thin">Folder</th>
+            <th className="px-4 py-2 font-thin">File</th>
+            <th className="px-4 py-2 font-thin">Owner</th>
+            <th className="px-4 py-2 font-thin">Signers</th>
            {actions?.length > 0 && (
              <th className="px-4 py-2 font-thin">Action</th>
            )}
@@ -284,160 +92,61 @@ const ReportTable = ({
        <tbody className="text-[12px]">
          {List?.length > 0 ? (
            <>
-              {currentLists.map((item, index) =>
-                ReportName === "Contactbook" ? (
-                  <tr className="border-y-[1px]" key={index}>
-                    {heading.includes("Sr.No") && (
-                      <td className="px-4 py-2">{startIndex + index + 1}</td>
-                    )}
-                    <td className="px-4 py-2 font-semibold">{item?.Name} </td>
-                    <td className="px-4 py-2">{item?.Email || "-"}</td>
-                    <td className="px-4 py-2">{item?.Phone || "-"}</td>
-                    <td className="px-3 py-2 text-white">
-                      {actions?.length > 0 &&
-                        actions.map((act, index) => (
-                          <button
-                            key={index}
-                            onClick={() =>
-                              act?.redirectUrl
-                                ? handlemicroapp(item, act.redirectUrl)
-                                : handlebtn(item)
-                            }
-                            className={`mb-1 flex justify-center items-center gap-1 px-2 py-1 rounded shadow`}
-                            style={{
-                              backgroundColor: act.btnColor
-                                ? act.btnColor
-                                : "#3ac9d6",
-                              color: act?.textColor ? act?.textColor : "white"
-                            }}
-                          >
-                            <span>
-                              {act?.btnIcon && (
-                                <i
-                                  className={
-                                    actLoader[item.objectId]
-                                      ? "fa-solid fa-spinner fa-spin-pulse"
-                                      : act.btnIcon
-                                  }
-                                ></i>
-                              )}
-                            </span>
-                            {act?.btnLabel && (
-                              <span className="uppercase">
-                                {act?.btnLabel ? act.btnLabel : "View"}
-                              </span>
-                            )}
-                          </button>
-                        ))}
-                      {isDeleteModal[item.objectId] && (
-                        <ModalUi
-                          isOpen
-                          title={"Delete Contact"}
-                          handleClose={handleCloseDeleteModal}
-                        >
-                          <div className="m-[20px]">
-                            <div className="text-lg font-normal text-black">
-                              Are you sure you want to delete this contact?
-                            </div>
-                            <hr className="bg-[#ccc] mt-4 " />
-                            <div className="flex items-center mt-3 gap-2 text-white">
-                              <button
-                                onClick={() => handleDelete(item)}
-                                className="px-4 py-1.5 text-white rounded shadow-md text-center focus:outline-none "
-                                style={{ backgroundColor: modalSubmitBtnColor }}
-                              >
-                                Yes
-                              </button>
-                              <button
-                                onClick={handleCloseDeleteModal}
-                                className="px-4 py-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
-                                style={{ backgroundColor: modalCancelBtnColor }}
-                              >
-                                No
-                              </button>
-                            </div>
-                          </div>
-                        </ModalUi>
-                      )}
-                    </td>
-                  </tr>
-                ) : (
-                  <tr className="border-y-[1px]" key={index}>
-                    {heading.includes("Sr.No") && (
-                      <td className="px-4 py-2">{startIndex + index + 1}</td>
-                    )}
-                    <td className="px-4 py-2 font-semibold w-56">
-                      {item?.Name}{" "}
-                    </td>
-                    {heading.includes("Note") && (
-                      <td className="px-4 py-2">{item?.Note || "-"}</td>
-                    )}
-                    {heading.includes("Folder") && (
-                      <td className="px-4 py-2">
-                        {item?.Folder?.Name || "OpenSign™ Drive"}
-                      </td>
-                    )}
-                    <td className="px-4 py-2">
-                      <a
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        title={item?.URL}
-                        href={item?.URL}
-                        download={item?.URL}
-                        className="text-[blue] hover:text-[blue] hover:underline"
-                      >
-                        {item?.URL ? "Download" : "-"}
-                      </a>
-                    </td>
+              {currentLists.map((item, index) => (
+                <tr className="border-y-[1px]" key={index}>
+                  <td className="px-4 py-2">{index + 1}</td>
+                  <td className="px-4 py-2 font-semibold">{item?.Name} </td>
+                  <td className="px-4 py-2">{item?.Note || "-"}</td>
+                  <td className="px-4 py-2">
+                    {item?.Folder?.Name || "OpenSignDrive"}
+                  </td>
+                  <td className="px-4 py-2">
+                    <a
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      title={item?.URL}
+                      href={item?.URL}
+                      download={item?.URL}
+                      className="text-[blue] hover:text-[blue] hover:underline"
+                    >
+                      {item?.URL ? "Download" : "-"}
+                    </a>
+                  </td>

-                    <td className="px-4 py-2">{formatRow(item?.ExtUserPtr)}</td>
-                    <td className="px-4 py-2">
-                      {item?.Signers ? formatRow(item?.Signers) : "-"}
-                    </td>
-                    <td className="px-3 py-2 text-white">
-                      {actions?.length > 0 &&
-                        actions.map((act, index) => (
-                          <button
-                            key={index}
-                            onClick={() =>
-                              act?.redirectUrl
-                                ? handlemicroapp(
-                                    item,
-                                    act.redirectUrl,
-                                    act.btnLabel
-                                  )
-                                : handlebtn(item)
-                            }
-                            className={`mb-1 flex justify-center items-center gap-1 px-2 py-1 rounded shadow`}
-                            style={{
-                              backgroundColor: act.btnColor
-                                ? act.btnColor
-                                : "#3ac9d6",
-                              color: act?.textColor ? act?.textColor : "white"
-                            }}
-                          >
-                            <span>
-                              {act?.btnIcon && (
-                                <i
-                                  className={
-                                    actLoader[
-                                      `${item.objectId}_${act.btnLabel}`
-                                    ]
-                                      ? "fa-solid fa-spinner fa-spin-pulse"
-                                      : act.btnIcon
-                                  }
-                                ></i>
-                              )}
-                            </span>
-                            <span className="uppercase">
-                              {act?.btnLabel ? act.btnLabel : "view"}
-                            </span>
-                          </button>
-                        ))}
-                    </td>
-                  </tr>
-                )
-              )}
+                  <td className="px-4 py-2">{formatRow(item?.ExtUserPtr)}</td>
+                  <td className="px-4 py-2">
+                    {item?.Signers ? formatRow(item?.Signers) : "-"}
+                  </td>
+                  <td className="px-4 py-2 flex flex-col justify-center items-center gap-2 text-white">
+                    {actions?.length > 0 &&
+                      actions.map((act, index) => (
+                        <button
+                          key={index}
+                          onClick={() =>
+                            act?.redirectUrl
+                              ? handlemicroapp(item, act.redirectUrl)
+                              : handlebtn(item)
+                          }
+                          className={`flex justify-center items-center w-full gap-1 px-2 py-1 rounded shadow`}
+                          style={{
+                            backgroundColor: act.btnColor
+                              ? act.btnColor
+                              : "#3ac9d6",
+                            color: act?.textColor ? act?.textColor : "white"
+                          }}
+                        >
+                          <span>
+                            {act?.btnIcon && <i className={act.btnIcon}></i>}
+                          </span>
+                          <span className="uppercase">
+                            {act?.btnLabel ? act.btnLabel : "view"}
+                          </span>
+                        </button>
+                        // )
+                      ))}
+                  </td>
+                </tr>
+              ))}
            </>
          ) : (
            <></>
@@ -445,7 +154,7 @@ const ReportTable = ({
        </tbody>
      </table>
      <div className="flex flex-wrap items-center gap-2 p-2 ">
-        {List.length > docPerPage && (
+        {List.length > 10 && (
          <>
            {currentPage > 1 && (
              <button
@@ -469,7 +178,7 @@ const ReportTable = ({
        {isMoreDocs && (
          <button className="text-black rounded px-1 py-2">...</button>
        )}
-        {List.length > docPerPage && (
+        {List.length > 10 && (
          <>
            {pageNumbers.includes(currentPage + 1) && (
              <button
@@ -490,26 +199,6 @@ const ReportTable = ({
          <div className="text-sm font-semibold">No Data Available</div>
        </div>
      )}
-      <ModalUi
-        title={"Add Contact"}
-        isOpen={isContactform}
-        handleClose={handleContactFormModal}
-      >
-        <AppendFormInForm
-          handleUserData={handleUserData}
-          closePopup={handleContactFormModal}
-        />
-      </ModalUi>
-      <ModalUi
-        headColor={"#dc3545"}
-        isOpen={isDocErr}
-        title={"Receipent required"}
-        handleClose={() => setIsDocErr(false)}
-      >
-        <div style={{ height: "100%", padding: 20 }}>
-          <p>Please add receipent in template!</p>
-        </div>
-      </ModalUi>
    </div>
  );
 };
@@ -1,28 +0,0 @@
-import React, { useState } from "react";
-
-const Modal = ({ children, Title }) => {
-  const [isOpen, SetIsOpen] = useState(false);
-  return (
-    <>
-      {children && (
-        <div
-          className={`fixed top-20 left-1/2 transform -translate-x-1/2 border-[1px] text-sm bg-white rounded `}
-        >
-          <div className="flex justify-between items-center py-[.75rem] px-[1.25rem] ">
-            <div className="font-semibold text-xl text-black">{Title}</div>
-            <div
-              onClick={() => SetIsOpen()}
-              className="px-2 py-1 bg-gray-400 rounded cursor-pointer"
-            >
-              <i className="fa-solid fa-xmark"></i>
-            </div>
-          </div>
-          <hr />
-          {isOpen && <div>{children}</div>}
-        </div>
-      )}
-    </>
-  );
-};
-
-export default Modal;
@@ -1,40 +0,0 @@
-import React from "react";
-const ModalUi = ({
-  children,
-  title,
-  isOpen,
-  headColor,
-  handleClose,
-  showHeader = true,
-  showClose = true
-}) => {
-  return (
-    <>
-      {isOpen && (
-        <div className="fixed z-[999] top-0 left-0 w-[100%] h-[100%] bg-black bg-opacity-[75%]">
-          <div className="fixed z-[1000] top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-sm bg-white rounded shadow-md max-h-90 min-w-[90%] md:min-w-[500px] overflow-y-auto hide-scrollbar">
-            {showHeader && (
-              <div
-                className="flex justify-between rounded-t items-center py-[15px] px-[20px] text-white"
-                style={{ background: headColor ? headColor : "#32a3ac" }}
-              >
-                <div className="text-[1.2rem] font-normal">{title}</div>
-                {showClose && (
-                  <div
-                    className="text-[1.5rem] cursor-pointer"
-                    onClick={() => handleClose && handleClose()}
-                  >
-                    &times;
-                  </div>
-                )}
-              </div>
-            )}
-            <div>{children}</div>
-          </div>
-        </div>
-      )}
-    </>
-  );
-};
-
-export default ModalUi;
@@ -1,57 +0,0 @@
-import React, { useState, useEffect } from "react";
-import Parse from "parse";
-import { Outlet, useNavigate, useLocation } from "react-router-dom";
-import ModalUi from "./ModalUi";
-const Validate = () => {
-  const navigate = useNavigate();
-  const location = useLocation();
-  const [isUserValid, setIsUserValid] = 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);
-        } else {
-          setIsUserValid(false);
-        }
-      } catch (error) {
-        // Session token is invalid or there was an error
-        setIsUserValid(false);
-      }
-    })();
-  }, []);
-  const handleLoginBtn = () => {
-    try {
-      Parse.User.logOut();
-    } catch (err) {
-      console.log("err ", err);
-    } finally {
-      localStorage.removeItem("accesstoken");
-      navigate("/", { replace: true, state: { from: location } });
-    }
-  };
-  return isUserValid ? (
-    <div>
-      <Outlet />
-    </div>
-  ) : (
-    <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>
-    </ModalUi>
-  );
-};
-
-export default Validate;
@@ -1,34 +0,0 @@
-import React, { useEffect } from "react";
-import Parse from "parse";
-import { Outlet } from "react-router-dom";
-const ValidateRoute = () => {
-  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) {
-          handlelogout();
-        }
-      } catch (error) {
-        handlelogout();
-      }
-    })();
-  }, []);
-  const handlelogout = async () => {
-    try {
-      Parse.User.logOut();
-      localStorage.removeItem("accesstoken");
-    } catch (err) {
-      console.log("err ", err);
-    } finally {
-      localStorage.removeItem("accesstoken");
-    }
-  };
-  return <div>{<Outlet />}</div>;
-};
-
-export default ValidateRoute;
@@ -1,7 +1,5 @@
 function sanitizeFileName(fileName) {
  // Remove spaces and invalid characters
-  const file = fileName.replace(/[^a-zA-Z0-9._-]/g, "");
-  const removedot = file.replace(/\.(?=.*\.)/g, "");
-  return removedot.replace(/[^a-zA-Z0-9._-]/g, "");
+  return fileName.replace(/[^a-zA-Z0-9._-]/g, "");
 }
 export default sanitizeFileName;
@@ -11,8 +11,7 @@ export const fetchAppInfo = (str, burl, app_id) => async (dispatch) => {
  let _base = ""; // Define _base here and initialize it to an empty string
  if (response && response.baseurl) {
    _base = response.baseurl.charAt(response.baseurl.length - 1);
-  }
-  localStorage.removeItem("baseUrl");
+  }  localStorage.removeItem("baseUrl");
  localStorage.setItem("_appName", response.appname);
  localStorage.setItem("_app_objectId", response.objectId);
  if (_base === "/") {
@@ -121,10 +120,16 @@ export const login = (username, password) => async (dispatch) => {
              localStorage.setItem("_user_role", _role);
            }
            try {
-              const currentUser = Parse.User.current();
-              await Parse.Cloud.run("getUserDetails", {
-                email: currentUser.get("email")
-              }).then(
+              const tour = Parse.Object.extend(
+                localStorage.getItem("extended_class")
+              );
+              let _tour = new Parse.Query(tour);
+              _tour.equalTo("UserId", {
+                __type: "Pointer",
+                className: "_User",
+                objectId: resultjson.objectId
+              });
+              await _tour.first().then(
                (results) => {
                  let userinfo = results.toJSON();
                  if (userinfo.TenantId) {
@@ -137,7 +142,7 @@ export const login = (username, password) => async (dispatch) => {
                }
              );
            } catch (error) {
-              console.log("err ", error);
+              console.log("err ", error)
            }
          }
        });
@@ -214,10 +219,95 @@ export const fetchRoleEnum = (name) => async (dispatch) => {
  dispatch({ type: "FETCH_ROLE", payload: response });
 };

+export const setEnableCart = (val) => async (dispatch) => {
+  dispatch({
+    type: "ENABLE_CART",
+    payload: val
+  });
+};
+
+export const setCartUpdateData = (val) => async (dispatch) => {
+  dispatch({
+    type: "UPDATE_CART",
+    payload: val
+  });
+};
+
+export const addItemsToCart = (val) => async (dispatch) => {
+  dispatch({
+    type: "ADD_CART",
+    payload: val
+  });
+};
+
+export const clearCartData = () => async (dispatch) => {
+  dispatch({
+    type: "CLEAR_CART",
+    payload: []
+  });
+};
+
+export const SaveMultipleCart = (val) => async (dispatch) => {
+  dispatch({
+    type: "MULTI_CART",
+    payload: val
+  });
+};
+
+export const removeFromCart = (val) => async (dispatch) => {
+  dispatch({
+    type: "REMOVE_CART",
+    payload: val
+  });
+};
+
+export const onChangeLevel1Dropdown = (id, name) => async (dispatch) => {
+  localStorage.setItem(`_dd${name}`, id);
+  let _data = { [name]: `${id}` };
+  dispatch({ type: "Level1_Dropdown", payload: _data });
+};
+
+export const onChangeLevel2Dropdown = (id, name) => async (dispatch) => {
+  localStorage.setItem(`_dd${name}`, id);
+  let _data = { [name]: `${id}` };
+  dispatch({ type: "Level2_Dropdown", payload: _data });
+};
+
+export const onChangeLevel3Dropdown = (id, name) => async (dispatch) => {
+  localStorage.setItem(`_dd${name}`, id);
+  let _data = { [name]: `${id}` };
+  dispatch({ type: "Level3_Dropdown", payload: _data });
+};
+
+export const removeState = () => async (dispatch) => {
+  dispatch({ type: "REMOVE_STATE", payload: {} });
+};
+export const removeLevel2State = () => async (dispatch) => {
+  dispatch({ type: "removeLevel2", payload: {} });
+};
+
+export const removeLevel3State = () => async (dispatch) => {
+  dispatch({ type: "removeLevel3", payload: {} });
+};
+
 export const showTenantName = (name) => async (dispatch) => {
  dispatch({ type: "SHOW_TENANT", payload: name || null });
 };

+export const saveDependantDDValue = (id, value) => async (dispatch) => {
+  let _data = { [`${id}_dd`]: value };
+  dispatch({ type: "SAVE_DEPENDANTDD", payload: _data });
+};
+
+export const removeDependantDDValue = (id, value) => async (dispatch) => {
+  let _data = { [`${id}_dd`]: value };
+  dispatch({ type: "REMOVE_DEPENDANTDD", payload: _data });
+};
+
+export const remove_AlldependantDD = () => async (dispatch) => {
+  dispatch({ type: "REMOVE_ALLDEPENDANTDD", payload: {} });
+};
+
 export const save_tourSteps = (steps) => async (dispatch) => {
  dispatch({ type: "SAVE_TOURSTEPS", payload: steps });
 };
@@ -2,12 +2,11 @@ import React, { useState, useEffect } from "react";
 import Parse from "parse";
 import "../styles/loader.css";
 import GetDashboard from "../components/dashboard/GetDashboard";
-import { useNavigate, useParams } from "react-router-dom";
+import { Navigate, useParams } from "react-router-dom";
 import Title from "../components/Title";
 import { save_tourSteps } from "../redux/actions";
 import { connect } from "react-redux";
 const Dashboard = (props) => {
-  const navigate = useNavigate();
  const { id } = useParams();
  const [dashboard, setdashboard] = useState([]);
  const [classnameArray, setclassnameArray] = useState([]);
@@ -16,19 +15,6 @@ const Dashboard = (props) => {
  const [parseAppId] = useState(localStorage.getItem("parseAppId"));
  const [defaultQuery, setDefaultQuery] = useState("");

-  useEffect(() => {
-    if (localStorage.getItem("accesstoken")) {
-      if (id !== undefined) {
-        getDashboard(id);
-      } else {
-        getDashboard(localStorage.getItem("PageLanding"));
-      }
-    } else {
-      navigate("/", { replace: true, state: { from: location } });
-    }
-    // eslint-disable-next-line
-  }, [id]);
-
  const getDashboard = async (id) => {
    setloading(true);
    try {
@@ -107,6 +93,20 @@ const Dashboard = (props) => {
    }
  };

+  useEffect(() => {
+    if (id !== undefined) {
+      getDashboard(id);
+    } else {
+      getDashboard(localStorage.getItem("PageLanding"));
+    }
+
+    // eslint-disable-next-line
+  }, [id]);
+
+  if (localStorage.getItem("accesstoken") === "" || null) {
+    return <Navigate to="/" />;
+  }
+
  let _dash = (
    <GetDashboard
      dashboard={dashboard}
@@ -4,15 +4,13 @@ import { fetchAppInfo, forgetPassword } from "../redux/actions";
 import Title from "../components/Title";
 import { NavLink } from "react-router-dom";
 import login_img from "../assets/images/login_img.svg";
-import Parse from "parse";
-import Alert from "../primitives/Alert";
+
 function ForgotPassword(props) {
  const [state, setState] = useState({
    email: "",
    password: "",
    hideNav: ""
  });
-  const [sentStatus, setSentStatus] = useState("");
  const handleChange = (event) => {
    const { name, value } = event.target;
    setState({ ...state, [name]: value });
@@ -25,7 +23,7 @@ function ForgotPassword(props) {
    }
  };

-  const handleSubmit = async (event) => {
+  const handleSubmit = (event) => {
    event.preventDefault();
    localStorage.setItem("appLogo", props.appInfo.applogo);
    localStorage.setItem("appName", props.appInfo.appname);
@@ -35,21 +33,9 @@ function ForgotPassword(props) {
      "userSettings",
      JSON.stringify(props.appInfo.settings)
    );
+
    if (state.email) {
-      const username = state.email;
-      let baseUrl = localStorage.getItem("BaseUrl12");
-      let parseAppId = localStorage.getItem("AppID12");
-      try {
-        Parse.serverURL = baseUrl;
-        Parse.initialize(parseAppId);
-        await Parse.User.requestPasswordReset(username);
-        setSentStatus("success");
-      } catch (err) {
-        console.log("err ", err.code);
-        setSentStatus("failed");
-      } finally {
-        setTimeout(() => setSentStatus(""), 1000);
-      }
+      props.forgetPassword(state.email);
    }
  };

@@ -65,14 +51,6 @@ function ForgotPassword(props) {
  return (
    <div className="bg-white">
      <Title title="Forgot password page" />
-      {sentStatus === "success" && (
-        <Alert type="success">
-          Reset password link has been sent to your email id
-        </Alert>
-      )}
-      {sentStatus === "failed" && (
-        <Alert type={"danger"}>Please setup email adapter </Alert>
-      )}
      <div>
        <div className="md:m-10 lg:m-16 md:p-4 lg:p-10 p-5 bg-[#ffffff] md:border-[1px] md:border-gray-400 ">
          <div className="w-[250px] h-[66px] inline-block">
@@ -1,184 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Title from "../components/Title";
-import axios from "axios";
-import Alert from "../primitives/Alert";
-import ModalUi from "../primitives/ModalUi";
-import { rejectBtn, submitBtn } from "../constant/const";
-import { openInNewTab } from "../constant/Utils";
-
-function GenerateToken() {
-  const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
-  const [parseAppId] = useState(localStorage.getItem("parseAppId"));
-  const [apiToken, SetApiToken] = useState("");
-  const [isLoader, setIsLoader] = useState(true);
-  const [copied, setCopied] = useState(false);
-  const [isGenerate, setIsGenerate] = useState(false);
-  const [isErr, setIsErr] = useState(false);
-  const [isModal, setIsModal] = useState(false);
-
-  useEffect(() => {
-    fetchToken();
-    // eslint-disable-next-line
-  }, []);
-
-  const fetchToken = async () => {
-    try {
-      const url = parseBaseUrl + "functions/getapitoken";
-      const headers = {
-        "Content-Type": "application/json",
-        "X-Parse-Application-Id": parseAppId,
-        sessiontoken: localStorage.getItem("accesstoken")
-      };
-      const res = await axios.post(url, {}, { headers: headers });
-      if (res) {
-        SetApiToken(res.data.result.result);
-      }
-      setIsLoader(false);
-    } catch (err) {
-      SetApiToken();
-      setIsLoader(false);
-      console.log("Err", err);
-    }
-  };
-  const handleSubmit = async (e) => {
-    e.preventDefault();
-    setIsLoader(true);
-    setIsModal(false);
-    try {
-      const url = parseBaseUrl + "functions/generateapitoken";
-      const headers = {
-        "Content-Type": "application/json",
-        "X-Parse-Application-Id": parseAppId,
-        sessiontoken: localStorage.getItem("accesstoken")
-      };
-      await axios.post(url, {}, { headers: headers }).then((res) => {
-        if (res) {
-          SetApiToken(res.data.result.token);
-          //   localStorage.setItem("apiToken", res.data.result.token);
-          setIsGenerate(true);
-          setTimeout(() => {
-            setIsGenerate(false);
-          }, 1500);
-          setIsLoader(false);
-        } else {
-          console.error("Error while generating Token");
-          setIsLoader(false);
-          setIsErr(true);
-          setTimeout(() => {
-            setIsErr(false);
-          }, 1500);
-        }
-      });
-    } catch (error) {
-      setIsLoader(false);
-      setIsErr(true);
-      setTimeout(() => {
-        setIsErr(false);
-      }, 1500);
-
-      console.log("err", error);
-    }
-  };
-
-  const copytoclipboard = (text) => {
-    navigator.clipboard.writeText(text);
-    setCopied(true);
-    setTimeout(() => {
-      setCopied(false);
-    }, 1500); // Reset copied state after 1.5 seconds
-  };
-  const handleModal = () => setIsModal(!isModal);
-  return (
-    <React.Fragment>
-      <Title title={"API Token"} />
-      {isGenerate && (
-        <Alert type="success">Token generated successfully!</Alert>
-      )}
-      {copied && <Alert type="success">Copied</Alert>}
-      {isErr && <Alert type="danger">Something went wrong!</Alert>}
-      {isLoader ? (
-        <div
-          style={{
-            height: "100vh",
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center"
-          }}
-        >
-          <div
-            style={{
-              fontSize: "45px",
-              color: "#3dd3e0"
-            }}
-            className="loader-37"
-          ></div>
-        </div>
-      ) : (
-        <div className="bg-white flex flex-col justify-center shadow rounded">
-          <h1 className="ml-4 mt-3 mb-2 font-semibold">API Token</h1>
-          <ul className="w-full flex flex-col p-2 text-sm">
-            <li
-              className={`flex justify-between items-center border-y-[1px] border-gray-300 break-all py-2`}
-            >
-              <span className="w-[40%]">Api Token:</span>{" "}
-              <span
-                id="token"
-                className="w-[60%] md:text-end cursor-pointer"
-                onClick={() => copytoclipboard(apiToken)}
-              >
-                {apiToken && apiToken}
-              </span>
-            </li>
-          </ul>
-          <div className="flex flex-col md:flex-row items-center justify-center gap-2 pb-4">
-            <button
-              type="button"
-              onClick={apiToken ? handleModal : handleSubmit}
-              className="rounded hover:bg-[#15b4e9] border-[1px] border-[#15b4e9] text-[#15b4e9] hover:text-white px-4 py-2 text-xs md:text-base focus:outline-none"
-            >
-              {apiToken ? "Regenerate Token" : "Generate Token"}
-            </button>
-            <button
-              type="button"
-              onClick={() =>
-                openInNewTab(
-                  "https://docs.opensignlabs.com/docs/API-docs/opensign-api-v-1"
-                )
-              }
-              className="rounded hover:bg-[#15b4e9] border-[1px] border-[#15b4e9] text-[#15b4e9] hover:text-white px-11 py-2 text-xs md:text-base focus:outline-none"
-            >
-              View Docs
-            </button>
-          </div>
-
-          <ModalUi
-            isOpen={isModal}
-            title={"Regenerate Token"}
-            handleClose={handleModal}
-          >
-            <div className="m-[20px]">
-              <div className="text-lg font-normal text-black">
-                Are you sure you want to regenerate token it will expire old
-                token?
-              </div>
-              <hr className="bg-[#ccc] mt-4 " />
-              <div className="flex items-center mt-3 gap-2 text-white">
-                <button
-                  onClick={handleSubmit}
-                  className={submitBtn + "ml-[2px]"}
-                >
-                  Yes
-                </button>
-                <button onClick={handleModal} className={rejectBtn}>
-                  No
-                </button>
-              </div>
-            </div>
-          </ModalUi>
-        </div>
-      )}
-    </React.Fragment>
-  );
-}
-
-export default GenerateToken;
@@ -30,9 +30,9 @@ function RemoteApp({ app }) {
            boxShadow: "0 1px 3px 0 rgba(0, 0, 0, 0.33)",
            backgroundColor: "#ffffff",
            width: "100%",
+            overflow: "hidden",
            borderRadius: 3,
-            height: "100%",
-            minHeight: "100vh"
+            minHeight: "70vh"
          }}
        >
          {RemoteComponent && <RemoteComponent />}
@@ -8,16 +8,11 @@ import axios from "axios";
 import Title from "../components/Title";
 import GoogleSignInBtn from "../components/LoginGoogle";
 // import LoginFacebook from "../components/LoginFacebook";
-import { NavLink, useNavigate, useLocation } from "react-router-dom";
+import { NavLink, useNavigate } from "react-router-dom";
 import login_img from "../assets/images/login_img.svg";
-import { useWindowSize } from "../hook/useWindowSize";
-import ModalUi from "../primitives/ModalUi";
-import { modalCancelBtnColor, modalSubmitBtnColor } from "../constant/const";

 function Login(props) {
  const navigate = useNavigate();
-  const location = useLocation();
-  const { width } = useWindowSize();
  const [state, setState] = useState({
    email: "",
    toastColor: "#5cb85c",
@@ -26,6 +21,7 @@ function Login(props) {
    passwordVisible: false,
    mobile: "",
    phone: "",
+    hideNav: "",
    scanResult: "",
    baseUrl: localStorage.getItem("baseUrl"),
    parseAppId: localStorage.getItem("parseAppId"),
@@ -51,11 +47,26 @@ function Login(props) {
    );
    // eslint-disable-next-line
  }, []);
+  useEffect(() => {
+    resize();
+    window.addEventListener("resize", resize());
+    return () => {
+      window.removeEventListener("resize", resize());
+    };
+    // eslint-disable-next-line
+  }, []);
  const handleChange = (event) => {
    const { name, value } = event.target;
    setState({ ...state, [name]: value });
  };

+  const resize = () => {
+    let currentHideNav = window.innerWidth <= 760;
+    if (currentHideNav !== state.hideNav) {
+      setState({ ...state, hideNav: currentHideNav });
+    }
+  };
+
  const handleSubmit = async (event) => {
    localStorage.removeItem("accesstoken");
    event.preventDefault();
@@ -135,9 +146,6 @@ function Login(props) {
                            `${localStorage.getItem("_appName")}_appeditor`
                        ) {
                          userSettings.forEach(async (element) => {
-                            const redirectUrl =
-                              location?.state?.from ||
-                              `/${element.pageType}/${element.pageId}`;
                            if (element.role === _currentRole) {
                              let _role = _currentRole.replace(
                                `${localStorage.getItem("_appName")}_`,
@@ -154,13 +162,15 @@ function Login(props) {
                                element.userpointer
                              );

-                              const currentUser = Parse.User.current();
-                              await Parse.Cloud.run("getUserDetails", {
-                                email: currentUser.get("email")
-                              }).then(
-                                (result) => {
+                              const extendedClass = Parse.Object.extend(
+                                element.extended_class
+                              );
+                              let query = new Parse.Query(extendedClass);
+                              query.equalTo("UserId", Parse.User.current());
+                              query.include("TenantId");
+                              await query.find().then(
+                                (results) => {
                                  let tenentInfo = [];
-                                  const results = [result];
                                  if (results) {
                                    let extendedInfo_stringify =
                                      JSON.stringify(results);
@@ -266,21 +276,19 @@ function Login(props) {
                                            localStorage.removeItem(
                                              "userDetails"
                                            );
-                                            // Redirect to the appropriate URL after successful login
-                                            navigate(redirectUrl);
+                                            navigate(
+                                              `/${element.pageType}/${element.pageId}`
+                                            );
                                          } else {
-                                            navigate(`/subscription`, {
-                                              replace: true
-                                            });
+                                            navigate(`/subscription`);
                                          }
                                        } else {
-                                          navigate(`/subscription`, {
-                                            replace: true
-                                          });
+                                          navigate(`/subscription`);
                                        }
                                      } else {
-                                        // Redirect to the appropriate URL after successful login
-                                        navigate(redirectUrl);
+                                        navigate(
+                                          `/${element.pageType}/${element.pageId}`
+                                        );
                                      }
                                    }
                                  } else {
@@ -312,13 +320,12 @@ function Login(props) {
                                      );
                                      const billingDate = "";
                                      if (billingDate) {
-                                        navigate(`/subscription`, {
-                                          replace: true
-                                        });
+                                        navigate(`/subscription`);
                                      }
                                    } else {
-                                      // Redirect to the appropriate URL after successful login
-                                      navigate(redirectUrl);
+                                      navigate(
+                                        `/${element.pageType}/${element.pageId}`
+                                      );
                                    }
                                  }
                                },
@@ -327,6 +334,23 @@ function Login(props) {
                                    sessionToken: user.getSessionToken()
                                  };
                                  handleSubmitbtn(payload);
+                                  // setState({
+                                  //   ...state,
+                                  //   loading: false,
+                                  //   toastColor: "#d9534f",
+                                  //   toastDescription:
+                                  //     "You dont have access to this application."
+                                  // });
+
+                                  // const x = document.getElementById("snackbar");
+                                  // x.className = "show";
+                                  // setTimeout(function () {
+                                  //   x.className = x.className.replace(
+                                  //     "show",
+                                  //     ""
+                                  //   );
+                                  // }, 2000);
+                                  // localStorage.setItem("accesstoken", null);
                                  console.error(
                                    "Error while fetching Follow",
                                    error
@@ -465,9 +489,6 @@ function Login(props) {
                    `${localStorage.getItem("_appName")}_appeditor`
                ) {
                  userSettings.forEach(async (element) => {
-                    const redirectUrl =
-                      location?.state?.from ||
-                      `/${element.pageType}/${element.pageId}`;
                    if (element.role === _currentRole) {
                      let _role = _currentRole.replace(
                        `${localStorage.getItem("_appName")}_`,
@@ -481,13 +502,16 @@ function Login(props) {
                        element.extended_class
                      );
                      localStorage.setItem("userpointer", element.userpointer);
-                      const currentUser = Parse.User.current();
-                      await Parse.Cloud.run("getUserDetails", {
-                        email: currentUser.get("email")
-                      }).then(
-                        (result) => {
+
+                      const extendedClass = Parse.Object.extend(
+                        element.extended_class
+                      );
+                      let query = new Parse.Query(extendedClass);
+                      query.equalTo("UserId", Parse.User.current());
+                      query.include("TenantId");
+                      await query.find().then(
+                        (results) => {
                          let tenentInfo = [];
-                          const results = [result];
                          if (results) {
                            let extendedInfo_stringify =
                              JSON.stringify(results);
@@ -572,22 +596,20 @@ function Login(props) {
                              setThirdpartyLoader(false);
                              setState({ ...state, loading: false });
                              if (process.env.REACT_APP_ENABLE_SUBSCRIPTION) {
-                                if (billingDate) {
-                                  if (billingDate > new Date()) {
-                                    localStorage.removeItem("userDetails");
-                                    navigate(redirectUrl);
-                                  } else {
-                                    navigate(`/subscription`, {
-                                      replace: true
-                                    });
-                                  }
+                              if (billingDate) {
+                                if (billingDate > new Date()) {
+                                  localStorage.removeItem("userDetails");
+                                  navigate(
+                                    `/${element.pageType}/${element.pageId}`
+                                  );
                                } else {
-                                  navigate(`/subscription`, { replace: true });
+                                  navigate(`/subscription`);
                                }
                              } else {
-                                navigate(redirectUrl);
+                                navigate(`/subscription`);
                              }
                            }
+                          }
                          } else {
                            localStorage.setItem("PageLanding", element.pageId);
                            localStorage.setItem(
@@ -598,22 +620,21 @@ function Login(props) {
                            setState({ ...state, loading: false });
                            setThirdpartyLoader(false);
                            if (process.env.REACT_APP_ENABLE_SUBSCRIPTION) {
-                              if (billingDate) {
-                                if (billingDate > new Date()) {
-                                  localStorage.removeItem("userDetails");
-                                  // Redirect to the appropriate URL after successful login
-                                  navigate(redirectUrl);
-                                } else {
-                                  navigate(`/subscription`, { replace: true });
-                                }
+                            if (billingDate) {
+                              if (billingDate > new Date()) {
+                                localStorage.removeItem("userDetails");
+                                navigate(
+                                  `/${element.pageType}/${element.pageId}`
+                                );
                              } else {
-                                navigate(`/subscription`, { replace: true });
+                                navigate(`/subscription`);
                              }
                            } else {
-                              navigate(redirectUrl);
+                              navigate(`/subscription`);
                            }
                          }
-                        },
+                        }
+                      },
                        (error) => {
                          const payload = {
                            sessionToken: sessionToken
@@ -695,10 +716,9 @@ function Login(props) {

        await axios
          .post(url, JSON.stringify(body), { headers: headers1 })
-          .then((axiosres) => {
-            const roles = axiosres.data.result;
+          .then((roles) => {
            if (roles) {
-              userRoles = roles;
+              userRoles = roles.data.result;
              let _currentRole = "";
              if (userRoles.length > 1) {
                if (
@@ -746,13 +766,15 @@ function Login(props) {
                    element.extended_class
                  );

-                  const currentUser = Parse.User.current();
-                  await Parse.Cloud.run("getUserDetails", {
-                    email: currentUser.get("email")
-                  }).then(
-                    (result) => {
+                  const extendedClass = Parse.Object.extend(
+                    element.extended_class
+                  );
+                  let query = new Parse.Query(extendedClass);
+                  query.equalTo("UserId", Parse.User.current());
+                  query.include("TenantId");
+                  await query.find().then(
+                    (results) => {
                      let tenentInfo = [];
-                      const results = [result];
                      if (results) {
                        let extendedInfo_stringify = JSON.stringify(results);
                        let extendedInfo = JSON.parse(extendedInfo_stringify);
@@ -1043,7 +1065,7 @@ function Login(props) {
                        <NavLink
                          className="rounded-sm cursor-pointer bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] w-full py-3 shadow uppercase"
                          to="/signup"
-                          style={width < 768 ? { textAlign: "center" } : {}}
+                          style={state.hideNav ? { textAlign: "center" } : {}}
                        >
                          Create Account
                        </NavLink>
@@ -1111,7 +1133,7 @@ function Login(props) {
                    </div>
                  </div>
                </div>
-                {width >= 768 && (
+                {!state.hideNav && (
                  <div className="self-center">
                    <div className="mx-auto md:w-[300px] lg:w-[400px] xl:w-[500px]">
                      <img
@@ -1133,76 +1155,98 @@ function Login(props) {
              {state.toastDescription}
            </div>
          </div>
-          <ModalUi isOpen={isModal} title="Additional Info" showClose={false}>
-            <form className="px-4 py-3">
-              <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
-                />
+          {isModal && (
+            <div
+              className="modal fade show"
+              id="exampleModal"
+              tabIndex="-1"
+              role="dialog"
+              style={{
+                display: "block",
+                zIndex: 1,
+                backgroundColor: "rgba(0,0,0,0.5)"
+              }}
+            >
+              <div className="modal-dialog" role="document">
+                <div className="modal-content">
+                  <div className="modal-header">
+                    <h5 className="modal-title font-semibold">Additional Info</h5>
+                    <span>
+                      <span></span>
+                    </span>
+                  </div>
+                  <div className="modal-body">
+                    <form className="text-sm">
+                      <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 className="mt-4">
+                        <button
+                          type="button"
+                          className="bg-[#17a2b8] text-sm p-2 text-white rounded uppercase"
+                          onClick={(e) => handleSubmitbtn(e)}
+                          style={{ marginRight: 10 }}
+                        >
+                          Login
+                        </button>
+                        <button
+                          type="button"
+                          className="bg-[#6c757d] text-sm p-2 text-white rounded uppercase"
+                          onClick={handleCloseModal}
+                          style={{ width: 90 }}
+                        >
+                          Cancel
+                        </button>
+                      </div>
+                    </form>
+                  </div>
+                </div>
              </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 className="mt-4">
-                <button
-                  type="button"
-                  className="px-3 py-1.5 text-white rounded shadow-md text-center focus:outline-none "
-                  onClick={(e) => handleSubmitbtn(e)}
-                  style={{
-                    marginRight: 10,
-                    backgroundColor: modalSubmitBtnColor
-                  }}
-                >
-                  Login
-                </button>
-                <button
-                  type="button"
-                  className="py-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
-                  onClick={handleCloseModal}
-                  style={{ width: 75, backgroundColor: modalCancelBtnColor }}
-                >
-                  Cancel
-                </button>
-              </div>
-            </form>
-          </ModalUi>
+            </div>
+          )}
        </>
      ) : (
        <div
@@ -2,7 +2,7 @@
 import React from "react";
 import Title from "../components/Title";

-const PageNotFound = ({ prefix }) => {
+const PageNotFound = () => {
  return (
    <div className="flex items-center justify-center h-screen w-full bg-white rounded">
      <Title title={"Page Not Found"} />
@@ -10,9 +10,7 @@ const PageNotFound = ({ prefix }) => {
        <h1 className="text-[60px] lg:text-[120px] font-semibold text-black">
          404
        </h1>
-        <p className="text-[30px] lg:text-[50px] text-black">
-          {prefix ? prefix : "Page"} Not Found
-        </p>
+        <p className="text-[30px] lg:text-[50px] text-black">Page Not Found</p>
      </div>
    </div>
  );
@@ -5,7 +5,7 @@ import axios from "axios";
 import { fetchAppInfo, showTenantName } from "../redux/actions/index";
 import { connect } from "react-redux";
 import Title from "../components/Title";
-import { useNavigate, useLocation } from "react-router-dom";
+import { useNavigate } from "react-router-dom";

 const appId = localStorage.getItem("AppID12");
 const server = localStorage.getItem("BaseUrl12");
@@ -13,7 +13,6 @@ Parse.serverURL = server;
 Parse.initialize(appId);
 const PgSignUp = (props) => {
  const navigate = useNavigate();
-  const location = useLocation();
  const [parseBaseUrl] = useState(localStorage.getItem("BaseUrl12"));
  const [parseAppId] = useState(localStorage.getItem("AppID12"));
  const [formData, setFormData] = useState({
@@ -22,9 +21,6 @@ const PgSignUp = (props) => {
  });
  const [validationMessage, setValidationMessage] = useState("");
  const [isLoader, setIsLoader] = useState(true);
-  const [lengthValid, setLengthValid] = useState(false);
-  const [caseDigitValid, setCaseDigitValid] = useState(false);
-  const [specialCharValid, setSpecialCharValid] = useState(false);

  // below useEffect is used to fetch App data and save to redux state
  useEffect(() => {
@@ -71,12 +67,13 @@ const PgSignUp = (props) => {
        const userSettings = JSON.parse(localStorage.getItem("userSettings"));
        const extClass = userSettings[0].extended_class;
        // console.log("extClass ", extClass);
-        const params = { email: userDetails.email };
-        const res = await Parse.Cloud.run("getUserDetails", params);
+        const checkUser = new Parse.Query(extClass);
+        checkUser.equalTo("Email", userDetails.email);
+        const res = await checkUser.first();
        // console.log("res", res);
        if (res) {
-          const updateQuery = new Parse.Object(extClass);
-          updateQuery.id = res.id;
+          const checkUser = new Parse.Query(extClass);
+          const updateQuery = await checkUser.get(res.id);
          updateQuery.set(
            "Next_billing_date",
            new Date(zohoRes.data.result.nextBillingDate)
@@ -108,23 +105,21 @@ const PgSignUp = (props) => {
  // "handleSubmit" is used to save user details signup him/her who come from plan-pricing page
  const handleSubmit = (e) => {
    e.preventDefault();
-    if (lengthValid && caseDigitValid && specialCharValid) {
-      setIsLoader(true);
-      if (formData.password === formData.confirmPassword) {
-        const url = window.location.href;
-        let paramString = url.split("?")[1];
-        let queryString = new URLSearchParams(paramString);
-        // console.log("url ", queryString);
+    setIsLoader(true);
+    if (formData.password === formData.confirmPassword) {
+      const url = window.location.href;
+      let paramString = url.split("?")[1];
+      let queryString = new URLSearchParams(paramString);
+      // console.log("url ", queryString);

-        let obj = { ...formData };
-        for (let pair of queryString.entries()) {
-          // console.log("Key is: " + pair[0]);
-          // console.log("Value is: " + pair[1]);
-          obj = { ...obj, [pair[0]]: pair[1] };
-        }
-        saveUser(obj);
-        // console.log("obj ", obj);}
+      let obj = { ...formData };
+      for (let pair of queryString.entries()) {
+        // console.log("Key is: " + pair[0]);
+        // console.log("Value is: " + pair[1]);
+        obj = { ...obj, [pair[0]]: pair[1] };
      }
+      saveUser(obj);
+      // console.log("obj ", obj);}
    }
  };
  const saveUser = async (obj) => {
@@ -157,7 +152,6 @@ const PgSignUp = (props) => {
      if (res) {
        const params = {
          userDetails: {
-            jobTitle: zohoRes.data.result.jobTitle,
            company: zohoRes.data.result.company,
            name: zohoRes.data.result.name,
            email: zohoRes.data.result.email,
@@ -188,7 +182,7 @@ const PgSignUp = (props) => {
      console.log("err ", error);
      if (error.message === "Account already exists for this username.") {
        alert("Account already exists!");
-        navigate("/", { replace: true });
+        navigate("/");
      } else {
        setIsLoader(false);
        alert("Something went wrong, please try again later!");
@@ -200,15 +194,6 @@ const PgSignUp = (props) => {
    const newPassword = e.target.value;
    setFormData({ ...formData, [e.target.name]: e.target.value });
    validatePasswords(newPassword, formData.confirmPassword);
-
-    // Check conditions separately
-    setLengthValid(newPassword.length >= 8);
-    setCaseDigitValid(
-      /[a-z]/.test(newPassword) &&
-        /[A-Z]/.test(newPassword) &&
-        /\d/.test(newPassword)
-    );
-    setSpecialCharValid(/[!@#$%^&*()\-_=+{};:,<.>]/.test(newPassword));
  };
  const handleConFirmPassowordChange = (e) => {
    const newConfirmPassword = e.target.value;
@@ -294,6 +279,13 @@ const PgSignUp = (props) => {
                        ""
                      );
                      localStorage.setItem("_user_role", _role);
+
+                      if (element.enableCart) {
+                        localStorage.setItem("EnableCart", element.enableCart);
+                        props.setEnableCart(element.enableCart);
+                      } else {
+                        localStorage.removeItem("EnableCart");
+                      }
                      // Get TenentID from Extendend Class
                      localStorage.setItem(
                        "extended_class",
@@ -301,12 +293,14 @@ const PgSignUp = (props) => {
                      );
                      localStorage.setItem("userpointer", element.userpointer);

-                      const currentUser = Parse.User.current();
-                      await Parse.Cloud.run("getUserDetails", {
-                        email: currentUser.get("email")
-                      }).then(
-                        (result) => {
-                          const results = [result];
+                      const extendedClass = Parse.Object.extend(
+                        element.extended_class
+                      );
+                      let query = new Parse.Query(extendedClass);
+                      query.equalTo("UserId", Parse.User.current());
+                      query.include("TenantId");
+                      await query.find().then(
+                        (results) => {
                          let tenentInfo = [];
                          if (results) {
                            let extendedInfo_stringify =
@@ -352,7 +346,7 @@ const PgSignUp = (props) => {
                                element.pageType
                              );
                              setIsLoader(false);
-                              navigate("/", { replace: true });
+                              navigate("/");
                            } else {
                              extendedInfo.forEach((x) => {
                                if (x.TenantId) {
@@ -390,12 +384,9 @@ const PgSignUp = (props) => {
                              );
                              setIsLoader(false);
                              alert("Registered user successfully");
-                              const redirectUrl =
-                                location?.state?.from ||
-                                `/${element.pageType}/${element.pageId}`;
-
-                              // Redirect to the appropriate URL after successful login
-                              navigate(redirectUrl);
+                              navigate(
+                                `/${element.pageType}/${element.pageId}`
+                              );
                            }
                          } else {
                            alert("Registered user successfully");
@@ -406,12 +397,7 @@ const PgSignUp = (props) => {
                            );
                            localStorage.setItem("pageType", element.pageType);
                            setIsLoader(false);
-                            const redirectUrl =
-                            location?.state?.from ||
-                            `/${element.pageType}/${element.pageId}`;
-
-                          // Redirect to the appropriate URL after successful login
-                          navigate(redirectUrl);
+                            navigate(`/${element.pageType}/${element.pageId}`);
                          }
                        },
                        (error) => {
@@ -429,7 +415,7 @@ const PgSignUp = (props) => {
              }
            })
            .catch((err) => {
-              console.log("err", err);
+              console.log('err', err)
              setIsLoader(false);
            });
        }
@@ -462,10 +448,10 @@ const PgSignUp = (props) => {
      ) : (
        <form id="signup" className="pgsignup-content" onSubmit={handleSubmit}>
          <div className="pgsignup-container">
-            <h1 className="text-2xl md:text-3xl font-bold">Choose Password</h1>
+            <h1 className="text-4xl font-bold">Choose Password</h1>
            <hr className="hrt" />
            <label htmlFor="password">
-              <b className="text-[13px]">Password</b>
+              <b>Password</b>
            </label>
            <input
              type="password"
@@ -478,7 +464,7 @@ const PgSignUp = (props) => {
            />

            <label htmlFor="confirmPassword">
-              <b className="text-[13px]">Confirm Password</b>
+              <b>Confirm Password</b>
            </label>
            <input
              type="password"
@@ -508,33 +494,6 @@ const PgSignUp = (props) => {
            >
              {validationMessage}
            </div>
-            {formData.password.length > 0 && (
-              <div className="mt-1 text-[11px]">
-                <p
-                  className={`${
-                    lengthValid ? "text-green-600" : "text-red-600"
-                  }`}
-                >
-                  {lengthValid ? "✓" : "✗"} Password should be 8 characters long
-                </p>
-                <p
-                  className={`${
-                    caseDigitValid ? "text-green-600" : "text-red-600"
-                  }`}
-                >
-                  {caseDigitValid ? "✓" : "✗"} Password should contain uppercase
-                  letter, lowercase letter, digit
-                </p>
-                <p
-                  className={`${
-                    specialCharValid ? "text-green-600" : "text-red-600"
-                  }`}
-                >
-                  {specialCharValid ? "✓" : "✗"} Password should contain special
-                  character
-                </p>
-              </div>
-            )}
            <div className="clearfix">
              <button type="submit" className="signupbtn">
                Submit
@@ -2,14 +2,14 @@ import React, { useState, useEffect } from "react";
 import { useNavigate } from "react-router";
 import { NavLink } from "react-router-dom";
 import checkmark from "../assets/images/checkmark.png";
-import plansArr from "../json/plansArr.json";
+import plansArr from '../json/plansArr.json'
 import Title from "../components/Title";
 const listItemStyle = {
-  paddingLeft: "20px", // Add padding to create space for the image
+  paddingLeft: '20px', // Add padding to create space for the image
  backgroundImage: `url(${checkmark})`, // Set your image as the list style image
-  backgroundPosition: "left",
-  backgroundRepeat: "no-repeat",
-  backgroundSize: "16px 16px" // Adjust the size of the image
+  backgroundPosition: 'left',
+  backgroundRepeat: 'no-repeat',
+  backgroundSize: '16px 16px', // Adjust the size of the image
 };

 const PlanSubscriptions = () => {
@@ -28,25 +28,20 @@ const PlanSubscriptions = () => {
      : "";
  const phone =
    userDetails && userDetails.phone ? "&mobile=" + userDetails.phone : "";
-  const details =
-    "?shipping_country_code=US&billing_country_code=US&billing_state_code=CA&" +
-    name +
-    email +
-    company +
-    phone;
+  const details = "?shipping_country_code=US&" + name + email + company + phone;
  useEffect(() => {
    if (localStorage.getItem("accesstoken")) {
      setIsLoader(false);
      setYearlyVisible(false);
    } else {
-      navigate("/", { replace: true });
+      navigate("/");
    }
    // eslint-disable-next-line
  }, []);

  return (
    <>
-      <Title title={"Subscriptions"} />
+    <Title title={"Subscriptions"} />
      {isLoader ? (
        <div
          style={{
@@ -78,6 +73,31 @@ const PlanSubscriptions = () => {
            id="monthlyPlans"
            className={`${yearlyVisible ? "none" : "block my-2"}`}
          >
+            {/* <div className=" my-2 w-full flex justify-center">
+              <ul
+                className="navs"
+                style={{
+                  listStyle: "none",
+                  display: "flex",
+                  alignItems: "baseline"
+                }}
+              >
+                <li className="nav-item">
+                  <button className="nav-link frequency active" name="1_months">
+                    Monthly
+                  </button>
+                </li>
+                <li className="nav-item">
+                  <button
+                    className="nav-link frequency "
+                    onClick={toggleFrequency}
+                    name="1_years"
+                  >
+                    Yearly
+                  </button>
+                </li>
+              </ul>
+            </div> */}
            <div className="flex justify-center w-full my-2">
              <ul className=" flex flex-col md:flex-row h-full bg-white justify-center border-collapse border-[1px] border-gray-300">
                {plansArr.map((item) => (
@@ -104,41 +124,22 @@ const PlanSubscriptions = () => {
                        <div
                          className={`${
                            item.subtitle.length <= 32
-                              ? "w-[150px] text-center"
+                              ? "w-[150px]  text-center"
                              : ""
                          } text-sm text-center my-2`}
                        >
-                          <p
-                            style={{
-                              backgroundColor: item.subtitlecolor
-                                ? item.subtitlecolor
-                                : "white"
-                            }}
-                          >
-                            {item.subtitle.includes("<") ? (
-                              <div
-                                dangerouslySetInnerHTML={{
-                                  __html: item.subtitle
-                                }}
-                              />
-                            ) : (
-                              <span>{item.subtitle}</span>
-                            )}
-                          </p>
+                          <p>{item.subtitle}</p>
                        </div>
                      </div>
-
-                      <NavLink
-                        to={
-                          item.btnText === "Subscribe"
-                            ? item.url + details
-                            : item.url
-                        }
-                        className="bg-[#002862] w-full text-white py-2 rounded uppercase hover:no-underline hover:text-white"
-                        target={item.target}
-                      >
-                        {item.btnText}
-                      </NavLink>
+                      <div className="bg-[#002862] w-full text-white py-2 rounded">
+                        <NavLink
+                          to={item.url + details}
+                          className="rounded uppercase hover:no-underline hover:text-white"
+                          target="_self"
+                        >
+                          {item.btnText}
+                        </NavLink>
+                      </div>
                    </div>
                    <hr className="w-full bg-gray-300 p-[.5px]" />
                    <ul className="mx-1 p-3 text-left break-words text-sm list-none">
@@ -5,7 +5,6 @@ import axios from "axios";
 import reportJson from "../json/ReportJson";
 import { useParams } from "react-router-dom";
 import Title from "../components/Title";
-import PageNotFound from "./PageNotFound";

 const Report = () => {
  const { id } = useParams();
@@ -13,12 +12,9 @@ const Report = () => {
  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 [form, setForm] = useState("");
  const abortController = new AbortController();
-  const docPerPage = 10;

  // below useEffect is call when id param change
  useEffect(() => {
@@ -50,27 +46,31 @@ const Report = () => {
    const json = reportJson(id);
    if (json) {
      setActions(json.actions);
-      setHeading(json.heading);
      setReportName(json.reportName);
-      setForm(json.form);
+      const { className, params, keys, orderBy } = json;
      Parse.serverURL = localStorage.getItem("BaseUrl12");
      Parse.initialize(localStorage.getItem("AppID12"));
      const currentUser = Parse.User.current().id;
+      const serverURL =
+        localStorage.getItem("BaseUrl12") + "classes/" + className;

+      const strParams = JSON.stringify(params);
+      const strKeys = keys.join();
      const headers = {
        "Content-Type": "application/json",
        "X-Parse-Application-Id": localStorage.getItem("AppID12"),
-        sessiontoken: localStorage.getItem("accesstoken")
+        "X-Parse-Session-Token": localStorage.getItem("accesstoken")
      };
      try {
-        const params = { reportId: id, skip: skipUserRecord, limit: limit };
-        const url = `${localStorage.getItem("BaseUrl12")}/functions/getReport`;
-        const res = await axios.post(url, params, {
+        const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skipUserRecord}&limit=${limit}&include=AuditTrail.UserPtr`;
+        const res = await axios.get(url, {
          headers: headers,
          signal: abortController.signal // is used to cancel fetch query
        });
        if (id === "4Hhwbp482K") {
-          const listData = res.data?.result.filter((x) => x.Signers.length > 0);
+          const listData = res.data?.results.filter(
+            (x) => x.Signers.length > 0
+          );
          let arr = [];
          for (const obj of listData) {
            const isSigner = obj.Signers.some(
@@ -92,7 +92,7 @@ const Report = () => {
              }
            }
          }
-          if (arr.length === docPerPage) {
+          if (arr.length === 10) {
            setIsMoreDocs(true);
          } else {
            setIsMoreDocs(false);
@@ -101,16 +101,17 @@ const Report = () => {
            prevRecord.length > 0 ? [...prevRecord, ...arr] : arr
          );
        } else {
-          if (res.data.result.length === docPerPage) {
+          if (res.data.results.length === 10) {
            setIsMoreDocs(true);
+            console.log("here");
          } else {
            setIsMoreDocs(false);
          }
          setIsNextRecord(false);
          setList((prevRecord) =>
            prevRecord.length > 0
-              ? [...prevRecord, ...res.data.result]
-              : res.data.result
+              ? [...prevRecord, ...res.data.results]
+              : res.data.results
          );
        }
        setIsLoader(false);
@@ -151,16 +152,18 @@ const Report = () => {
            <ReportTable
              ReportName={reportName}
              List={List}
-              setList={setList}
              actions={actions}
-              heading={heading}
              setIsNextRecord={setIsNextRecord}
              isMoreDocs={isMoreDocs}
-              docPerPage={docPerPage}
-              form={form}
            />
          ) : (
-            <PageNotFound prefix={"Report"} />
+            <div className="flex items-center justify-center h-screen w-full bg-white rounded">
+              <div className="text-center">
+                <p className="text-[30px] lg:text-[50px] text-black">
+                  Report Not Found
+                </p>
+              </div>
+            </div>
          )}
        </>
      )}
@@ -6,10 +6,8 @@ import Title from "../components/Title";
 import { fetchAppInfo, showTenantName } from "../redux/actions";
 import { useNavigate, NavLink } from "react-router-dom";
 import login_img from "../assets/images/login_img.svg";
-import { useWindowSize } from "../hook/useWindowSize";

 const Signup = (props) => {
-  const { width } = useWindowSize();
  const navigate = useNavigate();
  const [name, setName] = useState("");
  const [phone, setPhone] = useState("");
@@ -20,143 +18,122 @@ const Signup = (props) => {
  const [company, setCompany] = useState("");
  const [jobTitle, setJobTitle] = useState("");
  const [state, setState] = useState({
+    hideNav: "",
    loading: false,
    toastColor: "#5cb85c",
    toastDescription: ""
  });
  const [showPassword, setShowPassword] = useState(false);
-  const [lengthValid, setLengthValid] = useState(false);
-  const [caseDigitValid, setCaseDigitValid] = useState(false);
-  const [specialCharValid, setSpecialCharValid] = useState(false);
-
  const togglePasswordVisibility = () => setShowPassword(!showPassword);
  const image = props.appInfo.applogo;

-  const clearStorage = async () => {
-    if (Parse.User.current()) {
-      await Parse.User.logOut();
-    }
-    let baseUrl = localStorage.getItem("BaseUrl12");
-    let appid = localStorage.getItem("AppID12");
-    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("BaseUrl12", baseUrl);
-    localStorage.setItem("AppID12", 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 handleSubmit = (event) => {
-    event.preventDefault();
-    if (lengthValid && caseDigitValid && specialCharValid) {
-      clearStorage();
-      setState({ loading: true });
-      const userDetails = {
-        name: name,
-        email: email,
-        phone: phone,
-        company: company,
-        jobTitle: jobTitle
-      };
-      localStorage.setItem("userDetails", JSON.stringify(userDetails));
-      try {
-        Parse.serverURL = parseBaseUrl;
-        Parse.initialize(parseAppId);
-        event.preventDefault();
-        var user = new Parse.User();
-        user.set("name", name);
-        user.set("email", email);
-        user.set("password", password);
-        user.set("phone", phone);
-        user.set("username", email);
-        let res = user.save();
-        res
-          .then(async (r) => {
-            if (r) {
-              let roleData = props.appInfo.settings;
-              if (roleData && roleData.length > 0) {
-                const params = {
-                  userDetails: {
-                    jobTitle: jobTitle,
-                    company: company,
-                    name: name,
-                    email: email,
-                    phone: phone,
-                    role: props.appInfo.defaultRole
-                  }
-                };
-                try {
-                  const usersignup = await Parse.Cloud.run(
-                    "usersignup",
-                    params
-                  );
-                  if (usersignup) {
-                    handleNavigation(r.getSessionToken());
-                  }
-                } catch (err) {
-                  alert(err.message);
-                  setState({ loading: false });
-                }
-              }
-            }
-          })
-          .catch(async (err) => {
-            if (err.code === 202) {
-              const params = { email: email };
-              const res = await Parse.Cloud.run("getUserDetails", params);
-              // console.log("Res ", res);
-              if (res) {
-                alert("User already exists with this username!");
-                setState({ loading: false });
-              } else {
-                let baseUrl = localStorage.getItem("BaseUrl12");
-                let parseAppId = localStorage.getItem("AppID12");
-                // console.log("state.email ", email);
-                try {
-                  Parse.serverURL = baseUrl;
-                  Parse.initialize(parseAppId);
-                  await Parse.User.requestPasswordReset(email).then(
-                    async function (res1) {
-                      if (res1.data === undefined) {
-                        alert(
-                          "Verification mail has been sent to your E-mail!"
-                        );
+    setState({ loading: true });
+    const userDetails = {
+      name: name,
+      email: email,
+      phone: phone,
+      company: company,
+      jobTitle: jobTitle
+    };
+    localStorage.setItem("userDetails", JSON.stringify(userDetails));
+    try {
+      event.preventDefault();
+      Parse.serverURL = parseBaseUrl;
+      Parse.initialize(parseAppId);
+      event.preventDefault();
+      var user = new Parse.User();
+      user.set("name", name);
+      user.set("email", email);
+      user.set("password", password);
+      user.set("phone", phone);
+      user.set("username", email);
+      let res = user.save();
+      res
+        .then(async (r) => {
+          if (r) {
+            let roleurl = `${parseBaseUrl}functions/AddUserToRole`;
+            const headers = {
+              "Content-Type": "application/json",
+              "X-Parse-Application-Id": parseAppId,
+              sessionToken:
+                r.getSessionToken() || localStorage.getItem("accesstoken")
+            };
+            let body = {
+              appName: props.appInfo.appname,
+              roleName: props.appInfo.defaultRole,
+              userId: r.id
+            };
+            await axios.post(roleurl, body, { headers: headers });
+
+            let roleData = props.appInfo.settings;
+            if (roleData && roleData.length > 0) {
+              roleData.forEach((rld) => {
+                if (rld.role === props.appInfo.defaultRole) {
+                  const extCls = Parse.Object.extend(rld.extended_class);
+                  const newObj = new extCls();
+                  newObj.set("UserId", {
+                    __type: "Pointer",
+                    className: "_User",
+                    objectId: r.id
+                  });
+                  newObj.set("UserRole", props.appInfo.defaultRole);
+                  newObj.set("Email", email);
+                  newObj.set("Name", name);
+                  newObj.set("Phone", phone);
+                  newObj.set("Company", company);
+                  newObj.set("JobTitle", jobTitle);
+                  newObj
+                    .save()
+                    .then((ex) => {
+                      if (ex) {
+                        handleNavigation(r.getSessionToken());
                      }
-                    }
-                  );
-                } catch (err) {
-                  console.log(err);
+                    })
+                    .catch((err) => {
+                      alert(err.message);
+                      setState({ loading: false });
+                    });
                }
-                setState({ loading: false });
-              }
+              });
+            }
+          }
+        })
+        .catch(async (err) => {
+          if (err.code === 202) {
+            const userQuery = new Parse.Query("contracts_Users");
+            userQuery.equalTo("Email", email);
+            const res = await userQuery.first();
+            // console.log("Res ", res);
+            if (res) {
+              alert("User already exists with this username!");
+              setState({ loading: false });
            } else {
-              alert(err.message);
+              let baseUrl = localStorage.getItem("BaseUrl12");
+              let parseAppId = localStorage.getItem("AppID12");
+              // console.log("state.email ", email);
+              try {
+                Parse.serverURL = baseUrl;
+                Parse.initialize(parseAppId);
+                await Parse.User.requestPasswordReset(email).then(
+                  async function (res1) {
+                    if (res1.data === undefined) {
+                      alert("Verification mail has been sent to your E-mail!");
+                    }
+                  }
+                );
+              } catch (err) {
+                console.log(err);
+              }
              setState({ loading: false });
            }
-          });
-      } catch (error) {
-        console.log("err ", error);
-      }
+          } else {
+            alert(err.message);
+            setState({ loading: false });
+          }
+        });
+    } catch (error) {
+      console.log("err ", error);
    }
  };

@@ -231,6 +208,13 @@ const Signup = (props) => {
                        ""
                      );
                      localStorage.setItem("_user_role", _role);
+
+                      if (element.enableCart) {
+                        localStorage.setItem("EnableCart", element.enableCart);
+                        props.setEnableCart(element.enableCart);
+                      } else {
+                        localStorage.removeItem("EnableCart");
+                      }
                      // Get TenentID from Extendend Class
                      localStorage.setItem(
                        "extended_class",
@@ -238,12 +222,15 @@ const Signup = (props) => {
                      );
                      localStorage.setItem("userpointer", element.userpointer);

-                      await Parse.Cloud.run("getUserDetails", {
-                        email: email
-                      }).then(
-                        (result) => {
+                      const extendedClass = Parse.Object.extend(
+                        element.extended_class
+                      );
+                      let query = new Parse.Query(extendedClass);
+                      query.equalTo("UserId", Parse.User.current());
+                      query.include("TenantId");
+                      await query.find().then(
+                        (results) => {
                          let tenentInfo = [];
-                          const results = [result];
                          if (results) {
                            let extendedInfo_stringify =
                              JSON.stringify(results);
@@ -331,7 +318,7 @@ const Signup = (props) => {
                              );
                              setState({ loading: false });
                              if (process.env.REACT_APP_ENABLE_SUBSCRIPTION) {
-                                navigate(`/subscription`, { replace: true });
+                                navigate("/subscription");
                              } else {
                                alert("Registered user successfully");
                                navigate(
@@ -349,7 +336,7 @@ const Signup = (props) => {
                            localStorage.setItem("pageType", element.pageType);
                            setState({ loading: false });
                            if (process.env.REACT_APP_ENABLE_SUBSCRIPTION) {
-                              navigate(`/subscription`, { replace: true });
+                              navigate("/subscription");
                            } else {
                              navigate(
                                `/${element.pageType}/${element.pageId}`
@@ -434,26 +421,23 @@ const Signup = (props) => {
    }
  };
  useEffect(() => {
+    window.addEventListener("resize", resize);
    props.fetchAppInfo(
      localStorage.getItem("domain"),
      localStorage.getItem("BaseUrl12"),
      localStorage.getItem("AppID12")
    );
+    return () => {
+      window.removeEventListener("resize", resize);
+    };
    // eslint-disable-next-line
  }, []);

-  const handlePasswordChange = (e) => {
-    const newPassword = e.target.value;
-    setPassword(newPassword);
-
-    // Check conditions separately
-    setLengthValid(newPassword.length >= 8);
-    setCaseDigitValid(
-      /[a-z]/.test(newPassword) &&
-        /[A-Z]/.test(newPassword) &&
-        /\d/.test(newPassword)
-    );
-    setSpecialCharValid(/[!@#$%^&*()\-_=+{};:,<.>]/.test(newPassword));
+  const resize = () => {
+    let currentHideNav = window.innerWidth <= 760;
+    if (currentHideNav !== state.hideNav) {
+      setState({ hideNav: currentHideNav });
+    }
  };
  return (
    <div className="bg-white">
@@ -488,7 +472,11 @@ const Signup = (props) => {
        <div>
          <div className="md:m-10 lg:m-16 md:p-4 lg:p-10 p-5 bg-[#ffffff] md:border-[1px] md:border-gray-400 ">
            <div className="w-[250px] h-[66px] inline-block">
-              <img src={image} width="100%" alt="" />
+              {state.hideNav ? (
+                <img src={image} width="100%" alt="" />
+              ) : (
+                <img src={image} width="100%" alt="" />
+              )}
            </div>
            <div className="grid grid-cols-1 md:grid-cols-2 gap-x-2">
              <div className="">
@@ -567,7 +555,7 @@ const Signup = (props) => {
                          className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
                          name="password"
                          value={password}
-                          onChange={(e) => handlePasswordChange(e)}
+                          onChange={(e) => setPassword(e.target.value)}
                          required
                        />
                        <span
@@ -583,38 +571,6 @@ const Signup = (props) => {
                          )}
                        </span>
                      </div>
-                      {password.length > 0 && (
-                        <div className="mt-1 text-[11px]">
-                          <p
-                            className={`${
-                              lengthValid ? "text-green-600" : "text-red-600"
-                            }`}
-                          >
-                            {lengthValid ? "✓" : "✗"} Password should be 8
-                            characters long
-                          </p>
-                          <p
-                            className={`${
-                              caseDigitValid ? "text-green-600" : "text-red-600"
-                            }`}
-                          >
-                            {caseDigitValid ? "✓" : "✗"} Password should contain
-                            uppercase letter, lowercase letter, digit
-                          </p>
-                          <p
-                            className={`${
-                              specialCharValid
-                                ? "text-green-600"
-                                : "text-red-600"
-                            }`}
-                          >
-                            {specialCharValid ? "✓" : "✗"} Password should
-                            contain special character
-                          </p>
-                          {/* </>
-                          )} */}
-                        </div>
-                      )}
                    </div>
                  </div>
                  <div className="flex flex-col md:flex-row justify-between items-stretch gap-8 text-center text-xs font-bold mt-2">
@@ -628,14 +584,14 @@ const Signup = (props) => {
                    <NavLink
                      className="rounded-sm cursor-pointer bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] w-full py-3 shadow uppercase"
                      to="/"
-                      style={width < 768 ? { textAlign: "center" } : {}}
+                      style={state.hideNav ? { textAlign: "center" } : {}}
                    >
                      Login
                    </NavLink>
                  </div>
                </form>
              </div>
-              {width >= 768 && (
+              {!state.hideNav && (
                <div className="self-center">
                  <div className="mx-auto md:w-[300px] lg:w-[400px] xl:w-[500px]">
                    <img src={login_img} alt="bisec" width="100%" />
@@ -5,7 +5,7 @@ import { SaveFileSize } from "../constant/saveFileSize";
 import dp from "../assets/images/dp.png";
 import Title from "../components/Title";
 import sanitizeFileName from "../primitives/sanitizeFileName";
-import axios from "axios";
+
 function UserProfile() {
  const navigate = useNavigate();
  let UserProfile = JSON.parse(localStorage.getItem("UserInformation"));
@@ -16,8 +16,6 @@ function UserProfile() {
  const [Phone, SetPhone] = useState(UserProfile && UserProfile.phone);
  const [Image, setImage] = useState(localStorage.getItem("profileImg"));
  const [isLoader, setIsLoader] = useState(false);
-  const [percentage, setpercentage] = useState(0);
-
  Parse.serverURL = parseBaseUrl;
  Parse.initialize(parseAppId);
  const handleSubmit = async (e) => {
@@ -46,7 +44,7 @@ function UserProfile() {
              await updateExtUser({ Name: res.name, Phone: res.phone });
              alert("Profile updated successfully.");
              setEditMode(false);
-              navigate("/dashboard/35KBoSgoAK");
+              navigate("/");
            }
          },
          (error) => {
@@ -66,24 +64,18 @@ function UserProfile() {
    const extClass = localStorage.getItem("extended_class");
    const extData = JSON.parse(localStorage.getItem("Extand_Class"));
    const ExtUserId = extData[0].objectId;
+    // console.log("extData ", extData);
    // console.log("UserId ", ExtUserId);
-    const body = { Phone: obj.Phone, Name: obj.Name };
-    await axios.put(
-      parseBaseUrl + "classes/" + extClass + "/" + ExtUserId,
-      body,
-      {
-        headers: {
-          "Content-Type": "application/json",
-          "X-Parse-Application-Id": parseAppId,
-          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-        }
-      }
-    );
-    const res = await Parse.Cloud.run("getUserDetails", {
-      email: extData[0].Email
-    });

-    const json = JSON.parse(JSON.stringify([res]));
+    const extQuery = new Parse.Query(extClass);
+    const update = await extQuery.get(ExtUserId);
+    // console.log("update ", update);
+
+    update.set("Phone", obj.Phone);
+    update.set("Name", obj.Name);
+    const updateRes = await update.save();
+
+    const json = JSON.parse(JSON.stringify([updateRes]));
    const extRes = JSON.stringify(json);

    localStorage.setItem("Extand_Class", extRes);
@@ -104,15 +96,7 @@ function UserProfile() {
    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);
-          }
-        }
-      });
+      const response = await parseFile.save();
      // // The response object will contain information about the uploaded file
      // console.log("File uploaded:", response);

@@ -121,7 +105,6 @@ function UserProfile() {
      if (response.url()) {
        setImage(response.url());
        localStorage.setItem("profileImg", response.url());
-        setpercentage(0);
        SaveFileSize(size, response.url());
        return response.url();
      }
@@ -158,126 +141,113 @@ function UserProfile() {
          ></div>
        </div>
      ) : (
-        <div className="flex justify-center items-center w-full">
-          <div className="bg-white flex flex-col justify-center shadow rounded w-[450px]">
-            <div className="flex flex-col justify-center items-center my-4">
-              <div className="w-[200px] h-[200px] overflow-hidden rounded-full">
-                <img
-                  className="object-contain w-full h-full"
-                  src={Image === "" ? dp : Image}
-                  alt="dp"
-                />
-              </div>
-              {editmode && (
-                <input
-                  type="file"
-                  className="max-w-[270px] text-sm py-1 px-2 mt-4 border-[1px] border-[#15b4e9] text-black rounded"
-                  accept="image/png, image/gif, image/jpeg"
-                  onChange={(e) => {
-                    let files = e.target.files;
-                    fileUpload(files[0]);
-                  }}
-                />
-              )}
-              {percentage !== 0 && (
-                <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>
-              )}
-              <div className="text-base font-semibold pt-4">
-                {localStorage.getItem("_user_role")}
-              </div>
+        <div className="bg-white flex flex-col justify-center shadow rounded">
+          <div className="flex flex-col justify-center items-center my-4">
+            <div className="w-[200px] h-[200px] overflow-hidden rounded-full">
+              <img
+                className="object-contain w-full h-full"
+                src={Image === "" ? dp : Image}
+                alt="dp"
+              />
            </div>
-            <ul className="w-full flex flex-col p-2 text-sm">
-              <li
-                className={`flex justify-between items-center border-t-[1px] border-gray-300 break-all ${
-                  editmode ? "py-1" : "py-2"
-                }`}
-              >
-                <span className="font-semibold">Name:</span>{" "}
-                {editmode ? (
-                  <input
-                    type="text"
-                    value={name}
-                    className="py-1 px-2 text-sm border-[1px] border-[#15b4e9] text-black rounded"
-                    onChange={(e) => SetName(e.target.value)}
-                  />
-                ) : (
-                  <span>{localStorage.getItem("username")}</span>
-                )}
-              </li>
-              <li
-                className={`flex justify-between items-center border-t-[1px] border-gray-300 break-all ${
-                  editmode ? "py-1" : "py-2"
-                }`}
-              >
-                <span className="font-semibold">Phone:</span>{" "}
-                {editmode ? (
-                  <input
-                    type="text"
-                    className="py-1 px-2 text-sm border-[1px] border-[#15b4e9] text-black rounded"
-                    onChange={(e) => SetPhone(e.target.value)}
-                    value={Phone}
-                  />
-                ) : (
-                  <span>{UserProfile && UserProfile.phone}</span>
-                )}
-              </li>
-              <li className="flex justify-between items-center border-t-[1px] border-gray-300 py-2 break-all">
-                <span className="font-semibold">Email:</span>{" "}
-                <span>{UserProfile && UserProfile.email}</span>
-              </li>
-              <li className="flex justify-between items-center border-y-[1px] border-gray-300 py-2 break-all">
-                <span className="font-semibold">Is Email verified:</span>{" "}
-                <span>
-                  {UserProfile && UserProfile.emailVerified
-                    ? "Verified"
-                    : "Not verified"}
-                </span>
-              </li>
-            </ul>
-            <div className="flex justify-center pt-2 pb-3 md:pt-3 md:pb-4">
+            {editmode && (
+              <input
+                type="file"
+                className="max-w-[270px] text-sm py-1 px-2 mt-4 border-[1px] border-[#15b4e9] text-black rounded"
+                onChange={(e) => {
+                  let files = e.target.files;
+                  fileUpload(files[0]);
+                }}
+              />
+            )}
+            <div className="text-base font-semibold pt-4">
+              {" "}
+              {localStorage.getItem("_user_role")}
+            </div>
+          </div>
+          <ul className="w-full flex flex-col p-2 text-sm">
+            <li
+              className={`flex justify-between items-center border-t-[1px] border-gray-300 break-all ${
+                editmode ? "py-1" : "py-2"
+              }`}
+            >
+              <span>Name:</span>{" "}
              {editmode ? (
-                <button
-                  type="button"
-                  onClick={handleSubmit}
-                  className="rounded shadow focus:outline-none border-[2px] border-[#15b4e9] bg-white text-[#15b4e9] px-4 py-2 mr-4"
-                >
-                  Save
-                </button>
+                <input
+                  type="text"
+                  value={name}
+                  className="py-1 px-2 text-sm border-[1px] border-[#15b4e9] text-black rounded"
+                  onChange={(e) => SetName(e.target.value)}
+                />
              ) : (
-                <button
-                  type="button"
-                  onClick={() => {
-                    setEditMode(true);
-                  }}
-                  className="rounded shadow focus:outline-none text-white bg-[#e7505a] px-4 py-2 mr-4"
-                >
-                  Edit
-                </button>
+                <span>{localStorage.getItem("username")}</span>
              )}
+            </li>
+            <li
+              className={`flex justify-between items-center border-t-[1px] border-gray-300 break-all ${
+                editmode ? "py-1" : "py-2"
+              }`}
+            >
+              <span>Phone:</span>{" "}
+              {editmode ? (
+                <input
+                  type="text"
+                  className="py-1 px-2 text-sm border-[1px] border-[#15b4e9] text-black rounded"
+                  onChange={(e) => SetPhone(e.target.value)}
+                  value={Phone}
+                />
+              ) : (
+                <span>{UserProfile && UserProfile.phone}</span>
+              )}
+            </li>
+            <li className="flex justify-between items-center border-t-[1px] border-gray-300 py-2 break-all">
+              <span>Email:</span>{" "}
+              <span>{UserProfile && UserProfile.email}</span>
+            </li>
+            <li className="flex justify-between items-center border-y-[1px] border-gray-300 py-2 break-all">
+              <span>Is Email verified:</span>{" "}
+              <span>
+                {UserProfile && UserProfile.emailVerified
+                  ? "Verified"
+                  : "Not verified"}
+              </span>
+            </li>
+          </ul>
+          <div className="flex justify-center pb-4">
+            <button
+              type="button"
+              onClick={() => {
+                if (editmode) {
+                  setEditMode(false);
+                } else {
+                  navigate("/changepassword");
+                }
+              }}
+              className={`rounded shadow text-white bg-[#3598dc] mr-4 ${
+                editmode ? "px-4 py-2 " : "p-2"
+              }`}
+            >
+              {editmode ? "Cancel" : "Change Password"}
+            </button>
+            {editmode ? (
+              <button
+                type="button"
+                onClick={handleSubmit}
+                className="rounded  bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] px-4 py-2"
+              >
+                Save
+              </button>
+            ) : (
              <button
                type="button"
                onClick={() => {
-                  if (editmode) {
-                    setEditMode(false);
-                  } else {
-                    navigate("/changepassword");
-                  }
+                  setEditMode(true);
                }}
-                className={`rounded shadow focus:outline-none text-white bg-[#3598dc]  ${
-                  editmode ? "px-4 py-2 " : "p-2"
-                }`}
+                className="rounded shadow text-white bg-[#e7505a] px-4 py-2"
              >
-                {editmode ? "Cancel" : "Change Password"}
+                Edit
              </button>
-            </div>
+            )}
          </div>
        </div>
      )}
@@ -1,171 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Title from "../components/Title";
-import axios from "axios";
-import Alert from "../primitives/Alert";
-import ModalUi from "../primitives/ModalUi";
-import { rejectBtn, submitBtn } from "../constant/const";
-import { openInNewTab } from "../constant/Utils";
-import Parse from "parse";
-
-function Webhook() {
-  const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
-  const [parseAppId] = useState(localStorage.getItem("parseAppId"));
-  const [webhook, setWebhook] = useState();
-  const [isLoader, setIsLoader] = useState(true);
-  const [isGenerate, setIsGenerate] = useState(false);
-  const [isErr, setIsErr] = useState(false);
-  const [isModal, setIsModal] = useState(false);
-
-  useEffect(() => {
-    fetchWebhook();
-    // eslint-disable-next-line
-  }, []);
-
-  const fetchWebhook = async () => {
-    const email = Parse.User.current().getEmail();
-    const params = { email: email };
-    try {
-      const extRes = await Parse.Cloud.run("getUserDetails", params);
-      if (extRes) {
-        setWebhook(extRes.get("Webhook"));
-      }
-      setIsLoader(false);
-    } catch (err) {
-      setWebhook();
-      setIsLoader(false);
-      console.log("Err", err);
-    }
-  };
-  const handleSubmit = async (e) => {
-    e.preventDefault();
-    setIsLoader(true);
-    setIsModal(false);
-    try {
-      const params = { url: webhook };
-      const url = parseBaseUrl + "functions/savewebhook";
-      const headers = {
-        "Content-Type": "application/json",
-        "X-Parse-Application-Id": parseAppId,
-        sessiontoken: localStorage.getItem("accesstoken")
-      };
-      await axios.post(url, params, { headers: headers }).then((res) => {
-        if (res.data && res.data.result && res.data.result.Webhook) {
-          setWebhook(res.data.result.Webhook);
-          setIsGenerate(true);
-          setTimeout(() => {
-            setIsGenerate(false);
-          }, 1500);
-          setIsLoader(false);
-        } else {
-          console.error("Error while generating webhook");
-          setIsLoader(false);
-          setIsErr(true);
-          setTimeout(() => {
-            setIsErr(false);
-          }, 1500);
-        }
-      });
-    } catch (error) {
-      setIsLoader(false);
-      setIsErr(true);
-      setTimeout(() => {
-        setIsErr(false);
-      }, 1500);
-
-      console.log("err", error);
-    }
-  };
-
-  const handleModal = () => setIsModal(!isModal);
-  return (
-    <React.Fragment>
-      <Title title={"Webhook"} />
-      {isGenerate && <Alert type="success">Webhook added successfully!</Alert>}
-      {isErr && <Alert type="danger">Something went wrong!</Alert>}
-      {isLoader ? (
-        <div
-          style={{
-            height: "100vh",
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center"
-          }}
-        >
-          <div
-            style={{
-              fontSize: "45px",
-              color: "#3dd3e0"
-            }}
-            className="loader-37"
-          ></div>
-        </div>
-      ) : (
-        <div className="bg-white flex flex-col justify-center shadow rounded">
-          <h1 className="ml-4 mt-3 mb-2 font-semibold">Webhook</h1>
-          <ul className="w-full flex flex-col  p-2 text-sm">
-            <li
-              className={`flex justify-between items-center border-y-[1px] border-gray-300 break-all py-2`}
-            >
-              <span className="w-[40%]">Webhook:</span>{" "}
-              <span id="token" className="w-[60%] md:text-end cursor-pointer">
-                {webhook && webhook}
-              </span>
-            </li>
-          </ul>
-          <div className="flex flex-col md:flex-row items-center justify-center gap-2 pb-4">
-            <button
-              type="button"
-              onClick={handleModal}
-              className="rounded hover:bg-[#15b4e9] border-[1px] border-[#15b4e9] text-[#15b4e9] hover:text-white px-4 py-2 text-xs md:text-base focus:outline-none"
-            >
-              {webhook ? "Update Webhook" : "Add Webhook"}
-            </button>
-            <button
-              type="button"
-              onClick={() =>
-                openInNewTab(
-                  "https://docs.opensignlabs.com/docs/API-docs/save-update-webhook"
-                )
-              }
-              className="rounded hover:bg-[#15b4e9] border-[1px] border-[#15b4e9] text-[#15b4e9] hover:text-white px-11 py-2 text-xs md:text-base focus:outline-none"
-            >
-              View Docs
-            </button>
-          </div>
-
-          <ModalUi
-            isOpen={isModal}
-            title={"Regenerate Token"}
-            handleClose={handleModal}
-          >
-            <div className="m-[20px]">
-              <div className="text-lg font-normal text-black">
-                <label className="text-sm ml-2">Webhook</label>
-                <input
-                  value={webhook}
-                  onChange={(e) => setWebhook(e.target.value)}
-                  placeholder="Enter webhook url"
-                  className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-                />
-              </div>
-              <hr className="bg-[#ccc] mt-4 " />
-              <div className="flex items-center mt-3 gap-2 text-white">
-                <button
-                  onClick={handleSubmit}
-                  className={submitBtn + "ml-[2px]"}
-                >
-                  Yes
-                </button>
-                <button onClick={handleModal} className={rejectBtn}>
-                  No
-                </button>
-              </div>
-            </div>
-          </ModalUi>
-        </div>
-      )}
-    </React.Fragment>
-  );
-}
-
-export default Webhook;
@@ -1,14 +1,12 @@
 /* Full-width input fields */
 .inputt {
    width: 100%;
-    padding: 8px;
-    margin-bottom: 10px;
-    /* margin: 5px 0 14px 0; */
+    padding: 15px;
+    margin: 5px 0 22px 0;
    display: inline-block;
    border: none;
    background: #f1f1f1;
    color: black;
-    font-size: 12px;
 }

 /* Add a background color when the inputs get focus */
@@ -20,12 +18,11 @@

 .confirmInputt {
    width: 100%;
-    padding: 8px;
-    /* margin: 5px 0 14px 0; */
+    padding: 15px;
+    margin: 5px 0 1px 0;
    display: inline-block;
    background: #f1f1f1;
    color: black;
-    font-size: 12px;
 }

 .inputt::placeholder,
@@ -45,10 +42,11 @@
 .signupbtn {
    background-color: #15b4e9;
    color: white;
-    padding: 12px 12px;
+    padding: 14px 20px;
    margin: 8px 0;
    border: none;
    cursor: pointer;
+    width: 100%;
    opacity: 0.9;
    float: left;
    width: 50%;
@@ -89,7 +87,7 @@
    margin: 5% auto 15% auto;
    /* 5% from the top, 15% from the bottom and centered */
    border: 1px solid #888;
-    width: 50%;
+    width: 80%;
    /* Could be more or less, depending on screen size */
 }

@@ -113,26 +111,8 @@
 }

 /* Change styles for cancel button and signup button on extra small screens */
-@media screen and (max-width: 768px) {
-
-    /* pgsignup Content/Box */
-    .pgsignup-content {
-        background-color: #fefefe;
-        margin: 5% auto 15% auto;
-        /* 5% from the top, 15% from the bottom and centered */
-        border: 1px solid #888;
-        width: 90%;
-        /* Could be more or less, depending on screen size */
-    }
-
+@media screen and (max-width: 300px) {
    .signupbtn {
        width: 100%;
-        font-size: 16px;
    }
-
-    /* Style the horizontal ruler */
-    .hrt {
-        border: 1px solid #f1f1f1;
-        margin-bottom: 16px;
-    }
-}
+}
@@ -1,36 +0,0 @@
-.alertBox {
-    z-index: 1;
-    position: absolute;
-    top: 10%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    font-size: 13px;
-    animation: inAnimation 2s ease-in-out;
-}
-
-@keyframes inAnimation {
-    0% {
-        opacity: 0;
-        visibility: hidden;
-    }
-
-    25% {
-        opacity: 1;
-        visibility: visible;
-    }
-
-    50% {
-        opacity: 1;
-        visibility: visible;
-    }
-
-    75% {
-        opacity: 1;
-        visibility: visible;
-    }
-
-    100% {
-        opacity: 0;
-        visibility: hidden;
-    }
-}
@@ -1,64 +1,209 @@
 #snackbar {
-  visibility: hidden;
-  min-width: 250px;
-  margin-left: -125px;
-  background-color: #333;
-  color: #fff;
-  text-align: center;
-  border-radius: 2px;
-  padding: 16px;
-  position: fixed;
-  z-index: 99999;
-  left: 50%;
-  top: 30px;
-  font-size: 14px;
-}
-
-#snackbar.show {
-  visibility: visible;
-  -webkit-animation: fadein 0.5s;
-}
-
-@-webkit-keyframes fadein {
-  from {
-    top: 0;
-    opacity: 0;
-  }
-  to {
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #333;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    padding: 16px;
+    position: fixed;
+    z-index: 99999;
+    left: 50%;
    top: 30px;
-    opacity: 1;
+    font-size: 14px;
  }
-}
-
-@keyframes fadein {
-  from {
-    top: 0;
-    opacity: 0;
-  }
-  to {
+  
+  #_editsnackbar {
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #333;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    padding: 16px;
+    position: fixed;
+    z-index: 99999;
+    left: 50%;
    top: 30px;
-    opacity: 1;
+    font-size: 14px;
  }
-}
-
-@-webkit-keyframes fadeout {
-  from {
+  
+  #_editsnackbar.show {
+    visibility: visible;
+    -webkit-animation: fadein 0.5s;
+  }
+  
+  #UpdateColumnValue.show {
+    visibility: visible;
+    -webkit-animation: fadein 0.5s;
+  }
+  #DeleteUser.show {
+    visibility: visible;
+    -webkit-animation: fadein 0.5s;
+  }
+  #DeleteUser {
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #333;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    padding: 16px;
+    position: fixed;
+    z-index: 99999;
+    left: 50%;
    top: 30px;
-    opacity: 1;
+    font-size: 14px;
  }
-  to {
-    top: 0;
-    opacity: 0;
+  
+  #deleteObj.show {
+    visibility: visible;
+    -webkit-animation: fadein 0.5s;
  }
-}
-
-@keyframes fadeout {
-  from {
+  #deleteObj {
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #333;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    padding: 16px;
+    position: fixed;
+    z-index: 99999;
+    left: 50%;
    top: 30px;
-    opacity: 1;
+    font-size: 14px;
  }
-  to {
-    top: 0;
-    opacity: 0;
+  
+  #UpdateColumnValue {
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #333;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    padding: 16px;
+    position: fixed;
+    z-index: 99999;
+    left: 50%;
+    top: 30px;
+    font-size: 14px;
  }
-}
+  
+  #snackbar.show {
+    visibility: visible;
+    -webkit-animation: fadein 0.5s;
+  }
+  
+  #snackbar1 {
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #333;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    padding: 16px;
+    position: fixed;
+    z-index: 99999;
+    left: 50%;
+    top: 30px;
+    font-size: 14px;
+  }
+  
+  #snackbar1.show {
+    visibility: visible;
+    -webkit-animation: fadein 0.5s;
+  }
+  
+  #snackbar10 {
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #333;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    padding: 16px;
+    position: fixed;
+    z-index: 99999;
+    left: 50%;
+    top: 30px;
+    font-size: 14px;
+  }
+  
+  #snackbar10.show {
+    visibility: visible;
+    -webkit-animation: fadein 0.5s;
+  }
+  
+  #snackbarCol {
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #333;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    padding: 16px;
+    position: fixed;
+    z-index: 99999;
+    left: 50%;
+    top: 30px;
+    font-size: 14px;
+  }
+  
+  #snackbarCol.show {
+    visibility: visible;
+    -webkit-animation: fadein 0.5s;
+  }
+  
+  @-webkit-keyframes fadein {
+    from {
+      top: 0;
+      opacity: 0;
+    }
+    to {
+      top: 30px;
+      opacity: 1;
+    }
+  }
+  
+  @keyframes fadein {
+    from {
+      top: 0;
+      opacity: 0;
+    }
+    to {
+      top: 30px;
+      opacity: 1;
+    }
+  }
+  
+  @-webkit-keyframes fadeout {
+    from {
+      top: 30px;
+      opacity: 1;
+    }
+    to {
+      top: 0;
+      opacity: 0;
+    }
+  }
+  
+  @keyframes fadeout {
+    from {
+      top: 30px;
+      opacity: 1;
+    }
+    to {
+      top: 0;
+      opacity: 0;
+    }
+  }
+  
@@ -1,40 +0,0 @@
-export function customAPIurl() {
-  const url = new URL(process.env.SERVER_URL);
-  return url.pathname === '/api/app' ? url.origin + '/api' : url.origin;
-}
-
-export const color = [
-  '#93a3db',
-  '#e6c3db',
-  '#c0e3bc',
-  '#bce3db',
-  '#b8ccdb',
-  '#ceb8db',
-  '#ffccff',
-  '#99ffcc',
-  '#cc99ff',
-  '#ffcc99',
-  '#66ccff',
-  '#ffffcc',
-];
-
-export function replaceMailVaribles(subject, body, variables) {
-  let replacedSubject = subject;
-  let replacedBody = body;
-
-  for (const variable in variables) {
-    const regex = new RegExp(`{{${variable}}}`, 'g');
-    if (subject) {
-      replacedSubject = replacedSubject.replace(regex, variables[variable]);
-    }
-    if (body) {
-      replacedBody = replacedBody.replace(regex, variables[variable]);
-    }
-  }
-
-  const result = {
-    subject: replacedSubject,
-    body: replacedBody,
-  };
-  return result;
-}
@@ -47,78 +47,53 @@ async function uploadFile(req, res) {
    const DO_ACCESS_KEY_ID = process.env.DO_ACCESS_KEY_ID;
    const DO_SECRET_ACCESS_KEY = process.env.DO_SECRET_ACCESS_KEY;
    const DO_SPACE = process.env.DO_SPACE;
+    const spacesEndpoint = new aws.Endpoint(DO_ENDPOINT);
+    const s3 = new aws.S3({
+      endpoint: spacesEndpoint,
+      accessKeyId: DO_ACCESS_KEY_ID,
+      secretAccessKey: DO_SECRET_ACCESS_KEY,
+      signatureVersion: 'v4',
+      region: process.env.DO_REGION,
+    });

    const parseBaseUrl = process.env.SERVER_URL;
    const parseAppId = process.env.APP_ID;
-    let fileStorage;
-    if (process.env.USE_LOCAL == 'TRUE') {
-      fileStorage = multer.diskStorage({
-        destination: function (req, file, cb) {
-          cb(null, 'files/files');
+
+    if (process.env.USE_LOCAL == "TRUE") {
+      var fileStorage = multer.diskStorage({
+        destination: function(req, file, cb) {
+          cb(null, "files/files");
        },
        metadata: function (req, file, cb) {
          cb(null, { fieldName: 'OPENSIGN_METADATA' });
        },
-        filename: function (req, file, cb) {
+        filename: function(req, file, cb) {
          let filename = file.originalname;
          let newFileName = filename.split('.')[0];
          let extension = filename.split('.')[1];
-          newFileName = sanitizeFileName(
-            newFileName + '_' + new Date().toISOString() + '.' + extension
-          );
+          newFileName = sanitizeFileName(newFileName + '_' + new Date().toISOString() + '.' + extension)
          console.log(newFileName);
          cb(null, newFileName);
-        },
+        }
      });
    } else {
-      try {
-        const spacesEndpoint = new aws.Endpoint(DO_ENDPOINT);
-        const s3 = new aws.S3({
-          endpoint: spacesEndpoint,
-          accessKeyId: DO_ACCESS_KEY_ID,
-          secretAccessKey: DO_SECRET_ACCESS_KEY,
-          signatureVersion: 'v4',
-          region: process.env.DO_REGION,
-        });
-        fileStorage = multerS3({
-          acl: 'public-read',
-          s3,
-          bucket: DO_SPACE,
-          metadata: function (req, file, cb) {
-            cb(null, { fieldName: 'OPENSIGN_METADATA' });
-          },
-          key: function (req, file, cb) {
-            //console.log(file);
-            let filename = file.originalname;
-            let newFileName = filename.split('.')[0];
-            let extension = filename.split('.')[1];
-            newFileName = sanitizeFileName(
-              newFileName + '_' + new Date().toISOString() + '.' + extension
-            );
-            console.log(newFileName);
-            cb(null, newFileName);
-          },
-        });
-      } catch (err) {
-        fileStorage = multer.diskStorage({
-          destination: function (req, file, cb) {
-            cb(null, 'files/files');
-          },
-          metadata: function (req, file, cb) {
-            cb(null, { fieldName: 'OPENSIGN_METADATA' });
-          },
-          filename: function (req, file, cb) {
-            let filename = file.originalname;
-            let newFileName = filename.split('.')[0];
-            let extension = filename.split('.')[1];
-            newFileName = sanitizeFileName(
-              newFileName + '_' + new Date().toISOString() + '.' + extension
-            );
-            console.log(newFileName);
-            cb(null, newFileName);
-          },
-        });
-      }
+      var fileStorage = multerS3({
+        acl: 'public-read',
+        s3,
+        bucket: DO_SPACE,
+        metadata: function (req, file, cb) {
+          cb(null, { fieldName: 'OPENSIGN_METADATA' });
+        },
+        key: function (req, file, cb) {
+          //console.log(file);
+          let filename = file.originalname;
+          let newFileName = filename.split('.')[0];
+          let extension = filename.split('.')[1];
+          newFileName = sanitizeFileName(newFileName + '_' + new Date().toISOString() + '.' + extension)
+          console.log(newFileName);
+          cb(null, newFileName);
+        }
+      });
    }

    // const s3 = new aws.S3();
@@ -147,7 +122,7 @@ async function uploadFile(req, res) {
      const status = 'Success';
      //res.header("Access-Control-Allow-Headers", "Content-Type");
      //res.setHeader("Access-Control-Allow-Origin", "*");
-      if (process.env.USE_LOCAL == 'TRUE') {
+      if (process.env.USE_LOCAL == "TRUE") {
        console.log(req.file);
        var fileUrl = `${parseBaseUrl}/files/${parseAppId}/${req.file.filename}`;
      } else {
@@ -1,104 +0,0 @@
-//--npm modules
-import express from 'express';
-import cors from 'cors';
-export const app = express();
-import dotenv from 'dotenv';
-import getUser from './routes/getUser.js';
-import getDocumentList from './routes/getDocumentList.js';
-import getDocument from './routes/getDocument.js';
-import getContact from './routes/getContact.js';
-import deleteContact from './routes/deleteContact.js';
-import getContactList from './routes/getContactList.js';
-import draftDocument from './routes/draftDocument.js';
-import createTemplate from './routes/createTemplate.js';
-import getTemplate from './routes/getTemplate.js';
-import deletedTemplate from './routes/deleteTemplate.js';
-import getTemplatetList from './routes/getTemplateList.js';
-import updateTemplate from './routes/updateTemplate.js';
-import createContact from './routes/createContact.js';
-import multer from 'multer';
-// import fs from 'node:fs';
-import updateDocument from './routes/updateDocument.js';
-import deleteDocument from './routes/deleteDocument.js';
-import createDocumentWithTemplate from './routes/CreateDocumentWithTemplate.js';
-import saveWebhook from './routes/saveWebhook.js';
-import deleteWebhook from './routes/deleteWebhook.js';
-import getWebhook from './routes/getWebhook.js';
-import createDocumentwithCoordinate from './routes/createDocumentwithCoordinate.js';
-import createTemplatewithCoordinate from './routes/createTemplatewithCoordinate.js';
-dotenv.config();
-const storage = multer.memoryStorage();
-const upload = multer({ storage: storage });
-
-app.use(cors());
-app.use(express.json({ limit: '50mb' }));
-app.use(express.urlencoded({ limit: '50mb', extended: true }));
-
-// get user details whose api token used
-app.get('/getuser', getUser);
-
-// get contact on the basis of id
-app.post('/createcontact', createContact);
-
-// get contact on the basis of id
-app.get('/contact/:contact_id', getContact);
-
-// soft delete contact
-app.delete('/contact/:contact_id', deleteContact);
-
-//  get list of contacts
-app.get('/contactlist', getContactList);
-
-// create Document
-app.post('/createdocumentwithbinary', upload.array('file', 1), createDocumentwithCoordinate);
-
-// create Document with co-ordinate
-app.post('/createdocument', createDocumentwithCoordinate);
-
-// create Document with base64 without placeholder
-app.post('/draftdocument', draftDocument);
-
-// create Document with templateId
-app.post('/createdocument/:template_id', createDocumentWithTemplate);
-
-// get Document on the basis of id
-app.get('/document/:document_id', getDocument);
-
-// get document on the basis of id
-app.put('/document/:document_id', updateDocument);
-
-// get document on the basis of id
-app.delete('/document/:document_id', deleteDocument);
-
-// get all types of documents on the basis of doctype
-app.get('/documentlist/:doctype', getDocumentList);
-
-// create Template with co-ordinate
-app.post('/createtemplate', createTemplatewithCoordinate);
-
-// create Template
-app.post('/drafttemplate', createTemplate);
-
-// create Template with binary
-app.post('/createtemplatewithbinary', upload.array('file', 1), createTemplatewithCoordinate);
-
-// get template on the basis of id
-app.get('/template/:template_id', getTemplate);
-
-// get template on the basis of id
-app.put('/template/:template_id', updateTemplate);
-
-// get template on the basis of id
-app.delete('/template/:template_id', deletedTemplate);
-
-// get all types of documents on the basis of doctype
-app.get('/templatelist', getTemplatetList);
-
-// set and update webhook
-app.get('/webhook', getWebhook);
-
-// set and update webhook
-app.post('/webhook', saveWebhook);
-
-// set and update webhook
-app.delete('/webhook', deleteWebhook);
@@ -1,367 +0,0 @@
-import axios from 'axios';
-import { customAPIurl, replaceMailVaribles } from '../../../../Utils.js';
-
-// `sendDoctoWebhook` is used to send res data of document on webhook
-async function sendDoctoWebhook(doc, WebhookUrl, userId) {
-  if (WebhookUrl) {
-    const params = {
-      event: 'created',
-      ...doc,
-    };
-    await axios
-      .post(WebhookUrl, params, {
-        headers: { 'Content-Type': 'application/json' },
-      })
-      .then(res => {
-        try {
-          // console.log('res ', res);
-          const webhook = new Parse.Object('contracts_Webhook');
-          webhook.set('Log', res?.status);
-          webhook.set('UserId', {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: userId,
-          });
-          webhook.save(null, { useMasterKey: true });
-        } catch (err) {
-          console.log('err save in contracts_Webhook', err);
-        }
-      })
-      .catch(err => {
-        console.log('Err send data to webhook', err);
-        try {
-          const webhook = new Parse.Object('contracts_Webhook');
-          webhook.set('Log', err?.status);
-          webhook.set('UserId', {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: userId,
-          });
-          webhook.save(null, { useMasterKey: true });
-        } catch (err) {
-          console.log('err save in contracts_Webhook', err);
-        }
-      });
-    // console.log('res ', res.data);
-  }
-}
-export default async function createDocumentWithTemplate(request, response) {
-  const signers = request.body.signers;
-  const folderId = request.body.folderId;
-  const templateId = request.params.template_id;
-  const protocol = customAPIurl();
-  const baseUrl = new URL(process.env.SERVER_URL);
-  const send_email = request.body.send_email;
-  const email_subject = request.body.email_subject;
-  const email_body = request.body.email_body;
-  const sendInOrder = request.body.sendInOrder || false;
-
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      const templateQuery = new Parse.Query('contracts_Template');
-      templateQuery.include('ExtUserPtr');
-      const templateRes = await templateQuery.get(templateId, { useMasterKey: true });
-      if (templateRes) {
-        const template = JSON.parse(JSON.stringify(templateRes));
-        if (template?.Placeholders?.length > 0) {
-          const emptyplaceholder = template?.Placeholders.filter(x => !x.signerObjId);
-          const isValid =
-            signers.length >= emptyplaceholder.length &&
-            signers.length <= template?.Placeholders?.length;
-          const placeholder =
-            signers.length > emptyplaceholder.length ? template.Placeholders : emptyplaceholder;
-          const updateSigners = placeholder.every(y => signers?.some(x => x.role === y.Role));
-          // console.log('isValid ', isValid);
-          if (isValid && updateSigners) {
-            const folderPtr = {
-              __type: 'Pointer',
-              className: 'contracts_Document',
-              objectId: folderId,
-            };
-            const template = JSON.parse(JSON.stringify(templateRes));
-            const object = new Parse.Object('contracts_Document');
-            object.set('Name', template.Name);
-            if (template?.Note) {
-              object.set('Note', template.Note);
-            }
-            if (template?.Description) {
-              object.set('Description', template.Description);
-            }
-            object.set('IsSendMail', send_email);
-            if (sendInOrder) {
-              object.set('SendinOrder', sendInOrder);
-            } else if (template?.SendinOrder && template?.SendinOrder) {
-              object.set('SendinOrder', template?.SendinOrder);
-            }
-            let templateSigner = template?.Signers ? template?.Signers : [];
-            let contact = [];
-            if (signers && signers.length > 0) {
-              let parseSigners = [...signers];
-              let createContactUrl = protocol + '/v1/createcontact';
-
-              for (const obj of parseSigners) {
-                const body = {
-                  name: obj?.name || '',
-                  email: obj?.email || '',
-                  phone: obj?.phone || '',
-                };
-                try {
-                  const res = await axios.post(createContactUrl, body, {
-                    headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },
-                  });
-                  const contactPtr = {
-                    __type: 'Pointer',
-                    className: 'contracts_Contactbook',
-                    objectId: res.data?.objectId,
-                  };
-                  const newObj = { ...obj, contactPtr: contactPtr };
-                  contact.push(newObj);
-                } catch (err) {
-                  // console.log('err ', err);
-                  if (err?.response?.data?.objectId) {
-                    const contactPtr = {
-                      __type: 'Pointer',
-                      className: 'contracts_Contactbook',
-                      objectId: err.response.data?.objectId,
-                    };
-                    const newObj = { ...obj, contactPtr: contactPtr };
-                    contact.push(newObj);
-                  } else {
-                    console.log('err ', err);
-                  }
-                }
-              }
-              const contactPtrs = contact.map(x => x.contactPtr);
-              object.set('Signers', [...templateSigner, ...contactPtrs]);
-
-              let updatedPlaceholder = template?.Placeholders?.map(x => {
-                let matchingSigner = contact.find(y => x.Role && x.Role === y.role);
-
-                if (matchingSigner) {
-                  return {
-                    ...x,
-                    signerObjId: matchingSigner?.contactPtr?.objectId,
-                    signerPtr: matchingSigner?.contactPtr,
-                  };
-                } else {
-                  return {
-                    ...x,
-                  };
-                }
-              });
-              object.set('Placeholders', updatedPlaceholder);
-            } else {
-              object.set('Signers', templateSigner);
-            }
-            object.set('URL', template.URL);
-            object.set('CreatedBy', template.CreatedBy);
-            object.set('ExtUserPtr', {
-              __type: 'Pointer',
-              className: 'contracts_Users',
-              objectId: template.ExtUserPtr.objectId,
-            });
-            if (folderId) {
-              object.set('Folder', folderPtr);
-            }
-            const newACL = new Parse.ACL();
-            newACL.setPublicReadAccess(false);
-            newACL.setPublicWriteAccess(false);
-            newACL.setReadAccess(userPtr.objectId, true);
-            newACL.setWriteAccess(userPtr.objectId, true);
-            object.setACL(newACL);
-            const res = await object.save(null, { useMasterKey: true });
-
-            const newDate = new Date();
-            newDate.setDate(newDate.getDate() + 15);
-            const localExpireDate = newDate.toLocaleDateString('en-US', {
-              day: 'numeric',
-              month: 'long',
-              year: 'numeric',
-            });
-            let sender = template.ExtUserPtr.Email;
-            let sendMail;
-            const serverUrl = process.env.SERVER_URL;
-            const newServer = serverUrl.replaceAll('/', '%2F');
-            const serverParams = `${newServer}%2F&${process.env.APP_ID}&contracts`;
-            if (send_email === false) {
-              console.log("don't send mail");
-            } else {
-              let contactMail = contact;
-              if (sendInOrder) {
-                contactMail = contact.slice();
-                contactMail.splice(1);
-              }
-              for (let i = 0; i < contactMail.length; i++) {
-                try {
-                  const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png';
-                  let url = `${process.env.SERVER_URL}/functions/sendmailv3/`;
-                  const headers = {
-                    'Content-Type': 'application/json',
-                    'X-Parse-Application-Id': process.env.APP_ID,
-                    'X-Parse-Master-Key': process.env.MASTER_KEY,
-                  };
-
-                  const objectId = contactMail[i].contactPtr.objectId;
-
-                  const hostUrl = baseUrl.origin + '/loadmf/signmicroapp';
-                  let signPdf = `${hostUrl}/login/${res.id}/${contactMail[i].email}/${objectId}/${serverParams}`;
-                  const openSignUrl = 'https://www.opensignlabs.com/contact-us';
-                  const orgName = template.ExtUserPtr.Company ? template.ExtUserPtr.Company : '';
-                  const themeBGcolor = '#47a3ad';
-                  const 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: white;padding-bottom: 20px;'> <div style='padding:10px 10px 0 10px'><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;' > Digital Signature Request</p></div><div><p style='padding: 20px;font-family: system-ui;font-size: 14px; margin-bottom: 10px;'> " +
-                    template.ExtUserPtr.Name +
-                    ' has requested you to review and sign <strong> ' +
-                    template.Name +
-                    "</strong>.</p><div style='padding: 5px 0px 5px 25px;display: flex;flex-direction: row;justify-content: space-around;'><table> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Sender</td> <td> </td> <td  style='color:#626363;font-weight:bold'>" +
-                    sender +
-                    "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td> <td> </td><td style='color:#626363;font-weight:bold'> " +
-                    orgName +
-                    "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
-                    localExpireDate +
-                    "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
-                    signPdf +
-                    "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px;'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
-                    sender +
-                    ' 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>';
-
-                  let replaceVar;
-                  const variables = {
-                    document_title: template.Name,
-                    sender_name: template.ExtUserPtr.Name,
-                    sender_mail: template.ExtUserPtr.Email,
-                    sender_phone: template.ExtUserPtr.Phone,
-                    receiver_name: contactMail[i].name,
-                    receiver_email: contactMail[i].email,
-                    receiver_phone: contactMail[i].phone,
-                    expiry_date: localExpireDate,
-                    company_name: orgName,
-                    signing_url: signPdf,
-                  };
-                  if (email_subject && email_body) {
-                    replaceVar = replaceMailVaribles(email_subject, email_body, variables);
-                  } else if (email_subject) {
-                    replaceVar = replaceMailVaribles(email_subject, '', variables);
-                    replaceVar = { subject: replaceVar.subject, body: email_html };
-                  } else if (email_body) {
-                    replaceVar = replaceMailVaribles(
-                      `${template.ExtUserPtr.Name} has requested you to sign ${template.Name}`,
-                      email_body,
-                      variables
-                    );
-                  } else {
-                    replaceVar = {
-                      subject: `${template.ExtUserPtr.Name} has requested you to sign ${template.Name}`,
-                      body: email_html,
-                    };
-                  }
-
-                  const subject = replaceVar.subject;
-                  const html = replaceVar.body;
-                  let params = {
-                    recipient: contactMail[i].email,
-                    subject: subject,
-                    from: sender,
-                    html: html,
-                  };
-                  sendMail = await axios.post(url, params, { headers: headers });
-                } catch (error) {
-                  console.log('error', error);
-                }
-              }
-            }
-            // if (sendMail.data.result.status === 'success') {
-            try {
-              const doc = {
-                objectId: res.id,
-                file: template?.URL,
-                name: template?.Name,
-                note: template?.Note || '',
-                description: template?.Description || '',
-                signers: contact?.map(x => ({ name: x.name, email: x.email, phone: x.phone })),
-                createdAt: res.createdAt,
-              };
-              if (template.ExtUserPtr && template.ExtUserPtr?.Webhook) {
-                sendDoctoWebhook(doc, template.ExtUserPtr?.Webhook, userPtr?.objectId);
-              }
-            } catch (err) {
-              console.log('Err', err);
-            }
-            if (request.posthog) {
-              request.posthog?.capture({
-                distinctId: parseUser.userId.email,
-                event: 'api_create_document_with_templateid',
-                properties: { response_code: 200 },
-              });
-            }
-            return response.json({
-              objectId: res.id,
-              signurl: contact.map(x => ({
-                email: x.email,
-                url: `${baseUrl.origin}/loadmf/signmicroapp/login/${res.id}/${x.email}/${x.contactPtr.objectId}/${serverParams}`,
-              })),
-              message: 'Document sent successfully!',
-            });
-            // }
-          } else {
-            if (request.posthog) {
-              request.posthog?.capture({
-                distinctId: parseUser.userId.email,
-                event: 'api_create_document_with_templateid',
-                properties: { response_code: 400 },
-              });
-            }
-            return response.status(400).json({ error: 'Please provide signers properly!' });
-          }
-        } else {
-          if (request.posthog) {
-            request.posthog?.capture({
-              distinctId: parseUser.userId.email,
-              event: 'api_create_document_with_templateid',
-              properties: { response_code: 400 },
-            });
-          }
-          return response.status(400).json({ error: 'Please setup template properly!' });
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_create_document_with_templateid',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'Invalid template id!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    if (err.code === 101) {
-      return response.status(404).json({ error: 'Invalid template id!' });
-    }
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,216 +0,0 @@
-import axios from 'axios';
-export default async function createContact(request, response) {
-  const serverUrl = process.env.SERVER_URL;
-  const appId = process.env.APP_ID;
-  const name = request.body.name;
-  const phone = request.body.phone;
-  const email = request.body.email;
-  const reqToken = request.headers['x-api-token'];
-  if (!reqToken) {
-    return response.status(400).json({ error: 'Please Provide API Token' });
-  }
-  try {
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-
-      try {
-        const contactbook = new Parse.Query('contracts_Contactbook');
-        contactbook.equalTo('Email', email);
-        contactbook.equalTo('CreatedBy', userPtr);
-        contactbook.notEqualTo('IsDeleted', true);
-        const userExists = await contactbook.first({ useMasterKey: true });
-
-        if (userExists) {
-          if (request.posthog) {
-            request.posthog?.capture({
-              distinctId: parseUser.userId.email,
-              event: 'api_create_contact',
-              properties: { response_code: 401 },
-            });
-          }
-          return response
-            .status(401)
-            .json({ error: 'Contact already exists!', objectId: userExists.id });
-        } else {
-          try {
-            const Tenant = new Parse.Query('partners_Tenant');
-            Tenant.equalTo('UserId', userPtr);
-            const tenantRes = await Tenant.first({ useMasterKey: true });
-
-            const contactQuery = new Parse.Object('contracts_Contactbook');
-            contactQuery.set('Name', name);
-            contactQuery.set('Phone', phone);
-            contactQuery.set('Email', email);
-            contactQuery.set('UserRole', 'contracts_Guest');
-            if (tenantRes && tenantRes.id) {
-              contactQuery.set('TenantId', {
-                __type: 'Pointer',
-                className: 'partners_Tenant',
-                objectId: tenantRes.id,
-              });
-            }
-            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 = `${serverUrl}/functions/AddUserToRole`;
-                const headers = {
-                  'Content-Type': 'application/json',
-                  'X-Parse-Application-Id': appId,
-                  // sessionToken: localStorage.getItem('accesstoken'),
-                };
-                const body = {
-                  appName: 'contracts',
-                  roleName: 'contracts_Guest',
-                  userId: user.id,
-                };
-                await axios.post(roleurl, body, { headers: headers });
-                const currentUser = userPtr;
-                contactQuery.set('CreatedBy', currentUser);
-                contactQuery.set('UserId', user);
-
-                const acl = new Parse.ACL();
-                acl.setReadAccess(userPtr.objectId, true);
-                acl.setWriteAccess(userPtr.objectId, true);
-                acl.setReadAccess(user.id, true);
-                acl.setWriteAccess(user.id, true);
-                contactQuery.setACL(acl);
-
-                const contactRes = await contactQuery.save();
-                const parseRes = JSON.parse(JSON.stringify(contactRes));
-                if (request.posthog) {
-                  request.posthog?.capture({
-                    distinctId: parseUser.userId.email,
-                    event: 'api_create_contact',
-                    properties: { response_code: 200 },
-                  });
-                }
-                return response.json({
-                  objectId: parseRes.objectId,
-                  name: parseRes.Name,
-                  email: parseRes.Email,
-                  phone: parseRes.Phone,
-                  createdAt: parseRes.createdAt,
-                  updatedAt: parseRes.updatedAt,
-                });
-              }
-            } catch (err) {
-              console.log('err in', err);
-              if (err.code === 202) {
-                const params = { email: email };
-                const userRes = await Parse.Cloud.run('getUserId', params);
-                const roleurl = `${serverUrl}/functions/AddUserToRole`;
-                const headers = {
-                  'Content-Type': 'application/json',
-                  'X-Parse-Application-Id': appId,
-                  // sessionToken: localStorage.getItem('accesstoken'),
-                };
-                const body = {
-                  appName: 'contracts',
-                  roleName: 'contracts_Guest',
-                  userId: userRes.objectId,
-                };
-                await axios.post(roleurl, body, { headers: headers });
-                contactQuery.set('CreatedBy', userPtr.objectId);
-                contactQuery.set('UserId', {
-                  __type: 'Pointer',
-                  className: '_User',
-                  objectId: userRes.id,
-                });
-                const acl = new Parse.ACL();
-                acl.setReadAccess(userPtr.objectId, true);
-                acl.setWriteAccess(userPtr.objectId, true);
-                acl.setReadAccess(userRes.id, true);
-                acl.setWriteAccess(userRes.id, true);
-
-                contactQuery.setACL(acl);
-                const contactRes = await contactQuery.save();
-                if (contactRes) {
-                  const parseRes = JSON.parse(JSON.stringify(contactRes));
-                  if (request.posthog) {
-                    request.posthog?.capture({
-                      distinctId: parseUser.userId.email,
-                      event: 'api_create_contact',
-                      properties: { response_code: 200 },
-                    });
-                  }
-                  return response.json({
-                    objectId: parseRes.objectId,
-                    name: parseRes.Name,
-                    email: parseRes.Email,
-                    phone: parseRes.Phone,
-                    createdAt: parseRes.createdAt,
-                    updatedAt: parseRes.updatedAt,
-                  });
-                }
-              } else {
-                if (err.code === 137) {
-                  return response.status(401).json({ error: 'Contact already exists!' });
-                }
-                return response
-                  .status(400)
-                  .json({ error: 'Something went wrong, please try again later!' });
-              }
-            }
-          } catch (err) {
-            console.log('err ', err);
-            if (err.code === 137) {
-              if (request.posthog) {
-                request.posthog?.capture({
-                  distinctId: parseUser.userId.email,
-                  event: 'api_create_contact',
-                  properties: { response_code: 401 },
-                });
-              }
-              return response.status(401).json({ error: 'Contact already exists!' });
-            } else {
-              if (request.posthog) {
-                request.posthog?.capture({
-                  distinctId: parseUser.userId.email,
-                  event: 'api_create_contact',
-                  properties: { response_code: 400 },
-                });
-              }
-              return response
-                .status(400)
-                .json({ error: 'Something went wrong, please try again later!' });
-            }
-          }
-        }
-      } catch (err) {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_create_contact',
-            properties: { response_code: 400 },
-          });
-        }
-        return response
-          .status(400)
-          .json({ error: 'Something went wrong, please try again later!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('Err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,379 +0,0 @@
-import axios from 'axios';
-import { color, customAPIurl, replaceMailVaribles } from '../../../../Utils.js';
-
-// `sendDoctoWebhook` is used to send res data of document on webhook
-async function sendDoctoWebhook(doc, WebhookUrl, userId) {
-  if (WebhookUrl) {
-    const params = {
-      event: 'created',
-      ...doc,
-    };
-    await axios
-      .post(WebhookUrl, params, {
-        headers: { 'Content-Type': 'application/json' },
-      })
-      .then(res => {
-        try {
-          // console.log('res ', res);
-          const webhook = new Parse.Object('contracts_Webhook');
-          webhook.set('Log', res?.status);
-          webhook.set('UserId', {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: userId,
-          });
-          webhook.save(null, { useMasterKey: true });
-        } catch (err) {
-          console.log('err save in contracts_Webhook', err);
-        }
-      })
-      .catch(err => {
-        console.log('Err send data to webhook', err);
-        try {
-          const webhook = new Parse.Object('contracts_Webhook');
-          webhook.set('Log', err?.status);
-          webhook.set('UserId', {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: userId,
-          });
-          webhook.save(null, { useMasterKey: true });
-        } catch (err) {
-          console.log('err save in contracts_Webhook', err);
-        }
-      });
-    // console.log('res ', res.data);
-  }
-}
-const randomId = () => Math.floor(1000 + Math.random() * 9000);
-export default async function createDocumentwithCoordinate(request, response) {
-  const name = request.body.title;
-  const note = request.body.note;
-  const description = request.body.description;
-  const send_email = request.body.send_email;
-  const signers = request.body.signers;
-  const folderId = request.body.folderId;
-  const base64File = request.body.file;
-  const fileData = request.files?.[0] ? request.files[0].buffer : null;
-  const email_subject = request.body.email_subject;
-  const email_body = request.body.email_body;
-  const sendInOrder = request.body.sendInOrder || false;
-  // console.log('fileData ', fileData);
-  const protocol = customAPIurl();
-  const baseUrl = new URL(process.env.SERVER_URL);
-  const reqToken = request.headers['x-api-token'];
-  if (!reqToken) {
-    return response.status(400).json({ error: 'Please Provide API Token' });
-  }
-  try {
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      if (signers && signers.length > 0) {
-        let fileUrl;
-        if (request.files?.[0]) {
-          const file = new Parse.File(request.files?.[0]?.originalname, {
-            base64: fileData?.toString('base64'),
-          });
-          await file.save({ useMasterKey: true });
-          fileUrl = file.url();
-        } else {
-          const file = new Parse.File(`${name}.pdf`, {
-            base64: base64File,
-          });
-          await file.save({ useMasterKey: true });
-          fileUrl = file.url();
-        }
-        const contractsUser = new Parse.Query('contracts_Users');
-        contractsUser.equalTo('UserId', userPtr);
-        const extUser = await contractsUser.first({ useMasterKey: true });
-        const parseExtUser = JSON.parse(JSON.stringify(extUser));
-
-        const extUserPtr = {
-          __type: 'Pointer',
-          className: 'contracts_Users',
-          objectId: extUser.id,
-        };
-
-        const object = new Parse.Object('contracts_Document');
-        object.set('Name', name);
-
-        if (note) {
-          object.set('Note', note);
-        }
-        if (description) {
-          object.set('Description', description);
-        }
-        if (sendInOrder) {
-          object.set('SendinOrder', sendInOrder);
-        }
-        object.set('URL', fileUrl);
-        object.set('CreatedBy', userPtr);
-        object.set('ExtUserPtr', extUserPtr);
-        object.set('IsSendMail', send_email);
-        let contact = [];
-        if (signers && signers.length > 0) {
-          let parseSigners;
-          if (base64File) {
-            parseSigners = signers;
-          } else {
-            parseSigners = JSON.parse(signers);
-          }
-          let createContactUrl = protocol + '/v1/createcontact';
-
-          for (const [index, element] of parseSigners.entries()) {
-            const body = {
-              name: element?.name || '',
-              email: element?.email || '',
-              phone: element?.phone || '',
-            };
-            try {
-              const res = await axios.post(createContactUrl, body, {
-                headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },
-              });
-              // console.log('res ', res.data);
-              const contactPtr = {
-                __type: 'Pointer',
-                className: 'contracts_Contactbook',
-                objectId: res.data?.objectId,
-              };
-              const newObj = { ...element, contactPtr: contactPtr, index: index };
-              contact.push(newObj);
-            } catch (err) {
-              // console.log('err ', err.response);
-              if (err?.response?.data?.objectId) {
-                const contactPtr = {
-                  __type: 'Pointer',
-                  className: 'contracts_Contactbook',
-                  objectId: err.response.data?.objectId,
-                };
-                const newObj = { ...element, contactPtr: contactPtr, index: index };
-                contact.push(newObj);
-              }
-            }
-          }
-          object.set(
-            'Signers',
-            contact?.map(x => x.contactPtr)
-          );
-          let updatePlaceholders = contact.map((signer, index) => {
-            const placeHolder = [];
-
-            for (const widget of signer.widgets) {
-              const pageNumber = widget.page;
-              const page = placeHolder.find(page => page.pageNumber === pageNumber);
-
-              const widgetData = {
-                xPosition: widget.x,
-                yPosition: widget.y,
-                isStamp: widget.type === 'stamp',
-                key: randomId(),
-                isDrag: false,
-                firstXPos: widget.x,
-                firstYPos: widget.y,
-                yBottom: 0,
-                scale: 1,
-                isMobile: false,
-                zIndex: 1,
-                type: widget.type,
-                widgetValue: '',
-                Width: widget.w,
-                Height: widget.h,
-              };
-
-              if (page) {
-                page.pos.push(widgetData);
-              } else {
-                placeHolder.push({
-                  pageNumber,
-                  pos: [widgetData],
-                });
-              }
-            }
-
-            return {
-              signerObjId: signer?.contactPtr?.objectId,
-              signerPtr: signer?.contactPtr,
-              Role: signer.role,
-              Id: randomId(),
-              blockColor: color[signer?.index],
-              placeHolder,
-            };
-          });
-          object.set('Placeholders', updatePlaceholders);
-        }
-        if (folderId) {
-          object.set('Folder', {
-            __type: 'Pointer',
-            className: 'contracts_Document',
-            objectId: folderId,
-          });
-        }
-        const newACL = new Parse.ACL();
-        newACL.setPublicReadAccess(false);
-        newACL.setPublicWriteAccess(false);
-        newACL.setReadAccess(userPtr.objectId, true);
-        newACL.setWriteAccess(userPtr.objectId, true);
-        object.setACL(newACL);
-        const res = await object.save(null, { useMasterKey: true });
-        const doc = {
-          objectId: res.id,
-          file: fileUrl,
-          name: name,
-          note: note || '',
-          description: description || '',
-          signers: contact?.map(x => ({ name: x.name, email: x.email, phone: x.phone })),
-          createdAt: res.createdAt,
-        };
-        if (parseExtUser && parseExtUser.Webhook) {
-          sendDoctoWebhook(doc, parseExtUser?.Webhook, userPtr?.objectId);
-        }
-        const newDate = new Date();
-        newDate.setDate(newDate.getDate() + 15);
-        const localExpireDate = newDate.toLocaleDateString('en-US', {
-          day: 'numeric',
-          month: 'long',
-          year: 'numeric',
-        });
-        let sender = parseExtUser.Email;
-        let sendMail;
-        const serverUrl = process.env.SERVER_URL;
-        const newServer = serverUrl.replaceAll('/', '%2F');
-        const serverParams = `${newServer}%2F&${process.env.APP_ID}&contracts`;
-        if (send_email === false) {
-          console.log("don't send mail");
-        } else {
-          let contactMail = contact;
-          if (sendInOrder) {
-            contactMail = contact.slice();
-            contactMail.splice(1);
-          }
-          for (let i = 0; i < contactMail.length; i++) {
-            try {
-              const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png';
-              let url = `${process.env.SERVER_URL}/functions/sendmailv3/`;
-              const headers = {
-                'Content-Type': 'application/json',
-                'X-Parse-Application-Id': process.env.APP_ID,
-                'X-Parse-Master-Key': process.env.MASTER_KEY,
-              };
-
-              const objectId = contactMail[i].contactPtr.objectId;
-
-              const hostUrl = baseUrl.origin + '/loadmf/signmicroapp';
-              let signPdf = `${hostUrl}/login/${res.id}/${contactMail[i].email}/${objectId}/${serverParams}`;
-              const openSignUrl = 'https://www.opensignlabs.com/contact-us';
-              const orgName = parseExtUser.Company ? parseExtUser.Company : '';
-              const themeBGcolor = '#47a3ad';
-              const 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: white;padding-bottom: 20px;'> <div style='padding:10px 10px 0 10px'><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;' > Digital Signature Request</p></div><div><p style='padding: 20px;font-family: system-ui;font-size: 14px; margin-bottom: 10px;'> " +
-                parseExtUser.Name +
-                ' has requested you to review and sign <strong> ' +
-                name +
-                "</strong>.</p><div style='padding: 5px 0px 5px 25px;display: flex;flex-direction: row;justify-content: space-around;'><table> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Sender</td> <td> </td> <td  style='color:#626363;font-weight:bold'>" +
-                sender +
-                "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td> <td> </td><td style='color:#626363;font-weight:bold'> " +
-                orgName +
-                "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
-                localExpireDate +
-                "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
-                signPdf +
-                "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
-                sender +
-                ' 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>';
-              let replaceVar;
-              const variables = {
-                document_title: name,
-                sender_name: parseExtUser.Name,
-                sender_mail: parseExtUser.Email,
-                sender_phone: parseExtUser.Phone,
-                receiver_name: contactMail[i].name,
-                receiver_email: contactMail[i].email,
-                receiver_phone: contactMail[i].phone,
-                expiry_date: localExpireDate,
-                company_name: orgName,
-                signing_url: signPdf,
-              };
-              if (email_subject && email_body) {
-                replaceVar = replaceMailVaribles(email_subject, email_body, variables);
-              } else if (email_subject) {
-                replaceVar = replaceMailVaribles(email_subject, '', variables);
-                replaceVar = { subject: replaceVar.subject, body: email_html };
-              } else if (email_body) {
-                replaceVar = replaceMailVaribles(
-                  `${parseExtUser.Name} has requested you to sign ${name}`,
-                  email_body,
-                  variables
-                );
-              } else {
-                replaceVar = {
-                  subject: `${parseExtUser.Name} has requested you to sign ${parseExtUser.Name}`,
-                  body: email_html,
-                };
-              }
-              const subject = replaceVar.subject;
-              const html = replaceVar.body;
-
-              let params = {
-                recipient: contactMail[i].email,
-                subject: subject,
-                from: sender,
-                html: html,
-              };
-
-              sendMail = await axios.post(url, params, { headers: headers });
-            } catch (error) {
-              console.log('error', error);
-            }
-          }
-        }
-        // if (sendMail.data.result.status === 'success') {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_create_document',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({
-          objectId: res.id,
-          signurl: contact.map(x => ({
-            email: x.email,
-            url: `${baseUrl.origin}/loadmf/signmicroapp/login/${res.id}/${x.email}/${x.contactPtr.objectId}/${serverParams}`,
-          })),
-          message: 'Document sent successfully!',
-        });
-        // }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_create_document',
-            properties: { response_code: 400 },
-          });
-        }
-        return response.status(400).json({ error: 'Please provide signers!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,135 +0,0 @@
-import { customAPIurl } from '../../../../Utils.js';
-
-const randomId = () => Math.floor(1000 + Math.random() * 9000);
-export default async function createTemplate(request, response) {
-  const name = request.body?.title;
-  const note = request.body?.note;
-  const description = request.body?.description;
-  const signers = request.body?.signers;
-  const folderId = request.body?.folderId;
-  const base64File = request.body.file;
-  const SendinOrder = request.body.sendInOrder || false;
-  const fileData = request.files?.[0] ? request.files[0].buffer : null;
-  const baseUrl = new URL(process.env.SERVER_URL);
-
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      let fileUrl;
-      if (base64File) {
-        const file = new Parse.File(`${name}.pdf`, {
-          base64: base64File,
-        });
-        await file.save({ useMasterKey: true });
-        fileUrl = file.url();
-      } else {
-        const file = new Parse.File(request.files?.[0]?.originalname, {
-          base64: fileData?.toString('base64'),
-        });
-        await file.save({ useMasterKey: true });
-        fileUrl = file.url();
-      }
-
-      const contractsUser = new Parse.Query('contracts_Users');
-      contractsUser.equalTo('UserId', userPtr);
-      const extUser = await contractsUser.first({ useMasterKey: true });
-      const extUserPtr = { __type: 'Pointer', className: 'contracts_Users', objectId: extUser.id };
-
-      const folderPtr = { __type: 'Pointer', className: 'contracts_Template', objectId: folderId };
-
-      const object = new Parse.Object('contracts_Template');
-      object.set('Name', name);
-      if (note) {
-        object.set('Note', note);
-      }
-      if (description) {
-        object.set('Description', description);
-      }
-      object.set('URL', fileUrl);
-      object.set('CreatedBy', userPtr);
-      object.set('ExtUserPtr', extUserPtr);
-      if (SendinOrder) {
-        object.set('SendinOrder', SendinOrder);
-      }
-      if (signers && signers.length > 0) {
-        let parseSigners;
-        if (base64File) {
-          parseSigners = signers;
-        } else {
-          parseSigners = JSON.parse(signers);
-        }
-        let createContactUrl = protocol + '/v1/createcontact';
-
-        let contact = [];
-        for (const obj of parseSigners) {
-          const body = {
-            name: obj?.name || '',
-            email: obj?.email || '',
-            phone: obj?.phone || '',
-          };
-          try {
-            const res = await axios.post(createContactUrl, body, {
-              headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },
-            });
-            // console.log('res ', res.data);
-            contact.push({
-              __type: 'Pointer',
-              className: 'contracts_Contactbook',
-              objectId: res.data?.objectId,
-            });
-          } catch (err) {
-            // console.log('err ', err.response);
-            if (err?.response?.data?.objectId) {
-              contact.push({
-                __type: 'Pointer',
-                className: 'contracts_Contactbook',
-                objectId: err.response.data?.objectId,
-              });
-            }
-          }
-        }
-        object.set('Signers', contact);
-      }
-      if (folderId) {
-        object.set('Folder', folderPtr);
-      }
-      const newACL = new Parse.ACL();
-      newACL.setPublicReadAccess(false);
-      newACL.setPublicWriteAccess(false);
-      newACL.setReadAccess(userPtr.objectId, true);
-      newACL.setWriteAccess(userPtr.objectId, true);
-      object.setACL(newACL);
-      const res = await object.save(null, { useMasterKey: true });
-      if (request.posthog) {
-        request.posthog?.capture({
-          distinctId: parseUser.userId.email,
-          event: 'api_draft_template',
-          properties: { response_code: 200 },
-        });
-      }
-      return response.json({
-        objectId: res.id,
-        url: baseUrl.origin + '/load/signmicroapp/template/' + res.id,
-      });
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,214 +0,0 @@
-import axios from 'axios';
-import { color, customAPIurl } from '../../../../Utils.js';
-
-const randomId = () => Math.floor(1000 + Math.random() * 9000);
-export default async function createTemplatewithCoordinate(request, response) {
-  const name = request.body.title;
-  const note = request.body.note;
-  const description = request.body.description;
-  const signers = request.body.signers;
-  const folderId = request.body.folderId;
-  const base64File = request.body.file;
-  const fileData = request.files?.[0] ? request.files[0].buffer : null;
-  const SendinOrder = request.body.sendInOrder || false;
-  // console.log('fileData ', fileData);
-  const protocol = customAPIurl();
-
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      if (signers && signers.length > 0) {
-        let fileUrl;
-        if (request.files?.[0]) {
-          const file = new Parse.File(request.files?.[0]?.originalname, {
-            base64: fileData?.toString('base64'),
-          });
-          await file.save({ useMasterKey: true });
-          fileUrl = file.url();
-        } else {
-          const file = new Parse.File(`${name}.pdf`, {
-            base64: base64File,
-          });
-          await file.save({ useMasterKey: true });
-          fileUrl = file.url();
-        }
-        const contractsUser = new Parse.Query('contracts_Users');
-        contractsUser.equalTo('UserId', userPtr);
-        const extUser = await contractsUser.first({ useMasterKey: true });
-        const extUserPtr = {
-          __type: 'Pointer',
-          className: 'contracts_Users',
-          objectId: extUser.id,
-        };
-
-        const object = new Parse.Object('contracts_Template');
-        object.set('Name', name);
-
-        if (note) {
-          object.set('Note', note);
-        }
-        if (description) {
-          object.set('Description', description);
-        }
-        if (SendinOrder) {
-          object.set('SendinOrder', SendinOrder);
-        }
-        object.set('URL', fileUrl);
-        object.set('CreatedBy', userPtr);
-        object.set('ExtUserPtr', extUserPtr);
-        let contact = [];
-        if (signers && signers.length > 0) {
-          let parseSigners;
-          if (base64File) {
-            parseSigners = signers;
-          } else {
-            parseSigners = JSON.parse(signers);
-          }
-          let createContactUrl = protocol + '/v1/createcontact';
-
-          for (const [index, element] of parseSigners.entries()) {
-            if (element?.name && element.phone && element?.email) {
-              const body = {
-                name: element?.name || '',
-                email: element?.email || '',
-                phone: element?.phone || '',
-              };
-              try {
-                const res = await axios.post(createContactUrl, body, {
-                  headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },
-                });
-                // console.log('res ', res.data);
-                const contactPtr = {
-                  __type: 'Pointer',
-                  className: 'contracts_Contactbook',
-                  objectId: res.data?.objectId,
-                };
-                const newObj = { ...element, contactPtr: contactPtr, index: index };
-                contact.push(newObj);
-              } catch (err) {
-                // console.log('err ', err.response);
-                if (err?.response?.data?.objectId) {
-                  const contactPtr = {
-                    __type: 'Pointer',
-                    className: 'contracts_Contactbook',
-                    objectId: err.response.data?.objectId,
-                  };
-                  const newObj = { ...element, contactPtr: contactPtr, index: index };
-                  contact.push(newObj);
-                }
-              }
-            } else {
-              const newObj = { ...element, contactPtr: {}, index: index };
-              contact.push(newObj);
-            }
-          }
-          const updatedSigners = contact?.filter(x => x.contactPtr && x.contactPtr.objectId);
-          if (updatedSigners && updatedSigners.length > 0) {
-            object.set(
-              'Signers',
-              updatedSigners?.map(x => x.contactPtr)
-            );
-          }
-          let updatePlaceholders = contact.map((signer, index) => {
-            const placeHolder = [];
-
-            for (const widget of signer.widgets) {
-              const pageNumber = widget.page;
-              const page = placeHolder.find(page => page.pageNumber === pageNumber);
-
-              const widgetData = {
-                xPosition: widget.x,
-                yPosition: widget.y,
-                isStamp: widget.type === 'stamp',
-                key: randomId(),
-                isDrag: false,
-                firstXPos: widget.x,
-                firstYPos: widget.y,
-                yBottom: 0,
-                scale: 1,
-                isMobile: false,
-                zIndex: 1,
-                type: widget.type,
-                widgetValue: '',
-                Width: widget.w,
-                Height: widget.h,
-              };
-
-              if (page) {
-                page.pos.push(widgetData);
-              } else {
-                placeHolder.push({
-                  pageNumber,
-                  pos: [widgetData],
-                });
-              }
-            }
-
-            return {
-              signerObjId: signer?.contactPtr?.objectId,
-              signerPtr: signer?.contactPtr,
-              Role: signer.role,
-              Id: randomId(),
-              blockColor: color[signer?.index],
-              placeHolder,
-            };
-          });
-          object.set('Placeholders', updatePlaceholders);
-        }
-        if (folderId) {
-          object.set('Folder', {
-            __type: 'Pointer',
-            className: 'contracts_Template',
-            objectId: folderId,
-          });
-        }
-        const newACL = new Parse.ACL();
-        newACL.setPublicReadAccess(false);
-        newACL.setPublicWriteAccess(false);
-        newACL.setReadAccess(userPtr.objectId, true);
-        newACL.setWriteAccess(userPtr.objectId, true);
-        object.setACL(newACL);
-        const res = await object.save(null, { useMasterKey: true });
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_create_template',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({
-          objectId: res.id,
-          message: 'Template created successfully!',
-        });
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_create_template',
-            properties: { response_code: 400 },
-          });
-        }
-        return response.status(400).json({ error: 'Please provide signers!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,65 +0,0 @@
-export default async function deleteContact(request, response) {
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-
-      const Contactbook = new Parse.Query('contracts_Contactbook');
-      Contactbook.equalTo('objectId', request.params.contact_id);
-      Contactbook.equalTo('CreatedBy', userPtr);
-      const res = await Contactbook.first({ useMasterKey: true });
-      if (res) {
-        const isDeleted = res.get('IsDeleted');
-        if (isDeleted && isDeleted) {
-          return response.status(404).json({ error: 'Contact not found!' });
-        } else {
-          const Contactbook = Parse.Object.extend('contracts_Contactbook');
-          const deleteQuery = new Contactbook();
-          deleteQuery.id = request.params.contact_id;
-          deleteQuery.set('IsDeleted', true);
-          const deleteRes = await deleteQuery.save(null, { useMasterKey: true });
-          if (deleteRes) {
-            if (request.posthog) {
-              request.posthog?.capture({
-                distinctId: parseUser.userId.email,
-                event: 'api_delete_contact',
-                properties: { response_code: 200 },
-              });
-            }
-            return response.json({
-              objectId: request.params.contact_id,
-              deletedAt: deleteRes.get('updatedAt'),
-            });
-          }
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_delete_contact',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'Contact not found!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,65 +0,0 @@
-export default async function deleteDocument(request, response) {
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-
-      const Document = new Parse.Query('contracts_Document');
-      Document.equalTo('objectId', request.params.document_id);
-      Document.equalTo('CreatedBy', userPtr);
-      const res = await Document.first({ useMasterKey: true });
-      if (res) {
-        const isArchive = res.get('IsArchive');
-        if (isArchive && isArchive) {
-          return response.status(404).json({ error: 'Document not found!' });
-        } else {
-          const Document = Parse.Object.extend('contracts_Document');
-          const deleteQuery = new Document();
-          deleteQuery.id = request.params.document_id;
-          deleteQuery.set('IsArchive', true);
-          const deleteRes = await deleteQuery.save(null, { useMasterKey: true });
-          if (deleteRes) {
-            if (request.posthog) {
-              request.posthog?.capture({
-                distinctId: parseUser.userId.email,
-                event: 'api_delete_document',
-                properties: { response_code: 200 },
-              });
-            }
-            return response.json({
-              objectId: request.params.document_id,
-              deletedAt: deleteRes.get('updatedAt'),
-            });
-          }
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_delete_document',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'Document not found!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,71 +0,0 @@
-export default async function deletedTemplate(request, response) {
-  const reqToken = request.headers['x-api-token'];
-  if (!reqToken) {
-    return response.status(400).json({ error: 'Please Provide API Token' });
-  }
-  try {
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      const template = new Parse.Query('contracts_Template');
-      template.equalTo('objectId', request.params.template_id);
-      template.equalTo('CreatedBy', userPtr);
-      const res = await template.first({ useMasterKey: true });
-      if (res) {
-        const isArchive = res.get('IsArchive');
-        if (isArchive && isArchive) {
-          if (request.posthog) {
-            request.posthog?.capture({
-              distinctId: parseUser.userId.email,
-              event: 'api_delete_template',
-              properties: { response_code: 404 },
-            });
-          }
-          return response.status(404).json({ error: 'Template not found!' });
-        } else {
-          const template = Parse.Object.extend('contracts_Template');
-          const deleteQuery = new template();
-          deleteQuery.id = request.params.template_id;
-          deleteQuery.set('IsArchive', true);
-          const deleteRes = await deleteQuery.save(null, { useMasterKey: true });
-          if (deleteRes) {
-            if (request.posthog) {
-              request.posthog?.capture({
-                distinctId: parseUser.userId.email,
-                event: 'api_delete_template',
-                properties: { response_code: 200 },
-              });
-            }
-            return response.json({
-              objectId: request.params.template_id,
-              deletedAt: deleteRes.get('updatedAt'),
-            });
-          }
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_delete_template',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'Template not found!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,57 +0,0 @@
-export default async function deleteWebhook(request, response) {
-  const reqToken = request.headers['x-api-token'];
-  if (!reqToken) {
-    return response.status(400).json({ error: 'Please Provide API Token' });
-  }
-  try {
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-
-      const query = new Parse.Query('contracts_Users');
-      query.equalTo('UserId', userPtr);
-      const user = await query.first({ useMasterKey: true });
-      if (user) {
-        const updateQuery = new Parse.Object('contracts_Users');
-        updateQuery.id = user.id;
-        updateQuery.unset('Webhook');
-        const res = await updateQuery.save(null, { useMasterKey: true });
-        if (res) {
-          if (request.posthog) {
-            request.posthog?.capture({
-              distinctId: parseUser.userId.email,
-              event: 'api_delete_webhook',
-              properties: { response_code: 200 },
-            });
-          }
-          return response.json({
-            result: 'Webhook deleted successfully!',
-          });
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_delete_webhook',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'User not found!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,157 +0,0 @@
-import axios from 'axios';
-import { customAPIurl } from '../../../../Utils.js';
-
-// const randomId = () => Math.floor(1000 + Math.random() * 9000);
-export default async function draftDocument(request, response) {
-  const name = request.body.title;
-  const note = request.body.note;
-  const description = request.body.description;
-  const signers = request.body.signers;
-  const folderId = request.body.folderId;
-  const base64File = request.body.file;
-  const send_email = request.body.send_email || true;
-  const fileData = request.files?.[0] ? request.files[0].buffer : null;
-  const SendinOrder = request.body.sendInOrder || false;
-  // console.log('fileData ', fileData);
-  const protocol = customAPIurl();
-
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      // Valid Token then proceed request
-      if (signers && signers.length > 0) {
-        let fileUrl;
-        if (request.files?.[0]) {
-          const file = new Parse.File(request.files?.[0]?.originalname, {
-            base64: fileData?.toString('base64'),
-          });
-          await file.save({ useMasterKey: true });
-          fileUrl = file.url();
-        } else {
-          const file = new Parse.File(`${name}.pdf`, {
-            base64: base64File,
-          });
-          await file.save({ useMasterKey: true });
-          fileUrl = file.url();
-        }
-        const contractsUser = new Parse.Query('contracts_Users');
-        contractsUser.equalTo('UserId', userPtr);
-        const extUser = await contractsUser.first({ useMasterKey: true });
-        const extUserPtr = {
-          __type: 'Pointer',
-          className: 'contracts_Users',
-          objectId: extUser.id,
-        };
-
-        const folderPtr = {
-          __type: 'Pointer',
-          className: 'contracts_Document',
-          objectId: folderId,
-        };
-
-        const object = new Parse.Object('contracts_Document');
-        object.set('Name', name);
-        if (note) {
-          object.set('Note', note);
-        }
-        if (description) {
-          object.set('Description', description);
-        }
-        if (SendinOrder) {
-          object.set('SendinOrder', SendinOrder);
-        }
-        object.set('URL', fileUrl);
-        object.set('CreatedBy', userPtr);
-        object.set('ExtUserPtr', extUserPtr);
-        object.set('IsSendMail', send_email);
-        if (signers && signers.length > 0) {
-          let parseSigners;
-          if (base64File) {
-            parseSigners = signers;
-          } else {
-            parseSigners = JSON.parse(signers);
-          }
-          let createContactUrl = protocol + '/v1/createcontact';
-
-          let contact = [];
-          for (const obj of parseSigners) {
-            const body = {
-              name: obj?.name || '',
-              email: obj?.email || '',
-              phone: obj?.phone || '',
-            };
-            try {
-              const res = await axios.post(createContactUrl, body, {
-                headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },
-              });
-              // console.log('res ', res.data);
-              contact.push({
-                __type: 'Pointer',
-                className: 'contracts_Contactbook',
-                objectId: res.data?.objectId,
-              });
-            } catch (err) {
-              // console.log('err ', err.response);
-              if (err?.response?.data?.objectId) {
-                contact.push({
-                  __type: 'Pointer',
-                  className: 'contracts_Contactbook',
-                  objectId: err.response.data?.objectId,
-                });
-              }
-            }
-          }
-          object.set('Signers', contact);
-        }
-        if (folderId) {
-          object.set('Folder', folderPtr);
-        }
-        const newACL = new Parse.ACL();
-        newACL.setPublicReadAccess(false);
-        newACL.setPublicWriteAccess(false);
-        newACL.setReadAccess(userPtr.objectId, true);
-        newACL.setWriteAccess(userPtr.objectId, true);
-        object.setACL(newACL);
-        const res = await object.save(null, { useMasterKey: true });
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_draft_document',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({
-          objectId: res.id,
-          url: protocol + '/load/signmicroapp/placeholdersign/' + res.id,
-        });
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_draft_document',
-            properties: { response_code: 400 },
-          });
-        }
-        return response.status(400).json({ error: 'Please provide signers!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,61 +0,0 @@
-export default async function getContact(request, response) {
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-
-      const Contactbook = new Parse.Query('contracts_Contactbook');
-      Contactbook.equalTo('objectId', request.params.contact_id);
-      Contactbook.equalTo('CreatedBy', userPtr);
-      Contactbook.notEqualTo('IsDeleted', true);
-      Contactbook.select('Name,Email,Phone');
-
-      const res = await Contactbook.first({ useMasterKey: true });
-      if (res) {
-        const parseRes = JSON.parse(JSON.stringify(res));
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_contact',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({
-          objectId: parseRes.objectId,
-          name: parseRes.Name,
-          email: parseRes.Email,
-          phone: parseRes.Phone,
-          createdAt: parseRes.createdAt,
-          updatedAt: parseRes.updatedAt,
-        });
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_contact',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'Contact not found!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,63 +0,0 @@
-export default async function getContactList(request, response) {
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      const limit = request?.query?.limit ? parseInt(request.query.limit) : 100;
-      const skip = request?.query?.skip ? parseInt(request.query.skip) : 0;
-      const Contactbook = new Parse.Query('contracts_Contactbook');
-      Contactbook.equalTo('CreatedBy', userPtr);
-      Contactbook.notEqualTo('IsDeleted', true);
-      Contactbook.limit(limit);
-      Contactbook.skip(skip);
-      Contactbook.descending('createdAt');
-      const res = await Contactbook.find({ useMasterKey: true });
-      if (res && res.length > 0) {
-        const parseRes = JSON.parse(JSON.stringify(res));
-        const contactlist = parseRes.map(x => ({
-          objectId: x.objectId,
-          name: x.Name,
-          email: x.Email,
-          phone: x.Phone,
-          createdAt: x.createdAt,
-          updatedAt: x.updatedAt,
-        }));
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_contact_list',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({ result: contactlist });
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_contact_list',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({ result: [] });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,84 +0,0 @@
-export default async function getDocument(request, response) {
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      const Document = new Parse.Query('contracts_Document');
-      Document.equalTo('objectId', request.params.document_id);
-      Document.equalTo('CreatedBy', userPtr);
-      Document.notEqualTo('IsArchive', true);
-      Document.include('Signers');
-      Document.include('Folder');
-      Document.include('ExtUserPtr');
-      Document.include('Placeholders.signerPtr');
-      const res = await Document.first({ useMasterKey: true });
-      if (res) {
-        const document = JSON.parse(JSON.stringify(res));
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_document',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({
-          objectId: document.objectId,
-          title: document.Name,
-          note: document.Note || '',
-          folder: { objectId: document?.Folder?.objectId, name: document?.Folder?.Name } || '',
-          file: document?.SignedUrl || document.URL,
-          owner: document?.ExtUserPtr?.Name,
-          signers:
-            document?.Placeholders?.map(y => ({
-              role: y.Role,
-              name: y?.signerPtr?.Name || '',
-              email: y?.signerPtr?.Email || '',
-              phone: y?.signerPtr?.Phone || '',
-              widgets: y.placeHolder?.flatMap(x =>
-                x?.pos.map(w => ({
-                  type: w?.type ? w.type : w.isStamp ? 'stamp' : 'signature',
-                  x: w.xPosition,
-                  y: w.yPosition,
-                  w: w?.Width || 150,
-                  h: w?.Height || 60,
-                  page: x?.pageNumber,
-                }))
-              ),
-            })) ||
-            document?.Signers?.map(y => ({ name: y?.Name, email: y?.Email, phone: y?.Phone })) ||
-            [],
-          sendInOrder: document?.SendinOrder || false,
-          createdAt: document.createdAt,
-          updatedAt: document.updatedAt,
-        });
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_document',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'Document not found!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,138 +0,0 @@
-import axios from 'axios';
-import reportJson from '../../../parsefunction/reportsJson.js';
-import dotenv from 'dotenv';
-dotenv.config();
-
-export default async function getDocumentList(request, response) {
-  const reqToken = request.headers['x-api-token'];
-  const appId = process.env.APP_ID;
-  const serverUrl = process.env.SERVER_URL;
-  if (!reqToken) {
-    return response.status(400).json({ error: 'Please Provide API Token' });
-  }
-  try {
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      const docType = request.params.doctype;
-      const limit = request?.query?.limit ? request.query.limit : 100;
-      const skip = request?.query?.skip ? request.query.skip : 0;
-      let reportId;
-      switch (docType) {
-        case 'draft':
-          reportId = 'ByHuevtCFY';
-          break;
-        case 'signaturerequest':
-          reportId = '4Hhwbp482K';
-          break;
-        case 'inprogress':
-          reportId = '1MwEuxLEkF';
-          break;
-        case 'completed':
-          reportId = 'kQUoW4hUXz';
-          break;
-        case 'expired':
-          reportId = 'zNqBHXHsYH';
-          break;
-        case 'declined':
-          reportId = 'UPr2Fm5WY3';
-          break;
-        default:
-          reportId = '';
-      }
-      const json = reportId && reportJson(reportId, userPtr.objectId);
-      const clsName = 'contracts_Document';
-      if (reportId && json) {
-        const { params, keys } = json;
-        const orderBy = '-updatedAt';
-        const strParams = JSON.stringify(params);
-        const strKeys = keys.join();
-        const headers = {
-          'Content-Type': 'application/json',
-          'X-Parse-Application-Id': appId,
-          'X-Parse-Master-Key': process.env.MASTER_KEY,
-        };
-        const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys},Placeholders&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr`;
-        try {
-          const res = await axios.get(url, { headers: headers });
-          if (res.data && res.data.results.length > 0) {
-            if (request.posthog) {
-              request.posthog?.capture({
-                distinctId: parseUser.userId.email,
-                event: `api_get_document_list_${docType}`,
-                properties: { response_code: 200, doc_type: docType },
-              });
-            }
-            const updateRes = res.data.results.map(x => ({
-              objectId: x.objectId,
-              title: x.Name,
-              note: x.Note || '',
-              folder: { objectId: x?.Folder?.objectId, name: x?.Folder?.Name } || '',
-              file: x?.SignedUrl || x.URL,
-              owner: x?.ExtUserPtr?.Name,
-              signers:
-                x?.Placeholders?.map(y => ({
-                  role: y.Role,
-                  name: y?.signerPtr?.Name || '',
-                  email: y?.signerPtr?.Email || '',
-                  phone: y?.signerPtr?.Phone || '',
-                  widgets: y.placeHolder?.flatMap(x =>
-                    x?.pos.map(w => ({
-                      type: w?.type ? w.type : w.isStamp ? 'stamp' : 'signature',
-                      x: w.xPosition,
-                      y: w.yPosition,
-                      w: w?.Width || 150,
-                      h: w?.Height || 60,
-                      page: x?.pageNumber,
-                    }))
-                  ),
-                })) ||
-                x?.Signers?.map(y => ({ name: y?.Name, email: y?.Email, phone: y?.Phone })) ||
-                [],
-              sendInOrder: x?.SendinOrder || false,
-              createdAt: x.createdAt,
-              updatedAt: x.updatedAt,
-            }));
-            return response.json({ result: updateRes });
-          } else {
-            return response.json({ result: [] });
-          }
-        } catch (err) {
-          console.log('err in getdocument list', err);
-          if (request.posthog) {
-            request.posthog?.capture({
-              distinctId: parseUser.userId.email,
-              event: `api_get_document_list_${docType}`,
-              properties: { response_code: 400, doc_type: docType },
-            });
-          }
-          return response
-            .status(400)
-            .json({ error: 'Something went wrong, please try again later!' });
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: `api_get_document_list_${docType}`,
-            properties: { response_code: 404, doc_type: docType },
-          });
-        }
-        return response.status(404).json({ error: 'Report not available!' });
-      }
-    }
-    return response.status(405).json({ error: 'Invalid API Token!' });
-  } catch (err) {
-    console.log('Err', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,84 +0,0 @@
-export default async function getTemplate(request, response) {
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-
-      const Template = new Parse.Query('contracts_Template');
-      Template.equalTo('objectId', request.params.template_id);
-      Template.equalTo('CreatedBy', userPtr);
-      Template.notEqualTo('IsArchive', true);
-      Template.include('Signers');
-      Template.include('Folder');
-      Template.include('ExtUserPtr');
-      Template.include('Placeholders.signerPtr');
-      const res = await Template.first({ useMasterKey: true });
-      if (res) {
-        const template = JSON.parse(JSON.stringify(res));
-
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_template',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({
-          objectId: template.objectId,
-          title: template.Name,
-          note: template.Note || '',
-          folder: { objectId: template?.Folder?.objectId, name: template?.Folder?.Name } || '',
-          file: template?.SignedUrl || template?.URL,
-          owner: template?.ExtUserPtr?.Name,
-          signers:
-            template?.Placeholders?.map(y => ({
-              role: y.Role,
-              name: y?.signerPtr?.Name || '',
-              email: y?.signerPtr?.Email || '',
-              phone: y?.signerPtr?.Phone || '',
-              widgets: y.placeHolder?.flatMap(x =>
-                x?.pos.map(w => ({
-                  type: w?.type ? w.type : w.isStamp ? 'stamp' : 'signature',
-                  x: w.xPosition,
-                  y: w.yPosition,
-                  w: w?.Width || 150,
-                  h: w?.Height || 60,
-                  page: x?.pageNumber,
-                }))
-              ),
-            })) || [],
-          sendInOrder: template?.SendinOrder || false,
-          createdAt: template.createdAt,
-          updatedAt: template.updatedAt,
-        });
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_template',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'Template not found!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,111 +0,0 @@
-import axios from 'axios';
-import dotenv from 'dotenv';
-dotenv.config();
-export default async function getTemplatetList(request, response) {
-  const reqToken = request.headers['x-api-token'];
-  const appId = process.env.APP_ID;
-  const serverUrl = process.env.SERVER_URL;
-  if (!reqToken) {
-    return response.status(400).json({ error: 'Please Provide API Token' });
-  }
-  try {
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-
-      const limit = request?.query?.limit ? request.query.limit : 100;
-      const skip = request?.query?.skip ? request.query.skip : 0;
-
-      const clsName = 'contracts_Template';
-      const params = {
-        Type: { $ne: 'Folder' },
-        CreatedBy: userPtr,
-        IsArchive: { $ne: true },
-      };
-      const keys = [
-        'Name',
-        'Note',
-        'Description',
-        'Folder.Name',
-        'URL',
-        'SignedUrl',
-        'ExtUserPtr.Name',
-        'Signers.Name',
-        'Signers.Email',
-        'Signers.Phone',
-        'Placeholders',
-      ];
-      const orderBy = '-updatedAt';
-      const strParams = JSON.stringify(params);
-      const strKeys = keys.join();
-      const headers = {
-        'Content-Type': 'application/json',
-        'X-Parse-Application-Id': appId,
-        'X-Parse-Master-Key': process.env.MASTER_KEY,
-      };
-      const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr`;
-      const res = await axios.get(url, { headers: headers });
-      if (res.data && res.data.results.length > 0) {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_template_list',
-            properties: { response_code: 200 },
-          });
-        }
-        const updateRes = res.data.results.map(template => ({
-          objectId: template.objectId,
-          title: template.Name,
-          note: template.Note || '',
-          folder: { objectId: template?.Folder?.objectId, name: template?.Folder?.Name } || '',
-          file: template?.SignedUrl || template.URL,
-          owner: template?.ExtUserPtr?.Name,
-          signers:
-            template?.Placeholders?.map(y => ({
-              role: y.Role,
-              name: y?.signerPtr?.Name || '',
-              email: y?.signerPtr?.Email || '',
-              phone: y?.signerPtr?.Phone || '',
-              widgets: y.placeHolder?.flatMap(x =>
-                x?.pos.map(w => ({
-                  type: w?.type ? w.type : w.isStamp ? 'stamp' : 'signature',
-                  x: w.xPosition,
-                  y: w.yPosition,
-                  w: w?.Width || 150,
-                  h: w?.Height || 60,
-                  page: x?.pageNumber,
-                }))
-              ),
-            })) || [],
-          sendInOrder: template?.SendinOrder || false,
-          createdAt: template.createdAt,
-          updatedAt: template.updatedAt,
-        }));
-
-        return response.json({ result: updateRes });
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_template_list',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({ result: [] });
-      }
-    }
-    return response.status(405).json({ error: 'Invalid API Token!' });
-  } catch (err) {
-    console.log('err', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,62 +0,0 @@
-import dotenv from 'dotenv';
-dotenv.config();
-
-export default async function getUser(request, response) {
-  const reqToken = request.headers['x-api-token'];
-  if (!reqToken) {
-    return response.status(400).json({ error: 'Please Provide API Token' });
-  }
-  try {
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-
-      const query = new Parse.Query('contracts_Users');
-      query.equalTo('UserId', userPtr);
-      query.exclude('IsContactEntry,TourStatus,UserRole,TenantId,UserId,CreatedBy,Plan');
-      const user = await query.first({ useMasterKey: true });
-      if (user) {
-        const parseRes = JSON.parse(JSON.stringify(user));
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_your_account_details',
-            properties: { response_code: 200 },
-          });
-        }
-        return response.json({
-          objectId: parseRes.objectId,
-          name: parseRes.Name,
-          email: parseRes.Email,
-          phone: parseRes.Phone,
-          jobTitle: parseRes.JobTitle,
-          company: parseRes.Company,
-          createdAt: parseRes.createdAt,
-          updatedAt: parseRes.updatedAt,
-        });
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_your_account_details',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'User not found!' });
-      }
-    }
-    return response.status(405).json({ error: 'Invalid API Token!' });
-  } catch (err) {
-    console.log('Err', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,55 +0,0 @@
-export default async function getWebhook(request, response) {
-  const reqToken = request.headers['x-api-token'];
-  if (!reqToken) {
-    return response.status(400).json({ error: 'Please Provide API Token' });
-  }
-  try {
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      const query = new Parse.Query('contracts_Users');
-      query.equalTo('UserId', userPtr);
-      const user = await query.first({ useMasterKey: true });
-      if (user) {
-        const extUser = JSON.parse(JSON.stringify(user));
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_webhook',
-            properties: { response_code: 200 },
-          });
-        }
-        if (extUser && extUser.Webhook) {
-          return response.json({
-            webhook: extUser.Webhook,
-          });
-        } else {
-          return response.json({});
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_get_webhook',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'User not found!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('Err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,85 +0,0 @@
-export default async function saveWebhook(request, response) {
-  const Url = request.body.url;
-  const reqToken = request.headers['x-api-token'];
-  if (!reqToken) {
-    return response.status(400).json({ error: 'Please Provide API Token' });
-  }
-  try {
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      const query = new Parse.Query('contracts_Users');
-      query.equalTo('UserId', userPtr);
-      const user = await query.first({ useMasterKey: true });
-      if (user) {
-        const extUser = JSON.parse(JSON.stringify(user));
-        const isUrlExist = extUser?.Webhook && extUser?.Webhook === Url;
-
-        if (!isUrlExist) {
-          try {
-            const updateQuery = new Parse.Object('contracts_Users');
-            updateQuery.id = user.id;
-            updateQuery.set('Webhook', Url);
-            const res = await updateQuery.save(null, { useMasterKey: true });
-            if (res) {
-              if (request.posthog) {
-                request.posthog?.capture({
-                  distinctId: parseUser.userId.email,
-                  event: 'api_save_webhook',
-                  properties: { response_code: 200 },
-                });
-              }
-              return response.json({
-                result: 'Webhook updated successfully!',
-              });
-            }
-          } catch (err) {
-            if (request.posthog) {
-              request.posthog?.capture({
-                distinctId: parseUser.userId.email,
-                event: 'api_save_webhook',
-                properties: { response_code: 400 },
-              });
-            }
-            console.log('Err ', err);
-            return response
-              .status(400)
-              .json({ error: 'Something went wrong, please try again later!' });
-          }
-        } else {
-          if (request.posthog) {
-            request.posthog?.capture({
-              distinctId: parseUser.userId.email,
-              event: 'api_save_webhook',
-              properties: { response_code: 401 },
-            });
-          }
-          return response.status(401).json({ error: 'Webhook url already exists!' });
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_save_webhook',
-            properties: { response_code: 404 },
-          });
-        }
-        return response.status(404).json({ error: 'User not found!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('Err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,93 +0,0 @@
-export default async function updateDocument(request, response) {
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const allowedKeys = ['name', 'note', 'description', 'folderId'];
-      const objectKeys = Object.keys(request.body);
-      const isValid = objectKeys.every(key => allowedKeys.includes(key)) && objectKeys.length > 0;
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      if (isValid) {
-        const document = new Parse.Query('contracts_Document');
-        document.equalTo('objectId', request.params.document_id);
-        document.equalTo('CreatedBy', userPtr);
-        const res = await document.first({ useMasterKey: true });
-        if (res) {
-          const isArchive = res.get('IsArchive');
-          if (isArchive && isArchive) {
-            return response.status(404).json({ message: 'Document not found!' });
-          } else {
-            const document = Parse.Object.extend('contracts_Document');
-            const updateQuery = new document();
-            updateQuery.id = request.params.document_id;
-            if (request?.body?.name) {
-              updateQuery.set('Name', request?.body?.name);
-            }
-            if (request?.body?.note) {
-              updateQuery.set('Note', request?.body?.note);
-            }
-            if (request?.body?.description) {
-              updateQuery.set('Description', request?.body?.description);
-            }
-            if (request?.body?.folderId) {
-              updateQuery.set('Folder', {
-                __type: 'Pointer',
-                className: 'contracts_Document',
-                objectId: request?.body?.folderId,
-              });
-            }
-            const updatedRes = await updateQuery.save(null, { useMasterKey: true });
-            if (updatedRes) {
-              if (request.posthog) {
-                request.posthog?.capture({
-                  distinctId: parseUser.userId.email,
-                  event: 'api_update_document',
-                  properties: { response_code: 200 },
-                });
-              }
-              return response.json({
-                objectId: updatedRes.id,
-                updatedAt: updatedRes.get('updatedAt'),
-              });
-            }
-          }
-        } else {
-          if (request.posthog) {
-            request.posthog?.capture({
-              distinctId: parseUser.userId.email,
-              event: 'api_update_document',
-              properties: { response_code: 404 },
-            });
-          }
-          return response.status(404).json({ error: 'Document not found!' });
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_update_document',
-            properties: { response_code: 400 },
-          });
-        }
-        return response.status(400).json({ error: 'Please provide valid field names!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -1,93 +0,0 @@
-export default async function updateTemplate(request, response) {
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const allowedKeys = ['name', 'note', 'description', 'folderId'];
-      const objectKeys = Object.keys(request.body);
-      const isValid = objectKeys.every(key => allowedKeys.includes(key)) && objectKeys.length > 0;
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      if (isValid) {
-        const template = new Parse.Query('contracts_Template');
-        template.equalTo('objectId', request.params.template_id);
-        template.equalTo('CreatedBy', userPtr);
-        const res = await template.first({ useMasterKey: true });
-        if (res) {
-          const isArchive = res.get('IsArchive');
-          if (isArchive && isArchive) {
-            return response.status(404).json({ message: 'Template not found!' });
-          } else {
-            const template = Parse.Object.extend('contracts_Template');
-            const updateQuery = new template();
-            updateQuery.id = request.params.template_id;
-            if (request?.body?.name) {
-              updateQuery.set('Name', request?.body?.name);
-            }
-            if (request?.body?.note) {
-              updateQuery.set('Note', request?.body?.note);
-            }
-            if (request?.body?.description) {
-              updateQuery.set('Description', request?.body?.description);
-            }
-            if (request?.body?.folderId) {
-              updateQuery.set('Folder', {
-                __type: 'Pointer',
-                className: 'contracts_Template',
-                objectId: request?.body?.folderId,
-              });
-            }
-            const updatedRes = await updateQuery.save(null, { useMasterKey: true });
-            if (updatedRes) {
-              if (request.posthog) {
-                request.posthog?.capture({
-                  distinctId: parseUser.userId.email,
-                  event: 'api_update_template',
-                  properties: { response_code: 200 },
-                });
-              }
-              return response.json({
-                objectId: updatedRes.id,
-                updatedAt: updatedRes.get('updatedAt'),
-              });
-            }
-          }
-        } else {
-          if (request.posthog) {
-            request.posthog?.capture({
-              distinctId: parseUser.userId.email,
-              event: 'api_update_template',
-              properties: { response_code: 404 },
-            });
-          }
-          return response.status(404).json({ error: 'Template not found!' });
-        }
-      } else {
-        if (request.posthog) {
-          request.posthog?.capture({
-            distinctId: parseUser.userId.email,
-            event: 'api_update_template',
-            properties: { response_code: 400 },
-          });
-        }
-        return response.status(400).json({ error: 'Please provide valid field names!' });
-      }
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -13,16 +13,6 @@ import sendMailOTPv1 from './parsefunction/SendMailOTPv1.js';
 import SendMailv1 from './parsefunction/SendMailv1.js';
 import AuthLoginAsMail from './parsefunction/AuthLoginAsMail.js';
 import getUserId from './parsefunction/getUserId.js';
-import getUserDetails from './parsefunction/getUserDetails.js';
-import getDocument from './parsefunction/getDocument.js';
-import getDrive from './parsefunction/getDrive.js';
-import getReport from './parsefunction/getReport.js';
-import generateApiToken from './parsefunction/generateApiToken.js';
-import getapitoken from './parsefunction/getapitoken.js';
-import TemplateAfterSave from './parsefunction/TemplateAfterSave.js';
-import GetTemplate from './parsefunction/GetTemplate.js';
-import savewebhook from './parsefunction/saveWebhook.js';
-import callWebhook from './parsefunction/callWebhook.js';

 Parse.Cloud.define('AddUserToRole', addUserToGroups);
 Parse.Cloud.define('UserGroups', getUserGroups);
@@ -32,20 +22,10 @@ Parse.Cloud.define('googlesign', GoogleSign);
 Parse.Cloud.define('zohodetails', ZohoDetails);
 Parse.Cloud.define('usersignup', usersignup);
 Parse.Cloud.define('facebooksign', FacebookSign);
+Parse.Cloud.afterSave('contracts_Document', DocumentAftersave);
+Parse.Cloud.afterSave('contracts_Contactbook', ContactbookAftersave);
+Parse.Cloud.afterSave('contracts_Users', ContractUsersAftersave);
 Parse.Cloud.define('SendOTPMailV1', sendMailOTPv1);
 Parse.Cloud.define('sendmail', SendMailv1);
 Parse.Cloud.define('AuthLoginAsMail', AuthLoginAsMail);
 Parse.Cloud.define('getUserId', getUserId);
-Parse.Cloud.define('getUserDetails', getUserDetails);
-Parse.Cloud.define('getDocument', getDocument);
-Parse.Cloud.define('getDrive', getDrive);
-Parse.Cloud.define('getReport', getReport);
-Parse.Cloud.define('generateapitoken', generateApiToken);
-Parse.Cloud.define('getapitoken', getapitoken);
-Parse.Cloud.define('getTemplate', GetTemplate);
-Parse.Cloud.define('savewebhook', savewebhook);
-Parse.Cloud.define('callwebhook', callWebhook);
-Parse.Cloud.afterSave('contracts_Document', DocumentAftersave);
-Parse.Cloud.afterSave('contracts_Contactbook', ContactbookAftersave);
-Parse.Cloud.afterSave('contracts_Users', ContractUsersAftersave);
-Parse.Cloud.afterSave('contracts_Template', TemplateAfterSave);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
nxglabs	068082f56f	update default cert base64	2023-11-18 01:39:35 +05:30
nxglabs	1ce8e2bbdf	update default pfx passkey	2023-11-18 01:19:02 +05:30
AmolandGitHub	3cdc4116aa	change default value of USE_LOCAL to True	2023-11-18 00:59:03 +05:30
Amol GitHub Rishab prafull-opensignlabs Raktima	0b0c18d106	v1.0.5-beta (#180 ) * Main (#175) * Update features in README.md * #167 - Sanitize Output filename (#176) * replace modal title login with additional info and verification mail alert (#179) * fix issue of mulitple annotation in signyourself (#174) --------- Co-authored-by: Rishab <33950743+rishabjasrotia@users.noreply.github.com> Co-authored-by: prafull-opensignlabs <93375423+prafull-opensignlabs@users.noreply.github.com> Co-authored-by: Raktima <110812506+raktima-opensignlabs@users.noreply.github.com>	2023-11-13 17:13:48 +05:30
AmolandGitHub	b4315b5e0a	Merge pull request #163 from OpenSignLabs/staging v1.0.4	2023-11-10 02:52:04 +05:30
AmolandGitHub	ccecec5e59	Merge pull request #149 from OpenSignLabs/staging v1.0.3	2023-11-08 14:28:32 +05:30