Remove all implementation around badges (#50)

* Remove all implementation around badges

* Add subtext

Author: dr3

functions/index.js

@@ -16,13 +16,11 @@ const express = require('express');
 const user = require('./utilities/user');
 const { countries } = require('./utilities/countries')
 
-const BADGES = require('./build/badges.json');
 const PAGES = require('./build/pages.json');
 const LEVELS = ['year6', 'year7', 'year8', 'year9',  'year10', 'year11'];
 const LEVEL_NAMES = {year6: 'Level 1', year7: 'Level 2', year8: 'Level 3', year9: 'Level 4', year10: 'Level 5', year11: 'Level 6', graduated: 'Graduated'};
 const LEVEL_NAMES_WITH_AGES = {year6: 'Level 1 (ages 11 and below)', year7: 'Level 2 (age 11-12)', year8: 'Level 3 (age 12–13)', year9: 'Level 4 (age 13–14)', year10: 'Level 5 (age 14–15)', year11: 'Level 6 (ages 15 and above)', graduated: 'Graduated'};
 const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-const BADGE_NAMES = {ancient: 'Ancient Hero', geometry: 'Geometry', historic: 'Historic Hero', number: 'Number', modern: 'Modern Hero'};
 
 const PAGES_MAP = {};
 for (let l of LEVELS) {
@@ -83,13 +81,11 @@ app.use((req, res, next) => {
   res.locals.isProduction = process.env.NODE_ENV === 'production';
   res.locals.user = req.user;
   res.locals.profileComplete = isProfileComplete(req.user);
-  res.locals.badges = BADGES;
   res.locals.pages = {};
   res.locals.now = Date.now();
   res.locals.levels = LEVELS;
   res.locals.levelNames = LEVEL_NAMES;
   res.locals.levelNamesWithAges = LEVEL_NAMES_WITH_AGES;
-  res.locals.badgeNames = BADGE_NAMES;
   res.locals.path = req.path.replace(/\/$/, '');
   res.locals.scoreClass = scoreClass;
 
@@ -201,9 +197,6 @@ app.get('/login', (req, res) => {
   if(res?.locals?.user?.code){
     res.redirect('/dashboard')
   }
-  if(res?.locals?.user){
-    res.redirect('/badges')
-  }
   res.redirect('/');
 })
 
@@ -219,11 +212,6 @@ app.get('/home-educator-form', (req, res) => {
   res.render('home-educator');
 });
 
-app.get('/badges', (req, res) => {
-  if (!req.user) return error(res, 401);
-  res.render('badges', {showAllBadges: ('reveal' in req.query)});
-});
-
 app.get('/signup', (req, res) => {
   if (req.user) res.redirect('/');
 
@@ -332,25 +320,7 @@ app.get('/:pid', (req, res, next) => {
   const userData = {answers, uid: req.user ? req.user.uid : '',
     submitted: ('reveal' in req.query) || answers.submitted || false};
 
-  let badgeLevel = req?.user?.level;
-
-  if(['year5', 'year6'].includes(req?.user?.level)) badgeLevel = 'year7';
-  if(['year12', 'year13'].includes(req?.user?.level)) badgeLevel = 'year11';
-
-  let newBadge = null;
-  if (req.user && !req.user.code) {
-    for (let b of BADGES[badgeLevel]) {
-      if (b.score <= req.user.points && req.user.badges.indexOf(b.id) < 0) {
-        req.user.badges.push(b.id);
-        newBadge = b;
-        userDB.doc(req.user.uid) // async
-            .update({badges: req.user.badges.join(',')})
-            .catch(() => console.error('Failed to update badges', req.user.uid));
-      }
-    }
-  }
-
-  res.render('parallelogram', {pid, body, page: PAGES_MAP[pid], userData, newBadge});
+  res.render('parallelogram', {pid, body, page: PAGES_MAP[pid], userData});
 });
 
 app.use((req, res) => error(res, 404));

functions/utilities/user.js

@@ -1,7 +1,6 @@
 const firebase = require('firebase-admin');
 const cookieParser = require('cookie-parser')();
 const PAGES = require('../build/pages.json');
-const BADGES = require('../build/badges.json');
 
 const LEVELS = ['year6', 'year7', 'year8', 'year9', 'year10', 'year11'];
 
@@ -38,7 +37,6 @@ async function getUserData(uid) {
 
   if (!data.level) data.level = 'year8';
   if (!data.answers) data.answers = {};
-  data.badges = data.badges ? data.badges.split(',') : [];
   data.uid = uid;
 
   data.allPoints = {};
@@ -48,8 +46,6 @@ async function getUserData(uid) {
   }
 
   data.points = data.level ? (data.allPoints[data.level] || 0) : 0;
-  data.visibleBadges = data.level ? (BADGES[data.level] || [])
-      .filter(b => (data.points >= b.score)).reverse().slice(0, 4) : [];
 
   data.sidebarLevels = getSidebarLevels(data)
 

functions/views/_layout.pug

@@ -92,7 +92,7 @@ html
 
               .sidebar-circles-item: a(href="/circles")
                 div Parallel Circles
-                .sidebar-circles-subtext(id="sidebar-circles-text") Interactive live maths sessions
+                .sidebar-subtext(id="sidebar-circles-text") Interactive live maths sessions
                 .status.live.hidden(id="sidebar-circles-marker") LIVE
 
               if !user
@@ -109,14 +109,9 @@ html
                         a(v-on:click="user.toggleReset()") {{ user.loginForm.reset ? 'Back to login' : 'Reset password' }}
 
               if user && !user.code
-                .sidebar-field: a(href="/badges")
-                  | Your Badges
-                  if user.visibleBadges.length
-                    .badge-row
-                      for b in user.visibleBadges
-                        .badge(style='background-image: url(/images/badges/' + b.id + '.jpg); color: #' + b.color)
-                      if user.visibleBadges.length > 4
-                        .badge.more +
+                .sidebar-field: a(href="/awards")
+                  div Your Awards
+                  .sidebar-subtext(id="sidebar-circles-text") Badges are now part of the new Awards section
 
               if !user || user.code || user.level !== 'year6'
                 div(class="toggle space-around")

functions/views/badges.pug

@@ -25,18 +25,6 @@ block content
     else
       button#submit(v-on:click="c.submit") Submit Answers
 
-  //- if newBadge
-  //-   #new-badge.modal(v-if="c.showBadgeModal")
-  //-     .modal-background(v-on:click="c.showBadgeModal = false")
-  //-     .modal-body(style="background: #" + newBadge.color)
-  //-       h2 Congratulations!
-  //-       p You’ve scored enough points to receive a new badge:
-  //-       img(src='/images/badges/' + newBadge.id + '.jpg' width=160 height-180)
-  //-       h3= newBadge.name
-  //-       p !{newBadge.description}
-  //-       p: a.badge-btn(href=newBadge.link target="_blank") Learn more…
-  //-       .close(v-on:click="c.showBadgeModal = false") ×
-
   script!= 'window.PARALLELOGRAM = ' + JSON.stringify(page) + ';'
   script!= 'window.PARALLEL_USER_DATA = ' + JSON.stringify(userData) + ';'
 

functions/views/parallelogram.pug

@@ -16,7 +16,7 @@ These challenges are a random walk through the mysteries of mathematics. Be prep
 
 * Tackle each Parallelogram in one go. Don’t get distracted.
 * When you finish, remember to hit the SUBMIT button.
-*	NEW! You can new earn reward points and badges – [find out more here](/badges).
+*	NEW! You can new earn reward points and badges – [find out more here](/awards).
 * Finish by midnight on Sunday if your whole class is doing parallelograms.
 
 __IMPORTANT__ – it does not really matter what score you get, because the main thing is that you think hard about the problems... and then examine the solution sheet to learn from your mistakes.

pages/7-01-school-of-rock.md

@@ -16,7 +16,7 @@ These challenges are a random walk through the mysteries of mathematics. Be prep
 
 * Tackle each Parallelogram in one go. Don’t get distracted.
 * When you finish, remember to hit the SUBMIT button.
-*	NEW! You can new earn reward points and badges – [find out more here](/badges).
+*	NEW! You can new earn reward points and badges – [find out more here](/awards).
 *	Finish by midnight on Sunday if your whole class is doing parallelograms.
 
 __IMPORTANT__ – it does not really matter what score you get, because the main thing is that you think hard about the problems... and then examine the solution sheet to learn from your mistakes.

pages/8-01-wizard-of-oz.md

@@ -16,7 +16,7 @@ These challenges are a random walk through the mysteries of mathematics. Be prep
 
 * Tackle each Parallelogram in one go. Don’t get distracted.
 * When you finish, remember to hit the SUBMIT button.
-*	NEW! You can new earn reward points and badges – [find out more here](/badges).
+*	NEW! You can new earn reward points and badges – [find out more here](/awards).
 *	Finish by midnight on Sunday if your whole class is doing parallelograms.
 
 __IMPORTANT__ – it does not really matter what score you get, because the main thing is that you think hard about the problems... and then examine the solution sheet to learn from your mistakes.