Skip to content

Sync fork #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 15, 2023
Merged

Sync fork #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d5853e6
fix: placeholder block issue for select multisigners
raktima-opensignlabs Dec 12, 2023
d6c2c66
fix: image-upload issue in mobile view
raktima-opensignlabs Dec 13, 2023
fc3f134
fix: zIndex of placeholder-block and added signyourself & request sig…
raktima-opensignlabs Dec 15, 2023
0b64908
increase zIndex of header and footer
raktima-opensignlabs Dec 15, 2023
7704222
fix: opensign-drive drop-down issue
raktima-opensignlabs Dec 15, 2023
91976d2
chore: add dependabot dependency update check
nxglabs Dec 15, 2023
773e8b8
Merge pull request #260 from OpenSignLabs/placeholder-block
prafull-opensignlabs Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
# maintain dependencies for frontend
- package-ecosystem: "npm" # See documentation for possible values
directory: "/apps/OpenSign" # Location of package manifests
schedule:
interval: "weekly"
# maintain dependencies for server
- package-ecosystem: "npm" # See documentation for possible values
directory: "/apps/OpenSignServer" # Location of package manifests
schedule:
interval: "weekly"
# maintain dependencies for microfrontends
- package-ecosystem: "npm" # See documentation for possible values
directory: "microfrontends/SignDocuments" # Location of package manifests
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion microfrontends/SignDocuments/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css"
/>

<title>OpenSign App</title>
<title>OpenSign™</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
46 changes: 25 additions & 21 deletions microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,10 @@
color: var(--mauve-8);
}


.dropdown-menu {

min-width: 10rem;

}


.dropdown-item {
display: block;
width: 100%;
Expand All @@ -103,21 +99,18 @@
white-space: nowrap;
background-color: transparent;
border: 0;
cursor: pointer;
}


.dropdown-item:hover {
background-color: #dad9db;
color: var(--violet-11);

}

.itemColor {
font-size: 13px !important;
}



.folderComponent {
margin: 30px;
height: 100%;
Expand Down Expand Up @@ -490,41 +483,52 @@ a {
display: none;
}

.folderPath{
.folderPath {
overflow-x: auto;
white-space: nowrap;

cursor: pointer;
user-select: none;
}
.folderPath::-webkit-scrollbar {
}

.folderPath::-webkit-scrollbar {
display: none;
/* for Chrome, Safari, and Opera */
}

@media screen and (max-width:766px) {
.itemColor {
font-size: 10px !important;
}

}
@media (min-width: 310px) and (max-width:550px) {

.pdfContainer {
justify-content: space-around;
}

.sort {
padding: 2px;
padding: 2px;
}
.folderComponent{

.folderComponent {
margin: 10px;
}

}

@media screen and (max-width:309px) {
@media screen and (max-width:309px) {

.pdfContainer {
justify-content: center;
}

.sort {
padding: 2px;
}
.folderComponent{
margin: 10px;
}
}

.folderComponent {
margin: 10px;
}
}
77 changes: 68 additions & 9 deletions microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ import ModalHeader from "react-bootstrap/esm/ModalHeader";
import { themeColor, iconColor } from "../../utils/ThemeColor/backColor";
import { getDrive } from "../../utils/Utils";
import AlertComponent from "../component/alertComponent";
import { useNavigate } from "react-router-dom";

function PdfFile() {
const navigate = useNavigate();
const scrollRef = useRef(null);
const [isList, setIsList] = useState(false);
const [selectedSort, setSelectedSort] = useState("Date");
Expand All @@ -28,6 +30,7 @@ function PdfFile() {
const [handleError, setHandleError] = useState();
const [folderName, setFolderName] = useState([]);
const [isAlert, setIsAlert] = useState({ isShow: false, alertMessage: "" });
const [isNewFol, setIsNewFol] = useState(false);
const currentUser =
localStorage.getItem(
`Parse/${localStorage.getItem("parseAppId")}/currentUser`
Expand Down Expand Up @@ -188,7 +191,6 @@ function PdfFile() {
};
}

// console.log("data", data);
await axios
.post(
`${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
Expand Down Expand Up @@ -314,6 +316,8 @@ function PdfFile() {
const closeMenuOnOutsideClick = (e) => {
if (isShowSort && !e.target.closest("#menu-container")) {
setIsShowSort(false);
} else if (isNewFol && !e.target.closest("#folder-menu")) {
setIsNewFol(false);
}
};

Expand Down Expand Up @@ -502,6 +506,69 @@ function PdfFile() {
})}
</div>
<div className="dropMenuBD">
<div
id="folder-menu"
className={
isNewFol ? "dropdown show dropDownStyle" : "dropdown"
}
onClick={() => setIsNewFol(!isNewFol)}
>
<div className="sort">
<i
className="fa fa-plus-square"
aria-hidden="true"
style={{ fontSize: "25px", color: `${iconColor()}` }}
></i>
</div>
<div
className={
isNewFol ? "dropdown-menu show" : "dropdown-menu"
}
aria-labelledby="dropdownMenuButton"
aria-expanded={isNewFol ? "true" : "false"}
>
{" "}
<div
style={{
display: "flex",
flexDirection: "column"
}}
>
<span
className="dropdown-item itemColor"
onClick={() => getParentFolder()}
>
<i
style={{ marginRight: "5px" }}
className="fa fa-plus"
aria-hidden="true"
></i>
Create folder
</span>
<span
className="dropdown-item itemColor"
onClick={() => navigate("/form/sHAnZphf69")}
>
<i
style={{ marginRight: "5px" }}
className="fas fa-pen-nib"
></i>
Sign Yourself
</span>
<span
className="dropdown-item itemColor"
onClick={() => navigate("/form/8mZzFxbG1z")}
>
{" "}
<i
style={{ marginRight: "5px" }}
className="fa fa-file-signature"
></i>
Request Signatures{" "}
</span>
</div>
</div>
</div>
<div
id="menu-container"
className={isShowSort ? "dropdown show" : "dropdown"}
Expand Down Expand Up @@ -645,14 +712,6 @@ function PdfFile() {
</div>
)}
</div>

<div className="sort" onClick={() => getParentFolder()}>
<i
className="fa fa-plus-square"
aria-hidden="true"
style={{ fontSize: "25px", color: `${iconColor()}` }}
></i>
</div>
</div>
</div>

Expand Down
35 changes: 26 additions & 9 deletions microfrontends/SignDocuments/src/Component/PdfRequestFiles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,7 @@ function PdfRequestFiles() {
data.key === signKey && data.Width && data.Height && data.SignUrl
);
let getIMGWH = calculateImgAspectRatio(imgWH);

if (updateFilter.length > 0) {
const getXYdata = currentSigner[0].placeHolder[i].pos;
const getPosData = getXYdata;
Expand All @@ -516,11 +517,17 @@ function PdfRequestFiles() {
}
return obj;
});
currentSigner[0].placeHolder.splice(i, 1, newUpdateUrl[0]);
const getPlaceData = currentSigner[0].placeHolder;
getPlaceData.splice(0, getPlaceData.length, ...newUpdateUrl);

const indexofSigner = signerPos.findIndex((object) => {
return object.signerObjId === signerObjectId;
});
signerPos.splice(indexofSigner, 1, currentSigner[0]);
setSignerPos((prevState) => {
const newState = [...prevState]; // Create a copy of the state
newState.splice(indexofSigner, 1, ...currentSigner); // Modify the copy
return newState; // Update the state with the modified copy
});
} else {
const getXYdata = currentSigner[0].placeHolder[i].pos;

Expand All @@ -546,11 +553,17 @@ function PdfRequestFiles() {
return obj;
});

currentSigner[0].placeHolder.splice(i, 1, newUpdateUrl[0]);
const getPlaceData = currentSigner[0].placeHolder;
getPlaceData.splice(0, getPlaceData.length, ...newUpdateUrl);

const indexofSigner = signerPos.findIndex((object) => {
return object.signerObjId === signerObjectId;
});
signerPos.splice(indexofSigner, 1, currentSigner[0]);
setSignerPos((prevState) => {
const newState = [...prevState]; // Create a copy of the state
newState.splice(indexofSigner, 1, ...currentSigner); // Modify the copy
return newState; // Update the state with the modified copy
});
}
};

Expand Down Expand Up @@ -586,6 +599,7 @@ function PdfRequestFiles() {
updateFilter = currentSigner[0].placeHolder[i].pos.filter(
(data) => data.key === signKey && data.SignUrl
);

const getXYdata = currentSigner[0].placeHolder[i].pos;
const getPosData = getXYdata;
const posWidth = isDefaultSign
Expand Down Expand Up @@ -633,12 +647,15 @@ function PdfRequestFiles() {
}
return obj;
});
let signerupdate = [];
signerupdate = signerPos.filter(
(data) => data.signerObjId !== signerObjectId

const index = signerPos.findIndex(
(data) => data.signerObjId === signerObjectId
);
signerupdate.push(newUpdatePos[0]);
setSignerPos(signerupdate);
setSignerPos((prevState) => {
const newState = [...prevState]; // Create a copy of the state
newState.splice(index, 1, ...newUpdatePos); // Modify the copy
return newState; // Update the state with the modified copy
});
}
};

Expand Down
8 changes: 5 additions & 3 deletions microfrontends/SignDocuments/src/Component/component/emailComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function EmailComponent({
"X-Parse-Application-Id": localStorage.getItem("parseAppId"),
sessionToken: localStorage.getItem("accesstoken")
};

const openSignUrl = "https://www.opensignlabs.com/";
const themeBGcolor = themeColor();
let params = {
pdfName: pdfName,
Expand All @@ -54,9 +54,11 @@ function EmailComponent({
themeBGcolor +
";'> <p style='font-size:20px;font-weight:400;color:white;padding-left:20px',> Document Copy</p></div><div><p style='padding:20px;font-family:system-ui;font-size:14px'>A copy of the document " +
pdfName +
" Standard is attached to this email. Kindly download the document from the attachment.</p></div> </div><div><p>This is an automated email from Open Sign. For any queries regarding this email, please contact the sender " +
" Standard is attached to this email. Kindly download the document from the attachment.</p></div> </div><div><p>This is an automated email from OpenSign. For any queries regarding this email, please contact the sender " +
sender.email +
" directly. If you think this email is inappropriate or spam, you may file a complaint with Open Sign here.</p></div></div></body></html>"
" directly. If you think this email is inappropriate or spam, you may file a complaint with OpenSign <a href= " +
openSignUrl +
" target=_blank>here</a> </p></div></div></body></html>"
};
sendMail = await axios.post(url, params, { headers: headers });
} catch (error) {
Expand Down
Loading