Merge branch 'master' into add-ten-year-map-page

.gitignore

@@ -35,3 +35,4 @@ dist/
 ngrok
 
 .venv
+.coverage

.vscode/launch.json

@@ -21,6 +21,9 @@
       "type": "debugpy"
     },
     {
+      "env": {
+        "PYTEST_ADDOPTS": "--no-cov"
+      },
       "justMyCode": false,
       "name": "Pytest",
       "presentation": {

.vscode/settings.json

@@ -60,13 +60,17 @@
     "-m",
     "pylint"
   ],
+  "python.analysis.extraPaths": [
+    "./cfl_common"
+  ],
   "python.defaultInterpreterPath": ".venv/bin/python",
   "python.testing.pytestArgs": [
     "-n=auto",
+    "--cov=.",
+    "--cov-report=html",
     "-c=pyproject.toml",
     "."
   ],
   "python.testing.pytestEnabled": true,
-  "python.testing.unittestEnabled": false,
-  "python.analysis.extraPaths": ["./cfl_common"]
+  "python.testing.unittestEnabled": false
 }

portal/__init__.py

@@ -1 +1 @@
-__version__ = "6.45.4"
+__version__ = "6.45.5"

portal/templates/portal/about.html

@@ -24,7 +24,7 @@ <h2 class="text--brand-tertiary">>160</h2>
                 schools signed up to CFL. Nearly 10,000 schools are registered globally.</p>
             </div>
             <div class="col-sm-4">
-                <h2 class="text--brand-tertiary">>270,000</h2>
+                <h2 class="text--brand-tertiary">>260,000</h2>
                 <p>Active users so far, with numbers growing every day. In 2020 alone, close to 100,000 new people
                 subscribed to our resources.</p>
             </div>
@@ -120,7 +120,7 @@ <h5>Want to get involved?</h5>
             <h5>Developers</h5>
             <p>To contribute, head over to <a target="_blank" href="https://github.com/ocadotechnology/codeforlife-portal">GitHub</a>,
                 check out the issue tracker, and get started. There you can suggest new features or assign yourself
-                an issue to develop. You can find more info about how to do all these on our 
+                an issue to develop. You can find more info about how to do all these on our
                 <a target="_blank" href="https://docs.codeforlife.education/">docs on Gitbook</a>.
             <h5>Teachers, parents, and creatives</h5>
             <p>Please get in touch through our <a class="freshdesk__contact-us">contact</a> form and let us know how

portal/templates/portal/home.html

@@ -67,7 +67,7 @@ <h4 class="background">Giving everyone the ability to shape technology's future<
         </div>
         <div class="col-sm-3">
             <img title="Planet" alt="Planet image" src="{% static 'portal/img/icon_globe.png' %}">
-            <p class="col-sm-11 col-center">Code for Life has over 350,000 registered users across the world.</p>
+            <p class="col-sm-11 col-center">Code for Life has over 660,000 registered users across the world.</p>
         </div>
     </div>