WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-17 21:25:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor code

Browse Source
This commit is contained in:
RaktimaNXG
2024-08-09 13:43:39 +05:30
parent 2238f1fafc
commit 0072e3e5ba
15 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/components/AddSigner.js
+3 -1
View File
@@ -247,7 +247,9 @@ const AddSigner = (props) => {
type="email"
id="email"
value={email}
onChange={(e) => setEmail(e.target.value?.toLowerCase())}
onChange={(e) =>
setEmail(e.target.value?.toLowerCase?.replace(/\s/g, ""))
}
required
onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
onInput={(e) => e.target.setCustomValidity("")}
apps/OpenSign/src/components/AddUser.js
+4 -1
View File
@@ -241,7 +241,10 @@ const AddUser = (props) => {
}
};
const handleChange = (e) => {
setFormdata((prev) => ({ ...prev, [e.target.name]: e.target.value }));
setFormdata((prev) => ({
...prev,
[e.target.name]: e.target.value?.toLowerCase()?.replace(/\s/g, "")
}));
};
const copytoclipboard = (text) => {
apps/OpenSign/src/components/pdf/EmailComponent.js
+1 -1
View File
@@ -113,7 +113,7 @@ function EmailComponent({
};
//function for get email value
const handleEmailValue = (e) => {
const value = e.target.value;
const value = e.target.value?.toLowerCase()?.replace(/\s/g, "");
setEmailErr(false);
setEmailValue(value);
};
apps/OpenSign/src/constant/Utils.js
+14 -18
View File
@@ -2237,25 +2237,21 @@ export const saveLanguageInLocal = (i18n) => {
//function to get default signatur eof current user from `contracts_Signature` class
export const getDefaultSignature = async (objectId) => {
try {
const result = await axios.get(
`${localStorage.getItem(
"baseUrl"
)}classes/contracts_Signature?where={"UserId": {"__type": "Pointer","className": "_User", "objectId":"${objectId}"}}`,
{
headers: {
"Content-Type": "application/json",
"X-Parse-Application-Id": localStorage.getItem("parseAppId"),
"X-Parse-Session-Token": localStorage.getItem("accesstoken")
}
}
);
const res = result.data?.results;
if (res[0] && res.length > 0) {
const defaultSignature = res[0]?.ImageURL
? await getBase64FromUrl(res[0]?.ImageURL, true)
const query = new Parse.Query("contracts_Signature");
query.equalTo("UserId", {
__type: "Pointer",
className: "_User",
objectId: objectId
});
const result = await query.first();
if (result) {
const res = JSON.parse(JSON.stringify(result));
const defaultSignature = res?.ImageURL
? await getBase64FromUrl(res?.ImageURL, true)
: "";
const defaultInitial = res[0]?.Initials
? await getBase64FromUrl(res[0]?.Initials, true)
const defaultInitial = res?.Initials
? await getBase64FromUrl(res?.Initials, true)
: "";
return {
apps/OpenSign/src/layout/HomeLayout.js
+1
View File
@@ -38,6 +38,7 @@ const HomeLayout = () => {
useEffect(() => {
const language = localStorage.getItem("i18nextLng");
i18n.changeLanguage(language);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
useEffect(() => {
apps/OpenSign/src/pages/AddAdmin.js
+5 -1
View File
@@ -310,7 +310,11 @@ const AddAdmin = () => {
type="email"
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
value={email}
onChange={(e) => setEmail(e.target.value?.toLowerCase())}
onChange={(e) =>
setEmail(
e.target.value?.toLowerCase()?.replace(/\s/g, "")
)
}
onInvalid={(e) =>
e.target.setCustomValidity(t("input-required"))
}
apps/OpenSign/src/pages/ForgetPassword.js
+4 -1
View File
@@ -24,7 +24,10 @@ function ForgotPassword() {
const [image, setImage] = useState();
const handleChange = (event) => {
const { name, value } = event.target;
let { name, value } = event.target;
if (name === "email") {
value = value?.toLowerCase()?.replace(/\s/g, "");
}
setState({ ...state, [name]: value });
};
apps/OpenSign/src/pages/Login.js
+4 -1
View File
@@ -74,7 +74,10 @@ function Login() {
dispatch(fetchAppInfo());
};
const handleChange = (event) => {
const { name, value } = event.target;
let { name, value } = event.target;
if (name === "email") {
value = value?.toLowerCase()?.replace(/\s/g, "");
}
setState({ ...state, [name]: value });
};
apps/OpenSign/src/pages/PdfRequestFiles.js
+6 -2
View File
@@ -1473,7 +1473,11 @@ function PdfRequestFiles(props) {
};
const handleInputChange = (e) => {
setContact((prev) => ({ ...prev, [e.target.name]: e.target.value }));
let { name, value } = e.target;
if (name === "email") {
value = value?.toLowerCase()?.replace(/\s/g, "");
}
setContact({ ...contact, [name]: value });
};
const SendOtp = async () => {
@@ -1781,7 +1785,7 @@ function PdfRequestFiles(props) {
<path d="M15 6.954 8.978 9.86a2.25 2.25 0 0 1-1.956 0L1 6.954V11.5A1.5 1.5 0 0 0 2.5 13h11a1.5 1.5 0 0 0 1.5-1.5V6.954Z" />
</svg>
<input
type="text"
type="email"
className="grow"
name="email"
value={contact.email}
apps/OpenSign/src/pages/Report.js
-1
View File
@@ -98,7 +98,6 @@ const Report = () => {
json.actions.map((data) => {
const newConfig = {
selector: `[data-tut="${data?.selector}"]`,
content: () => (
<TourContentWithBtn
message={t(`tour-mssg.${data?.action}`)}
apps/OpenSign/src/pages/Signup.js
+3 -1
View File
@@ -365,7 +365,9 @@ const Signup = () => {
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
value={email}
onChange={(e) =>
setEmail(e.target.value?.toLowerCase())
setEmail(
e.target.value?.toLowerCase()?.replace(/\s/g, "")
)
}
onInvalid={(e) =>
e.target.setCustomValidity(t("input-required"))
apps/OpenSign/src/pages/UpdateExistUserAdmin.js
+3 -1
View File
@@ -119,7 +119,9 @@ const UpdateExistUserAdmin = () => {
onChange={(e) =>
setFormdata((prev) => ({
...prev,
email: e.target.value?.toLowerCase()
email: e.target.value
?.toLowerCase()
?.replace(/\s/g, "")
}))
}
onInvalid={(e) =>
apps/OpenSign/src/primitives/AddContact.js
+3 -1
View File
@@ -222,7 +222,9 @@ const AddContact = (props) => {
type="email"
id="email"
value={email}
onChange={(e) => setEmail(e.target.value?.toLowerCase())}
onChange={(e) =>
setEmail(e.target.value?.toLowerCase()?.replace(/\s/g, ""))
}
onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
onInput={(e) => e.target.setCustomValidity("")}
required
apps/OpenSign/src/primitives/GetReportDisplay.js
+2 -1
View File
@@ -1198,7 +1198,8 @@ const ReportTable = (props) => {
)}
{props.heading.includes("Folder") && (
<td className="px-4 py-2">
{item?.Folder?.Name || t("OpenSign™ Drive")}
{item?.Folder?.Name ||
t("sidebar.OpenSign™ Drive")}
</td>
)}
<td className="px-4 py-2">
apps/OpenSignServer/cloud/parsefunction/GetPublicTemplate.js
+2 -3
View File
@@ -21,12 +21,11 @@ async function GetPublicTemplate(request) {
templatQuery.equalTo('IsPublic', true);
templatQuery.notEqualTo('IsArchive', true);
const getTemplate = await templatQuery.find({ useMasterKey: true });
const extcls = new Parse.Query('contracts_Users');
extcls.equalTo('email', user.get('email'));
extcls.equalTo('Email', user.get('email'));
const res = await extcls.first({ useMasterKey: true });
if (res) {
const _res = JSON.parse(JSON.stringify(_res));
const _res = JSON.parse(JSON.stringify(res));
return {
template: getTemplate,
user: user,