Skip to content

Commit 2b73087

Browse files
nxglabsnxglabs
authored
Merge pull request #215 from prafull-opensignlabs/auth_user
2 parents 2fa2f56 + d11dff2 commit 2b73087

File tree

4 files changed

+76
-39
lines changed

4 files changed

+76
-39
lines changed

‎apps/OpenSign/src/components/LoginGoogle.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,42 @@ const GoogleSignInBtn = ({
4242
width: "187px"
4343
});
4444
});
45+
const clearStorage = async () => {
46+
await Parse.User.logOut();
47+
48+
let baseUrl = localStorage.getItem("BaseUrl12");
49+
let appid = localStorage.getItem("AppID12");
50+
let applogo = localStorage.getItem("appLogo");
51+
let domain = localStorage.getItem("domain");
52+
let appversion = localStorage.getItem("appVersion");
53+
let appTitle = localStorage.getItem("appTitle");
54+
let defaultmenuid = localStorage.getItem("defaultmenuid");
55+
let PageLanding = localStorage.getItem("PageLanding");
56+
let _appName = localStorage.getItem("_appName");
57+
let _app_objectId = localStorage.getItem("_app_objectId");
58+
let appName = localStorage.getItem("appName");
59+
let userSettings = localStorage.getItem("userSettings");
60+
61+
localStorage.clear();
62+
63+
localStorage.setItem("BaseUrl12", baseUrl);
64+
localStorage.setItem("AppID12", appid);
65+
localStorage.setItem("appLogo", applogo);
66+
localStorage.setItem("domain", domain);
67+
localStorage.setItem("appversion", appversion);
68+
localStorage.setItem("appTitle", appTitle);
69+
localStorage.setItem("defaultmenuid", defaultmenuid);
70+
localStorage.setItem("PageLanding", PageLanding);
71+
localStorage.setItem("_appName", _appName);
72+
localStorage.setItem("_app_objectId", _app_objectId);
73+
localStorage.setItem("appName", appName);
74+
localStorage.setItem("userSettings", userSettings);
75+
localStorage.setItem("baseUrl", baseUrl);
76+
localStorage.setItem("parseAppId", appid);
77+
78+
};
4579
const responseGoogle = async (response) => {
80+
clearStorage();
4681
setThirdpartyLoader(true);
4782
// console.log("response ", response);
4883
if (response.credential) {

‎apps/OpenSign/src/routes/Login.js‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ import GoogleSignInBtn from "../components/LoginGoogle";
1010
// import LoginFacebook from "../components/LoginFacebook";
1111
import { NavLink, useNavigate } from "react-router-dom";
1212
import login_img from "../assets/images/login_img.svg";
13+
import { useWindowSize } from "../hook/useWindowSize";
1314

1415
function Login(props) {
1516
const navigate = useNavigate();
17+
const { width } = useWindowSize();
1618
const [state, setState] = useState({
1719
email: "",
1820
toastColor: "#5cb85c",
@@ -21,7 +23,6 @@ function Login(props) {
2123
passwordVisible: false,
2224
mobile: "",
2325
phone: "",
24-
hideNav: "",
2526
scanResult: "",
2627
baseUrl: localStorage.getItem("baseUrl"),
2728
parseAppId: localStorage.getItem("parseAppId"),
@@ -47,26 +48,11 @@ function Login(props) {
4748
);
4849
// eslint-disable-next-line
4950
}, []);
50-
useEffect(() => {
51-
resize();
52-
window.addEventListener("resize", resize());
53-
return () => {
54-
window.removeEventListener("resize", resize());
55-
};
56-
// eslint-disable-next-line
57-
}, []);
5851
const handleChange = (event) => {
5952
const { name, value } = event.target;
6053
setState({ ...state, [name]: value });
6154
};
6255

63-
const resize = () => {
64-
let currentHideNav = window.innerWidth <= 760;
65-
if (currentHideNav !== state.hideNav) {
66-
setState({ ...state, hideNav: currentHideNav });
67-
}
68-
};
69-
7056
const handleSubmit = async (event) => {
7157
localStorage.removeItem("accesstoken");
7258
event.preventDefault();
@@ -594,6 +580,10 @@ function Login(props) {
594580
} else {
595581
navigate(`/subscription`, { replace: true });
596582
}
583+
} else {
584+
navigate(
585+
`/${element.pageType}/${element.pageId}`
586+
);
597587
}
598588
}
599589
} else {
@@ -618,6 +608,10 @@ function Login(props) {
618608
} else {
619609
navigate(`/subscription`, { replace: true });
620610
}
611+
} else {
612+
navigate(
613+
`/${element.pageType}/${element.pageId}`
614+
);
621615
}
622616
}
623617
},
@@ -1050,7 +1044,7 @@ function Login(props) {
10501044
<NavLink
10511045
className="rounded-sm cursor-pointer bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] w-full py-3 shadow uppercase"
10521046
to="/signup"
1053-
style={state.hideNav ? { textAlign: "center" } : {}}
1047+
style={width < 768 ? { textAlign: "center" } : {}}
10541048
>
10551049
Create Account
10561050
</NavLink>
@@ -1118,7 +1112,7 @@ function Login(props) {
11181112
</div>
11191113
</div>
11201114
</div>
1121-
{!state.hideNav && (
1115+
{width >= 768 && (
11221116
<div className="self-center">
11231117
<div className="mx-auto md:w-[300px] lg:w-[400px] xl:w-[500px]">
11241118
<img

‎apps/OpenSign/src/routes/Signup.js‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ import Title from "../components/Title";
66
import { fetchAppInfo, showTenantName } from "../redux/actions";
77
import { useNavigate, NavLink } from "react-router-dom";
88
import login_img from "../assets/images/login_img.svg";
9+
import { useWindowSize } from "../hook/useWindowSize";
910

1011
const Signup = (props) => {
12+
const { width } = useWindowSize();
1113
const navigate = useNavigate();
1214
const [name, setName] = useState("");
1315
const [phone, setPhone] = useState("");
@@ -18,7 +20,6 @@ const Signup = (props) => {
1820
const [company, setCompany] = useState("");
1921
const [jobTitle, setJobTitle] = useState("");
2022
const [state, setState] = useState({
21-
hideNav: "",
2223
loading: false,
2324
toastColor: "#5cb85c",
2425
toastDescription: ""
@@ -387,24 +388,14 @@ const Signup = (props) => {
387388
}
388389
};
389390
useEffect(() => {
390-
window.addEventListener("resize", resize);
391391
props.fetchAppInfo(
392392
localStorage.getItem("domain"),
393393
localStorage.getItem("BaseUrl12"),
394394
localStorage.getItem("AppID12")
395395
);
396-
return () => {
397-
window.removeEventListener("resize", resize);
398-
};
399396
// eslint-disable-next-line
400397
}, []);
401398

402-
const resize = () => {
403-
let currentHideNav = window.innerWidth <= 760;
404-
if (currentHideNav !== state.hideNav) {
405-
setState({ hideNav: currentHideNav });
406-
}
407-
};
408399
return (
409400
<div className="bg-white">
410401
{state.loading && (
@@ -438,11 +429,7 @@ const Signup = (props) => {
438429
<div>
439430
<div className="md:m-10 lg:m-16 md:p-4 lg:p-10 p-5 bg-[#ffffff] md:border-[1px] md:border-gray-400 ">
440431
<div className="w-[250px] h-[66px] inline-block">
441-
{state.hideNav ? (
442-
<img src={image} width="100%" alt="" />
443-
) : (
444-
<img src={image} width="100%" alt="" />
445-
)}
432+
<img src={image} width="100%" alt="" />
446433
</div>
447434
<div className="grid grid-cols-1 md:grid-cols-2 gap-x-2">
448435
<div className="">
@@ -550,14 +537,14 @@ const Signup = (props) => {
550537
<NavLink
551538
className="rounded-sm cursor-pointer bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] w-full py-3 shadow uppercase"
552539
to="/"
553-
style={state.hideNav ? { textAlign: "center" } : {}}
540+
style={width < 768 ? { textAlign: "center" } : {}}
554541
>
555542
Login
556543
</NavLink>
557544
</div>
558545
</form>
559546
</div>
560-
{!state.hideNav && (
547+
{width >= 768 && (
561548
<div className="self-center">
562549
<div className="mx-auto md:w-[300px] lg:w-[400px] xl:w-[500px]">
563550
<img src={login_img} alt="bisec" width="100%" />

‎apps/OpenSign/src/routes/UserProfile.js‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ function UserProfile() {
1616
const [Phone, SetPhone] = useState(UserProfile && UserProfile.phone);
1717
const [Image, setImage] = useState(localStorage.getItem("profileImg"));
1818
const [isLoader, setIsLoader] = useState(false);
19+
const [percentage, setpercentage] = useState(0);
20+
1921
Parse.serverURL = parseBaseUrl;
2022
Parse.initialize(parseAppId);
2123
const handleSubmit = async (e) => {
@@ -44,7 +46,7 @@ function UserProfile() {
4446
await updateExtUser({ Name: res.name, Phone: res.phone });
4547
alert("Profile updated successfully.");
4648
setEditMode(false);
47-
navigate("/");
49+
navigate("/dashboard/35KBoSgoAK");
4850
}
4951
},
5052
(error) => {
@@ -102,7 +104,15 @@ function UserProfile() {
102104
const parseFile = new Parse.File(name, pdfFile);
103105

104106
try {
105-
const response = await parseFile.save();
107+
const response = await parseFile.save({
108+
progress: (progressValue, loaded, total, { type }) => {
109+
if (type === "upload" && progressValue !== null) {
110+
const percentCompleted = Math.round((loaded * 100) / total);
111+
// console.log("percentCompleted ", percentCompleted);
112+
setpercentage(percentCompleted);
113+
}
114+
}
115+
});
106116
// // The response object will contain information about the uploaded file
107117
// console.log("File uploaded:", response);
108118

@@ -111,6 +121,7 @@ function UserProfile() {
111121
if (response.url()) {
112122
setImage(response.url());
113123
localStorage.setItem("profileImg", response.url());
124+
setpercentage(0);
114125
SaveFileSize(size, response.url());
115126
return response.url();
116127
}
@@ -167,8 +178,18 @@ function UserProfile() {
167178
}}
168179
/>
169180
)}
181+
{percentage !== 0 && (
182+
<div className="flex items-center gap-x-2">
183+
<div className="h-2 rounded-full w-[200px] md:w-[400px] bg-gray-200">
184+
<div
185+
className="h-2 rounded-full bg-blue-500"
186+
style={{ width: `${percentage}%` }}
187+
></div>
188+
</div>
189+
<span className="text-black text-sm">{percentage}%</span>
190+
</div>
191+
)}
170192
<div className="text-base font-semibold pt-4">
171-
{" "}
172193
{localStorage.getItem("_user_role")}
173194
</div>
174195
</div>

0 commit comments

Comments
 (0)