🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
fix: resolve conflict
RaktimaNXG14fe3b2b9817
diff --cc apps/OpenSign/public/locales/en/translation.jsonindex 7e4e04772,a25a053d5..83eb56de0--- a/apps/OpenSign/public/locales/en/translation.json+++ b/apps/OpenSign/public/locales/en/translation.json@@@ -619,9 -615,11 +619,11 @@@"quantityofquicksend": "Quantity of Quick send","quotaerrquicksend": "Quota Reached, You don't have enough credits.","buycredits": "Buy credits",- "rotate-right":"Rotate right",- "rotate-left":"Rotate left",- "rotate-alert-mssg":"All widgets on this page will be lost. Are you sure you want to proceed?",- "templateid":"Template-Id",- "bulksendsubcriptionalert":"Please upgrade to Professional or Team plan to use quicksend.",+ "rotate-right": "Rotate right",+ "rotate-left": "Rotate left",+ "rotate-alert-mssg": "All widgets on this page will be lost. Are you sure you want to proceed?",+ "templateid": "Template-Id",- "bulksendsubcriptionalert": "Please upgrade to Professional or Team plan to use quicksend."++ "bulksendsubcriptionalert": "Please upgrade to Professional or Team plan to use quicksend.",+ "generate-test-token":"Generate Test Token",+ "regenerate-test-token":"Regenerate Test Token"}diff --cc apps/OpenSign/public/locales/fr/translation.jsonindex 66bbb12e1,745339c12..376a16011--- a/apps/OpenSign/public/locales/fr/translation.json+++ b/apps/OpenSign/public/locales/fr/translation.json@@@ -618,9 -615,11 +618,11 @@@"quantityofquicksend": "Quantité de Quick send","quotaerrquicksend": "Quota atteint, vous n'avez pas assez de crédits.","buycredits": "Acheter des crédits",- "rotate-right" :"Faire pivoter à droite",- "rotate-left" :"Faire pivoter à gauche",- "rotate-alert-mssg" :"Tous les widgets de cette page seront perdus. Êtes-vous sûr de vouloir continuer ?",- "templateid":"ID de modèle",- "bulksendsubcriptionalert":"Veuillez passer au forfait Professionnel ou Équipe pour utiliser Quicksend.",- "generate-test-token": "Générer jeton de test",+ "rotate-right": "Faire pivoter à droite",+ "rotate-left": "Faire pivoter à gauche",+ "rotate-alert-mssg": "Tous les widgets de cette page seront perdus. Êtes-vous sûr de vouloir continuer ?",+ "templateid": "ID de modèle",- "bulksendsubcriptionalert": "Veuillez passer au forfait Professionnel ou Équipe pour utiliser Quicksend."++ "bulksendsubcriptionalert": "Veuillez passer au forfait Professionnel ou Équipe pour utiliser Quicksend.",++ "generate-test-token": "Générer jeton de test",+ "regenerate-test-token":"Régénérer le jeton de test"}diff --cc apps/OpenSign/src/pages/UserProfile.jsindex 7dd49f055,06f9ce63c..1158137a9--- a/apps/OpenSign/src/pages/UserProfile.js+++ b/apps/OpenSign/src/pages/UserProfile.js@@@ -350,105 -329,6 +350,107 @@@ function UserProfile()setTimeout(() => setIsAlert({}), 3000);};+ const tourConfig = [+ {+ selector: '[data-tut="username"]',+ content: () => (+ <TourContentWithBtn+ message={t("tour-mssg.username")}+ isChecked={handleDontShow}+ image={userName}+ />+ ),+ position: "top",+ style: { fontSize: "13px" }+ },+ {+ selector: '[data-tut="tagline"]',+ content: () => (+ <TourContentWithBtn+ message={t("tour-mssg.tagline")}+ isChecked={handleDontShow}+ image={userName}+ />+ ),+ position: "top",+ style: { fontSize: "13px" }+ },+ {+ selector: '[data-tut="publicTemplate"]',+ content: () => (+ <TourContentWithBtn+ message={t("tour-mssg.public-template")}+ isChecked={handleDontShow}+ video={publicRole}+ />+ ),+ position: "top",+ style: { fontSize: "13px" }+ }+ ];+ //function for update TourStatus+ const closeTour = async () => {- setIsProfileTour(true);- if (isDontShow) {- let updatedTourStatus = [];- if (tourStatus.length > 0) {- updatedTourStatus = [...tourStatus];- const profileIndex = tourStatus.findIndex(- (obj) => obj["profileTour"] === false || obj["profileTour"] === true- );- if (profileIndex !== -1) {- updatedTourStatus[profileIndex] = { profileTour: true };++ try {++ setIsProfileTour(true);++ if (isDontShow) {++ let updatedTourStatus = [];++ if (tourStatus.length > 0) {++ updatedTourStatus = [...tourStatus];++ const profileIndex = tourStatus.findIndex(++ (obj) => obj["profileTour"] === false || obj["profileTour"] === true++ );++ if (profileIndex !== -1) {++ updatedTourStatus[profileIndex] = { profileTour: true };++ } else {++ updatedTourStatus.push({ profileTour: true });++ }+ } else {- updatedTourStatus.push({ profileTour: true });++ updatedTourStatus = [{ profileTour: true }];+ }- } else {- updatedTourStatus = [{ profileTour: true }];- }- await axios- .put(++++ await axios.put(+ `${localStorage.getItem("baseUrl")}classes/contracts_Users/${+ extendUser?.[0]?.objectId+ }`,+ {+ TourStatus: updatedTourStatus+ },+ {+ headers: {+ "Content-Type": "application/json",+ "X-Parse-Application-Id": localStorage.getItem("parseAppId"),+ sessionToken: localStorage.getItem("accesstoken")+ }+ }- )- .then(() => {- // const json = Listdata.data;- })- .catch((err) => {- console.log("axois err ", err);- alert(t("something-went-wrong-mssg"));- });++ );++ const res = await Parse.Cloud.run("getUserDetails");++ const json = JSON.parse(JSON.stringify([res]));++ const extRes = JSON.stringify(json);++ localStorage.setItem("Extand_Class", extRes);++ }++ } catch (err) {++ console.log("axois err ", err);++ alert(t("something-went-wrong-mssg"));+ }+ };+ const handleDontShow = (isChecked) => {+ setIsDontShow(isChecked);+ };+ const handleTooltipClick = (type) => {+ if (type === "public") {+ setIsPublicInfo({+ status: true,+ message: t("tour-mssg.username"),+ image: userName+ });+ } else if (type === "tagline") {+ setIsPublicInfo({+ status: true,+ message: t("tour-mssg.tagline"),+ image: userName+ });+ }+ };return (<React.Fragment><Title title={"Profile"} />