From 500b62dd9b486594693d52927cc16e0b5a0793e2 Mon Sep 17 00:00:00 2001 From: Justin Georgi Date: Fri, 23 Feb 2024 21:57:15 -0700 Subject: [PATCH 1/2] Add site agreement expiration Signed-off-by: Justin Georgi --- src/components/app.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/app.vue b/src/components/app.vue index 68c5426..cc175a3 100644 --- a/src/components/app.vue +++ b/src/components/app.vue @@ -65,6 +65,7 @@ return { rememberAgreement: false, siteAgreement: false, + dateAgreement: null, showDisclaimer: true } }, @@ -74,8 +75,11 @@ var loadedSettings = JSON.parse(loadSiteSettings) this.siteAgreement = loadedSettings.siteAgreement this.rememberAgreement = loadedSettings.rememberAgreement + this.dateAgreement = loadedSettings.dateAgreement && new Date(loadedSettings.dateAgreement) } - if (this.siteAgreement && this.rememberAgreement) { + var curDate = new Date () + var agreeStillValid = this.dateAgreement && (curDate < this.dateAgreement.setMonths(this.dateAgreement.getMonths() + 3)) + if (this.siteAgreement && this.rememberAgreement && agreeStillValid) { this.showDisclaimer = false store().agree() } @@ -91,7 +95,8 @@ store().agree() let newSettings = { siteAgreement: this.siteAgreement, - rememberAgreement: this.rememberAgreement + rememberAgreement: this.rememberAgreement, + dateAgreement: new Date() } let saveSiteSettings = new Promise( (saved,failed) => { -- 2.49.1 From ab79da95ea091a69ba30d9b1b53bb4784c6a1655 Mon Sep 17 00:00:00 2001 From: Justin Georgi Date: Fri, 23 Feb 2024 21:58:36 -0700 Subject: [PATCH 2/2] Fix getMonth function calls Signed-off-by: Justin Georgi --- src/components/app.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/app.vue b/src/components/app.vue index cc175a3..10a0235 100644 --- a/src/components/app.vue +++ b/src/components/app.vue @@ -78,7 +78,7 @@ this.dateAgreement = loadedSettings.dateAgreement && new Date(loadedSettings.dateAgreement) } var curDate = new Date () - var agreeStillValid = this.dateAgreement && (curDate < this.dateAgreement.setMonths(this.dateAgreement.getMonths() + 3)) + var agreeStillValid = this.dateAgreement && (curDate < this.dateAgreement.setMonth(this.dateAgreement.getMonth() + 3)) if (this.siteAgreement && this.rememberAgreement && agreeStillValid) { this.showDisclaimer = false store().agree() -- 2.49.1