diff --git a/apps/OpenSign/src/App.js b/apps/OpenSign/src/App.js index 3ad4546fe..5f195fb3b 100644 --- a/apps/OpenSign/src/App.js +++ b/apps/OpenSign/src/App.js @@ -43,8 +43,8 @@ function App() { : window.location.origin + "/api/app"; const appName = "contracts"; try { - localStorage.setItem("BaseUrl12", `${baseurl}/`); - localStorage.setItem("AppID12", appId); + localStorage.setItem("baseUrl", `${baseurl}/`); + localStorage.setItem("parseAppId", appId); localStorage.setItem("domain", appName); setIsLoading(false); } catch (error) { diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.js index 5861f6be6..67d6095e0 100644 --- a/apps/OpenSign/src/components/AddUser.js +++ b/apps/OpenSign/src/components/AddUser.js @@ -12,8 +12,6 @@ const AddUser = (props) => { const [isUserExist, setIsUserExist] = useState(false); const parseBaseUrl = localStorage.getItem("baseUrl"); const parseAppId = localStorage.getItem("parseAppId"); - Parse.serverURL = parseBaseUrl; - Parse.initialize(parseAppId); const checkUserExist = async () => { try { diff --git a/apps/OpenSign/src/components/AppendFormInForm.js b/apps/OpenSign/src/components/AppendFormInForm.js index 4f757e5bf..9fb2723f1 100644 --- a/apps/OpenSign/src/components/AppendFormInForm.js +++ b/apps/OpenSign/src/components/AppendFormInForm.js @@ -49,8 +49,6 @@ const AppendFormInForm = (props) => { e.preventDefault(); e.stopPropagation(); setIsLoader(true); - Parse.serverURL = parseBaseUrl; - Parse.initialize(parseAppId); try { const contactQuery = new Parse.Object("contracts_Contactbook"); contactQuery.set("Name", name); diff --git a/apps/OpenSign/src/components/Header.js b/apps/OpenSign/src/components/Header.js index 2ed4af269..6306d5135 100644 --- a/apps/OpenSign/src/components/Header.js +++ b/apps/OpenSign/src/components/Header.js @@ -11,8 +11,6 @@ const Header = ({ showSidebar }) => { let applogo = localStorage.getItem("appLogo") || ""; let username = localStorage.getItem("username"); const image = localStorage.getItem("profileImg") || dp; - const [parseBaseUrl] = useState(localStorage.getItem("baseUrl")); - const [parseAppId] = useState(localStorage.getItem("parseAppId")); const [isOpen, setIsOpen] = useState(false); @@ -22,8 +20,6 @@ const Header = ({ showSidebar }) => { const closeDropdown = () => { setIsOpen(false); - Parse.serverURL = parseBaseUrl; - Parse.initialize(parseAppId); Parse.User.logOut(); let appdata = localStorage.getItem("userSettings"); let applogo = localStorage.getItem("appLogo"); @@ -32,8 +28,8 @@ const Header = ({ showSidebar }) => { let PageLanding = localStorage.getItem("PageLanding"); let domain = localStorage.getItem("domain"); let _appName = localStorage.getItem("_appName"); - let baseUrl = localStorage.getItem("BaseUrl12"); - let appid = localStorage.getItem("AppID12"); + let baseUrl = localStorage.getItem("baseUrl"); + let appid = localStorage.getItem("parseAppId"); localStorage.clear(); @@ -44,8 +40,8 @@ const Header = ({ showSidebar }) => { localStorage.setItem("PageLanding", PageLanding); localStorage.setItem("domain", domain); localStorage.setItem("userSettings", appdata); - localStorage.setItem("BaseUrl12", baseUrl); - localStorage.setItem("AppID12", appid); + localStorage.setItem("baseUrl", baseUrl); + localStorage.setItem("parseAppId", appid); navigation("/"); }; diff --git a/apps/OpenSign/src/components/LoginGoogle.js b/apps/OpenSign/src/components/LoginGoogle.js index bd44d7f0d..96e97c1b0 100644 --- a/apps/OpenSign/src/components/LoginGoogle.js +++ b/apps/OpenSign/src/components/LoginGoogle.js @@ -48,8 +48,8 @@ const GoogleSignInBtn = ({ if (Parse.User.current()) { await Parse.User.logOut(); } - let baseUrl = localStorage.getItem("BaseUrl12"); - let appid = localStorage.getItem("AppID12"); + let baseUrl = localStorage.getItem("baseUrl"); + let appid = localStorage.getItem("parseAppId"); let applogo = localStorage.getItem("appLogo"); let domain = localStorage.getItem("domain"); let appversion = localStorage.getItem("appVersion"); @@ -63,8 +63,8 @@ const GoogleSignInBtn = ({ localStorage.clear(); - localStorage.setItem("BaseUrl12", baseUrl); - localStorage.setItem("AppID12", appid); + localStorage.setItem("baseUrl", baseUrl); + localStorage.setItem("parseAppId", appid); localStorage.setItem("appLogo", applogo); localStorage.setItem("domain", domain); localStorage.setItem("appversion", appversion); @@ -191,8 +191,8 @@ const GoogleSignInBtn = ({ let PageLanding = localStorage.getItem("PageLanding"); let domain = localStorage.getItem("domain"); let _appName = localStorage.getItem("_appName"); - let baseUrl = localStorage.getItem("BaseUrl12"); - let appid = localStorage.getItem("AppID12"); + let baseUrl = localStorage.getItem("baseUrl"); + let appid = localStorage.getItem("parseAppId"); localStorage.clear(); @@ -203,8 +203,8 @@ const GoogleSignInBtn = ({ localStorage.setItem("PageLanding", PageLanding); localStorage.setItem("domain", domain); localStorage.setItem("userSettings", appdata); - localStorage.setItem("BaseUrl12", baseUrl); - localStorage.setItem("AppID12", appid); + localStorage.setItem("baseUrl", baseUrl); + localStorage.setItem("parseAppId", appid); }; return (
diff --git a/apps/OpenSign/src/components/dashboard/DashboardCard.js b/apps/OpenSign/src/components/dashboard/DashboardCard.js index 08d2a8904..bc131213f 100644 --- a/apps/OpenSign/src/components/dashboard/DashboardCard.js +++ b/apps/OpenSign/src/components/dashboard/DashboardCard.js @@ -24,9 +24,6 @@ const DashboardCard = (props) => { }; let body = {}; let currentUser; - - Parse.serverURL = parseBaseUrl; - Parse.initialize(parseAppId); let currentUser1 = Parse.User.current(); currentUser = currentUser1.id; let res; @@ -82,8 +79,6 @@ const DashboardCard = (props) => { } else { setLoading(true); try { - Parse.serverURL = parseBaseUrl; - Parse.initialize(parseAppId); const currentUser = Parse.User.current(); let reg1 = /(\#.*?\#)/gi; // eslint-disable-line let _query = props.Data.query; @@ -223,8 +218,6 @@ const DashboardCard = (props) => { if (restr.includes("#")) { try { - Parse.serverURL = parseBaseUrl; - Parse.initialize(parseAppId); const currentUser = Parse.User.current(); let res; if (localStorage.getItem("Extand_Class")) { diff --git a/apps/OpenSign/src/components/dashboard/DashboardReport.js b/apps/OpenSign/src/components/dashboard/DashboardReport.js index ddb832024..e29ef149b 100644 --- a/apps/OpenSign/src/components/dashboard/DashboardReport.js +++ b/apps/OpenSign/src/components/dashboard/DashboardReport.js @@ -45,18 +45,16 @@ function DashboardReport(props) { setActions(json.actions); setReportName(json.reportName); setHeading(json.heading); - Parse.serverURL = localStorage.getItem("BaseUrl12"); - Parse.initialize(localStorage.getItem("AppID12")); const currentUser = Parse.User.current().id; const headers = { "Content-Type": "application/json", - "X-Parse-Application-Id": localStorage.getItem("AppID12"), + "X-Parse-Application-Id": localStorage.getItem("parseAppId"), sessiontoken: localStorage.getItem("accesstoken") }; try { const params = { reportId: id, skip: skipUserRecord, limit: limit }; - const url = `${localStorage.getItem("BaseUrl12")}/functions/getReport`; + const url = `${localStorage.getItem("baseUrl")}/functions/getReport`; const res = await axios.post(url, params, { headers: headers, signal: abortController.signal // is used to cancel fetch query diff --git a/apps/OpenSign/src/components/pdf/Header.js b/apps/OpenSign/src/components/pdf/Header.js index 626671581..d2c64c7c5 100644 --- a/apps/OpenSign/src/components/pdf/Header.js +++ b/apps/OpenSign/src/components/pdf/Header.js @@ -433,7 +433,7 @@ function Header({ {recipient ? ( pdfUrl || isAlreadySign.mssg ? (
- {pdfDetails[0] && pdfDetails.length > 0 && ( + {pdfDetails && pdfDetails.length > 0 && ( )}