Merge pull request #163 from OpenSignLabs/staging

v1.0.4
Merge pull request #149 from OpenSignLabs/staging
2026-09-04 08:48:55 +02:00 · 2023-11-10 02:52:04 +05:30 · 2023-11-08 14:28:32 +05:30
150 changed files with 8283 additions and 15820 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=
@@ -42,74 +42,69 @@ DO_SECRET_ACCESS_KEY=
 # Digital ocean spaces region or AWS s3 region
 DO_REGION=us-west
 # local storage
-USE_LOCAL=TRUE
+USE_LOCAL=FALSE

-# 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
-BqCCBGAwggRcAgEAMIIEVQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIpumu
-bFabBWACAggAgIIEKDqHS7Icd5MzIBk1dBokGK2s+5a2fA4308WA1QzEWmczqVYI
-z6lYmW8qsiZIw4PFkRzdIx1+zCmP8jgWiiqh5RKnbHYmh1JPNyx9SqmUDILDXmjg
-KxO9agRw9LXge4hgRL7YW0TxYZYw4EeXV9Yr7kcOq9DoO2MoRikJ+2Tuvvq/hfuV
-9zFHsz4jpf7W95k1IeH6bZ92klz5R1e/EK8JuHy592i/u+BxxW1vTkiPpTaHD6s9
-1lDSkT1j0LIDU6l9gVvJvFBV8j88vet/Z4QkTbHPMYvBnKNRstKuOvDasEJE4RkA
-PV4TfBwFF6uvREZI1vBboM/18pzeyjoRX+mlJNfcH3kh1tkck+Jg+M2bLXAH1EdD
-GRwENvnTNW1CFIn37VVja7SFBQNXA+E6rejmqtUmZ5XktSINDBUyjow9XuYTUtI/
-sgcRSC0aB0EKKpphbFPp1niKCLm1ef33e+bWyWbtR2L2Kc3ETmhjNADpyapAGmzc
-LP2BafGaKj18KiLAG4GL6+kXk0GUz7Fw5q8H8RY1T33o+xjWvC0+aJgvr65qWdKw
-+ug6wuu4Cr2kFEuXxPKsnYqmE5NT/x+lfunlZ5iEQN3w2XO5J2u2eMXVRUsPH2T6
-0sJKomjY0RB1JsqZBnyleWm+tYo0RpVAyJ3NGBp9dVb7a3Qw6jNZBG/xMW+gvtUJ
-q6hfK/cD3cagD0NQFVD5STMOuGOSqq/bbwAKjZ/lrPmCCYATKwkjAFybYfHJVrrW
-Y2tQgCQ/zrZLIxQjp7F17hU0+gT54x0MpF6AoqIM/qqNnHrQ0fi50ECmLvx3SqYa
-nvjvt/HZhMZfqRXiXjeicIwpnNoG7+uQknySk+7cc9GNhHZR7cfPfkTpgvuuebrQ
-l5YW+k9tG+xrX8g72nvtFMnammlBixlFwECJaEszEQk5tc2ti8uG2z+kGnFoDoBV
-M6ZVMpKDJzXPxLdzT6ChIPyatjIkqOKe6vDpnmzcoEhbBhmtkVjWFA2dfX846ugV
-y1QiecWgk8pMNWhh3IDd05v/wzbFwNcq+Gi+1dZsPmFH+egIcrQKZu2r3jCJtGHh
-DNG/nyf/anqvKXF90bi4hRT3vdDXXuWgY7EUwfn9h5jYabCO6HsQxQOBjFYNmBrh
-MfaiBZe72E8fzNAfIlwDcJ4AWY1SOM7hi8bqfRWw1NtNxuMUiRFoR31O6XkQauye
-9hAmpdlZHZXtJ6LM0QaWkPJmG3058GMtIn/qS60V9nINh+zXhwza/1pnFB+e9MWc
-hAPgo0nn55FusM//g1nM31PKe+nOm3Jyp0nEQ4m8aDtJS63o2fvp3e2KJbPWQMHE
-a83W975diWg4NTdevV9lFpNllHclVoPoavUHIzHd7HF9TcPpjbXJSUZ7cITHHefr
-kQTa/2G9cWuRhN9GKIHBdr13nfEvMIIFQQYJKoZIhvcNAQcBoIIFMgSCBS4wggUq
-MIIFJgYLKoZIhvcNAQwKAQKgggTuMIIE6jAcBgoqhkiG9w0BDAEDMA4ECDgnjfOf
-AjArAgIIAASCBMgkbVuptroBdyMY5gl/eBQj5+iAV02YSaF969ihStLSWI4x5FAf
-HuDgqCyEMSl4RHG8ZvNaO9JoNfIpMK/TPQBoQRCzE2Vjf66VTERaQtU6h7tZrbQt
-K96n9eqvohm/vXbXe08fsodYp2s79kAvKgpuGG5iX77qYVzJHBPed87cvczo4ToP
-CpurDpByt8fGEmjtcikal8o+H9uoHjcFwqMigX1Q7IEjuKXrb5e6wTvxMRob8yfv
-LVl6ahteKSkWCMb6rLZ5f12jDoCGX/YXRrSsU9t/lXe0Nxv5i7c8flb2EsNtwygD
-fexVvn5u6ble6RDYNpuQkPgF41HyZh+JvGAF6i1r4tJPL9Pf4HnjEB8Y8IHgon+w
-T5I+8LTgcrWyhptzblXMjKySTEp9OEa2cCVwZkl4z43PWJ5oIAQ2IDTOQ603/5o/
-d9KA76/zMPQ5O0gv17OA7kwFv98v6sTcR4vgkQZqnyDpJSEPHyNxhw2MSBqS3jq3
-YPhRz+3Ei1oFp9uYFhzn39f9gzNi++X9pOjSrDb8v3mcDXZKNrxQLuoRMSf0eQNI
-dgJRqj/fuqNZ5ac3kd4P5BALCsnA1tM27zYrgUdpOnrc2D9FBthEjpRlQKMMzhQf
-cNMFWmoNjakDilvvLcsQeQ3P6cXbN1ODoNnjgK3VzcmeKyzW2PrTXEPHARUM3j4V
-sZzGaUOVKLqaaDrXWQKC0vrTvxP2WMfjQ1dTdXQP/kSZTXRC5rtB9tky38flBor0
-N9rhUDIGMs5qBvyrkV2hKXiW39G69p1KWY+Cw28AzY+CNSjePRi60TsnUxgcOS7i
-0AT25Gx3A4YqxmTY38MPB4wPcBPcw4hjNoQamaC9mqs+KVHcP5YHUlqykMeH0YVi
-J+ehytJE9xuDcfBOjxjadxp3/q/Lku4rky89gdJGFQWuuz75VulDywPRZRwmQTel
-sjEGMHR1zTOlPJdTDWhqaKmWvL4GhbCgEPIKwmqd1QKRTl/3Baa1nYllJeYVwiTT
-qLCkbA6qXrLGj1ENZxrKn9yqr8HwOoApjwhARu4LF/BRMgdkzelK2kOXHnZ26sZ2
-NY/MMtVmq4c59y6iQwmsbHr9tWGz3ahyXcZZufjNXU/AVnO1c92g7umAWZF4RohL
-gMmh57cAhN9PEbEv6j/6BT3XXp8jB0ywcRriYxfxwidviCKH/76Q4sytYJQaDFI1
-fnzmv0aDotbG2BdpWSiYPDOPm+3cmfjlULsn1FYWL4NDCX1f+C4lNtKVX9LU8c5M
-m8dA1DUlDfnuNO5/BShuoGXG2z4O/XwxIaRFizMxWS2sWurbAEFJ6oNw3kC7WSah
-NIe8aUC1umpc1Gk3X2f4Ytzj9OEqn0y55qoqLINJuejXMffF/gjopxHWadLVaVaj
-Q1SewrECuEXdSbBR/a10po24wmRtkmlvRJXJl7sG95xE5ZCqp+m6sRPWGdf1yKbV
-vyWNUe4Qvkxe4a0VAJpTyIGr980CKz/jkvtNQMobGl7AfhxKJ450wg454WcexMct
-BYXvZMSdUDCgMLlh0nHJHl5btrFWqE0Z/fqWmIknZL2jZ4J+2hdVl/xB/sUt6kcu
-txw+RfL+vNE8PxhTNaOdJFwD8yeN1mJ3yMUA8HHYpw9yljgxJTAjBgkqhkiG9w0B
-CRUxFgQUDYlgGVxSxuOknhQc256x3++7BDwwMTAhMAkGBSsOAwIaBQAEFFjASdYl
-3pXAXxZuvVvv9tsb4bdrBAhyb+KCIjp/gAICCAA='
+PFX_BASE64='MIIKLwIBAzCCCeUGCSqGSIb3DQEHAaCCCdYEggnSMIIJzjCCBEIGCSqGSIb3DQEH
+BqCCBDMwggQvAgEAMIIEKAYJKoZIhvcNAQcBMFcGCSqGSIb3DQEFDTBKMCkGCSqG
+SIb3DQEFDDAcBAh6cQqVpHfTzAICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQME
+ASoEEFKEIGJTTRo3voO/FvsXs7yAggPAI7rMCboTFFBfdMuuV3Y9/xfphAgdGD7P
+0xAN10CcmXlMtedc8cRxOaD9n3Q7zJx5iIbqEGDTc0dgp5EtdWsGl7MP76iHkSfB
+ZUPc13nbnRU4Nq4hNFcSj1m6NVa0lT9UobbTsG+wUkJn8aLfijzZ1OY82KLlKUoJ
+lqLsQ1yZkeLiLKI0aEew/2vzfiLUX9A99qnCRoryo8ZbLiWl0Vu/FEKM5mqIRFEp
+BKeSUsRxBfJCMZ2Ks5t4/MTCV+yrcsuhLPF/AJpzKfIinEFDhm7MxP4RXtk2LWNe
+EO2GuFRjZCfsMO0oNWybFmDeNDMCHZj5TeoqL1JwAV5e1lEeqR38v4Wcr4OVefY
+DfdrJ2xdvm7XbBZ8Lgx8L4fwugw7oDyTpR2jJqHMlpOsQrxipN6UKkN6EVYeCC5K
+4dF5LHdCcIa7L/OI/feD5g/zz8SGCTc91husVN7zi+CVO0lQLRkAj02+VbiXPPDD
+eQm/QBieG2yVe5IRfcnIs2aszulbQbgHdguSYSQa/7DEvN/9/uxUIRFbItwrreRI
+VAUUNS02L680Zok9xzDed1I/WJoPr2+5n2eV1jc5zoH7mAni0+Z1d5qLoYV6pNaN
+P9okvBf75LLNoJKsb/eWlkk73rmlH6/Qz+hudgnlkxUJuU/b79AMQpd0EWEWhcim
+ZeB4d9lPLLwyvY/FN4aCGWzsoAW69RK9E1DyGZAZRYRwCKHSWXmCaenR1ilxcPFx
+TDavpybObIISPtylv5Z/IGBjE19Lw0UHc6Waln/jx0YXXGGDWs1F/MrdJ/8mkVXf
+tHB/5ds4u5md+CmXpaCITO3Cg9GltGSWyDoEJsz1u/Wzq4X4FYmolXiqQvMPQrxu
+iThTnPDGbz9VqFSyNKPKswIQ8CUbvZ209A5vjERPzE0Lp1pO39K51fnHD9oD968t
+tGbGmNiQ0++Orze79cH0UVwDa6NLGCmnE0oBgke1JDPlaU3kkx7+R9SAS0Zytsmj
+aLxW5Z1cOFaqqBLjwgHUxOqRO+cl6P9ORox34wJjiwZKy1L+0ppw22Na/unwi2Rk
+a8jvK7+ycOLaiSmI77T0l7VCWgKsRsWLvBA3cjX5XAGtatFXrY/7Imoxl0nWGLjG
+n5Sv5XuDek4e4QAPeJmhpURMnzLDsSXAYOSYZvS/kgENYhYSnQLQp50TxrzquA2c
+lAeFIEqqAJy9tAMfp5UAqMeOC60Ttn6ySsdOle003F2NrRilhPynNDZ3h1ZQknur
+Y9zWUm9qBmXCjhPzdmzHz3Ozj2Bi6kd4MIIFhAYJKoZIhvcNAQcBoIIFdQSCBXEw
+ggVtMIIFaQYLKoZIhvcNAQwKAQKgggUxMIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkq
+hkiG9w0BBQwwHAQIZenzippqfSQCAggAMAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUD
+BAEqBBCddSIj/wfxowZAO1j3W9FwBIIE0C/guzeZtV/vPsaIDAtWEkmepCvhm9Rg
+aUgOoR66wjyYx7upeuZJ+pYJdsEqUmTgGYN+ClBpsU0bqCM7PI0mepvIT9kLD6ZL
+UkprtNAYP87NBA/e5dpXlGAf9ibDRT0F2Y+lCSF83rCIYKG8n7h5834F6Saf+dU7
+6y5bgorbf2Fnxy123XfUSg5qdCraZZM+DwE1gpQdBGrFyq8cwlQ8hJpKHDWup7WA
+f2HcT/X0Wjb24L6JWjC1FvTbTNdS/lzTOcqLYUc31iuU9rF6O4qtX9PK/yGWc+YE
+qakuV+HrsF4je/YdVZRYHtkbbcYXW9PjtMv+4D1ut5X2SPeHwpj3WmGAb7Zno6SD
+SfohMihXvDbIjVSMDBpW97bhgk0h7iS4ISIYoQJUGJv3QQ3XJq91LoIP3zpiO/Cq
+ZuuHuGvZmO6lb0PGShRT7mFg3k3rswTfFyKdtY76zAVJIR2bz/6bRf4uQI48SOLR
+NX1Z6lavUNiE4nPNlnfBp480C+YANKs/bdev0wkRVmFxPMyb5FFLXwLSqcfdSQag
+RayrKd8xPOm6lor3cTvrkO3XH2Hf9TgFHjeIAQ3VZ1Cncb9jfra3V4zvIocek4dC
+GREirPbEyL/js5O0aAa0mg9EontMWKRqncomKhUOckheP2dYiQOazDFDFP9OQCYV
+MBb0RDwm3+hiMU0lPeO+NAjAv2SfFK7G4maMb2SL7inT7An7ZPPpnDNXLDt+nOgo
+IKuaJpy8JX/OKB4ntYsdnQG4E0J3vpHWjYPKif7j1njIYFd76bIgNVlqWuQFArBy
+U9BuPyF+eYouJc+TpX9R5ybPvabRR4NUjnrttr2E5AzQfIgNGrSFiewjvYZHQOKd
+WyVR9YV0cUv591xyUDdXMoHh+J0v0xK1WCHe/9enY5y/C8YohL8h5tEvInAQconj
+lJ2r9qX8iBmIupJij5M5Ebza8HQ4aVMdHu/s05Vj9BC6K0ok3h+DFTj2gUBD24sp
+APHic0DmNnciUQuHuuoW/1SVb6I1HJswsgcC8CekvoXF26ygwWhJPyqw+5djip2w
+I/l3uOnPPUWZQHKhnBH4noZydrzBBJN1po9dkxb8LKuKZDEcnKo+tQrTnZJaFRXK
+pQDsAjQ0HcYi8ZqN/GPezXOqzRgvObevXeDYTJrNejr46B1HqjPw8doai+AEf//1
+iiM9EK4y3bGbX837oebTByRi112AOctISHTWbF0zdFMiBO9X9PML4n3i14ToqLH1
+EUp0WtCdKLJmrRnO9PKJUMpce3yNu6oRSBzB4EkgUMOTVx9tM66h/gcR3wr+qKJP
+1EABMbbCsJeYYLujhQHVh0JluqLBXYuCmr5n6o8qmonj5tEfTn9zs2gi0OvKTliH
+wRXWsar004alt8D8o4M/Oqu3qyVV1O8BlVEofUC1CfAMIh/T1NJBeKG/FPfAFoEz
+9liLLkoDvGvFVJ4Ezy4BaPtg+G3yU/SeiruwsCB3unHRD7G6VvS4jY2B8vEYl0yM
+Z1mLFbKK8CIEvg8+v/vbc0noYUOzd6bkwh6Y6cziR/u78y2nALYZpQK+3XiVVH/v
+SaVoDckZgUwAX+dMd1P4U3a487MPXBZZmLVFMHTuv3NvW6NIQCMd4l35ViRd7YcS
+V2QDKTnUtPN2MSUwIwYJKoZIhvcNAQkVMRYEFMSz7PlBO5VzTDqC/foidPWrMjkw
+MEEwMTANBglghkgBZQMEAgEFAAQgPlLuG+67SxPOEPbgFuEnVgewvY6LUzFmrprx
+c6yryFgECIld0S5kDk7JAgIIAA=='

 # Provide Pass pharse of above PFX or p12 document
-PASS_PHRASE=opensign 
+PASS_PHRASE= 
@@ -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. |
@@ -2,7 +2,7 @@ build:
 	cp .env.local_dev .env
 	rm -rf apps/OpenSign/public/mfbuild
 	cd microfrontends/SignDocuments && npm install && npm run build
-	docker compose up --build --force-recreate
+	docker compose up -d

 run:
 	cp .env.local_dev .env
@@ -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>
@@ -47,18 +48,14 @@ Welcome to OpenSign, an open-source document e-signing solution designed to prov

 ### Features

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

 <img src=https://github.com/OpenSignLabs/OpenSign/assets/5486116/b37ff443-7099-4273-9aeb-21c46d7154cf height='200'>
 <img src=https://github.com/OpenSignLabs/OpenSign/assets/5486116/86db91b7-6c2f-4885-a33c-58f4fd35ec89 height='200'>
@@ -128,11 +125,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
@@ -42,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",
@@ -86,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>
@@ -15,7 +15,6 @@ import ForgetPassword from "./routes/ForgetPassword";
 import ChangePassword from "./routes/ChangePassword";
 import ReportMicroapp from "./components/ReportMicroapp";
 import LoadMf from "./routes/LoadMf";
-import ValidateRoute from "./primitives/ValidateRoute";

 function App() {
  const [isloading, setIsLoading] = useState(true);
@@ -59,24 +58,8 @@ function App() {
      ) : (
        <BrowserRouter>
          <Routes>
-            <Route
-              exact
-              path="/"
-              element={
-                <ValidateRoute>
-                  <Login />
-                </ValidateRoute>
-              }
-            />
-            <Route
-              exact
-              path="/signup"
-              element={
-                <ValidateRoute>
-                  <Signup />
-                </ValidateRoute>
-              }
-            />
+            <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 && (
@@ -32,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);
@@ -46,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);
@@ -106,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
@@ -164,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);
@@ -253,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"
@@ -290,6 +261,25 @@ 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"
@@ -1,20 +1,8 @@
 import React, { useEffect, useState } from "react";
 import Package from "../../package.json";
-import axios from "axios";
+
 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);
@@ -37,12 +25,16 @@ const Footer = () => {
  }, []);

  const appName = "OpenSign™";
-
+  
  return (
    <>
      <div className="bg-[#222c3c] text-[#98a6ba] text-center text-[13px] py-3">
        All Rights Reserved &copy; {new Date().getFullYear()} &nbsp;
-        {appName} ( version: {version ? version : `${Package.version} `})
+        {appName}{" "}
+        (version:{" "}
+        {localStorage.getItem("appVersion") &&
+          `${Package.version}.${localStorage.getItem("appVersion")}`}
+        )
      </div>
      <button
        className={`${
@@ -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>
@@ -42,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) {
@@ -101,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") };
@@ -148,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
          }
@@ -298,17 +261,17 @@ const GoogleSignInBtn = ({
                  </div>
                  <div className="form-group">
                    <label
-                      htmlFor="JobTitle"
+                      htmlFor="Destination"
                      style={{ display: "flex" }}
                      className="col-form-label"
                    >
-                      Job Title{" "}
+                      Destination{" "}
                      <span style={{ fontSize: 13, color: "red" }}>*</span>
                    </label>
                    <input
                      type="text"
                      className="form-control"
-                      id="JobTitle"
+                      id="Destination"
                      value={userDetails.Destination}
                      onChange={(e) =>
                        setUserDetails({
@@ -322,19 +285,18 @@ const GoogleSignInBtn = ({
                  <div>
                    <button
                      type="button"
-                      className="bg-[#17a2b8] p-2 text-white rounded"
-                      onClick={() => handleSubmitbtn()}
-                      style={{ marginRight: 10 }}
+                      className="bg-[#6c757d] p-2 text-white rounded"
+                      onClick={handleCloseModal}
+                      style={{ marginRight: 10, width: 90 }}
                    >
-                      Sign up
+                      Cancel
                    </button>
                    <button
                      type="button"
-                      className="bg-[#6c757d] p-2 text-white rounded"
-                      onClick={handleCloseModal}
-                      style={{ width: 90 }}
+                      className="bg-[#17a2b8] p-2 text-white rounded"
+                      onClick={() => handleSubmitbtn()}
                    >
-                      Cancel
+                      Sign up
                    </button>
                  </div>
                </form>
@@ -5,7 +5,7 @@ import Parse from "parse";
 import axios from "axios";
 import "../styles/spinner.css";
 import TreeFormComponent from "./TreeFormComponent";
-// import TreeEditForm from "./TreeEditForm";
+import TreeEditForm from "./TreeEditForm";
 import "../styles/modal.css";
 import Modal from "react-modal";

@@ -22,7 +22,7 @@ const TreeWidget = (props) => {
  const [schemaState, setSchemaState] = useState({});
  const [TabURL, setTabURL] = useState("");
  const [editable, setEditable] = useState(false);
-  // const [editId, setEditId] = useState("");
+  const [editId, setEditId] = useState("");
  const [defaultState, setDefaultState] = useState(false);
  const [isShowModal, setIsShowModal] = useState(false);
  const selectFolderHandle = async () => {
@@ -49,9 +49,12 @@ const TreeWidget = (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", currentUser);
+                res = await q.first();
                if (res) res = res.toJSON();
              }
              if (res) {
@@ -76,9 +79,12 @@ const TreeWidget = (props) => {
                  let data = JSON.parse(localStorage.getItem("Extand_Class"));
                  res = data[0];
                } else {
-                  res = await Parse.Cloud.run("getUserDetails", {
-                    email: currentUser.get("email")
-                  });
+                  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();
                }

@@ -115,15 +121,10 @@ const TreeWidget = (props) => {
            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();
-            const currentUser = Parse.User.current();
-            res = await Parse.Cloud.run("getUserDetails", {
-              email: currentUser.get("email")
-            });
+            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();
          }

@@ -472,8 +473,6 @@ const TreeWidget = (props) => {
        props.schema.data.FolderTypeField,
        props.schema.data.FolderTypeValue
      );
-      const currentUser = Parse.User.current();
-      folder.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
      if (tabList.length > 0) {
        let len = tabList.length - 1;
        folder.set(props.schema.data.ParentFolderField, {
@@ -533,7 +532,7 @@ const TreeWidget = (props) => {
      padding: 0
    },
    overlay: {
-      width: "100%",
+      width:"100%",
      backgroundColor: "rgba(0, 0, 0, 0.75)",
      zIndex: 50
    }
@@ -700,7 +699,7 @@ const TreeWidget = (props) => {
                ))}
              <hr />
            </div>
-            {/* {editable && (
+            {editable && (
              <TreeEditForm
                FormId={props.schema.data.FormId}
                objectId={editId}
@@ -709,7 +708,7 @@ const TreeWidget = (props) => {
                  selectFolderHandle();
                }}
              />
-            )} */}
+            )}
            {isAddField && !loader && !editable && (
              <TreeFormComponent
                Id={props.schema.data.FormId}
@@ -797,7 +796,7 @@ const TreeWidget = (props) => {
                              </a>
                            </div>

-                            {/* {fldr[props.schema.data.FolderTypeField] ===
+                            {fldr[props.schema.data.FolderTypeField] ===
                              props.schema.data.FolderTypeValue && (
                              <a
                                className="float-right"
@@ -817,7 +816,7 @@ const TreeWidget = (props) => {
                                  aria-hidden="true"
                                ></i>
                              </a>
-                            )} */}
+                            )}
                          </li>
                        )
                    )}
@@ -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>
-  );
-}
@@ -2,12 +2,14 @@ import React, { useState, useEffect } from "react";
 import { SaveFileSize } from "../../constant/saveFileSize";
 import Parse from "parse";
 import sanitizeFileName from "../../primitives/sanitizeFileName";
-import DropboxChooser from "./DropboxChoose";
+
 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);

@@ -23,6 +25,7 @@ const FileUpload = (props) => {
  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;
@@ -103,56 +106,6 @@ const FileUpload = (props) => {
      console.error("Error uploading file:", error);
    }
  };
-
-  const dropboxSuccess = async (files) => {
-    // console.log("file ", files);
-    setfileload(true);
-    const file = files[0];
-    const url = file.link;
-    const size = file.bytes;
-    const mb = Math.round(file.bytes / Math.pow(1024, 2));
-
-    if (mb > 10) {
-      setTimeout(() => {
-        alert(
-          `The selected file size is too large. Please select a file less than 10 MB`
-        );
-      }, 500);
-      return;
-    } else {
-      const name = sanitizeFileName(file.name);
-
-      const parseFile = new Parse.File(name, { uri: url });
-
-      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);
-            }
-          }
-        });
-        // console.log("response.url() ", response.url());
-        setFileUpload(response.url());
-        props.onChange(response.url());
-        setfileload(false);
-
-        if (response.url()) {
-          SaveFileSize(size, response.url());
-          return response.url();
-        }
-      } catch (error) {
-        setfileload(false);
-        setpercentage(0);
-        console.error("Error uploading file:", error);
-      }
-    }
-  };
-  const dropboxCancel = async () => {
-    console.log("cancel clicked ");
-  };
  let fileView =
    props.formData &&
    props.schema.uploadtype === "s3viajw" ? null : props.formData &&
@@ -254,55 +207,55 @@ const FileUpload = (props) => {
      </div>

      <>
-        {props.formData ? (
-          <div className="flex gap-2 justify-center items-center">
-            <div className="flex justify-between items-center px-2 py-[3px] w-full font-bold rounded border-[1px] border-[#ccc] text-gray-500 bg-white text-[13px]">
-              <div className="break-all">
-                file selected : {props.formData?.split("/")[3]?.split("_")[1]}
-              </div>
-              <div
-                onClick={() => {
-                  console.log("clicked");
-                  setFileUpload([]);
-                  props.onChange(undefined);
-                }}
-                className="cursor-pointer px-[10px] text-[20px] font-bold bg-white text-red-500"
-              >
-                <i className="fa-solid fa-xmark"></i>
-              </div>
-            </div>
-            {process.env.REACT_APP_DROPBOX_API_KEY && (
-              <DropboxChooser
-                onSuccess={dropboxSuccess}
-                onCancel={dropboxCancel}
-              />
-            )}
+        {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>
        ) : (
-          <div className="flex gap-2 justify-center items-center">
-            <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}
-            />
-            {process.env.REACT_APP_DROPBOX_API_KEY && (
-              <DropboxChooser
-                onSuccess={dropboxSuccess}
-                onCancel={dropboxCancel}
-              />
-            )}
-          </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>
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import Parse from "parse";
-// import axios from "axios";
+import axios from "axios";

 export class HiddenField extends Component {
  state = {
@@ -37,46 +37,31 @@ export class HiddenField extends Component {
          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 });
-            // });
-
-            const res = await Parse.Cloud.run("getUserDetails", {
-              email: currentUser.get("email")
+            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 });
            });
-            let custome_Filed = "";
-            const result = res.toJSON();
-            let _rdata = [result];
-            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);
+        console.log('err', error)
      }
    }
  };
@@ -120,10 +120,12 @@ const Level1Dropdown = (props) => {
            let data = JSON.parse(localStorage.getItem("Extand_Class"));
            res = data[0];
          } else {
-            const currentUser = Parse.User.current();
-            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", currentUser);
+            res = await q.first();
            if (res) res = res.toJSON();
          }

@@ -337,7 +339,7 @@ const Level1Dropdown = (props) => {
          x.className = x.className.replace("show", "");
        }, 5000);
      } catch (error) {
-        console.log("Err", error);
+        console.log("Err", error)
      }
    }
  };
@@ -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,190 +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}
-          />
-        </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%)",
-              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
-                valueKey={"objectId"}
-                displayKey={"Name"}
-                details={handleNewDetails}
-                closePopup={handleModalCloseClick}
-              />
-            )}
-          </div>
-        </Modal>
-      </div>
-    </div>
-  );
-};
-
-export default SignersInput;
@@ -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,2 +0,0 @@
-export const contactCls = "contracts_Contactbook";
-export const templateCls = "contracts_Template";
@@ -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 */
-}
-  
+}
@@ -14,7 +14,7 @@ export const formJson = (id) => {
            type: "string",
            title: "Select Document",
            filetypes: [],
-            maxfilesizeKB: "10000",
+            maxfilesizeKB: "5000",
            uploadtype: "regular",
            helpbody: "",
            helplink: ""
@@ -113,7 +113,7 @@ export const formJson = (id) => {
    });
    formData = {
      jsonSchema: {
-        title: "Request signatures",
+        title: "New Document",
        description: "",
        type: "object",
        required: ["URL", "Name", "Note", "TimeToCompleteDays", "Signers"],
@@ -147,7 +147,7 @@ export const formJson = (id) => {
              class: "contracts_Contactbook",
              displayKey: "Name",
              valueKey: "objectId",
-              query: `where={"CreatedBy":${userPtr},"IsDeleted":{"$ne":true}}&keys=Name`,
+              query: `where={"CreatedBy":${userPtr}}&keys=Name`,
              isPointer: true,
              helpbody: "",
              helplink: "",
@@ -582,3 +582,4 @@ export const formJson = (id) => {
    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,10 +26,9 @@
        "planName": "THANKS PLAN",
        "currency": "$",
        "price": "29.99",
-        "subtitle": "Use code 'FREEBETA' 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 OpenSignDrive",
@@ -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,36 +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 } from "react-router-dom";

 const HomeLayout = ({ children }) => {
-  const navigate = useNavigate();
  const { width } = useWindowSize();
-  const [isOpen, setIsOpen] = useState(true);
+  const [isOpen, setIsOpen] = useState(false);
  const arr = useSelector((state) => state.TourSteps);
-  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);
-      }
-    })();
-  }, []);

  // reactour state
  const [isCloseBtn, setIsCloseBtn] = useState(true);
@@ -44,16 +19,20 @@ const HomeLayout = ({ children }) => {
  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
@@ -145,11 +124,20 @@ const HomeLayout = ({ children }) => {
  };

  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);
@@ -176,59 +164,32 @@ const HomeLayout = ({ children }) => {
      setIsOpen(false);
    }
  };
-
-  const handleLoginBtn = () => {
-    try {
-      Parse.User.logOut();
-    } catch (err) {
-      console.log("err ", err);
-    } finally {
-      localStorage.removeItem("accesstoken");
-      navigate("/", { replace: true });
-    }
-  };
  return (
    <div>
      <div className="sticky top-0 z-50">
        <Header showSidebar={showSidebar} />
      </div>
-      {isUserValid ? (
-        <>
-          <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">{children}</div>
-              <div className="z-30">
-                <Footer />
-              </div>
-            </div>
+        <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>
-          <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>
-        </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,30 +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";
+
 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
@@ -34,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);
@@ -63,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
@@ -198,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>
            )}
@@ -283,158 +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="bg-[#1ab6ce] rounded-sm shadow-md text-[12px] font-semibold uppercase text-white py-1.5 px-3 focus:outline-none"
-                              >
-                                Yes
-                              </button>
-                              <button
-                                onClick={handleCloseDeleteModal}
-                                className="bg-[#188ae2] rounded-sm shadow-md text-[12px] font-semibold uppercase text-white py-1.5 px-3 text-center ml-[2px] focus:outline-none"
-                              >
-                                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 || "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>
+              {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>
+              ))}
            </>
          ) : (
            <></>
@@ -442,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
@@ -466,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
@@ -487,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,336 +0,0 @@
-import React, { useState } from "react";
-import sanitizeFileName from "./sanitizeFileName";
-import Parse from "parse";
-import DropboxChooser from "../components/fields/DropboxChoose";
-import Alert from "./Alert";
-import SelectFolder from "../components/fields/SelectFolder";
-// import SignersInput from "../components/fields/SignersInput";
-import Title from "../components/Title";
-import { useNavigate } from "react-router-dom";
-import { templateCls } from "../constant/const";
-
-const TemplateForm = () => {
-  const navigate = useNavigate();
-  const [signers, setSigners] = useState([]);
-  const [folder, setFolder] = useState({ ObjectId: "", Name: "" });
-  const [formData, setFormData] = useState({
-    Name: "",
-    Description: "",
-    Note: "Please review and sign this document"
-  });
-  const [fileupload, setFileUpload] = useState([]);
-  const [fileload, setfileload] = useState(false);
-  const [percentage, setpercentage] = useState(0);
-  const [isAlert, setIsAlert] = useState(false);
-  const [isSubmit, setIsSubmit] = useState(false);
-  const [isErr, setIsErr] = useState("");
-  const handleStrInput = (e) => {
-    setFormData({ ...formData, [e.target.name]: e.target.value });
-  };
-
-  const handleFileInput = (e) => {
-    setpercentage(0);
-    try {
-      let files = e.target.files;
-      if (typeof files[0] !== "undefined") {
-        const mb = Math.round(files[0].bytes / Math.pow(1024, 2));
-        if (mb > 10) {
-          alert(
-            `The selected file size is too large. Please select a file less than ${Math.round(
-              10
-            )} 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 = process.env.REACT_APP_SERVERURL;
-    Parse.initialize(process.env.REACT_APP_APPID);
-    setfileload(true);
-    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);
-            setpercentage(percentCompleted);
-          }
-        }
-      });
-
-      // The response object will contain information about the uploaded file
-      // You can access the URL of the uploaded file using response.url()
-      setFileUpload(response.url());
-      setfileload(false);
-      if (response.url()) {
-        return response.url();
-      }
-    } catch (error) {
-      setfileload(false);
-      setpercentage(0);
-      console.error("Error uploading file:", error);
-    }
-  };
-
-  const dropboxSuccess = async (files) => {
-    setfileload(true);
-    const file = files[0];
-    const url = file.link;
-    const mb = Math.round(file.bytes / Math.pow(1024, 2));
-
-    if (mb > 10) {
-      setTimeout(() => {
-        alert(
-          `The selected file size is too large. Please select a file less than 10 MB`
-        );
-      }, 500);
-      return;
-    } else {
-      const name = sanitizeFileName(file.name);
-
-      const parseFile = new Parse.File(name, { uri: url });
-
-      try {
-        const response = await parseFile.save({
-          progress: (progressValue, loaded, total, { type }) => {
-            if (type === "upload" && progressValue !== null) {
-              const percentCompleted = Math.round((loaded * 100) / total);
-              setpercentage(percentCompleted);
-            }
-          }
-        });
-        setFileUpload(response.url());
-        setfileload(false);
-
-        if (response.url()) {
-          return response.url();
-        }
-      } catch (error) {
-        setfileload(false);
-        setpercentage(0);
-        console.error("Error uploading file:", error);
-      }
-    }
-  };
-  const dropboxCancel = async () => {};
-  const handleSubmit = async (e) => {
-    e.preventDefault();
-    setIsSubmit(true);
-    try {
-      const currentUser = Parse.User.current();
-      const template = new Parse.Object(templateCls);
-      Object.entries(formData).forEach((item) =>
-        template.set(item[0], item[1])
-      );
-      template.set("URL", fileupload);
-      template.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
-      if (folder && folder.ObjectId) {
-        template.set("Folder", {
-          __type: "Pointer",
-          className: templateCls,
-          objectId: folder.ObjectId
-        });
-      }
-      if (signers && signers.length > 0) {
-        template.set("Signers", signers);
-      }
-      const ExtCls = JSON.parse(localStorage.getItem("Extand_Class"));
-      template.set("ExtUserPtr", {
-        __type: "Pointer",
-        className: "contracts_Users",
-        objectId: ExtCls[0].objectId
-      });
-
-      const res = await template.save();
-      if (res) {
-        setSigners([]);
-        setFolder({ ObjectId: "", Name: "" });
-        setFormData({
-          Name: "",
-          Description: "",
-          Note: ""
-        });
-        setFileUpload([]);
-        setpercentage(0);
-        navigate(
-          "/asmf/remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/template/" +
-            res.id
-        );
-      }
-    } catch (err) {
-      console.log("err ", err);
-      setIsErr(true);
-    } finally {
-      setIsAlert(true);
-      setTimeout(() => {
-        setIsAlert(false);
-      }, 1000);
-      setIsSubmit(false);
-    }
-  };
-
-  const handleFolder = (data) => {
-    setFolder(data);
-  };
-  // const handleSigners = (data) => {
-  //   if (data && data.length > 0) {
-  //     const updateSigners = data.map((x) => ({
-  //       __type: "Pointer",
-  //       className: "contracts_Contactbook",
-  //       objectId: x
-  //     }));
-  //     setSigners(updateSigners);
-  //   }
-  // };
-
-  const handleReset = () => {
-    setSigners([]);
-    setFolder({ ObjectId: "", Name: "" });
-    setFormData({
-      Name: "",
-      Description: "",
-      Note: ""
-    });
-    setFileUpload([]);
-    setpercentage(0);
-  };
-  return (
-    <div className="shadow-md rounded my-2 p-3 bg-[#ffffff] md:border-[1px] md:border-gray-600/50">
-      <Title title="New Template" />
-      {isAlert && (
-        <Alert type={isErr ? "danger" : "success"}>
-          {isErr
-            ? "Something went wrong please try again!"
-            : "Template created successfully!"}
-        </Alert>
-      )}
-      <form onSubmit={handleSubmit}>
-        <h1 className="text-[20px] font-semibold mb-4">New Template</h1>
-        {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>
-        )}
-        <div className="text-xs">
-          <label className="block">
-            File<span className="text-red-500 text-[13px]">*</span>
-          </label>
-          {fileupload.length > 0 ? (
-            <div className="flex gap-2 justify-center items-center">
-              <div className="flex justify-between items-center px-2 py-2 w-full font-bold rounded border-[1px] border-[#ccc] text-gray-500 bg-white text-[13px]">
-                <div className="break-all">
-                  file selected : {fileupload?.split("/")[3]?.split("_")[1]}
-                </div>
-                <div
-                  onClick={() => {
-                    setFileUpload([]);
-                  }}
-                  className="cursor-pointer px-[10px] text-[20px] font-bold bg-white text-red-500"
-                >
-                  <i className="fa-solid fa-xmark"></i>
-                </div>
-              </div>
-              {process.env.REACT_APP_DROPBOX_API_KEY && (
-                <DropboxChooser
-                  onSuccess={dropboxSuccess}
-                  onCancel={dropboxCancel}
-                />
-              )}
-            </div>
-          ) : (
-            <div className="flex gap-2 justify-center items-center">
-              <input
-                type="file"
-                className="bg-white px-2 py-1.5 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-                onChange={(e) => handleFileInput(e)}
-                accept="application/pdf,application/vnd.ms-excel"
-                required
-              />
-              {process.env.REACT_APP_DROPBOX_API_KEY && (
-                <DropboxChooser
-                  onSuccess={dropboxSuccess}
-                  onCancel={dropboxCancel}
-                />
-              )}
-            </div>
-          )}
-        </div>
-        <div className="text-xs mt-2">
-          <label className="block">
-            Title<span className="text-red-500 text-[13px]">*</span>
-          </label>
-          <input
-            name="Name"
-            className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-            value={formData.Name}
-            onChange={(e) => handleStrInput(e)}
-            required
-          />
-        </div>
-        <div className="text-xs mt-2">
-          <label className="block">
-            Note<span className="text-red-500 text-[13px]">*</span>
-          </label>
-          <input
-            name="Note"
-            className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-            value={formData.Note}
-            onChange={(e) => handleStrInput(e)}
-            required
-          />
-        </div>
-        <div className="text-xs mt-2">
-          <label className="block">Description</label>
-          <input
-            name="Description"
-            className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-            value={formData.Description}
-            onChange={(e) => handleStrInput(e)}
-          />
-        </div>
-        {/* <SignersInput onChange={handleSigners} /> */}
-        <SelectFolder onSuccess={handleFolder} folderCls={templateCls} />
-        <div className="flex items-center mt-3 gap-2 text-white">
-          <button
-            className={`${
-              isSubmit && "cursor-progress"
-            } bg-[#1ab6ce] rounded-sm shadow-md text-[14px] font-semibold uppercase text-white py-1.5 px-2.5 focus:outline-none`}
-            type="submit"
-            disabled={isSubmit}
-          >
-            Submit
-          </button>
-          <div
-            className="bg-[#188ae2] rounded-sm shadow-md text-[14px] font-semibold uppercase text-white py-1.5 px-2.5 text-center ml-[2px] focus:outline-none"
-            onClick={() => handleReset()}
-          >
-            Reset
-          </div>
-        </div>
-      </form>
-    </div>
-  );
-};
-
-export default TemplateForm;
@@ -1,34 +0,0 @@
-import React, { useEffect } from "react";
-import Parse from "parse";
-
-const ValidateRoute = ({ children }) => {
-  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>{children}</div>;
-};
-
-export default ValidateRoute;
@@ -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,11 +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) {
@@ -138,7 +142,7 @@ export const login = (username, password) => async (dispatch) => {
                }
              );
            } catch (error) {
-              console.log("err ", error);
+              console.log("err ", error)
            }
          }
        });
@@ -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 });
-    }
-    // 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}
@@ -25,7 +25,6 @@ import TreeWidget from "../components/TreeWidget";
 import parse from "html-react-parser";
 import Title from "../components/Title";
 import { formJson } from "../json/FormJson";
-import TemplateForm from "../primitives/TemplateForm";
 const widget = {
  TimeWidget: TimeWidget
 };
@@ -42,19 +41,15 @@ const fields = () => {
 function FormBuilderFn(props) {
  const { id } = useParams();
  const navigate = useNavigate();
-  if (id === "template") {
-    return <TemplateForm />;
-  } else {
-    return (
-      <FormBuilder
-        removeState={props.removeState}
-        removeLevel2State={props.removeLevel2State}
-        removeLevel3State={props.removeLevel3State}
-        id={id}
-        navigate={navigate}
-      />
-    );
-  }
+  return (
+    <FormBuilder
+      removeState={props.removeState}
+      removeLevel2State={props.removeLevel2State}
+      removeLevel3State={props.removeLevel3State}
+      id={id}
+      navigate={navigate}
+    />
+  );
 }
 class FormBuilder extends Component {
  state = {
@@ -10,11 +10,9 @@ import GoogleSignInBtn from "../components/LoginGoogle";
 // import LoginFacebook from "../components/LoginFacebook";
 import { NavLink, useNavigate } from "react-router-dom";
 import login_img from "../assets/images/login_img.svg";
-import { useWindowSize } from "../hook/useWindowSize";

 function Login(props) {
  const navigate = useNavigate();
-  const { width } = useWindowSize();
  const [state, setState] = useState({
    email: "",
    toastColor: "#5cb85c",
@@ -23,6 +21,7 @@ function Login(props) {
    passwordVisible: false,
    mobile: "",
    phone: "",
+    hideNav: "",
    scanResult: "",
    baseUrl: localStorage.getItem("baseUrl"),
    parseAppId: localStorage.getItem("parseAppId"),
@@ -48,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();
@@ -115,7 +129,7 @@ function Login(props) {
                          );
                          if (rolesfiltered.length > 0) {
                            _currentRole = rolesfiltered[0];
-                          }
+                          } 
                        } else {
                          const rolesfiltered = userRoles.filter(
                            (x) => !valuesToExclude.includes(x)
@@ -148,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);
@@ -264,14 +280,10 @@ function Login(props) {
                                              `/${element.pageType}/${element.pageId}`
                                            );
                                          } else {
-                                            navigate(`/subscription`, {
-                                              replace: true
-                                            });
+                                            navigate(`/subscription`);
                                          }
                                        } else {
-                                          navigate(`/subscription`, {
-                                            replace: true
-                                          });
+                                          navigate(`/subscription`);
                                        }
                                      } else {
                                        navigate(
@@ -308,9 +320,7 @@ function Login(props) {
                                      );
                                      const billingDate = "";
                                      if (billingDate) {
-                                        navigate(`/subscription`, {
-                                          replace: true
-                                        });
+                                        navigate(`/subscription`);
                                      }
                                    } else {
                                      navigate(
@@ -324,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
@@ -445,7 +472,7 @@ function Login(props) {
                  );
                  if (rolesfiltered.length > 0) {
                    _currentRole = rolesfiltered[0];
-                  }
+                  } 
                } else {
                  const rolesfiltered = userRoles.filter(
                    (x) => !valuesToExclude.includes(x)
@@ -475,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);
@@ -566,26 +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(
-                                      `/${element.pageType}/${element.pageId}`
-                                    );
-                                  } 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(
-                                  `/${element.pageType}/${element.pageId}`
-                                );
+                                navigate(`/subscription`);
                              }
                            }
+                          }
                          } else {
                            localStorage.setItem("PageLanding", element.pageId);
                            localStorage.setItem(
@@ -596,25 +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");
-                                  navigate(
-                                    `/${element.pageType}/${element.pageId}`
-                                  );
-                                } 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(
-                                `/${element.pageType}/${element.pageId}`
-                              );
+                              navigate(`/subscription`);
                            }
                          }
-                        },
+                        }
+                      },
                        (error) => {
                          const payload = {
                            sessionToken: sessionToken
@@ -635,6 +655,7 @@ function Login(props) {
              } else {
                setThirdpartyLoader(false);
                setState({ ...state, loading: false });
+               
              }
            })
            .catch((err) => {
@@ -696,10 +717,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 (
@@ -747,13 +767,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);
@@ -1044,7 +1066,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>
@@ -1112,7 +1134,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
@@ -1149,9 +1171,7 @@ function Login(props) {
              <div className="modal-dialog" role="document">
                <div className="modal-content">
                  <div className="modal-header">
-                    <h5 className="modal-title font-semibold">
-                      Additional Info
-                    </h5>
+                    <h5 className="modal-title">Login form</h5>
                    <span>
                      <span></span>
                    </span>
@@ -1183,17 +1203,17 @@ function Login(props) {
                      </div>
                      <div className="form-group">
                        <label
-                          htmlFor="JobTitle"
+                          htmlFor="Destination"
                          style={{ display: "flex" }}
                          className="col-form-label"
                        >
-                          Job Title
+                          Destination{" "}
                          <span style={{ fontSize: 13, color: "red" }}>*</span>
                        </label>
                        <input
                          type="text"
                          className="form-control"
-                          id="JobTitle"
+                          id="Destination"
                          value={userDetails.Destination}
                          onChange={(e) =>
                            setUserDetails({
@@ -1207,19 +1227,18 @@ function Login(props) {
                      <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 }}
+                          className="bg-[#6c757d] text-sm p-2 text-white rounded uppercase"
+                          onClick={handleCloseModal}
+                          style={{ marginRight: 10, width: 90 }}
                        >
-                          Login
+                          Cancel
                        </button>
                        <button
                          type="button"
-                          className="bg-[#6c757d] text-sm p-2 text-white rounded uppercase"
-                          onClick={handleCloseModal}
-                          style={{ width: 90 }}
+                          className="bg-[#17a2b8] text-sm p-2 text-white rounded uppercase"
+                          onClick={(e) => handleSubmitbtn(e)}
                        >
-                          Cancel
+                          Login
                        </button>
                      </div>
                    </form>
@@ -21,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(() => {
@@ -70,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)
@@ -107,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) => {
@@ -156,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,
@@ -199,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;
@@ -293,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",
@@ -300,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 =
@@ -420,7 +415,7 @@ const PgSignUp = (props) => {
              }
            })
            .catch((err) => {
-              console.log("err", err);
+              console.log('err', err)
              setIsLoader(false);
            });
        }
@@ -453,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"
@@ -469,7 +464,7 @@ const PgSignUp = (props) => {
            />

            <label htmlFor="confirmPassword">
-              <b className="text-[13px]">Confirm Password</b>
+              <b>Confirm Password</b>
            </label>
            <input
              type="password"
@@ -499,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,12 +28,7 @@ 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 = "?" + name + email + company + phone;
  useEffect(() => {
    if (localStorage.getItem("accesstoken")) {
      setIsLoader(false);
@@ -46,7 +41,7 @@ const PlanSubscriptions = () => {

  return (
    <>
-      <Title title={"Subscriptions"} />
+    <Title title={"Subscriptions"} />
      {isLoader ? (
        <div
          style={{
@@ -136,18 +131,15 @@ const PlanSubscriptions = () => {
                          <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">
@@ -12,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(() => {
@@ -49,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(
@@ -91,7 +92,7 @@ const Report = () => {
              }
            }
          }
-          if (arr.length === docPerPage) {
+          if (arr.length === 10) {
            setIsMoreDocs(true);
          } else {
            setIsMoreDocs(false);
@@ -100,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);
@@ -150,13 +152,9 @@ const Report = () => {
            <ReportTable
              ReportName={reportName}
              List={List}
-              setList={setList}
              actions={actions}
-              heading={heading}
              setIsNextRecord={setIsNextRecord}
              isMoreDocs={isMoreDocs}
-              docPerPage={docPerPage}
-              form={form}
            />
          ) : (
            <div className="flex items-center justify-center h-screen w-full bg-white rounded">
@@ -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("Email has been sent to your 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>
      )}
@@ -2211,5 +2211,7 @@
      background-position: -2em 0;
    }
  }
-
-  
+  .box:nth-of-type(n + 43) {
+    display: none;
+  }
+  
@@ -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;
-    }
-}
@@ -13,12 +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 TemplateAfterSave from './parsefunction/TemplateAfterSave.js';
-import GetTemplate from './parsefunction/GetTemplate.js';

 Parse.Cloud.define('AddUserToRole', addUserToGroups);
 Parse.Cloud.define('UserGroups', getUserGroups);
@@ -28,16 +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("getTemplate", GetTemplate)
-Parse.Cloud.afterSave('contracts_Document', DocumentAftersave);
-Parse.Cloud.afterSave('contracts_Contactbook', ContactbookAftersave);
-Parse.Cloud.afterSave('contracts_Users', ContractUsersAftersave);
-Parse.Cloud.afterSave("contracts_Template", TemplateAfterSave)
@@ -16,7 +16,6 @@ async function ContactbookAftersave(request) {
      acl.setWriteAccess(object.get('UserId'), true);

      object.setACL(acl);
-      object.set('IsDeleted', false)
      // Continue saving the object
      return object.save(null, { useMasterKey: true });
    }
@@ -1,53 +0,0 @@
-import axios from 'axios';
-
-export default async function GetTemplate(request) {
-  const serverUrl = process.env.SERVER_URL;
-  const templateId = request.params.templateId;
-
-  try {
-    const userRes = await axios.get(serverUrl + '/users/me', {
-      headers: {
-        'X-Parse-Application-Id': process.env.APP_ID,
-        'X-Parse-Session-Token': request.headers['sessiontoken'],
-      },
-    });
-    const userId = userRes.data && userRes.data.objectId;
-    // console.log("templateId ", templateId)
-    // console.log("userId ",userId)
-    if (templateId && userId) {
-      try {
-        const template = new Parse.Query('contracts_Template');
-        template.equalTo('objectId', templateId);
-        template.include('ExtUserPtr');
-        template.include('Signers');
-        template.include('CreateBy');
-        const res = await template.first({ useMasterKey: true });
-        // console.log("res ", res)
-        if (res) {
-          // console.log("res ",res)
-          const acl = res.getACL();
-          console.log("acl", acl.getReadAccess(userId))
-          if (acl && acl.getReadAccess(userId)) {
-            return res;
-          } else {
-            return { error: "You don't have access of this document!" };
-          }
-        } else {
-          return { error: "You don't have access of this document!" };
-        }
-      } catch (err) {
-        console.log('err', err);
-        return err;
-      }
-    } else {
-      return { error: 'Please pass required parameters!' };
-    }
-  } catch (err) {
-    console.log('err', err);
-    if (err.code == 209) {
-      return { error: 'Invalid session token' };
-    } else {
-      return { error: "You don't have access of this document!" };
-    }
-  }
-}
@@ -5,7 +5,7 @@ async function SendMailv1(request) {
    const recipient = request.params.email;
    const otp = request.params.otp;
    const res = await Parse.Cloud.sendEmail({
-      from: 'Test user' + ' <' + process.env.SMTP_ENABLE ? process.env.SMTP_USER_EMAIL : process.env.MAILGUN_SENDER + '>',
+      from: 'Test user' + ' <' + process.env.MAILGUN_SENDER + '>',
      recipient: recipient,
      subject: 'Your OpenSign™ OTP',
      text: 'This email is a test.',
@@ -1,83 +0,0 @@
-export default async function TemplateAfterSave(request) {
-  try {
-    if (!request.original) {
-      console.log('new entry is insert in contracts_Template');
-      // update acl of New Document If There are signers present in array
-      const signers = request.object.get('Signers');
-
-      if (signers && signers.length > 0) {
-        await updateAclDoc(request.object.id);
-      } else {
-        await updateSelfDoc(request.object.id);
-      }
-    } else {
-      if (request.user) {
-        const signers = request.object.get('Signers');
-        if (signers && signers.length > 0) {
-          await updateAclDoc(request.object.id);
-        } else {
-          await updateSelfDoc(request.object.id);
-        }
-      }
-    }
-  } catch (err) {
-    console.log('err in aftersave of contracts_Template');
-    console.log(err);
-  }
-
-  async function updateAclDoc(objId) {
-    // console.log("In side updateAclDoc func")
-    // console.log(objId)
-    const Query = new Parse.Query('contracts_Template');
-    Query.include('Signers');
-    const updateACL = await Query.get(objId, { useMasterKey: true });
-    const res = JSON.parse(JSON.stringify(updateACL));
-    // console.log("res");
-    // console.log(JSON.stringify(res));
-    const UsersPtr = res.Signers.map(item => item.UserId);
-
-    if (res.Signers[0].ExtUserPtr) {
-      const ExtUserSigners = res.Signers.map(item => {
-        return {
-          __type: 'Pointer',
-          className: 'contracts_Users',
-          objectId: item.ExtUserPtr.objectId,
-        };
-      });
-      updateACL.set('Signers', ExtUserSigners);
-    }
-
-    // console.log("UsersPtr")
-    // console.log(JSON.stringify(UsersPtr))
-    const newACL = new Parse.ACL();
-    newACL.setPublicReadAccess(false);
-    newACL.setPublicWriteAccess(false);
-    newACL.setReadAccess(request.user, true);
-    newACL.setWriteAccess(request.user, true);
-
-    UsersPtr.forEach(x => {
-      newACL.setReadAccess(x.objectId, true);
-      newACL.setWriteAccess(x.objectId, true);
-    });
-
-    updateACL.setACL(newACL);
-    updateACL.save(null, { useMasterKey: true });
-  }
-
-  async function updateSelfDoc(objId) {
-    // console.log("Inside updateSelfDoc func")
-    
-    const Query = new Parse.Query('contracts_Template');
-    const updateACL = await Query.get(objId, { useMasterKey: true });
-    // const res = JSON.parse(JSON.stringify(updateACL));
-    // console.log("res");
-    // console.log(JSON.stringify(res));
-    const newACL = new Parse.ACL();
-    newACL.setPublicReadAccess(false);
-    newACL.setPublicWriteAccess(false);
-    newACL.setReadAccess(request.user, true);
-    newACL.setWriteAccess(request.user, true);
-    updateACL.setACL(newACL);
-    updateACL.save(null, { useMasterKey: true });
-  }
-}
@@ -46,20 +46,15 @@ export default async function ZohoDetails(request) {
      (userData.data.data.subscription.customer &&
        userData.data.data.subscription.customer.company_name) ||
      '';
-    const jobTitle =
-      (userData.data.data.subscription.customer &&
-        userData.data.data.subscription.customer.cd_job_title) ||
-      '';
    const resData = {
      phone: userData.data.data.subscription.contactpersons[0].mobile,
      name: first_name + ' ' + last_name,
      email: userData.data.data.subscription.contactpersons[0].email,
-      nextBillingDate: userData.data.data.subscription.next_billing_at,
+      nextBillingDate: userData.data.expiring_time,
      company: company_name,
      plan: userData.data.data.subscription.plan,
      customer_id: userData.data.data.subscription.customer_id,
      subscription_id: userData.data.data.subscription.subscription_id,
-      jobTitle: jobTitle,
    };
    return resData;
  }
@@ -1,51 +0,0 @@
-import axios from 'axios';
-
-export default async function getDocument(request) {
-  const serverUrl = process.env.SERVER_URL;
-  const docId = request.params.docId;
-
-  try {
-    const userRes = await axios.get(serverUrl + '/users/me', {
-      headers: {
-        'X-Parse-Application-Id': process.env.APP_ID,
-        'X-Parse-Session-Token': request.headers['sessiontoken'],
-      },
-    });
-    const userId = userRes.data && userRes.data.objectId;
-    if (docId && userId) {
-      try {
-        const query = new Parse.Query('contracts_Document');
-        query.equalTo('objectId', docId);
-        query.include('ExtUserPtr');
-        query.include('CreatedBy');
-        query.include('Signers');
-        query.include('AuditTrail.UserPtr');
-        query.include('Placeholders');
-        query.notEqualTo('IsArchive', true)
-        const res = await query.first({ useMasterKey: true });
-        if (res) {
-          const acl = res.getACL();
-          if (acl && acl.getReadAccess(userId)) {
-            return res;
-          } else {
-            return { error: "You don't have access of this document!" };
-          }
-        } else {
-          return { error: "You don't have access of this document!" };
-        }
-      } catch (err) {
-        console.log('err', err);
-        return err;
-      }
-    } else {
-      return { error: 'Please pass required parameters!' };
-    }
-  } catch (err) {
-    console.log('err', err);
-    if (err.code == 209) {
-      return { error: 'Invalid session token' };
-    } else {
-      return { error: "You don't have access of this document!" };
-    }
-  }
-}
@@ -1,51 +0,0 @@
-import axios from 'axios';
-export default async function getDrive(request) {
-  const serverUrl = process.env.SERVER_URL;
-  const appId = process.env.APP_ID;
-
-  const classUrl = serverUrl + '/classes/contracts_Document';
-  const docId = request.params.docId;
-  try {
-    const userRes = await axios.get(serverUrl + '/users/me', {
-      headers: {
-        'X-Parse-Application-Id': appId,
-        'X-Parse-Session-Token': request.headers['sessiontoken'],
-      },
-    });
-    const userId = userRes.data && userRes.data.objectId;
-    if (userId) {
-      let url;
-      if (docId) {
-        url = `${classUrl}?where={"Folder":{"__type":"Pointer","className":"contracts_Document","objectId":"${docId}"},"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"},"IsArchive":{"$ne":true}}&include=ExtUserPtr,Signers,Folder`;
-      } else {
-        url = `${classUrl}?where={"Folder":{"$exists":false},"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"},"IsArchive":{"$ne":true}}&include=ExtUserPtr,Signers`;
-      }
-      try {
-        const res = await axios.get(url, {
-          headers: {
-            'X-Parse-Application-Id': appId,
-            'X-Parse-Master-key': process.env.MASTER_KEY,
-          },
-        });
-        // console.log('res.data.results ', res.data.results);
-        if (res.data && res.data.results) {
-          return res.data.results;
-        } else {
-          return [];
-        }
-      } catch (err) {
-        console.log('err', err);
-        return { error: "You don't have access to drive" };
-      }
-    } else {
-      return { error: 'Please provide required parameter!' };
-    }
-  } catch (err) {
-    console.log('err', err);
-    if (err.code == 209) {
-      return { error: 'Invalid session token' };
-    } else {
-      return { error: "You don't have access!" };
-    }
-  }
-}
@@ -1,52 +0,0 @@
-import reportJson from './reportsJson.js';
-import axios from 'axios';
-
-export default async function getReport(request) {
-  const reportId = request.params.reportId;
-  const limit = request.params.limit;
-  const skip = request.params.skip;
-
-  const serverUrl = process.env.SERVER_URL;
-  const appId = process.env.APP_ID;
-
-  try {
-    const userRes = await axios.get(serverUrl + '/users/me', {
-      headers: {
-        'X-Parse-Application-Id': appId,
-        'X-Parse-Session-Token': request.headers['sessiontoken'],
-      },
-    });
-    const userId = userRes.data && userRes.data.objectId;
-    if (userId) {
-      const json = reportId && reportJson(reportId, userId);
-      const clsName = json?.reportClass ? json.reportClass : 'contracts_Document';
-      if (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}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr`;
-        const res = await axios.get(url, { headers: headers });
-        if (res.data && res.data.results) {
-          return res.data.results;
-        } else {
-          return [];
-        }
-      } else {
-        return { error: 'Report is not available!' };
-      }
-    }
-  } catch (err) {
-    console.log('err', err);
-    if (err.code == 209) {
-      return { error: 'Invalid session token' };
-    } else {
-      return { error: "You don't have access!" };
-    }
-  }
-}
@@ -1,14 +0,0 @@
-async function getUserDetails(request) {
-  try {
-    const userQuery = new Parse.Query('contracts_Users');
-    userQuery.equalTo('Email', request.params.email);
-    userQuery.include('TenantId');
-    userQuery.include('UserId')
-    const res = await userQuery.first({ useMasterKey: true });
-    return res;
-  } catch (err) {
-    console.log('Err ', err);
-    return err;
-  }
-}
-export default getUserDetails;
@@ -2,7 +2,7 @@ import SignPDF from './SignPDF.min.cjs';
 import fs from 'node:fs';
 import axios from 'axios';
 import FormData from 'form-data';
-// import plainplaceholder from './customSignPdf/plainplaceholder.min.js';
+import plainplaceholder from './customSignPdf/plainplaceholder.min.js';
 import { plainAddPlaceholder } from 'node-signpdf/dist/helpers/index.js';
 const serverUrl = process.env.SERVER_URL,
  APPID = process.env.APP_ID,
@@ -19,20 +19,20 @@ async function uploadFile(a) {
    console.log('err ', e), fs.unlinkSync(a);
  }
 }
-async function updateDoc(t, s, r, i, n, o) {
+async function updateDoc(t, s, r, i, o, n) {
  try {
    var d = {
-      UserPtr: { __type: 'Pointer', className: o, objectId: r },
+      UserPtr: { __type: 'Pointer', className: n, objectId: r },
      SignedUrl: s,
      Activity: 'Signed',
      ipAddress: i,
    };
    let e;
-    var l = (e = n.AuditTrail && 0 < n.AuditTrail.length ? [...n.AuditTrail, d] : [d]).filter(
+    var l = (e = o.AuditTrail && 0 < o.AuditTrail.length ? [...o.AuditTrail, d] : [d]).filter(
      e => 'Signed' === e.Activity
    );
    let a = !1;
-    !((n.Signers && 0 < n.Signers.length && l.length !== n.Signers.length) || !(a = !0));
+    !((o.Signers && 0 < o.Signers.length && l.length !== o.Signers.length) || !(a = !0));
    var p = { SignedUrl: s, AuditTrail: e, IsCompleted: a };
    await axios.put(serverUrl + '/classes/contracts_Document/' + t, p, {
      headers: {
@@ -61,7 +61,7 @@ async function sendMail(e) {
        s +
        ' Standard is attached to this email. Kindly download the document from the attachment.</p></div> </div><div><p>This is an automated email from Open Sign. For any queries regarding this email, please contact the sender ' +
        t.Mail +
-        ' directly. If you think this email is inappropriate or spam, you may file a complaint with Open Sign <a href=www.opensignlabs.com target=_blank>here</a>.</p></div></div></body></html>'
+        ' directly. If you think this email is inappropriate or spam, you may file a complaint with Open Sign here.</p></div></div></body></html>',
    };
  await axios.post(serverUrl + '/functions/sendmailv3', a, {
    headers: {
@@ -79,14 +79,14 @@ async function sendCompletedMail(e) {
      url: a,
      from: 'OpenSign™',
      recipient: e.receiver,
-      subject: `Document ${s} has been signed by all parties`,
+      subject: `Document ${s} has beeen signed by all parties`,
      pdfName: s,
      html:
        "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>  <div style='background-color:#f5f5f5;padding:20px'>    <div style='box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background-color:white;'> <div><img src=https://qikinnovation.ams3.digitaloceanspaces.com/logo.png  height='50' style='padding:20px'/> </div><div style='padding:2px;font-family:system-ui; background-color: #47a3ad;'>    <p style='font-size:20px;font-weight:400;color:white;padding-left:20px',> Document sign successfully</p></div><div><p style='padding:20px;font-family:system-ui;font-size:14px'>All parties have successfully signed the document" +
        s +
        '. Kindly download the document from the attachment.</p></div> </div><div><p>This is an automated email from Open Sign. For any queries regarding this email, please contact the sender ' +
        t.Mail +
-        ' directly. If you think this email is inappropriate or spam, you may file a complaint with Open Sign <a href=www.opensignlabs.com target=_blank>here</a>.</p></div></div></body></html>',
+        ' directly. If you think this email is inappropriate or spam, you may file a complaint with Open Sign here.</p></div></div></body></html>',
    };
  await axios.post(serverUrl + '/functions/sendmailv3', a, {
    headers: {
@@ -96,135 +96,115 @@ async function sendCompletedMail(e) {
    },
  });
 }
-async function PDF(i, n) {
+async function PDF(s, r) {
  try {
-    i.params.sign;
-    var e = i.params.docId,
-      a = i.params.userId,
-      o = await axios.get(
-        serverUrl + '/classes/contracts_Document/' + e + '?include=ExtUserPtr,Signers',
-        {
-          headers: {
-            'Content-Type': 'application/json',
-            'X-Parse-Application-Id': APPID,
-            'X-Parse-Master-Key': masterKEY,
-          },
-        }
-      ),
-      t = await axios.get(serverUrl + '/users/me', {
+    var i = s.params.sign,
+      e = s.params.docId,
+      o = s.params.userId,
+      n = await axios.get(serverUrl + '/classes/contracts_Document/' + e + '?include=ExtUserPtr', {
+        headers: {
+          'Content-Type': 'application/json',
+          'X-Parse-Application-Id': APPID,
+          'X-Parse-Session-Token': s.headers.sessiontoken,
+        },
+      }),
+      d = await axios.get(serverUrl + '/users/me', {
        headers: {
          'X-Parse-Application-Id': APPID,
-          'X-Parse-Session-Token': i.headers.sessiontoken,
+          'X-Parse-Session-Token': s.headers.sessiontoken,
        },
      });
-    if (!t.data || !t.data.objectId) return { status: 'error', message: 'this user not allowed!' };
+    if (!d.data || !d.data.objectId) return { status: 'error', message: 'this user not allowed!' };
    {
-      var d,
-        l,
+      var l,
        p,
-        c = JSON.stringify({ objectId: a });
-      let s, r;
-      r = a
-        ? (d = await axios.get(serverUrl + '/classes/contracts_Contactbook?where=' + c, {
+        c,
+        m = JSON.stringify({ objectId: o });
+      let a, t;
+      t = o
+        ? (l = await axios.get(serverUrl + '/classes/contracts_Contactbook?where=' + m, {
            headers: {
              'X-Parse-Application-Id': APPID,
-              'X-Parse-Session-Token': i.headers.sessiontoken,
+              'X-Parse-Session-Token': s.headers.sessiontoken,
            },
-          })).data && 0 < d.data.results.length
-          ? ((s = d), 'contracts_Contactbook')
-          : ((s = await axios.get(serverUrl + '/classes/contracts_Users?where=' + c, {
-              headers: { 'X-Parse-Application-Id': APPID, 'X-Parse-Master-Key': masterKEY },
+          })).data && 0 < l.data.results.length
+          ? ((a = l), 'contracts_Contactbook')
+          : ((a = await axios.get(serverUrl + '/classes/contracts_Users?where=' + m, {
+              headers: {
+                'X-Parse-Application-Id': APPID,
+                'X-Parse-Session-Token': s.headers.sessiontoken,
+              },
            })),
            'contracts_Users')
-        : ((l = JSON.stringify({
-            UserId: { __type: 'Pointer', className: '_User', objectId: t.data.objectId },
+        : ((p = JSON.stringify({
+            UserId: { __type: 'Pointer', className: '_User', objectId: d.data.objectId },
          })),
-          (p = await axios.get(serverUrl + '/classes/contracts_Users?where=' + l, {
-            headers: { 'X-Parse-Application-Id': APPID, 'X-Parse-Master-Key': masterKEY },
-          })).data && 0 < p.data.results.length
-            ? ((s = p), 'contracts_Users')
-            : ((s = await axios.get(serverUrl + '/classes/contracts_Contactbook?where=' + l, {
+          (c = await axios.get(serverUrl + '/classes/contracts_Users?where=' + p, {
+            headers: {
+              'X-Parse-Application-Id': APPID,
+              'X-Parse-Session-Token': s.headers.sessiontoken,
+            },
+          })).data && 0 < c.data.results.length
+            ? ((a = c), 'contracts_Users')
+            : ((a = await axios.get(serverUrl + '/classes/contracts_Contactbook?where=' + p, {
                headers: {
                  'X-Parse-Application-Id': APPID,
-                  'X-Parse-Session-Token': i.headers.sessiontoken,
+                  'X-Parse-Session-Token': s.headers.sessiontoken,
                },
              })),
              'contracts_Contactbook'));
-      var m = s.data.results[0].Name,
-        g = s.data.results[0].Email;
-      if (!i.params.pdfFile) return { status: 'error', message: 'pdf file not present!' };
+      var g = a.data.results[0].Name,
+        h = a.data.results[0].Email;
+      if (!s.params.pdfFile) return { status: 'error', message: 'pdf file not present!' };
      {
-        let e = Buffer.from(i.params.pdfFile, 'base64');
+        let e = Buffer.from(s.params.pdfFile, 'base64');
        var u = process.env.PFX_BASE64,
-          h = Buffer.from(u, 'base64'),
-          f = {
-            UserPtr: { __type: 'Pointer', className: r, objectId: s.data.results[0].objectId },
-            SignedUrl: '',
-            Activity: 'Signed',
-            ipAddress: i.headers['x-real-ip'],
-          };
-        let a;
-        var y = (a =
-          o.data.AuditTrail && 0 < o.data.AuditTrail.length
-            ? [...o.data.AuditTrail, f]
-            : [f]).filter(e => 'Signed' === e.Activity);
-        let t = !1;
-        !(
-          (o.data.Signers && 0 < o.data.Signers.length && y.length !== o.data.Signers.length) ||
-          !(t = !0)
-        );
-        var v,
-          P,
-          x = `./exports/exported_file_${Math.floor(5e3 * Math.random())}.pdf`,
-          A =
-            (t
-              ? ((v = o.data.Signers?.map(e => e.Name + ' <' + e.Email + '>')),
-                (e =
-                  v && 0 < v.length
-                    ? plainAddPlaceholder({
-                        pdfBuffer: e,
-                        reason: 'Digitally signed by Open sign for ' + v?.join(', '),
-                        location: 'location',
-                        signatureLength: 1e4,
-                      })
-                    : plainAddPlaceholder({
-                        pdfBuffer: e,
-                        reason: 'Digitally signed by Open sign for ' + m + ' <' + g + '>',
-                        location: 'location',
-                        signatureLength: 1e4,
-                      })),
-                (P = await new SignPDF(e, h).signPDF()),
-                fs.writeFileSync(x, P))
-              : fs.writeFileSync(x, e),
-            await uploadFile(x));
-        if (A && A.imageUrl) {
-          const n = await updateDoc(
-            i.params.docId,
-            A.imageUrl,
-            s.data.results[0].objectId,
-            i.headers['x-real-ip'],
-            o.data,
-            r
+          f = Buffer.from(u, 'base64');
+        e = i
+          ? plainplaceholder({
+              pdfBuffer: e,
+              reason: 'Digitally signed by Open sign for ' + g + ' <' + h + '>',
+              location: 'test location',
+              signatureLength: 1e4,
+              sign: i,
+            })
+          : plainAddPlaceholder({
+              pdfBuffer: e,
+              reason: 'Digitally signed by Open sign for ' + g + ' <' + h + '>',
+              location: 'test location',
+              signatureLength: 1e4,
+            });
+        var y = await new SignPDF(e, f).signPDF(),
+          v = `./exports/exported_file_${Math.floor(5e3 * Math.random())}.pdf`,
+          P = (fs.writeFileSync(v, y), await uploadFile(v));
+        if (P && P.imageUrl) {
+          const r = await updateDoc(
+            s.params.docId,
+            P.imageUrl,
+            a.data.results[0].objectId,
+            s.headers['x-real-ip'],
+            n.data,
+            t
          );
          return (
            sendMail({
-              url: A.imageUrl,
-              sender: { Mail: o.data.ExtUserPtr.Email, Name: o.data.ExtUserPtr.Name },
-              pdfName: o.data.Name,
-              receiver: g,
+              url: P.imageUrl,
+              sender: { Mail: n.data.ExtUserPtr.Email, Name: n.data.ExtUserPtr.Name },
+              pdfName: n.data.Name,
+              receiver: h,
            }),
-            n &&
-              n.isCompleted &&
+            r &&
+              r.isCompleted &&
              sendCompletedMail({
-                url: A.imageUrl,
-                sender: { Mail: o.data.ExtUserPtr.Email, Name: 'Open sign' },
-                pdfName: o.data.Name,
-                receiver: o.data.ExtUserPtr.Email,
+                url: P.imageUrl,
+                sender: { Mail: n.data.ExtUserPtr.Email, Name: 'Open sign' },
+                pdfName: n.data.Name,
+                receiver: n.data.ExtUserPtr.Email,
              }),
-            fs.unlinkSync(x),
-            console.log('New Signed PDF created called: ' + x),
-            'success' === n.message
-              ? { status: 'success', data: A.imageUrl }
+            fs.unlinkSync(v),
+            console.log('New Signed PDF created called: ' + v),
+            'success' === r.message
+              ? { status: 'success', data: P.imageUrl }
              : { status: 'error', message: 'please provide required parameters!' }
          );
        }
@@ -1,28 +1,28 @@
-import{DEFAULT_BYTE_RANGE_PLACEHOLDER,DEFAULT_SIGNATURE_LENGTH,SUBFILTER_ADOBE_PKCS7_DETACHED}from"./const.min.js";import PDFKitReferenceMock from"./PDFKitReferenceMock.min.js";import PNG from"png-js";import zlib from"zlib";const specialCharacters=["á","Á","é","É","í","Í","ó","Ó","ö","Ö","ő","Ő","ú","Ú","ű","Ű"],MARKERS=[65472,65473,65474,65475,65477,65478,65479,65480,65481,65482,65483,65484,65485,65486,65487],COLOR_SPACE_MAP={1:"DeviceGray",3:"DeviceRGB",4:"DeviceCMYK"};function getImage(e,t){let n;if(255===e[0]&&216===e[1])n=getJpgImage(t,e);else{if(137!==e[0]||"PNG"!==e.toString("ascii",1,4))throw new Error("Unknown image format.");n=getPngImage(t,e)}return n}function getAnnotationApparance(e,t,n){return e.ref({CropBox:[0,10,200,60],Type:"XObject",FormType:1,BBox:[0,10,200,60],Resources:`<</XObject <<
+import{DEFAULT_BYTE_RANGE_PLACEHOLDER,DEFAULT_SIGNATURE_LENGTH,SUBFILTER_ADOBE_PKCS7_DETACHED}from"./const.min.js";import PDFKitReferenceMock from"./PDFKitReferenceMock.min.js";import PNG from"png-js";import zlib from"zlib";import fs from"node:fs";const specialCharacters=["á","Á","é","É","í","Í","ó","Ó","ö","Ö","ő","Ő","ú","Ú","ű","Ű"],MARKERS=[65472,65473,65474,65475,65477,65478,65479,65480,65481,65482,65483,65484,65485,65486,65487],COLOR_SPACE_MAP={1:"DeviceGray",3:"DeviceRGB",4:"DeviceCMYK"};function getImage(e,t){let n;if(255===e[0]&&216===e[1])n=getJpgImage(t,e);else{if(137!==e[0]||"PNG"!==e.toString("ascii",1,4))throw new Error("Unknown image format.");n=getPngImage(t,e)}return n}function getAnnotationApparance(e,t,n){return e.ref({CropBox:[0,0,197,70],Type:"XObject",FormType:1,BBox:[0,0,197,70],Resources:`<</XObject <<
 /Img${t.index} ${t.index} 0 R
 >>
 /Font <<
 /f1 ${n.index} 0 R
 >>
->>`,MediaBox:[0,10,200,60],Subtype:"Form"},null,getStream(t.index))}const getStream=e=>getConvertedText(`
-      1.0 1.0 1.0 rg
-      0.0 0.0 0.0 RG
-      q
-      q
-      200 0 0 50 0 10 cm
-      /Img${e} Do
-      Q
-      0 0 0 rg
-      BT
-      0 Tr
-      /f1 10.0 Tf
-      1.4 0 0 1 20 45.97412 Tm
-      ET
-      BT
-      0 Tr
-      /f1 10.0 Tf
-      1.4 0 0 1 20 33.56006 Tm
-      ET
-      Q`),getFont=(e,t)=>e.ref({Type:"Font",BaseFont:t,Encoding:"WinAnsiEncoding",Subtype:"Type1"}),getJpgImage=(e,t)=>{if(65496!==t.readUInt16BE(0))throw"SOI not found in JPEG";let n=2,a;for(;n<t.length&&(a=t.readUInt16BE(n),n+=2,!MARKERS.includes(a));)n+=t.readUInt16BE(n);if(!MARKERS.includes(a))throw"Invalid JPEG.";n+=2;var r=t[n++],o=t.readUInt16BE(n),i=(n+=2,t.readUInt16BE(n)),l=(n+=2,t[n++]),l=COLOR_SPACE_MAP[l],r={Type:"XObject",Subtype:"Image",BitsPerComponent:r,Width:i,Height:o,ColorSpace:l,Filter:"DCTDecode"},i=("DeviceCMYK"===l&&(r.Decode=[1,0,1,0,1,0,1,0]),e.ref(r,null,t));return i},getPngImage=(e,t)=>{var t=new PNG(t),n=t.hasAlphaChannel,a={Type:"XObject",Subtype:"Image",BitsPerComponent:n?8:t.bits,Width:t.width,Height:t.height,Filter:"FlateDecode"};if(n||(r=e.ref({Predictor:15,Colors:t.colors,BitsPerComponent:t.bits,Columns:t.width}),a.DecodeParms=r),0===t.palette.length?a.ColorSpace=t.colorSpace:(r=e.ref({stream:new Buffer(t.palette)}),a.ColorSpace=["Indexed","DeviceRGB",t.palette.length/3-1,r]),null!=t.transparency.grayscale){var r=t.transparency.grayscale;a.Mask=[r,r]}else if(t.transparency.rgb){var o,r=t.transparency["rgb"],i=[];for(o of r)i.push(o,o);a.Mask=i}else t.transparency.indexed?loadIndexedAlphaChannel(t):n&&(splitAlphaChannel(t),r=getSmask(e,t),a.Mask=r);return e.ref(a,null,t.imgData)},loadIndexedAlphaChannel=e=>{const o=e.transparency.indexed;return e.decodePixels(n=>{var a=new Buffer(e.width*e.height);let r=0;for(let e=0,t=n.length;e<t;e++)a[r++]=o[n[e]];e.alphaChannel=zlib.deflateSync(a)})},splitAlphaChannel=d=>{d.decodePixels(t=>{let e,n;var a=d.colors,r=d.width*d.height,o=new Buffer(r*a),i=new Buffer(r);let l=n=e=0;for(var c=t.length,g=16===d.bits?1:0;l<c;){for(let e=0;e<a;e++)o[n++]=t[l++],l+=g;i[e++]=t[l++],l+=g}d.imgData=zlib.deflateSync(o),d.alphaChannel=zlib.deflateSync(i)})},getSmask=(e,t)=>{let n;return console.log("image.hasAlphaChannel ",t.hasAlphaChannel),t.hasAlphaChannel&&(console.log("image.alphaChannel ",t.alphaChannel),n=e.ref({Type:"XObject",Subtype:"Image",Height:t.height,Width:t.width,BitsPerComponent:8,Filter:"FlateDecode",ColorSpace:"DeviceGray",Decode:[0,1],stream:t.alphaChannel})),n},getConvertedText=e=>e.split("").map(e=>specialCharacters.includes(e)?getOctalCodeFromCharacter(e):e).join(""),getOctalCodeFromCharacter=e=>"\\"+e.charCodeAt(0).toString(8),pdfkitAddPlaceholder=({pdf:e,pdfBuffer:a,reason:r,contactInfo:t="emailfromp1289@gmail.com",name:n="Name from p12",location:o="Location from p12",signatureLength:i=DEFAULT_SIGNATURE_LENGTH,byteRangePlaceholder:l=DEFAULT_BYTE_RANGE_PLACEHOLDER,subFilter:c=SUBFILTER_ADOBE_PKCS7_DETACHED,sign:g})=>{var d=getFont(e,"Helvetica"),s=getFont(e,"ZapfDingbats"),p=getFont(e,"Helvetica"),f=g.Base64,f=getAnnotationApparance(e,getImage(Buffer.from(f,"base64"),e),p,g),p=e.ref({Type:"Sig",Filter:"Adobe.PPKLite",SubFilter:c,ByteRange:[0,l,l,l],Contents:Buffer.from(String.fromCharCode(0).repeat(i)),Reason:new String(r),M:new Date,ContactInfo:new String(t),Name:new String(n),Location:new String(o)}),h=a.lastIndexOf("/Type /AcroForm"),c=-1!==h;let m=[],C;if(c){let e=h;var S=h-10;let t="",n=11;for(n;n<22;n+=1){var A=a.slice(h-n,S).toString();if("\n"===A[0])break;t=A,e=h-n}l=a.slice(e),i=l.slice(0,l.indexOf("endobj")).toString(),r=(C=parseInt(t),i.slice(i.indexOf("/Fields [")+9,i.indexOf("]")));m=r.split(" ").filter((e,t)=>t%3==0).map(e=>new PDFKitReferenceMock(e))}t=g.Left,n=g.Bottom,o=t+g.Width,l=n+g.Height,i=e.ref({Type:"Annot",Subtype:"Widget",FT:"Sig",Rect:[t,n,o,l],V:p,T:new String("Signature"+(m.length+1)),F:4,P:e.page.dictionary,AP:`<</N ${f.index} 0 R>>`,DA:new String("/Helvetica 0 Tf 0 g")});e.page.dictionary.data.Annots=[i];let T;return T=c?e.ref({Type:"AcroForm",SigFlags:3,Fields:[...m,i],DR:`<</Font
+>>`,MediaBox:[0,0,197,70],Subtype:"Form"},null,getStream(t.index))}const getStream=e=>getConvertedText(`
+    1.0 1.0 1.0 rg
+    0.0 0.0 0.0 RG
+    q
+    q
+    200 0 0 50 0 10 cm
+    /Img${e} Do
+    Q
+    0 0 0 rg
+    BT
+    0 Tr
+    /f1 10.0 Tf
+    1.4 0 0 1 20 45.97412 Tm
+    ET
+    BT
+    0 Tr
+    /f1 10.0 Tf
+    1.4 0 0 1 20 33.56006 Tm
+    ET
+    Q`),getFont=(e,t)=>e.ref({Type:"Font",BaseFont:t,Encoding:"WinAnsiEncoding",Subtype:"Type1"}),getJpgImage=(e,t)=>{if(65496!==t.readUInt16BE(0))throw"SOI not found in JPEG";let n=2,a;for(;n<t.length&&(a=t.readUInt16BE(n),n+=2,!MARKERS.includes(a));)n+=t.readUInt16BE(n);if(!MARKERS.includes(a))throw"Invalid JPEG.";n+=2;var r=t[n++],o=t.readUInt16BE(n),i=(n+=2,t.readUInt16BE(n)),l=(n+=2,t[n++]),l=COLOR_SPACE_MAP[l],r={Type:"XObject",Subtype:"Image",BitsPerComponent:r,Width:i,Height:o,ColorSpace:l,Filter:"DCTDecode"},i=("DeviceCMYK"===l&&(r.Decode=[1,0,1,0,1,0,1,0]),e.ref(r,null,t));return i},getPngImage=(e,t)=>{var t=new PNG(t),n=t.hasAlphaChannel,a={Type:"XObject",Subtype:"Image",BitsPerComponent:n?8:t.bits,Width:t.width,Height:t.height,Filter:"FlateDecode"};if(n||(r=e.ref({Predictor:15,Colors:t.colors,BitsPerComponent:t.bits,Columns:t.width}),a.DecodeParms=r),0===t.palette.length?a.ColorSpace=t.colorSpace:(r=e.ref({stream:new Buffer(t.palette)}),a.ColorSpace=["Indexed","DeviceRGB",t.palette.length/3-1,r]),null!=t.transparency.grayscale){var r=t.transparency.grayscale;a.Mask=[r,r]}else if(t.transparency.rgb){var o,r=t.transparency["rgb"],i=[];for(o of r)i.push(o,o);a.Mask=i}else t.transparency.indexed?loadIndexedAlphaChannel(t):n&&(splitAlphaChannel(t),r=getSmask(e,t),a.Mask=r);return e.ref(a,null,t.imgData)},loadIndexedAlphaChannel=e=>{const o=e.transparency.indexed;return e.decodePixels(n=>{var a=new Buffer(e.width*e.height);let r=0;for(let e=0,t=n.length;e<t;e++)a[r++]=o[n[e]];e.alphaChannel=zlib.deflateSync(a)})},splitAlphaChannel=d=>{d.decodePixels(t=>{let e,n;var a=d.colors,r=d.width*d.height,o=new Buffer(r*a),i=new Buffer(r);let l=n=e=0;for(var g=t.length,c=16===d.bits?1:0;l<g;){for(let e=0;e<a;e++)o[n++]=t[l++],l+=c;i[e++]=t[l++],l+=c}d.imgData=zlib.deflateSync(o),d.alphaChannel=zlib.deflateSync(i)})},getSmask=(e,t)=>{let n;return console.log("image.hasAlphaChannel ",t.hasAlphaChannel),t.hasAlphaChannel&&(console.log("image.alphaChannel ",t.alphaChannel),n=e.ref({Type:"XObject",Subtype:"Image",Height:t.height,Width:t.width,BitsPerComponent:8,Filter:"FlateDecode",ColorSpace:"DeviceGray",Decode:[0,1],stream:t.alphaChannel})),n},getConvertedText=e=>e.split("").map(e=>specialCharacters.includes(e)?getOctalCodeFromCharacter(e):e).join(""),getOctalCodeFromCharacter=e=>"\\"+e.charCodeAt(0).toString(8),pdfkitAddPlaceholder=({pdf:e,pdfBuffer:a,reason:r,contactInfo:t="emailfromp1289@gmail.com",name:n="Name from p12",location:o="Location from p12",signatureLength:i=DEFAULT_SIGNATURE_LENGTH,byteRangePlaceholder:l=DEFAULT_BYTE_RANGE_PLACEHOLDER,subFilter:g=SUBFILTER_ADOBE_PKCS7_DETACHED,sign:c})=>{var d=getFont(e,"Helvetica"),s=getFont(e,"ZapfDingbats"),f=getFont(e,"Helvetica"),p=c.Base64,p=getAnnotationApparance(e,getImage(Buffer.from(p,"base64"),e),f),f=e.ref({Type:"Sig",Filter:"Adobe.PPKLite",SubFilter:g,ByteRange:[0,l,l,l],Contents:Buffer.from(String.fromCharCode(0).repeat(i)),Reason:new String(r),M:new Date,ContactInfo:new String(t),Name:new String(n),Location:new String(o)}),h=a.lastIndexOf("/Type /AcroForm"),g=-1!==h;let m=[],C;if(g){let e=h;var S=h-10;let t="",n=11;for(n;n<22;n+=1){var A=a.slice(h-n,S).toString();if("\n"===A[0])break;t=A,e=h-n}l=a.slice(e),i=l.slice(0,l.indexOf("endobj")).toString(),r=(C=parseInt(t),i.slice(i.indexOf("/Fields [")+9,i.indexOf("]")));m=r.split(" ").filter((e,t)=>t%3==0).map(e=>new PDFKitReferenceMock(e))}m.length;t=c.Left,n=c.Bottom,o=t+c.Width,l=n+c.Height,i=e.ref({Type:"Annot",Subtype:"Widget",FT:"Sig",Rect:[t,n,o,l],V:f,T:new String("Signature"+(m.length+1)),F:4,P:e.page.dictionary,AP:`<</N ${p.index} 0 R>>`,DA:new String("/Helvetica 0 Tf 0 g")});e.page.dictionary.data.Annots=[i];let T;return T=g?e.ref({Type:"AcroForm",SigFlags:3,Fields:[...m,i],DR:`<</Font
 <</Helvetica ${d.index} 0 R/ZapfDingbats ${s.index} 0 R>>
->>`},C):e.ref({Type:"AcroForm",SigFlags:3,Fields:[...m,i]}),{signature:p,form:e._root.data.AcroForm=T,widget:i}};export default pdfkitAddPlaceholder;
+>>`},C):e.ref({Type:"AcroForm",SigFlags:3,Fields:[...m,i]}),{signature:f,form:e._root.data.AcroForm=T,widget:i}};export default pdfkitAddPlaceholder;
@@ -1,257 +0,0 @@
-export default function reportJson(id, userId) {
-  const currentUserId = userId;
-
-  switch (id) {
-    // draft documents report
-    case 'ByHuevtCFY':
-      return {
-        reportName: 'Draft Documents',
-        params: {
-          Type: { $ne: 'Folder' },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          IsArchive: { $ne: true },
-          $or: [{Signers:{$eq:[]}}, { Signers: null }, { Signers: { $exists: true }, Placeholders: null }],
-          CreatedBy: {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: currentUserId,
-          },
-        },
-        keys: ['Name', 'Note', 'Folder.Name', 'URL', 'ExtUserPtr.Name', 'Signers.Name'],
-      };
-    // Need your sign report
-    case '4Hhwbp482K':
-      return {
-        reportName: 'Need your sign',
-        params: {
-          Type: { $ne: 'Folder' },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          IsArchive: { $ne: true },
-          ExpiryDate: {
-            $gt: { __type: 'Date', iso: new Date().toISOString() },
-          },
-          Placeholders: { $ne: null },
-          Signers: {
-            $inQuery: {
-              where: {
-                UserId: {
-                  __type: 'Pointer',
-                  className: '_User',
-                  objectId: currentUserId,
-                },
-              },
-              className: 'contracts_Contactbook',
-            },
-          },
-        },
-        keys: [
-          'Name',
-          'Note',
-          'Folder.Name',
-          'URL',
-          'ExtUserPtr.Name',
-          'Signers.Name',
-          'Signers.UserId',
-          'AuditTrail',
-        ],
-      };
-    // In progess report
-    case '1MwEuxLEkF':
-      return {
-        reportName: 'In-progress documents',
-        params: {
-          Type: { $ne: 'Folder' },
-          Signers: { $exists: true, $ne: [] },
-          Placeholders: { $ne: null },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          IsArchive: { $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'],
-      };
-    // completed documents report
-    case 'kQUoW4hUXz':
-      return {
-        reportName: 'Completed Documents',
-        params: {
-          Type: { $ne: 'Folder' },
-          IsCompleted: true,
-          CreatedBy: {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: currentUserId,
-          },
-          IsDeclined: { $ne: true },
-          IsArchive: { $ne: true },
-        },
-        keys: [
-          'Name',
-          'Note',
-          'Folder.Name',
-          'URL',
-          'ExtUserPtr.Name',
-          'Signers.Name',
-          'TimeToCompleteDays',
-        ],
-      };
-
-    //  declined documents report
-    case 'UPr2Fm5WY3':
-      return {
-        reportName: 'Declined Documents',
-        params: {
-          Type: null,
-          IsArchive: { $ne: true },
-          IsDeclined: true,
-          CreatedBy: {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: currentUserId,
-          },
-        },
-
-        keys: ['Name', 'Note', 'Folder.Name', 'URL', 'ExtUserPtr.Name', 'Signers.Name'],
-      };
-    //  Expired Documents report
-    case 'zNqBHXHsYH':
-      return {
-        reportName: 'Expired Documents',
-        params: {
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          IsArchive: { $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'],
-      };
-    //  Recently sent for signatures report show on dashboard
-    case 'd9k3UfYHBc':
-      return {
-        reportName: 'Recently sent for signatures',
-        params: {
-          Type: { $ne: 'Folder' },
-          Signers: { $exists: true, $ne: [] },
-          Placeholders: { $ne: null },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          IsArchive: { $ne: true },
-          CreatedBy: {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: currentUserId,
-          },
-          ExpiryDate: {
-            $gt: { __type: 'Date', iso: new Date().toISOString() },
-          },
-        },
-        keys: ['Name', 'Folder.Name', 'URL', 'ExtUserPtr.Name', 'Signers.Name'],
-      };
-    //  Recent signature requests report show on dashboard
-    case '5Go51Q7T8r':
-      return {
-        reportName: 'Recent signature requests',
-        params: {
-          Type: { $ne: 'Folder' },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          IsArchive: { $ne: true },
-          ExpiryDate: {
-            $gt: { __type: 'Date', iso: new Date().toISOString() },
-          },
-          Placeholders: { $ne: null },
-          Signers: {
-            $inQuery: {
-              where: {
-                UserId: {
-                  __type: 'Pointer',
-                  className: '_User',
-                  objectId: currentUserId,
-                },
-              },
-              className: 'contracts_Contactbook',
-            },
-          },
-        },
-        keys: ['Name', 'URL', 'ExtUserPtr.Name', 'Signers.Name', 'Signers.UserId', 'AuditTrail'],
-      };
-    // Drafts report show on dashboard
-    case 'kC5mfynCi4':
-      return {
-        reportName: 'Drafts',
-        params: {
-          Type: { $ne: 'Folder' },
-          IsCompleted: { $ne: true },
-          IsDeclined: { $ne: true },
-          IsArchive: { $ne: true },
-          $or: [{Signers:{$eq:[]}}, { Signers: null }, { Signers: { $exists: true }, Placeholders: null }],
-          CreatedBy: {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: currentUserId,
-          },
-        },
-        keys: ['Name', 'Note', 'Folder.Name', 'URL', 'ExtUserPtr.Name', 'Signers.Name'],
-      };
-    // contact book report
-    case '5KhaPr482K':
-      return {
-        reportName: 'Contactbook',
-        reportClass: 'contracts_Contactbook',
-        params: {
-          CreatedBy: {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: currentUserId,
-          },
-          IsDeleted: { $ne: true },
-        },
-        keys: ['Name', 'Email', 'Phone'],
-      };
-    // Templates report
-    case '6TeaPr321t':
-      return {
-        reportName: 'Templates',
-        reportClass: 'contracts_Template',
-        params: {
-          Type: { $ne: 'Folder' },
-          IsArchive: { $ne: true },
-          CreatedBy: {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: currentUserId,
-          },
-        },
-        keys: ['Name', 'Note', 'Folder.Name', 'URL', 'ExtUserPtr.Name', 'Signers.Name'],
-      };
-    default:
-      return null;
-  }
-}
@@ -1,30 +1,14 @@
 import fs from 'node:fs';
-import https from 'https';
 import formData from 'form-data';
 import Mailgun from 'mailgun.js';
-import { createTransport } from 'nodemailer';
+import https from 'https';

-let transporterSMTP;
-let mailgunClient;
-let mailgunDomain;
-if (process.env.SMTP_ENABLE) {
-  transporterSMTP = createTransport({
-    host: process.env.SMTP_HOST,
-    port: process.env.SMTP_PORT || 465,
-    secure: process.env.SMTP_SECURE || true,
-    auth: {
-      user: process.env.SMTP_USER_EMAIL,
-      pass: process.env.SMTP_PASS,
-    },
-  });
-} else {
-  const mailgun = new Mailgun(formData);
-  mailgunClient = mailgun.client({
-    username: 'api',
-    key: process.env.MAILGUN_API_KEY,
-  });
-  mailgunDomain = process.env.MAILGUN_DOMAIN;
-}
+const mailgun = new Mailgun(formData);
+const mailgunClient = mailgun.client({
+  username: 'api',
+  key: process.env.MAILGUN_API_KEY,
+});
+const mailgunDomain = process.env.MAILGUN_DOMAIN;

 async function sendmail(req) {
  try {
@@ -54,67 +38,22 @@ async function sendmail(req) {
        const pdfName = req.params.pdfName && `${req.params.pdfName}.pdf`;
        const file = {
          filename: pdfName || 'exported.pdf',
-          content: process.env.SMTP_ENABLE ? PdfBuffer : undefined, //fs.readFileSync('./exports/exported_file_1223.pdf'),
-          data: process.env.SMTP_ENABLE ? undefined : PdfBuffer,
+          data: PdfBuffer, //fs.readFileSync('./exports/exported_file_1223.pdf'),
        };

        // const html = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body style='text-align: center;'> <p style='font-weight: bolder; font-size: large;'>Hello!</p> <p>This is a html checking mail</p><p><button style='background-color: lightskyblue; cursor: pointer; border-radius: 5px; padding: 10px; border-style: solid; border-width: 2px; text-decoration: none; font-weight: bolder; color:blue'>Verify email</button></p></body></html>"

        const from = req.params.from || '';
-        const mailsender = process.env.SMTP_ENABLE
-          ? process.env.SMTP_USER_EMAIL
-          : process.env.MAILGUN_SENDER;

        const messageParams = {
-          from: from + ' <' + mailsender + '>',
+          from: from + ' <' + process.env.MAILGUN_SENDER + '>',
          to: req.params.recipient,
          subject: req.params.subject,
          text: req.params.text || 'mail',
          html: req.params.html || '',
-          attachments: process.env.SMTP_ENABLE ? [file] : undefined,
-          attachment: process.env.SMTP_ENABLE ? undefined : file,
+          attachment: file,
        };
-        if (transporterSMTP) {
-          const res = await transporterSMTP.sendMail(messageParams);
-          console.log('Res ', res);
-          if (!res.err) {
-            return {
-              status: 'success',
-            };
-          }
-        } else {
-          const res = await mailgunClient.messages.create(mailgunDomain, messageParams);
-          console.log('Res ', res);
-          if (res.status === 200) {
-            return {
-              status: 'success',
-            };
-          }
-        }
-      }
-    } else {
-      const from = req.params.from || '';
-      const mailsender = process.env.SMTP_ENABLE
-        ? process.env.SMTP_USER_EMAIL
-        : process.env.MAILGUN_SENDER;

-      const messageParams = {
-        from: from + ' <' + mailsender + '>',
-        to: req.params.recipient,
-        subject: req.params.subject,
-        text: req.params.text || 'mail',
-        html: req.params.html || '',
-      };
-
-      if (transporterSMTP) {
-        const res = await transporterSMTP.sendMail(messageParams);
-        console.log('Res ', res);
-        if (!res.err) {
-          return {
-            status: 'success',
-          };
-        }
-      } else {
        const res = await mailgunClient.messages.create(mailgunDomain, messageParams);
        console.log('Res ', res);
        if (res.status === 200) {
@@ -123,6 +62,23 @@ async function sendmail(req) {
          };
        }
      }
+    } else {
+      const from = req.params.from || '';
+      const messageParams = {
+        from: from + ' <' + process.env.MAILGUN_SENDER + '>',
+        to: req.params.recipient,
+        subject: req.params.subject,
+        text: req.params.text || 'mail',
+        html: req.params.html || '',
+      };
+
+      const res = await mailgunClient.messages.create(mailgunDomain, messageParams);
+      console.log('Res ', res);
+      if (res.status === 200) {
+        return {
+          status: 'success',
+        };
+      }
    }
  } catch (err) {
    console.log('err ', err);
@@ -1,47 +0,0 @@
-/**
- *
- * @param {Parse} Parse
- */
-exports.up = async Parse => {
-  // TODO: set className here
-  const className = 'contracts_Users';
-  const schema = new Parse.Schema(className);
-  // schema.addString('Name');
-  // schema.addString('Phone');
-  // schema.addString('JobTitle');
-  // schema.addString('Email');
-  // schema.addString('Company');
-  // schema.addString('UserRole');
-  // schema.addObject('Plan');
-  // schema.addString('Customer_id');
-  // schema.addString('Subscription_id');
-  // schema.addString('Next_billing_date');
-  // schema.addBoolean('IsContactEntry');
-  // schema.addBoolean('ShareWithTeam');
-  // schema.addPointer('TenantId', 'partners_Tenant');
-  // schema.addPointer('UserId', '_User');
-  // schema.addPointer('CreatedBy', '_User');
-  schema.setCLP({
-    get: {},
-    find: {},
-    count: {},
-    create: { '*': true },
-    update: { '*': true },
-    delete: {},
-    addField: {},
-  });
-
-  return schema.update();
-};
-
-/**
- *
- * @param {Parse} Parse
- */
-exports.down = async Parse => {
-  // TODO: set className here
-  const className = 'contracts_Users';
-  const schema = new Parse.Schema(className);
-
-  return schema.purge().then(() => schema.delete());
-};
@@ -1,556 +0,0 @@
-/**
- *
- * @param {Parse} Parse
- */
-exports.up = async Parse => {
-  const className = 'w_menu';
-  const userMenu = new Parse.Query(className);
-  const updateUserMenu = await userMenu.get('H9vRfEYKhT');
-  updateUserMenu.set('menuItems', [
-    {
-      icon: 'fas fa-tachometer-alt',
-      title: 'Dashboard',
-      target: '',
-      pageType: 'dashboard',
-      description: '',
-      objectId: '35KBoSgoAK',
-    },
-    {
-      icon: 'far fa-newspaper',
-      title: 'New Document',
-      target: '_self',
-      pageType: null,
-      description: null,
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-nib',
-          title: 'Sign yourself',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'sHAnZphf69',
-        },
-        {
-          icon: 'fas fa-file-signature',
-          title: 'Request signatures',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: '8mZzFxbG1z',
-        }
-      ],
-    },
-    {
-      icon: 'fas fa-folder',
-      title: 'OpenSignDrive™',
-      target: '_self',
-      pageType: 'mf',
-      description: '',
-      objectId:
-        'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive',
-    },
-    {
-      icon: 'fas fa-address-card',
-      title: 'Reports',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-signature',
-          title: 'Need your sign',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '4Hhwbp482K',
-        },
-        {
-          icon: 'fas fa-tasks',
-          title: 'In Progress',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '1MwEuxLEkF',
-        },
-        {
-          icon: 'fas fa-check-circle',
-          title: 'Completed',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'kQUoW4hUXz',
-        },
-        {
-          icon: 'fas fa-edit',
-          title: 'Drafts',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'ByHuevtCFY',
-        },
-        {
-          icon: 'fas fa-times-circle',
-          title: 'Declined',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'UPr2Fm5WY3',
-        },
-        {
-          icon: 'fas fa-hourglass-end',
-          title: 'Expired',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'zNqBHXHsYH',
-        },
-        {
-          icon: 'fa-solid fa-address-book',
-          title: 'Contactbook',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '5KhaPr482K',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-cog',
-      title: 'Settings',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-fancy',
-          title: 'My Signature',
-          target: '_self',
-          pageType: 'mf',
-          description: '',
-          objectId:
-            'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign',
-        },
-      ],
-    },
-  ]);
-
-  const AdminMenu = new Parse.Query(className);
-  const updateAdminMenu = await AdminMenu.get('VPh91h0ZHk');
-  updateAdminMenu.set('menuItems', [
-    {
-      icon: 'fas fa-tachometer-alt',
-      title: 'Dashboard',
-      target: '',
-      pageType: 'dashboard',
-      description: '',
-      objectId: '35KBoSgoAK',
-    },
-    {
-      icon: 'far fa-newspaper',
-      title: 'New Document',
-      target: '_self',
-      pageType: null,
-      description: null,
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-nib',
-          title: 'Sign yourself',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'sHAnZphf69',
-        },
-        {
-          icon: 'fas fa-file-signature',
-          title: 'Request signatures',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: '8mZzFxbG1z',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-folder',
-      title: 'OpenSignDrive™',
-      target: '_self',
-      pageType: 'mf',
-      description: '',
-      objectId:
-        'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive',
-    },
-    {
-      icon: 'fas fa-address-card',
-      title: 'Reports',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-signature',
-          title: 'Need your sign',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '4Hhwbp482K',
-        },
-        {
-          icon: 'fas fa-tasks',
-          title: 'In Progress',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '1MwEuxLEkF',
-        },
-        {
-          icon: 'fas fa-check-circle',
-          title: 'Completed',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'kQUoW4hUXz',
-        },
-        {
-          icon: 'fas fa-edit',
-          title: 'Drafts',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'ByHuevtCFY',
-        },
-        {
-          icon: 'fas fa-times-circle',
-          title: 'Declined',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'UPr2Fm5WY3',
-        },
-        {
-          icon: 'fas fa-hourglass-end',
-          title: 'Expired',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'zNqBHXHsYH',
-        },
-        {
-          icon: 'fa-solid fa-address-book',
-          title: 'Contactbook',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '5KhaPr482K',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-cog',
-      title: 'Settings',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-fancy',
-          title: 'My Signature',
-          target: '_self',
-          pageType: 'mf',
-          description: '',
-          objectId:
-            'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign',
-        },
-        {
-          icon: 'far fa-user',
-          title: 'Add User',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'lM0xRnM3iE',
-        },
-      ],
-    },
-  ]);
-  // TODO: Set the schema here
-  // Example:
-  // schema.addString('name').addNumber('cash');
-  const batch = [updateUserMenu, updateAdminMenu];
-  return Parse.Object.saveAll(batch, { useMasterKey: true });
-};
-
-/**
- *
- * @param {Parse} Parse
- */
-exports.down = async Parse => {
-  // TODO: set className here
-  const className = 'w_menu';
-  const userMenu = new Parse.Query(className);
-  const revertUserMenu = await userMenu.get('H9vRfEYKhT');
-  revertUserMenu.set('menuItems', [
-    {
-      icon: 'fas fa-tachometer-alt',
-      title: 'Dashboard',
-      target: '',
-      pageType: 'dashboard',
-      description: '',
-      objectId: '35KBoSgoAK',
-    },
-    {
-      icon: 'far fa-newspaper',
-      title: 'New Document',
-      target: '_self',
-      pageType: null,
-      description: null,
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-nib',
-          title: 'Sign yourself',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'sHAnZphf69',
-        },
-        {
-          icon: 'fas fa-file-signature',
-          title: 'Request signatures',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: '8mZzFxbG1z',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-folder',
-      title: 'OpenSignDrive™',
-      target: '_self',
-      pageType: 'mf',
-      description: '',
-      objectId:
-        'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive',
-    },
-    {
-      icon: 'fas fa-address-card',
-      title: 'Reports',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-signature',
-          title: 'Need your sign',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '4Hhwbp482K',
-        },
-        {
-          icon: 'fas fa-tasks',
-          title: 'In Progress',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '1MwEuxLEkF',
-        },
-        {
-          icon: 'fas fa-check-circle',
-          title: 'Completed',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'kQUoW4hUXz',
-        },
-        {
-          icon: 'fas fa-edit',
-          title: 'Drafts',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'ByHuevtCFY',
-        },
-        {
-          icon: 'fas fa-times-circle',
-          title: 'Declined',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'UPr2Fm5WY3',
-        },
-        {
-          icon: 'fas fa-hourglass-end',
-          title: 'Expired',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'zNqBHXHsYH',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-cog',
-      title: 'Settings',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-fancy',
-          title: 'My Signature',
-          target: '_self',
-          pageType: 'mf',
-          description: '',
-          objectId:
-            'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign',
-        },
-      ],
-    },
-  ]);
-
-  const adminMenu = new Parse.Query(className);
-  const revertAdminMenu = await adminMenu.get('VPh91h0ZHk');
-  revertAdminMenu.set('menuItems', [
-    {
-      icon: 'fas fa-tachometer-alt',
-      title: 'Dashboard',
-      target: '',
-      pageType: 'dashboard',
-      description: '',
-      objectId: '35KBoSgoAK',
-    },
-    {
-      icon: 'far fa-newspaper',
-      title: 'New Document',
-      target: '_self',
-      pageType: null,
-      description: null,
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-nib',
-          title: 'Sign yourself',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'sHAnZphf69',
-        },
-        {
-          icon: 'fas fa-file-signature',
-          title: 'Request signatures',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: '8mZzFxbG1z',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-folder',
-      title: 'OpenSignDrive™',
-      target: '_self',
-      pageType: 'mf',
-      description: '',
-      objectId:
-        'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive',
-    },
-    {
-      icon: 'fas fa-address-card',
-      title: 'Reports',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-signature',
-          title: 'Need your sign',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '4Hhwbp482K',
-        },
-        {
-          icon: 'fas fa-tasks',
-          title: 'In Progress',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '1MwEuxLEkF',
-        },
-        {
-          icon: 'fas fa-check-circle',
-          title: 'Completed',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'kQUoW4hUXz',
-        },
-        {
-          icon: 'fas fa-edit',
-          title: 'Drafts',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'ByHuevtCFY',
-        },
-        {
-          icon: 'fas fa-times-circle',
-          title: 'Declined',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'UPr2Fm5WY3',
-        },
-        {
-          icon: 'fas fa-hourglass-end',
-          title: 'Expired',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'zNqBHXHsYH',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-cog',
-      title: 'Settings',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-fancy',
-          title: 'My Signature',
-          target: '_self',
-          pageType: 'mf',
-          description: '',
-          objectId:
-            'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign',
-        },
-        {
-          icon: 'far fa-user',
-          title: 'Add User',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'lM0xRnM3iE',
-        },
-      ],
-    },
-  ]);
-  // TODO: Set the schema here
-  // Example:
-  // schema.addString('name').addNumber('cash');
-  const batch = [revertUserMenu, revertAdminMenu];
-  return Parse.Object.saveAll(batch, { useMasterKey: true });
-};
@@ -1,588 +0,0 @@
-/**
- *
- * @param {Parse} Parse
- */
-exports.up = async Parse => {
-  const className = 'w_menu';
-  const userMenu = new Parse.Query(className);
-  const updateUserMenu = await userMenu.get('H9vRfEYKhT');
-  updateUserMenu.set('menuItems', [
-    {
-      icon: 'fas fa-tachometer-alt',
-      title: 'Dashboard',
-      target: '',
-      pageType: 'dashboard',
-      description: '',
-      objectId: '35KBoSgoAK',
-    },
-    {
-      icon: 'far fa-newspaper',
-      title: 'New Document',
-      target: '_self',
-      pageType: null,
-      description: null,
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-nib',
-          title: 'Sign yourself',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'sHAnZphf69',
-        },
-        {
-          icon: 'fa-solid fa-paper-plane',
-          title: 'Request signatures',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: '8mZzFxbG1z',
-        },
-        {
-          icon: 'fas fa-file-signature',
-          title: 'New template',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'template',
-        },
-      ],
-    },
-    {
-      icon: 'fa-solid fa-file-contract',
-      title: 'Templates',
-      target: '_self',
-      pageType: 'report',
-      description: '',
-      objectId: '6TeaPr321t',
-    },
-    {
-      icon: 'fas fa-folder',
-      title: 'OpenSign™ Drive',
-      target: '_self',
-      pageType: 'mf',
-      description: '',
-      objectId:
-        'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive',
-    },
-    {
-      icon: 'fas fa-address-card',
-      title: 'Reports',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-signature',
-          title: 'Need your sign',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '4Hhwbp482K',
-        },
-        {
-          icon: 'fas fa-tasks',
-          title: 'In Progress',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '1MwEuxLEkF',
-        },
-        {
-          icon: 'fas fa-check-circle',
-          title: 'Completed',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'kQUoW4hUXz',
-        },
-        {
-          icon: 'fas fa-edit',
-          title: 'Drafts',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'ByHuevtCFY',
-        },
-        {
-          icon: 'fas fa-times-circle',
-          title: 'Declined',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'UPr2Fm5WY3',
-        },
-        {
-          icon: 'fas fa-hourglass-end',
-          title: 'Expired',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'zNqBHXHsYH',
-        },
-        {
-          icon: 'fa-solid fa-address-book',
-          title: 'Contactbook',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '5KhaPr482K',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-cog',
-      title: 'Settings',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-fancy',
-          title: 'My Signature',
-          target: '_self',
-          pageType: 'mf',
-          description: '',
-          objectId:
-            'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign',
-        },
-      ],
-    },
-  ]);
-
-  const AdminMenu = new Parse.Query(className);
-  const updateAdminMenu = await AdminMenu.get('VPh91h0ZHk');
-  updateAdminMenu.set('menuItems', [
-    {
-      icon: 'fas fa-tachometer-alt',
-      title: 'Dashboard',
-      target: '',
-      pageType: 'dashboard',
-      description: '',
-      objectId: '35KBoSgoAK',
-    },
-    {
-      icon: 'far fa-newspaper',
-      title: 'New Document',
-      target: '_self',
-      pageType: null,
-      description: null,
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-nib',
-          title: 'Sign yourself',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'sHAnZphf69',
-        },
-        {
-          icon: 'fa-solid fa-paper-plane',
-          title: 'Request signatures',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: '8mZzFxbG1z',
-        },
-        {
-          icon: 'fas fa-file-signature',
-          title: 'New template',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'template',
-        },
-      ],
-    },
-    {
-      icon: 'fa-solid fa-file-contract',
-      title: 'Templates',
-      target: '_self',
-      pageType: 'report',
-      description: '',
-      objectId: '6TeaPr321t',
-    },
-    {
-      icon: 'fas fa-folder',
-      title: 'OpenSign™ Drive',
-      target: '_self',
-      pageType: 'mf',
-      description: '',
-      objectId:
-        'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive',
-    },
-    {
-      icon: 'fas fa-address-card',
-      title: 'Reports',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-signature',
-          title: 'Need your sign',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '4Hhwbp482K',
-        },
-        {
-          icon: 'fas fa-tasks',
-          title: 'In Progress',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '1MwEuxLEkF',
-        },
-        {
-          icon: 'fas fa-check-circle',
-          title: 'Completed',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'kQUoW4hUXz',
-        },
-        {
-          icon: 'fas fa-edit',
-          title: 'Drafts',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'ByHuevtCFY',
-        },
-        {
-          icon: 'fas fa-times-circle',
-          title: 'Declined',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'UPr2Fm5WY3',
-        },
-        {
-          icon: 'fas fa-hourglass-end',
-          title: 'Expired',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'zNqBHXHsYH',
-        },
-        {
-          icon: 'fa-solid fa-address-book',
-          title: 'Contactbook',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '5KhaPr482K',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-cog',
-      title: 'Settings',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-fancy',
-          title: 'My Signature',
-          target: '_self',
-          pageType: 'mf',
-          description: '',
-          objectId:
-            'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign',
-        },
-        {
-          icon: 'far fa-user',
-          title: 'Add User',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'lM0xRnM3iE',
-        },
-      ],
-    },
-  ]);
-  // TODO: Set the schema here
-  // Example:
-  // schema.addString('name').addNumber('cash');
-  const batch = [updateUserMenu, updateAdminMenu];
-  return Parse.Object.saveAll(batch, { useMasterKey: true });
-};
-
-/**
- *
- * @param {Parse} Parse
- */
-exports.down = async Parse => {
-  // TODO: set className here
-  const className = 'w_menu';
-  const userMenu = new Parse.Query(className);
-  const revertUserMenu = await userMenu.get('H9vRfEYKhT');
-  revertUserMenu.set('menuItems', [
-    {
-      icon: 'fas fa-tachometer-alt',
-      title: 'Dashboard',
-      target: '',
-      pageType: 'dashboard',
-      description: '',
-      objectId: '35KBoSgoAK',
-    },
-    {
-      icon: 'far fa-newspaper',
-      title: 'New Document',
-      target: '_self',
-      pageType: null,
-      description: null,
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-nib',
-          title: 'Sign yourself',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'sHAnZphf69',
-        },
-        {
-          icon: 'fas fa-file-signature',
-          title: 'Request signatures',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: '8mZzFxbG1z',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-folder',
-      title: 'OpenSignDrive™',
-      target: '_self',
-      pageType: 'mf',
-      description: '',
-      objectId:
-        'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive',
-    },
-    {
-      icon: 'fas fa-address-card',
-      title: 'Reports',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-signature',
-          title: 'Need your sign',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '4Hhwbp482K',
-        },
-        {
-          icon: 'fas fa-tasks',
-          title: 'In Progress',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '1MwEuxLEkF',
-        },
-        {
-          icon: 'fas fa-check-circle',
-          title: 'Completed',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'kQUoW4hUXz',
-        },
-        {
-          icon: 'fas fa-edit',
-          title: 'Drafts',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'ByHuevtCFY',
-        },
-        {
-          icon: 'fas fa-times-circle',
-          title: 'Declined',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'UPr2Fm5WY3',
-        },
-        {
-          icon: 'fas fa-hourglass-end',
-          title: 'Expired',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'zNqBHXHsYH',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-cog',
-      title: 'Settings',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-fancy',
-          title: 'My Signature',
-          target: '_self',
-          pageType: 'mf',
-          description: '',
-          objectId:
-            'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign',
-        },
-      ],
-    },
-  ]);
-
-  const adminMenu = new Parse.Query(className);
-  const revertAdminMenu = await adminMenu.get('VPh91h0ZHk');
-  revertAdminMenu.set('menuItems', [
-    {
-      icon: 'fas fa-tachometer-alt',
-      title: 'Dashboard',
-      target: '',
-      pageType: 'dashboard',
-      description: '',
-      objectId: '35KBoSgoAK',
-    },
-    {
-      icon: 'far fa-newspaper',
-      title: 'New Document',
-      target: '_self',
-      pageType: null,
-      description: null,
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-nib',
-          title: 'Sign yourself',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'sHAnZphf69',
-        },
-        {
-          icon: 'fas fa-file-signature',
-          title: 'Request signatures',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: '8mZzFxbG1z',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-folder',
-      title: 'OpenSignDrive™',
-      target: '_self',
-      pageType: 'mf',
-      description: '',
-      objectId:
-        'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive',
-    },
-    {
-      icon: 'fas fa-address-card',
-      title: 'Reports',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-signature',
-          title: 'Need your sign',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '4Hhwbp482K',
-        },
-        {
-          icon: 'fas fa-tasks',
-          title: 'In Progress',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: '1MwEuxLEkF',
-        },
-        {
-          icon: 'fas fa-check-circle',
-          title: 'Completed',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'kQUoW4hUXz',
-        },
-        {
-          icon: 'fas fa-edit',
-          title: 'Drafts',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'ByHuevtCFY',
-        },
-        {
-          icon: 'fas fa-times-circle',
-          title: 'Declined',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'UPr2Fm5WY3',
-        },
-        {
-          icon: 'fas fa-hourglass-end',
-          title: 'Expired',
-          target: '_self',
-          pageType: 'report',
-          description: '',
-          objectId: 'zNqBHXHsYH',
-        },
-      ],
-    },
-    {
-      icon: 'fas fa-cog',
-      title: 'Settings',
-      target: '_self',
-      pageType: null,
-      description: '',
-      objectId: null,
-      children: [
-        {
-          icon: 'fas fa-pen-fancy',
-          title: 'My Signature',
-          target: '_self',
-          pageType: 'mf',
-          description: '',
-          objectId:
-            'remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign',
-        },
-        {
-          icon: 'far fa-user',
-          title: 'Add User',
-          target: '_self',
-          pageType: 'form',
-          description: '',
-          objectId: 'lM0xRnM3iE',
-        },
-      ],
-    },
-  ]);
-  // TODO: Set the schema here
-  // Example:
-  // schema.addString('name').addNumber('cash');
-  const batch = [revertUserMenu, revertAdminMenu];
-  return Parse.Object.saveAll(batch, { useMasterKey: true });
-};
@@ -1,40 +0,0 @@
-/**
- *
- * @param {Parse} Parse
- */
-exports.up = async Parse => {
-  const className = 'contracts_Template';
-  const schema = new Parse.Schema(className);
-
-  schema.addString('Name');
-  schema.addString('URL');
-  schema.addString('Note');
-  schema.addString('Description');
-  schema.addArray('Signers');
-  schema.addBoolean('IsArchive');
-  schema.addArray('Placeholders');
-  schema.addPointer('Folder', 'contracts_Template');
-  schema.addString('Type');
-  schema.addPointer('CreatedBy', '_User');
-  schema.addPointer('ExtUserPtr', 'contracts_Users');
-  schema.addBoolean('EnablePhoneOTP')
-  schema.addBoolean('EnableEmailOTP')
-  schema.addBoolean('SendinOrder')
-  schema.addBoolean('SentToOthers')
-  schema.addBoolean('AutomaticReminders')
-
-
-
-  return schema.save();
-};
-
-/**
- *
- * @param {Parse} Parse
- */
-exports.down = async Parse => {
-  const className = 'contracts_Template';
-  const schema = new Parse.Schema(className);
-
-  return schema.purge().then(() => schema.delete());
-};
@@ -1,23 +0,0 @@
-/**
- *
- * @param {Parse} Parse
- */
-exports.up = async Parse => {
-    // TODO: set className here
-    const className = 'contracts_Document';
-    const schema = new Parse.Schema(className);
-    schema.addBoolean('IsArchive');
-    return schema.update();
-  };
-  
-  /**
-   *
-   * @param {Parse} Parse
-   */
-  exports.down = async Parse => {
-    // TODO: set className here
-    const className = 'contracts_Document';
-    const schema = new Parse.Schema(className);
-    schema.deleteField('IsArchive');
-    return schema.update();
-  };
@@ -10,7 +10,7 @@
    <br />
    <p><a href="{{{link}}}" style="background-color: lightskyblue; cursor: pointer; border-radius: 5px; padding: 10px; border-style: solid; border-width: 2px; text-decoration: none; font-weight: bolder; color:blue">Verify email</a></p>
    <br />
-    <p><a href="https://www.opensignlabs.com">OpenSign™</a></p>
+    <p>ExampleApp</p>
 </body>

-</html>
+</html>
@@ -17,12 +17,10 @@ import S3Adapter from 'parse-server-s3-adapter';
 import FSFilesAdapter from 'parse-server-fs-adapter';
 import AWS from 'aws-sdk';
 import { app as customRoute } from './cloud/customRoute/customApp.js';
-import { exec } from 'child_process';
-import { createTransport } from 'nodemailer';

 const spacesEndpoint = new AWS.Endpoint(process.env.DO_ENDPOINT);
 // console.log("configuration ", configuration);
-if (process.env.USE_LOCAL !== 'TRUE') {
+if (process.env.USE_LOCAL !== "TRUE") {
  const s3Options = {
    bucket: process.env.DO_SPACE, // globalConfig.S3FilesAdapter.bucket,
    baseUrl: process.env.DO_BASEURL,
@@ -38,84 +36,64 @@ if (process.env.USE_LOCAL !== 'TRUE') {
  var fsAdapter = new S3Adapter(s3Options);
 } else {
  var fsAdapter = new FSFilesAdapter({
-    filesSubDirectory: 'files', // optional, defaults to ./files
+    "filesSubDirectory": "files" // optional, defaults to ./files
  });
 }

-let transporterMail;
 let mailgunClient;
 let mailgunDomain;
-
-if (process.env.SMTP_ENABLE) {
-  transporterMail = createTransport({
-    host: process.env.SMTP_HOST,
-    port: process.env.SMTP_PORT || 465,
-    secure: process.env.SMTP_SECURE || true,
-    auth: {
-      user: process.env.SMTP_USER_EMAIL,
-      pass: process.env.SMTP_PASS,
-    },
-  });
-} else if (process.env.MAILGUN_API_KEY) {
+if (process.env.MAILGUN_API_KEY) {
  const mailgun = new Mailgun(formData);
  mailgunClient = mailgun.client({
    username: 'api',
    key: process.env.MAILGUN_API_KEY,
  });
-
  mailgunDomain = process.env.MAILGUN_DOMAIN;
 }

 export const config = {
  databaseURI:
    process.env.DATABASE_URI || process.env.MONGODB_URI || 'mongodb://localhost:27017/dev',
-  cloud: function () {
-    import('./cloud/main.js');
-  },
+  cloud: process.env.CLOUD || __dirname + '/cloud/main.js',
  appId: process.env.APP_ID || 'myAppId',
  masterKey: process.env.MASTER_KEY || '', //Add your master key here. Keep it secret!
  masterKeyIps: ['0.0.0.0/0', '::1'], // '::1'
  serverURL: process.env.SERVER_URL || 'http://localhost:8080/app', // Don't forget to change to https if needed
-  verifyUserEmails: true,
+  // verifyUserEmails: true,
  publicServerURL: process.env.SERVER_URL || 'http://localhost:8080/app',
  // Your apps name. This will appear in the subject and body of the emails that are sent.
  appName: 'Open Sign',
  allowClientClassCreation: false,
-  emailAdapter:
-    process.env.SMTP_ENABLE || process.env.MAILGUN_API_KEY
-      ? {
-          module: 'parse-server-api-mail-adapter',
-          options: {
-            // The email address from which emails are sent.
-            sender: process.env.SMTP_ENABLE
-              ? process.env.SMTP_USER_EMAIL
-              : process.env.MAILGUN_SENDER,
-            // The email templates.
-            templates: {
-              // The template used by Parse Server to send an email for password
-              // reset; this is a reserved template name.
-              passwordResetEmail: {
-                subjectPath: './files/password_reset_email_subject.txt',
-                textPath: './files/password_reset_email.txt',
-                htmlPath: './files/password_reset_email.html',
-              },
-              // The template used by Parse Server to send an email for email
-              // address verification; this is a reserved template name.
-              verificationEmail: {
-                subjectPath: './files/verification_email_subject.txt',
-                textPath: './files/verification_email.txt',
-                htmlPath: './files/verification_email.html',
-              },
+  emailAdapter: process.env.MAILGUN_API_KEY
+    ? {
+        module: 'parse-server-api-mail-adapter',
+        options: {
+          // The email address from which emails are sent.
+          sender: process.env.MAILGUN_SENDER,
+          // The email templates.
+          templates: {
+            // The template used by Parse Server to send an email for password
+            // reset; this is a reserved template name.
+            passwordResetEmail: {
+              subjectPath: './files/password_reset_email_subject.txt',
+              textPath: './files/password_reset_email.txt',
+              htmlPath: './files/password_reset_email.html',
            },
-            apiCallback: async ({ payload, locale }) => {
-              if (mailgunClient) {
-                const mailgunPayload = ApiPayloadConverter.mailgun(payload);
-                await mailgunClient.messages.create(mailgunDomain, mailgunPayload);
-              } else if (transporterMail) await transporterMail.sendMail(payload);
+            // The template used by Parse Server to send an email for email
+            // address verification; this is a reserved template name.
+            verificationEmail: {
+              subjectPath: './files/verification_email_subject.txt',
+              textPath: './files/verification_email.txt',
+              htmlPath: './files/verification_email.html',
            },
          },
-        }
-      : null,
+          apiCallback: async ({ payload, locale }) => {
+            const mailgunPayload = ApiPayloadConverter.mailgun(payload);
+            await mailgunClient.messages.create(mailgunDomain, mailgunPayload);
+          },
+        },
+      }
+    : null,
  filesAdapter: fsAdapter,
  auth: {
    google: {
@@ -172,6 +150,12 @@ app.get('/', function (req, res) {
  res.status(200).send('open-sign-server is running !!!');
 });

+// There will be a test page available on the /test path of your server url
+// Remove this before launching your app
+app.get('/test', function (req, res) {
+  res.sendFile(path.join(__dirname, '/public/test.html'));
+});
+
 if (!process.env.TESTING) {
  const port = process.env.PORT || 8080;
  const httpServer = http.createServer(app);
@@ -180,20 +164,6 @@ if (!process.env.TESTING) {
  httpServer.headersTimeout = 100000; // in milliseconds
  httpServer.listen(port, function () {
    console.log('parse-server-example running on port ' + port + '.');
-    const migrate = `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=http://localhost:8080/app MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
-
-    exec(migrate, (error, stdout, stderr) => {
-      if (error) {
-        console.error(`Error: ${error.message}`);
-        return;
-      }
-
-      if (stderr) {
-        console.error(`Error: ${stderr}`);
-        return;
-      }
-      console.log(`Command output: ${stdout}`);
-    });
  });
  // This will enable the Live Query real-time server
  await ParseServer.createLiveQueryServer(httpServer);
@@ -18,19 +18,16 @@
        "express-sse": "^0.5.3",
        "form-data": "^4.0.0",
        "jsonschema": "^1.4.1",
-        "mailgun.js": "^9.3.0",
+        "mailgun.js": "^9.0.1",
        "mongoose": "^7.2.1",
        "multer": "^1.4.5-lts.1",
        "multer-s3": "^2.10.0",
        "node-forge": "^1.3.1",
        "node-signpdf": "^1.5.1",
-        "nodemailer": "^6.9.7",
        "openai": "^4.8.0",
        "parse": "4.1.0",
-        "parse-dbtool": "^1.2.0",
        "parse-server": "6.3.1",
        "parse-server-api-mail-adapter": "^3.0.0",
-        "parse-server-fs-adapter": "1.0.1",
        "parse-server-s3-adapter": "^1.2.0",
        "pdf-lib": "^1.16.0",
        "pdfkit": "^0.13.0",
@@ -2148,6 +2145,7 @@
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
      "dependencies": {
        "fill-range": "^7.0.1"
      },
@@ -2796,37 +2794,6 @@
        "node": ">=0.10"
      }
    },
-    "node_modules/date-fns": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0"
-      },
-      "engines": {
-        "node": ">=0.11"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
-      }
-    },
-    "node_modules/date-fns/node_modules/@babel/runtime": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/date-fns/node_modules/regenerator-runtime": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
-    },
    "node_modules/debug": {
      "version": "4.3.4",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -3933,32 +3900,6 @@
      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
    },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
    "node_modules/fast-json-stable-stringify": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -4058,6 +3999,7 @@
      "version": "7.0.1",
      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@@ -4393,6 +4335,7 @@
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
      "engines": {
        "node": "6.* || 8.* || >= 10.*"
      }
@@ -5148,6 +5091,7 @@
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
      "engines": {
        "node": ">=0.12.0"
      }
@@ -6072,9 +6016,9 @@
      }
    },
    "node_modules/mailgun.js": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/mailgun.js/-/mailgun.js-9.3.0.tgz",
-      "integrity": "sha512-iRqCglCdi+Q5anFpeRKHiytT/i34E14p/WtTE57VSeq5bATK+zQ8UnpFgPRaqGGTJqyGjqcO9m5YDRRB4/qirw==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/mailgun.js/-/mailgun.js-9.0.1.tgz",
+      "integrity": "sha512-bVZ1zGh5UfQcChqIwIAil99hzoTeB3aHqAUbqmIBLMLcKfx+FF2qvhbc00WtwrFhe5dBQqQw6zPj0QBlqV4nXg==",
      "dependencies": {
        "axios": "^1.3.3",
        "base-64": "^1.0.0",
@@ -6143,14 +6087,6 @@
      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
    "node_modules/methods": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
@@ -6159,18 +6095,6 @@
        "node": ">= 0.6"
      }
    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
    "node_modules/mime": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
@@ -6875,14 +6799,6 @@
        "node-forge": "^1.2.1"
      }
    },
-    "node_modules/nodemailer": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.7.tgz",
-      "integrity": "sha512-rUtR77ksqex/eZRLmQ21LKVH5nAAsVicAtAYudK7JgwenEDZ0UIQ1adUGqErz7sMkWYxWTTU1aeP2Jga6WQyJw==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
    "node_modules/nodemon": {
      "version": "2.0.22",
      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
@@ -7412,234 +7328,6 @@
        "crypto-js": "4.1.1"
      }
    },
-    "node_modules/parse-dbtool": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parse-dbtool/-/parse-dbtool-1.2.0.tgz",
-      "integrity": "sha512-APRMPdQ2jyJ7SBouPYZsCD4BjB0zIrSEgALgeYZsVSDrrtoqXhUHJHi42tF/0ocTA/nolteUMzlHT+msrqPvjQ==",
-      "dependencies": {
-        "chalk": "^4.1.1",
-        "date-fns": "^2.21.3",
-        "dotenv": "^10.0.0",
-        "fast-glob": "^3.2.5",
-        "parse": "^3.2.0",
-        "ts-dedent": "^2.1.1",
-        "yargs": "^17.0.1"
-      },
-      "bin": {
-        "parse-dbtool": "src/parse-dbtool.js"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/@babel/runtime": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.0.tgz",
-      "integrity": "sha512-YMQvx/6nKEaucl0MY56mwIG483xk8SDNdlUwb2Ts6FUpr7fm85DxEmsY18LXBNhcTz6tO6JwZV8w1W06v8UKeg==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/@babel/runtime-corejs3": {
-      "version": "7.17.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.8.tgz",
-      "integrity": "sha512-ZbYSUvoSF6dXZmMl/CYTMOvzIFnbGfv4W3SEHYgMvNsFTeLaF2gkGAF4K2ddmtSK4Emej+0aYcnSC6N5dPCXUQ==",
-      "dependencies": {
-        "core-js-pure": "^3.20.2",
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/parse-dbtool/node_modules/dotenv": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
-      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/idb-keyval": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.0.3.tgz",
-      "integrity": "sha512-yh8V7CnE6EQMu9YDwQXhRxwZh4nv+8xm/HV4ZqK4IiYFJBWYGjJuykADJbSP+F/GDXUBwCSSNn/14IpGL81TuA==",
-      "dependencies": {
-        "safari-14-idb-fix": "^3.0.0"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/parse": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/parse/-/parse-3.5.1.tgz",
-      "integrity": "sha512-uxkLVNfbqgZ/pStg/jIQGh09tOUkPZorzDIqz9vSFjZ3iIZzgvNk6VBbjXjcMWsR8LyFPOR1ROR6/y9Dedn3/w==",
-      "dependencies": {
-        "@babel/runtime": "7.18.0",
-        "@babel/runtime-corejs3": "7.17.8",
-        "idb-keyval": "6.0.3",
-        "react-native-crypto-js": "1.0.0",
-        "uuid": "3.4.0",
-        "ws": "8.6.0",
-        "xmlhttprequest": "1.8.0"
-      },
-      "optionalDependencies": {
-        "crypto-js": "4.1.1"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/ws": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/parse-dbtool/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
    "node_modules/parse-server": {
      "version": "6.3.1",
      "resolved": "https://registry.npmjs.org/parse-server/-/parse-server-6.3.1.tgz",
@@ -7715,12 +7403,6 @@
        "node": ">=12"
      }
    },
-    "node_modules/parse-server-fs-adapter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-server-fs-adapter/-/parse-server-fs-adapter-1.0.1.tgz",
-      "integrity": "sha512-5IRKAT2QkzHrYrBESY4E8jsV1sl+XVBTKGyUvBPgBR2QzsTTqiyU/lFZD8PAJavA+TH1BLyLTUMZbhZhswNVbQ==",
-      "deprecated": "use @parse/fs-files-adapter"
-    },
    "node_modules/parse-server-s3-adapter": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/parse-server-s3-adapter/-/parse-server-s3-adapter-1.2.0.tgz",
@@ -8199,6 +7881,7 @@
      "version": "2.3.1",
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
      "engines": {
        "node": ">=8.6"
      },
@@ -8772,6 +8455,7 @@
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -9537,6 +9221,7 @@
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
      "dependencies": {
        "is-number": "^7.0.0"
      },
@@ -9598,14 +9283,6 @@
      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
      "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
    },
-    "node_modules/ts-dedent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
-      "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
-      "engines": {
-        "node": ">=6.10"
-      }
-    },
    "node_modules/tslib": {
      "version": "2.5.2",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz",
@@ -27,20 +27,18 @@
    "express-sse": "^0.5.3",
    "form-data": "^4.0.0",
    "jsonschema": "^1.4.1",
-    "mailgun.js": "^9.3.0",
+    "mailgun.js": "^9.0.1",
    "mongoose": "^7.2.1",
    "multer": "^1.4.5-lts.1",
    "multer-s3": "^2.10.0",
    "node-forge": "^1.3.1",
    "node-signpdf": "^1.5.1",
-    "nodemailer": "^6.9.7",
    "openai": "^4.8.0",
    "parse": "4.1.0",
-    "parse-dbtool": "^1.2.0",
    "parse-server": "6.3.1",
    "parse-server-api-mail-adapter": "^3.0.0",
-    "parse-server-fs-adapter": "1.0.1",
    "parse-server-s3-adapter": "^1.2.0",
+    "parse-server-fs-adapter": "1.0.1",
    "pdf-lib": "^1.16.0",
    "pdfkit": "^0.13.0",
    "razorpay": "^2.8.6",
@@ -1,37 +0,0 @@
-// const { exec } = require('child_process');
-import { exec } from 'child_process';
-
-const migrate =
-  'APPLICATION_ID=legadranaxn SERVER_URL=http://localhost:8080/app MASTER_KEY=XnAwPDRQQyMr npx parse-dbtool migrate';
-// `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=${process.env.SERVER_URL} MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
-
-exec(migrate, (error, stdout, stderr) => {
-  if (error) {
-    console.error(`Error: ${error.message}`);
-    return;
-  }
-
-  if (stderr) {
-    console.error(`Error: ${stderr}`);
-    return;
-  }
-
-  console.log(`Command output: ${stdout}`);
-});
-
-// const seeder =
-//   'APPLICATION_ID=legadranaxn SERVER_URL=http://localhost:8080/app MASTER_KEY=XnAwPDRQQyMr npx parse-dbtool seed';
-
-// exec(seeder, (error, stdout, stderr) => {
-//   if (error) {
-//     console.error(`Error: ${error.message}`);
-//     return;
-//   }
-
-//   if (stderr) {
-//     console.error(`Error: ${stderr}`);
-//     return;
-//   }
-
-//   console.log(`Command output: ${stdout}`);
-// });
@@ -40,7 +40,7 @@
                "id": "c1935cc0-28d4-3d73-b72a-8c1e3d18a17f",
                "queryType": "",
                "class": "contracts_Document",
-                "query":  "where={\"IsDeclined\":{\"$ne\":true},\"IsCompleted\":{\"$ne\":true},\"Type\":{\"$ne\":\"Folder\"},\"Placeholders\":{\"$ne\":null},\"ExpiryDate\":{\"#*gt\":{\"__type\":\"#Date#\",\"iso\":\"#today#\"}}}&include=Signers,AuditTrail.UserPtr",
+                "query": "where={\"CreatedBy\":{\"__type\":\"Pointer\",\"className\":\"_User\",\"objectId\":\"#UserId.objectId#\"},\"IsCompleted\":{\"$ne\":true},\"IsDeclined\":{\"$ne\":true},\"Type\":{\"$ne\":\"Folder\"},\"Placeholders\":{\"$ne\":null},\"ExpiryDate\":{\"#*gt\":{\"__type\":\"#Date#\",\"iso\":\"#today#\"}}}&count=1",
                "key": "count",
                "Redirect_type": "Report",
                "Redirect_id": "1MwEuxLEkF",
@@ -1,5 +1,4 @@
-[
-  {
+[{
    "_id": "H9vRfEYKhT",
    "_created_at": {
      "$date": "2023-09-04T14:04:00.669Z"
@@ -106,14 +105,6 @@
            "pageType": "report",
            "description": "",
            "objectId": "zNqBHXHsYH"
-          },
-          {
-            "icon": "fa-solid fa-address-book",
-            "title": "Contactbook",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "5KhaPr482K"
          }
        ]
      },
@@ -246,14 +237,6 @@
            "pageType": "report",
            "description": "",
            "objectId": "zNqBHXHsYH"
-          },
-          {
-            "icon": "fa-solid fa-address-book",
-            "title": "Contactbook",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "5KhaPr482K"
          }
        ]
      },
@@ -286,5 +269,4 @@
    ],
    "menuTitle": "Admin Menu",
    "menuType": "Side Menu"
-  }
-]
+  }]
@@ -1,54 +1,55 @@
-MIIKCQIBAzCCCc8GCSqGSIb3DQEHAaCCCcAEggm8MIIJuDCCBG8GCSqGSIb3DQEH
-BqCCBGAwggRcAgEAMIIEVQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIpumu
-bFabBWACAggAgIIEKDqHS7Icd5MzIBk1dBokGK2s+5a2fA4308WA1QzEWmczqVYI
-z6lYmW8qsiZIw4PFkRzdIx1+zCmP8jgWiiqh5RKnbHYmh1JPNyx9SqmUDILDXmjg
-KxO9agRw9LXge4hgRL7YW0TxYZYw4EeXV9Yr7kcOq9DoO2MoRikJ+2Tuvvq/hfuV
-9zFHsz4jpf7W95k1IeH6bZ92klz5R1e/EK8JuHy592i/u+BxxW1vTkiPpTaHD6s9
-1lDSkT1j0LIDU6l9gVvJvFBV8j88vet/Z4QkTbHPMYvBnKNRstKuOvDasEJE4RkA
-PV4TfBwFF6uvREZI1vBboM/18pzeyjoRX+mlJNfcH3kh1tkck+Jg+M2bLXAH1EdD
-GRwENvnTNW1CFIn37VVja7SFBQNXA+E6rejmqtUmZ5XktSINDBUyjow9XuYTUtI/
-sgcRSC0aB0EKKpphbFPp1niKCLm1ef33e+bWyWbtR2L2Kc3ETmhjNADpyapAGmzc
-LP2BafGaKj18KiLAG4GL6+kXk0GUz7Fw5q8H8RY1T33o+xjWvC0+aJgvr65qWdKw
-+ug6wuu4Cr2kFEuXxPKsnYqmE5NT/x+lfunlZ5iEQN3w2XO5J2u2eMXVRUsPH2T6
-0sJKomjY0RB1JsqZBnyleWm+tYo0RpVAyJ3NGBp9dVb7a3Qw6jNZBG/xMW+gvtUJ
-q6hfK/cD3cagD0NQFVD5STMOuGOSqq/bbwAKjZ/lrPmCCYATKwkjAFybYfHJVrrW
-Y2tQgCQ/zrZLIxQjp7F17hU0+gT54x0MpF6AoqIM/qqNnHrQ0fi50ECmLvx3SqYa
-nvjvt/HZhMZfqRXiXjeicIwpnNoG7+uQknySk+7cc9GNhHZR7cfPfkTpgvuuebrQ
-l5YW+k9tG+xrX8g72nvtFMnammlBixlFwECJaEszEQk5tc2ti8uG2z+kGnFoDoBV
-M6ZVMpKDJzXPxLdzT6ChIPyatjIkqOKe6vDpnmzcoEhbBhmtkVjWFA2dfX846ugV
-y1QiecWgk8pMNWhh3IDd05v/wzbFwNcq+Gi+1dZsPmFH+egIcrQKZu2r3jCJtGHh
-DNG/nyf/anqvKXF90bi4hRT3vdDXXuWgY7EUwfn9h5jYabCO6HsQxQOBjFYNmBrh
-MfaiBZe72E8fzNAfIlwDcJ4AWY1SOM7hi8bqfRWw1NtNxuMUiRFoR31O6XkQauye
-9hAmpdlZHZXtJ6LM0QaWkPJmG3058GMtIn/qS60V9nINh+zXhwza/1pnFB+e9MWc
-hAPgo0nn55FusM//g1nM31PKe+nOm3Jyp0nEQ4m8aDtJS63o2fvp3e2KJbPWQMHE
-a83W975diWg4NTdevV9lFpNllHclVoPoavUHIzHd7HF9TcPpjbXJSUZ7cITHHefr
-kQTa/2G9cWuRhN9GKIHBdr13nfEvMIIFQQYJKoZIhvcNAQcBoIIFMgSCBS4wggUq
-MIIFJgYLKoZIhvcNAQwKAQKgggTuMIIE6jAcBgoqhkiG9w0BDAEDMA4ECDgnjfOf
-AjArAgIIAASCBMgkbVuptroBdyMY5gl/eBQj5+iAV02YSaF969ihStLSWI4x5FAf
-HuDgqCyEMSl4RHG8ZvNaO9JoNfIpMK/TPQBoQRCzE2Vjf66VTERaQtU6h7tZrbQt
-K96n9eqvohm/vXbXe08fsodYp2s79kAvKgpuGG5iX77qYVzJHBPed87cvczo4ToP
-CpurDpByt8fGEmjtcikal8o+H9uoHjcFwqMigX1Q7IEjuKXrb5e6wTvxMRob8yfv
-LVl6ahteKSkWCMb6rLZ5f12jDoCGX/YXRrSsU9t/lXe0Nxv5i7c8flb2EsNtwygD
-fexVvn5u6ble6RDYNpuQkPgF41HyZh+JvGAF6i1r4tJPL9Pf4HnjEB8Y8IHgon+w
-T5I+8LTgcrWyhptzblXMjKySTEp9OEa2cCVwZkl4z43PWJ5oIAQ2IDTOQ603/5o/
-d9KA76/zMPQ5O0gv17OA7kwFv98v6sTcR4vgkQZqnyDpJSEPHyNxhw2MSBqS3jq3
-YPhRz+3Ei1oFp9uYFhzn39f9gzNi++X9pOjSrDb8v3mcDXZKNrxQLuoRMSf0eQNI
-dgJRqj/fuqNZ5ac3kd4P5BALCsnA1tM27zYrgUdpOnrc2D9FBthEjpRlQKMMzhQf
-cNMFWmoNjakDilvvLcsQeQ3P6cXbN1ODoNnjgK3VzcmeKyzW2PrTXEPHARUM3j4V
-sZzGaUOVKLqaaDrXWQKC0vrTvxP2WMfjQ1dTdXQP/kSZTXRC5rtB9tky38flBor0
-N9rhUDIGMs5qBvyrkV2hKXiW39G69p1KWY+Cw28AzY+CNSjePRi60TsnUxgcOS7i
-0AT25Gx3A4YqxmTY38MPB4wPcBPcw4hjNoQamaC9mqs+KVHcP5YHUlqykMeH0YVi
-J+ehytJE9xuDcfBOjxjadxp3/q/Lku4rky89gdJGFQWuuz75VulDywPRZRwmQTel
-sjEGMHR1zTOlPJdTDWhqaKmWvL4GhbCgEPIKwmqd1QKRTl/3Baa1nYllJeYVwiTT
-qLCkbA6qXrLGj1ENZxrKn9yqr8HwOoApjwhARu4LF/BRMgdkzelK2kOXHnZ26sZ2
-NY/MMtVmq4c59y6iQwmsbHr9tWGz3ahyXcZZufjNXU/AVnO1c92g7umAWZF4RohL
-gMmh57cAhN9PEbEv6j/6BT3XXp8jB0ywcRriYxfxwidviCKH/76Q4sytYJQaDFI1
-fnzmv0aDotbG2BdpWSiYPDOPm+3cmfjlULsn1FYWL4NDCX1f+C4lNtKVX9LU8c5M
-m8dA1DUlDfnuNO5/BShuoGXG2z4O/XwxIaRFizMxWS2sWurbAEFJ6oNw3kC7WSah
-NIe8aUC1umpc1Gk3X2f4Ytzj9OEqn0y55qoqLINJuejXMffF/gjopxHWadLVaVaj
-Q1SewrECuEXdSbBR/a10po24wmRtkmlvRJXJl7sG95xE5ZCqp+m6sRPWGdf1yKbV
-vyWNUe4Qvkxe4a0VAJpTyIGr980CKz/jkvtNQMobGl7AfhxKJ450wg454WcexMct
-BYXvZMSdUDCgMLlh0nHJHl5btrFWqE0Z/fqWmIknZL2jZ4J+2hdVl/xB/sUt6kcu
-txw+RfL+vNE8PxhTNaOdJFwD8yeN1mJ3yMUA8HHYpw9yljgxJTAjBgkqhkiG9w0B
-CRUxFgQUDYlgGVxSxuOknhQc256x3++7BDwwMTAhMAkGBSsOAwIaBQAEFFjASdYl
-3pXAXxZuvVvv9tsb4bdrBAhyb+KCIjp/gAICCAA=
+MIIKLwIBAzCCCeUGCSqGSIb3DQEHAaCCCdYEggnSMIIJzjCCBEIGCSqGSIb3DQEH
+BqCCBDMwggQvAgEAMIIEKAYJKoZIhvcNAQcBMFcGCSqGSIb3DQEFDTBKMCkGCSqG
+SIb3DQEFDDAcBAh6cQqVpHfTzAICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQME
+ASoEEFKEIGJTTRo3voO/FvsXs7yAggPAI7rMCboTFFBfdMuuV3Y9/xfphAgdGD7P
+0xAN10CcmXlMtedc8cRxOaD9n3Q7zJx5iIbqEGDTc0dgp5EtdWsGl7MP76iHkSfB
+ZUPc13nbnRU4Nq4hNFcSj1m6NVa0lT9UobbTsG+wUkJn8aLfijzZ1OY82KLlKUoJ
+lqLsQ1yZkeLiLKI0aEew/2vzfiLUX9A99qnCRoryo8ZbLiWl0Vu/FEKM5mqIRFEp
+BKeSUsRxBfJCMZ2Ks5t4/MTCV+yrcsuhLPF/AJpzKfIinEFDhm7MxP4RXtk2LWNe
+EO2GuFRjZCfsMO0oNWybFmDeNDMCHZj5TeoqL1JwAV5e1lEeqR38v4Wcr4OVefY
+DfdrJ2xdvm7XbBZ8Lgx8L4fwugw7oDyTpR2jJqHMlpOsQrxipN6UKkN6EVYeCC5K
+4dF5LHdCcIa7L/OI/feD5g/zz8SGCTc91husVN7zi+CVO0lQLRkAj02+VbiXPPDD
+eQm/QBieG2yVe5IRfcnIs2aszulbQbgHdguSYSQa/7DEvN/9/uxUIRFbItwrreRI
+VAUUNS02L680Zok9xzDed1I/WJoPr2+5n2eV1jc5zoH7mAni0+Z1d5qLoYV6pNaN
+P9okvBf75LLNoJKsb/eWlkk73rmlH6/Qz+hudgnlkxUJuU/b79AMQpd0EWEWhcim
+ZeB4d9lPLLwyvY/FN4aCGWzsoAW69RK9E1DyGZAZRYRwCKHSWXmCaenR1ilxcPFx
+TDavpybObIISPtylv5Z/IGBjE19Lw0UHc6Waln/jx0YXXGGDWs1F/MrdJ/8mkVXf
+tHB/5ds4u5md+CmXpaCITO3Cg9GltGSWyDoEJsz1u/Wzq4X4FYmolXiqQvMPQrxu
+iThTnPDGbz9VqFSyNKPKswIQ8CUbvZ209A5vjERPzE0Lp1pO39K51fnHD9oD968t
+tGbGmNiQ0++Orze79cH0UVwDa6NLGCmnE0oBgke1JDPlaU3kkx7+R9SAS0Zytsmj
+aLxW5Z1cOFaqqBLjwgHUxOqRO+cl6P9ORox34wJjiwZKy1L+0ppw22Na/unwi2Rk
+a8jvK7+ycOLaiSmI77T0l7VCWgKsRsWLvBA3cjX5XAGtatFXrY/7Imoxl0nWGLjG
+n5Sv5XuDek4e4QAPeJmhpURMnzLDsSXAYOSYZvS/kgENYhYSnQLQp50TxrzquA2c
+lAeFIEqqAJy9tAMfp5UAqMeOC60Ttn6ySsdOle003F2NrRilhPynNDZ3h1ZQknur
+Y9zWUm9qBmXCjhPzdmzHz3Ozj2Bi6kd4MIIFhAYJKoZIhvcNAQcBoIIFdQSCBXEw
+ggVtMIIFaQYLKoZIhvcNAQwKAQKgggUxMIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkq
+hkiG9w0BBQwwHAQIZenzippqfSQCAggAMAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUD
+BAEqBBCddSIj/wfxowZAO1j3W9FwBIIE0C/guzeZtV/vPsaIDAtWEkmepCvhm9Rg
+aUgOoR66wjyYx7upeuZJ+pYJdsEqUmTgGYN+ClBpsU0bqCM7PI0mepvIT9kLD6ZL
+UkprtNAYP87NBA/e5dpXlGAf9ibDRT0F2Y+lCSF83rCIYKG8n7h5834F6Saf+dU7
+6y5bgorbf2Fnxy123XfUSg5qdCraZZM+DwE1gpQdBGrFyq8cwlQ8hJpKHDWup7WA
+f2HcT/X0Wjb24L6JWjC1FvTbTNdS/lzTOcqLYUc31iuU9rF6O4qtX9PK/yGWc+YE
+qakuV+HrsF4je/YdVZRYHtkbbcYXW9PjtMv+4D1ut5X2SPeHwpj3WmGAb7Zno6SD
+SfohMihXvDbIjVSMDBpW97bhgk0h7iS4ISIYoQJUGJv3QQ3XJq91LoIP3zpiO/Cq
+ZuuHuGvZmO6lb0PGShRT7mFg3k3rswTfFyKdtY76zAVJIR2bz/6bRf4uQI48SOLR
+NX1Z6lavUNiE4nPNlnfBp480C+YANKs/bdev0wkRVmFxPMyb5FFLXwLSqcfdSQag
+RayrKd8xPOm6lor3cTvrkO3XH2Hf9TgFHjeIAQ3VZ1Cncb9jfra3V4zvIocek4dC
+GREirPbEyL/js5O0aAa0mg9EontMWKRqncomKhUOckheP2dYiQOazDFDFP9OQCYV
+MBb0RDwm3+hiMU0lPeO+NAjAv2SfFK7G4maMb2SL7inT7An7ZPPpnDNXLDt+nOgo
+IKuaJpy8JX/OKB4ntYsdnQG4E0J3vpHWjYPKif7j1njIYFd76bIgNVlqWuQFArBy
+U9BuPyF+eYouJc+TpX9R5ybPvabRR4NUjnrttr2E5AzQfIgNGrSFiewjvYZHQOKd
+WyVR9YV0cUv591xyUDdXMoHh+J0v0xK1WCHe/9enY5y/C8YohL8h5tEvInAQconj
+lJ2r9qX8iBmIupJij5M5Ebza8HQ4aVMdHu/s05Vj9BC6K0ok3h+DFTj2gUBD24sp
+APHic0DmNnciUQuHuuoW/1SVb6I1HJswsgcC8CekvoXF26ygwWhJPyqw+5djip2w
+I/l3uOnPPUWZQHKhnBH4noZydrzBBJN1po9dkxb8LKuKZDEcnKo+tQrTnZJaFRXK
+pQDsAjQ0HcYi8ZqN/GPezXOqzRgvObevXeDYTJrNejr46B1HqjPw8doai+AEf//1
+iiM9EK4y3bGbX837oebTByRi112AOctISHTWbF0zdFMiBO9X9PML4n3i14ToqLH1
+EUp0WtCdKLJmrRnO9PKJUMpce3yNu6oRSBzB4EkgUMOTVx9tM66h/gcR3wr+qKJP
+1EABMbbCsJeYYLujhQHVh0JluqLBXYuCmr5n6o8qmonj5tEfTn9zs2gi0OvKTliH
+wRXWsar004alt8D8o4M/Oqu3qyVV1O8BlVEofUC1CfAMIh/T1NJBeKG/FPfAFoEz
+9liLLkoDvGvFVJ4Ezy4BaPtg+G3yU/SeiruwsCB3unHRD7G6VvS4jY2B8vEYl0yM
+Z1mLFbKK8CIEvg8+v/vbc0noYUOzd6bkwh6Y6cziR/u78y2nALYZpQK+3XiVVH/v
+SaVoDckZgUwAX+dMd1P4U3a487MPXBZZmLVFMHTuv3NvW6NIQCMd4l35ViRd7YcS
+V2QDKTnUtPN2MSUwIwYJKoZIhvcNAQkVMRYEFMSz7PlBO5VzTDqC/foidPWrMjkw
+MEEwMTANBglghkgBZQMEAgEFAAQgPlLuG+67SxPOEPbgFuEnVgewvY6LUzFmrprx
+c6yryFgECIld0S5kDk7JAgIIAA==
@@ -1,23 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIUAZQ9QST2eBZz5k9pCa//mHQVm1QwDQYJKoZIhvcNAQEL
-BQAwcjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5ldyBZb3JrMRYwFAYDVQQKDA1P
-cGVuU2lnbiBMYWJzMREwDwYDVQQDDAhPcGVuU2lnbjElMCMGCSqGSIb3DQEJARYW
-aGVsbG9Ab3BlbnNpZ25sYWJzLmNvbTAeFw0yMzExMTcxOTQ0MzZaFw0yNDExMTYx
-OTQ0MzZaMHIxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhOZXcgWW9yazEWMBQGA1UE
-CgwNT3BlblNpZ24gTGFiczERMA8GA1UEAwwIT3BlblNpZ24xJTAjBgkqhkiG9w0B
-CQEWFmhlbGxvQG9wZW5zaWdubGFicy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDLRKLjCSrvV1zAY2leWxCvdKTUaThpQO8nWPE/4v5ilMU2aRON
-krAnli0LUfQ/tIRWNurxwVjJ7HrW3ICLn05GBLjm2AUCfuMbJCvOEEdmFJqRY04n
-12fBZWz2KtzbZEIBVxLhc4E4g+Rz68hQA2fqwNuFdyGkkIbhVXpZIePEppqRmw+2
-uuDvIzJ77rdDaLqwwPoHWenZ2uZTedKXx7PGYs98psg35GvcpssqAJGAIAi9Rzg/
-ZV4oSpGXCjn/TJy61zTDbmPFCS/rC1XBWzBQfwDeBPDI18W6gPVX6N4dp0Ao+n8Q
-txeI6g4FzMH91KPbdbZXxm8rZqXj87VQs9trAgMBAAGjUzBRMB0GA1UdDgQWBBRN
-NtRPagnqovdmbrdhSUON9Rwd3TAfBgNVHSMEGDAWgBRNNtRPagnqovdmbrdhSUON
-9Rwd3TAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBrcPyA7GHq
-+ol9qjy9HijpoU5MaEiV9v9H8/0v7KoXUND3rMl37yFyjxGN8uda8WxpEhE2eFnk
-Xjtm2NgPrv8qeYHor/A3y5RfQhnlCY4kE1bREZGhcuKihR4rOtmComwFjx4Ibwwj
-4nKsflj6rXcWKSfSNHLkXFXHPYwyqRsKdtClrD/8YJn6LeeMlMjIYGGP4qyi2WwS
-Z8hExWGEMaMWiA9rxTMX6iu/parGH/pWU/55Os3WlcHPhlvqchBkQFJ+f8b+NYz0
-vIHQgwn4K5WMsZVLxoiUcU7cSqE/qhnP+pzBf8lRaYwd+zUznDvzpKKz6nFgeHok
-s8BK7JAKkIsl
+MIIDXTCCAkWgAwIBAgIUdpdDPiNqilWn26oMvcpT9qmMtoswDQYJKoZIhvcNAQEL
+BQAwPjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAk5JMQowCAYDVQQHDAFOMQowCAYD
+VQQKDAFTMQowCAYDVQQLDAFTMB4XDTIzMTEwNTEzMDg1OFoXDTI0MTEwNDEzMDg1
+OFowPjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAk5JMQowCAYDVQQHDAFOMQowCAYD
+VQQKDAFTMQowCAYDVQQLDAFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAzT30t7Adb6XdXWywzC4RF03r3piTt5MF4MZClvorsl8bySNKrYkl7i5+igpz
+36SfLp090Dal0cUZ7it9QCxaxrWv3m8OFAwfwK5ePuzUryF6/QJcoF560Sq4k3Pb
+640PJ5UlFwvUqsXQN8A/pAA6S96MqpwCrPQE0u5OcRQuVIsZxBL2s17lv5eROjX+
+Ufx/6qtmuZscn9xKDP6GNO8aa6X0YZMoVXlll14iEn4bg0yagiY7QhvVCzK8q7nB
+9yKCLvw/28eSoD08yJnHnUZnIOoNrn+cZKTkl8VcyKW55IeOiUilb5h3a07JD6bj
+Q/VroPQE5UtveajB9CBa3eUCiwIDAQABo1MwUTAdBgNVHQ4EFgQUIQGrIwhvSNkG
+L3ATZra96d4cDE4wHwYDVR0jBBgwFoAUIQGrIwhvSNkGL3ATZra96d4cDE4wDwYD
+VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAp2mCfhRf6Jft6lSgL4hi
+I8xHfqcUjG+XnDM1Pi7gKVxxclwVQ67vVtfO0rU1SBPWUO3nIaaLN9Wyzcx+LXPV
+4e3pyHlq2T6Z6ENuozOsMhHeY9+ows6wPBcxq57KLLHnBpx3lJiKHKOp0ueiAbkz
+LaI+Mm+VQo0MbzhCw7KXs8VPFt8YO+S3XircVMWaa007VgGY/NjYF62hlG35fD/v
+CTHccRj5Y3coQ2MjosTUQTd4u3N5VhgxdRbyMdpjpwDxu0u9BE7ISXKMBhnBLV/w
+/mxoF2bqExBuPiZS8vT6yW9rehdi/KR9c26GUreTsKLtjXyveeP6VLoTJ60T3D9
+Jg==
 -----END CERTIFICATE-----
@@ -1,30 +1,30 @@
-----BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,5932FA9F02938D1B
-
-6gkkZP80WrVnR3dVwkimtfirSeYNXZlrXXBv+Ddjyq7FScqca7svJFd8ObC0xXjg
-nbxChDKS8SXcSjsNCTzixG0QReO5vaqovrpQoYbkSQ9GRMIVV8WuWNzlyMnypNJ4
-Z6hdpd5nkc1hIP8A6WcY3lA8msyHceU9IidEEb75CE743qsvUMko+XvqntZx/LNe
-0uK8Bs+cXeDzolpNX8ORKBTAOMii+WPlN2l+9ldsWTECEk4GmWa51QfpKouLxz5E
-u7fuGuku/nPKGb4Yj7sCgaD91UabRksDLS9UGDBqeNL+mogG3gY/Iu0/q2cUs6XR
-x1W6KW1eJHnOf1pAp7+G/zNqzdsxI3pnoR+nsV6/G0glBLar+Xqc99B568lnUWWv
-5NGN3Buz1axx1jPKIknDcT4Skmvt6TcmgrjoCQ9XvmNKVClpExQ+dKPmJI/EVNoU
-jjDZyfghcJ6BEMcTgoOBDiUrPM0273sb89u/AzyUA1tTciW2KARz6cOUTPWVRSRn
-4yXpkA4BJDpxRmK68BXorZLNxtvHk+on80c9tu5e+IVa3Gu1K7gc269TPmlIolAM
-v//i+jpwJ4Pe2IGVYdojMr15useUv7JC6/Kconnkx4q9rkMriguuXoQt8qW3kvEs
-Ur8KuibtDqhz2zGbsKboQFMOd6cdd+63dJCGAUqk4hFrSikTw3LhkXNcg9GZHq1z
-WFAfaA3x2jd+kJJ5xg8xMVEHax5IAOXDL2ektyPFpI1UZOuTc2i7FK6Y0NnXPkSN
-G/+DsKdLWT943mPfZj01mTRi3MgseDXsHMHGmmPxW9J4jv+WW4OdpHvd474QzJ8b
-vQmyiKq4XPHsuQUkzHVPbTrGe1B9z4p97YQKdEfXP2ChGFsUHCYQdpHyXwie2+pq
-E2rc7Bai0OuL0anYMSIvDrJ0DE8mVVaFur1b2Uz6ieCDlrOXnzD1BrcleiZem7og
-on/3oCUK+qxibCCcd5Hg2HtPusa43U0/UbCrqb2sww9iN36DLdtef/jlozKNiBx9
-e8ZztF6GtAKhIdgGW/M9TXMUZOYr7aaXO71MsqhwpVWZ5dNqagOBzhmd7Etokf1H
-O0WxJZ5XPDsnlKwYq86ssK+2RCNYAuvZoM3dRCysPvXoBFmsmHDzKdbKcckd8Vxr
-6P1yaCkB/iX55dUqwKfIuqxY3m4MA2Us9DD0BRxZOSUqHhzHHSogsLhqLQEQENA4
-U9N/v/za81UaU8nfkAswsGlTdTKjWH6Fzc0NeagbEFtpUaG/WIHPesUzU7ZNvMzR
-SQACVWl62Dley2g2eAgcrsIn78MbwNJI2YN5eXIw0K2MiMlGXWOEvkjIIVfjc0/d
-QxLFJwqShZBVO+jnAJ8jti7mP6PgskjtfHNAIphRJ4fm9h/Ns1YMpipBRVBDhbwY
-AOVT4bRw9Q3O5I0pe10ZdViAhexegQ8yGt3pUlKaUf9GRwIFEknjZ5Pc98V/R/wC
-INSIOZzDHj2uyZ3p7ToF1Z6kVVbbyfqDOnxUiV2ykR8ZqQMXNWcEJKH8qRqI+VHf
-oszD2BQvXgkWdrJtHuHjJCdDl03Y+daS5yP8IKTDucHvRv4ZSMghZ34SJTw5MaBP
-----END RSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIJvntFBuTIWACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEE+1CDDu5XvBIIEyEwR/61HhjJ0
+P6oGr1E+uDTKVcUqK++fbsrhqxYq+oEoj+w5C1KOgUxQYQTm2he6PhfGkPh56V9w
+OaArJ+QrGrSFRUdTtLZG+qBbfyWKQyah9VxwYhmG9Ptf6RyQXDJnup4WtgJWI2sw
+fAcJ6QqPQkSFUq/0cn0s/RLNCy6P8qKfUjdVugEv0K9dsc7dFNWZQEQlpyKeZdbY
+rJfKjf85qSmDpFfRnP1B0n//vzlPWK03fNH2be4EnBTFW7l1sDnju6iwasLSP7P+
+EuGq8Bw9YGlf3I/STWGgfxWWLZACCjgVDiRjLakstkodLqC1tZAWawOKcDQGPyKG
+nRrF/yF4H0ChmcMBA9Ur4zxBd4uayWujwqIPehfWU+ODYYaVDluSVrxiTaSHGAP2
+XnT6vrOnR5sg/uzgsbuApHTbHCW+lplof/R0swvwyt15fKaD8HsngNMN6R75e0ar
+6+ltI/BLgcSbu0f7Fe8qMumBNrJiU5j09EdvDKaIEe3+Ko2HWCV/zLgxvL8BwGyB
+K9RSMw1YzivO/CahWE3cQcS4GQSX84+y8VXF43CxpmTRf3Hmdpj4JBGB0fOvGHzA
+hv+st5E+hhSOOv2ZZ00XtEaUi3d2uQFYApxEoXubz2QG481M7ulNXaVd74DZf/Fr
+J+R7BmCa633rEw34sXFKUcfdfVOzUfMnMGvO5danSrov6k/cFfLPH56ORb9Ep30a
+U1fXHP+pcFQohR/kjAk5gjDUr8pjkOJ0/JHv106rptT4SNCznvJa8BvWtP9wDXDv
+UZDA/UCLlnl20mJUjLtb0iM5vtqhi7XOxDoS8AauOimSEh+M0uLEZ7HOQvtGchLl
+tDLd/DVew/WzPBhL4eNTmhwwno9JL21nPBEaFAa58djoiZXgzUdLQbBDbo/7nsRA
+UJ9imt0HmhDU+xrimnMZJD051KcbohHjPvTnTb4qvd0Rt7u/dpL9NT07rQlVIe3u
+qGl4sEe+1vEueRdHt5QCSGbxnwPPHdE9XMsK8et3M/DOYN+ToB9QmDm72lLsJNkm
+0nxdYVpfXHUiPmMorkJgb9YXfY+j0UEWuT0l4bl7a5+mzGm/Zy9FCoLaW7MTWNJd
+fyDSYsVotOhRdCBi0Osho21GldKmfX6XoqHYENVqsh7x9bgvjNwvLNgpCWXYh7/Q
+K6N3iDQ3G3A6x9nOgeKpXYREd8fx8byM6u7FAttVTtcV71QaWU3TSn7Oice1Bklg
+osIhUJydHny856D/WCD6EmnPBuukx9Tht8NKtJVS0XoXqbz69mx4xfq987HGkJJa
+nvCgkZOr/LhcVylmRjg9ZVfiUrwim4Gp42gV3JtsZpOGE1m+1twSXShtr/PQ2FdF
+jD41LOEG1OGdZ5XIDLxAI4085jwVD/WIRo/AZELENog1XKtjeXSqJ/H7njauB30w
+MeNv0VRTIItVA0eXRDwoqjpqyGSdn9YF2SQ/qDR6WU+Y2bVD38m6ZJlsy/zHx9uc
+sH1DK7hbbRRSuZ9Sx/TjD19DWJ4qNPTpUZTd0+dxsG/HGQKpkbpXI5f3aQ6nTWWM
+MjlWF6mUI06iLIRhLyNwBrtEjJHL1k8fIOvO/MUKtj72VBGt/fnoutS0WifZLvfn
+mFXB4iaMX0hGcgzpK4iNcg==
+-----END ENCRYPTED PRIVATE KEY-----
@@ -29,13 +29,11 @@
        "react-dnd-touch-backend": "^16.0.1",
        "react-dom": "^18.2.0",
        "react-draggable": "^4.4.6",
-        "react-helmet": "^6.1.0",
        "react-pdf": "^7.4.0",
        "react-rnd": "^10.4.1",
        "react-router-dom": "^6.16.0",
        "react-scripts": "5.0.1",
        "react-scrollbars-custom": "^4.1.1",
-        "react-select": "^5.8.0",
        "react-signature-canvas": "^1.0.6",
        "reactour": "^1.19.1",
        "web-vitals": "^2.1.4"
@@ -2311,65 +2309,6 @@
        "postcss-selector-parser": "^6.0.10"
      }
    },
-    "node_modules/@emotion/babel-plugin": {
-      "version": "11.11.0",
-      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
-      "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/runtime": "^7.18.3",
-        "@emotion/hash": "^0.9.1",
-        "@emotion/memoize": "^0.8.1",
-        "@emotion/serialize": "^1.1.2",
-        "babel-plugin-macros": "^3.1.0",
-        "convert-source-map": "^1.5.0",
-        "escape-string-regexp": "^4.0.0",
-        "find-root": "^1.1.0",
-        "source-map": "^0.5.7",
-        "stylis": "4.2.0"
-      }
-    },
-    "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-    },
-    "node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@emotion/babel-plugin/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@emotion/cache": {
-      "version": "11.11.0",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
-      "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==",
-      "dependencies": {
-        "@emotion/memoize": "^0.8.1",
-        "@emotion/sheet": "^1.2.2",
-        "@emotion/utils": "^1.2.1",
-        "@emotion/weak-memoize": "^0.3.1",
-        "stylis": "4.2.0"
-      }
-    },
-    "node_modules/@emotion/hash": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
-      "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
-    },
    "node_modules/@emotion/is-prop-valid": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
@@ -2382,52 +2321,8 @@
    "node_modules/@emotion/memoize": {
      "version": "0.8.1",
      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
-      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
-    },
-    "node_modules/@emotion/react": {
-      "version": "11.11.1",
-      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.1.tgz",
-      "integrity": "sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA==",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "@emotion/babel-plugin": "^11.11.0",
-        "@emotion/cache": "^11.11.0",
-        "@emotion/serialize": "^1.1.2",
-        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
-        "@emotion/utils": "^1.2.1",
-        "@emotion/weak-memoize": "^0.3.1",
-        "hoist-non-react-statics": "^3.3.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@emotion/serialize": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.2.tgz",
-      "integrity": "sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==",
-      "dependencies": {
-        "@emotion/hash": "^0.9.1",
-        "@emotion/memoize": "^0.8.1",
-        "@emotion/unitless": "^0.8.1",
-        "@emotion/utils": "^1.2.1",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@emotion/serialize/node_modules/@emotion/unitless": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
-      "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
-    },
-    "node_modules/@emotion/sheet": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz",
-      "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA=="
+      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==",
+      "peer": true
    },
    "node_modules/@emotion/stylis": {
      "version": "0.8.5",
@@ -2441,24 +2336,6 @@
      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
      "peer": true
    },
-    "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
-      "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/@emotion/utils": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz",
-      "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg=="
-    },
-    "node_modules/@emotion/weak-memoize": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz",
-      "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
-    },
    "node_modules/@eslint-community/eslint-utils": {
      "version": "4.4.0",
      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -10730,11 +10607,6 @@
        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
      }
    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
-    },
    "node_modules/find-up": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -14937,11 +14809,6 @@
        "node": ">= 4.0.0"
      }
    },
-    "node_modules/memoize-one": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
-      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
-    },
    "node_modules/merge-descriptors": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -17880,25 +17747,6 @@
      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
      "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
    },
-    "node_modules/react-fast-compare": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
-      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
-    },
-    "node_modules/react-helmet": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
-      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.7.2",
-        "react-fast-compare": "^3.1.1",
-        "react-side-effect": "^2.1.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.3.0"
-      }
-    },
    "node_modules/react-is": {
      "version": "17.0.2",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -18154,34 +18002,6 @@
        "react": ">=16.0.0"
      }
    },
-    "node_modules/react-select": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz",
-      "integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==",
-      "dependencies": {
-        "@babel/runtime": "^7.12.0",
-        "@emotion/cache": "^11.4.0",
-        "@emotion/react": "^11.8.1",
-        "@floating-ui/dom": "^1.0.1",
-        "@types/react-transition-group": "^4.4.0",
-        "memoize-one": "^6.0.0",
-        "prop-types": "^15.6.0",
-        "react-transition-group": "^4.3.0",
-        "use-isomorphic-layout-effect": "^1.1.2"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/react-side-effect": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
-      "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
-      "peerDependencies": {
-        "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
    "node_modules/react-signature-canvas": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/react-signature-canvas/-/react-signature-canvas-1.0.6.tgz",
@@ -19692,11 +19512,6 @@
        "postcss": "^8.2.15"
      }
    },
-    "node_modules/stylis": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
-      "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
-    },
    "node_modules/sucrase": {
      "version": "3.34.0",
      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz",
@@ -20608,19 +20423,6 @@
        }
      }
    },
-    "node_modules/use-isomorphic-layout-effect": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
-      "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/use-sidecar": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
@@ -25,13 +25,11 @@
    "react-dnd-touch-backend": "^16.0.1",
    "react-dom": "^18.2.0",
    "react-draggable": "^4.4.6",
-    "react-helmet": "^6.1.0",
    "react-pdf": "^7.4.0",
    "react-rnd": "^10.4.1",
    "react-router-dom": "^6.16.0",
    "react-scripts": "5.0.1",
    "react-scrollbars-custom": "^4.1.1",
-    "react-select": "^5.8.0",
    "react-signature-canvas": "^1.0.6",
    "reactour": "^1.19.1",
    "web-vitals": "^2.1.4"
@@ -47,7 +47,7 @@
      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css"
    />

-    <title>OpenSign™</title>
+    <title>OpenSign App</title>
  </head>
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -1,15 +1,7 @@
 import React, { useEffect, useState } from "react";
 import "./certificate.css";
-import opensignLogo from "../../assests/open-sign-logo.png";

-import {
-  Page,
-  Text,
-  View,
-  Document,
-  StyleSheet,
-  Image
-} from "@react-pdf/renderer";
+import { Page, Text, View, Document, StyleSheet } from "@react-pdf/renderer";

 function Certificate({ pdfData }) {
  const [isMultiSigners, setIsMultiSigners] = useState();
@@ -57,34 +49,70 @@ function Certificate({ pdfData }) {
      fontSize: "11px",
      marginBottom: "10px",
      color: "gray"
-    },
-    image: {
-      width: "71px",
-      height: "17px"
    }
  });

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

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

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

  const signerName = (data) => {
@@ -115,19 +143,7 @@ function Certificate({ pdfData }) {
        {/** Page defines a single page of content. */}
        <Page size="A4" style={styles.page}>
          <View style={styles.section1}>
-            <View
-              style={{
-                display: "flex",
-                flexDirection: "row",
-                justifyContent: "space-between",
-                alignItems: "center",
-                marginBottom: "30px"
-              }}
-            >
-              <Image src={opensignLogo} style={styles.image} />
-              {generatedDate()}
-            </View>
-
+            {generatedDate()}
            <View style={{ justifyContent: "center" }}>
              <Text
                style={{
@@ -166,9 +182,7 @@ function Certificate({ pdfData }) {
                  </Text>
                  <Text style={styles.textStyle}>
                    Organization : &nbsp;
-                    <Text style={styles.textStyle2}>
-                      {pdfData[0].ExtUserPtr.Company}
-                    </Text>
+                    <Text style={styles.textStyle2}>__</Text>
                  </Text>
                  <Text style={styles.textStyle}>
                    Completed on : &nbsp;{changeCompletedDate()}
@@ -246,12 +260,6 @@ function Certificate({ pdfData }) {
                        {pdfData[0].ExtUserPtr.Name}
                      </Text>
                    </Text>
-                    <Text style={styles.textStyle}>
-                      Email : &nbsp;
-                      <Text style={styles.textStyle2}>
-                        {pdfData[0].ExtUserPtr.Email}
-                      </Text>
-                    </Text>
                    <Text style={styles.textStyle}>
                      Accessed from : &nbsp;
                      <Text style={styles.textStyle2}>
@@ -1,80 +1,124 @@
 import React, { useEffect, useState } from "react";
+import axios from "axios";
 import { useNavigate } from "react-router-dom";
 import Loader from "./component/loader";
-import { contractDocument, getHostUrl } from "../utils/Utils";
+import { getHostUrl } from "../utils/Utils";
 function DraftDocument() {
  const navigate = useNavigate();
  const [pdfDetails, setPdfDetails] = useState([]);
  const [isLoading, setIsLoading] = useState({
    isLoad: true,
-    message: "This might take some time"
+    message: "This might take some time",
  });

  const rowLevel =
    localStorage.getItem("rowlevel") &&
    JSON.parse(localStorage.getItem("rowlevel"));
-  const docId =
+  const signObjId =
    rowLevel && rowLevel?.id
      ? rowLevel.id
      : rowLevel?.objectId && rowLevel.objectId;
-
  useEffect(() => {
-    if (docId) {
+    if (signObjId) {
      getDocumentDetails();
    }
  }, []);

  //get document details
  const getDocumentDetails = async () => {
-    //getting document details
-    const documentData = await contractDocument(docId);
-    if (documentData && documentData.length > 0) {
-      setPdfDetails(documentData);
-      const loadObj = {
-        isLoad: false
-      };
-      setIsLoading(loadObj);
-    } else if (
-      documentData === "Error: Something went wrong!" ||
-      (documentData.result && documentData.result.error)
-    ) {
-      alert("Error: Something went wrong!");
-    } else {
-      alert("No data found!");
-    }
+    await axios
+      .get(
+        `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
+          "_appName"
+        )}_Document?where={"objectId":"${signObjId}"}&include=ExtUserPtr,Signers`,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+            "X-Parse-Session-Token": localStorage.getItem("accesstoken"),
+          },
+        }
+      )
+      .then((Listdata) => {
+        const json = Listdata.data;
+        const res = json.results;
+        
+        if (res[0] && res.length > 0) {
+          setPdfDetails(res);
+          const loadObj = {
+            isLoad: false,
+          };
+          setIsLoading(loadObj);
+        } else {
+          alert("No data found!");
+        }
+      })
+      .catch((err) => {
+        console.log("axois err ", err);
+      });
  };

  //check document type and render on signyour self and placeholder route
  const handleDraftDoc = () => {
    const data = pdfDetails[0];
-    const hostUrl = getHostUrl();
-    const signerExist = data.Signers && data.Signers;
+    const checkSignerExist =
+      pdfDetails[0] && pdfDetails[0].Signers && pdfDetails[0].Signers;
+  const isPlaceholder =
+      pdfDetails[0].Placeholders && pdfDetails[0].Placeholders;
    const isDecline = data.IsDeclined && data.IsDeclined;
-    const isPlaceholder = data.Placeholders && data.Placeholders;
+    const signUrl = data.SignedUrl && data.SignedUrl;
+    const expireDate = pdfDetails[0] && pdfDetails[0].ExpiryDate.iso &&  pdfDetails[0].ExpiryDate.iso;
+    const expireUpdateDate = new Date(expireDate).getTime();
+    const currDate = new Date().getTime();
+    const hostUrl = getHostUrl();

-    //checking if document has completed and request signature flow
-    if (data?.IsCompleted && signerExist?.length > 0) {
-      navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
+    //checking document is completed and signer exist then navigate to pdfRequestFiles file
+    if (data.IsCompleted && checkSignerExist) {
+    navigate(`${hostUrl}pdfRequestFiles`);
    }
-    //checking if document has completed and signyour-self flow
-    else if (!signerExist && !isPlaceholder) {
-      navigate(`${hostUrl}signaturePdf/${data.objectId}`);
+    //checking document is completed and signer does not exist then navigate to recipientSignPdf file
+    else if (data.IsCompleted && !checkSignerExist) {
+      navigate(
+        `${hostUrl}signaturePdf`
+      );
    }
-    //checking if document has declined by someone
+    //checking document is declined by someone then navigate to pdfRequestFiles file
    else if (isDecline) {
-      navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
-      //checking draft type document
+      navigate(`${hostUrl}pdfRequestFiles`);
    }
-    //Inprogress document
-    else if (isPlaceholder?.length > 0 && signerExist?.length > 0) {
-      navigate(`${hostUrl}pdfRequestFiles/${data.objectId}`);
-    } //placeholder draft document
+    //checking document has expired and signers exist and placeholder does not set yet then navigate to pdfRequestFiles file
+    //draft type request sign document
    else if (
-      (signerExist?.length > 0 &&
-        (!isPlaceholder || isPlaceholder?.length === 0)) ||
-      ((!signerExist || signerExist?.length === 0) && isPlaceholder?.length > 0)
+      currDate > expireUpdateDate &&
+      checkSignerExist &&
+      !isPlaceholder
    ) {
-      navigate(`${hostUrl}placeHolderSign/${data.objectId}`);
+      navigate(`${hostUrl}placeHolderSign`);
+    }
+    //checking document has expired and signers does not exist and document not signed yet then navigate to pdfRequestFiles file
+    //draft type signyouselfdocument
+    else if (
+      currDate > expireUpdateDate &&
+      !checkSignerExist &&
+      !isPlaceholder &&
+      !signUrl
+    ) {
+      // window.location.hash = `/signaturePdf`;
+      navigate(`${hostUrl}signaturePdf`);
+    }
+    //checking document has expired and signers exist and document then navigate to pdfRequestFiles file
+    else if (currDate > expireUpdateDate) {
+      // window.location.hash = `/pdfRequestFiles`;
+      navigate(`${hostUrl}pdfRequestFiles`);
+    }
+    //checking document has expired not been expired yet and signers exist and placeholder does not set yet then navigate to pdfRequestFiles file
+    //draft type request sign document
+    else if (!signUrl && checkSignerExist) {
+      navigate(`${hostUrl}placeHolderSign`);
+      // window.location.hash = `/placeHolderSign`;
+    } else {
+      // window.location.hash = `/signaturePdf/`;
+      navigate(`${hostUrl}signaturePdf`);
    }
  };

@@ -10,9 +10,6 @@ import { getHostUrl } from "../../../utils/Utils";
 import { useNavigate } from "react-router-dom";
 import Table from "react-bootstrap/Table";
 import * as HoverCard from "@radix-ui/react-hover-card";
-import SelectFolder from "../../../premitives/SelectFolder";
-import ModalUi from "../../../premitives/ModalUi";
-import { themeColor } from "../../../utils/ThemeColor/backColor";

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

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

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

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

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

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

-  const sanitizeFileName = (pdfName) => {
-    // Replace spaces with underscore
-    return pdfName.replace(/ /g, "_");
-  };
-
-  const handleEnterPress = (e, data) => {
-    if (e.key === "Enter") {
-      handledRenameDoc(data);
-    }
-  };
-
-  const handleDraftDoc = (data) => {
-    window.location.hash = `/mf/remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9MZWdhR2VuaWUtTWljcm9hcHBWMi9yZW1vdGVFbnRyeS5qcw==&moduleToLoad=AppRoutes&remoteName=legageniemicroapp/legagenie?${data.objectId}`;
-  };
-
  //component to handle type of document and render according to type
  const handleFolderData = (data, ind, listType) => {
-    let createddate, status, isDecline, signerExist, isComplete, isPlaceholder;
+    // console.log("data", data);
+    let createddate,
+      status,
+      isDecline,
+      signerExist,
+      isExpire,
+      isComplete,
+      signUrl,
+      isPlaceholder;
    if (data.Type !== "Folder") {
      const expireDate = data.ExpiryDate && data.ExpiryDate.iso;
      const createdDate = data.createdAt && data.createdAt;
@@ -297,51 +183,61 @@ function PdfFileComponent({
      isDecline = data.IsDeclined && data.IsDeclined;
      isPlaceholder = data.Placeholders && data.Placeholders;
      signerExist = data.Signers && data.Signers;
-
+      signUrl = data.SignedUrl && data.SignedUrl;
      const expireUpdateDate = new Date(expireDate).getTime();
      const currDate = new Date().getTime();
-      let isExpire = false;
+
      if (currDate > expireUpdateDate) {
        isExpire = true;
+      } else {
+        isExpire = false;
      }
-
      if (isComplete) {
        status = "Completed";
      } else if (isDecline) {
        status = "Declined";
-      } else if (!signerExist || signerExist?.length === 0) {
+      } else if (isExpire && !isPlaceholder && signerExist) {
+        // status = "Expired";
        status = "Draft";
-      } else if (
-        signerExist?.length > 0 &&
-        (!isPlaceholder || isPlaceholder?.length === 0)
-      ) {
+      } else if (isExpire && !isPlaceholder && !signerExist && !signUrl) {
+        // status = "Expired";
        status = "Draft";
      } else if (isExpire) {
        status = "Expired";
+      } else if (!signUrl) {
+        status = "Draft";
      } else {
-        status = "In Progress";
+        status = "InComplete";
      }
    }

-    const signersName = () => {
-      const getSignersName = signerExist.map((data) => data.Name);
-      const signerName = getSignersName.join(",");
-
-      return (
-        <span
-          className="statusSpan"
-          style={{ width: "90%", wordWrap: "break-word" }}
-        >
-          {signerName}{" "}
-        </span>
-      );
+    const handleDraftDoc = (data) => {
+      window.location.hash = `/mf/remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9MZWdhR2VuaWUtTWljcm9hcHBWMi9yZW1vdGVFbnRyeS5qcw==&moduleToLoad=AppRoutes&remoteName=legageniemicroapp/legagenie?${data.objectId}`;
    };
+
+    const handleMenuItemClick = (selectType, data) => {
+      // console.log("data",data)
+      if (selectType === "Download") {
+        // console.log("download")
+        const pdfName = data && data.Name;
+        const pdfUrl = data && data.SignedUrl ? data.SignedUrl : data.URL;
+        saveAs(pdfUrl, `${pdfName}_signed_by_OpenSign™.pdf`);
+      } else if (selectType === "Rename") {
+        // console.log("rename")
+        setRenameValue(data.Name);
+        setRename(data.objectId);
+      }
+    };
+    const handleEnterPress = (e, data) => {
+      if (e.key === "Enter") {
+        handledRenameDoc(data);
+      }
+    };
+
    return listType === "table" ? (
      data.Type === "Folder" ? (
        <tr onClick={() => handleOnclikFolder(data)}>
-          <td
-            style={{ cursor: "pointer", display: "flex", alignItems: "center" }}
-          >
+          <td>
            <i
              className="fa fa-folder"
              aria-hidden="true"
@@ -359,9 +255,7 @@ function PdfFileComponent({
        </tr>
      ) : data.Type === "AIDoc" ? (
        <tr onClick={() => handleDraftDoc(data)}>
-          <td
-            style={{ cursor: "pointer", display: "flex", alignItems: "center" }}
-          >
+          <td>
            <i
              className="fa fa-file-text"
              style={{ color: "#0ea3ed", marginRight: "8px", fontSize: "26px" }}
@@ -378,9 +272,7 @@ function PdfFileComponent({
        </tr>
      ) : (
        <tr onClick={() => checkPdfStatus(data)}>
-          <td
-            style={{ cursor: "pointer", display: "flex", alignItems: "center" }}
-          >
+          <td>
            <i
              className="fa fa-file-pdf"
              style={{ color: "#ed4d0e", marginRight: "8px", fontSize: "26px" }}
@@ -414,7 +306,7 @@ function PdfFileComponent({
              style={{
                display: "flex",
                flexDirection: "column",
-                cursor: "pointer"
+                cursor: "pointer",
              }}
            >
              <img
@@ -435,6 +327,7 @@ function PdfFileComponent({
                  }}
                  autoFocus={true}
                  type="text"
+                  // onFocus={()=>console.log("focus")}
                  onBlur={() => handledRenameDoc(data)}
                  onKeyDown={(e) => handleEnterPress(e, data)}
                  ref={inputRef}
@@ -445,7 +338,7 @@ function PdfFileComponent({
                    width: "100px",
                    border: "1.5px solid black",
                    borderRadius: "2px",
-                    fontSize: "10px"
+                    fontSize: "10px",
                  }}
                />
              ) : (
@@ -460,12 +353,19 @@ function PdfFileComponent({
              sideOffset={5}
              align="end"
            >
+              {/* <ContextMenu.Item
+                    onClick={() => handleMenuItemClick("Download", data)}
+                    onSelect={(e) => console.log("event", e)}
+                    className="ContextMenuItem"
+                  >
+                    Download
+                  </ContextMenu.Item> */}
+
              <ContextMenu.Item
                onClick={() => handleMenuItemClick("Rename", data)}
                className="ContextMenuItem"
              >
-                <i class="fa-solid fa-font"></i>
-                <span style={{ marginLeft: "8px" }}>Rename</span>
+                Rename
              </ContextMenu.Item>
            </ContextMenu.Content>
          </ContextMenu.Portal>
@@ -479,7 +379,7 @@ function PdfFileComponent({
              style={{
                display: "flex",
                flexDirection: "column",
-                cursor: "pointer"
+                cursor: "pointer",
              }}
            >
              <img
@@ -500,6 +400,7 @@ function PdfFileComponent({
                  }}
                  autoFocus={true}
                  type="text"
+                  // onFocus={()=>console.log("focus")}
                  onBlur={() => handledRenameDoc(data)}
                  onKeyDown={(e) => handleEnterPress(e, data)}
                  ref={inputRef}
@@ -510,7 +411,7 @@ function PdfFileComponent({
                    width: "100px",
                    border: "1.5px solid black",
                    borderRadius: "2px",
-                    fontSize: "10px"
+                    fontSize: "10px",
                  }}
                />
              ) : (
@@ -525,19 +426,26 @@ function PdfFileComponent({
              sideOffset={5}
              align="end"
            >
+              {/* <ContextMenu.Item
+               onClick={() => handleMenuItemClick("Download", data)}
+               onSelect={(e) => console.log("event", e)}
+               className="ContextMenuItem"
+             >
+               Download
+             </ContextMenu.Item> */}
+
              <ContextMenu.Item
                onClick={() => handleMenuItemClick("Rename", data)}
                className="ContextMenuItem"
              >
-                <i class="fa-solid fa-font"></i>
-                <span style={{ marginLeft: "8px" }}>Rename</span>
+                Rename
              </ContextMenu.Item>
            </ContextMenu.Content>
          </ContextMenu.Portal>
        </ContextMenu.Root>
      </div>
    ) : (
-      <HoverCard.Root openDelay={0} closeDelay={100}>
+      <HoverCard.Root>
        <HoverCard.Trigger asChild>
          <div>
            <ContextMenu.Root>
@@ -570,7 +478,7 @@ function PdfFileComponent({
                        width: "100px",
                        border: "1.5px solid black",
                        borderRadius: "2px",
-                        fontSize: "10px"
+                        fontSize: "10px",
                      }}
                    />
                  ) : (
@@ -594,7 +502,7 @@ function PdfFileComponent({
                    <i className="fa fa-file"></i>
                  </div>
                ) : (
-                  status === "In Progress" && (
+                  status === "InComplete" && (
                    <div className="status-badge in-progress">
                      <i className="fa fa-paper-plane"></i>
                    </div>
@@ -608,18 +516,20 @@ function PdfFileComponent({
                  sideOffset={5}
                  align="end"
                >
-                  {contextMenu.map((menu, ind) => {
-                    return (
-                      <ContextMenu.Item
-                        key={ind}
-                        onClick={() => handleMenuItemClick(menu.type, data)}
-                        className="ContextMenuItem"
-                      >
-                        <i class={menu.icon}></i>
-                        <span style={{ marginLeft: "8px" }}>{menu.type}</span>
-                      </ContextMenu.Item>
-                    );
-                  })}
+                  <ContextMenu.Item
+                    onClick={() => handleMenuItemClick("Download", data)}
+                    onSelect={(e) => console.log("event", e)}
+                    className="ContextMenuItem"
+                  >
+                    Download
+                  </ContextMenu.Item>
+
+                  <ContextMenu.Item
+                    onClick={() => handleMenuItemClick("Rename", data)}
+                    className="ContextMenuItem"
+                  >
+                    Rename
+                  </ContextMenu.Item>
                </ContextMenu.Content>
              </ContextMenu.Portal>
            </ContextMenu.Root>
@@ -642,110 +552,56 @@ function PdfFileComponent({
            {signerExist && (
              <>
                <strong style={{ fontSize: "13px" }}>Signers: </strong>
-                {/* <span className="statusSpan">kjefjjnejkfnkbjs bbfjkdsbjbfjkbjk kscbjkbjkb</span> */}
-                {signersName()}
+                {signerExist.map((data, key) => {
+                  return (
+                    <React.Fragment key={key}>
+                      <span className="statusSpan">{data.Name}, </span>
+                    </React.Fragment>
+                  );
+                })}
              </>
            )}
-
            <HoverCard.Arrow className="HoverCardArrow" />
          </HoverCard.Content>
        </HoverCard.Portal>
      </HoverCard.Root>
    );
  };
-
  //component to handle type of document and render according to type
-  return (
-    <>
-      {isList ? (
-        <div className="container" style={{ overflowX: "auto" }}>
-          <Table striped bordered hover>
-            <thead>
-              <tr>
-                <th>Name</th>
-                <th>Created Date</th>
-                <th>Type</th>
-                <th>Status</th>
-                <th>Action</th>
-              </tr>
-            </thead>
-            <tbody>
-              {pdfData.map((data, ind) => {
-                return (
-                  <React.Fragment key={ind}>
-                    {handleFolderData(data, ind, "table")}
-                  </React.Fragment>
-                );
-              })}
-            </tbody>
-          </Table>
-        </div>
-      ) : (
-        <div className="pdfContainer">
+
+  return isList ? (
+    <div className="container" style={{overflowX:"auto"}}>
+      <Table striped bordered hover  >
+        <thead>
+          <tr>
+            <th>Name</th>
+            <th>Created Date</th>
+            <th>Type</th>
+            <th>Status</th>
+            <th>Action</th>
+          </tr>
+        </thead>
+        <tbody>
          {pdfData.map((data, ind) => {
            return (
-              <div className="box" key={ind}>
-                {handleFolderData(data, ind, "list")}
-              </div>
+              <React.Fragment key={ind}>
+                {handleFolderData(data, ind, "table")}
+              </React.Fragment>
            );
          })}
-        </div>
-      )}
-      {isOpenMoveModal && (
-        <SelectFolder
-          onSuccess={handleMoveFolder}
-          isOpenModal={isOpenMoveModal}
-          folderCls={"contracts_Document"}
-          setIsOpenMoveModal={setIsOpenMoveModal}
-          setPdfData={setPdfData}
-        />
-      )}
-      <ModalUi
-        isOpen={isDeleteDoc}
-        headerColor={themeColor()}
-        title={"Delete Document"}
-        handleClose={() => {
-          setIsDeleteDoc(false);
-        }}
-      >
-        <div style={{ height: "100%", padding: 20 }}>
-          <p>Are you sure you want to delete this document?</p>
-
-          <div
-            style={{
-              height: "1px",
-              backgroundColor: "#9f9f9f",
-              width: "100%",
-              marginTop: "15px",
-              marginBottom: "15px"
-            }}
-          ></div>
-
-          <button
-            onClick={() => {
-              handleDeleteDocument(selectDoc);
-            }}
-            style={{
-              background: themeColor(),
-              color: "white"
-            }}
-            type="button"
-            className="finishBtn"
-          >
-            Yes
-          </button>
-          <button
-            onClick={() => {
-              setIsDeleteDoc(false);
-            }}
-            type="button"
-            className="finishBtn cancelBtn"
-          >
-            No
-          </button>
-        </div>
-      </ModalUi>
-    </>
+        </tbody>
+      </Table>
+    </div>
+  ) : (
+    <div className="pdfContainer">
+      {pdfData.map((data, ind) => {
+        return (
+          <div className="box" key={ind}>
+            {handleFolderData(data, ind, "list")}
+          </div>
+        );
+      })}
+    </div>
  );
 }

@@ -6,13 +6,12 @@

 .ContextMenuContent,
 .ContextMenuSubContent {
-  min-width: 135px;
+  min-width: 150px;
  background-color: white;
  border-radius: 6px;
  overflow: hidden;
  padding: 5px;
  box-shadow: 0px 10px 38px -10px rgba(22, 23, 24, 0.35), 0px 10px 20px -15px rgba(22, 23, 24, 0.2);
-  z-index: 99;
 }

 .ContextMenuItem,
@@ -28,7 +27,7 @@
  height: 25px;
  padding: 0 5px;
  position: relative;
-  padding-left: 15px;
+  padding-left: 25px;
  user-select: none;
  outline: none;
 }
@@ -85,10 +84,14 @@
  color: var(--mauve-8);
 }

+
 .dropdown-menu {
+
  min-width: 10rem;
+
 }

+
 .dropdown-item {
  display: block;
  width: 100%;
@@ -100,25 +103,26 @@
  white-space: nowrap;
  background-color: transparent;
  border: 0;
-  cursor: pointer;
 }

+
 .dropdown-item:hover {
  background-color: #dad9db;
  color: var(--violet-11);
+
 }

 .itemColor {
  font-size: 13px !important;
 }

+
+
 .folderComponent {
  margin: 30px;
  height: 100%;
 }
-.inputStyle{
-  border: 1.6px solid #ccc !important;
-}
+
 .folderComponent::-webkit-scrollbar {
  display: none;
  /* for Chrome, Safari, and Opera */
@@ -398,7 +402,6 @@ a {
  will-change: transform, opacity;
  text-align: center;
  align-items: center;
- 
 }

 .HoverCardContent[data-side='top'] {
@@ -487,74 +490,41 @@ a {
  display: none;
 }

-.folderPath {
+ .folderPath{
  overflow-x: auto;
  white-space: nowrap;

  cursor: pointer;
  user-select: none;
-}
-
-.folderPath::-webkit-scrollbar {
+ }
+ .folderPath::-webkit-scrollbar {
  display: none;
  /* for Chrome, Safari, and Opera */
 }

-.docDeleteBtn {
-  /* box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.18); */
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
-  padding: 7px 17px;
-  color: white;
-  font-weight: 600 !important;
-  font-size: 12px !important;
-  border: none;
-  border-radius: 2px;
-}
-
-.docDeleteBtn:focus {
-  border: none;
-  outline: none;
-}
-
-.docDeleteBtn:hover {
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1), 0 2px 4px rgba(0, 0, 0, 0.18);
-  color: white;
-}
-
-@media screen and (max-width:766px) {
-  .itemColor {
-    font-size: 10px !important;
-  }
-
-}
-
@media (min-width: 310px) and (max-width:550px) {
-
+  
  .pdfContainer {
    justify-content: space-around;
  }
-
  .sort {
-    padding: 2px;
+padding: 2px;
  }
-
-  .folderComponent {
+  .folderComponent{
    margin: 10px;
  }
-
+  
 }

-@media screen and (max-width:309px) {
-
+@media screen and  (max-width:309px) {
+ 
  .pdfContainer {
    justify-content: center;
  }
-
  .sort {
    padding: 2px;
-  }
-
-  .folderComponent {
-    margin: 10px;
-  }
+      }
+      .folderComponent{
+        margin: 10px;
+      }
 }
@@ -1,16 +1,13 @@
 import React, { useEffect, useState, useRef } from "react";
+import axios from "axios";
 import "./LegaDrive.css";
 import loader from "../../assests/loader2.gif";
 import PdfFileComponent from "./FolderDrive/legaDriveComponent";
+import Modal from "react-bootstrap/Modal";
+import ModalHeader from "react-bootstrap/esm/ModalHeader";
 import { themeColor, iconColor } from "../../utils/ThemeColor/backColor";
-import { getDrive } from "../../utils/Utils";
-import { useNavigate } from "react-router-dom";
-import Title from "../component/Title";
-import Parse from "parse";
-import ModalUi from "../../premitives/ModalUi";

 function PdfFile() {
-  const navigate = useNavigate();
  const scrollRef = useRef(null);
  const [isList, setIsList] = useState(false);
  const [selectedSort, setSelectedSort] = useState("Date");
@@ -18,26 +15,28 @@ function PdfFile() {
  const [pdfData, setPdfData] = useState([]);
  const [isFolder, setIsFolder] = useState(false);
  const [newFolderName, setNewFolderName] = useState();
+  // const [parentFolderName, setParentFolderName] = useState();
+  // const [parentFolder, setParentFolder] = useState([]);
  const [error, setError] = useState();
  const [folderLoader, setIsFolderLoader] = useState(false);
  const [isShowSort, setIsShowSort] = useState(false);
  const [isLoading, setIsLoading] = useState({
    isLoad: true,
-    message: "This might take some time"
+    message: "This might take some time",
  });
  const [docId, setDocId] = useState();
-  const [handleError, setHandleError] = useState("");
+  const [handleError, setHandleError] = useState();
+
  const [folderName, setFolderName] = useState([]);
-  const [isAlert, setIsAlert] = useState({ isShow: false, alertMessage: "" });
-  const [isNewFol, setIsNewFol] = useState(false);
-  const currentUser =
+
+  const senderUser =
    localStorage.getItem(
      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
    ) &&
    localStorage.getItem(
      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
    );
-  const jsonCurrentUser = JSON.parse(currentUser);
+  const jsonSender = JSON.parse(senderUser);

  useEffect(() => {
    if (docId) {
@@ -51,77 +50,104 @@ function PdfFile() {
  const getPdfDocumentList = async () => {
    const load = {
      isLoad: true,
-      message: "This might take some time"
+      message: "This might take some time",
    };
-    let driveDetails;
    setIsLoading(load);
-    try {
-      driveDetails = await getDrive();
-      if (driveDetails) {
-        if (driveDetails.length > 0) {
-          setPdfData(driveDetails);
-          sortApps(null, null, driveDetails);
+    //?where={"Type":"Folder" }&include=ExtUserPtr,Signers
+    //?where={"$or":[{"Type":{"$exists":true}},{"Folder":{"$exists":false}}]}&include=ExtUserPtr,Signers
+    // "CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${jsonSender.objectId}"}
+    // where={"Folder":{"$exists":false} }&include=ExtUserPtr,Signers`,
+    await axios
+      .get(
+        `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
+          "_appName"
+        )}_Document?where={"Folder":{"$exists":false},"$or":[{"CreatedBy":{"$exists":false}},{"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${
+          jsonSender.objectId
+        }"}}]}&include=ExtUserPtr,Signers`,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+            "X-Parse-Session-Token": localStorage.getItem("accesstoken"),
+          },
        }
+      )
+      .then((Listdata) => {
+        const json = Listdata.data;
+        const res = json.results;
+        // console.log("result", res);
+        if (res[0] && res.length > 0) {
+          setPdfData(res);
+        }
+
        const data = [
          {
-            name: "OpenSign™ Drive",
-            objectId: ""
-          }
+            name: "OpenSignDrive™",
+            objectId: "",
+          },
        ];
        setFolderName(data);
        const loadObj = {
-          isLoad: false
+          isLoad: false,
        };
        setIsLoading(loadObj);
-      } else if (driveDetails === "Error: Something went wrong!") {
+      })
+      .catch((err) => {
        const loadObj = {
-          isLoad: false
+          isLoad: false,
        };
        setHandleError("Error: Something went wrong!");
        setIsLoading(loadObj);
-      }
-    } catch (e) {
-      setIsAlert({
-        isShow: true,
-        alertMessage: "something went wrong"
      });
-    }
  };
  //function for get parent folder document list
  const getPdfFolderDocumentList = async () => {
    const load = {
      isLoad: true,
-      message: "This might take some time"
+      message: "This might take some time",
    };
    setIsLoading(load);
-    let driveDetails;
-    try {
-      driveDetails = await getDrive(docId);
+    //{"$inQuery":{"where":{"objectId":"${docId}"},"className":"${appName}_Document"}}
+    //"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${jsonSender.objectId}"}
+    await axios
+      .get(
+        `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
+          "_appName"
+        )}_Document?where={"Folder":{"__type":"Pointer","className":"${localStorage.getItem(
+          "_appName"
+        )}_Document","objectId":"${docId}"},"$or":[{"CreatedBy":{"$exists":false}},{"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${
+          jsonSender.objectId
+        }"}}]}&include=ExtUserPtr,Signers,Folder`,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+            "X-Parse-Session-Token": localStorage.getItem("accesstoken"),
+          },
+        }
+      )
+      .then((Listdata) => {
+        const json = Listdata.data;
+        const res = json.results;

-      if (driveDetails) {
-        if (driveDetails.length > 0) {
-          setPdfData(driveDetails);
-          sortApps(null, null, driveDetails);
+        if (res[0] && res.length > 0) {
+          setPdfData(res);
        } else {
          setPdfData([]);
        }
+
        const loadObj = {
-          isLoad: false
+          isLoad: false,
        };
        setIsLoading(loadObj);
-      } else if (driveDetails === "Error: Something went wrong!") {
+      })
+      .catch((err) => {
        const loadObj = {
-          isLoad: false
+          isLoad: false,
        };
        setHandleError("Error: Something went wrong!");
        setIsLoading(loadObj);
-      }
-    } catch (e) {
-      setIsAlert({
-        isShow: true,
-        alertMessage: "something went wrong!"
      });
-    }
  };

  //function for get all pdf document list
@@ -129,16 +155,44 @@ function PdfFile() {
    setIsFolder(true);
  };
  //function for handle folder name path
-  const handleRoute = (index) => {
-    const updateFolderName = folderName.filter((x, i) => {
-      if (i <= index) {
-        return x;
+  const handleRoute = (data) => {
+    let loadObj = {
+      isLoad: true,
+      message: "This might take some time",
+    };
+    if (data.name === "LegaDrive™") {
+      setIsLoading(loadObj);
+      if (docId) {
+        setDocId();
+      } else {
+        setTimeout(() => {
+          const loadObj = {
+            isLoad: false,
+          };
+          setIsLoading(loadObj);
+        }, 1000);
      }
-    });
+    } else if (data.name === folderName[folderName.length - 1].name) {
+      setIsLoading(loadObj);
+      setTimeout(() => {
+        const loadObj = {
+          isLoad: false,
+        };
+        setIsLoading(loadObj);
+      }, 1000);
+    } else {
+      // console.log("go here1",data.objectId)
+      const findIndex = folderName.findIndex(
+        (fold) => fold.objectId === data.objectId
+      );
+      const newFolder = folderName.slice(0, findIndex + 1);

-    setFolderName(updateFolderName);
-    const getLastId = updateFolderName[updateFolderName.length - 1];
-    setDocId(getLastId.objectId);
+      setFolderName(newFolder);
+      const getLastId = newFolder[newFolder.length - 1];
+
+      setDocId(getLastId.objectId);
+      setIsLoading(loadObj);
+    }
  };

  //function for add new folder name
@@ -147,60 +201,67 @@ function PdfFile() {
    const value = e.target.value;
    setNewFolderName(value);
  };
-  //function for create folder
+  //function for add folder
  const handleAddFolder = async () => {
    if (newFolderName) {
      setIsFolderLoader(true);
+
      const getParentObjId = folderName[folderName.length - 1];
-      const parentId = getParentObjId && getParentObjId.objectId;
-      const foldercls = `${localStorage.getItem("_appName")}_Document`;
-      const folderPtr = {
-        __type: "Pointer",
-        className: foldercls,
-        objectId: parentId
-      };
-      const CreatedBy = {
-        __type: "Pointer",
-        className: "_User",
-        objectId: jsonCurrentUser.objectId
-      };
+      const isParentId = getParentObjId && getParentObjId.objectId;
+      let data;
+      if (isParentId) {
+        data = {
+          Name: newFolderName,
+          Type: "Folder",
+          Folder: {
+            __type: "Pointer",
+            className: `${localStorage.getItem("_appName")}_Document`,
+            objectId: isParentId,
+          },
+        };
+      } else {
+        data = {
+          Name: newFolderName,
+          Type: "Folder",
+        };
+      }

-      try {
-        const exsitQuery = new Parse.Query(foldercls);
-        exsitQuery.equalTo("Name", newFolderName);
-        exsitQuery.equalTo("Type", "Folder");
-        if (parentId) {
-          exsitQuery.equalTo("Folder", folderPtr);
-        }
-        const templExist = await exsitQuery.first();
-        if (templExist) {
-          setError("Folder already exist!");
-          setIsFolderLoader(false);
-        } else {
-          const template = new Parse.Object(foldercls);
-          template.set("Name", newFolderName);
-          template.set("Type", "Folder");
-
-          if (parentId) {
-            template.set("Folder", folderPtr);
+      // console.log("data", data);
+      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"),
+            },
          }
-          template.set("CreatedBy", CreatedBy);
-          const res = await template.save();
-          if (res) {
-            const result = JSON.parse(JSON.stringify(res));
+        )

-            setPdfData((prev) => [...prev, result]);
+        .then((Listdata) => {
+          // console.log("Listdata ", Listdata);
+          const json = Listdata.data;
+          // console.log("json ", json);
+          if (json) {
            setNewFolderName();
+
            setIsFolderLoader(false);
            setIsFolder(false);
+            if (docId) {
+              getPdfFolderDocumentList();
+            } else {
+              getPdfDocumentList();
+            }
          }
-        }
-      } catch (e) {
-        setIsAlert({
-          isShow: true,
-          alertMessage: "something went wrong!"
+        })
+        .catch((err) => {
+          console.log("axois err ", err);
+          alert("something went wrong");
        });
-      }
    } else {
      setError("Please fill out this field");
    }
@@ -222,11 +283,11 @@ function PdfFile() {
    }
  };

-  const sortApps = (type, order, driveDetails) => {
-    const selectedSortType = type ? type : selectedSort ? selectedSort : "Date";
-    const sortOrder = order ? order : sortingOrder ? sortingOrder : "Decending";
+  const sortApps = () => {
+    const selectedSortType = selectedSort;
+    const sortOrder = sortingOrder;

-    let sortingData = driveDetails;
+    let sortingData = pdfData;
    if (selectedSortType === "Name") {
      sortingApp(sortingData, "Name", sortOrder);
    } else if (selectedSortType === "Date") {
@@ -288,9 +349,7 @@ function PdfFile() {
  useEffect(() => {
    const closeMenuOnOutsideClick = (e) => {
      if (isShowSort && !e.target.closest("#menu-container")) {
-        setIsShowSort(!isShowSort);
-      } else if (isNewFol && !e.target.closest("#folder-menu")) {
-        setIsNewFol(!isNewFol);
+        setIsShowSort(false);
      }
    };

@@ -300,88 +359,28 @@ function PdfFile() {
      // Cleanup the event listener when the component unmounts
      document.removeEventListener("click", closeMenuOnOutsideClick);
    };
-  }, [isShowSort || isNewFol]);
+  }, [isShowSort]);

-  const handleFolderTab = (folderData, isMove) => {
-    return folderData.map((data, id) => {
-      return (
-        <React.Fragment key={id}>
-          <span
-            onClick={() => handleRoute(id)}
-            style={{
-              color: "#a64b4e",
-              fontWeight: "400",
-              cursor: "pointer"
-            }}
-          >
-            {data.name}
-            <span
-              style={{
-                color: "#a64b4e",
-                fontWeight: "200",
-                cursor: "pointer",
-                margin: "0 4px"
-              }}
-            >
-              &gt;
-            </span>
-          </span>
-        </React.Fragment>
-      );
-    });
-  };
-  const oncloseFolder = () => {
-    setIsFolder(false);
-    setNewFolderName("");
-    setError("");
-  };
  return (
    <div className="folderComponent ">
-      <Title title={"OpenSign™ Drive"} drive={true} />
      <div>
-        <ModalUi
-          headerColor={"#dc3545"}
-          isOpen={isAlert.isShow}
-          title={"Alert"}
-          handleClose={() => {
-            setIsAlert({
-              isShow: false,
-              alertMessage: ""
-            });
-          }}
-        >
-          <div style={{ height: "100%", padding: 20 }}>
-            <p>{isAlert.alertMessage}</p>
+        <Modal show={isFolder}>
+          <ModalHeader style={{ background: themeColor() }}>
+            <span style={{ color: "white" }}>Add New Folder</span>
+            {!folderLoader && (
+              <span
+                style={{ cursor: "pointer" }}
+                onClick={() => {
+                  setNewFolderName("");
+                  setIsFolder(false);
+                }}
+              >
+                X
+              </span>
+            )}
+          </ModalHeader>

-            <div
-              style={{
-                height: "1px",
-                backgroundColor: "#9f9f9f",
-                width: "100%",
-                marginTop: "15px",
-                marginBottom: "15px"
-              }}
-            ></div>
-            <button
-              onClick={() =>
-                setIsAlert({
-                  isShow: false,
-                  alertMessage: ""
-                })
-              }
-              type="button"
-              className="finishBtn cancelBtn"
-            >
-              Close
-            </button>
-          </div>
-        </ModalUi>
-        <ModalUi
-          isOpen={isFolder}
-          title={"Add New Folder"}
-          handleClose={oncloseFolder}
-        >
-          <div style={{ height: "100%", padding: 20 }}>
+          <Modal.Body>
            {folderLoader ? (
              <div
                style={{
@@ -389,7 +388,7 @@ function PdfFile() {
                  display: "flex",
                  flexDirection: "column",
                  justifyContent: "center",
-                  alignItems: "center"
+                  alignItems: "center",
                }}
              >
                <img
@@ -402,68 +401,65 @@ function PdfFile() {
                </span>
              </div>
            ) : (
-              <form
-                onSubmit={(e) => {
-                  e.preventDefault();
-                  handleAddFolder();
-                }}
-                style={{ display: "flex", flexDirection: "column" }}
-              >
+              <form style={{ display: "flex", flexDirection: "column" }}>
                <label
                  style={{
                    margin: "10px 0px 10px 0px",
                    fontSize: "15px",
-                    fontWeight: "400"
+                    fontWeight: "400",
                  }}
                >
-                  Name
-                  <span style={{ color: "red" }}>*</span>
+                  Name*
                </label>

                <input
                  required
-                  className="form-control inputStyle"
+                  className="form-control"
                  type="text"
                  value={newFolderName}
                  onChange={(e) => handleFolderName(e)}
                  // className="addFolderInput"
                />
-                <span
-                  style={{ color: "red", fontSize: "12px", marginTop: "6px" }}
-                >
-                  {error}
-                </span>
+                <span style={{ color: "red", fontSize: "12px" }}>{error}</span>
+
                <div
                  style={{
-                    height: "1px",
-                    backgroundColor: "#9f9f9f",
-                    width: "100%",
-                    marginTop: "15px",
-                    marginBottom: "15px"
+                    margin: "20px 10px 10px 10px ",
+                    display: "flex",
+                    alignItems: "flex-end",
+                    justifyContent: "flex-end",
+                    alignContent: "flex-end",
                  }}
-                ></div>
-                <div style={{ display: "flex", flexDirection: "row" }}>
+                >
                  <button
-                    style={{
-                      background: themeColor()
-                    }}
                    type="submit"
+                    style={{
+                      borderRadius: "0px",
+                      border: "1.5px solid #e3e2e1",
+                      fontWeight: "600",
+                      color: "black",
+                    }}
+                    className="finishBtn"
+                    onClick={() => setIsFolder(false)}
+                  >
+                    Close
+                  </button>
+
+                  <button
+                    onClick={() => handleAddFolder()}
+                    style={{
+                      background: themeColor(),
+                    }}
+                    type="button"
                    className="finishBtn"
                  >
                    Add
                  </button>
-                  <button
-                    type="button"
-                    className="finishBtn cancelBtn"
-                    onClick={oncloseFolder}
-                  >
-                    Close
-                  </button>
                </div>
              </form>
            )}
-          </div>
-        </ModalUi>
+          </Modal.Body>
+        </Modal>

        {isLoading.isLoad ? (
          <div
@@ -473,7 +469,7 @@ function PdfFile() {
              alignItems: "center",
              height: "100vh",
              width: "100%",
-              flexDirection: "column"
+              flexDirection: "column",
            }}
          >
            <img
@@ -492,7 +488,7 @@ function PdfFile() {
              justifyContent: "center",
              alignItems: "center",
              height: "100vh",
-              width: "100%"
+              width: "100%",
            }}
          >
            <span style={{ fontSize: "20px", color: "gray" }}>
@@ -506,76 +502,37 @@ function PdfFile() {
                onMouseEnter={(e) => handleMouseEnter(e)}
                ref={scrollRef}
                style={{
-                  width: "100%"
+                  width: "100%",
                }}
                className="folderPath"
              >
-                {handleFolderTab(folderName)}
-              </div>
-              <div className="dropMenuBD">
-                <div
-                  id="folder-menu"
-                  className={
-                    isNewFol ? "dropdown show dropDownStyle" : "dropdown"
-                  }
-                  onClick={() => setIsNewFol(!isNewFol)}
-                >
-                  <div className="sort">
-                    <i
-                      className="fa fa-plus-square"
-                      aria-hidden="true"
-                      style={{ fontSize: "25px", color: `${iconColor()}` }}
-                    ></i>
-                  </div>
-                  <div
-                    className={
-                      isNewFol ? "dropdown-menu show" : "dropdown-menu"
-                    }
-                    aria-labelledby="dropdownMenuButton"
-                    aria-expanded={isNewFol ? "true" : "false"}
-                  >
-                    {" "}
-                    <div
+                {folderName.map((data, id) => {
+                  return (
+                    <span
+                      key={id}
+                      onClick={() => handleRoute(data)}
                      style={{
-                        display: "flex",
-                        flexDirection: "column"
+                        color: "#a64b4e",
+                        fontWeight: "400",
+                        cursor: "pointer",
                      }}
                    >
+                      {data.name}
                      <span
-                        className="dropdown-item itemColor"
-                        onClick={() => getParentFolder()}
+                        style={{
+                          color: "#a64b4e",
+                          fontWeight: "200",
+                          cursor: "pointer",
+                          margin: "0 4px",
+                        }}
                      >
-                        <i
-                          style={{ marginRight: "5px" }}
-                          className="fa fa-plus"
-                          aria-hidden="true"
-                        ></i>
-                        Create folder
+                        &gt;
                      </span>
-                      <span
-                        className="dropdown-item itemColor"
-                        onClick={() => navigate("/form/sHAnZphf69")}
-                      >
-                        <i
-                          style={{ marginRight: "5px" }}
-                          className="fas fa-pen-nib"
-                        ></i>
-                        Sign Yourself
-                      </span>
-                      <span
-                        className="dropdown-item itemColor"
-                        onClick={() => navigate("/form/8mZzFxbG1z")}
-                      >
-                        {" "}
-                        <i
-                          style={{ marginRight: "5px" }}
-                          className="fa fa-file-signature"
-                        ></i>
-                        Request Signatures{" "}
-                      </span>
-                    </div>
-                  </div>
-                </div>
+                    </span>
+                  );
+                })}
+              </div>
+              <div className="dropMenuBD">
                <div
                  id="menu-container"
                  className={isShowSort ? "dropdown show" : "dropdown"}
@@ -588,13 +545,13 @@ function PdfFile() {
                      style={{
                        marginRight: "5px",
                        fontSize: "14px",
-                        color: `${iconColor()}`
+                        color: `${iconColor()}`,
                      }}
                    ></i>
                    <span
                      style={{
                        fontSize: "15px",
-                        color: `${iconColor()}`
+                        color: `${iconColor()}`,
                      }}
                    >
                      {selectedSort}
@@ -610,7 +567,7 @@ function PdfFile() {
                    <span
                      onClick={() => {
                        setSelectedSort("Name");
-                        sortApps("Name", null, pdfData);
+                        sortApps();
                      }}
                      className="dropdown-item itemColor"
                    >
@@ -632,7 +589,7 @@ function PdfFile() {
                    <span
                      onClick={() => {
                        setSelectedSort("Date");
-                        sortApps("Date", null, pdfData);
+                        sortApps();
                      }}
                      className="dropdown-item itemColor"
                    >
@@ -655,7 +612,7 @@ function PdfFile() {
                    <span
                      onClick={() => {
                        setSortingOrder("Accending");
-                        sortApps(null, "Accending", pdfData);
+                        sortApps();
                      }}
                      className="dropdown-item itemColor"
                    >
@@ -677,7 +634,7 @@ function PdfFile() {
                    <span
                      onClick={() => {
                        setSortingOrder("Decending");
-                        sortApps(null, "Decending", pdfData);
+                        sortApps();
                      }}
                      className="dropdown-item itemColor"
                    >
@@ -719,6 +676,14 @@ function PdfFile() {
                    </div>
                  )}
                </div>
+
+                <div className="sort" onClick={() => getParentFolder()}>
+                  <i
+                    className="fa fa-plus-square"
+                    aria-hidden="true"
+                    style={{ fontSize: "25px", color: `${iconColor()}` }}
+                  ></i>
+                </div>
              </div>
            </div>

@@ -729,7 +694,7 @@ function PdfFile() {
                  justifyContent: "center",
                  alignItems: "center",
                  height: "50vh",
-                  width: "100%"
+                  width: "100%",
                }}
              >
                <span style={{ fontWeight: "bold" }}>No Data Found!</span>
@@ -745,7 +710,6 @@ function PdfFile() {
                isDocId={docId}
                setPdfData={setPdfData}
                isList={isList}
-                setIsAlert={setIsAlert}
              />
            )}
          </>
@@ -157,7 +157,7 @@ const ManageSign = () => {
          file = base64StringtoFile(image, `${replaceSpace}.png`);
        }
      }
-      // console.log("isUrl ", isUrl);
+      console.log("isUrl ", isUrl);
      let imgUrl;
      if (!isUrl) {
        imgUrl = await uploadFile(file);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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