🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into validation
prafull-opensignlabs862dd78cd5ad
diff --cc apps/OpenSign/public/locales/en/translation.jsonindex c7a4d45ff,e64b08be5..9d9a53375--- a/apps/OpenSign/public/locales/en/translation.json+++ b/apps/OpenSign/public/locales/en/translation.json@@@ -586,29 -586,23 +586,22 @@@"Recent signature requests": "This is a list of documents that are waiting for your signature.","Recently sent for signatures":"This is a list of documents you've sent to other parties for signature.","Drafts":"This are documents you have started but have not finalized for sending."- },- "enter-email-plaholder":"Add an email address and hit enter",- "success-email-alert":"Email sent successfully!",- "expired-doc-title":"Expired Document",- "expired-on-mssg" :"This document expired on {{expiredDate}} and is no longer available to sign.",- "signature-validate-alert":"Please confirm that you have selected at least {{minRequiredCount}} checkboxes.",- "signature-validate-alert-2" :"Ensure this field is accurately filled and meets all requirements.",- "user-name-exist":"user name already exist"--------+ },+ "enter-email-plaholder":"Add an email address and hit enter",+ "success-email-alert":"Email sent successfully!",+ "expired-doc-title":"Expired Document",+ "expired-on-mssg" :"This document expired on {{expiredDate}} and is no longer available to sign.",+ "signature-validate-alert":"Please confirm that you have selected at least {{minRequiredCount}} checkboxes.",+ "signature-validate-alert-2" :"Ensure this field is accurately filled and meets all requirements.",+ "remaing-users":"Remaining users",+ "Role":"Role",+ "additional-users":"Please purchase add-on users.",+ "Quantity-of-users":"Quantity of users",+ "Price":"Price",+ "Total-price-for-next-time":"Total price for next time",+ "Proceed":"Proceed",+ "Select":"Select",- "Add-seats":"Add Seats"-++ "Add-seats":"Add Seats",++ "user-name-exist":"user name already exist"---------}diff --cc apps/OpenSign/public/locales/fr/translation.jsonindex ef16a0a19,e8416a5de..fa0df737a--- a/apps/OpenSign/public/locales/fr/translation.json+++ b/apps/OpenSign/public/locales/fr/translation.json@@@ -585,28 -585,19 +585,24 @@@"Recent signature requests": "Voici une liste de documents qui attendent votre signature.","Recently sent for signatures":"Il s'agit d'une liste de documents que vous avez envoyés à d'autres parties pour signature.","Drafts":"Il s'agit de documents que vous avez commencés mais que vous n'avez pas finalisés pour envoi."- },- "enter-email-plaholder":"Ajoutez une adresse email et appuyez sur Entrée",- "success-email-alert" :"E-mail envoyé avec succès!",- "expired-doc-title" :"Document expiré",- "expired-on-mssg" :"Ce document a expiré le {{expiredDate}} et n'est plus disponible pour signature.",- "signature-validate-alert":"Veuillez confirmer que vous avez coché au moins {{minRequiredCount}} cases.",- "signature-validate-alert-2" :"Assurez-vous que ce champ est rempli avec précision et répond à toutes les exigences.",- "user-name-exist" :"le nom d'utilisateur existe déjà "-----+ },+ "enter-email-plaholder":"Ajoutez une adresse email et appuyez sur Entrée",+ "success-email-alert" :"E-mail envoyé avec succès!",+ "expired-doc-title" :"Document expiré",+ "expired-on-mssg" :"Ce document a expiré le {{expiredDate}} et n'est plus disponible pour signature.",+ "signature-validate-alert":"Veuillez confirmer que vous avez coché au moins {{minRequiredCount}} cases.",+ "signature-validate-alert-2" :"Assurez-vous que ce champ est rempli avec précision et répond à toutes les exigences.",++ "user-name-exist" :"le nom d'utilisateur existe déjà ",+ "remaing-users":"Utilisateurs restants",+ "Role":"Rôle",+ "additional-users":"Veuillez acheter des utilisateurs supplémentaires.",+ "Quantity-of-users":"Quantité d'utilisateurs",+ "Price":"Prix",+ "Total-price-for-next-time":"Prix ​​total pour la prochaine fois",+ "Proceed":"Procéder",+ "Select":"sélectionner",+ "Add-seats":"Ajouter des sièges"------++}diff --cc apps/OpenSign/src/pages/UserProfile.jsindex df9c7a5bb,d5b9c75d8..06f9ce63c--- a/apps/OpenSign/src/pages/UserProfile.js+++ b/apps/OpenSign/src/pages/UserProfile.js@@@ -10,15 -10,18 +10,18 @@@ import Tooltip from "../primitives/Toolimport { isEnableSubscription, isStaging } from "../constant/const";import {checkIsSubscribed,- checkIsSubscribedTeam,+ copytoData,handleSendOTP,openInNewTab} from "../constant/Utils";import Upgrade from "../primitives/Upgrade";import ModalUi from "../primitives/ModalUi";import Loader from "../primitives/Loader";+import { paidUrl, validplan } from "../json/plansArr";import { useTranslation } from "react-i18next";import SelectLanguage from "../components/pdf/SelectLanguage";+ import { RWebShare } from "react-web-share";+ import Alert from "../primitives/Alert";function UserProfile() {const navigate = useNavigate();@@@ -36,6 -39,7 +39,7 @@@const [isDisableDocId, setIsDisableDocId] = useState(false);const [isSubscribe, setIsSubscribe] = useState(false);const [isUpgrade, setIsUpgrade] = useState(false);- const [isAlert, setIsAlert] = useState({});++ const [isAlert, setIsAlert] = useState({ type: "success", message: "" });const [publicUserName, setPublicUserName] = useState(extendUser && extendUser?.[0]?.UserName);@@@ -53,9 -57,10 +57,10 @@@const [tagLine, setTagLine] = useState(extendUser && extendUser?.[0]?.Tagline);- const [isTeam, setIsTeam] = useState(false);+ const [isPlan, setIsPlan] = useState({ plan: "", isValid: false });-+ const getPublicUrl = isStaging+ ? `https://staging.opensign.me/${extendUser?.[0]?.UserName}`+ : `https://opensign.me/${extendUser?.[0]?.UserName}`;useEffect(() => {getUserDetail();// eslint-disable-next-line react-hooks/exhaustive-deps@@@ -103,10 -109,13 +108,8 @@@});if (res) {setIsLoader(false);- setUserNameError("user name already exist");- setIsAlert({- type: "danger",- message: t("user-name-exist")- });-- setTimeout(() => {- setUserNameError("");- setIsAlert({});-- }, 3000);++ setIsAlert({ type: "danger", message: t("user-name-exist") });++ setTimeout(() => setIsAlert({}), 3000);return res;}} catch (e) {@@@ -312,15 -320,17 +314,21 @@@setJobTitle(extendUser?.[0]?.JobTitle);setIsDisableDocId(extendUser?.[0]?.HeaderDocId);};+ const handlePaidRoute = () => {+ const route = paidUrl(isPlan.plan);+ if (route === "/subscription") {+ navigate(route);+ } else {+ openInNewTab(route, "_self");+ }+ };++ const copytoclipboard = () => {+ copytoData(getPublicUrl);- setIsAlert({- type: "success",- message: t("copied")- });- setTimeout(() => {- setIsAlert({});- }, 3000);++ setIsAlert({ type: "success", message: t("copied") });++ setTimeout(() => setIsAlert({}), 3000);+ };+return (<React.Fragment><Title title={"Profile"} />@@@ -330,11 -340,12 +338,11 @@@</div>) : (<div className="flex justify-center items-center w-full relative">- {userNameError && (- <div className="z-[1000] fixed top-[50%] transform border-[1px] text-sm border-[#f0a8a8] bg-[#f4bebe] text-[#c42121] rounded py-[.75rem] px-[1.25rem]">- {userNameError}- </div>- {isAlert && (++ {isAlert.message && (+ <Alert className="z-[1000] fixed top-[10%]" type={isAlert.type}>+ {isAlert.message}+ </Alert>)}-<div className="bg-base-100 text-base-content flex flex-col justify-center shadow-md rounded-box w-[450px]"><div className="flex flex-col justify-center items-center my-4"><div className="w-[200px] h-[200px] overflow-hidden rounded-full">@@@ -504,12 -512,38 +509,33 @@@className="op-input op-input-bordered focus:outline-none hover:border-base-content op-input-xs"/>) : (- <input- value={extendUser?.[0]?.UserName}- disabled- placeholder="enter user name"- className="op-input op-input-bordered op-input-xs"- />+ <div className="flex flex-row gap-1 items-center justify-between md:justify-start">+ <span+ rel="noreferrer"+ target="_blank"- onClick={() => {- openInNewTab(getPublicUrl);- }}++ onClick={() => openInNewTab(getPublicUrl)}+ className="cursor-pointer underline hover:text-blue-800 w-[200px] md:w-[150px] whitespace-nowrap overflow-hidden text-ellipsis"+ >+ {isStaging+ ? `staging.opensign.me/${extendUser?.[0]?.UserName}`+ : `opensign.me/${extendUser?.[0]?.UserName}`}+ </span>+ <div className="flex items-center gap-2">+ <RWebShare- data={{- url: getPublicUrl,- title: "Sign url"- }}++ data={{ url: getPublicUrl, title: "Sign url" }}+ >+ <button className="op-btn op-btn-primary op-btn-outline op-btn-xs md:op-btn-sm ">+ <i className="fa-light fa-share-from-square"></i>{" "}+ </button>+ </RWebShare>+ <button+ className="op-btn op-btn-primary op-btn-outline op-btn-xs md:op-btn-sm"+ onClick={() => copytoclipboard()}+ >+ <i className="fa-light fa-link"></i>{" "}+ </button>+ </div>+ </div>)}</div></li>diff --cc apps/OpenSign/src/primitives/Alert.jsindex 6d2266f8d,b93dd80d2..b0a6e00e7--- a/apps/OpenSign/src/primitives/Alert.js+++ b/apps/OpenSign/src/primitives/Alert.js@@@ -18,9 -18,15 +18,15 @@@ const Alert = ({ children, type, classN}return (children && (- <div className="z-[1000] fixed top-20 left-1/2 transform -translate-x-1/2 text-sm">+ <div+ className={`${+ className+ ? className+ : "z-[1000] fixed top-20 left-1/2 transform -translate-x-1/2 text-sm"+ } `}+ >- <div className={`op-alert ${textcolor} flex items-center`}>- <span>{children}</span>+ <div className={`op-alert ${textcolor}`}>+ <span className="ml-3">{children}</span></div></div>)