Privacy fix

Author: dr3

functions/index.js

@@ -435,12 +435,14 @@ const redirects = {
 
 Object.entries(redirects).forEach(([from, to]) => app.get(from, (_, res) => res.redirect(to)))
 
-const pagesWithoutSidebar = ['primary-parallel', 'pmc', 'job-ad', 'tutorinfo']
+const pagesWithoutSidebar = ['primary-parallel', 'pmc', 'job-ad', 'tutorinfo', 'privacy-notice']
+const pagesWithoutPrivacyModal = ['privacy-notice']
 
 for (let p of ['about', 'introduction', 'parents', 'teachers', 'privacy-notice', 'safeguarding', 'hints-tips', 'job-ad', 'developer-support', 'pmc', 'primary-parallel', 'masterclass', 'troubleshooting', 'tutorinfo', 'academy-primary-parent', 'academy-primary-teacher']) {
   const content = fs.readFileSync(path.join(__dirname, `build/${p}.html`));
   app.get('/' + p, (_, res) => {
     res.locals.sidebarDisabled = pagesWithoutSidebar.includes(p);
+    res.locals.privacyModalDisabled = pagesWithoutPrivacyModal.includes(p);
     res.render('_layout', {content})
   });
 }

functions/views/_layout.pug

@@ -171,7 +171,7 @@ html
       | and
       a(href="https://mathigon.org" target="_blank") #[img(src="/images/mathigon.png" width=16 height=16)] Mathigon
 
-    if user && user.privacy && user.privacy.visible
+    if user && user.privacy && user.privacy.visible && !privacyModalDisabled
       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")