Fix level 1 sidebar issue

Author: dr3

functions/views/_layout.pug

@@ -120,6 +120,7 @@ html
 
               if user && !user.code
                 script!= 'window.USER_LEVEL = "' + user.level + '";'
+                script!= 'window.SIDEBAR_LEVELS = ' + JSON.stringify(user.sidebarLevels) + ';'
 
               for l in user ? user.sidebarLevels : levels
                 nav(v-show=`user.level == '${l}'`)
@@ -155,15 +156,6 @@ html
             p.text-center We’ve updated your level to #[strong #{levelNamesWithAges[user.level]}]. You can always change it on your #[a(href="/account") account settings] page. The first Parallelogram is now available, but officially it is launched in early September. We will be releasing new Parallelograms every week, from mid-September.
             button(type="submit" v-on:click="showWelcomeMsg = false") Continue
 
-      //- if user
-      //-   .modal(v-if="user.showYearScopeMessage")
-      //-     .modal-background
-      //-     .modal-body
-      //-       h2 Welcome to Parallel!
-      //-       p.text-center(v-if="user.showYearScopeMessage === 1") We don’t yet have Parallelograms maths puzzle sheets for students aged 10 or below, but you might like to try some of the Year 7 Parallelograms, which contains some curious problems.
-      //-       p.text-center(v-if="user.showYearScopeMessage === 2") We don’t yet have Parallelograms maths puzzle sheets for students aged 17 or older, but you might like to try some of the Year 11 Parallelograms, which contains some curious problems.
-      //-       button(type="submit" v-on:click=`user.hideYearScopeMessage()`) Continue
-
     footer
       a(href="/about") About
       | •

static/scripts/user.js

@@ -121,8 +121,6 @@ export default function() {
     }
   });
 
-  const cachedLevel = document.cookie.match(/level=(year[7-9])/);
-
   const loginForm = {error: null, reset: false};
 
   const editForm = {loading: false, error: '', teacherCodes: []};
@@ -232,33 +230,19 @@ export default function() {
     }
   }
 
-  let level = cachedLevel ? cachedLevel[1] : (window.USER_LEVEL || 'year6');
+  const cachedLevel = document.cookie.match(/level=(year[6-9])/);
 
-  if (level === 'year5') {
-    level = 'year6'
-  }
+  let level = cachedLevel ? cachedLevel[1] : window.USER_LEVEL;
 
-  if (level === 'year12' || level === 'year13') {
-    level = 'year11'
+  if(!level || (window.SIDEBAR_LEVELS && !window.SIDEBAR_LEVELS.includes(level))) {
+    level = 'year6';
   }
 
-
-  const hasSeenYearScopeMessage = document.cookie.match(/yearScopeMessageSeen/);
-  const isTooYoung = window.USER_LEVEL === "year5" || window.USER_LEVEL === "year6";
-  const isTooOld = window.USER_LEVEL === "year12" || window.USER_LEVEL === "year13";
-  const showYearScopeMessage = hasSeenYearScopeMessage ? false : isTooYoung ? 1 : isTooOld ? 2 : false;
-
   const user = {
     level,
     showLogin: false,
-    showYearScopeMessage,
     loginForm, editForm, signupForm, passwordForm, homeEducatorForm,
 
-    hideYearScopeMessage() {
-      user.showYearScopeMessage = false;
-      document.cookie = `yearScopeMessageSeen=1;path=/;max-age=${60 * 60* 24 * 365}`;
-    },
-
     setLevel(l) {
       user.level = l;
       document.cookie = `level=${l};path=/;max-age=${60 * 60* 24 * 365}`;