Merge branch 'master' into beta-new

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/utilities/privacy/router.js

@@ -109,7 +109,7 @@ const mergeAccountEmailsWithReqBodyGuardianEmails = (req, res) => {
   return user.emails || [];
 };
 
-router.post("/student/delay", studentMiddleware, async (req, res) => {
+router.get("/student/delay", studentMiddleware, async (req, res) => {
   try {
     const updateBody = {
       [firstSeenKey]: req.user[firstSeenKey] || Date.now(),

functions/views/_layout.pug

@@ -175,7 +175,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")

pages/academy-9aut-week-1.md

@@ -19,31 +19,31 @@ We will also be running a weekly homework review session (look out for our email
 ## 1.	
 ![](/resources/academy-9aut-week-1/q1.png){image align="center"}  
 
-::: problem id=1_1 marks=2
+::: problem id=1_1 marks=1
 a) <input type="number" solution="11"/>  
 
 ---
 
 ![](/resources/academy-9aut-week-1/s1a.png){image align="center"}
 :::  
 
-::: problem id=1_2 marks=2
+::: problem id=1_2 marks=1
 b) <input type="number" solution="27"/>  
 
 ---
 
 ![](/resources/academy-9aut-week-1/s1b.png){image align="center"}
 :::  
 
-::: problem id=1_3 marks=2
+::: problem id=1_3 marks=1
 c) <input type="number" solution="6"/>  
 
 ---
 
 ![](/resources/academy-9aut-week-1/s1c.png){image align="center"}
 :::  
 
-::: problem id=1_4 marks=2
+::: problem id=1_4 marks=1
 d) <input type="number" solution="20"/>  
 
 ---
@@ -55,8 +55,8 @@ d) <input type="number" solution="20"/>
 ## 2.
 ![](/resources/academy-9aut-week-1/q2.png){image align="center"}  
 
-::: problem id=2_1 marks=2
-i) 
+::: problem id=2_1 marks=1
+![](/resources/academy-9aut-week-1/q2a.png){image align="center"}  
 * [ ] a)
 * [ ] b)
 * [x] c)
@@ -65,11 +65,11 @@ i)
 
 ---
 
-![](/resources/academy-9aut-week-1/s2i.png){image align="center"}
+![](/resources/academy-9aut-week-1/s2a.png){image align="center"}
 :::  
 
-::: problem id=2_2 marks=2
-ii) 
+::: problem id=2_2 marks=1
+![](/resources/academy-9aut-week-1/q2b.png){image align="center"}  
 * [x] a)
 * [ ] b)
 * [ ] c)
@@ -78,11 +78,11 @@ ii)
 
 ---
 
-![](/resources/academy-9aut-week-1/s2ii.png){image align="center"}
+![](/resources/academy-9aut-week-1/s2b.png){image align="center"}
 :::  
 
-::: problem id=2_3 marks=2
-iii) 
+::: problem id=2_3 marks=1
+![](/resources/academy-9aut-week-1/q2c.png){image align="center"}  
 * [ ] a)
 * [x] b)
 * [ ] c)
@@ -91,11 +91,11 @@ iii)
 
 ---
 
-![](/resources/academy-9aut-week-1/s2iii.png){image align="center"}
+![](/resources/academy-9aut-week-1/s2c.png){image align="center"}
 :::  
 
-::: problem id=2_4 marks=2
-iv) 
+::: problem id=2_4 marks=1
+![](/resources/academy-9aut-week-1/q2d.png){image align="center"}  
 * [ ] a)
 * [ ] b)
 * [ ] c)
@@ -104,7 +104,7 @@ iv)
 
 ---
 
-![](/resources/academy-9aut-week-1/s2iv.png){image align="center"}
+![](/resources/academy-9aut-week-1/s2d.png){image align="center"}
 :::  
 
 

pages/academy-9aut-week-2.md

@@ -17,10 +17,9 @@ We will also be running a weekly homework review session (look out for our email
 **After you click Submit, make sure you scroll down to see the correct answers and read the full written solutions.**  
 
 ## 1.	
-![](/resources/academy-9aut-week-2/q1.png){image align="center"}  
 
-::: problem id=1_1 marks=2
-a) 
+::: problem id=1_1 marks=1
+![](/resources/academy-9aut-week-2/q1a.png){image align="center"}  
 
 * [ ] Rowan
 * [x] Rachel
@@ -32,8 +31,8 @@ a)
 ![](/resources/academy-9aut-week-2/s1a.png){image align="center"}
 :::  
 
-::: problem id=1_2 marks=2
-b) 
+::: problem id=1_2 marks=1
+![](/resources/academy-9aut-week-2/q1b.png){image align="center"}  
 
 * [x] Yes
 * [ ] No

pages/privacy-notice.md

@@ -4,7 +4,7 @@
 
 **Effective Date:** 31 August 2025.
 
-This Notice is informed by [Good Thinking’s Data Protection Policy](https://docs.google.com/document/d/1gAvFujgwwU4bdPycxBiqJ3WK8UULyy7t/edit?usp=sharing&ouid=104525238127026012930&rtpof=true&sd=true).
+This Notice is informed by [Good Thinking’s Data Protection Policy](https://docs.google.com/document/d/1gAvFujgwwU4bdPycxBiqJ3WK8UULyy7t/edit?usp=sharing&ouid=104525238127026012930&rtpof=true&sd=true){target="_blank"}.
 
 
 ## 1. Purpose of This Notice
@@ -86,4 +86,4 @@ We take appropriate technical and organisational measures to protect personal da
 
 
 ## 10. Complaints
-If you have concerns about how we use your child’s data, please contact us first. You also have the right to lodge a complaint with the **Information Commissioner’s Office (ICO)**: [https://ico.org.uk](https://ico.org.uk)
+If you have concerns about how we use your child’s data, please contact us first. You also have the right to lodge a complaint with the **Information Commissioner’s Office (ICO)**: [https://ico.org.uk](https://ico.org.uk){target="_blank"}.