Skip to content

Commit 8700fd8

Browse files
authored
Merge branch 'staging' into transparent-img
2 parents 6d2010f + cdc8eb5 commit 8700fd8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2165
-2129
lines changed

.env.local_dev

Lines changed: 58 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -42,75 +42,68 @@ DO_SECRET_ACCESS_KEY=
4242
# Digital ocean spaces region or AWS s3 region
4343
DO_REGION=us-west
4444
# local storage
45-
USE_LOCAL=FALSE
45+
USE_LOCAL=TRUE
4646

47-
# Email using Mailgun or SMTP if set enable config (The app will not initialize if any of these variables are not set) *********************************************************************************************************************
48-
MAILGUN_API_KEY=
47+
# Email mailgun config (The app will not initialize if any of these 3 variables are not set) *********************************************************************************************************************
48+
MAILGUN_API_KEY=XXXXX
4949
MAILGUN_DOMAIN=mail.yourdomain.com
5050
51-
SMTP_ENABLE=
52-
SMTP_HOST=
53-
SMTP_PORT=
54-
SMTP_USER_EMAIL=
55-
SMTP_PASS=
56-
5751

5852
# Base64 encoded PFX or p12 document signing certificate file *********************************************************************************************************************
59-
PFX_BASE64='MIIKLwIBAzCCCeUGCSqGSIb3DQEHAaCCCdYEggnSMIIJzjCCBEIGCSqGSIb3DQEH
60-
BqCCBDMwggQvAgEAMIIEKAYJKoZIhvcNAQcBMFcGCSqGSIb3DQEFDTBKMCkGCSqG
61-
SIb3DQEFDDAcBAh6cQqVpHfTzAICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQME
62-
ASoEEFKEIGJTTRo3voO/FvsXs7yAggPAI7rMCboTFFBfdMuuV3Y9/xfphAgdGD7P
63-
0xAN10CcmXlMtedc8cRxOaD9n3Q7zJx5iIbqEGDTc0dgp5EtdWsGl7MP76iHkSfB
64-
ZUPc13nbnRU4Nq4hNFcSj1m6NVa0lT9UobbTsG+wUkJn8aLfijzZ1OY82KLlKUoJ
65-
lqLsQ1yZkeLiLKI0aEew/2vzfiLUX9A99qnCRoryo8ZbLiWl0Vu/FEKM5mqIRFEp
66-
BKeSUsRxBfJCMZ2Ks5t4/MTCV+yrcsuhLPF/AJpzKfIinEFDhm7MxP4RXtk2LWNe
67-
+EO2GuFRjZCfsMO0oNWybFmDeNDMCHZj5TeoqL1JwAV5e1lEeqR38v4Wcr4OVefY
68-
DfdrJ2xdvm7XbBZ8Lgx8L4fwugw7oDyTpR2jJqHMlpOsQrxipN6UKkN6EVYeCC5K
69-
4dF5LHdCcIa7L/OI/feD5g/zz8SGCTc91husVN7zi+CVO0lQLRkAj02+VbiXPPDD
70-
eQm/QBieG2yVe5IRfcnIs2aszulbQbgHdguSYSQa/7DEvN/9/uxUIRFbItwrreRI
71-
VAUUNS02L680Zok9xzDed1I/WJoPr2+5n2eV1jc5zoH7mAni0+Z1d5qLoYV6pNaN
72-
P9okvBf75LLNoJKsb/eWlkk73rmlH6/Qz+hudgnlkxUJuU/b79AMQpd0EWEWhcim
73-
ZeB4d9lPLLwyvY/FN4aCGWzsoAW69RK9E1DyGZAZRYRwCKHSWXmCaenR1ilxcPFx
74-
TDavpybObIISPtylv5Z/IGBjE19Lw0UHc6Waln/jx0YXXGGDWs1F/MrdJ/8mkVXf
75-
tHB/5ds4u5md+CmXpaCITO3Cg9GltGSWyDoEJsz1u/Wzq4X4FYmolXiqQvMPQrxu
76-
iThTnPDGbz9VqFSyNKPKswIQ8CUbvZ209A5vjERPzE0Lp1pO39K51fnHD9oD968t
77-
tGbGmNiQ0++Orze79cH0UVwDa6NLGCmnE0oBgke1JDPlaU3kkx7+R9SAS0Zytsmj
78-
aLxW5Z1cOFaqqBLjwgHUxOqRO+cl6P9ORox34wJjiwZKy1L+0ppw22Na/unwi2Rk
79-
a8jvK7+ycOLaiSmI77T0l7VCWgKsRsWLvBA3cjX5XAGtatFXrY/7Imoxl0nWGLjG
80-
n5Sv5XuDek4e4QAPeJmhpURMnzLDsSXAYOSYZvS/kgENYhYSnQLQp50TxrzquA2c
81-
lAeFIEqqAJy9tAMfp5UAqMeOC60Ttn6ySsdOle003F2NrRilhPynNDZ3h1ZQknur
82-
Y9zWUm9qBmXCjhPzdmzHz3Ozj2Bi6kd4MIIFhAYJKoZIhvcNAQcBoIIFdQSCBXEw
83-
ggVtMIIFaQYLKoZIhvcNAQwKAQKgggUxMIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkq
84-
hkiG9w0BBQwwHAQIZenzippqfSQCAggAMAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUD
85-
BAEqBBCddSIj/wfxowZAO1j3W9FwBIIE0C/guzeZtV/vPsaIDAtWEkmepCvhm9Rg
86-
aUgOoR66wjyYx7upeuZJ+pYJdsEqUmTgGYN+ClBpsU0bqCM7PI0mepvIT9kLD6ZL
87-
UkprtNAYP87NBA/e5dpXlGAf9ibDRT0F2Y+lCSF83rCIYKG8n7h5834F6Saf+dU7
88-
6y5bgorbf2Fnxy123XfUSg5qdCraZZM+DwE1gpQdBGrFyq8cwlQ8hJpKHDWup7WA
89-
f2HcT/X0Wjb24L6JWjC1FvTbTNdS/lzTOcqLYUc31iuU9rF6O4qtX9PK/yGWc+YE
90-
qakuV+HrsF4je/YdVZRYHtkbbcYXW9PjtMv+4D1ut5X2SPeHwpj3WmGAb7Zno6SD
91-
SfohMihXvDbIjVSMDBpW97bhgk0h7iS4ISIYoQJUGJv3QQ3XJq91LoIP3zpiO/Cq
92-
ZuuHuGvZmO6lb0PGShRT7mFg3k3rswTfFyKdtY76zAVJIR2bz/6bRf4uQI48SOLR
93-
NX1Z6lavUNiE4nPNlnfBp480C+YANKs/bdev0wkRVmFxPMyb5FFLXwLSqcfdSQag
94-
RayrKd8xPOm6lor3cTvrkO3XH2Hf9TgFHjeIAQ3VZ1Cncb9jfra3V4zvIocek4dC
95-
GREirPbEyL/js5O0aAa0mg9EontMWKRqncomKhUOckheP2dYiQOazDFDFP9OQCYV
96-
MBb0RDwm3+hiMU0lPeO+NAjAv2SfFK7G4maMb2SL7inT7An7ZPPpnDNXLDt+nOgo
97-
IKuaJpy8JX/OKB4ntYsdnQG4E0J3vpHWjYPKif7j1njIYFd76bIgNVlqWuQFArBy
98-
U9BuPyF+eYouJc+TpX9R5ybPvabRR4NUjnrttr2E5AzQfIgNGrSFiewjvYZHQOKd
99-
WyVR9YV0cUv591xyUDdXMoHh+J0v0xK1WCHe/9enY5y/C8YohL8h5tEvInAQconj
100-
lJ2r9qX8iBmIupJij5M5Ebza8HQ4aVMdHu/s05Vj9BC6K0ok3h+DFTj2gUBD24sp
101-
APHic0DmNnciUQuHuuoW/1SVb6I1HJswsgcC8CekvoXF26ygwWhJPyqw+5djip2w
102-
I/l3uOnPPUWZQHKhnBH4noZydrzBBJN1po9dkxb8LKuKZDEcnKo+tQrTnZJaFRXK
103-
pQDsAjQ0HcYi8ZqN/GPezXOqzRgvObevXeDYTJrNejr46B1HqjPw8doai+AEf//1
104-
iiM9EK4y3bGbX837oebTByRi112AOctISHTWbF0zdFMiBO9X9PML4n3i14ToqLH1
105-
EUp0WtCdKLJmrRnO9PKJUMpce3yNu6oRSBzB4EkgUMOTVx9tM66h/gcR3wr+qKJP
106-
1EABMbbCsJeYYLujhQHVh0JluqLBXYuCmr5n6o8qmonj5tEfTn9zs2gi0OvKTliH
107-
wRXWsar004alt8D8o4M/Oqu3qyVV1O8BlVEofUC1CfAMIh/T1NJBeKG/FPfAFoEz
108-
9liLLkoDvGvFVJ4Ezy4BaPtg+G3yU/SeiruwsCB3unHRD7G6VvS4jY2B8vEYl0yM
109-
Z1mLFbKK8CIEvg8+v/vbc0noYUOzd6bkwh6Y6cziR/u78y2nALYZpQK+3XiVVH/v
110-
SaVoDckZgUwAX+dMd1P4U3a487MPXBZZmLVFMHTuv3NvW6NIQCMd4l35ViRd7YcS
111-
V2QDKTnUtPN2MSUwIwYJKoZIhvcNAQkVMRYEFMSz7PlBO5VzTDqC/foidPWrMjkw
112-
MEEwMTANBglghkgBZQMEAgEFAAQgPlLuG+67SxPOEPbgFuEnVgewvY6LUzFmrprx
113-
c6yryFgECIld0S5kDk7JAgIIAA=='
53+
PFX_BASE64='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
106+
3pXAXxZuvVvv9tsb4bdrBAhyb+KCIjp/gAICCAA='
114107

115108
# Provide Pass pharse of above PFX or p12 document
116-
PASS_PHRASE=
109+
PASS_PHRASE=opensign

apps/OpenSign/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# production
1212
/build
13+
/mfbuild
1314

1415
# misc
1516
.env

apps/OpenSign/src/components/AppendFormInForm.js

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -241,39 +241,37 @@ const AppendFormInForm = (props) => {
241241
className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
242242
/>
243243
</div>
244-
245244
<div className="mb-3">
246245
<label
247-
htmlFor="phone"
246+
htmlFor="email"
248247
className="block text-xs text-gray-700 font-semibold"
249248
>
250-
Phone
249+
Email
251250
<span style={{ color: "red", fontSize: 13 }}> *</span>
252251
</label>
253252
<input
254-
type="text"
255-
id="phone"
256-
value={phone}
257-
onChange={(e) => setPhone(e.target.value)}
253+
type="email"
254+
id="email"
255+
value={email}
256+
onChange={(e) => setEmail(e.target.value)}
258257
required
259258
disabled={addYourself}
260259
className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
261260
/>
262261
</div>
263-
264262
<div className="mb-3">
265263
<label
266-
htmlFor="email"
264+
htmlFor="phone"
267265
className="block text-xs text-gray-700 font-semibold"
268266
>
269-
Email
267+
Phone
270268
<span style={{ color: "red", fontSize: 13 }}> *</span>
271269
</label>
272270
<input
273-
type="email"
274-
id="email"
275-
value={email}
276-
onChange={(e) => setEmail(e.target.value)}
271+
type="text"
272+
id="phone"
273+
value={phone}
274+
onChange={(e) => setPhone(e.target.value)}
277275
required
278276
disabled={addYourself}
279277
className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"

apps/OpenSign/src/components/LoginFacebook.js

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,26 @@ const LoginFacebook = ({
2727
setThirdpartyLoader(true);
2828
const details = {
2929
Email: response.email,
30-
Name: response.name,
30+
Name: response.name
3131
};
3232
setUserDetails({ ...userDetails, ...details });
3333
const fDetails = {
3434
Id: response.userID,
3535
AccessToken: response.accessToken,
3636
Name: response.name,
37-
Email: response.email,
37+
Email: response.email
3838
};
3939
setFBDetails({ ...fBDetails, ...fDetails });
4040
const res = await checkExtUser(fDetails);
4141
}
4242
};
4343

4444
const checkExtUser = async (details) => {
45-
const extUser = new Parse.Query("contracts_Users");
46-
extUser.equalTo("Email", details.Email);
47-
const extRes = await extUser.first();
45+
// const extUser = new Parse.Query("contracts_Users");
46+
// extUser.equalTo("Email", details.Email);
47+
// const extRes = await extUser.first();
48+
const params = { email: details.Email };
49+
const extRes = await Parse.Cloud.run("getUserDetails", params);
4850
// console.log("extRes ", extRes);
4951
if (extRes) {
5052
const params = { ...details, Phone: extRes.get("Phone") };
@@ -209,18 +211,19 @@ const LoginFacebook = ({
209211
<div>
210212
<button
211213
type="button"
212-
className="btn btn-secondary"
213-
onClick={() => setIsModal(false)}
214-
style={{ marginRight: 10, width: 90 }}
214+
onClick={() => handleSubmitbtn()}
215+
className="btn btn-info"
216+
style={{ marginRight: 10 }}
215217
>
216-
Cancel
218+
Sign up
217219
</button>
218220
<button
219221
type="button"
220-
onClick={() => handleSubmitbtn()}
221-
className="btn btn-info"
222+
className="btn btn-secondary"
223+
onClick={() => setIsModal(false)}
224+
style={{ width: 90 }}
222225
>
223-
Sign up
226+
Cancel
224227
</button>
225228
</div>
226229
</form>

apps/OpenSign/src/components/LoginGoogle.js

Lines changed: 51 additions & 13 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) {
@@ -66,9 +101,11 @@ const GoogleSignInBtn = ({
66101
}
67102
};
68103
const checkExtUser = async (details) => {
69-
const extUser = new Parse.Query("contracts_Users");
70-
extUser.equalTo("Email", details.Gmail);
71-
const extRes = await extUser.first();
104+
// const extUser = new Parse.Query("contracts_Users");
105+
// extUser.equalTo("Email", details.Gmail);
106+
// const extRes = await extUser.first();
107+
const params = { email: details.Gmail };
108+
const extRes = await Parse.Cloud.run("getUserDetails", params);
72109
// console.log("extRes ", extRes);
73110
if (extRes) {
74111
const params = { ...details, Phone: extRes.get("Phone") };
@@ -261,17 +298,17 @@ const GoogleSignInBtn = ({
261298
</div>
262299
<div className="form-group">
263300
<label
264-
htmlFor="Destination"
301+
htmlFor="JobTitle"
265302
style={{ display: "flex" }}
266303
className="col-form-label"
267304
>
268-
Destination{" "}
305+
Job Title{" "}
269306
<span style={{ fontSize: 13, color: "red" }}>*</span>
270307
</label>
271308
<input
272309
type="text"
273310
className="form-control"
274-
id="Destination"
311+
id="JobTitle"
275312
value={userDetails.Destination}
276313
onChange={(e) =>
277314
setUserDetails({
@@ -285,18 +322,19 @@ const GoogleSignInBtn = ({
285322
<div>
286323
<button
287324
type="button"
288-
className="bg-[#6c757d] p-2 text-white rounded"
289-
onClick={handleCloseModal}
290-
style={{ marginRight: 10, width: 90 }}
325+
className="bg-[#17a2b8] p-2 text-white rounded"
326+
onClick={() => handleSubmitbtn()}
327+
style={{ marginRight: 10 }}
291328
>
292-
Cancel
329+
Sign up
293330
</button>
294331
<button
295332
type="button"
296-
className="bg-[#17a2b8] p-2 text-white rounded"
297-
onClick={() => handleSubmitbtn()}
333+
className="bg-[#6c757d] p-2 text-white rounded"
334+
onClick={handleCloseModal}
335+
style={{ width: 90 }}
298336
>
299-
Sign up
337+
Cancel
300338
</button>
301339
</div>
302340
</form>

0 commit comments

Comments
 (0)