WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-26 09:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #554 from OpenSignLabs/patch-1

Browse Source 
fix: Expired report query
This commit is contained in:
prafull-opensignlabs
2024-04-02 14:17:08 +05:30
committed by GitHub
parent 1c3d2d5c9a 19ba9e3091
commit 27130fd223
4 changed files with 26 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/components/Header.js
+7 -1
View File
@@ -13,9 +13,9 @@ const Header = ({ showSidebar }) => {
let applogo = localStorage.getItem("appLogo") || "";
let username = localStorage.getItem("username");
const image = localStorage.getItem("profileImg") || dp;
const [isOpen, setIsOpen] = useState(false);
const [isSubscribe, setIsSubscribe] = useState(true);
const [isPro, setIsPro]= useState(false)
const toggleDropdown = () => {
setIsOpen(!isOpen);
@@ -27,6 +27,7 @@ const Header = ({ showSidebar }) => {
async function checkSubscription() {
if (isEnableSubscription) {
const getIsSubscribe = await checkIsSubscribed();
setIsPro(getIsSubscribe)
setIsSubscribe(getIsSubscribe);
}
}
@@ -105,6 +106,11 @@ const Header = ({ showSidebar }) => {
</button>
</div>
)}
{isPro && (
<div className="w-[35px] h-[35px] rounded-full ring-[1px] ring-offset-2 ring-[#002862] text-[#002862] overflow-hidden font-semibold flex items-center justify-center">
PRO
</div>
)}
<div>
<FullScreenButton />
</div>
apps/OpenSign/src/pages/Login.js
+4 -17
View File
@@ -1164,25 +1164,12 @@ function Login() {
</form>
<br />
{(appInfo.fbAppId || appInfo.googleClietId) && (
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center"
}}
className="text-sm"
>
<hr
className={"border-[1px] border-gray-300 w-full"}
style={{ color: "grey" }}
/>
<span style={{ color: "grey" }} className="px-2 ">
<div className="text-sm flex justify-center items-center">
<hr className="border-[1px] border-gray-300 w-full" />
<span className="px-2 text-gray-500 cursor-default">
OR
</span>
<hr
className={"border-[1px] border-gray-300 w-full"}
style={{ color: "grey" }}
/>
<hr className="border-[1px] border-gray-300 w-full" />
</div>
)}
<br />
apps/OpenSign/src/pages/PlanSubscriptions.js
+11 -32
View File
@@ -92,7 +92,7 @@ const PlanSubscriptions = () => {
maxHeight: "100%"
}}
>
<div id="monthlyPlans" className="block my-2">
<div className="block my-2">
<div className="flex flex-col justify-center items-center w-full">
<div className="mb-6 mt-2 flex flex-row border-[1px] p-2 border-gray-300 rounded text-sm">
<span
@@ -119,10 +119,10 @@ const PlanSubscriptions = () => {
<ul className="flex flex-col md:flex-row h-full bg-white justify-center">
{plansArr.map((item) => (
<li
className="flex flex-col md:my-0 text-center border-collapse border-[1px] border-gray-300 w-[260px]"
className="flex flex-col text-center border-collapse border-[1px] border-gray-300 max-w-[250px]"
key={item.planName}
>
<div className="p-2 flex flex-col justify-center items-center min-h-[320px]">
<div className="p-2 flex flex-col justify-center items-center max-h-[310px]">
<h3 className="text-[#002862] uppercase">
{item.planName}
</h3>
@@ -133,7 +133,7 @@ const PlanSubscriptions = () => {
alt="freeimg"
/>
</div>
<div className="">
<div>
<span className="text-3xl">
{item.currency && <small>{item.currency}</small>}
{yearlyVisible
@@ -143,13 +143,7 @@ const PlanSubscriptions = () => {
<p className="font-semibold pt-2 text-sm">
{yearlyVisible ? "Billed Yearly" : "Billed Monthly"}
</p>
<div
className={`${
item.subtitle.length <= 32
? "w-[150px] h-[40px] text-center"
: ""
} text-sm text-center my-2`}
>
<div className="max-w-[250px] h-[40px] text-center text-sm my-2">
<div
style={{
textAlign: "center",
@@ -179,14 +173,14 @@ const PlanSubscriptions = () => {
: item.url + details
: item.url
}
className="bg-[#002862] w-full mt-1 text-white py-2 rounded uppercase hover:no-underline hover:text-white cursor-pointer"
className="bg-[#002862] w-full text-white py-2 rounded uppercase hover:no-underline hover:text-white cursor-pointer"
target={item.target}
>
{item.btnText}
</NavLink>
) : (
<button
className="bg-[#002862] w-full mt-1 text-white py-2 rounded uppercase hover:no-underline hover:text-white cursor-pointer"
className="bg-[#002862] w-full text-white py-2 rounded uppercase hover:text-white cursor-pointer"
onClick={() => handleFreePlan()}
>
{item.btnText}
@@ -207,25 +201,10 @@ const PlanSubscriptions = () => {
))}
</ul>
</div>
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center"
}}
className="text-sm"
>
<hr
className={"border-[1px] border-gray-300 w-[20%]"}
style={{ color: "grey" }}
/>
<span style={{ color: "grey" }} className="px-2 ">
or
</span>
<hr
className={"border-[1px] border-gray-300 w-[20%]"}
style={{ color: "grey" }}
/>
<div className="text-sm flex justify-center items-center">
<hr className="border-[1px] border-gray-300 w-[20%]" />
<span className="px-2 text-gray-500 cursor-default">or</span>
<hr className="border-[1px] border-gray-300 w-[20%]" />
</div>
<div className="flex flex-col justify-center w-full items-center">
<h3 className="text-[#002862] mt-1 mb-2">
apps/OpenSignServer/cloud/parsefunction/reportsJson.js
+4 -13
View File
@@ -164,19 +164,10 @@ export default function reportJson(id, userId) {
IsDeclined: { $ne: true },
IsArchive: { $ne: true },
Type: { $ne: 'Folder' },
$and: [
{
$or: [
{ Signers: { $ne: null }, SignedUrl: { $ne: null } },
{ Placeholders: { $ne: null } },
],
},
{
ExpiryDate: {
$lt: { __type: 'Date', iso: new Date().toISOString() },
},
},
],
SignedUrl: { $ne: null },
ExpiryDate: {
$lt: { __type: 'Date', iso: new Date().toISOString() },
},
CreatedBy: {
__type: 'Pointer',
className: '_User',