diff --git a/apps/OpenSign/src/components/LoginGoogle.js b/apps/OpenSign/src/components/LoginGoogle.js index 19c6fd594..7cc01c213 100644 --- a/apps/OpenSign/src/components/LoginGoogle.js +++ b/apps/OpenSign/src/components/LoginGoogle.js @@ -42,7 +42,42 @@ const GoogleSignInBtn = ({ width: "187px" }); }); + const clearStorage = async () => { + await Parse.User.logOut(); + + let baseUrl = localStorage.getItem("BaseUrl12"); + let appid = localStorage.getItem("AppID12"); + let applogo = localStorage.getItem("appLogo"); + let domain = localStorage.getItem("domain"); + let appversion = localStorage.getItem("appVersion"); + let appTitle = localStorage.getItem("appTitle"); + let defaultmenuid = localStorage.getItem("defaultmenuid"); + let PageLanding = localStorage.getItem("PageLanding"); + let _appName = localStorage.getItem("_appName"); + let _app_objectId = localStorage.getItem("_app_objectId"); + let appName = localStorage.getItem("appName"); + let userSettings = localStorage.getItem("userSettings"); + + localStorage.clear(); + + localStorage.setItem("BaseUrl12", baseUrl); + localStorage.setItem("AppID12", appid); + localStorage.setItem("appLogo", applogo); + localStorage.setItem("domain", domain); + localStorage.setItem("appversion", appversion); + localStorage.setItem("appTitle", appTitle); + localStorage.setItem("defaultmenuid", defaultmenuid); + localStorage.setItem("PageLanding", PageLanding); + localStorage.setItem("_appName", _appName); + localStorage.setItem("_app_objectId", _app_objectId); + localStorage.setItem("appName", appName); + localStorage.setItem("userSettings", userSettings); + localStorage.setItem("baseUrl", baseUrl); + localStorage.setItem("parseAppId", appid); + + }; const responseGoogle = async (response) => { + clearStorage(); setThirdpartyLoader(true); // console.log("response ", response); if (response.credential) { diff --git a/apps/OpenSign/src/routes/Login.js b/apps/OpenSign/src/routes/Login.js index 4a472cb95..bfb6e813c 100644 --- a/apps/OpenSign/src/routes/Login.js +++ b/apps/OpenSign/src/routes/Login.js @@ -10,9 +10,11 @@ import GoogleSignInBtn from "../components/LoginGoogle"; // import LoginFacebook from "../components/LoginFacebook"; import { NavLink, useNavigate } from "react-router-dom"; import login_img from "../assets/images/login_img.svg"; +import { useWindowSize } from "../hook/useWindowSize"; function Login(props) { const navigate = useNavigate(); + const { width } = useWindowSize(); const [state, setState] = useState({ email: "", toastColor: "#5cb85c", @@ -21,7 +23,6 @@ function Login(props) { passwordVisible: false, mobile: "", phone: "", - hideNav: "", scanResult: "", baseUrl: localStorage.getItem("baseUrl"), parseAppId: localStorage.getItem("parseAppId"), @@ -47,26 +48,11 @@ function Login(props) { ); // eslint-disable-next-line }, []); - useEffect(() => { - resize(); - window.addEventListener("resize", resize()); - return () => { - window.removeEventListener("resize", resize()); - }; - // eslint-disable-next-line - }, []); const handleChange = (event) => { const { name, value } = event.target; setState({ ...state, [name]: value }); }; - const resize = () => { - let currentHideNav = window.innerWidth <= 760; - if (currentHideNav !== state.hideNav) { - setState({ ...state, hideNav: currentHideNav }); - } - }; - const handleSubmit = async (event) => { localStorage.removeItem("accesstoken"); event.preventDefault(); @@ -594,6 +580,10 @@ function Login(props) { } else { navigate(`/subscription`, { replace: true }); } + } else { + navigate( + `/${element.pageType}/${element.pageId}` + ); } } } else { @@ -618,6 +608,10 @@ function Login(props) { } else { navigate(`/subscription`, { replace: true }); } + } else { + navigate( + `/${element.pageType}/${element.pageId}` + ); } } }, @@ -1050,7 +1044,7 @@ function Login(props) { Create Account @@ -1118,7 +1112,7 @@ function Login(props) { - {!state.hideNav && ( + {width >= 768 && (
{ + const { width } = useWindowSize(); const navigate = useNavigate(); const [name, setName] = useState(""); const [phone, setPhone] = useState(""); @@ -18,7 +20,6 @@ const Signup = (props) => { const [company, setCompany] = useState(""); const [jobTitle, setJobTitle] = useState(""); const [state, setState] = useState({ - hideNav: "", loading: false, toastColor: "#5cb85c", toastDescription: "" @@ -387,24 +388,14 @@ const Signup = (props) => { } }; useEffect(() => { - window.addEventListener("resize", resize); props.fetchAppInfo( localStorage.getItem("domain"), localStorage.getItem("BaseUrl12"), localStorage.getItem("AppID12") ); - return () => { - window.removeEventListener("resize", resize); - }; // eslint-disable-next-line }, []); - const resize = () => { - let currentHideNav = window.innerWidth <= 760; - if (currentHideNav !== state.hideNav) { - setState({ hideNav: currentHideNav }); - } - }; return (
{state.loading && ( @@ -438,11 +429,7 @@ const Signup = (props) => {
- {state.hideNav ? ( - - ) : ( - - )} +
@@ -550,14 +537,14 @@ const Signup = (props) => { Login
- {!state.hideNav && ( + {width >= 768 && (
bisec diff --git a/apps/OpenSign/src/routes/UserProfile.js b/apps/OpenSign/src/routes/UserProfile.js index ea450c94f..5dc747329 100644 --- a/apps/OpenSign/src/routes/UserProfile.js +++ b/apps/OpenSign/src/routes/UserProfile.js @@ -16,6 +16,8 @@ function UserProfile() { const [Phone, SetPhone] = useState(UserProfile && UserProfile.phone); const [Image, setImage] = useState(localStorage.getItem("profileImg")); const [isLoader, setIsLoader] = useState(false); + const [percentage, setpercentage] = useState(0); + Parse.serverURL = parseBaseUrl; Parse.initialize(parseAppId); const handleSubmit = async (e) => { @@ -44,7 +46,7 @@ function UserProfile() { await updateExtUser({ Name: res.name, Phone: res.phone }); alert("Profile updated successfully."); setEditMode(false); - navigate("/"); + navigate("/dashboard/35KBoSgoAK"); } }, (error) => { @@ -102,7 +104,15 @@ function UserProfile() { const parseFile = new Parse.File(name, pdfFile); try { - const response = await parseFile.save(); + const response = await parseFile.save({ + progress: (progressValue, loaded, total, { type }) => { + if (type === "upload" && progressValue !== null) { + const percentCompleted = Math.round((loaded * 100) / total); + // console.log("percentCompleted ", percentCompleted); + setpercentage(percentCompleted); + } + } + }); // // The response object will contain information about the uploaded file // console.log("File uploaded:", response); @@ -111,6 +121,7 @@ function UserProfile() { if (response.url()) { setImage(response.url()); localStorage.setItem("profileImg", response.url()); + setpercentage(0); SaveFileSize(size, response.url()); return response.url(); } @@ -167,8 +178,18 @@ function UserProfile() { }} /> )} + {percentage !== 0 && ( +
+
+
+
+ {percentage}% +
+ )}
- {" "} {localStorage.getItem("_user_role")}