From e85dc63fc71af610296dc9f912f62f57e9553a7b Mon Sep 17 00:00:00 2001
From: prafullnavkar-nxg <prafull.navkar@nxglabs.com>
Date: Thu, 26 Oct 2023 11:55:49 +0530
Subject: [PATCH] add title in every page and pass missing paramter in cloud
 function

---
 apps/OpenSign/src/components/ReportMicroapp.js        | 11 ++++++++---
 apps/OpenSign/src/components/sidebar/Sidebar.js       |  6 +++---
 apps/OpenSign/src/components/sidebar/SubMenu.js       |  2 +-
 apps/OpenSign/src/routes/ChangePassword.js            |  2 ++
 apps/OpenSign/src/routes/PageNotFound.js              |  2 ++
 apps/OpenSign/src/routes/PlanSubscriptions.js         |  2 ++
 apps/OpenSign/src/routes/RemoteApp.js                 |  2 ++
 apps/OpenSign/src/routes/Report.js                    |  2 +-
 apps/OpenSign/src/routes/UserProfile.js               |  2 ++
 .../cloud/parsefunction/AuthLoginAsMail.js            |  2 +-
 10 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/apps/OpenSign/src/components/ReportMicroapp.js b/apps/OpenSign/src/components/ReportMicroapp.js
index eb36d0f55..b0be8c1d8 100644
--- a/apps/OpenSign/src/components/ReportMicroapp.js
+++ b/apps/OpenSign/src/components/ReportMicroapp.js
@@ -2,7 +2,7 @@ import useFederatedComponent from "mf-cra";
 import React, { Suspense, useEffect } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 
-const MicroappModal = ({ app }) => {
+const MicroappModal = () => {
   const { remoteApp } = useParams();
 
   useEffect(() => {
@@ -33,9 +33,9 @@ const MicroappModal = ({ app }) => {
       {/* <!-- Modal Container --> */}
       <div className="bg-white rounded-lg shadow-lg w-full">
         {/* <!-- Modal Header --> */}
-        <div className="flex w-full items-center border-b-2 mb-2 p-4">
+        <div className="flex w-full items-center border-b-2 mb-2 p-2">
           <button
-            className="focus:outline-none bg-blue-500 text-white shadow px-3 py-2 rounded"
+            className="focus:outline-none bg-blue-500 text-white text-sm shadow px-2.5 py-1 rounded"
             id="closeModal"
             onClick={(e) => {
               e.preventDefault();
@@ -45,6 +45,11 @@ const MicroappModal = ({ app }) => {
           >
             Back
           </button>
+          {localStorage.getItem('domain') && (
+            <p className="flex-1 w-full text-sm md:text-base text-black text-center">
+              {localStorage.getItem('domain') === "contracts" ? "Document":""}
+            </p>
+          )}
         </div>
         {/* <!-- Modal Body --> */}
         <div className="w-full">
diff --git a/apps/OpenSign/src/components/sidebar/Sidebar.js b/apps/OpenSign/src/components/sidebar/Sidebar.js
index 019a88a62..008c8520b 100644
--- a/apps/OpenSign/src/components/sidebar/Sidebar.js
+++ b/apps/OpenSign/src/components/sidebar/Sidebar.js
@@ -62,7 +62,7 @@ const Sidebar = ({ isOpen, closeSidebar }) => {
               !item.children ? (
                 <li key={item.title} onClick={() => closeSidebar()}>
                   <Link
-                    className={`mx-auto flex items-center hover:bg-[#eef1f5] p-3 lg:p-4 hover:no-underline`}
+                    className={`mx-auto flex items-center hover:bg-[#eef1f5] p-3 lg:p-4 hover:no-underline cursor-pointer`}
                     to={`/${item.pageType}/${item.objectId}`}
                   >
                     <i className={item.icon + " text-[18px]"}></i>
@@ -74,9 +74,9 @@ const Sidebar = ({ isOpen, closeSidebar }) => {
               ) : (
                 <Submenu key={item.title} icon={item.icon} title={item.title}>
                   {item.children.map((item) => (
-                    <li key={item.title} onClick={() => closeSidebar()}>
+                    <li key={item.title} onClick={() => closeSidebar()} className="pl-6 md:pl-8 hover:bg-[#eef1f5] cursor-pointer">
                       <Link
-                        className={`mx-auto flex items-center hover:bg-[#eef1f5] p-2 lg:p-3 hover:no-underline`}
+                        className={`mx-auto flex items-center p-2 lg:p-3 hover:no-underline`}
                         to={`/${item.pageType}/${item.objectId}`}
                       >
                         <i className={item.icon + " text-[18px]"}></i>
diff --git a/apps/OpenSign/src/components/sidebar/SubMenu.js b/apps/OpenSign/src/components/sidebar/SubMenu.js
index d18a0a703..6b3d59582 100644
--- a/apps/OpenSign/src/components/sidebar/SubMenu.js
+++ b/apps/OpenSign/src/components/sidebar/SubMenu.js
@@ -23,7 +23,7 @@ const Submenu = ({ icon, title, children }) => {
           ></i>
         </div>
       </button>
-      {isOpen && <ul className="pl-6 lg:pl-8">{children}</ul>}
+      {isOpen && <ul>{children}</ul>}
     </div>
   );
 };
diff --git a/apps/OpenSign/src/routes/ChangePassword.js b/apps/OpenSign/src/routes/ChangePassword.js
index 0051ab3ac..7a3d160dc 100644
--- a/apps/OpenSign/src/routes/ChangePassword.js
+++ b/apps/OpenSign/src/routes/ChangePassword.js
@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import Parse from "parse";
 import { Navigate } from "react-router-dom";
+import Title from "../components/Title";
 
 function ChangePassword() {
   const [currentpassword, setCurrentPassword] = useState("");
@@ -49,6 +50,7 @@ function ChangePassword() {
   }
   return (
     <div className="w-full bg-white shadow rounded p-2">
+      <Title title={"Change Password"} />
       <div className="text-xl font-bold border-b-[1px] border-gray-300">
         Change Password
       </div>
diff --git a/apps/OpenSign/src/routes/PageNotFound.js b/apps/OpenSign/src/routes/PageNotFound.js
index e1e73a62e..be8d10e6d 100644
--- a/apps/OpenSign/src/routes/PageNotFound.js
+++ b/apps/OpenSign/src/routes/PageNotFound.js
@@ -1,9 +1,11 @@
 // NotFound.js
 import React from "react";
+import Title from "../components/Title";
 
 const PageNotFound = () => {
   return (
     <div className="flex items-center justify-center h-screen w-full bg-white rounded">
+      <Title title={"Page Not Found"} />
       <div className="text-center">
         <h1 className="text-[60px] lg:text-[120px] font-semibold text-black">
           404
diff --git a/apps/OpenSign/src/routes/PlanSubscriptions.js b/apps/OpenSign/src/routes/PlanSubscriptions.js
index cc642a3e3..d28a76217 100644
--- a/apps/OpenSign/src/routes/PlanSubscriptions.js
+++ b/apps/OpenSign/src/routes/PlanSubscriptions.js
@@ -3,6 +3,7 @@ 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 Title from "../components/Title";
 const listItemStyle = {
   paddingLeft: '20px', // Add padding to create space for the image
   backgroundImage: `url(${checkmark})`, // Set your image as the list style image
@@ -44,6 +45,7 @@ const PlanSubscriptions = () => {
 
   return (
     <>
+    <Title title={"Subscriptions"} />
       {isLoader ? (
         <div
           style={{
diff --git a/apps/OpenSign/src/routes/RemoteApp.js b/apps/OpenSign/src/routes/RemoteApp.js
index 15b06af5f..16d1afc71 100644
--- a/apps/OpenSign/src/routes/RemoteApp.js
+++ b/apps/OpenSign/src/routes/RemoteApp.js
@@ -2,12 +2,14 @@ import { Suspense } from "react";
 import { useParams } from "react-router-dom";
 import useFederatedComponent from "mf-cra";
 import React from "react";
+import Title from "../components/Title";
 function RemoteApp({ app }) {
   // console.log("app ", app);
   const { Component: RemoteComponent } = useFederatedComponent(app);
   // console.log("RemoteComponent ", RemoteComponent);
   return (
     <>
+      <Title title={app.remoteName} />
       <Suspense
         fallback={
           <div style={{ height: "300px" }}>
diff --git a/apps/OpenSign/src/routes/Report.js b/apps/OpenSign/src/routes/Report.js
index 3ea62ccf9..d59394b17 100644
--- a/apps/OpenSign/src/routes/Report.js
+++ b/apps/OpenSign/src/routes/Report.js
@@ -53,7 +53,7 @@ const Report = () => {
   };
   return (
     <>
-      <Title title={"Pgsignup page"} />
+      <Title title={reportName} />
       {isLoader ? (
         <div
           style={{
diff --git a/apps/OpenSign/src/routes/UserProfile.js b/apps/OpenSign/src/routes/UserProfile.js
index c12296093..ac64efe39 100644
--- a/apps/OpenSign/src/routes/UserProfile.js
+++ b/apps/OpenSign/src/routes/UserProfile.js
@@ -3,6 +3,7 @@ import { Navigate, useNavigate } from "react-router-dom";
 import Parse from "parse";
 import { SaveFileSize } from "../constant/saveFileSize";
 import dp from "../assets/images/dp.png";
+import Title from "../components/Title";
 
 function UserProfile() {
   const navigate = useNavigate();
@@ -118,6 +119,7 @@ function UserProfile() {
 
   return (
     <React.Fragment>
+      <Title title={"Profile"} />
       {isLoader ? (
         <div
           style={{
diff --git a/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js b/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js
index 04d8ed657..68e57f96f 100644
--- a/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js
+++ b/apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js
@@ -1,7 +1,7 @@
 async function AuthLoginAsMail(request) {
   try {
     //function for login user using user objectId without touching user's password
-
+    const serverUrl = process.env.SERVER_URL
     let otpN = request.params.otp;
     let otp = parseInt(otpN);
     let email = request.params.email;