Merge branch 'master' into beta-new

Author: dr3

functions/utilities/privacy/router.js

@@ -177,12 +177,17 @@ router.get("/student/accept", studentMiddleware, async (req, res) => {
   }
 });
 
+const SevenDays = 7 * 24 * 60 * 60 * 1000;
+
 router.get("/guardian/load/:token", guardianMiddleware, async (req, res) => {
+  const startTime = res.locals.guardianStudent[firstSeenKey];
+
   res.status(200).send({
     success: true,
     error: null,
     data: {
       first: res.locals.guardianStudent.first,
+      dueDate: startTime ? startTime + SevenDays : null,
     },
   });
 });

functions/views/_layout.pug

@@ -176,7 +176,7 @@ html
       a(href="https://mathigon.org" target="_blank") #[img(src="/images/mathigon.png" width=16 height=16)] Mathigon
 
     if user && user.privacy && user.privacy.visible
-      iframe(src="/privacy" id="privacy-iframe" style="height: 100%;width: 100%;position: absolute;z-index: 10000000000;top: 0;left: 0;border: none;")
+      iframe(src="/privacy-modal" id="privacy-iframe" style="height: 100%;width: 100%;position: absolute;z-index: 10000000000;top: 0;left: 0;border: none;")
 
     script(defer src="https://www.gstatic.com/firebasejs/8.10.0/firebase-app.js")
     script(defer src="https://www.gstatic.com/firebasejs/8.10.0/firebase-auth.js")