diff --git a/apps/OpenSign/src/components/AppendFormInForm.js b/apps/OpenSign/src/components/AppendFormInForm.js index d090348e3..2d61d4597 100644 --- a/apps/OpenSign/src/components/AppendFormInForm.js +++ b/apps/OpenSign/src/components/AppendFormInForm.js @@ -241,26 +241,6 @@ const AppendFormInForm = (props) => { className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" /> - -
- - setPhone(e.target.value)} - required - disabled={addYourself} - className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" - /> -
-
+
+ + setPhone(e.target.value)} + required + disabled={addYourself} + className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs" + /> +
- {!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")}
diff --git a/apps/OpenSignServer/files/verification_email.html b/apps/OpenSignServer/files/verification_email.html index 0a9c3a664..2cae33453 100644 --- a/apps/OpenSignServer/files/verification_email.html +++ b/apps/OpenSignServer/files/verification_email.html @@ -10,7 +10,7 @@

Verify email


-

ExampleApp

+

OpenSign™

- \ No newline at end of file + diff --git a/apps/OpenSignServer/index.js b/apps/OpenSignServer/index.js index 16445d99c..760b6df91 100644 --- a/apps/OpenSignServer/index.js +++ b/apps/OpenSignServer/index.js @@ -73,7 +73,7 @@ export const config = { masterKey: process.env.MASTER_KEY || '', //Add your master key here. Keep it secret! masterKeyIps: ['0.0.0.0/0', '::1'], // '::1' serverURL: process.env.SERVER_URL || 'http://localhost:8080/app', // Don't forget to change to https if needed - // verifyUserEmails: true, + verifyUserEmails: true, publicServerURL: process.env.SERVER_URL || 'http://localhost:8080/app', // Your apps name. This will appear in the subject and body of the emails that are sent. appName: 'Open Sign',