diff --git a/apps/OpenSign/src/App.js b/apps/OpenSign/src/App.js index 5f195fb3b..4917ffa07 100644 --- a/apps/OpenSign/src/App.js +++ b/apps/OpenSign/src/App.js @@ -1,31 +1,31 @@ import React, { useState, useEffect } from "react"; import { Routes, Route, BrowserRouter } from "react-router-dom"; -import Pgsignup from "./routes/Pgsignup"; -import Login from "./routes/Login"; -import Signup from "./routes/Signup"; -import Form from "./routes/Form"; -import Report from "./routes/Report"; -import Dashboard from "./routes/Dashboard"; -import Subscriptions from "./routes/PlanSubscriptions"; -import HomeLayout from "./layout/HomeLayout"; -import UserProfile from "./routes/UserProfile"; -import PageNotFound from "./routes/PageNotFound"; -import ForgetPassword from "./routes/ForgetPassword"; -import ChangePassword from "./routes/ChangePassword"; -import GenerateToken from "./routes/GenerateToken"; -import ValidateRoute from "./primitives/ValidateRoute"; -import Webhook from "./routes/Webhook"; -import Validate from "./primitives/Validate"; -import DebugPdf from "./routes/DebugPdf"; -import ManageSign from "./routes/Managesign"; -import Opensigndrive from "./routes/Opensigndrive"; -import TemplatePlaceholder from "./routes/TemplatePlaceholder"; import { pdfjs } from "react-pdf"; -import SignYourSelf from "./routes/SignyourselfPdf"; +import Pgsignup from "./pages/Pgsignup"; +import Login from "./pages/Login"; +import Signup from "./pages/Signup"; +import Form from "./pages/Form"; +import Report from "./pages/Report"; +import Dashboard from "./pages/Dashboard"; +import Subscriptions from "./pages/PlanSubscriptions"; +import HomeLayout from "./layout/HomeLayout"; +import UserProfile from "./pages/UserProfile"; +import PageNotFound from "./pages/PageNotFound"; +import ForgetPassword from "./pages/ForgetPassword"; +import ChangePassword from "./pages/ChangePassword"; +import GenerateToken from "./pages/GenerateToken"; +import ValidateRoute from "./primitives/ValidateRoute"; +import Webhook from "./pages/Webhook"; +import Validate from "./primitives/Validate"; +import DebugPdf from "./pages/DebugPdf"; +import ManageSign from "./pages/Managesign"; +import Opensigndrive from "./pages/Opensigndrive"; +import TemplatePlaceholder from "./pages/TemplatePlaceholder"; +import SignYourSelf from "./pages/SignyourselfPdf"; import DraftDocument from "./components/pdf/DraftDocument"; -import PlaceHolderSign from "./routes/PlaceHolderSign"; -import PdfRequestFiles from "./routes/PdfRequestFiles"; -import GuestLogin from "./routes/GuestLogin"; +import PlaceHolderSign from "./pages/PlaceHolderSign"; +import PdfRequestFiles from "./pages/PdfRequestFiles"; +import GuestLogin from "./pages/GuestLogin"; pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`; function App() { diff --git a/apps/OpenSign/src/components/pdf/Certificate.js b/apps/OpenSign/src/components/pdf/Certificate.js index 1885bdd58..1e4bd682b 100644 --- a/apps/OpenSign/src/components/pdf/Certificate.js +++ b/apps/OpenSign/src/components/pdf/Certificate.js @@ -1,5 +1,4 @@ import React, { useEffect, useState } from "react"; -import "../../styles/certificate.css"; import opensignLogo from "../../assets/images/open-sign-logo.png"; import { Page, diff --git a/apps/OpenSign/src/components/pdf/RecipientList.js b/apps/OpenSign/src/components/pdf/RecipientList.js index cf4edc665..a46519d49 100644 --- a/apps/OpenSign/src/components/pdf/RecipientList.js +++ b/apps/OpenSign/src/components/pdf/RecipientList.js @@ -1,5 +1,4 @@ import React, { useRef, useState } from "react"; -import "../../styles/signerListPlace.css"; import { darkenColor, getFirstLetter } from "../../constant/Utils"; const RecipientList = (props) => { diff --git a/apps/OpenSign/src/components/pdf/SignerListPlace.js b/apps/OpenSign/src/components/pdf/SignerListPlace.js index e123c257a..046aa9fa0 100644 --- a/apps/OpenSign/src/components/pdf/SignerListPlace.js +++ b/apps/OpenSign/src/components/pdf/SignerListPlace.js @@ -1,6 +1,5 @@ import React from "react"; import { themeColor } from "../../constant/const"; -import "../../styles/signerListPlace.css"; import RecipientList from "./RecipientList"; function SignerListPlace(props) { @@ -22,7 +21,7 @@ function SignerListPlace(props) { {props.handleAddSigner && (
props.handleAddSigner()} > diff --git a/apps/OpenSign/src/components/pdf/WidgetComponent.js b/apps/OpenSign/src/components/pdf/WidgetComponent.js index 656f60616..943e9f30e 100644 --- a/apps/OpenSign/src/components/pdf/WidgetComponent.js +++ b/apps/OpenSign/src/components/pdf/WidgetComponent.js @@ -4,13 +4,12 @@ import RecipientList from "./RecipientList"; import { useDrag } from "react-dnd"; import WidgetList from "./WidgetList"; import { widgets } from "../../constant/Utils"; - +import { themeColor } from "../../constant/const"; function WidgetComponent({ dragSignature, signRef, handleDivClick, handleMouseLeave, - themeColor, dragStamp, isSignYourself, addPositionOfSignature, @@ -321,7 +320,7 @@ function WidgetComponent({ backgroundColor: themeColor, color: "white" }} - className="addSignerBtn" + className="p-[10px] my-[2px] flex flex-row items-center justify-center border-[1px] border-[#47a3ad] hover:bg-[#47a3ad] text-[#47a3ad] hover:text-white cursor-pointer" onClick={() => handleAddSigner()} > diff --git a/apps/OpenSign/src/routes/ChangePassword.js b/apps/OpenSign/src/pages/ChangePassword.js similarity index 100% rename from apps/OpenSign/src/routes/ChangePassword.js rename to apps/OpenSign/src/pages/ChangePassword.js diff --git a/apps/OpenSign/src/routes/Dashboard.js b/apps/OpenSign/src/pages/Dashboard.js similarity index 100% rename from apps/OpenSign/src/routes/Dashboard.js rename to apps/OpenSign/src/pages/Dashboard.js diff --git a/apps/OpenSign/src/routes/DebugPdf.js b/apps/OpenSign/src/pages/DebugPdf.js similarity index 100% rename from apps/OpenSign/src/routes/DebugPdf.js rename to apps/OpenSign/src/pages/DebugPdf.js diff --git a/apps/OpenSign/src/routes/ForgetPassword.js b/apps/OpenSign/src/pages/ForgetPassword.js similarity index 100% rename from apps/OpenSign/src/routes/ForgetPassword.js rename to apps/OpenSign/src/pages/ForgetPassword.js diff --git a/apps/OpenSign/src/routes/Form.js b/apps/OpenSign/src/pages/Form.js similarity index 100% rename from apps/OpenSign/src/routes/Form.js rename to apps/OpenSign/src/pages/Form.js diff --git a/apps/OpenSign/src/routes/GenerateToken.js b/apps/OpenSign/src/pages/GenerateToken.js similarity index 100% rename from apps/OpenSign/src/routes/GenerateToken.js rename to apps/OpenSign/src/pages/GenerateToken.js diff --git a/apps/OpenSign/src/routes/GuestLogin.js b/apps/OpenSign/src/pages/GuestLogin.js similarity index 100% rename from apps/OpenSign/src/routes/GuestLogin.js rename to apps/OpenSign/src/pages/GuestLogin.js diff --git a/apps/OpenSign/src/routes/Login.js b/apps/OpenSign/src/pages/Login.js similarity index 100% rename from apps/OpenSign/src/routes/Login.js rename to apps/OpenSign/src/pages/Login.js diff --git a/apps/OpenSign/src/routes/Managesign.js b/apps/OpenSign/src/pages/Managesign.js similarity index 100% rename from apps/OpenSign/src/routes/Managesign.js rename to apps/OpenSign/src/pages/Managesign.js diff --git a/apps/OpenSign/src/routes/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js similarity index 100% rename from apps/OpenSign/src/routes/Opensigndrive.js rename to apps/OpenSign/src/pages/Opensigndrive.js diff --git a/apps/OpenSign/src/routes/PageNotFound.js b/apps/OpenSign/src/pages/PageNotFound.js similarity index 100% rename from apps/OpenSign/src/routes/PageNotFound.js rename to apps/OpenSign/src/pages/PageNotFound.js diff --git a/apps/OpenSign/src/routes/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js similarity index 100% rename from apps/OpenSign/src/routes/PdfRequestFiles.js rename to apps/OpenSign/src/pages/PdfRequestFiles.js diff --git a/apps/OpenSign/src/routes/Pgsignup.js b/apps/OpenSign/src/pages/Pgsignup.js similarity index 100% rename from apps/OpenSign/src/routes/Pgsignup.js rename to apps/OpenSign/src/pages/Pgsignup.js diff --git a/apps/OpenSign/src/routes/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js similarity index 99% rename from apps/OpenSign/src/routes/PlaceHolderSign.js rename to apps/OpenSign/src/pages/PlaceHolderSign.js index 9e3817004..9b65a676d 100644 --- a/apps/OpenSign/src/routes/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -1628,7 +1628,6 @@ function PlaceHolderSign() { handleDivClick={handleDivClick} handleMouseLeave={handleMouseLeave} isDragSign={isDragSign} - themeColor={themeColor} dragStamp={dragStamp} dragRef={dragRef} isDragStamp={isDragStamp} @@ -1676,7 +1675,6 @@ function PlaceHolderSign() { handleDivClick={handleDivClick} handleMouseLeave={handleMouseLeave} isDragSign={isDragSign} - themeColor={themeColor} dragStamp={dragStamp} dragRef={dragRef} isDragStamp={isDragStamp} diff --git a/apps/OpenSign/src/routes/PlanSubscriptions.js b/apps/OpenSign/src/pages/PlanSubscriptions.js similarity index 100% rename from apps/OpenSign/src/routes/PlanSubscriptions.js rename to apps/OpenSign/src/pages/PlanSubscriptions.js diff --git a/apps/OpenSign/src/routes/Report.js b/apps/OpenSign/src/pages/Report.js similarity index 100% rename from apps/OpenSign/src/routes/Report.js rename to apps/OpenSign/src/pages/Report.js diff --git a/apps/OpenSign/src/routes/Signup.js b/apps/OpenSign/src/pages/Signup.js similarity index 100% rename from apps/OpenSign/src/routes/Signup.js rename to apps/OpenSign/src/pages/Signup.js diff --git a/apps/OpenSign/src/routes/SignyourselfPdf.js b/apps/OpenSign/src/pages/SignyourselfPdf.js similarity index 100% rename from apps/OpenSign/src/routes/SignyourselfPdf.js rename to apps/OpenSign/src/pages/SignyourselfPdf.js diff --git a/apps/OpenSign/src/routes/TemplatePlaceholder.js b/apps/OpenSign/src/pages/TemplatePlaceholder.js similarity index 99% rename from apps/OpenSign/src/routes/TemplatePlaceholder.js rename to apps/OpenSign/src/pages/TemplatePlaceholder.js index 7c6caa857..12e72e855 100644 --- a/apps/OpenSign/src/routes/TemplatePlaceholder.js +++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js @@ -1405,7 +1405,6 @@ const TemplatePlaceholder = () => { handleDivClick={handleDivClick} handleMouseLeave={handleMouseLeave} isDragSign={isDragSign} - themeColor={themeColor} dragStamp={dragStamp} dragRef={dragRef} isDragStamp={isDragStamp} @@ -1463,7 +1462,6 @@ const TemplatePlaceholder = () => { handleDivClick={handleDivClick} handleMouseLeave={handleMouseLeave} isDragSign={isDragSign} - themeColor={themeColor} dragStamp={dragStamp} dragRef={dragRef} isDragStamp={isDragStamp} diff --git a/apps/OpenSign/src/routes/UserProfile.js b/apps/OpenSign/src/pages/UserProfile.js similarity index 100% rename from apps/OpenSign/src/routes/UserProfile.js rename to apps/OpenSign/src/pages/UserProfile.js diff --git a/apps/OpenSign/src/routes/Webhook.js b/apps/OpenSign/src/pages/Webhook.js similarity index 100% rename from apps/OpenSign/src/routes/Webhook.js rename to apps/OpenSign/src/pages/Webhook.js diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 136275a35..1656c4dce 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -2,10 +2,10 @@ import React, { useState, useEffect, useMemo } from "react"; import pad from "../assets/images/pad.svg"; import { useNavigate } from "react-router-dom"; import axios from "axios"; -import "../styles/report.css"; import ModalUi from "./ModalUi"; import AppendFormInForm from "../components/AppendFormInForm"; import { modalSubmitBtnColor, modalCancelBtnColor } from "../constant/const"; +import Alert from "./Alert"; const ReportTable = ({ ReportName, List, @@ -149,6 +149,7 @@ const ReportTable = ({ if (res.data && res.data.objectId) { setActLoader({}); setIsAlert(true); + setTimeout(() => setIsAlert(false), 1500); navigate(`/${url}/${res.data.objectId}`, { state: { title: "Use Template" } }); @@ -157,6 +158,7 @@ const ReportTable = ({ console.log("Err", err); setIsAlert(true); setIsErr(true); + setTimeout(() => setIsAlert(false), 1500); setActLoader({}); } } else { @@ -166,12 +168,14 @@ const ReportTable = ({ } else { setIsAlert(true); setIsErr(true); + setTimeout(() => setIsAlert(false), 1500); setActLoader({}); } } catch (err) { console.log("err", err); setIsAlert(true); setIsErr(true); + setTimeout(() => setIsAlert(false), 1500); setActLoader({}); } } @@ -227,6 +231,7 @@ const ReportTable = ({ if (res.data && res.data.updatedAt) { setActLoader({}); setIsAlert(true); + setTimeout(() => setIsAlert(false), 1500); const upldatedList = List.filter((x) => x.objectId !== item.objectId); setList(upldatedList); } @@ -234,6 +239,7 @@ const ReportTable = ({ console.log("err", err); setIsAlert(true); setIsErr(true); + setTimeout(() => setIsAlert(false), 1500); setActLoader({}); } }; @@ -242,17 +248,12 @@ const ReportTable = ({ return (
{isAlert && ( -
setIsAlert(false)} - > + {isErr ? "Something went wrong, Please try again later!" : "Record deleted successfully!"} -
+ )} -
{ReportName}
{ReportName === "Templates" && ( diff --git a/apps/OpenSign/src/primitives/PdfDeclineModal.js b/apps/OpenSign/src/primitives/PdfDeclineModal.js index 6d12144e3..a0439de9e 100644 --- a/apps/OpenSign/src/primitives/PdfDeclineModal.js +++ b/apps/OpenSign/src/primitives/PdfDeclineModal.js @@ -1,6 +1,6 @@ import React from "react"; -import "../styles/customModal.css"; import "../styles/signature.css"; +import { rejectBtn } from "../constant/const"; function CustomModal({ show, @@ -15,40 +15,34 @@ function CustomModal({ return ( show && (
-
-
{headMsg && headMsg}
-
-

{bodyMssg && bodyMssg}

+
+
+ {headMsg && headMsg} +
+
+

{bodyMssg && bodyMssg}

{footerMessage && ( <> -
-
+
+