Removed email address

Sync

.env.example

@@ -1,33 +0,0 @@
-SERVER_NAME= # URL where this will be hosted.
-FLASK_DEBUG=False
-
-TZ=Europe/London # Time Zone
-
-## App Configuration
-SECRET_KEY= # Long, secure, secret string.
-DATA=./data/
-DATABASE_TYPE=SQLite # SQLite or MySQL, defaults to SQLite
-DATABASE_HOST= # Required if MySQL. Must match name of Docker service, or provide host if database is on an external server. Defaults to localhost.
-DATABASE_PORT= # Required if MySQL. Defaults to 3306
-
-## MySQL Database Configuration (Required if configured to MySQL Database.)
-# Note that if using the Docker service, these configuration values will also be used when creating the database in the mysql container.
-MYSQL_RANDOM_ROOT_PASSWORD=True
-MYSQL_DATABASE= # Required if MySQL.
-MYSQL_USER= # Required if MySQL
-MYSQL_PASSWORD= # Required if MySQL. Create secure password string. Note '@' character cannot be used.
-
-## Flask Mail Configuration
-MAIL_SERVER=postfix # Must match name of the Docker service
-MAIL_PORT=25
-MAIL_USE_TLS=False
-MAIL_USE_SSL=False
-MAIL_USERNAME= # Username@domain, must match config values below
-MAIL_PASSWORD= # Must match config value below
-MAIL_DEFAULT_SENDER= # NoReply@domain or some such.
-MAIL_MAX_EMAILS=25
-MAIL_ASCII_ATTACHMENTS=True
-
-# Postfix
-maildomain= # Domain must match the section of username above
-smtp_user= # username:password. Must match config values above.

.gitignore

@@ -145,21 +145,5 @@ dev/
 out/
 ref-test/testing.py
 
-# Ignore Database
-database/data/
-
 # Ignore Encryption Keyfile
-.encryption.key
-
-# Ignore Data Dir
-**/data/*
-
-# Ignore Logs Dir
-logs/*
-
-# Ignore Certbot Dir
-certbot/*
-
-# Ignore src dir (exception for robots.txt)
-src/html/*
-src/html/robots.txt
+.encryption.key

README.md

@@ -10,224 +10,31 @@ The exam client is made with accessibility in mind, and has been designed to be
 
 ## Set Up and Installation
 
-The app is designed to be hosted on a server.
+The clien is designed to work on a server.
 
 ### Pre-Requisites
 
-- A Debian- or Ubuntu-based server, preferably the latest distribution.
-- Docker (specifically, Docker Engine)
-- Docker Compose
-- Git
+Server
+Docker
+Docker-Compose
+Git
 
 ### Installation
 
-#### Install all the pre-requisites
-
-The first step is to ensure all the prerequisites are available on the server.
-
-To set up the server, consult some of the comprehensive guides on various hosting platforms like Linode or DigitalOcean.
-Here is a [good starting point on setting up a server](https://www.digitalocean.com/community/tutorials/initial-server-setup-with-ubuntu-22-04).
-
-To install Docker and Docker Compose, consult the respective documentation:
-
-- [Install on Ubuntu](https://docs.docker.com/engine/install/ubuntu/) or [Install on Debian](https://docs.docker.com/engine/install/debian/)
-- Docker Compose should be installed as part of that.
-
-> At the time of writing, there has been an upgrade to Docker and Docker Compose, meaning the syntax below might be different between versions.
-
-Check if Git is installed on your server using the `git --version` command.
-If it isn't installed, install it.
-This should normally come pre-packaged with your OS distribution.
-But if it doesn't, look up how to for whatever OS you use.
-If you are using Ubuntu or Debian, it should be as easy as using the command:
-
-```$ sudo apt-get install git -y```
-
 #### Preliminary Set-Up: Clone repos and Configure Values
 
-Open a terminal and navigate to the folder where you want to install this app.
-I would suggest using a subfolder within your Home folder:
+#### Set Up Web Server
 
-```$ cd ~ && mkdir ska-referee-test && cd ska-referee-test```
+#### Incorporate SSL
 
-That way, you will ensure you can read and write all the necessary files during installation.
-Once in the destination folder, clone all the relevant files you will need for the installation:
+#### Set Up Auto-Renew
 
-```$ git clone https://git.vsnt.uk/viveksantayana/ska-referee-test.git .```
+### Alterations
 
-(Remember to include the trailing dot at the end, as that indicates to Git to download the files in the current directory.)
+## Use
 
-#### Choose What Database Engine You Will Use
+## Compatibility
 
-This app is designed to use an SQLite database by default.
-You can set it up to use a MySQL database by configuring the environment variables accordingly.
-If your database is being hosted remotely, make sure the MySQL database has the proper authentication for the user from a remote server.
-Alternatively, you can also use the second `docker-compose-mysql.yml` file which provides a MySQL database as part of the cluster.
-To use the second `docker-compose-mysql.yml` file, use the following command at the last step of the installation:
-
-```sudo docker compose -f docker-compose-mysql.yml up```
-
-#### Populate Environment Variables
-
-Configuration values for the app are stored in the environment variables file.
-To set it up, make a copy of the example file and populate it with appropriate values.
-
-```$ cp .env.example .env```
-
-Make sure to use complex, secure strings for passwords.
-Also make sure that the various entries for usernames and passwords match.
-
-#### Input Specific Values for Your Installation
-
-There are some values in the following four files you will need to configure to reflect the domain you are installing this app.
-
-```sh
-# .env
-
-SERVER_NAME= # URL where this will be hosted.
-```
-
-```sh
-# install-script.sh
-
-domains=(example.org www.example.org)
-email="" # Adding a valid address is strongly recommended
-```
-
-Substitute the domain name `domain_name` in the two file paths in the following file:
-
-```sh
-# nginx/ssl.conf
-
-ssl_certificate /etc/letsencrypt/live/domain_name/fullchain.pem;
-ssl_certificate_key /etc/letsencrypt/live/domain_name/privkey.pem;
-...
-```
-
-And **six** locations in the following file, two for the regular version of the domain and four for the www version (remember to keep the www. prefix where present):
-
-```nginx
-# nginx/conf.d/ref-test-app.conf
-
-server {
-    server_name domain_name;
-    listen 80 default_server;
-    ...
-}
-
-server {
-    server_name domain_name;
-    listen 443 ssl http2 default_server;
-    ...
-}
-
-server {
-    server_name www.domain_name;
-    listen 80;
-    listen [::]:80;
-    # Redirect to non-www
-    return 301 $scheme://domain_name$request_uri;
-    ...
-}
-
-server {
-    server_name www.domain_name;
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-
-    ...
-
-    # Redirect to non-www
-    return 301 $scheme://domain_name$request_uri;
-}
-```
-
-#### Installing SSL Certificates
-
-The app will use SSL certificates to operate through a secure, `https` connection.
-This will be set up automatically.
-However, there is a specific chicken-and-egg problem as the web server, Nginx, won't run without certificates, Certbot, the certificate generator, won't run without the web server.
-So to solve this, there is an automation script we can run that will set up a dummy certificate and then issue the appropriate certificates for us.
-
-```sh
-chmod +x install-script.sh
-sudo ./install-script.sh
-```
-
-This will take a long time to run the first time because it will try and generate a fairly sizeable cypher.
-
-When we later run the server, Certbot will check for renewals of the SSL certificates every 12 hours, and Nginx will reload the configurations every 6 hours, to make sure everything runs smoothly and stays live.
-
-#### Run the Stack
-
-Everything should be good to run on autopilot at this point.
-Navigate to the root folder of the app, the folder where you have `install-script.sh` and `docker-compose.yml`.
-Run the following command:
-
-```sudo docker compose up -d```
-
-And you should have the stack running.
-You can register in the app and begin using it.
+### iOS Limitations
 
 ### Fonts
-
-The app uses [OpenDyslexic](https://opendyslexic.org/), which is available on-line.
-It also has the option of rendering in other system fonts, but this can vary depending on your operating system.
-Because these are proprietary fonts, they cannot be made available on-line in the same way as open source ones should your system not have them.
-Some fonts may not display correctly as a result.
-
-## Updating the Installation
-
-If the app is updated, you can update the version on your installation using the following method:
-
-### Navigate to the root folder
-
-This will be the root folder into which you cloned the git repository when you set the app up.
-
-### Stash your local changes
-
-When you update the code, there is a risk the changes you made to your configuration will be overwritten.
-To avoid this, use the following command:
-
-```git stash```
-
-This will stash the changes you made, and we can re-apply the changes once the new code has been downloaded.
-If you do not have any other changes stashed, the index number of these changes should be `0` in a later step.
-If there are other changes, make sure to note what the correct index number for the stashed changes is.
-
-### Take down the Docker containers
-
-We will need to stop the current containers with the following command:
-
-```sudo docker compose down```
-
-This may take a few seconds.
-
-### Pull the updated code
-
-Download the updated code from the Git repository:
-
-```git pull```
-
-This step might fail if you have any un-stashed local changed.
-
-### Re-Apply your local configurations
-
-Because we stashed our local configurations, we can re-apply them once again:
-
-```git stash pop 0```
-
-The index number (`0`) is assuming there were no other changes saved on your git repository.
-If you have a different index number for the relevant changes from the above step, change this accordingly.
-
-### Re-build the docker image
-
-Now that we have the base code downloaded, we just need to update the docker image:
-
-```sudo docker compose build app```
-
-### Re-build the containers
-
-This is the same last step as running the containers in the last step of the installation:
-
-```sudo docker compose up -d```

REFERENCES.md

@@ -6,6 +6,11 @@
 
 - [Docker Compose Reference](https://docs.docker.com/compose/compose-file/compose-file-v3/)
 
+### MongoDB/PyMongo
+
+- [MongoDB Shell Commands](https://docs.mongodb.com/manual/reference/)
+- [PyMongo Driver](https://pymongo.readthedocs.io/en/stable/)
+
 ## Source Code
 
 - [MongoDB Docker Image entrypoint shell script](https://github.com/docker-library/mongo/blob/master/5.0/docker-entrypoint.sh) (Context: Tried to replicate the command to create a new user in the original entrypoint script in the custom initialisation script in this app.)
@@ -18,6 +23,15 @@
 - [Tables](https://www.blog.pythonlibrary.org/2017/12/14/flask-101-adding-editing-and-displaying-data/)
 - [Tables, but interactive](https://blog.miguelgrinberg.com/post/beautiful-interactive-tables-for-your-flask-templates)
 
+## Stack Exchange/Overflow
+
+### MongoDB
+
+- [Creating MongoDB Database on Container Start](https://stackoverflow.com/questions/42912755/how-to-create-a-db-for-mongodb-container-on-start-up)
+- [Passing Environment Variables to Docker Container Entrypoint](https://stackoverflow.com/questions/64606674/how-can-i-pass-environment-variables-to-mongo-docker-entrypoint-initdb-d)
+- [Integrating Flask-Login with MongoDB](https://stackoverflow.com/questions/54992412/flask-login-usermixin-class-with-a-mongodb) (**This does not work with the app as is, and is possibly something that needs more research and development in the future**)
+- [Setting up a Postfix email notification system](https://medium.com/@vietgoeswest/a-simple-outbound-email-service-for-your-app-in-15-minutes-cc4da70a2af7)
+
 ## YouTube Tutorials
 
 ### General Flask Introduction
@@ -58,7 +72,7 @@ A much simpler and more rudimentary introduction to Flask and MongoDB.
 - [Build a User Login System with `flask-login`, `flask-wtforms`, `flask-bootstrap`, and `flask-sqlalchemy`](https://www.youtube.com/watch?v=8aTnmsDMldY)
 
 A much more robust method that uses the various Flask modules to make a more powerful framework.
-Uses SQL.
+Uses SQL rather than MongoDB.
 
 ### Flask techniques
 
@@ -66,4 +80,4 @@ Uses SQL.
 
 ### Flask handling file uploads
 
-- [Handling File Uploads](https://blog.miguelgrinberg.com/post/handling-file-uploads-with-flask)
+- [Handlin File Uploads](https://blog.miguelgrinberg.com/post/handling-file-uploads-with-flask)

certbot/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

database/initdb.d/init-mongo.sh

@@ -0,0 +1,14 @@
+set -e
+mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
+
+if [ "$MONGO_INITDB_ROOT_USERNAME" ] && [ "$MONGO_INITDB_ROOT_PASSWORD" ] && [ "$MONGO_INITDB_USERNAME" ] && [ "$MONGO_INITDB_PASSWORD" ]; then
+rootAuthDatabase='admin'
+
+"${mongo[@]}" "$rootAuthDatabase" <<-EOJS
+    db.createUser({
+        user: $(_js_escape "$MONGO_INITDB_USERNAME"),
+        pwd: $(_js_escape "$MONGO_INITDB_PASSWORD"),
+        roles: [ { role: 'readWrite', db: $(_js_escape "$MONGO_INITDB_DATABASE") } ]
+    })
+EOJS
+fi

docker-compose-mysql.yml

@@ -1,90 +0,0 @@
-version: '3.9'
-
-volumes:
-  app:
-  mysql:
-
-services:
-  nginx:
-    container_name: reftest_server
-    image: nginx:alpine
-    volumes:
-      - ./certbot:/etc/letsencrypt:ro
-      - ./nginx:/etc/nginx
-      - ./src/html/certbot:/usr/share/nginx/html/certbot:ro
-      - ./src/html/robots.txt:/usr/share/nginx/html/robots.txt:ro
-      - ./ref-test/app/root:/usr/share/nginx/html/root:ro
-      - ./ref-test/app/admin/static:/usr/share/nginx/html/admin/static:ro
-      - ./ref-test/app/editor/static:/usr/share/nginx/html/editor/static:ro
-      - ./ref-test/app/quiz/static:/usr/share/nginx/html/quiz/static:ro
-      - ./ref-test/app/view/static:/usr/share/nginx/html/view/static:ro
-    ports:
-      - 80:80
-      - 443:443
-    restart: unless-stopped
-    networks:
-      - frontend
-    depends_on:
-      - app
-    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
-  
-  app:
-    container_name: reftest_app
-    image: reftest
-    build: ./ref-test
-    env_file:
-      - ./.env
-    ports:
-      - 5000
-    volumes:
-      - app:/ref-test/data
-      - ./logs:/ref-test/data/logs
-    restart: unless-stopped
-    networks:
-      - frontend
-      - backend
-    depends_on:
-      postfix:
-      mysql:
-        condition: service_healthy
-
-  postfix:
-    container_name: reftest_postfix
-    image: catatnight/postfix:latest
-    restart: unless-stopped
-    env_file:
-      - ./.env
-    ports:
-      - 25
-    networks:
-      - backend
-  
-  certbot:
-    container_name: reftest_certbot
-    image: certbot/certbot
-    volumes:
-      - ./certbot:/etc/letsencrypt
-      - ./src/html/certbot:/var/www/html
-    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
-  
-  mysql:
-    container_name: reftest_db
-    image: mysql:8.0
-    env_file:
-      - ./.env
-    volumes:
-      - mysql:/var/lib/mysql
-    ports:
-      - 3306
-    networks:
-      - backend
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
-      timeout: 10s
-      retries: 10
-
-networks:
-  frontend:
-    external: false
-  backend:
-    external: false

docker-compose.yml

@@ -1,22 +1,15 @@
 version: '3.9'
 
-volumes:
-  app:
-
 services:
-  nginx:
-    container_name: reftest_server
-    image: nginx:alpine
+  ref_test_server:
+    container_name: ref_test_server
+    image: nginx:1.21.4-alpine
     volumes:
       - ./certbot:/etc/letsencrypt:ro
       - ./nginx:/etc/nginx
-      - ./src/html/certbot:/usr/share/nginx/html/certbot:ro
-      - ./src/html/robots.txt:/usr/share/nginx/html/robots.txt:ro
-      - ./ref-test/app/root:/usr/share/nginx/html/root:ro
-      - ./ref-test/app/admin/static:/usr/share/nginx/html/admin/static:ro
-      - ./ref-test/app/editor/static:/usr/share/nginx/html/editor/static:ro
-      - ./ref-test/app/quiz/static:/usr/share/nginx/html/quiz/static:ro
-      - ./ref-test/app/view/static:/usr/share/nginx/html/view/static:ro
+      - ./src/html:/usr/share/nginx/html/
+      - ./ref-test/admin/static:/usr/share/nginx/html/admin/static
+      - ./ref-test/quiz/static:/usr/share/nginx/html/quiz/static
     ports:
       - 80:80
       - 443:443
@@ -24,29 +17,41 @@ services:
     networks:
       - frontend
     depends_on:
-      - app
-    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
+      - ref_test_app
   
-  app:
-    container_name: reftest_app
-    image: reftest
+  ref_test_app:
+    container_name: ref_test_app
     build: ./ref-test
+    volumes:
+      - ./ref-test:/ref-test
     env_file:
       - ./.env
     ports:
       - 5000
-    volumes:
-      - app:/ref-test/data
-      - ./logs:/ref-test/data/logs
     restart: unless-stopped
     networks:
       - frontend
       - backend
     depends_on:
-      - postfix
+      - ref_test_db
+      - ref_test_postfix
 
-  postfix:
-    container_name: reftest_postfix
+  ref_test_db:
+    container_name: ref_test_db
+    image: mongo:5.0.4-focal
+    restart: unless-stopped
+    volumes:
+      - ./database/data:/data
+      - ./database/initdb.d/:/docker-entrypoint-initdb.d/
+    env_file:
+      - ./.env
+    ports:
+      - 27017
+    networks:
+      - backend
+  
+  ref_test_postfix:
+    container_name: ref_test_postfix
     image: catatnight/postfix:latest
     restart: unless-stopped
     env_file:
@@ -56,13 +61,15 @@ services:
     networks:
       - backend
   
-  certbot:
-    container_name: reftest_certbot
-    image: certbot/certbot
+  ref_test_certbot:
+    container_name: ref_test_certbot
+    image: certbot/certbot:v1.21.0
     volumes:
       - ./certbot:/etc/letsencrypt
-      - ./src/html/certbot:/var/www/html
-    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
+      - ./src/html:/var/www/html
+    depends_on:
+      - ref_test_server
+    # command: certonly --webroot --webroot-path=/var/www/html --email vsdomainmanager@gmail.com --agree-tos --no-eff-email -d reftest.vsnt.uk
   
 networks:
   frontend:

install-script.sh

@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# Source https://pentacent.medium.com/nginx-and-lets-encrypt-with-docker-in-less-than-5-minutes-b4b8a60d3a71
-
-if ! [ -x "$(command -v docker)" ]; then
-  echo 'Error: docker is not installed.' >&2
-  exit 1
-fi
-
-if ! [ -x "$(command -v compose)" ]; then
-  echo 'Error: docker compose is not installed.' >&2
-  exit 1
-fi
-
-domains=(example.org www.example.org)
-rsa_key_size=4096
-data_path="./certbot"
-email="" # Adding a valid address is strongly recommended
-staging=0 # Set to 1 if you're testing your setup to avoid hitting request limits
-
-if [ -d "$data_path" ]; then
-  read -p "Existing data found for $domains. Continue and replace existing certificate? (y/N) " decision
-  if [ "$decision" != "Y" ] && [ "$decision" != "y" ]; then
-    exit
-  fi
-fi
-
-if [ ! -e "$data_path/ssl-dhparams.pem" ]; then
-  echo "### Generating ssl-dhparams.pem ..."
-  docker compose run --rm --entrypoint "\
-    openssl dhparam -out /etc/letsencrypt/ssl-dhparams.pem 4096" certbot
-  echo
-fi
-
-echo "### Creating dummy certificate for $domains ..."
-path="/etc/letsencrypt/live/$domains"
-mkdir -p "$data_path/live/$domains"
-docker compose run --rm --entrypoint "\
-  openssl req -x509 -nodes -newkey rsa:$rsa_key_size -days 1\
-    -keyout '$path/privkey.pem' \
-    -out '$path/fullchain.pem' \
-    -subj '/CN=localhost'" certbot
-echo
-
-if [ ! -e "$data_path/lets-encrypt-x3-cross-signed.pem" ]; then
-  echo "### Downloading lets-encrypt-x3-cross-signed.pem ..."
-  wget -O $data_path/lets-encrypt-x3-cross-signed.pem \
-  "https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem"
-  echo
-fi
-
-echo "### Starting nginx ..."
-docker compose up --force-recreate -d nginx
-echo
-
-echo "### Deleting dummy certificate for $domains ..."
-docker compose run --rm --entrypoint "\
-  rm -Rf /etc/letsencrypt/live/$domains && \
-  rm -Rf /etc/letsencrypt/archive/$domains && \
-  rm -Rf /etc/letsencrypt/renewal/$domains.conf" certbot
-echo
-
-echo "### Requesting Let's Encrypt certificate for $domains ..."
-#Join $domains to -d args
-domain_args=""
-for domain in "${domains[@]}"; do
-  domain_args="$domain_args -d $domain"
-done
-
-# Select appropriate email arg
-case "$email" in
-  "") email_arg="--register-unsafely-without-email" ;;
-  *) email_arg="--email $email" ;;
-esac
-
-# Enable staging mode if needed
-if [ $staging != "0" ]; then staging_arg="--staging"; fi
-
-docker compose run --rm --entrypoint "\
-  certbot certonly --non-interactive --webroot -w /var/www/html \
-    $staging_arg \
-    $email_arg \
-    $domain_args \
-    --rsa-key-size $rsa_key_size \
-    --agree-tos \
-    --force-renewal" certbot
-echo
-
-echo "### Reloading nginx ..."
-docker compose exec nginx nginx -s reload

nginx/certbot-challenge.conf

@@ -1,6 +1,6 @@
 # Certbot Renewal
 location ^~ /.well-known/acme-challenge/ {
-    root /usr/share/nginx/html/certbot;
+    root /usr/share/nginx/html;
     allow all;
     default_type "text/plain";
 }

nginx/conf.d/default.conf

@@ -0,0 +1,33 @@
+server {
+	listen 80 default_server;
+	listen [::]:80 default_server;
+
+	listen 443 ssl http2 default_server;
+	listen [::]:443 ssl http2 default_server;
+
+    access_log  /var/log/nginx/host.access.log  main;
+
+	# SSL configuration
+	include	/etc/nginx/ssl.conf;
+
+	# Add index.php to the list if you are using PHP
+	index index.html index.htm index.nginx-debian.html;
+
+	# Default catch all to 404
+	# Added from Serverfault support https://serverfault.com/questions/994141/nginx-redirecting-the-wrong-subdomains
+	server_name _;
+	server_name_in_redirect off;
+	location / {
+		return 404;
+	}
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+}

nginx/conf.d/ref-test-app.conf

@@ -1,74 +0,0 @@
-upstream reftest {
-    server  app:5000;
-}
-
-server {
-    server_name domain_name;
-    listen 80 default_server;
-    listen [::]:80 default_server;
-    # Redirect to ssl
-    return 301 https://$host$request_uri;
-}
-
-server {
-    server_name domain_name;
-    listen 443 ssl http2 default_server;
-    listen [::]:443 ssl http2 default_server;
-
-    # SSL configuration
-    include	/etc/nginx/ssl.conf;
-    include	/etc/nginx/certbot-challenge.conf;
-
-    # Define locations for static files to be served by Nginx
-    location ^~ /root/ {
-        include  /etc/nginx/mime.types;
-        alias /usr/share/nginx/html/root/;
-    }
-
-    location ^~ /quiz/static/  {
-        include  /etc/nginx/mime.types;
-        alias /usr/share/nginx/html/quiz/static/;
-    }
-
-    location ^~ /admin/static/  {
-        include  /etc/nginx/mime.types;
-        alias /usr/share/nginx/html/admin/static/;
-    }
-
-    location ^~ /admin/editor/static/  {
-        include  /etc/nginx/mime.types;
-        alias /usr/share/nginx/html/editor/static/;
-    }
-
-    location ^~ /admin/view/static/  {
-        include  /etc/nginx/mime.types;
-        alias /usr/share/nginx/html/view/static/;
-    }
-
-    # Proxy to the main app for all other requests
-    location / {
-        include /etc/nginx/conf.d/proxy_headers.conf;
-        proxy_pass http://reftest;
-    }
-}
-
-server {
-    server_name www.domain_name;
-    listen 80;
-    listen [::]:80;
-    # Redirect to non-www
-    return 301 $scheme://domain_name$request_uri;
-}
-
-server {
-    server_name www.domain_name;
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-
-	# SSL configuration
-    include	/etc/nginx/ssl.conf;
-    include	/etc/nginx/certbot-challenge.conf;
-
-    # Redirect to non-www
-    return 301 $scheme://domain_name$request_uri;
-}

nginx/ssl.conf

@@ -1,13 +0,0 @@
-ssl_certificate /etc/letsencrypt/live/domain_name/fullchain.pem;
-ssl_certificate_key /etc/letsencrypt/live/domain_name/privkey.pem;
-
-ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-ssl_prefer_server_ciphers on;
-ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
-ssl_stapling on;
-ssl_stapling_verify on;
-ssl_trusted_certificate /etc/letsencrypt/lets-encrypt-x3-cross-signed.pem;
-add_header Strict-Transport-Security "max-age=31536000" always;
-ssl_session_cache   shared:SSL:40m;
-ssl_session_timeout 4h;
-ssl_session_tickets on;

ref-test/.dockerignore

@@ -1,3 +1,2 @@
 env/
-__pycache__/
-data/
+__pycache__/

ref-test/Dockerfile

@@ -1,8 +1,5 @@
 FROM python:3.10-slim
-ARG DATA=./data/
-ENV DATA=$DATA
 WORKDIR /ref-test
 COPY . .
 RUN pip install --upgrade pip && pip install -r requirements.txt
-RUN chmod +x install.py reset.py && ./install.py
 CMD [ "gunicorn", "-b", "0.0.0.0:5000", "-w", "5", "wsgi:app" ]

ref-test/admin/auth.py

@@ -0,0 +1,147 @@
+from flask import Blueprint, render_template, request, session, redirect
+from flask.helpers import flash, url_for
+from flask.json import jsonify
+from .models.users import User
+from uuid import uuid4
+from common.security.database import decrypt_find_one, encrypted_update
+from werkzeug.security import check_password_hash
+
+from .views import admin_account_required, disable_on_registration, login_required, disable_if_logged_in, get_id_from_cookie
+
+auth = Blueprint(
+    'admin_auth',
+    __name__,
+    template_folder='templates',
+    static_folder='static'
+)
+
+@auth.route('/account/', methods = ['GET', 'POST'])
+@admin_account_required
+@login_required
+def account():
+    from .models.forms import UpdateAccountForm
+    from main import db
+    form = UpdateAccountForm()
+    _id = get_id_from_cookie()
+    user = decrypt_find_one(db.users, {'_id': _id})
+    if request.method == 'GET':
+        return render_template('/admin/auth/account.html', form = form, user = user)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            password_confirm = request.form.get('password_confirm')
+            if not check_password_hash(user['password'], password_confirm):
+                return jsonify({ 'error': 'The password you entered is incorrect.' }), 401
+            entry = User(
+                _id = _id,
+                password = request.form.get('password'),
+                email = request.form.get('email')
+            )
+            return entry.update()
+        else:
+            errors = [*form.password_confirm.errors, *form.password_reenter.errors, *form.password.errors, *form.email.errors]
+            return jsonify({ 'error': errors}), 400
+
+@auth.route('/login/', methods=['GET','POST'])
+@admin_account_required
+@disable_if_logged_in
+def login():
+    from .models.forms import LoginForm
+    form = LoginForm()
+    if request.method == 'GET':
+        return render_template('/admin/auth/login.html', form=form)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            entry = User(
+                username = request.form.get('username').lower(),
+                password = request.form.get('password'),
+                remember = request.form.get('remember')
+            )
+            return entry.login()
+        else:
+            errors = [*form.username.errors, *form.password.errors]
+            return jsonify({ 'error': errors}), 400
+
+@auth.route('/logout/')
+@admin_account_required
+@login_required
+def logout():
+    _id = get_id_from_cookie()
+    return User(_id=_id).logout()
+
+@auth.route('/register/', methods=['GET','POST'])
+@disable_on_registration
+def register():
+    from .models.forms import RegistrationForm
+    form = RegistrationForm()
+    if request.method == 'GET':
+        return render_template('/admin/auth/register.html', form=form)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            entry = User(
+                _id = uuid4().hex,
+                username = request.form.get('username').lower(),
+                email = request.form.get('email'),
+                password = request.form.get('password'),
+            )
+            return entry.register()
+        else:
+            errors = [*form.username.errors, *form.email.errors, *form.password.errors, *form.password_reenter.errors]
+            return jsonify({ 'error': errors}), 400
+
+@auth.route('/reset/', methods = ['GET', 'POST'])
+@admin_account_required
+@disable_if_logged_in
+def reset():
+    from .models.forms import ResetPasswordForm
+    form = ResetPasswordForm()
+    if request.method == 'GET':
+        return render_template('/admin/auth/reset.html', form=form)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            entry = User(
+                username = request.form.get('username').lower(),
+                email = request.form.get('email'),
+            )
+            return entry.reset_password()
+        else:
+            errors = [*form.username.errors, *form.email.errors]
+            return jsonify({ 'error': errors}), 400
+
+@auth.route('/reset/<token1>/<token2>/', methods = ['GET'])
+@admin_account_required
+@disable_if_logged_in
+def reset_gateway(token1,token2):
+    from main import db
+    user = decrypt_find_one( db.users, {'reset_token' : token1} )
+    if not user:
+        return redirect(url_for('admin_auth.login'))
+    encrypted_update( db.users, {'reset_token': token1}, {'$unset': {'reset_token' : '', 'verification_token': ''}})
+    if not user['verification_token'] == token2:
+        flash('The verification of your password reset request failed and the token has been invalidated. Please make a new reset password request.', 'error'), 401
+        return redirect(url_for('admin_auth.reset'))
+    session['_id'] = user['_id']
+    session['reset_validated'] = True
+    return redirect(url_for('admin_auth.update_password_'))
+
+@auth.route('/reset/update/', methods = ['GET','POST'])
+@admin_account_required
+@disable_if_logged_in
+def update_password_():
+    from .models.forms import UpdatePasswordForm
+    form = UpdatePasswordForm()
+    if request.method == 'GET':
+        if 'reset_validated' not in session:
+            return redirect(url_for('admin_auth.login'))
+        session.pop('reset_validated')
+        return render_template('/admin/auth/update-password.html', form=form)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            entry = User(
+                _id = session['_id'],
+                password = request.form.get('password')
+            )
+            session.pop('_id')
+            return entry.update()
+        else:
+            errors = [*form.password.errors, *form.password_reenter.errors]
+            return jsonify({ 'error': errors}), 400

ref-test/admin/models/forms/__init__.py

@@ -1,66 +1,62 @@
-from ..tools.forms import value
-
 from flask_wtf import FlaskForm
-from flask_wtf.file import FileAllowed, FileField, FileRequired
-from wtforms import BooleanField, IntegerField, PasswordField, SelectField, StringField
-from wtforms.fields import DateTimeLocalField
-from wtforms.validators import InputRequired, Email, EqualTo, Length, Optional
+from flask_wtf.file import FileField, FileRequired, FileAllowed
+from wtforms import StringField, PasswordField, BooleanField, DateField, SelectField, IntegerField
+from wtforms.validators import InputRequired, Email, Length, EqualTo, Optional
+from datetime import date, timedelta
 
-class Login(FlaskForm):
+from .validators import value
+
+class LoginForm(FlaskForm):
     username = StringField('Username', validators=[InputRequired(), Length(min=4, max=15)])
-    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     remember = BooleanField('Remember Log In', render_kw={'checked': True})
 
-class Register(FlaskForm):
+class RegistrationForm(FlaskForm):
     username = StringField('Username', validators=[InputRequired(), Length(min=4, max=15)])
     email = StringField('Email Address', validators=[InputRequired(), Email(message='You must enter a valid email address.'), Length(max=50)])
-    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
-    password_reenter = PasswordField('Re-Enter Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.'), EqualTo('password', message='Passwords do not match.')])
+    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
+    password_reenter = PasswordField('Re-Enter Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.'), EqualTo('password', message='Passwords do not match.')])
 
-class ResetPassword(FlaskForm):
+class ResetPasswordForm(FlaskForm):
     username = StringField('Username', validators=[InputRequired(), Length(min=4, max=15)])
     email = StringField('Email Address', validators=[InputRequired(), Email(message='You must enter a valid email address.'), Length(max=50)])
 
-class UpdatePassword(FlaskForm):
-    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
-    password_reenter = PasswordField('Re-Enter Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.'), EqualTo('password', message='Passwords do not match.')])
+class UpdatePasswordForm(FlaskForm):
+    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
+    password_reenter = PasswordField('Re-Enter Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.'), EqualTo('password', message='Passwords do not match.')])
 
-class CreateUser(FlaskForm):
+class CreateUserForm(FlaskForm):
     username = StringField('Username', validators=[InputRequired(), Length(min=4, max=15)])
     email = StringField('Email Address', validators=[InputRequired(), Email(message='You must enter a valid email address.'), Length(max=50)])
-    password = PasswordField('Password (Optional)', validators=[Optional(),Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
-    notify = BooleanField('Notify accout creation by email', render_kw={'checked': True})
+    password = PasswordField('Password (Optional)', validators=[Optional(),Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
 
-class DeleteUser(FlaskForm):
-    password = PasswordField('Confirm Your Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+class DeleteUserForm(FlaskForm):
+    password = PasswordField('Confirm Your Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     notify = BooleanField('Notify deletion by email', render_kw={'checked': True})
 
-class UpdateUser(FlaskForm):
-    confirm_password = PasswordField('Confirm Your Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+class UpdateUserForm(FlaskForm):
+    user_password = PasswordField('Confirm Your Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     email = StringField('Email Address', validators=[Optional(), Email(message='You must enter a valid email address.'), Length(max=50)])
-    password = PasswordField('Change Password', validators=[Optional(),Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Change Password', validators=[Optional(),Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     password_reenter = PasswordField('Re-Enter New Password', validators=[EqualTo('password', message='Passwords do not match.')])
     notify = BooleanField('Notify changes by email', render_kw={'checked': True})
 
-class UpdateAccount(FlaskForm):
-    confirm_password = PasswordField('Current Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+class UpdateAccountForm(FlaskForm):
+    password_confirm = PasswordField('Current Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     email = StringField('Email Address', validators=[Optional(), Email(message='You must enter a valid email address.'), Length(max=50)])
-    password = PasswordField('Change Password', validators=[Optional(),Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Change Password', validators=[Optional(),Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     password_reenter = PasswordField('Re-Enter New Password', validators=[EqualTo('password', message='Passwords do not match.')])
 
 class CreateTest(FlaskForm):
-    start_date = DateTimeLocalField('Start Date', format='%Y-%m-%dT%H:%M', validators=[InputRequired()] )
-    expiry_date = DateTimeLocalField('Expiry Date', format='%Y-%m-%dT%H:%M', validators=[InputRequired()] )
+    start_date = DateField('Start Date', format="%Y-%m-%d", validators=[InputRequired()], default = date.today() )
+    expiry_date = DateField('Expiry Date', format="%Y-%m-%d", validators=[InputRequired()], default = date.today() + timedelta(days=1) )
     time_limit = SelectField('Time Limit')
     dataset = SelectField('Question Dataset')
 
-class UploadData(FlaskForm):
-    name = StringField('Name', validators=[InputRequired()])
+class UploadDataForm(FlaskForm):
     data_file = FileField('Data File', validators=[FileRequired(), FileAllowed(['json'])])
     default = BooleanField('Make Default', render_kw={'checked': True})
 
 class AddTimeAdjustment(FlaskForm):
     time = IntegerField('Extra Time (Minutes)', validators=[InputRequired(), value(max=60)])
-
-class EditDataset(FlaskForm):
-    dataset = SelectField('Question Dataset')
+    

ref-test/admin/models/forms/validators.py

@@ -0,0 +1,11 @@
+from wtforms.validators import ValidationError
+
+def value(min=0, max=None):
+    message = f'Value must be between {min} and {max}.'
+
+    def _length(form, field):
+        value = field.data or 0
+        if value < min or max != None and value > max:
+            raise ValidationError(message)
+
+    return _length

ref-test/admin/models/tests.py

@@ -0,0 +1,122 @@
+import secrets
+from datetime import datetime
+from uuid import uuid4
+from flask import flash, jsonify
+import secrets
+import os
+from json import dump, loads
+
+from common.security import encrypt
+
+class Test:
+    
+    def __init__(self, _id=None, start_date=None, expiry_date=None, time_limit=None, creator=None, dataset=None):
+        self._id = _id
+        self.start_date = start_date
+        self.expiry_date = expiry_date
+        self.time_limit = None if time_limit == 'none' or time_limit == '' or time_limit == None else int(time_limit)
+        self.creator = creator
+        self.dataset = dataset
+    
+    def create(self):
+        from main import app, db
+        test = {
+            '_id': self._id,
+            'date_created': datetime.today(),
+            'start_date': self.start_date,
+            'expiry_date': self.expiry_date,
+            'time_limit': self.time_limit,
+            'creator': encrypt(self.creator),
+            'test_code': secrets.token_hex(6).upper(),
+            'dataset': self.dataset
+        }
+        if db.tests.insert_one(test):
+            dataset_file_path = os.path.join(app.config["DATA_FILE_DIRECTORY"],self.dataset)
+            with open(dataset_file_path, 'r') as dataset_file:
+                data = loads(dataset_file.read())
+            data['meta']['tests'].append(self._id)
+            with open(dataset_file_path, 'w') as dataset_file:
+                dump(data, dataset_file, indent=2)
+            flash(f'Created a new exam with Exam Code <strong>{self.render_test_code(test["test_code"])}</strong>.', 'success')
+            return jsonify({'success': test}), 200
+        return jsonify({'error': f'Could not create exam. An error occurred.'}), 400
+
+    def add_time_adjustment(self, time_adjustment):
+        from main import db
+        user_code = secrets.token_hex(3).upper()
+        adjustment = {
+            user_code: time_adjustment
+        }
+        if db.tests.find_one_and_update({'_id': self._id}, {'$set': {'time_adjustments': adjustment}},upsert=False):
+            flash(f'Time adjustment for {time_adjustment} minutes has been added. This can be enabled using the user code {user_code}.')
+            return jsonify({'success': adjustment})
+        return jsonify({'error': 'Failed to add the time adjustment. An error occurred.'}), 400
+
+    def remove_time_adjustment(self, user_code):
+        from main import db
+        if db.tests.find_one_and_update({'_id': self._id}, {'$unset': {f'time_adjustments.{user_code}': {}}}):
+            message = 'Time adjustment has been deleted.'
+            flash(message, 'success')
+            return jsonify({'success': message})
+        return jsonify({'error': 'Failed to delete the time adjustment. An error occurred.'}), 400
+
+    def render_test_code(self, test_code):
+        return '—'.join([test_code[:4], test_code[4:8], test_code[8:]])
+    
+    def parse_test_code(self, test_code):
+        return test_code.replace('—', '')
+    
+    def delete(self):
+        from main import app, db
+        test = db.tests.find_one({'_id': self._id})
+        if 'entries' in test:
+            if test['entries']:
+                return jsonify({'error': 'Cannot delete an exam that has entries submitted to it.'}), 400
+        if self.dataset is None:
+            self.dataset = db.tests.find_one({'_id': self._id})['dataset']
+        if db.tests.delete_one({'_id': self._id}):
+            dataset_file_path = os.path.join(app.config["DATA_FILE_DIRECTORY"],self.dataset)
+            with open(dataset_file_path, 'r') as dataset_file:
+                data = loads(dataset_file.read())
+            data['meta']['tests'].remove(self._id)
+            with open(dataset_file_path, 'w') as dataset_file:
+                dump(data, dataset_file, indent=2)
+            message = 'Deleted exam.'
+            flash(message, 'alert')
+            return jsonify({'success': message}), 200
+        return jsonify({'error': f'Could not create exam. An error occurred.'}), 400
+
+    def update(self):
+        from main import db
+        test = {}
+        updated = []
+        if not self.start_date == '' and self.start_date is not None:
+            test['start_date'] = self.start_date
+            updated.append('start date')
+        if not self.expiry_date == '' and self.expiry_date is not None:
+            test['expiry_date'] = self.expiry_date
+            updated.append('expiry date')
+        if not self.time_limit == '' and self.time_limit is not None:
+            test['time_limit'] = int(self.time_limit)
+            updated.append('time limit')
+        output = ''
+        if len(updated) == 0:
+            flash(f'There were no changes requested for your account.', 'alert'), 200
+            return jsonify({'success': 'There were no changes requested for your account.'}), 200
+        elif len(updated) == 1:
+            output = updated[0]
+        elif len(updated) == 2:
+            output = ' and '.join(updated)
+        elif len(updated) > 2:
+            output = updated[0]
+            for index in range(1,len(updated)):
+                if index < len(updated) - 2:
+                    output = ', '.join([output, updated[index]])
+                elif index == len(updated) - 2:
+                    output = ', and '.join([output, updated[index]])
+                else:
+                    output = ''.join([output, updated[index]])
+        db.tests.find_one_and_update({'_id': self._id}, {'$set': test})
+        _output = f'The {output} of the test {"has" if len(updated) == 1 else "have"} been updated.'
+        flash(_output)
+        return jsonify({'success': _output}), 200

ref-test/admin/models/users.py

@@ -0,0 +1,205 @@
+from flask import flash, make_response, Response, session
+from flask.helpers import url_for
+from flask.json import jsonify
+from werkzeug.security import generate_password_hash, check_password_hash
+from werkzeug.utils import redirect
+from flask_mail import Message
+import secrets
+
+from common.security import encrypt, decrypt
+from common.security.database import decrypt_find_one, encrypted_update
+from datetime import datetime, timedelta
+
+class User:
+
+    def __init__(self, _id=None, username=None, password=None, email=None, remember=False):
+        self._id = _id
+        self.username = username
+        self.email = email
+        self.password = password
+        self.remember = remember
+
+    def start_session(self, resp:Response):
+        resp.set_cookie(
+            key = '_id',
+            value = self._id,
+            max_age = timedelta(days=14) if self.remember else 'Session',
+            path = '/',
+            expires = datetime.utcnow() + timedelta(days=14) if self.remember else 'Session',
+            domain = '.reftest.vsnt.uk',
+            secure = True
+        )
+        if self.remember:
+            resp.set_cookie (
+                key = 'remember',
+                value = 'True',
+                max_age = timedelta(days=14),
+                path = '/',
+                expires = datetime.utcnow() + timedelta(days=14),
+                domain = '.reftest.vsnt.uk',
+                secure = True
+            )
+
+    def register(self):
+        from main import db
+        from ..views import get_id_from_cookie
+        user = {
+            '_id': self._id,
+            'email': encrypt(self.email),
+            'password': generate_password_hash(self.password, method='sha256'),
+            'username': encrypt(self.username)
+        }
+        if decrypt_find_one(db.users, { 'username': self.username }):
+            return jsonify({ 'error': f'Username {self.username} is not available.' }), 400
+        if db.users.insert_one(user):
+            flash(f'User {self.username} has been created successfully. You may now use it to log in and administer the tests.', 'success')
+            resp = make_response(jsonify(user), 200)
+            if not get_id_from_cookie:
+                self.start_session(resp)
+            return resp
+        return jsonify({ 'error': f'Registration failed. An error occurred.' }), 400
+    
+    def login(self):
+        from main import db
+        user = decrypt_find_one( db.users, { 'username': self.username })
+        if not user:
+            return jsonify({ 'error': f'Username {self.username} does not exist.' }), 401
+        if not check_password_hash( user['password'], self.password ):
+            return jsonify({ 'error': f'The password you entered is incorrect.' }), 401
+        response = {
+            'success': f'Successfully logged in user {self.username}.'
+        }
+        if 'prev_page' in session:
+            response['redirect_to'] = session['prev_page']
+            session.pop('prev_page')
+        resp = make_response(jsonify(response), 200)
+        self._id = user['_id']
+        self.start_session(resp)
+        return resp
+
+    def logout(self):
+        resp = make_response(redirect(url_for('admin_auth.login')))
+        resp.set_cookie(
+            key = '_id',
+            value = '',
+            max_age = timedelta(days=-1),
+            path = '/',
+            expires= datetime.utcnow() + timedelta(days=-1),
+            domain = '.reftest.vsnt.uk',
+            secure = True
+        )
+        resp.set_cookie (
+            key = 'cookie_consent',
+            value = 'True',
+            max_age = 'Session',
+            path = '/',
+            expires = 'Session',
+            domain = '.reftest.vsnt.uk',
+            secure = True
+        )
+        resp.set_cookie (
+            key = 'remember',
+            value = 'True',
+            max_age = timedelta(days=-1),
+            path = '/',
+            expires = datetime.utcnow() + timedelta(days=-1),
+            domain = '.reftest.vsnt.uk',
+            secure = True
+        )
+        flash('You have been logged out. All cookies pertaining to your account have been deleted. Have a nice day.', 'alert')
+        return resp
+
+    def reset_password(self):
+        from main import db, mail
+        user = decrypt_find_one(db.users, { 'username': self.username })
+        if not user:
+            return jsonify({ 'error': f'Username {self.username} does not exist.' }), 401
+        if not user['email'] == self.email:
+            return jsonify({ 'error': f'The email address {self.email} does not match the user account {self.username}.' }), 401
+        new_password = secrets.token_hex(12)
+        reset_token = secrets.token_urlsafe(16)
+        verification_token = secrets.token_urlsafe(16)
+        user['password'] = generate_password_hash(new_password, method='sha256')
+        if encrypted_update(db.users, { 'username': self.username }, { '$set': {'password': user['password'], 'reset_token': reset_token, 'verification_token': verification_token } } ):
+            flash(f'Your password has been reset. Instructions to recover your account have been sent to {self.email}. Please be sure to check your spam folder in case you have not received the email.', 'alert')
+            email = Message(
+                subject = 'RefTest | Password Reset',
+                recipients = [self.email],
+                body = f"""
+                Hello {user['username']}, \n\n
+                This email was generated because we received a request to reset the password for your administrator account for the SKA RefTest app.\n\n
+                If you did not make this request, please ignore this email.\n\n
+                If you did make this request, then you have two options to recover your account.\n\n
+                For the time being, your password has been reset to the following:\n\n
+                {new_password}\n\n
+                You may use this to log back in to your account, and subsequently change your password to something more suitable.\n\n
+                Alternatively, you may visit the following private link using your unique token to override your password. Copy and paste the following link in a web browser. Please note that this token is only valid once:\n\n
+                {url_for('admin_auth.reset_gateway', token1 = reset_token, token2 = verification_token, _external = True)}\n\n
+                Have a nice day.
+                """,
+                html = f"""
+                <p>Hello {user['username']},</p>
+                <p>This email was generated because we received a request to reset the password for your administrator account for the SKA RefTest app. </p>
+                <p>If you did not make this request, please ignore this email.</p>
+                <p>If you did make this request, then you have two options to recover your account.</p>
+                <p>For the time being, your password has been reset to the following:</p>
+                <strong>{new_password}</strong>
+                <p>You may use this to log back in to your account, and subsequently change your password to something more suitable.</p>
+                <p>Alternatively, you may visit the following private link using your unique token to override your password. Click on the following link, or copy and paste it into a browser. <strong>Please note that this token is only valid once</strong>:</p>
+                <p><a href='{url_for('admin_auth.reset_gateway', token1 = reset_token, token2 = verification_token, _external = True)}'>{url_for('admin_auth.reset_gateway', token1 = reset_token, token2 = verification_token, _external = True)}</a></p>
+                <p>Have a nice day.</p>
+                """
+            )
+            mail.send(email)
+            return jsonify({ 'success': 'Password reset request has been processed.'}), 200
+    
+    def update(self):
+        from main import db
+        from ..views import get_id_from_cookie
+        retrieved_user = decrypt_find_one(db.users, { '_id': self._id })
+        if not retrieved_user:
+            return jsonify({ 'error': f'User {retrieved_user["username"]} does not exist.' }), 401
+        user = {}
+        updated = []
+        if not self.email == '' and self.email is not None:
+            user['email'] = self.email
+            updated.append('email')
+        if not self.password == '' and self.password is not None:
+            user['password'] = generate_password_hash(self.password, method='sha256')
+            updated.append('password')
+        output = ''
+        if len(updated) == 0:
+            flash(f'There were no changes requested for your account.', 'alert'), 200
+            return jsonify({'success': 'There were no changes requested for your account.'}), 200
+        elif len(updated) == 1:
+            output = updated[0]
+        elif len(updated) == 2:
+            output = ' and '.join(updated)
+        elif len(updated) > 2:
+            output = updated[0]
+            for index in range(1,len(updated)):
+                if index < len(updated) - 2:
+                    output = ', '.join([output, updated[index]])
+                elif index == len(updated) - 2:
+                    output = ', and '.join([output, updated[index]])
+                else:
+                    output = ''.join([output, updated[index]])
+        encrypted_update(db.users, {'_id': self._id}, { '$set': user })
+        if self._id == get_id_from_cookie():
+            _output = 'Your '
+        elif retrieved_user['username'][-1] == 's':
+            _output = '&rsquo;'.join([retrieved_user['username'], ''])
+        else:
+            _output = '&rsquo;'.join([retrieved_user['username'], 's'])
+        _output = f'{_output} {output} {"has" if len(updated) == 1 else "have"} been updated.'
+        flash(_output)
+        return jsonify({'success': _output}), 200
+    
+    def delete(self):
+        from main import db
+        retrieved_user = decrypt_find_one(db.users, { '_id': self._id })
+        if not retrieved_user:
+            return jsonify({ 'error': f'User does not exist.' }), 401
+        db.users.find_one_and_delete({'_id': self._id})
+        flash(f'User {retrieved_user["username"]} has been deleted.')
+        return jsonify({'success': f'User {retrieved_user["username"]} has been deleted.'}), 200

ref-test/admin/results.py

@@ -0,0 +1,15 @@
+from flask import Blueprint, render_template
+from .views import login_required, admin_account_required
+
+results = Blueprint(
+    'results',
+    __name__,
+    template_folder='templates',
+    static_folder='static'
+)
+
+@results.route('/')
+@admin_account_required
+@login_required
+def _results():
+    return render_template('/admin/results.html')

ref-test/admin/static/css/style.css

@@ -158,7 +158,7 @@ table.dataTable {
 
 #dismiss-cookie-alert {
     margin-top: 16px;
-    width: fit-content;
+    width: 100%;
 }
 
 .alert-db-empty {
@@ -223,19 +223,6 @@ table.dataTable {
     background-color: unset;
 }
 
-/* Change Autocomplete styles in Chrome*/
-input:-webkit-autofill,
-input:-webkit-autofill:hover, 
-input:-webkit-autofill:focus,
-textarea:-webkit-autofill,
-textarea:-webkit-autofill:hover,
-textarea:-webkit-autofill:focus,
-select:-webkit-autofill,
-select:-webkit-autofill:hover,
-select:-webkit-autofill:focus {
-  transition: background-color 5000s ease-in-out 0s;
-}
-
 /* Fallback for Edge
 -------------------------------------------------- */
 @supports (-ms-ime-align: auto) {

ref-test/admin/static/js/script.js

@@ -1,25 +1,25 @@
 // Menu Highlight Scripts
-const menuItems = document.getElementsByClassName('nav-link')
+const menuItems = document.getElementsByClassName('nav-link');
 for(let i = 0; i < menuItems.length; i++) {
     if(menuItems[i].pathname == window.location.pathname) {
-        menuItems[i].classList.add('active')
+        menuItems[i].classList.add('active');
     }
 }
-const dropdownItems = document.getElementsByClassName('dropdown-item')
+const dropdownItems = document.getElementsByClassName('dropdown-item');
 for(let i = 0; i< dropdownItems.length; i++) {
     if(dropdownItems[i].pathname == window.location.pathname) {
-        dropdownItems[i].classList.add('active')
-        $( "#" + dropdownItems[i].id ).closest( '.dropdown' ).find('.dropdown-toggle').addClass('active')
+        dropdownItems[i].classList.add('active');
+        $( "#" + dropdownItems[i].id ).closest( '.dropdown' ).find('.dropdown-toggle').addClass('active');
     }
 }
 
 // General Post Method Form Processing Script
 $('form.form-post').submit(function(event) {
     
-    var $form = $(this)
-    var data = $form.serialize()
-    var url = $(this).prop('action')
-    var rel_success = $(this).data('rel-success')
+    var $form = $(this);
+    var data = $form.serialize();
+    var url = $(this).attr('action');
+    var rel_success = $(this).data('rel-success');
 
     $.ajax({
         url: url,
@@ -28,25 +28,25 @@ $('form.form-post').submit(function(event) {
         dataType: 'json',
         success: function(response) {
             if (response.redirect_to) {
-                window.location.href = response.redirect_to
+                window.location.href = response.redirect_to;
             }
             else {
-                window.location.href = rel_success
+                window.location.href = rel_success;
             }
         },
         error: function(response) {
-            error_response(response)
+            error_response(response);
         }
-    })
+    });
 
-    event.preventDefault()
-})
+    event.preventDefault();
+});
 
 // Form Upload Questions - Special case, needs to handle files.
 $('form[name=form-upload-questions]').submit(function(event) {
     
-    var $form = $(this)
-    var data = new FormData($form[0])
+    var $form = $(this);
+    var data = new FormData($form[0]);
     var file = $('input[name=data_file]')[0].files[0]
     data.append('file', file)
 
@@ -57,81 +57,84 @@ $('form[name=form-upload-questions]').submit(function(event) {
         processData: false,
         contentType: false,
         success: function(response) {
-            window.location.reload()
+            window.location.reload();
         },
         error: function(response) {
-            error_response(response)
+            error_response(response);
         }
-    })
+    });
 
-    event.preventDefault()
-})
+    event.preventDefault();
+});
 
 // Edit and Delete Test Button Handlers
 $('.test-action').click(function(event) {
     
-    let id = $(this).data('id')
-    let action = $(this).data('action')
+    let _id = $(this).data('_id');
+    let action = $(this).data('action');
 
-    if (action == 'delete' || action == 'start' || action == 'end') {
+    if (action == 'delete') {
         $.ajax({
-            url: `/admin/tests/edit/`,
+            url: `/admin/tests/delete/`,
             type: 'POST',
-            data: JSON.stringify({'id': id, 'action': action}),
+            data: JSON.stringify({'_id': _id}),
             contentType: 'application/json',
             success: function(response) {
-                window.location.href = '/admin/tests/'
+                window.location.href = '/admin/tests/';
             },
             error: function(response){
-                error_response(response)
+                error_response(response);
             },
-        })
+        });
     } else if (action == 'edit') {
-        window.location.href = `/admin/test/${id}/`
+        window.location.href = `/admin/test/${_id}/`
+    } else if (action == 'close'){
+        $.ajax({
+            url: `/admin/tests/close/`,
+            type: 'POST',
+            data: JSON.stringify({'_id': _id}),
+            contentType: 'application/json',
+            success: function(response) {
+                $(window).scrollTop(0);
+                window.location.reload();
+            },
+            error: function(response){
+                error_response(response);
+            },
+        });
     }
 
-    event.preventDefault()
-})
+    event.preventDefault();
+});
 
 // Edit Dataset Button Handlers
 $('.edit-question-dataset').click(function(event) {
     
-    var id = $(this).data('id')
-    var action = $(this).data('action')
-    var disabled = $(this).hasClass('disabled')
+    var filename = $(this).data('filename');
+    var action = $(this).data('action');
+    var disabled = $(this).hasClass('disabled');
 
     if ( !disabled ) {
-        if (action == 'delete') {
-            $.ajax({
-                url: `/admin/settings/questions/${action}/`,
-                type: 'POST',
-                data: JSON.stringify({
-                    'id': id,
-                    'action': action,
-                }),
-                contentType: 'application/json',
-                success: function(response) {
-                    window.location.reload()
-                },
-                error: function(response){
-                    error_response(response)
-                },
-            })
-        } else if (action == 'edit') {
-            window.location.href = `/admin/editor/${id}/`
-        } else if (action == 'view') {
-            window.location.href = `/admin/view/${id}`
-        } else if (action == 'download') {
-            window.location.href = `/admin/settings/questions/download/${id}/`
-        }
-    }
-    event.preventDefault()
-})
+        $.ajax({
+            url: `/admin/settings/questions/${action}/`,
+            type: 'POST',
+            data: JSON.stringify({'filename': filename}),
+            contentType: 'application/json',
+            success: function(response) {
+                window.location.reload();
+            },
+            error: function(response){
+                error_response(response);
+            },
+        });
+    };
+    event.preventDefault();
+});
 
 function error_response(response) {
 
-    const $alert = $("#alert-box")
-    $alert.html('')
+    const $alert = $("#alert-box");
+    $alert.html('');
 
     if (typeof response.responseJSON.error === 'string' || response.responseJSON.error instanceof String) {
         $alert.html(`
@@ -140,18 +143,18 @@ function error_response(response) {
             ${response.responseJSON.error}
             <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
         </div>
-        `)
+        `);
     } else if (response.responseJSON.error instanceof Array) {
         var output = ''
-        for (let i = 0; i < response.responseJSON.error.length; i ++) {
+        for (var i = 0; i < response.responseJSON.error.length; i ++) {
             output += `
             <div class="alert alert-danger alert-dismissible fade show" role="alert">
                 <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
                 ${response.responseJSON.error[i]}
                 <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
             </div>
-            `
-            $alert.html(output)
+            `;
+            $alert.html(output);
         }
     }
 
@@ -163,68 +166,68 @@ $('#dismiss-cookie-alert').click(function(event){
 
     $.ajax({
         url: '/cookies/',
-        type: 'POST',
+        type: 'GET',
         data: {
             time: Date.now()
         },
         dataType: 'json',
         success: function(response){
-            console.log(response)
+            console.log(response);
         },
         error: function(response){
-            console.log(response)
+            console.log(response);
         }
     })
 
-    event.preventDefault()
+    event.preventDefault();
 })
 
 // Script for Result Actions
 $('.result-action-buttons').click(function(event){
 
-    var id = $(this).data('id')
+    var _id = $(this).data('_id');
 
     if ($(this).data('result-action') == 'generate') {
         $.ajax({
             url: '/admin/certificate/',
             type: 'POST',
-            data: JSON.stringify({'id': id}),
+            data: JSON.stringify({'_id': _id}),
             contentType: 'application/json',
             dataType: 'html',
             success: function(response) {
-                var display_window = window.open()
-                display_window.document.write(response)
+                var display_window = window.open();
+                display_window.document.write(response);
             },
             error: function(response){
-                error_response(response)
+                error_response(response);
             },
-        })
+        });
     } else {
         var action = $(this).data('result-action')
         $.ajax({
             url: window.location.href,
             type: 'POST',
-            data: JSON.stringify({'id': id, 'action': action}),
+            data: JSON.stringify({'_id': _id, 'action': action}),
             contentType: 'application/json',
             success: function(response) {
                 if (action == 'delete') {
-                    window.location.href = '/admin/results/'
-                } else window.location.reload()
+                    window.location.href = '/admin/results/';
+                } else window.location.reload();
             },
             error: function(response){
-                error_response(response)
+                error_response(response);
             },
-        })
+        });
     }
 
-    event.preventDefault()
-})
+    event.preventDefault();
+});
 
 // Script for Deleting Time Adjustment
 $('.adjustment-delete').click(function(event){
 
-    var user_code = $(this).data('user_code')
-    var location = window.location.href
+    var user_code = $(this).data('user_code');
+    var location = window.location.href;
     location = location.replace('#', '')
 
     $.ajax({
@@ -233,19 +236,12 @@ $('.adjustment-delete').click(function(event){
         data: JSON.stringify({'user_code': user_code}),
         contentType: 'application/json',
         success: function(response) {
-            window.location.reload()
+            window.location.reload();
         },
         error: function(response){
-            error_response(response)
+            error_response(response);
         },
-    })
+    });
     
-    event.preventDefault()
-})
-
-// Detailed Results view questions
-$('.view-full-questions').click(function(event) {
-    var dataset = $(this).data('dataset')
-    window.open(`/admin/view/${dataset}`, '_blank')
-    event.preventDefault()
-})
+    event.preventDefault();
+});

ref-test/admin/templates/admin/auth/account.html

@@ -2,7 +2,7 @@
 
 {% block content %}
     <div class="form-container">
-        <form name="form-update-account" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin._home') }}">
+        <form name="form-update-account" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin_views.home') }}">
             {% include "admin/components/server-alerts.html" %}
             <h2 class="form-heading">Update Your Account</h2>
             {{ form.hidden_tag() }}
@@ -32,7 +32,7 @@
             <div class="container form-submission-button">
                 <div class="row">
                     <div class="col text-center">
-                        <a href="{{ url_for('admin._users') }}" class="btn btn-md btn-danger btn-block" type="button">
+                        <a href="{{ url_for('admin_views.users') }}" class="btn btn-md btn-danger btn-block" type="button">
                             <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16">
                                 <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
                             </svg>

ref-test/admin/templates/admin/auth/login.html

@@ -2,7 +2,7 @@
 
 {% block content %}
     <div class="form-container">
-        <form name="form-login" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ next or url_for('admin._home') }}">
+        <form name="form-login" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin_views.home') }}">
             {% include "admin/components/server-alerts.html" %}
             <h2 class="form">Log In</h2>
             {{ form.hidden_tag() }}
@@ -26,7 +26,7 @@
                     </div>
                 </div>
             </div>
-            <a href="{{ url_for('admin._reset') }}" class="signin-forgot-password">Reset Password</a>
+            <a href="{{ url_for('admin_auth.reset') }}" class="signin-forgot-password">Reset Password</a>
         </form>
     </div>
 {% endblock %}

ref-test/admin/templates/admin/auth/register.html

@@ -3,14 +3,14 @@
 {% block navbar %}
     <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark">
         <div class="container">
-            <a href="{{ url_for('admin._home') }}" class="navbar-brand mb-0 h1">RefTest | Admin</a>
+            <a href="{{ url_for('admin_views.home') }}" class="navbar-brand mb-0 h1">RefTest | Admin</a>
         </div>
 </nav>
 {% endblock %}
 
 {% block content %}
     <div class="form-container">
-        <form name="form-register" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin._login') }}">
+        <form name="form-register" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin_auth.login') }}">
             {% include "admin/components/server-alerts.html" %}
             <h2 class="form-heading">Register an Account</h2>
                 {{ form.hidden_tag() }}

ref-test/admin/templates/admin/auth/reset.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 <div class="form-container">
-    <form name="form-reset" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin._login') }}">
+    <form name="form-reset" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin_auth.login') }}">
         {% include "admin/components/server-alerts.html" %}
         <h2 class="form-heading">Reset Password</h2>
         {{ form.hidden_tag() }}

ref-test/admin/templates/admin/auth/update-password.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 <div class="form-container">
-    <form name="form-update-password" class="form-display form-post" action="{{ url_for('admin._update_password', **request.view_args) }}" data-rel-success="{{ url_for('admin._login') }}">
+    <form name="form-update-password" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin_auth.login') }}">
         {% include "admin/components/server-alerts.html" %}
         <h2 class="form-heading">Update Password</h2>
         {{ form.hidden_tag() }}

ref-test/admin/templates/admin/components/base.html

@@ -45,9 +45,6 @@
             integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4="
             crossorigin="anonymous">
         </script>
-        <script>
-            window.jQuery || document.write(`<script src="{{ url_for('.static', filename='js/jquery-3.6.0.min.js') }}"><\/script>`)
-        </script>
         <script
             src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js"
             integrity="sha384-7+zCNj/IqJ95wo16oMtfsKbZ9ccEh31eOz1HGyDuCQ6wgnyJNSYdrPa03rtR1zdB"

ref-test/admin/templates/admin/components/certificate.html

@@ -15,30 +15,30 @@
                             <h5 class="mb-1">Candidate</h5>
                         </div>
                         <h2>
-                            {{ entry.get_surname()}}, {{ entry.get_first_name() }}
+                            {{ entry.name.surname}}, {{ entry.name.first_name }}
                         </h2>
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Email Address</h5>
                         </div>
-                        {{ entry.get_email() }}
+                        {{ entry.email }}
                     </li>
-                    {% if entry.get_club() %}
+                    {% if entry['club'] %}
                         <li class="list-group-item list-group-item-action">
                             <div class="d-flex w-100 justify-content-between">
                                 <h5 class="mb-1">Club</h5>
                             </div>
-                            {{ entry.get_club() }}
+                            {{ entry.club }}
                         </li>
                     {% endif %}
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Exam Code</h5>
                         </div>
-                        {{ entry.test.get_code() }}
+                        {{ '—'.join([entry.test_code[:4], entry.test_code[4:8], entry.test_code[8:]]) }}
                     </li>
-                    {% if entry.user_code %}
+                    {% if entry['user_code'] %}
                         <li class="list-group-item list-group-item-action">
                             <div class="d-flex w-100 justify-content-between">
                                 <h5 class="mb-1">User Code</h5>
@@ -50,7 +50,7 @@
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Start Time</h5>
                         </div>
-                        {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') if entry.start_time else None }}
+                        {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
@@ -59,19 +59,19 @@
                                 <span class="badge bg-danger">Late</span>
                             {% endif %}
                         </div>
-                        {{ entry.end_time.strftime('%d %b %Y %H:%M:%S') if entry.end_time else None }}
+                        {{ entry.submission_time.strftime('%d %b %Y %H:%M:%S') }}
                     </li>       
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Score</h5>
                         </div>
-                        {{ entry.result.score }}&percnt;
+                        {{ entry.results.score }}&percnt;
                     </li>
-                    <li class="list-group-item list-group-item-action {% if entry.result.grade == 'fail' %}list-group-item-danger {% elif entry.result.grade == 'merit' %} list-group-item-success {% endif %}">
+                    <li class="list-group-item list-group-item-action {% if entry.results.grade == 'fail' %}list-group-item-danger {% elif entry.results.grade == 'merit' %} list-group-item-success {% endif %}">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Grade</h5>
                         </div>
-                        {{ entry.result.grade[0]|upper }}{{ entry.result.grade[1:]}}
+                        {{ entry.results.grade[0]|upper }}{{ entry.results.grade[1:]}}
                     </li>
                 </ul>
                 <div class="site-footer mt-5">

ref-test/admin/templates/admin/components/footer.html

@@ -0,0 +1,2 @@
+<p>This web app was developed by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
+<p>All questions in the test are &copy; The Scottish Korfball Association {{ now.year }}. All rights are reserved.</p>

ref-test/admin/templates/admin/components/navbar.html

@@ -0,0 +1,79 @@
+<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <a href="{{ url_for('admin_views.home') }}" class="navbar-brand mb-0 h1">RefTest (Beta) | Admin</a>
+        <button
+            class="navbar-toggler"
+            type="button"
+            data-bs-toggle="collapse"
+            data-bs-target="#navbar"
+            aria-controls="navbar"
+            aria-expanded="false"
+            aria-label="Toggle Navigation"
+        >
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse justify-content-end" id="navbar">
+            <ul class="navbar-nav">
+                {% if not check_login() %}
+                    <li class="nav-item" id="nav-login">
+                        <a href="{{ url_for('admin_auth.login') }}" id="link-login" class="nav-link">Log In</a>
+                    </li>
+                {% endif %}
+                {% if check_login() %}
+                    <li class="nav-item" id="nav-results">
+                        <a href="{{ url_for('results._results') }}" id="link-results" class="nav-link">View Results</a>
+                    </li>
+                    <li class="nav-item" id="nav-tests">
+                        <a href="{{ url_for('admin_views.tests') }}" id="link-tests" class="nav-link">Manage Exams</a>
+                    </li>
+                    <li class="nav-item dropdown" id="nav-settings">
+                        <a
+                            class="nav-link dropdown-toggle"
+                            id="dropdown-account"
+                            role="button"
+                            href="{{ url_for('admin_views.settings') }}"
+                            data-bs-toggle="dropdown"
+                            aria-expanded="false"
+                        >
+                            Settings
+                        </a>
+                        <ul
+                            class="dropdown-menu"
+                            aria-labelledby="dropdown-account"
+                        >
+                            <li>
+                                <a href="{{ url_for('admin_views.users') }}" id="link-users" class="dropdown-item">Users</a>
+                            </li>
+                            <li>
+                                <a href="{{ url_for('admin_views.questions') }}" id="link-questions" class="dropdown-item">Question Datasets</a>
+                            </li>
+                        </ul>
+                    </li>
+                    <li class="nav-item dropdown" id="nav-account">
+                        <a
+                            class="nav-link dropdown-toggle"
+                            id="dropdown-account"
+                            role="button"
+                            href="{{ url_for('admin_auth.account') }}"
+                            data-bs-toggle="dropdown"
+                            aria-expanded="false"
+                        >
+                            Account
+                        </a>
+                        <ul
+                            class="dropdown-menu"
+                            aria-labelledby="dropdown-account"
+                        >
+                            <li>
+                                <a href="{{ url_for('admin_auth.account') }}" id="link-account" class="dropdown-item">Account Settings</a>
+                            </li>
+                            <li>
+                                <a href="{{ url_for('admin_auth.logout') }}" id="link-logout" class="dropdown-item">Log Out</a>
+                            </li>
+                        </ul>
+                    </li>
+                {% endif %}
+            </ul>
+        </div>
+    </div>
+</nav>

ref-test/admin/templates/admin/components/og-meta.html

@@ -2,17 +2,16 @@
 <meta property="og:locale" content="en_UK" />
 <meta property="og:type" content="website" />
 <meta property="og:description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta property="og:url" content="{{ url_for(request.endpoint, _external = True, **(request.view_args or {})) }}" />
+<meta property="og:url" content="{{ url_for(request.endpoint, _external = True, **request.view_args) }}" />
 <meta property="og:site_name" content="Scottish Korfball Association Referee Theory Exam" />
-<meta property="og:image" content="{{ url_for('.static', filename='favicon.png', _external = True) }}" />
+<meta property="og:image" content="{{ url_for('static', filename='favicon.png', _external = True) }}" />
 <meta property="og:image:alt" content="Logo of the SKA Refereeing Exam App" />
 <meta property="og:image:width" content="512" />
 <meta property="og:image:height" content="512" />
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta name="twitter:image" content="{{ url_for('.static', filename='favicon.png', _external = True) }}" />
+<meta name="twitter:image" content="{{ url_for('static', filename='favicon.png', _external = True) }}" />
 <meta name="twitter:image:alt" content="Logo of the SKA Refereeing Exam App" />
 <meta name="twitter:creator" content="@viveksantayana" />
 <meta name="twitter:site" content="@viveksantayana" />
-<meta name="theme-color" content="#343a40" />
-<link rel="shortcut icon" href="{{ url_for('.static', filename='favicon.ico') }}">
+<meta name="theme-color" content="#343a40" />

ref-test/admin/templates/admin/components/secondary-navs/tests.html

@@ -0,0 +1,23 @@
+<div class="navbar navbar-expand-sm navbar-light bg-light">
+    <div class="container-fluid">
+    <div class="expand navbar-expand justify-content-center" id="navbar_secondary">
+        <ul class="nav">
+            <li class="nav-item">
+                <a class="nav-link" href="{{ url_for('admin_views.tests', filter='active') }}">Active</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="{{ url_for('admin_views.tests', filter='scheduled') }}">Scheduled</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="{{ url_for('admin_views.tests', filter='expired') }}">Expired</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="{{ url_for('admin_views.tests', filter='all') }}">All</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="{{ url_for('admin_views.tests', filter='create') }}">Create</a>
+            </li>
+        </ul>
+    </div>
+    </div>
+</div>

ref-test/admin/templates/admin/components/server-alerts.html

@@ -25,9 +25,7 @@
                     <div class="alert alert-primary alert-dismissible fade show" id="cookie-alert" role="alert">
                         <i class="bi bi-info-circle-fill" title="Cookie Alert" aria-title="Cookie Alert"></i>
                         {{ message|safe }}
-                        <div class="d-flex justify-content-center w-100">
-                            <button type="button" id="dismiss-cookie-alert" class="btn btn-success" data-bs-dismiss="alert" aria-label="Close">Accept</button>
-                        </div>
+                        <button type="button" id="dismiss-cookie-alert" class="btn btn-success" data-bs-dismiss="alert" aria-label="Close">Accept</button>
                     </div>
                     {% set cookie_flash_flag.value = True %}
                 {% endif %}

ref-test/admin/templates/admin/index.html

@@ -25,22 +25,22 @@
                                         {% for test in current_tests %}
                                             <tr>
                                                 <td>
-                                                    <a href="{{ url_for('admin._view_test', id=test.id) }}">{{ test.get_code() }}</a>
+                                                    <a href="{{ url_for('admin_views.view_test', _id=test._id) }}">{{ '—'.join([test.test_code[:4], test.test_code[4:8], test.test_code[8:]]) }}</a>
                                                 </td>
                                                 <td>
-                                                    {{ test.end_date.strftime('%d %b %Y') if test.end_date else None }}
+                                                    {{ test.expiry_date.strftime('%d %b %Y') }}
                                                 </td>
                                             </tr>
                                         {% endfor %}
                                     </tbody>
                                 </table>
                             </div>
-                            <a href="{{ url_for('admin._tests', filter='active') }}" class="btn btn-primary">View Exams</a>
+                            <a href="{{ url_for('admin_views.tests', filter='active') }}" class="btn btn-primary">View Exams</a>
                         {% else %}
                             <div class="alert alert-primary">
                                 There are currently no active exams.
                             </div>
-                            <a href="{{ url_for('admin._tests', filter='create') }}" class="btn btn-primary">Create Exam</a>
+                            <a href="{{ url_for('admin_views.tests', filter='create') }}" class="btn btn-primary">Create Exam</a>
                         {% endif %}
                     </div>
                   </div>
@@ -69,24 +69,20 @@
                                         {% for result in recent_results %}
                                             <tr>
                                                 <td>
-                                                    <a href="{{ url_for('admin._view_entry', id=result.id) }}">{{ result.get_surname() }}, {{ result.get_first_name() }}</a>
+                                                    <a href="{{ url_for('admin_views.view_entry', _id=result._id) }}">{{ result.name.surname }}, {{ result.name.first_name }}</a>
                                                 </td>
                                                 <td>
-                                                    {{ result.end_time.strftime('%d %b %Y %H:%M') if result.end_time else None }}
+                                                    {{ result.submission_time.strftime('%d %b %Y %H:%M') }}
                                                 </td>
                                                 <td>
-                                                    {% if result.result %}
-                                                        {{ (100*result.result['score']/result.result['max'])|round|int }}&percnt; ({{ result.result.grade }})
-                                                    {% else %}
-                                                        Incomplete
-                                                    {% endif %}
+                                                    {{ result.percent }}&percnt; ({{ result.results.grade }})
                                                 </td>
                                             </tr>
                                         {% endfor %}
                                     </tbody>
                                 </table>
                             </div>
-                            <a href="{{ url_for('admin._view_entries') }}" class="btn btn-primary">View Results</a>
+                            <a href="{{ url_for('admin_views.view_entries') }}" class="btn btn-primary">View Results</a>
                         {% else %}
                             <div class="alert alert-primary">
                                 There are currently no exam results to preview.
@@ -118,22 +114,22 @@
                                             {% for test in upcoming_tests %}
                                                 <tr>
                                                     <td>
-                                                        <a href="{{ url_for('admin._view_test', id=test.id) }}">{{ test.get_code() }}</a>
+                                                        <a href="{{ url_for('admin_views.view_test', _id=test._id) }}">{{ '—'.join([test.test_code[:4], test.test_code[4:8], test.test_code[8:]]) }}</a>
                                                     </td>
                                                     <td>
-                                                        {{ test.end_date.strftime('%d %b %Y') if test.end_date else None }}
+                                                        {{ test.expiry_date.strftime('%d %b %Y') }}
                                                     </td>
                                                 </tr>
                                             {% endfor %}
                                         </tbody>
                                     </table>
                                 </div>
-                                <a href="{{ url_for('admin._tests', filter='scheduled') }}" class="btn btn-primary">View Exams</a>
+                                <a href="{{ url_for('admin_views.tests', filter='scheduled') }}" class="btn btn-primary">View Exams</a>
                             {% else %}
                                 <div class="alert alert-primary">
                                     There are currently no upcoming exams.
                                 </div>
-                                <a href="{{ url_for('admin._tests', filter='create') }}" class="btn btn-primary">Create Exam</a>
+                                <a href="{{ url_for('admin_views.tests', filter='create') }}" class="btn btn-primary">Create Exam</a>
                             {% endif %}
                     </div>
                   </div>
@@ -142,7 +138,7 @@
                 <div class="card m-3">
                     <div class="card-body">
                         <h5 class="card-title">Help</h5>
-                        <p class="card-text">This web app was developed and is maintained by Vivek Santayana. If there are any issues with the app, any bugs you need to report, or any features you would like to request, please feel free to <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test/issues">open an issue at the Git Repository</a>.</p>
+                        <p class="card-text">This web app was developed by Vivek Santayana. If there are any issues with the app, any bugs you need to report, or any features you would like to request, please feel free to <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test/issues">open an issue at the Git Repository</a>.</p>
                         <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test/issues" class="btn btn-primary">Open an Issue</a>
                     </div>
                   </div>

ref-test/admin/templates/admin/result-detail.html

@@ -13,30 +13,30 @@
                             <h5 class="mb-1">Candidate</h5>
                         </div>
                         <h2>
-                            {{ entry.get_surname() }}, {{ entry.get_first_name() }}
+                            {{ entry.name.surname }}, {{ entry.name.first_name }}
                         </h2>
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Email Address</h5>
                         </div>
-                        {{ entry.get_email() }}
+                        {{ entry.email }}
                     </li>
-                    {% if entry.get_club() %}
+                    {% if entry['club'] %}
                         <li class="list-group-item list-group-item-action">
                             <div class="d-flex w-100 justify-content-between">
                                 <h5 class="mb-1">Club</h5>
                             </div>
-                            {{ entry.get_club() }}
+                            {{ entry.club }}
                         </li>
                     {% endif %}
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Exam Code</h5>
                         </div>
-                        {{ entry.test.get_code() }}
+                        {{ '—'.join([entry.test_code[:4], entry.test_code[4:8], entry.test_code[8:]]) }}
                     </li>
-                    {% if entry.user_code %}
+                    {% if entry['user_code'] %}
                         <li class="list-group-item list-group-item-action">
                             <div class="d-flex w-100 justify-content-between">
                                 <h5 class="mb-1">User Code</h5>
@@ -44,14 +44,12 @@
                             {{ entry.user_code }}
                         </li>
                     {% endif %}
-                    {% if entry.start_time %}
-                        <li class="list-group-item list-group-item-action">
-                            <div class="d-flex w-100 justify-content-between">
-                                <h5 class="mb-1">Start Time</h5>
-                            </div>
-                            {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') if entry.start_time else None }}
-                        </li>
-                    {% endif %}
+                    <li class="list-group-item list-group-item-action">
+                        <div class="d-flex w-100 justify-content-between">
+                            <h5 class="mb-1">Start Time</h5>
+                        </div>
+                        {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') }}
+                    </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Submission Time</h5>
@@ -59,28 +57,28 @@
                                 <span class="badge bg-danger">Late</span>
                             {% endif %}
                         </div>
-                        {% if entry.end_time %}
-                            {{ entry.end_time.strftime('%d %b %Y %H:%M:%S') }}
+                        {% if 'submission_time' in entry %}
+                            {{ entry.submission_time.strftime('%d %b %Y %H:%M:%S') }}
                         {% else %}
                             Incomplete
                         {% endif %}
                     </li>
-                    {% if entry.result %}
+                    {% if 'results' in entry %}
                         <li class="list-group-item list-group-item-action">
                             <div class="d-flex w-100 justify-content-between">
                                 <h5 class="mb-1">Score</h5>
                             </div>
-                            {{ entry.result.score }}&percnt;
+                            {{ entry.results.score }}&percnt;
                         </li>
-                        <li class="list-group-item list-group-item-action {% if entry.result.grade == 'fail' %}list-group-item-danger {% elif entry.result.grade == 'merit' %} list-group-item-success {% endif %}">
+                        <li class="list-group-item list-group-item-action {% if entry.results.grade == 'fail' %}list-group-item-danger {% elif entry.results.grade == 'merit' %} list-group-item-success {% endif %}">
                             <div class="d-flex w-100 justify-content-between">
                                 <h5 class="mb-1">Grade</h5>
                             </div>
-                            {{ entry.result.grade[0]|upper }}{{ entry.result.grade[1:]}}
+                            {{ entry.results.grade[0]|upper }}{{ entry.results.grade[1:]}}
                         </li>
                     {% endif %}
                 </ul>
-                {% if entry.result %}
+                {% if 'results' in entry %}
                     <div class="accordion" id="results-breakdown">
                         <div class="accordion-item">
                             <h2 class="accordion-header" id="by-category">
@@ -105,7 +103,7 @@
                                             </tr>
                                         </thead>
                                         <tbody>
-                                            {% for tag, scores in entry.result.tags.items() %}
+                                            {% for tag, scores in entry.results.tags.items() %}
                                                 <tr>
                                                     <td>
                                                         {{ tag }}
@@ -114,7 +112,7 @@
                                                         {{ scores.scored }}
                                                     </td>
                                                     <td>
-                                                        {{ scores.max }}
+                                                        {{scores.max}}
                                                     </td>
                                                 </tr>
                                             {% endfor %}
@@ -131,7 +129,6 @@
                             </h2>
                         <div id="by-question-breakdown" class="accordion-collapse collapse" aria-labelledby="by-question" data-bs-parent="#results-breakdown">
                             <div class="accordion-body">
-                                <a class="view-full-questions" data-dataset="{{ entry.test.dataset.id }}">View Questions</a>
                                 <table class="table table-striped">
                                         <thead>
                                             <tr>
@@ -147,11 +144,11 @@
                                             {% for question, answer in entry.answers.items() %}
                                                 <tr>
                                                     <td>
-                                                        {{ question|int + 1 }}
+                                                        {{ question }}
                                                     </td>
                                                     <td>
-                                                        {{ answers[question|int][answer|int] }}
-                                                        {% if not correct[question] == answer|int %}
+                                                        {{ answer }}
+                                                        {% if not correct[question] == answer %}
                                                             <span class="badge badge-pill bg-danger badge-danger">Incorrect</span>
                                                         {% endif %}
                                                     </td>
@@ -165,19 +162,19 @@
                 {% endif %}
                 <div class="container justify-content-center">
                     <div class="row">
-                        <a href="#" class="btn btn-primary result-action-buttons" data-result-action="generate" data-id="{{ entry.id }}">
+                        <a href="#" class="btn btn-primary result-action-buttons" data-result-action="generate" data-_id="{{ entry._id }}">
                             <i class="bi bi-printer-fill button-icon"></i>
                             Printable Version
                         </a>
                     </div>
                     <div class="row">
                             {% if entry.status == 'late' %}
-                                <a href="#" class="btn btn-warning result-action-buttons" data-result-action="override" data-id="{{ entry.id }}">
+                                <a href="#" class="btn btn-warning result-action-buttons" data-result-action="override" data-_id="{{ entry._id }}">
                                     <i class="bi bi-clock-history button-icon"></i>
                                     Allow Late Entry
                                 </a>
                             {% endif %}
-                        <a href="#" class="btn btn-danger result-action-buttons" data-result-action="delete" data-id="{{ entry.id }}">
+                        <a href="#" class="btn btn-danger result-action-buttons" data-result-action="delete" data-_id="{{ entry._id }}">
                             <i class="bi bi-trash-fill button-icon"></i>
                             Delete Result
                         </a>

ref-test/admin/templates/admin/results.html

@@ -37,41 +37,41 @@
                 {% for entry in entries %}
                     <tr class="table-row">
                         <td>
-                            {{ entry.get_surname() }}, {{ entry.get_first_name() }}
+                            {{ entry.name.surname }}, {{ entry.name.first_name }}
                         </td>
                         <td>
-                            {% if entry.get_club() %}
-                                {{ entry.get_club() }}
+                            {% if 'club' in entry %}
+                                {{ entry.club }}
                             {% endif %}
                         </td>
                         <td>
-                            {{ entry.test.get_code() }}
+                            {{ '—'.join([entry.test_code[:4], entry.test_code[4:8], entry.test_code[8:]]) }}
                         </td>
                         <td>
-                            {% if entry.status %}
+                            {% if 'status' in entry %}
                                 {{ entry.status }}
                             {% endif %}
                         </td>
                         <td>
-                            {% if entry.end_time %}
-                                {{ entry.end_time.strftime('%d %b %Y') }}
+                            {% if 'submission_time' in entry %}
+                                {{ entry.submission_time.strftime('%d %b %Y') }}
                             {% endif %}
                         </td>
                         <td>
-                            {% if entry.result %}
-                                {{ entry.result.score }}&percnt;
+                            {% if 'results' in entry %}
+                                {{ entry.results.score }}&percnt;
                             {% endif %}
                         </td>
                         <td>
-                            {% if entry.result %}
-                                {{ entry.result.grade }}
+                            {% if 'results' in entry %}
+                                {{ entry.results.grade }}
                             {% endif %}
                         </td>
                         <td class="row-actions">
                             <a
-                                href="{{ url_for('admin._view_entry', id = entry.id ) }}"
+                                href="{{ url_for('admin_views.view_entry', _id = entry._id ) }}"
                                 class="btn btn-primary entry-details"
-                                data-id="{{entry.id}}"
+                                data-_id="{{entry._id}}"
                                 title="View Details"
                             >
                                 <i class="bi bi-file-medical-fill button-icon"></i>

ref-test/admin/templates/admin/settings/delete-user.html

@@ -2,11 +2,11 @@
 
 {% block content %}
     <div class="form-container">
-        <form name="form-delete-user" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin._users') }}">
+        <form name="form-delete-user" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin_views.users') }}">
             {% include "admin/components/server-alerts.html" %}
-            <h2 class="form-heading">Delete User &lsquo;{{ user.get_username() }}&rsquo;?</h2>
+            <h2 class="form-heading">Delete User &lsquo;{{ user.username }}&rsquo;?</h2>
             {{ form.hidden_tag() }}
-            <p>This action cannot be undone. Deleting an account will mean {{ user.get_username() }} will no longer be able to log in to the admin console.</p>
+            <p>This action cannot be undone. Deleting an account will mean {{ user.username }} will no longer be able to log in to the admin console.</p>
             <p>Are you sure you want to proceed?</p>
             <div class="form-label-group">
                 {{ form.password(class_="form-control", placeholder="Confirm Your Password", autofocus=true) }}
@@ -20,7 +20,7 @@
             <div class="container form-submission-button">
                 <div class="row">
                     <div class="col text-center">
-                        <a href="{{ url_for('admin._users') }}" autofocus="true" class="btn btn-md btn-primary btn-block" type="button">
+                        <a href="{{ url_for('admin_views.users') }}" autofocus="true" class="btn btn-md btn-primary btn-block" type="button">
                             <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16">
                                 <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
                             </svg>

ref-test/admin/templates/admin/settings/index.html

@@ -28,22 +28,22 @@
                                         <tr>
                                             <td>
                                                 <a href="
-                                                {% if user == current_user %}
-                                                    {{ url_for('admin._update_user', id=current_user.id) }}
+                                                {% if user._id == get_id_from_cookie() %}
+                                                    {{ url_for('admin_auth.account') }}
                                                 {% else %}
-                                                    {{ url_for('admin._update_user', id=user.id) }}
+                                                    {{ url_for('admin_views.update_user', _id=user._id) }}
                                                 {% endif%}
-                                                ">{{ user.get_username() }}</a>
+                                                ">{{ user.username }}</a>
                                             </td>
                                             <td>
-                                                <a href="mailto:{{ user.get_email() }}">{{ user.get_email() }}</a>
+                                                <a href="mailto:{{ user.email }}">{{ user.email }}</a>
                                             </td>
                                         </tr>
                                     {% endfor %}
                                 </tbody>
                             </table>
                         </div>
-                        <a href="{{ url_for('admin._users') }}" class="btn btn-primary">Manage Users</a>
+                        <a href="{{ url_for('admin_views.users') }}" class="btn btn-primary">Manage Users</a>
                     </div>
                 </div>
             </div>
@@ -57,7 +57,7 @@
                                     <thead>
                                         <tr>
                                             <th>
-                                                Name
+                                                File Name
                                             </th>
                                             <th>
                                                 Exams
@@ -68,24 +68,22 @@
                                         {% for dataset in datasets %}
                                             <tr>
                                                 <td>
-                                                    <a href="{{ url_for('editor._editor_console', id=dataset.id) }}">
-                                                        {{ dataset.get_name() }}
-                                                    </a>
+                                                    {{ dataset.filename }}
                                                 </td>
                                                 <td>
-                                                    {{ dataset.tests|length }}
+                                                    {{ dataset.use }}
                                                 </td>
                                             </tr>
                                         {% endfor %}
                                     </tbody>
                                 </table>
                             </div>
-                            <a href="{{ url_for('admin._questions') }}" class="btn btn-primary">Manage Datasets</a>
+                            <a href="{{ url_for('admin_views.questions') }}" class="btn btn-primary">Manage Datasets</a>
                         {% else %}
                             <div class="alert alert-primary">
                                 There are currently no question datasets uploaded.
                             </div>
-                            <a href="{{ url_for('admin._questions') }}" class="btn btn-primary">Upload Dataset</a>
+                            <a href="{{ url_for('admin_views.questions') }}" class="btn btn-primary">Upload Dataset</a>
                         {% endif %}
                     </div>
                 </div>

ref-test/admin/templates/admin/settings/questions.html

@@ -11,10 +11,10 @@
 
                     </th>
                     <th data-priority="1">
-                        Name
+                        File Name
                     </th>
                     <th data-priority="2">
-                        Updated
+                        Uploaded
                     </th>
                     <th data-priority="3">
                         Author
@@ -31,7 +31,7 @@
                 {% for element in data %}
                     <tr class="table-row">
                         <td>
-                            {% if element.default %}
+                            {% if element.filename == default %}
                                 <div class="text-success" title="Default Dataset">
                                     <svg  xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="bi success bi-caret-right-fill" viewBox="0 0 16 16">
                                         <path d="m12.14 8.753-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z"/>
@@ -40,54 +40,36 @@
                             {% endif %}
                         </td>
                         <td>
-                            {{ element.get_name() }}
+                            {{ element.filename }}
                         </td>
                         <td>
-                            {{ element.date.strftime('%d %b %Y %H:%M') }}
+                            {{ element.timestamp.strftime('%d %b %Y') }}
                         </td>
                         <td>
-                            {{ element.creator.get_username() }}
+                            {{ element.author }}
                         </td>
                         <td>
-                            {{ element.tests|length }}
+                            {{ element.use }}
                         </td>
                         <td class="row-actions">
                             <a
-                                href="javascript:void(0)"
-                                class="btn btn-primary edit-question-dataset"
-                                data-id="{{ element.id }}"
-                                data-action="download"
-                                title="Download Questions"
-                            >
-                                <i class="bi bi-cloud-arrow-down-fill button-icon"></i>
-                            </a>
-                            <a
-                                href="javascript:void(0)"
-                                class="btn btn-primary view-question-dataset"
-                                data-id="{{ element.id }}"
-                                data-action="view"
-                                title="View Questions"
+                                href="#"
+                                class="btn btn-primary edit-question-dataset {% if element.filename == default %}disabled{% endif %}"
+                                data-filename="{{ element.filename }}"
+                                data-action="default"
+                                title="Make Default"
                             >
                                 <i class="bi bi-file-earmark-text-fill button-icon"></i>
-                            </a>
+                            </button>
                             <a
-                                href="javascript:void(0)"
-                                class="btn btn-primary edit-question-dataset"
-                                data-id="{{ element.id }}"
-                                data-action="edit"
-                                title="Edit Questions"
-                            >
-                                <i class="bi bi-pencil-fill button-icon"></i>
-                            </a>
-                            <a
-                                href="javascript:void(0)"
-                                class="btn btn-danger edit-question-dataset {% if element.default %}disabled{% endif %}"
-                                data-id="{{ element.id }}"
+                                href="#"
+                                class="btn btn-danger edit-question-dataset {% if element.filename == default %}disabled{% endif %}"
+                                data-filename="{{ element.filename }}"
                                 data-action="delete"
-                                title="Delete Questions"
+                                title="Delete Dataset"
                             >
                                 <i class="bi bi-file-earmark-excel-fill button-icon"></i>
-                            </a>
+                            </button>
                         </td>
                     </tr>
                 {% endfor %}
@@ -96,23 +78,13 @@
     {% else %}
         <div class="alert alert-primary alert-db-empty">
             <i class="bi bi-info-circle-fill" aria-title="Alert" title="Alert"></i>
-            There are no question datasets uploaded. Please use the panel below to upload a new question dataset or create a new dataset using the editor console.
+            There are no question datasets uploaded. Please use the panel below to upload a new question dataset.
         </div>
     {% endif %}
-    <div class="col text-center">
-        <button title="Create New" class="btn btn-md btn-primary btn-block create-new-dataset">
-            <i class="bi bi-cloud-plus-fill button-icon"></i>
-            Create New Dataset
-        </button>
-    </div>
     <div class="form-container">
         <form name="form-upload-questions" class="form-display" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="" enctype="multipart/form-data">
             <h2 class="form-heading">Upload Question Dataset</h2>
             {{ form.hidden_tag() }}
-            <div class="form-label-group">
-                {{ form.name(class_="form-control", autofocus=true, placeholder="Enter Name of Dataset") }}
-                {{ form.name.label }}
-            </div>
             <div class="form-upload">
                 {{ form.data_file() }}
             </div>
@@ -123,8 +95,8 @@
             <div class="container form-submission-button">
                 <div class="row">
                     <div class="col text-center">
-                        <button title="Upload Dataset" class="btn btn-md btn-success btn-block" type="submit">
-                            <i class="bi bi-cloud-arrow-up-fill button-icon"></i>
+                        <button title="Create User" class="btn btn-md btn-success btn-block" type="submit">
+                            <i class="bi bi-file-earmark-arrow-up-fill button-icon"></i>
                             Upload Dataset
                         </button>
                     </div>
@@ -141,9 +113,9 @@
                 $('#question-datasets-table').DataTable({
                     'columnDefs': [
                         {'sortable': false, 'targets': [0,5]},
-                        {'searchable': false, 'targets': [1,2,3]}
+                        {'searchable': false, 'targets': [0,4,5]}
                     ],
-                    'order': [[1, 'asc'], [2, 'desc'], [3, 'asc']],
+                    'order': [[2, 'desc'], [3, 'asc']],
                     'responsive': 'true',
                     'fixedHeader': 'true',
                 });

ref-test/admin/templates/admin/settings/update-user.html

@@ -2,12 +2,12 @@
 
 {% block content %}
     <div class="form-container">
-        <form name="form-update-user" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin._users') }}">
+        <form name="form-update-user" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for('admin_views.users') }}">
             {% include "admin/components/server-alerts.html" %}
-            <h2 class="form-heading">Update User &lsquo;{{ user.get_username() }}&rsquo;</h2>
+            <h2 class="form-heading">Update User &lsquo;{{ user.username }}&rsquo;</h2>
             {{ form.hidden_tag() }}
             <div class="form-label-group">
-                {{ form.email(class_="form-control", placeholder="Email Address", value = user.get_email()) }}
+                {{ form.email(class_="form-control", placeholder="Email Address", value = user.email) }}
                 {{ form.email.label }}
             </div>
             <div class="form-label-group">
@@ -23,17 +23,17 @@
                 {{ form.notify.label }}
             </div>
             <div class="form-label-group">
-                Please confirm <strong>your current password</strong> before committing any changes to a user account.
+                Please confirm <strong>your password</strong> before committing any changes to a user account.
             </div>
             <div class="form-label-group">
-                {{ form.confirm_password(class_="form-control", placeholder="Your Password", value = user.email) }}
-                {{ form.confirm_password.label }}
+                {{ form.user_password(class_="form-control", placeholder="Your Password", value = user.email) }}
+                {{ form.user_password.label }}
             </div>
             {% include "admin/components/client-alerts.html" %}
             <div class="container form-submission-button">
                 <div class="row">
                     <div class="col text-center">
-                        <a href="{{ url_for('admin._users') }}" class="btn btn-md btn-danger btn-block" type="button">
+                        <a href="{{ url_for('admin_views.users') }}" class="btn btn-md btn-danger btn-block" type="button">
                             <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-x-circle-fill" viewBox="0 0 16 16">
                                 <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
                             </svg>

ref-test/admin/templates/admin/settings/upload-questions.html

@@ -0,0 +1 @@
+{% extends "admin/components/base.html" %}

ref-test/admin/templates/admin/settings/users.html

@@ -23,7 +23,7 @@
             {% for user in users %}
                 <tr class="table-row">
                     <td>
-                        {% if user == current_user %}
+                        {% if user._id == get_id_from_cookie() %}
                             <div class="text-success" title="Current User">
                                 <svg  xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="bi success bi-caret-right-fill" viewBox="0 0 16 16">
                                     <path d="m12.14 8.753-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z"/>
@@ -32,18 +32,18 @@
                         {% endif %}
                     </td>
                     <td>
-                        {{ user.get_username() }}
+                        {{ user.username }}
                     </td>
                     <td>
-                        {{ user.get_email() }}
+                        {{ user.email }}
                     </td>
                     <td class="row-actions">
                         <a
                             href="
-                            {% if not user == current_user %}
-                                {{ url_for('admin._update_user', id = user.id ) }}
+                            {% if not user._id == get_id_from_cookie() %}
+                                {{ url_for('admin_views.update_user', _id = user._id ) }}
                             {% else %}
-                                {{ url_for('admin._update_user', id=current_user.id) }}
+                                {{ url_for('admin_auth.account') }}
                             {% endif %}
                             "
                             class="btn btn-primary"
@@ -53,15 +53,15 @@
                         </a>
                         <a
                             href="
-                            {% if not user == current_user %}
-                                {{ url_for('admin._delete_user', id = user.id ) }}
+                            {% if not user._id == get_id_from_cookie()  %}
+                                {{ url_for('admin_views.delete_user', _id = user._id ) }}
                             {% else %}
                                 #
                             {% endif %}
                             "
-                            class="btn btn-danger {% if user == current_user  %} disabled {% endif %}"
+                            class="btn btn-danger {% if user._id == get_id_from_cookie()  %} disabled {% endif %}"
                             title="Delete User"
-                            {% if user == current_user  %} onclick="return false" {% endif %}
+                            {% if user._id == get_id_from_cookie()  %} onclick="return false" {% endif %}
                         >
                             <i class="bi bi-person-x-fill button-icon"></i>
                         </button>

ref-test/admin/templates/admin/test.html

@@ -12,33 +12,38 @@
                             <h5 class="mb-1">Exam Code</h5>
                         </div>
                         <h2>
-                            {{ test.get_code() }}
+                            {{ '—'.join([test.test_code[:4], test.test_code[4:8], test.test_code[8:]]) }}
                         </h2>
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Dataset</h5>
                         </div>
-                        <a href="{{ url_for('view._view_console', id=test.dataset.id) }}">{{ test.dataset.get_name() }}</a>
+                        {{ test.dataset }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Created By</h5>
                         </div>
-                        {{ test.creator.get_username() }}
+                        {{ test.creator }}
+                    </li>
+                    <li class="list-group-item list-group-item-action">
+                        <div class="d-flex w-100 justify-content-between">
+                            <h5 class="mb-1">Date Created</h5>
+                        </div>
+                        {{ test.date_created.strftime('%d %b %Y') }}
                     </li>
-                    
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Start Date</h5>
                         </div>
-                        {{ test.start_date.strftime('%d %b %Y %H:%M') if test.start_date else None }}
+                        {{ test.start_date.strftime('%d %b %Y') }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Expiry Date</h5>
                         </div>
-                        {{ test.end_date.strftime('%d %b %Y %H:%M') if test.end_date else None }}
+                        {{ test.expiry_date.strftime('%d %b %Y') }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
@@ -57,7 +62,7 @@
                         {% endif %}
                     </li>
                     <div class="accordion" id="test-info-detail">
-                        {% if test.entries|length > 0 %}
+                        {% if 'entries' in test and test.entries|length > 0 %}
                             <div class="accordion-item">
                                 <h2 class="accordion-header" id="test-entries">
                                     <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#test-entries-list" aria-expanded="false" aria-controls="test-entries-list">
@@ -71,7 +76,7 @@
                                                 {% for entry in test.entries %}
                                                     <tr>
                                                         <td>
-                                                            <a href="{{ url_for('admin._view_entry', id=entry.id) }}" >Entry {{ loop.index }}</a>
+                                                            <a href="{{ url_for('admin_views.view_entry', _id=entry) }}" >Entry {{ loop.index }}</a>
                                                         </td>
                                                     </tr>
                                                 {% endfor %}
@@ -81,7 +86,7 @@
                                 </div>
                             </div>
                         {% endif %}
-                        {% if test.adjustments %}
+                        {% if 'time_adjustments' in test and test.time_adjustments|length > 0 %}
                             <div class="accordion-item">
                                 <h2 class="accordion-header" id="test-adjustments">
                                     <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#test-adjustments-list" aria-expanded="false" aria-controls="test-adjustments-list">
@@ -105,10 +110,10 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                                {% for key, value in test.adjustments.items() %}
+                                                {% for key, value in test.time_adjustments.items() %}
                                                     <tr>
                                                         <td>
-                                                            {{ key.upper() }}
+                                                            {{ key }}
                                                         </td>
                                                         <td>
                                                             {{ value }}
@@ -138,7 +143,7 @@
                                         <form name="form-add-adjustment" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="">
                                             {{ form.hidden_tag() }}
                                             <div class="form-label-group">
-                                                {{ form.time(class_="form-control", placeholder="Enter Time") }}
+                                                {{ form.time(class_="form-control", placeholder="Enter Username") }}
                                                 {{ form.time.label }}
                                             </div>
                                             <div class="container form-submission-button">
@@ -163,18 +168,11 @@
                 </div>
                 <div class="container justify-content-center">
                     <div class="row">
-                        {% if test.start_date <= now %}
-                            <a href="#" class="btn btn-warning test-action {% if test.end_date < now %}disabled{% endif %}" data-action="end" data-id="{{ test.id }}">
-                                <i class="bi bi-hourglass-bottom button-icon"></i>
-                                Close Exam
-                            </a>
-                        {% else  %}
-                            <a href="#" class="btn btn-success test-action {% if test.start_date < now %}disabled{% endif %}" data-action="start" data-id="{{ test.id }}">
-                                <i class="bi bi-hourglass-top button-icon"></i>
-                                Start Exam
-                            </a>
-                        {% endif %}
-                        <a href="#" class="btn btn-danger test-action" data-action="delete" data-id="{{ test.id }}">
+                        <a href="#" class="btn btn-warning test-action" data-action="close" data-_id="{{ test._id }}">
+                            <i class="bi bi-hourglass button-icon"></i>
+                            Close Exam
+                        </a>
+                        <a href="#" class="btn btn-danger test-action" data-action="delete" data-_id="{{ test._id }}">
                             <i class="bi bi-file-earmark-excel-fill button-icon"></i>
                             Delete Exam
                         </a>

ref-test/admin/templates/admin/tests.html

@@ -33,13 +33,13 @@
                 {% for test in tests %}
                     <tr class="table-row">
                         <td>
-                            {{ test.start_date.strftime('%d %b %y %H:%M') }}
+                            {{ test.start_date.strftime('%d %b %Y') }}
                         </td>
                         <td>
-                            {{ test.get_code() }}
+                            {{ '—'.join([test.test_code[:4], test.test_code[4:8], test.test_code[8:]]) }}
                         </td>
                         <td>
-                            {{ test.end_date.strftime('%d %b %Y %H:%M') }}
+                            {{ test.expiry_date.strftime('%d %b %Y') }}
                         </td>
                         <td>
                             {% if test.time_limit == None -%}
@@ -61,7 +61,7 @@
                             <a
                                 href="#"
                                 class="btn btn-primary test-action"
-                                data-id="{{test.id}}"
+                                data-_id="{{test._id}}"
                                 title="Edit Exam"
                                 data-action="edit"
                             >
@@ -70,7 +70,7 @@
                             <a
                                 href="#"
                                 class="btn btn-danger test-action"
-                                data-id="{{test.id}}"
+                                data-_id="{{test._id}}"
                                 title="Delete Exam"
                                 data-action="delete"
                             >

ref-test/admin/views.py

@@ -0,0 +1,509 @@
+from flask import Blueprint, render_template, flash, redirect, request, jsonify, abort, session
+from flask.helpers import url_for
+from functools import wraps
+from datetime import datetime, timedelta
+
+import os
+from glob import glob
+from json import loads
+from werkzeug.security import check_password_hash
+from common.security.database import decrypt_find, decrypt_find_one
+from .models.users import User
+from flask_mail import Message
+from uuid import uuid4
+import secrets
+from datetime import datetime, date
+from .models.tests import Test
+from common.data_tools import get_default_dataset, get_time_options, available_datasets, get_datasets, get_correct_answers
+
+views = Blueprint(
+    'admin_views',
+    __name__,
+    template_folder='templates',
+    static_folder='static'
+)
+
+def admin_account_required(function):
+    @wraps(function)
+    def decorated_function(*args, **kwargs):
+        from main import db
+        from main import db
+        if not db.users.find_one({}):
+            flash('No administrator accounts have been registered. Please register an administrator account.', 'alert')
+            return redirect(url_for('admin_auth.register'))
+        return function(*args, **kwargs)
+    return decorated_function
+
+def disable_on_registration(function):
+    @wraps(function)
+    def decorated_function(*args, **kwargs):
+        from main import db
+        if db.users.find_one({}):
+            return abort(404)
+        return function(*args, **kwargs)
+    return decorated_function
+
+def get_id_from_cookie():
+    return request.cookies.get('_id')
+
+def get_user_from_db(_id):
+    from main import db
+    return db.users.find_one({'_id': _id})
+
+def check_login():
+    _id = get_id_from_cookie()
+    return True if get_user_from_db(_id) else False
+
+def login_required(function):
+    @wraps(function)
+    def decorated_function(*args, **kwargs):
+        if not check_login():
+            session['prev_page'] = request.url
+            flash('Please log in to view this page.', 'alert')
+            return redirect(url_for('admin_auth.login'))
+        return function(*args, **kwargs)
+    return decorated_function
+
+def disable_if_logged_in(function):
+    @wraps(function)
+    def decorated_function(*args, **kwargs):
+        if check_login():
+            return abort(404)
+        return function(*args, **kwargs)
+    return decorated_function
+
+@views.route('/')
+@views.route('/home/')
+@views.route('/dashboard/')
+@admin_account_required
+@login_required
+def home():
+    from main import db
+    tests = db.tests.find()
+    results = decrypt_find(db.entries, {})
+    current_tests = [ test for test in tests if test['expiry_date'] >= datetime.utcnow() and test['start_date'].date() <= date.today() ]
+    current_tests.sort(key= lambda x: x['expiry_date'], reverse=True)
+    upcoming_tests = [ test for test in tests if test['start_date'] > datetime.utcnow()]
+    upcoming_tests.sort(key= lambda x: x['start_date'])
+    recent_results = [result for result in results if 'submission_time' in result ]
+    recent_results.sort(key= lambda x: x['submission_time'], reverse=True)
+    for result in recent_results:
+        result['percent'] = round(100*result['results']['score']/result['results']['max'])
+    return render_template('/admin/index.html', current_tests = current_tests[:5], upcomimg_tests = upcoming_tests[:5], recent_results = recent_results[:5])
+
+@views.route('/settings/')
+@admin_account_required
+@login_required
+def settings():
+    from main import db
+    users = decrypt_find(db.users, {})
+    users.sort(key= lambda x: x['username'])
+    datasets = get_datasets()
+    return render_template('/admin/settings/index.html', users=users[:5], datasets=datasets[:5])
+
+@views.route('/settings/users/', methods=['GET','POST'])
+@admin_account_required
+@login_required
+def users():
+    from main import db, mail
+    from .models.forms import CreateUserForm
+    form = CreateUserForm()
+    if request.method == 'GET':
+        users_list = decrypt_find(db.users, {})
+        return render_template('/admin/settings/users.html', users = users_list, form = form)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            entry = User(
+                _id = uuid4().hex,
+                username = request.form.get('username').lower(),
+                email = request.form.get('email'),
+                password = request.form.get('password') if not request.form.get('password') == '' else secrets.token_hex(12),
+            )
+            email = Message(
+                subject = 'RefTest | Registration Confirmation',
+                recipients = [entry.email],
+                body = f"""
+                Hello {entry.username}, \n\n
+                You have been registered as an administrator for the SKA RefTest App!\n\n
+                You can access your account using the username '{entry.username}'.\n\n
+                Your password is as follows:\n\n
+                {entry.password}\n\n
+                You can change your password by logging in to the admin console by copying the following URL into a web browser:\n\n
+                {url_for('admin_views.home', _external = True)}\n\n
+                Have a nice day.
+                """,
+                html = f"""
+                <p>Hello {entry.username},</p>
+                <p>You have been registered as an administrator for the SKA RefTest App!</p>
+                <p>You can access your account using the username '{entry.username}'.</p>
+                <p>Your password is as follows:</p>
+                <strong>{entry.password}</strong>
+                <p>You can change your password by logging in to the admin console at the link below:</p>
+                <p><a href='{url_for('admin_views.home', _external = True)}'>{url_for('admin_views.home', _external = True)}</a></p>
+                <p>Have a nice day.</p>
+                """
+            )
+            mail.send(email)
+            return entry.register()
+        else:
+            errors = [*form.username.errors, *form.email.errors, *form.password.errors]
+            return jsonify({ 'error': errors}), 400
+        
+@views.route('/settings/users/delete/<string:_id>', methods = ['GET', 'POST'])
+@admin_account_required
+@login_required
+def delete_user(_id:str):
+    from main import db, mail
+    if _id == get_id_from_cookie():
+        flash('Cannot delete your own user account.', 'error')
+        return redirect(url_for('admin_views.users'))
+    from .models.forms import DeleteUserForm
+    form = DeleteUserForm()
+    user = decrypt_find_one(db.users, {'_id': _id})
+    if request.method == 'GET':
+        if not user:
+            return abort(404)
+        return render_template('/admin/settings/delete-user.html', form = form, _id = _id, user = user)
+    if request.method == 'POST':
+        if not user:
+            return jsonify({ 'error': 'User does not exist.' }), 404
+        if form.validate_on_submit():
+            _user = decrypt_find_one(db.users, {'_id': get_id_from_cookie()})
+            password = request.form.get('password')
+            if not check_password_hash(_user['password'], password):
+                return jsonify({ 'error': 'The password you entered is incorrect.' }), 401
+            if request.form.get('notify'):
+                email = Message(
+                    subject = 'RefTest | Account Deletion',
+                    recipients = [user['email']],
+                    bcc = [_user['email']],
+                    body = f"""
+                    Hello {user['username']}, \n\n
+                    Your administrator account for the SKA RefTest App has been deleted by {_user['username']}. All data about your account has been deleted.\n\n
+                    If you believe this was done in error, please contact them immediately.\n\n
+                    If you would like to register to administer the app, please ask an existing administrator to create a new account.\n\n
+                    Have a nice day.
+                    """,
+                    html = f"""
+                    <p>Hello {user['username']},</p>
+                    <p>Your administrator account for the SKA RefTest App has been deleted by {_user['username']}. All data about your account has been deleted.</p>
+                    <p>If you believe this was done in error, please contact them immediately.</p>
+                    <p>If you would like to register to administer the app, please ask an existing administrator to create a new account.</p>
+                    <p>Have a nice day.</p>
+                    """
+                )
+                mail.send(email)
+            user = User(
+                _id = user['_id']
+            )
+            return user.delete()
+        else: return abort(400)
+
+@views.route('/settings/users/update/<string:_id>', methods = ['GET', 'POST'])
+@admin_account_required
+@login_required
+def update_user(_id:str):
+    from main import db, mail
+    if _id == get_id_from_cookie():
+        flash('Cannot delete your own user account.', 'error')
+        return redirect(url_for('admin_views.users'))
+    from .models.forms import UpdateUserForm
+    form = UpdateUserForm()
+    user = decrypt_find_one( db.users, {'_id': _id})
+    if request.method == 'GET':
+        if not user:
+            return abort(404)
+        return render_template('/admin/settings/update-user.html', form = form, _id = _id, user = user)
+    if request.method == 'POST':
+        if not user:
+            return jsonify({ 'error': 'User does not exist.' }), 404
+        if form.validate_on_submit():
+            _user = decrypt_find_one(db.users, {'_id': get_id_from_cookie()})
+            password = request.form.get('password')
+            if not check_password_hash(_user['password'], password):
+                return jsonify({ 'error': 'The password you entered is incorrect.' }), 401
+            if request.form.get('notify'):
+                recipient = request.form.get('email') if not request.form.get('email') == '' else user['email']
+                email = Message(
+                    subject = 'RefTest | Account Update',
+                    recipients = [recipient],
+                    bcc = [_user['email']],
+                    body = f"""
+                    Hello {user['username']}, \n\n
+                    Your administrator account for the SKA RefTest App has been updated by {_user['username']}.\n\n
+                    Your new account details are as follows:\n\n
+                    Email: {recipient}\n
+                    Password: {request.form.get('password')}\n\n
+                    You can update your email and password by logging in to the app.\n\n
+                    Have a nice day.
+                    """,
+                    html = f"""
+                    <p>Hello {user['username']},</p>
+                    <p>Your administrator account for the SKA RefTest App has been updated by {_user['username']}.</p>
+                    <p>Your new account details are as follows:</p>
+                    <p>Email: {recipient} <br/>Password: {request.form.get('password')}</p>
+                    <p>You can update your email and password by logging in to the app.</p>
+                    <p>Have a nice day.</p>
+                    """
+                )
+                mail.send(email)
+            entry = User(
+                _id = _id,
+                email = request.form.get('email'),
+                password = request.form.get('password')
+            )
+            return entry.update()
+        else:
+            errors = [*form.user_password.errors, *form.email.errors, *form.password.errors, *form.password_reenter.errors]
+            return jsonify({ 'error': errors}), 400
+
+@views.route('/settings/questions/', methods=['GET', 'POST'])
+@admin_account_required
+@login_required
+def questions():
+    from .models.forms import UploadDataForm
+    from common.data_tools import check_json_format, validate_json_contents, store_data_file
+    form = UploadDataForm()
+    if request.method == 'GET':
+        data = get_datasets()
+        default = get_default_dataset()
+        return render_template('/admin/settings/questions.html', form=form, data=data, default=default)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            upload = form.data_file.data
+            default = True if request.form.get('default') else False
+            if not check_json_format(upload):
+                return jsonify({ 'error': 'Invalid file selected. Please upload a JSON file.'}), 400
+            if not validate_json_contents(upload):
+                return jsonify({'error': 'The data in the file is invalid.'}), 400
+            filename = store_data_file(upload, default=default)
+            flash(f'Dataset {form.data_file.data.filename} has been uploaded as {filename}.', 'success')
+            return jsonify({ 'success': f'Dataset {form.data_file.data.filename} has been uploaded as {filename}.'}), 200
+        errors = [*form.errors]
+        return jsonify({ 'error': errors}), 400
+
+@views.route('/settings/questions/delete/', methods=['POST'])
+@admin_account_required
+@login_required
+def delete_questions():
+    from main import db, app
+    filename = request.get_json()['filename']
+    data_files = glob(os.path.join(app.config["DATA_FILE_DIRECTORY"],'*.json'))
+    if any(filename in file for file in data_files):
+        default = get_default_dataset()
+        if default == filename:
+            return jsonify({'error': 'Cannot delete the default question dataset.'}), 400
+        data_file = os.path.join(app.config["DATA_FILE_DIRECTORY"],filename)
+        with open(data_file, 'r') as _data_file:
+            data = loads(_data_file.read())
+            if data['meta']['tests']:
+                return jsonify({'error': 'Cannot delete a dataset that is in use by an exam.'}), 400
+        if len(data_files) == 1:
+            return jsonify({'error': 'Cannot delete the only question dataset.'}), 400
+        os.remove(data_file)
+        flash(f'Question dataset {filename} has been deleted.', 'success')
+        return jsonify({'success': f'Question dataset {filename} has been deleted.'}), 200
+    return abort(404)
+
+@views.route('/settings/questions/default/', methods=['POST'])
+@admin_account_required
+@login_required
+def make_default_questions():
+    from main import app
+    filename = request.get_json()['filename']
+    data_files = glob(os.path.join(app.config["DATA_FILE_DIRECTORY"],'*.json'))
+    default_file_path = os.path.join(app.config['DATA_FILE_DIRECTORY'], '.default.txt')
+    if any(filename in file for file in data_files):
+        with open(default_file_path, 'r') as default_file:
+            default = default_file.read()
+            if default == filename:
+                return jsonify({'error': 'Cannot delete default question dataset.'}), 400
+        with open(default_file_path, 'w') as default_file:
+            default_file.write(filename)
+        flash(f'Set dataset f{filename} as the default.', 'success')
+        return jsonify({'success': f'Set dataset {filename} as the default.'})
+    return abort(404)
+
+@views.route('/tests/<filter>/', methods=['GET'])
+@views.route('/tests/', methods=['GET'])
+@admin_account_required
+@login_required
+def tests(filter=''):
+    from main import db
+    if not available_datasets():
+        flash('There are no available question datasets. Please upload a question dataset in order to set up an exam.', 'error')
+        return redirect(url_for('admin_views.questions'))
+    if filter not in ['', 'create', 'active', 'scheduled', 'expired', 'all']:
+        return abort(404)
+    if filter == 'create':
+        from .models.forms import CreateTest
+        form = CreateTest()
+        form.time_limit.choices = get_time_options()
+        form.dataset.choices = available_datasets()
+        form.time_limit.default='none'
+        form.dataset.default=get_default_dataset()
+        form.process()
+        display_title = ''
+        error_none = ''
+        return render_template('/admin/tests.html', form = form, display_title=display_title, error_none=error_none, filter=filter)
+    _tests = db.tests.find({})
+    if filter == 'active' or filter == '':
+        tests = [ test for test in _tests if test['expiry_date'] >= datetime.utcnow() and test['start_date'].date() <= date.today() ]
+        display_title = 'Active Exams'
+        error_none = 'There are no exams that are currently active. You can create one using the Creat Exam form.'
+    if filter == 'expired':
+        tests = [ test for test in _tests if test['expiry_date'] < datetime.utcnow()]
+        display_title = 'Expired Exams'
+        error_none = 'There are no expired exams. Exams will appear in this category after their expiration date has passed.'
+    if filter == 'scheduled':
+        tests = [ test for test in _tests if test['start_date'].date() > date.today()]
+        display_title = 'Scheduled Exams'
+        error_none = 'There are no scheduled exams pending. You can schedule an exam for the future using the Create Exam form.'
+    if filter == 'all':
+        tests = _tests
+        display_title = 'All Exams'
+        error_none = 'There are no exams set up. You can create one using the Create Exam form.'
+    return render_template('/admin/tests.html', tests = tests, display_title=display_title, error_none=error_none,  filter=filter)
+
+@views.route('/tests/create/', methods=['POST'])
+@admin_account_required
+@login_required
+def create_test():
+    from main import db
+    from .models.forms import CreateTest
+    form = CreateTest()
+    form.dataset.choices = available_datasets()
+    form.time_limit.choices = get_time_options()
+    if form.validate_on_submit():
+        start_date = request.form.get('start_date')
+        start_date = datetime.strptime(start_date, '%Y-%m-%d')
+        expiry_date = request.form.get('expiry_date')
+        expiry_date = datetime.strptime(expiry_date, '%Y-%m-%d') + timedelta(days= 1) - timedelta(milliseconds = 1)
+        dataset = request.form.get('dataset')
+        errors = []
+        if start_date.date() < date.today():
+            errors.append('The start date cannot be in the past.')
+        if  expiry_date.date() < date.today():
+            errors.append('The expiry date cannot be in the past.')
+        if expiry_date < start_date:
+            errors.append('The expiry date cannot be before the start date.')
+        if errors:
+            return jsonify({'error': errors}), 400
+        creator_id = get_id_from_cookie()
+        creator = decrypt_find_one(db.users, { '_id': creator_id } )['username']
+        test = Test(
+            _id = uuid4().hex,
+            start_date = start_date,
+            expiry_date = expiry_date,
+            time_limit = request.form.get('time_limit'),
+            creator = creator,
+            dataset = dataset
+        )
+        test.create()
+        return jsonify({'success': 'New exam created.'}), 200
+    else:
+        errors = [*form.expiry.errors, *form.time_limit.errors]
+        return jsonify({ 'error': errors}), 400
+
+@views.route('/tests/delete/', methods=['POST'])
+@admin_account_required
+@login_required
+def delete_test():
+    from main import db
+    _id = request.get_json()['_id']
+    if db.tests.find_one({'_id': _id}):
+        return Test(_id = _id).delete()
+    return jsonify({'error': 'Could not find the corresponding test to delete.'}), 404
+
+@views.route('/tests/close/', methods=['POST'])
+@admin_account_required
+@login_required
+def close_test():
+    from main import db
+    _id = request.get_json()['_id']
+    if db.tests.find_one({'_id': _id}):
+        return Test(_id = _id, expiry_date= datetime.utcnow()).update()
+    return jsonify({'error': 'Could not find the corresponding test to delete.'}), 404
+
+@views.route('/test/<_id>/', methods=['GET','POST'])
+@admin_account_required
+@login_required
+def view_test(_id):
+    from main import db
+    from .models.forms import AddTimeAdjustment
+    form = AddTimeAdjustment()
+    test = decrypt_find_one(db.tests, {'_id': _id})
+    if request.method == 'GET':
+        if not test:
+            return abort(404)
+        return render_template('/admin/test.html', test = test, form = form)
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            time = int(request.form.get('time'))
+            return Test(_id=_id).add_time_adjustment(time)
+        return jsonify({'error': form.time.errors }), 400
+
+@views.route('/test/<_id>/delete-adjustment/', methods = ['POST'])
+@admin_account_required
+@login_required
+def delete_adjustment(_id):
+    user_code = request.get_json()['user_code']
+    return Test(_id=_id).remove_time_adjustment(user_code)
+
+@views.route('/results/')
+@admin_account_required
+@login_required
+def view_entries():
+    from main import db
+    entries = decrypt_find(db.entries, {})
+    return render_template('/admin/results.html', entries = entries)
+
+@views.route('/results/<_id>/', methods = ['GET', 'POST'])
+@admin_account_required
+@login_required
+def view_entry(_id=''):
+    from main import app, db
+    entry = decrypt_find_one(db.entries, {'_id': _id})
+    if request.method == 'GET':
+        if not entry:
+            return abort(404)
+        test_code = entry['test_code']
+        test = db.tests.find_one({'test_code' : test_code})
+        dataset = test['dataset']
+        dataset_path = os.path.join(app.config['DATA_FILE_DIRECTORY'], dataset)
+        with open(dataset_path, 'r') as _dataset:
+            data = loads(_dataset.read())
+        correct = get_correct_answers(dataset=data)
+        print(correct.values())
+        return render_template('/admin/result-detail.html', entry = entry, correct = correct)
+    if request.method == 'POST':
+        if not entry:
+            return jsonify({'error': 'A valid entry could no be found.'}), 404
+        action = request.get_json()['action']
+        if action == 'override':
+            late_ignore = db.entries.find_one_and_update({'_id': _id}, {'$set': {'status': 'late (allowed)'}})
+            if late_ignore:
+                flash('Late status for the entry has been allowed.', 'success')
+                return jsonify({'success': 'Late status allowed.'}), 200
+            return jsonify({'error': 'An error occurred.'}), 400
+        if action == 'delete':
+            test_code = entry['test_code']
+            test = db.tests.find_one_and_update({'test_code': test_code}, {'$pull': {'entries': _id}})
+            if not test:
+                return jsonify({'error': 'A valid exam could not be found.'}), 404
+            delete = db.entries.delete_one({'_id': _id})
+            if delete:
+                flash('Entry has been deleted.', 'success')
+                return jsonify({'success': 'Entry has been deleted.'}), 200
+            return jsonify({'error': 'An error occurred.'}), 400
+
+@views.route('/certificate/', methods=['POST'])
+@admin_account_required
+@login_required
+def generate_certificate():
+    from main import db
+    _id = request.get_json()['_id']
+    entry = decrypt_find_one(db.entries, {'_id': _id})
+    if not entry:
+        return abort(404)
+    return render_template('/admin/components/certificate.html', entry = entry)

ref-test/app/__init__.py

@@ -1,68 +0,0 @@
-from .config import Production as Config
-from .models import *
-from .extensions import bootstrap, csrf, db, login_manager, mail
-from .tools.logs import write
-
-from flask import flash, Flask, render_template, request
-from flask.helpers import abort, url_for
-from flask.json import jsonify
-from flask_wtf.csrf import CSRFError
-from werkzeug.middleware.proxy_fix import ProxyFix
-
-from datetime import datetime
-
-def create_app():
-    app = Flask(__name__)
-    app.config.from_object(Config())
-    app.wsgi_app = ProxyFix(app.wsgi_app, x_proto= 1, x_host= 1)
-
-    bootstrap.init_app(app)
-    csrf.init_app(app)
-    db.init_app(app)
-    login_manager.init_app(app)
-    mail.init_app(app)
-
-    login_manager.login_view = 'admin._login'
-    @login_manager.user_loader
-    def _load_user(id):
-        try: return User.query.filter_by(id=id).first()
-        except Exception as exception:
-            write('system.log', f'Database error when loading user fo login manager: {exception}')
-            return abort(500)
-
-    @app.before_request
-    def _check_cookie_consent():
-        if request.cookies.get('cookie_consent'):
-            return
-        if any([ request.path.startswith(x) for x in [ '/admin/static/', '/root/', '/quiz/static', '/cookies/', '/admin/editor/static', '/admin/view/static' ] ]):
-            return
-        flash(f'<strong>Cookie Consent</strong>: This web site only stores minimal, functional cookies. It does not store any tracking information. By using this site, you consent to this use of cookies. For more information, see our <a href="{url_for("views._privacy")}">privacy policy</a>.', 'cookie_alert')
-
-    @app.errorhandler(404)
-    def _404_handler(error): return render_template('404.html')
-    @app.errorhandler(CSRFError)
-    def _csrf_handler(): return jsonify({'error':'Could not validate a secure connection.'}), 403
-    @app.context_processor
-    def _now(): return {'now': datetime.now()}
-
-    from .admin.views import admin
-    from .api.views import api
-    from .quiz.views import quiz
-    from .views import views
-    from .editor.views import editor
-    from .view.views import view
-
-    app.register_blueprint(admin, url_prefix='/admin')
-    app.register_blueprint(api, url_prefix='/api')
-    app.register_blueprint(views)
-    app.register_blueprint(quiz)
-    app.register_blueprint(editor, url_prefix='/admin/editor')
-    app.register_blueprint(view, url_prefix='/admin/view')
-
-    """Create Database Tables before First Request"""
-    @app.before_first_request
-    def _create_database_tables():
-        with app.app_context():
-            db.create_all()
-
-    return app

ref-test/app/admin/static/css/style.css

@@ -1,260 +0,0 @@
-body {
-    padding: 80px 0;
-}
-
-.site-footer {
-    background-color: lightgray;
-    font-size: small;
-}
-
-.site-footer p {
-    margin: 0;
-}
-
-.form-container {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-}
-
-.form-display {
-    width: 100%;
-    max-width: 420px;
-    padding: 15px;
-    margin: auto;
-}
-
-.form-heading {
-    margin-bottom: 2rem;
-}
-
-.form-label-group {
-    position: relative;
-    margin-bottom: 2rem;
-}
-
-.form-label-group input,
-.form-label-group label {
-    padding: var(--input-padding-y) var(--input-padding-x);
-    font-size: 16pt;
-}
-
-.form-label-group label {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: block;
-    width: 100%;
-    margin-bottom: 0; /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    cursor: text; /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: -1;
-}
-
-.form-label-group input {
-    background-color: transparent;
-    border: none;
-    border-radius: 0%;
-    border-bottom: 2px solid #585858;
-}
-
-.form-label-group input:active, .form-label-group input:focus {
-    background-color: transparent;
-}
-
-.form-label-group input::-webkit-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-moz-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:not(:placeholder-shown) {
-    padding-top: calc(var(--input-padding-y) + var(--input-padding-y) * (2 / 3));
-    padding-bottom: calc(var(--input-padding-y) / 3);
-}
-  
-.form-label-group input:not(:placeholder-shown) ~ label {
-    padding-top: calc(var(--input-padding-y) / 3);
-    padding-bottom: calc(var(--input-padding-y) / 3);
-    font-size: 12px;
-    color: #777;
-}
-
-.form-check {
-    margin-bottom: 2rem;
-}
-
-.checkbox input {
-    transform: scale(1.5);
-    margin-right: 1rem;
-}
-
-.signin-forgot-password {
-    font-size: 14pt;
-}
-
-.form-submission-button {
-    margin-bottom: 2rem;
-}
-
-.form-submission-button button, .form-submission-button a {
-    margin: 1rem;
-    vertical-align: middle;
-}
-
-.form-submission-button button span, .form-submission-button button svg, .form-submission-button a span, .form-submission-button a svg {
-    margin: 0 2px;
-}
-
-table.dataTable {
-    border-collapse: collapse;
-    width: 100%;
-}
-
-.table-row {
-    vertical-align: middle;
-}
-
-.row-actions {
-    text-align: center;
-    white-space: nowrap;
-}
-
-.dataTables_wrapper .dt-buttons {
-    left: 50%;
-    transform: translateX(-50%);
-    float:none;  
-    text-align:center;
-}
-
-.row-actions button, .row-actions a {
-    margin: 0px 5px;
-}
-
-#cookie-alert {
-    padding-right: 16px;
-}
-
-#dismiss-cookie-alert {
-    margin-top: 16px;
-    width: fit-content;
-}
-
-.alert-db-empty {
-    width: 100%;
-    max-width: 720px;
-    font-size: 14pt;
-    margin: 20px auto;
-}
-
-.form-date-input, .form-select-input {
-    position: relative;
-    margin: 2rem 0;
-}
-
-.form-date-input input,
-.form-date-input label, .form-select-input select, .form-select-input label {
-    padding: var(--input-padding-y) var(--input-padding-x);
-    font-size: 16pt;
-    width: 100%;
-    background-color: transparent;
-    border: none;
-    border-bottom: 2px solid #585858;
-}
-
-.datepicker::-webkit-calendar-picker-indicator {    
-    border: 1px;
-    border-color: gray;
-    border-radius: 10%;
-}
-
-.form-date-input label, .form-select-input label {
-    /* position: absolute; */
-    /* top: 0;
-    left: 0; */
-    display: block;
-    width: 100%;
-    margin-bottom: 0; /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    cursor: text; /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: -1;
-}
-
-.button-icon {
-    font-size: 20px;
-}
-
-.form-upload {
-    margin: 2rem 0;
-    font-size: 14pt;
-}
-
-.result-action-buttons, .test-action {
-    margin: 5px auto;
-    width: fit-content;
-}
-
-.accordion-item {
-    background-color: unset;
-}
-
-/* Change Autocomplete styles in Chrome*/
-input:-webkit-autofill,
-input:-webkit-autofill:hover, 
-input:-webkit-autofill:focus,
-textarea:-webkit-autofill,
-textarea:-webkit-autofill:hover,
-textarea:-webkit-autofill:focus,
-select:-webkit-autofill,
-select:-webkit-autofill:hover,
-select:-webkit-autofill:focus {
-  transition: background-color 5000s ease-in-out 0s;
-}
-
-/* Fallback for Edge
--------------------------------------------------- */
-@supports (-ms-ime-align: auto) {
-    .form-label-group label {
-      display: none;
-    }
-    .form-label-group input::-ms-input-placeholder {
-      color: #777;
-    }
-}
-  
-  /* Fallback for IE
-  -------------------------------------------------- */
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-    .form-label-group label {
-        display: none;
-    }
-    .form-label-group input:-ms-input-placeholder {
-        color: #777;
-    }
-}
-  

ref-test/app/admin/templates/admin/components/footer.html

@@ -1,2 +0,0 @@
-<p>This web app was developed and is maintained by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
-<p>All questions in the test are &copy; The Scottish Korfball Association {{ now.year }}. All rights are reserved.</p>

ref-test/app/admin/templates/admin/components/navbar.html

@@ -1,117 +0,0 @@
-<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark">
-    <div class="container">
-        <a href="{{ url_for('admin._home') }}" class="navbar-brand mb-0 h1">RefTest | Admin</a>
-        <button
-            class="navbar-toggler"
-            type="button"
-            data-bs-toggle="collapse"
-            data-bs-target="#navbar"
-            aria-controls="navbar"
-            aria-expanded="false"
-            aria-label="Toggle Navigation"
-        >
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse justify-content-end" id="navbar">
-            <ul class="navbar-nav">
-                {% if not current_user.is_authenticated %}
-                    <li class="nav-item" id="nav-login">
-                        <a href="{{ url_for('admin._login') }}" id="link-login" class="nav-link">Log In</a>
-                    </li>
-                {% endif %}
-                {% if current_user.is_authenticated %}
-                    <li class="nav-item" id="nav-results">
-                        <a href="{{ url_for('admin._view_entries') }}" id="link-results" class="nav-link">View Results</a>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-tests">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-tests"
-                            role="button"
-                            href="{{ url_for('admin._tests') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Exams
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-settings"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='active') }}" id="link-active" class="dropdown-item">Active</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='scheduled') }}" id="link-scheduled" class="dropdown-item">Scheduled</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='expired') }}" id="link-expired" class="dropdown-item">Expired</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='all') }}" id="link-all" class="dropdown-item">All</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='create') }}" id="link-create" class="dropdown-item">Create</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-settings">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-account"
-                            role="button"
-                            href="{{ url_for('admin._settings') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Settings
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-settings"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._settings') }}" id="link-settings" class="dropdown-item">View Settings</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._users') }}" id="link-users" class="dropdown-item">Users</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._questions') }}" id="link-questions" class="dropdown-item">Manage Questions</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('view._view') }}" id="link-editor" class="dropdown-item">View Questions</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('editor._editor') }}" id="link-editor" class="dropdown-item">Edit Questions</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-account">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-account"
-                            role="button"
-                            href="{{ url_for('admin._update_user', id=current_user.id) }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Account
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-account"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._update_user', id=current_user.id) }}" id="link-account" class="dropdown-item">Account Settings</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._logout') }}" id="link-logout" class="dropdown-item">Log Out</a>
-                            </li>
-                        </ul>
-                    </li>
-                {% endif %}
-            </ul>
-        </div>
-    </div>
-</nav>

ref-test/app/admin/templates/admin/components/secondary-navs/tests.html

@@ -1,23 +0,0 @@
-<div class="navbar navbar-expand-sm navbar-light bg-light">
-    <div class="container-fluid">
-    <div class="expand navbar-expand justify-content-center" id="navbar_secondary">
-        <ul class="nav nav-pills">
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='active') }}">Active</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='scheduled') }}">Scheduled</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='expired') }}">Expired</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='all') }}">All</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='create') }}">Create</a>
-            </li>
-        </ul>
-    </div>
-    </div>
-</div>

ref-test/app/admin/templates/admin/components/server-alerts.html

@@ -1,43 +0,0 @@
-{% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-        {% set cookie_flash_flag = namespace(value=False) %}
-        {% for category, message in messages %}
-            {% if category == "error" %}
-                <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                    <i class="bi bi-exclamation-triangle-fill" title="Error" aria-title="Error"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "success" %}
-                <div class="alert alert-success alert-dismissible fade show" role="alert">
-                    <i class="bi bi-check2-circle" title="Success" aria-title="Success"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "warning" %}
-                <div class="alert alert-warning alert-dismissible fade show" role="alert">
-                    <i class="bi bi-info-circle-fill" aria-title="Warning" title="Warning"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "cookie_alert" %}
-                {% if not cookie_flash_flag.value %}
-                    <div class="alert alert-primary alert-dismissible fade show" id="cookie-alert" role="alert">
-                        <i class="bi bi-info-circle-fill" title="Cookie Alert" aria-title="Cookie Alert"></i>
-                        {{ message|safe }}
-                        <div class="d-flex justify-content-center w-100">
-                            <button type="button" id="dismiss-cookie-alert" class="btn btn-success" data-bs-dismiss="alert" aria-label="Close">Accept</button>
-                        </div>
-                    </div>
-                    {% set cookie_flash_flag.value = True %}
-                {% endif %}
-            {% else %}
-                <div class="alert alert-primary alert-dismissible fade show" role="alert">
-                    <i class="bi bi-info-circle-fill" title="Alert"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% endif %}
-        {% endfor %}
-    {% endif %}
-{% endwith %}

ref-test/app/admin/views.py

@@ -1,456 +0,0 @@
-from ..forms.admin import AddTimeAdjustment, CreateTest, CreateUser, DeleteUser, Login, Register, ResetPassword, UpdatePassword, UpdateUser, UploadData
-from ..models import Dataset, Entry, Test, User
-from ..tools.auth import disable_if_logged_in, require_account_creation
-from ..tools.data import check_dataset_exists, check_is_json, validate_json
-from ..tools.forms import get_dataset_choices, get_time_options, send_errors_to_client
-from ..tools.logs import write
-from ..tools.test import  answer_options, get_correct_answers
-
-from flask import abort, Blueprint, jsonify, render_template, request, send_file, session
-from flask.helpers import abort, flash, redirect, url_for
-from flask_login import current_user, login_required
-
-from datetime import date, datetime, MINYEAR, timedelta
-from json import loads
-from os import path
-import secrets
-
-admin = Blueprint(
-    name='admin',
-    import_name=__name__,
-    template_folder='templates',
-    static_folder='static'
-)
-
-@admin.route('/')
-@admin.route('/home/')
-@admin.route('/dashboard/')
-@login_required
-def _home():
-    try:
-        tests = Test.query.all()
-        results = Entry.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    current_tests = [ test for test in tests if test.end_date >= datetime.now() and test.start_date.date() <= date.today() ]
-    current_tests.sort(key= lambda x: x.end_date or datetime(MINYEAR,1,1), reverse=True)
-    upcoming_tests = [ test for test in tests if test.start_date.date() > datetime.now().date()]
-    upcoming_tests.sort(key= lambda x: x.start_date or datetime(MINYEAR,1,1))
-    recent_results = [result for result in results if not result.status == 'started' ]
-    recent_results.sort(key= lambda x: x.end_time or datetime(MINYEAR,1,1), reverse=True)
-    return render_template('/admin/index.html', current_tests = current_tests, upcomimg_tests = upcoming_tests, recent_results = recent_results)
-
-@admin.route('/settings/')
-@login_required
-def _settings():
-    try:
-        users = User.query.all()
-        datasets = Dataset.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    return render_template('/admin/settings/index.html', users=users, datasets=datasets)
-
-@admin.route('/login/', methods=['GET','POST'])
-@disable_if_logged_in
-@require_account_creation
-def _login():
-    form = Login()
-    if request.method == 'POST':
-        if form.validate_on_submit():
-            try: users = User.query.all()
-            except Exception as exception:
-                write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-                return abort(500)
-            user = None
-            for _user in users:
-                if _user.get_username() == request.form.get('username').lower():
-                    user = _user
-                    break
-            if user:
-                if user.verify_password(request.form.get('password')):
-                    user.login(remember=request.form.get('remember'))
-                    return jsonify({'success': f'Successfully logged in.'}), 200
-                return jsonify({'error': f'The password you entered is incorrect.'}), 401
-            return jsonify({'error': f'The username you entered does not exist.'}), 401
-        return send_errors_to_client(form=form)
-    if 'remembered_username' in session: form.username.data = session.pop('remembered_username')
-    next = request.args.get('next')
-    return render_template('/admin/auth/login.html', form=form, next=next)
-
-@admin.route('/logout/')
-@login_required
-def _logout():
-    current_user.logout()
-    return redirect(url_for('admin._login'))
-
-@admin.route('/register/', methods=['GET','POST'])
-@disable_if_logged_in
-def _register():
-    from ..models.user import User
-    form = Register()
-    if request.method == 'POST':
-        if form.validate_on_submit():
-            new_user = User()
-            new_user.set_username(request.form.get('username').lower())
-            new_user.set_email(request.form.get('email').lower())
-            success, message = new_user.register(password=request.form.get('password'))
-            if success:
-                flash(message=f'{message} Please log in to continue.', category='success')
-                session['remembered_username'] = request.form.get('username').lower()
-                return jsonify({'success': message}), 200
-            flash(message=message, category='error')
-            return jsonify({'error': message}), 401
-        return send_errors_to_client(form=form)
-    return render_template('/admin/auth/register.html', form=form)
-
-@admin.route('/reset/', methods=['GET','POST'])
-def _reset():
-    form = ResetPassword()
-    if request.method == 'POST':
-        if form.validate_on_submit():
-            user = None
-            try: users = User.query.all()
-            except Exception as exception:
-                write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-                return abort(500)
-            for _user in users:
-                if _user.get_username() == request.form.get('username'):
-                    user = _user
-                    break
-            if not user: return jsonify({'error': 'The user account does not exist.'}), 400
-            if not user.get_email() == request.form.get('email'): return jsonify({'error': 'The email address does not match the user account.'}), 400
-            return user.reset_password()
-        return send_errors_to_client(form=form)
-    
-    token = request.args.get('token')
-    if token:
-        try: user = User.query.filter_by(reset_token=token).first()
-        except Exception as exception:
-            write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-            return abort(500)
-        if not user: return redirect(url_for('admin._reset'))
-        verification_token = user.verification_token
-        user.clear_reset_tokens()
-        if request.args.get('verification') == verification_token:
-            form = UpdatePassword()
-            session['user'] = user.id
-            return render_template('/admin/auth/update-password.html', form=form)
-        flash('The verification of your password reset request failed and the token has been invalidated. Please make a new reset password request.', 'error')
-
-    return render_template('/admin/auth/reset.html', form=form)
-
-@admin.route('/update_password/', methods=['POST'])
-def _update_password():
-    form = UpdatePassword()
-    if form.validate_on_submit():
-        user = session.pop('user')
-        try: user = User.query.filter_by(id=user).first()
-        except Exception as exception:
-            write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-            return abort(500)
-        user.update(password=request.form.get('password'))
-        session['remembered_username'] = user.get_username()
-        flash('Your password has been reset.', 'success')
-        return jsonify({'success':'Your password has been reset'}), 200
-    return send_errors_to_client(form=form)
-
-@admin.route('/settings/users/', methods=['GET', 'POST'])
-@login_required
-def _users():
-    form = CreateUser()
-    try: users = User.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if request.method == 'POST':
-        if form.validate_on_submit():
-            password = request.form.get('password')
-            password = secrets.token_hex(12) if not password else password
-            new_user = User()
-            new_user.set_username(request.form.get('username').lower())
-            new_user.set_email(request.form.get('email'))
-            success, message = new_user.register(notify=request.form.get('notify'), password=password)
-            if success: return jsonify({'success': message}), 200
-            return jsonify({'error': message}), 401
-        return send_errors_to_client(form=form)
-    return render_template('/admin/settings/users.html', form = form, users = users)
-
-@admin.route('/settings/users/delete/<string:id>', methods=['GET', 'POST'])
-@login_required
-def _delete_user(id:str):
-    try: user = User.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    form = DeleteUser()
-    if request.method == 'POST': 
-        if not user: return jsonify({'error': 'User does not exist.'}), 400
-        if id == current_user.id: return jsonify({'error': 'Cannot delete your own account.'}), 400
-        if form.validate_on_submit():
-            password = request.form.get('password')
-            if not current_user.verify_password(password): return jsonify({'error': 'The password you entered is incorrect.'}), 401
-            success, message = user.delete(notify=request.form.get('notify'))
-            if success: return jsonify({'success': message}), 200
-            return jsonify({'error': message}), 400
-        return send_errors_to_client(form=form)
-
-    if id == current_user.id:
-        flash('Cannot delete your own user account.', 'error')
-        return redirect(url_for('admin._users'))
-    if not user:
-        flash('User not found.', 'error')
-        return redirect(url_for('admin._users'))
-    return render_template('/admin/settings/delete_user.html', form=form, id = id, user = user)
-
-@admin.route('/settings/users/update/<string:id>', methods=['GET', 'POST'])
-@login_required
-def _update_user(id:str):
-    try: user = User.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    form = UpdateUser()
-    if request.method == 'POST': 
-        if not user: return jsonify({'error': 'User does not exist.'}), 400
-        if form.validate_on_submit():
-            if not current_user.verify_password(request.form.get('confirm_password')): return jsonify({'error': 'Invalid password for your account.'}), 401
-            success, message = user.update(
-                password = request.form.get('password'),
-                email = request.form.get('email'),
-                notify = request.form.get('notify')
-            )
-            if success:
-                flash(message, 'success')
-                return jsonify({'success': message}), 200
-            return jsonify({'error': message}), 400
-        return send_errors_to_client(form=form)
-    if not user:
-        flash('User not found.', 'error')
-        return redirect(url_for('admin._users'))
-    return render_template('/admin/settings/update_user.html', form=form, id = id, user = user)
-
-@admin.route('/settings/questions/', methods=['GET', 'POST'])
-@login_required
-def _questions():
-    form = UploadData()
-    if request.method == 'POST':
-        if form.validate_on_submit():
-            upload = form.data_file.data
-            if not check_is_json(upload): return jsonify({'error': 'Invalid file. Please upload a JSON file.'}), 400
-            upload.stream.seek(0)
-            data = loads(upload.read())
-            if not validate_json(data=data): return jsonify({'error': 'The data in the file is invalid.'}), 400
-            new_dataset = Dataset()
-            new_dataset.set_name(request.form.get('name'))
-            success, message = new_dataset.create(
-                data = data,
-                default = request.form.get('default')
-            )
-            if success: return jsonify({'success': message}), 200
-            return jsonify({'error': message}), 400
-        return send_errors_to_client(form=form)
-
-    try: data = Dataset.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    return render_template('/admin/settings/questions.html', form=form, data=data)
-
-@admin.route('/settings/questions/delete/', methods=['POST'])
-@login_required
-def _edit_questions():
-    id = request.get_json()['id']
-    action = request.get_json()['action']
-    if not action == 'delete': return jsonify({'error': 'Invalid action.'}), 400
-    try: dataset = Dataset.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if action == 'delete': success, message = dataset.delete()
-    if success: return jsonify({'success': message}), 200
-    return jsonify({'error': message}), 400
-
-@admin.route('/settings/questions/download/<string:id>/')
-@login_required
-def _download(id:str):
-    try: dataset = Dataset.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not dataset: return abort(404)
-    data_path = path.abspath(dataset.get_file())
-    return send_file(data_path, as_attachment=True, attachment_filename=f'{dataset.get_name()}.json')
-
-@admin.route('/tests/<string:filter>/', methods=['GET'])
-@admin.route('/tests/', methods=['GET'])
-@login_required
-@check_dataset_exists
-def _tests(filter:str=None):
-    tests = None
-    try: _tests = Test.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    form = None
-    now = datetime.now()
-    if filter not in ['create','active','scheduled','expired','all']: return redirect(url_for('admin._tests', filter='active'))
-    if filter == 'create':
-        form = CreateTest()
-        form.start_date.default = datetime.now()
-        form.expiry_date.default = date.today() + timedelta(days=1)
-        form.time_limit.choices = get_time_options()
-        form.dataset.choices = get_dataset_choices()
-        form.time_limit.default='none'
-        form.process()
-        display_title = ''
-        error_none = ''
-    if filter in [None, '', 'active']:
-        tests = [ test for test in _tests if test.end_date >= now and test.start_date <= now ]
-        display_title = 'Active Exams'
-        error_none = 'There are no exams that are currently active. You can create one using the Create Exam form.'
-    if filter == 'expired':
-        tests = [ test for test in _tests if test.end_date < now ]
-        display_title = 'Expired Exams'
-        error_none = 'There are no expired exams. Exams will appear in this category after their expiration date has passed.'
-    if filter == 'scheduled':
-        tests = [ test for test in _tests if test.start_date > now]
-        display_title = 'Scheduled Exams'
-        error_none = 'There are no scheduled exams pending. You can schedule an exam for the future using the Create Exam form.'
-    if filter == 'all':
-        tests = _tests
-        display_title = 'All Exams'
-        error_none = 'There are no exams set up. You can create one using the Create Exam form.'
-    return render_template('/admin/tests.html', form = form, tests=tests, display_title=display_title, error_none=error_none, filter=filter)
-
-@admin.route('/tests/create/', methods=['POST'])
-@login_required
-def _create_test():
-    form = CreateTest()
-    form.dataset.choices = get_dataset_choices()
-    form.time_limit.choices = get_time_options()
-    if form.validate_on_submit():
-        new_test = Test()
-        new_test.start_date = request.form.get('start_date')
-        new_test.start_date = datetime.strptime(new_test.start_date, '%Y-%m-%dT%H:%M')
-        new_test.end_date = request.form.get('expiry_date')
-        new_test.end_date = datetime.strptime(new_test.end_date, '%Y-%m-%dT%H:%M')
-        new_test.time_limit = None if request.form.get('time_limit') == 'none' else int(request.form.get('time_limit'))
-        dataset = request.form.get('dataset')
-        try: new_test.dataset = Dataset.query.filter_by(id=dataset).first()
-        except Exception as exception:
-            write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-            return abort(500)
-        success, message = new_test.create()
-        if success:
-            flash(message=message, category='success')
-            return jsonify({'success': message}), 200
-        return jsonify({'error': message}), 400
-    return send_errors_to_client(form=form)
-
-@admin.route('/tests/edit/', methods=['POST'])
-@login_required
-def _edit_test():
-    id = request.get_json()['id']
-    action = request.get_json()['action']
-    if action not in ['start', 'delete', 'end']: return jsonify({'error': 'Invalid action.'}), 400
-    try: test = Test.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not test: return jsonify({'error': 'Could not find the corresponding test to delete.'}), 404
-    if action == 'delete': success, message = test.delete()
-    if action == 'start': success, message = test.start()
-    if action == 'end': success, message = test.end()
-    if success:
-        flash(message=message, category='success')
-        return jsonify({'success': message}), 200
-    return jsonify({'error': message}), 400
-
-@admin.route('/test/<string:id>/', methods=['GET','POST'])
-@login_required
-def _view_test(id:str=None):    
-    form = AddTimeAdjustment()
-    try: test = Test.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if request.method == 'POST':
-        if not test: return jsonify({'error': 'Invalid test ID.'}), 404
-        if form.validate_on_submit():
-            time = int(request.form.get('time'))
-            success, message = test.add_adjustment(time)
-            if success: return jsonify({'success': message}), 200
-            return jsonify({'error': message}), 400
-        return jsonify({'error': form.time.errors }), 400
-    if not test:
-        flash('Invalid test ID.', 'error')
-        return redirect(url_for('admin._tests', filter='active'))
-    return render_template('/admin/test.html', test = test, form = form)
-
-@admin.route('/test/<string:id>/delete-adjustment/', methods=['POST'])
-@login_required
-def _delete_adjustment(id:str=None):
-    try: test = Test.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not test: return jsonify({'error': 'Invalid test ID.'}), 404
-    user_code = request.get_json()['user_code'].lower()
-    success, message = test.remove_adjustment(user_code)
-    if success: return jsonify({'success': message}), 200
-    return jsonify({'error': message}), 400
-
-@admin.route('/results/')
-@login_required
-def _view_entries():
-    try: entries = Entry.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    return render_template('/admin/results.html', entries = entries)
-
-@admin.route('/results/<string:id>/', methods = ['GET', 'POST'])
-@login_required
-def _view_entry(id:str=None):
-    try: entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if request.method == 'POST':
-        if not entry: return jsonify({'error': 'Invalid entry ID.'}), 404
-        action = request.get_json()['action']
-        if action not in ['validate', 'delete']: return jsonify({'error': 'Invalid action.'}), 400
-        if action == 'validate':
-            success, message = entry.validate()
-        if action == 'delete':
-            success, message = entry.delete()
-        if success:
-            flash(message, 'success')
-            entry.notify_result()
-            return jsonify({'success': message}), 200
-        return jsonify({'error': message}),400
-    if not entry:
-        flash('Invalid entry ID.', 'error')
-        return redirect(url_for('admin._view_entries'))
-    test = entry.test
-    dataset = test.dataset
-    dataset_path = dataset.get_file()
-    with open(dataset_path, 'r') as _dataset:
-        data = loads(_dataset.read())
-    correct = get_correct_answers(dataset=data)
-    answers = answer_options(dataset=data)
-    return render_template('/admin/result-detail.html', entry = entry, correct = correct, answers = answers)
-
-@admin.route('/certificate/',methods=['POST'])
-@login_required
-def _generate_certificate():
-    from ..extensions import db
-    id = request.get_json()['id']
-    try: entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not entry: return jsonify({'error': 'Invalid entry ID.'}), 404
-    return render_template('/admin/components/certificate.html', entry = entry)

ref-test/app/api/views.py

@@ -1,115 +0,0 @@
-from ..models import Dataset, Entry, User
-from ..tools.data import validate_json
-from ..tools.logs import write
-from ..tools.test import evaluate_answers, generate_questions
-
-from flask import Blueprint, jsonify, request
-from flask.helpers import abort, flash, url_for
-from flask_login import login_required
-
-from datetime import datetime, timedelta
-from json import loads
-
-api = Blueprint(
-    name='api',
-    import_name=__name__
-)
-
-@api.route('/questions/', methods=['POST'])
-def _fetch_questions():
-    id = request.get_json()['id']
-    try: entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not entry: return jsonify({'error': 'Invalid entry ID.'}), 400
-    test = entry.test
-    user_code = entry.user_code
-    time_limit = test.time_limit
-    time_adjustment = 0
-    if time_limit:
-        _time_limit = int(time_limit)
-        if user_code:
-            time_adjustment = test.adjustments[user_code]
-            _time_limit += time_adjustment
-        end_delta = timedelta(minutes=_time_limit)
-        end_time = datetime.now() + end_delta
-    else:
-        end_time = None
-    entry.start()
-    dataset = test.dataset
-    success, message = dataset.check_file()
-    if not success: return jsonify({'error': message}), 500
-    data_path = dataset.get_file()
-    with open(data_path, 'r') as data_file:
-        data = loads(data_file.read())
-    questions = generate_questions(data)
-    return jsonify({
-        'time_limit': end_time,
-        'questions': questions,
-        'start_time': entry.start_time,
-        'time_adjustment': time_adjustment
-    }), 200
-
-@api.route('/submit/', methods=['POST'])
-def _submit_quiz():
-    id = request.get_json()['id']
-    answers = request.get_json()['answers']
-    try: entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not entry: return jsonify({'error': 'Unrecognised Entry.'}), 400
-    test = entry.test
-    dataset = test.dataset
-    success, message = dataset.check_file()
-    if not success: return jsonify({'error': message}), 500
-    data_path = dataset.get_file()
-    with open(data_path, 'r') as data_file:
-        data = loads(data_file.read())
-    result = evaluate_answers(answers=answers, key=data)
-    entry.complete(answers=answers, result=result)
-    return jsonify({
-        'success': 'Your submission has been processed. Redirecting you to receive your results.',
-        'id': id
-    }), 200
-
-@api.route('/editor/', methods=['POST'])
-@login_required
-def _editor(id:str=None):
-    request_data = request.get_json()
-    id = request_data['id']
-    try: dataset = Dataset.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not dataset: return jsonify({'error': 'Invalid request. Dataset not found.'}), 404
-    data_path = dataset.get_file()
-    if request_data['action'] == 'fetch':
-        with open(data_path, 'r') as data_file:
-            data = loads(data_file.read())
-        return jsonify({'success': 'Successfully downloaded dataset', 'data': data}), 200
-    default = request_data['default']
-    creator = request_data['creator']
-    try: user = User.query.filter_by(id=creator).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    name = request_data['name']
-    data = request_data['data']
-    if not validate_json(data): return jsonify({'error': 'The data you submitted was invalid.'}), 400
-    dataset.set_name(name)
-    dataset.creator = user
-    success, message = dataset.update(data=data, default=default)
-    if not success: return jsonify({'error': message}), 400
-    return jsonify({'success': message}), 200
-
-@api.route('/editor/new/', methods=['POST'])
-@login_required
-def _editor_new():
-    new_dataset = Dataset()
-    new_dataset.set_name('New Dataset')
-    success, message = new_dataset.create(data=[], default=False)
-    if not success: return jsonify({'error':message}), 400
-    flash(message, 'success')
-    return jsonify({'success': message, 'redirect_to': url_for('editor._editor_console', id=new_dataset.id)}), 200

ref-test/app/config.py

@@ -1,60 +0,0 @@
-import os
-from pathlib import Path
-from dotenv import load_dotenv
-load_dotenv('../.env')
-
-class Config(object):
-    """Basic App Configuration"""
-    APP_HOST = '0.0.0.0'
-    DATA = './data/'
-    DEBUG = False
-    TESTING = False
-    SECRET_KEY = os.getenv('SECRET_KEY')
-    SERVER_NAME = os.getenv('SERVER_NAME')
-    SESSION_COOKIE_SECURE = True
-    WTF_CSRF_TIME_LIMIT = None
-
-    """Email Engine Configuration"""
-    MAIL_SERVER = os.getenv('MAIL_SERVER')
-    MAIL_PORT = int(os.getenv('MAIL_PORT') or 25)
-    MAIL_USE_TLS = False
-    MAIL_USE_SSL = False
-    MAIL_DEBUG = False
-    MAIL_USERNAME = os.getenv('MAIL_USERNAME')
-    MAIL_PASSWORD = os.getenv('MAIL_PASSWORD')
-    MAIL_DEFAULT_SENDER = os.getenv('MAIL_DEFAULT_SENDER')
-    MAIL_MAX_EMAILS = int(os.getenv('MAIL_MAX_EMAILS') or 25)
-    MAIL_SUPPRESS_SEND = False
-    MAIL_ASCII_ATTACHMENTS = bool(os.getenv('MAIL_ASCII_ATTACHMENTS') or True)
-
-    """Database Driver Configuration"""
-    DATABASE_TYPE = os.getenv('DATABASE_TYPE') or 'SQLite'
-    SQLALCHEMY_TRACK_MODIFICATIONS = False
-
-    if DATABASE_TYPE.lower() == 'mysql' and os.getenv('MYSQL_DATABASE') and os.getenv('MYSQL_USER') and os.getenv('MYSQL_PASSWORD'):
-        DATABASE_HOST = os.getenv('DATABASE_HOST') or 'localhost'
-        DATABASE_PORT = int(os.getenv('DATABASE_PORT') or 3306)
-        MYSQL_DATABASE = os.getenv('MYSQL_DATABASE')
-        MYSQL_USER = os.getenv('MYSQL_USER')
-        MYSQL_PASSWORD = os.getenv('MYSQL_PASSWORD')
-        SQLALCHEMY_DATABASE_URI = f'mysql+pymysql://{MYSQL_USER}:{MYSQL_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{MYSQL_DATABASE}'
-    else: SQLALCHEMY_DATABASE_URI = f'sqlite:///{Path(os.path.abspath(f"{DATA}/db.sqlite"))}'
-
-class Production(Config):
-    pass
-
-class Development(Config):
-    APP_HOST = '127.0.0.1'
-    DEBUG = True
-    SERVER_NAME = '127.0.0.1:5000'
-    SESSION_COOKIE_SECURE = False
-    MAIL_SERVER = 'localhost'
-    MAIL_DEBUG = True
-    MAIL_SUPPRESS_SEND = False
-
-class Testing(Development):
-    TESTING = True
-    SESSION_COOKIE_SECURE = False
-    MAIL_SERVER = os.getenv('MAIL_SERVER')
-    MAIL_DEBUG = True
-    MAIL_SUPPRESS_SEND = False

ref-test/app/editor/static/css/editor.css

@@ -1,103 +0,0 @@
-.accordion-button {
-    color: inherit;
-    background-color: inherit;
-    display: block;
-    border: 1px solid rgb(0 0 0 / .3);
-    height: 60px;
-}
-
-.editor-controls {
-    width: fit-content;
-    display: block;
-    margin: 10px auto;
-}
-
-.editor-controls a {
-    margin: 10px 10px;
-}
-
-.editor-controls a i {
-    font-size: larger;
-    margin: 2px;
-}
-
-.option-controls, .block-controls {
-    width: fit-content;
-    display: block;
-    margin: 10px auto;
-}
-
-.option-controls a, .block-controls a {
-    margin: 0 10px;
-    z-index: 10;
-}
-
-.option-controls a i, .block-controls a i {
-    font-size: larger;
-    margin: 2px;
-}
-
-.accordion-button div {
-    margin: 0;
-    position: relative;
-    top: 50%;
-    transform: translate(0, -50%);
-}
-
-.accordion-button::after {
-    content: none;
-}
-
-.accordion-error {
-    background-color: #bb2d3b;
-    color: white;
-}
-
-.accordion-error:not(.collapsed) {
-    background-color: #bb2d3b;
-    color: white;
-}
-
-.panel-button {
-    padding: 6px;
-    margin: 0px 2px;
-}
-
-.panel-button i {
-    font-size: larger;
-}
-
-.editor-panel, .info-panel {
-    margin: 30pt auto;
-}
-
-.info-panel, .viewer-panel {
-    display: none;
-}
-
-.control-panel {
-    margin-left: auto;
-    margin-right: 0;
-    width:fit-content;
-}
-
-#alert-box {
-    margin: 30px auto;
-    max-width: 460px;
-}
-
-.block {
-    border: 2px solid black;
-    border-radius: 10px;
-    margin: 10px;
-    padding: 5px;
-}
-
-.question-body, .question-block {
-    padding: 0px 2em;
-}
-
-blockquote {
-    padding: 0px 2em;
-    font-style: italic;
-}

ref-test/app/editor/static/css/style.css

@@ -1,260 +0,0 @@
-body {
-    padding: 80px 0;
-}
-
-.site-footer {
-    background-color: lightgray;
-    font-size: small;
-}
-
-.site-footer p {
-    margin: 0;
-}
-
-.form-container {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-}
-
-.form-display {
-    width: 100%;
-    max-width: 420px;
-    padding: 15px;
-    margin: auto;
-}
-
-.form-heading {
-    margin-bottom: 2rem;
-}
-
-.form-label-group {
-    position: relative;
-    margin-bottom: 2rem;
-}
-
-.form-label-group input,
-.form-label-group label {
-    padding: var(--input-padding-y) var(--input-padding-x);
-    font-size: 16pt;
-}
-
-.form-label-group label {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: block;
-    width: 100%;
-    margin-bottom: 0; /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    cursor: text; /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: -1;
-}
-
-.form-label-group input {
-    background-color: transparent;
-    border: none;
-    border-radius: 0%;
-    border-bottom: 2px solid #585858;
-}
-
-.form-label-group input:active, .form-label-group input:focus {
-    background-color: transparent;
-}
-
-.form-label-group input::-webkit-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-moz-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:not(:placeholder-shown) {
-    padding-top: calc(var(--input-padding-y) + var(--input-padding-y) * (2 / 3));
-    padding-bottom: calc(var(--input-padding-y) / 3);
-}
-  
-.form-label-group input:not(:placeholder-shown) ~ label {
-    padding-top: calc(var(--input-padding-y) / 3);
-    padding-bottom: calc(var(--input-padding-y) / 3);
-    font-size: 12px;
-    color: #777;
-}
-
-.form-check {
-    margin-bottom: 2rem;
-}
-
-.checkbox input {
-    transform: scale(1.5);
-    margin-right: 1rem;
-}
-
-.signin-forgot-password {
-    font-size: 14pt;
-}
-
-.form-submission-button {
-    margin-bottom: 2rem;
-}
-
-.form-submission-button button, .form-submission-button a {
-    margin: 1rem;
-    vertical-align: middle;
-}
-
-.form-submission-button button span, .form-submission-button button svg, .form-submission-button a span, .form-submission-button a svg {
-    margin: 0 2px;
-}
-
-table.dataTable {
-    border-collapse: collapse;
-    width: 100%;
-}
-
-.table-row {
-    vertical-align: middle;
-}
-
-.row-actions {
-    text-align: center;
-    white-space: nowrap;
-}
-
-.dataTables_wrapper .dt-buttons {
-    left: 50%;
-    transform: translateX(-50%);
-    float:none;  
-    text-align:center;
-}
-
-.row-actions button, .row-actions a {
-    margin: 0px 5px;
-}
-
-#cookie-alert {
-    padding-right: 16px;
-}
-
-#dismiss-cookie-alert {
-    margin-top: 16px;
-    width: fit-content;
-}
-
-.alert-db-empty {
-    width: 100%;
-    max-width: 720px;
-    font-size: 14pt;
-    margin: 20px auto;
-}
-
-.form-date-input, .form-select-input {
-    position: relative;
-    margin: 2rem 0;
-}
-
-.form-date-input input,
-.form-date-input label, .form-select-input select, .form-select-input label {
-    padding: var(--input-padding-y) var(--input-padding-x);
-    font-size: 16pt;
-    width: 100%;
-    background-color: transparent;
-    border: none;
-    border-bottom: 2px solid #585858;
-}
-
-.datepicker::-webkit-calendar-picker-indicator {    
-    border: 1px;
-    border-color: gray;
-    border-radius: 10%;
-}
-
-.form-date-input label, .form-select-input label {
-    /* position: absolute; */
-    /* top: 0;
-    left: 0; */
-    display: block;
-    width: 100%;
-    margin-bottom: 0; /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    cursor: text; /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: -1;
-}
-
-.button-icon {
-    font-size: 20px;
-}
-
-.form-upload {
-    margin: 2rem 0;
-    font-size: 14pt;
-}
-
-.result-action-buttons, .test-action {
-    margin: 5px auto;
-    width: fit-content;
-}
-
-.accordion-item {
-    background-color: unset;
-}
-
-/* Change Autocomplete styles in Chrome*/
-input:-webkit-autofill,
-input:-webkit-autofill:hover, 
-input:-webkit-autofill:focus,
-textarea:-webkit-autofill,
-textarea:-webkit-autofill:hover,
-textarea:-webkit-autofill:focus,
-select:-webkit-autofill,
-select:-webkit-autofill:hover,
-select:-webkit-autofill:focus {
-  transition: background-color 5000s ease-in-out 0s;
-}
-
-/* Fallback for Edge
--------------------------------------------------- */
-@supports (-ms-ime-align: auto) {
-    .form-label-group label {
-      display: none;
-    }
-    .form-label-group input::-ms-input-placeholder {
-      color: #777;
-    }
-}
-  
-  /* Fallback for IE
-  -------------------------------------------------- */
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-    .form-label-group label {
-        display: none;
-    }
-    .form-label-group input:-ms-input-placeholder {
-        color: #777;
-    }
-}
-  

ref-test/app/editor/static/js/editor.js

@@ -1,642 +0,0 @@
-// Variable Declarations
-const $root = $('#editor-root')
-const target = $root.data('target')
-const id = $root.data('id')
-
-const $control_panel = $('.control-panel')
-const $info_panel = $('.info-panel')
-const $viewer_panel = $('.viewer-panel')
-const $editor_panel = $('.editor-panel')
-
-var toggle_info = false
-var toggle_viewer = false
-
-var element_index = 0
-
-// Initialise Sortable and trigger renumbering on end of drag
-Sortable.create($root.get(0), {handle: '.move-handle', onEnd: function(evt) {renumber_blocks()}})
-
-// Info and Viewer Button Listener
-$control_panel.find('button').click(function(event){
-    var action = $(this).data('action');
-
-    if (action == 'info') {
-        if ($info_panel.is(":hidden")) {
-            if ($viewer_panel.is(":visible")) {
-                toggle_viewer = true
-                $viewer_panel.hide()
-            }
-            $editor_panel.hide()
-            $info_panel.fadeIn()
-            $(window).scrollTop(0)
-            toggle_info = false
-            $(this).addClass('active')
-        } else {
-            $info_panel.hide()
-            if (toggle_viewer) {
-                render_viewer()
-                $(window).scrollTop(0)
-                toggle_viewer = false
-            } else {
-                $editor_panel.fadeIn()
-                $(window).scrollTop(0)
-            }
-            $(this).removeClass('active')
-        }
-    } else if (action == 'view') {
-        if ($viewer_panel.is(":hidden")) {
-            if ($info_panel.is(':visible')) {
-                toggle_info = true
-                $info_panel.hide()
-            }
-            $editor_panel.hide()
-            render_viewer()
-            $(window).scrollTop(0)
-            toggle_viewer = false
-            $(this).addClass('active')
-        } else {
-            $viewer_panel.hide()
-            if (toggle_info) {
-                $info_panel.fadeIn()
-                $(window).scrollTop(0)
-                toggle_info = false
-            } else {
-                $editor_panel.fadeIn()
-                $(window).scrollTop(0)
-            }
-            $(this).removeClass('active')
-        }
-    }
-    
-    event.preventDefault()
-})
-
-// Control Button Listeners
-$root.on('click', '.block-controls > a', function(event){
-    event.preventDefault()
-    var action = $(this).data('action')
-    var root_accordion = $(this).closest('div').siblings('.accordion')
-    if (action == 'add-question') {
-        var question = generate_single_question(root_container_id=`#${root_accordion.attr('id')}`)
-        $(question).appendTo(root_accordion).hide().fadeIn()
-        if (root_accordion.children().length > 1 ) {
-            root_accordion.find('.panel-controls > a[data-action="delete"]').removeClass('disabled')
-        } else {
-            root_accordion.find('.panel-controls > a[data-action="delete"]').addClass('disabled')
-        }
-        renumber_blocks()
-    }
-})
-
-$root.on('click', '.panel-controls > a', function(event) {
-    event.preventDefault()
-    event.stopPropagation()
-    var action = $(this).data('action')
-    var element = $(this).closest('.accordion-item')
-    var root_container = $(this).closest('.accordion')
-    if (action == 'delete') {
-        element.fadeOut(function(){
-            $(this).remove()
-            renumber_blocks()
-            if (root_container.get(0) != $root.get(0) && root_container.children().length < 2 ) {
-                root_container.find('.panel-controls > a[data-action="delete"]').addClass('disabled')
-            }
-        })
-    } else if (action == 'add-question') {
-        var question = generate_single_question(root_container_id=`#${root_container.attr('id')}`)
-        $(question).insertBefore(element).hide().fadeIn()
-        if (root_container.get(0) != $root.get(0) && root_container.children().length > 1 ) {
-            root_container.find('.panel-controls > a[data-action="delete"]').removeClass('disabled')
-        }
-    } else if (action == 'add-block') {
-        var block = generate_block(root_container_id=`#${root_container.attr('id')}`)
-        $(block).insertBefore(element).hide().fadeIn()
-        var block_container = $(`#element${element_index-1}`).children().find('.accordion')
-        Sortable.create(block_container.get(0), {handle: '.move-handle', onEnd: function(evt) {renumber_blocks()}})
-        var question = generate_single_question(root_container_id=`#${block_container.attr('id')}`)
-        block_container.append(question)
-        block_container.find('.panel-controls > a[data-action="delete"]').addClass('disabled')
-    }
-    renumber_blocks()
-})
-
-$root.on('click', '.option-controls > a', function(event) {
-    event.preventDefault()
-    var action = $(this).data('action')
-    var options = $(this).closest('div.option-controls').siblings('.options')
-    var length = options.children().length
-    var correct = $(this).closest('div.option-controls').siblings().find('.question-correct')
-    if (action == 'delete') {
-        if (length > 2) {
-            options.children().last().fadeOut(function(){
-                $(this).remove()
-                length = options.children().length
-                if (length <= 2) {
-                    options.siblings('div.option-controls').children('a[data-action="delete"]').addClass('disabled')
-                } else {
-                    options.siblings('div.option-controls').children('a[data-action="delete"]').removeClass('disabled')
-                }
-            })
-            correct.children().last().fadeOut(function(){
-                $(this).remove()
-            })
-        }
-    } else {
-        var opt = `
-            <div class="input-group mb-3">
-                <span class="input-group-text">${length}</span>
-                <input type="text" class="form-control" value="Option ${length}">
-            </div>
-        `
-        $(opt).appendTo(options).hide().fadeIn()
-        var cor = `<option value="${length}">${length}</option>`
-        correct.append(cor)
-    }
-    length = options.children().length
-    if (length <= 2) {
-        $(this).closest('div.option-controls').children('a[data-action="delete"]').addClass('disabled')
-    } else {
-        $(this).closest('div.option-controls').children('a[data-action="delete"]').removeClass('disabled')
-    }
-})
-
-$('.editor-controls > a').click(function(event){
-    event.preventDefault()
-    var action = $(this).data('action')
-    var root_accordion = $(this).closest('div').siblings('.accordion')
-    if (action == 'add-question') {
-        var obj = generate_single_question(root_container_id=`#${root_accordion.attr('id')}`)
-        $(obj).appendTo($root).hide().fadeIn()
-    } else if (action == 'add-block') {
-        var obj = generate_block(root_container_id=`#${root_accordion.attr('id')}`)
-        $(obj).appendTo($root).hide().fadeIn()
-        var block_container = $(`#element${element_index-1}`).children().find('.accordion')
-        Sortable.create(block_container.get(0), {handle: '.move-handle', onEnd: function(evt) {renumber_blocks()}})
-        var question = generate_single_question(root_container_id=`#${block_container.attr('id')}`)
-        block_container.append(question)
-        block_container.find('.panel-controls > a[data-action="delete"]').addClass('disabled')
-    } else if (action == 'discard') {
-        window.location.href = '/admin/settings/questions/'
-    } else if (action == 'delete') {
-        $.ajax({
-            url: '/admin/settings/questions/delete/',
-            type: 'POST',
-            data: JSON.stringify({
-                'id': id,
-                'action': action
-            }),
-            contentType: 'application/json',
-            success: function(response) {
-                window.location.href = '/admin/settings/questions/'
-            },
-            error: function(response) {
-                error_response(response)
-            }
-        })
-    } else if (action == 'save') {
-        var input = parse_input()
-        var def = $('.dataset-default').is(':checked')
-        var name = $('.dataset-name').val()
-        var creator = $('.dataset-creator').val()
-        console.log([def, name, creator])
-        $.ajax({
-            url: target,
-            type: 'POST',
-            data: JSON.stringify({
-                'id': id,
-                'action': 'upload',
-                'data': input,
-                'default': def,
-                'name': name,
-                'creator': creator
-            }),
-            contentType: 'application/json',
-            success: function(response) {
-                window.location.href = '/admin/settings/questions/'
-            },
-            error: function(response) {
-                error_response(response)
-            }
-        })
-    }
-    renumber_blocks()
-})
-
-// Question Type Select Menu Listener
-$root.on('change', '.form-select.question-type', function(event) {
-    event.preventDefault()
-    var type = $(this).val()
-    var options = $(this).closest('div.input-group').siblings('.options')
-    var option_controls = $(this).closest('div.input-group').siblings('.option-controls')
-    var correct = $(this).closest('div.input-group').siblings().find('.question-correct')
-    if (type == 'Yes/No') {
-        options.empty()
-        correct.empty()
-        var opt = `
-            <div class="input-group mb-3">
-                <span class="input-group-text">0</span>
-                <input type="text" class="form-control" value="Yes" disabled>
-            </div>
-            <div class="input-group mb-3">
-                <span class="input-group-text">1</span>
-                <input type="text" class="form-control" value="No" disabled>
-            </div>
-        `
-        $(opt).appendTo(options).hide().fadeIn()
-        option_controls.children('a').addClass('disabled')
-        var cor = `
-            <option value ="0" default>0</option>
-            <option value="1">1</option>
-        `
-        correct.append(cor)
-    } else {
-        option_controls.children('a').removeClass('disabled')
-        options.find('input').removeAttr('disabled')
-        if (options.children().length <= 2 ){
-            option_controls.children('a[data-action="delete"]').addClass('disabled')
-        }
-    }
-})
-
-// Data and Rendering Functions
-function renumber_blocks () {
-    $( ".block-number" ).each(function(index) {
-        $( this ).text($( this ).closest('.accordion-item').index() + 1)
-    })
-}
-
-function parse_input() {
-    var data = []
-    var element = {}
-    var question = {}
-    var block_container
-    var q_no = 0
-    $root.children().each(function(index) {
-        element = {}
-        if ($(this).data('type') == 'block') {
-            element['type'] = 'block'
-            element['question_header'] = $(this).find('.block-header-text').val()
-            element['questions'] = []
-            block_container = $(this).children().find('.accordion')
-            block_container.children().each(function(index) {
-                question = {}
-                question['q_no'] = q_no
-                question['text'] = $(this).find('.question-text').val()
-                question['q_type'] = $(this).find('.question-type').val()
-                question['correct'] = parseInt($(this).find('.question-correct').val())
-                question['options'] = []
-                $(this).find('.options').find('input').each(function(index) {
-                    question['options'].push($(this).val())
-                })
-                question['tags'] = $(this).find('.question-tags').val().split('\r\n')
-                element['questions'].push(question)
-                q_no ++
-            })
-        } else if ( $(this).data('type') == 'question') {
-            element['type'] = 'question'
-            element['q_no'] = q_no
-            element['text'] = $(this).find('.question-text').val()
-            element['q_type'] = $(this).find('.question-type').val()
-            element['correct'] = parseInt($(this).find('.question-correct').val())
-            element['options'] = []
-            $(this).find('.options').find('input').each(function(index) {
-                element['options'].push($(this).val())
-            })
-            element['tags'] = $(this).find('.question-tags').val().split('\r\n')
-            q_no ++
-        }
-        data.push(element)
-    })
-    return data
-}
-
-function parse_data(data) {
-    var block, obj, new_block, block_container, question, _question, new_question, options, correct, opt, tags
-    for (let c = 0; c < data.length; c++) {
-        block = data[c]
-        if (block['type'] == 'block') {
-            obj = generate_block(root_container_id=`#${$root.attr('id')}`)
-            $root.append(obj)
-            new_block = $(`#element${element_index-1}`)
-            new_block.find('.block-header-text').val(block['question_header']).trigger('change')
-            block_container = $(`#element${element_index-1}`).children().find('.accordion')
-            Sortable.create(block_container.get(0), {handle: '.move-handle', onEnd: function(evt) {renumber_blocks()}})
-            for (let _c = 0; _c < block['questions'].length; _c ++) {
-                question = block['questions'][_c]
-                _question = generate_single_question(root_container_id=`#${block_container.attr('id')}`)
-                block_container.append(_question)
-                if (block_container.children().length <= 1) {
-                    block_container.find('.panel-controls > a[data-action="delete"]').addClass('disabled')
-                } else {
-                    block_container.find('.panel-controls > a[data-action="delete"]').removeClass('disabled')
-                }
-                new_question = $(`#element${element_index-1}`)
-                new_question.find('.question-text').val(question['text']).trigger('change')
-                new_question.find('.question-type').val(question['q_type']).trigger('change')
-                correct = new_question.find('.question-correct')
-                if (question['q_type'] != 'Yes/No') {
-                    options = new_question.find('.options')
-                    options.empty()
-                    correct.empty()
-                    for ( var __c = 0; __c < question['options'].length; __c++) {
-                        option = question['options'][__c]
-                        opt = `
-                            <div class="input-group mb-3">
-                                <span class="input-group-text">${__c}</span>
-                                <input type="text" class="form-control" value="${option}">
-                            </div>
-                        `
-                        options.append(opt)
-                        correct.append(`<option value="${__c}">${__c}</option>`)
-                    }
-                }
-                correct.val(String(question['correct']))
-                tags = question['tags'].join('\r\n')
-                new_question.find('.question-tags').val(tags)
-            }
-        } else {
-            question = block
-            obj = generate_single_question(root_container_id=`#${$root.attr('id')}`)
-            $root.append(obj)
-            new_question = $(`#element${element_index-1}`)
-            new_question.find('.question-text').val(question['text']).trigger('change')
-            new_question.find('.question-type').val(question['q_type']).trigger('change')
-            correct = new_question.find('.question-correct')
-            if (question['q_type'] != 'Yes/No') {
-                options = new_question.find('.options')
-                options.empty()
-                correct.empty()
-                for ( var _c = 0; _c < question['options'].length; _c++) {
-                    option = question['options'][_c]
-                    opt = `
-                        <div class="input-group mb-3">
-                            <span class="input-group-text">${_c}</span>
-                            <input type="text" class="form-control" value="${option}">
-                        </div>
-                    `
-                    options.append(opt)
-                    correct.append(`<option value="${_c}">${_c}</option>`)
-                }
-            }
-            correct.val(String(question['correct']))
-            tags = question['tags'].join('\r\n')
-            new_question.find('.question-tags').val(tags)
-        }
-    }
-    renumber_blocks()
-}
-
-// Content Generator Functions
-function generate_single_question(root_container_id) {
-    if (root_container_id == `#${$root.attr('id')}`) {
-        var block_button = `
-            <a href="javascript:void(0)" class="btn btn-primary" data-action="add-block" title="Add Block Above" aria-title="Add Block Above" data-bs-toggle="collapse" data-bs-target>
-                <i class="bi bi-folder-plus"></i>
-            </a>
-        `
-    } else {
-        var block_button = ''
-    }
-    var question = `
-        <div class="accordion-item" id="element${element_index}" data-type="question">
-            <h2 class="accordion-header" id="element${element_index}-header">
-                <div class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#element${element_index}-content" aria-expanded="true" aria-controls="element${element_index}-content">
-                    <div class="float-start">
-                        <div class="accordion-caption">
-                            <span class="block-number"></span>. 
-                            Question
-                        </div>
-                    </div>
-                    <div class="panel-controls float-end">
-                        <a href="javascript:void(0)" class="btn btn-success move-handle" data-action="move-question" title="Move Question" aria-title="Move Question" data-bs-toggle="collapse" data-bs-target>
-                            <i class="bi bi-arrows-move"></i>
-                        </a>
-                        ${block_button}
-                        <a href="javascript:void(0)" class="btn btn-primary" data-action="add-question" title="Add Question Above" aria-title="Add Question Above" data-bs-toggle="collapse" data-bs-target>
-                            <i class="bi bi-file-plus-fill"></i>
-                        </a>
-                        <a href="javascript:void(0)" class="btn btn-danger" data-action="delete" title="Delete Block" aria-title="Delete Block" data-bs-toggle="collapse" data-bs-target>
-                            <i class="bi bi-trash-fill"></i>
-                        </a>
-                    </div>
-                </div>
-            </h2>
-            <div id="element${element_index}-content" class="accordion-collapse collapse" aria-labelledby="element${element_index}-header" data-bs-parent="${root_container_id}">
-                <div class="accordion-body">
-                    <div class="input-group mb-3">
-                        <span class="input-group-text">Question</span>
-                        <textarea type="text" class="form-control question-text">Enter question here.</textarea>
-                    </div>
-                    <div class="input-group mb-3">
-                        <span class="input-group-text">Question Type</span>
-                        <select class="form-select question-type">
-                            <option value ="Multiple Choice" default>Multiple Choice</option>
-                            <option value="Yes/No">Yes/No</option>
-                            <option value="List">Ordered List</option>
-                        </select>
-                    </div>
-                    <label class="form-label">Options</label>
-                    <ul class="options">
-                        <div class="input-group mb-3">
-                            <span class="input-group-text">0</span>
-                            <input type="text" class="form-control" value="Option 0">
-                        </div>
-                        <div class="input-group mb-3">
-                            <span class="input-group-text">1</span>
-                            <input type="text" class="form-control" value="Option 1">
-                        </div>
-                    </ul>
-                    <div class="option-controls">
-                        <a href="javascript:void(0)" class="btn btn-danger disabled" data-action="delete" title="Delete Question" aria-title="Delete Question">
-                            <i class="bi bi-patch-minus-fill"></i>
-                            Delete
-                        </a>
-                        <a href="javascript:void(0)" class="btn btn-success" data-action="add" title="Add Question" aria-title="Add Question">
-                            <i class="bi bi-patch-plus-fill"></i>
-                            Add
-                        </a>
-                    </div>
-                    <div class="input-group mb-3">
-                        <span class="input-group-text">Correct</span>
-                        <select class="form-select question-correct">
-                            <option value ="0" default>0</option>
-                            <option value="1">1</option>
-                        </select>
-                    </div>
-                    <div class="input-group mb-3">
-                        <span class="input-group-text">Tags</span>
-                        <textarea type="text" class="form-control question-tags"></textarea>
-                    </div>
-                </div>
-            </div>
-        </div>
-    `
-    element_index ++
-    return question
-}
-
-function generate_block(root_container_id) {
-    var block = `
-        <div class="accordion-item" id="element${element_index}" data-type="block">
-            <h2 class="accordion-header" id="element${element_index}-header">
-                <div class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#element${element_index}-content" aria-expanded="true" aria-controls="element${element_index}-content">
-                    <div class="float-start">
-                        <div class="accordion-caption">
-                            <span class="block-number"></span>. 
-                            Block
-                        </div>
-                    </div>
-                    <div class="panel-controls float-end">
-                        <a href="javascript:void(0)" class="btn btn-success move-handle" data-action="move-question" title="Move Question" aria-title="Move Question" data-bs-toggle="collapse" data-bs-target>
-                            <i class="bi bi-arrows-move"></i>
-                        </a>
-                        <a href="javascript:void(0)" class="btn btn-primary" data-action="add-block" title="Add Block Above" aria-title="Add Block Above" data-bs-toggle="collapse" data-bs-target>
-                            <i class="bi bi-folder-plus"></i>
-                        </a>
-                        <a href="javascript:void(0)" class="btn btn-primary" data-action="add-question" title="Add Question Above" aria-title="Add Question Above" data-bs-toggle="collapse" data-bs-target>
-                            <i class="bi bi-file-plus-fill"></i>
-                        </a>
-                        <a href="javascript:void(0)" class="btn btn-danger" data-action="delete" title="Delete Block" aria-title="Delete Block" data-bs-toggle="collapse" data-bs-target>
-                            <i class="bi bi-trash-fill"></i>
-                        </a>
-                    </div>
-                </div>
-            </h2>
-            <div id="element${element_index}-content" class="accordion-collapse collapse" aria-labelledby="element${element_index}-header" data-bs-parent="${root_container_id}">
-                <div class="accordion-body">
-                    <div class="input-group mb-3">
-                        <span class="input-group-text">Block Header</span>
-                        <textarea type="text" class="form-control block-header-text">Enter the header text for this block of questions.</textarea>
-                    </div>
-                    <div class="accordion" id="element${element_index}-questions">
-                    </div>
-                    <div class="block-controls">
-                        <a href="javascript:void(0)" class="btn btn-success" data-action="add-question" title="Add Question" aria-title="Add Question">
-                            <i class="bi bi-file-plus-fill"></i>
-                            Add Question
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    `
-    element_index ++
-    return block
-}
-
-// Fetch data once page finishes loading
-$(window).on('load', function() {
-    $.ajax({
-        url: target,
-        type: 'POST',
-        data: JSON.stringify({
-            'id': id,
-            'action': 'fetch'
-        }),
-        contentType: 'application/json',
-        success: function(response) {
-            parse_data(response['data'])
-        },
-        error: function(response) {
-            console.log(response)
-        }
-    })
-})
-
-// Viewer Render Function
-function render_viewer() {
-    $viewer_panel.fadeIn()
-    $viewer_panel.empty()
-    var heading = document.createElement('h3')
-    heading.innerText = 'View Questions'
-    $viewer_panel.append(heading)
-    var data = parse_input()
-    var block
-    var obj
-    for (let i = 0; i < data.length; i++) {
-        block = data[i]
-        obj = document.createElement('div')
-        obj.classList = 'block'
-        if (block['type'] == 'question') {
-            text = document.createElement('p')
-            text.innerHTML = `<strong>Question ${block['q_no'] + 1}.</strong> ${block['text']}`
-            obj.append(text)
-            question_body = document.createElement('div')
-            question_body.className ='question-body'
-            type = document.createElement('p')
-            type.innerHTML = `<strong>Question Type:</strong> ${block['q_type']}`
-            question_body.append(type)
-            options = document.createElement('p')
-            options.innerHTML = '<strong>Options:</strong>'
-            option_list = document.createElement('ul')
-            for (let _i = 0; _i < block['options'].length; _i++) {
-                option = document.createElement('li')
-                option.innerHTML = block['options'][_i]
-                if (block['correct'] == _i) {
-                    option.innerHTML += ' <span class="badge rounded-pill bg-success">Correct</span>'
-                }
-                option_list.append(option)
-            }
-            options.append(option_list)
-            question_body.append(options)
-            tags = document.createElement('p')
-            tags.innerHTML = `<strong>Tags:</strong>`
-            tag_list = document.createElement('ul')
-            for (let _i = 0; _i < block['tags'].length; _i++) {
-                tag = document.createElement('li')
-                tag.innerHTML = block['tags'][_i]
-                tag_list.append(tag)
-            }
-            tags.append(tag_list)
-            question_body.append(tags)
-            obj.append(question_body)
-        } else if (block['type'] == 'block') {
-            meta = document.createElement('p')
-            meta.innerHTML = `<strong>Block ${i+1}.</strong> ${block['questions'].length} questions.`
-            obj.append(meta)
-            header = document.createElement('blockquote')
-            header.innerText = block['question_header']
-            obj.append(header)
-            var block_question = document.createElement('div')
-            var question
-            block_question.className = 'question-block'
-            for (let _i = 0; _i < block['questions'].length; _i++) {
-                question = block['questions'][_i]
-                text = document.createElement('p')
-                text.innerHTML = `<strong>Question ${question['q_no'] + 1}.</strong> ${question['text']}`
-                block_question.append(text)
-                question_body = document.createElement('div')
-                question_body.className ='question-body'
-                type = document.createElement('p')
-                type.innerHTML = `<strong>Question Type:</strong> ${question['q_type']}`
-                question_body.append(type)
-                options = document.createElement('p')
-                options.innerHTML = '<strong>Options:</strong>'
-                option_list = document.createElement('ul')
-                for (let __i = 0; __i < question['options'].length; __i++) {
-                    option = document.createElement('li')
-                    option.innerHTML = question['options'][__i]
-                    if (question['correct'] == __i) {
-                        option.innerHTML += ' <span class="badge rounded-pill bg-success">Correct</span>'
-                    }
-                    option_list.append(option)
-                }
-                options.append(option_list)
-                question_body.append(options)
-                tags = document.createElement('p')
-                tags.innerHTML = `<strong>Tags:</strong>`
-                tag_list = document.createElement('ul')
-                for (let __i = 0; __i < question['tags'].length; __i++) {
-                    tag = document.createElement('li')
-                    tag.innerHTML = question['tags'][__i]
-                    tag_list.append(tag)
-                }
-                tags.append(tag_list)
-                question_body.append(tags)
-                block_question.append(question_body)
-                obj.append(block_question)
-            }
-        }
-        $viewer_panel.append(obj)
-    }
-}

ref-test/app/editor/static/js/script.js

@@ -1,115 +0,0 @@
-// Menu Highlight Scripts
-const menuItems = document.getElementsByClassName('nav-link');
-for(let i = 0; i < menuItems.length; i++) {
-    if(menuItems[i].pathname == window.location.pathname) {
-        menuItems[i].classList.add('active');
-    }
-}
-const dropdownItems = document.getElementsByClassName('dropdown-item');
-for(let i = 0; i< dropdownItems.length; i++) {
-    if(dropdownItems[i].pathname == window.location.pathname) {
-        dropdownItems[i].classList.add('active');
-        $( "#" + dropdownItems[i].id ).closest( '.dropdown' ).find('.dropdown-toggle').addClass('active');
-    }
-}
-
-// General Post Method Form Processing Script
-$('form.form-post').submit(function(event) {
-    
-    var $form = $(this);
-    var data = $form.serialize();
-    var url = $(this).prop('action');
-    var rel_success = $(this).data('rel-success');
-
-    $.ajax({
-        url: url,
-        type: 'POST',
-        data: data,
-        dataType: 'json',
-        success: function(response) {
-            if (response.redirect_to) {
-                window.location.href = response.redirect_to;
-            }
-            else {
-                window.location.href = rel_success;
-            }
-        },
-        error: function(response) {
-            error_response(response);
-        }
-    });
-
-    event.preventDefault();
-});
-
-function error_response(response) {
-
-    const $alert = $("#alert-box");
-    $alert.html('');
-
-    if (typeof response.responseJSON.error === 'string' || response.responseJSON.error instanceof String) {
-        $alert.html(`
-        <div class="alert alert-danger alert-dismissible fade show" role="alert">
-            <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
-            ${response.responseJSON.error}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-        </div>
-        `);
-    } else if (response.responseJSON.error instanceof Array) {
-        var output = ''
-        for (let i = 0; i < response.responseJSON.error.length; i ++) {
-            output += `
-            <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
-                ${response.responseJSON.error[i]}
-                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-            </div>
-            `;
-            $alert.html(output);
-        }
-    }
-
-    $alert.focus()
-}
-
-// Dismiss Cookie Alert
-$('#dismiss-cookie-alert').click(function(event){
-
-    $.ajax({
-        url: '/cookies/',
-        type: 'POST',
-        data: {
-            time: Date.now()
-        },
-        dataType: 'json',
-        success: function(response){
-            console.log(response);
-        },
-        error: function(response){
-            console.log(response);
-        }
-    })
-
-    event.preventDefault();
-})
-
-// Create New Dataset
-$('.create-new-dataset').click(function(event){
-    $.ajax({
-        url: '/api/editor/new/',
-        type: 'POST',
-        data: {
-            time: Date.now()
-        },
-        dataType: 'json',
-        success: function(response){
-            if (response.redirect_to) {
-                window.location.href = response.redirect_to;
-            }
-        },
-        error: function(response){
-            console.log(response);
-        }
-    })
-    event.preventDefault()
-})

ref-test/app/editor/templates/editor/components/base.html

@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <link
-            href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
-            rel="stylesheet"
-            integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
-            crossorigin="anonymous">
-        <link
-            rel="stylesheet"
-            href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.1/font/bootstrap-icons.css">
-        <link 
-            rel="stylesheet"
-            href="{{ url_for('.static', filename='css/style.css') }}"
-        />
-        {% block style %}
-        {% endblock %}
-        <title>{% block title %} SKA Referee Test | Admin Console {% endblock %}</title>
-        {% include "editor/components/og-meta.html" %}
-    </head>
-    <body class="bg-light">
-
-        {% block navbar %}
-            {% include "editor/components/navbar.html" %}
-        {% endblock %}
-
-        <div class="container">
-            {% block top_alerts %}
-                {% include "editor/components/server-alerts.html" %}
-            {% endblock %}
-            {% block content %}{% endblock %}
-        </div>
-
-        <footer class="container site-footer mt-5">
-            {% block footer %}
-                {% include "editor/components/footer.html" %}
-            {% endblock %}
-        </footer>
-
-        <!-- JQuery, Popper, and Bootstrap js dependencies -->
-        <script
-            src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4="
-            crossorigin="anonymous">
-        </script>
-        <script>
-            window.jQuery || document.write(`<script src="{{ url_for('.static', filename='js/jquery-3.6.0.min.js') }}"><\/script>`)
-        </script>
-        <script src="https://cdn.jsdelivr.net/npm/sortablejs@latest/Sortable.min.js"></script>
-        <script
-            src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js"
-            integrity="sha384-7+zCNj/IqJ95wo16oMtfsKbZ9ccEh31eOz1HGyDuCQ6wgnyJNSYdrPa03rtR1zdB"
-            crossorigin="anonymous">
-        </script>
-        <script
-            src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js"
-            integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13"
-            crossorigin="anonymous"
-        ></script>
-        <!-- Custom js -->
-        <script type="text/javascript">
-            var csrf_token = "{{ csrf_token() }}";
-        
-            $.ajaxSetup({
-                beforeSend: function(xhr, settings) {
-                    if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
-                        xhr.setRequestHeader("X-CSRFToken", csrf_token);
-                    }
-                }
-            });
-        </script>
-        <script
-            type="text/javascript"
-            src="{{ url_for('.static', filename='js/script.js') }}"
-        ></script>
-        {% block script %}
-        {% endblock %}
-    </body>
-</html>

ref-test/app/editor/templates/editor/components/client-alerts.html

@@ -1 +0,0 @@
-<div id="alert-box" tabindex="-1"></div>

ref-test/app/editor/templates/editor/components/datatable.html

@@ -1,28 +0,0 @@
-{% extends "editor/components/base.html" %}
-{% block datatable_css %}
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/dataTables.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/buttons/2.0.1/css/buttons.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/colreorder/1.5.5/css/colReorder.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/fixedheader/3.2.0/css/fixedHeader.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/keytable/2.6.4/css/keyTable.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/responsive/2.2.9/css/responsive.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/searchbuilder/1.3.0/css/searchBuilder.dataTables.min.css"/>
-{% endblock %}
-{% block datatable_scripts %}
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jszip/2.5.0/jszip.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/1.11.3/js/dataTables.bootstrap5.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/dataTables.buttons.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.bootstrap5.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.colVis.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.html5.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.print.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/colreorder/1.5.5/js/dataTables.colReorder.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/fixedheader/3.2.0/js/dataTables.fixedHeader.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/keytable/2.6.4/js/dataTables.keyTable.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/responsive/2.2.9/js/dataTables.responsive.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/responsive/2.2.9/js/responsive.bootstrap5.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/searchbuilder/1.3.0/js/dataTables.searchBuilder.min.js"></script>
-{% endblock %}

ref-test/app/editor/templates/editor/components/footer.html

@@ -1,2 +0,0 @@
-<p>This web app was developed and is maintained by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
-<p>All questions in the test are &copy; The Scottish Korfball Association {{ now.year }}. All rights are reserved.</p>

ref-test/app/editor/templates/editor/components/input-forms.html

@@ -1,4 +0,0 @@
-{% extends "admin/components/base.html" %}
-{% import "bootstrap/wtf.html" as wtf %}
-{% block top_alerts %}
-{% endblock %}

ref-test/app/editor/templates/editor/components/navbar.html

@@ -1,117 +0,0 @@
-<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark">
-    <div class="container">
-        <a href="{{ url_for('admin._home') }}" class="navbar-brand mb-0 h1">RefTest | Admin</a>
-        <button
-            class="navbar-toggler"
-            type="button"
-            data-bs-toggle="collapse"
-            data-bs-target="#navbar"
-            aria-controls="navbar"
-            aria-expanded="false"
-            aria-label="Toggle Navigation"
-        >
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse justify-content-end" id="navbar">
-            <ul class="navbar-nav">
-                {% if not current_user.is_authenticated %}
-                    <li class="nav-item" id="nav-login">
-                        <a href="{{ url_for('admin._login') }}" id="link-login" class="nav-link">Log In</a>
-                    </li>
-                {% endif %}
-                {% if current_user.is_authenticated %}
-                    <li class="nav-item" id="nav-results">
-                        <a href="{{ url_for('admin._view_entries') }}" id="link-results" class="nav-link">View Results</a>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-tests">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-tests"
-                            role="button"
-                            href="{{ url_for('admin._tests') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Exams
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-settings"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='active') }}" id="link-active" class="dropdown-item">Active</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='scheduled') }}" id="link-scheduled" class="dropdown-item">Scheduled</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='expired') }}" id="link-expired" class="dropdown-item">Expired</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='all') }}" id="link-all" class="dropdown-item">All</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='create') }}" id="link-create" class="dropdown-item">Create</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-settings">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-account"
-                            role="button"
-                            href="{{ url_for('admin._settings') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Settings
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-settings"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._settings') }}" id="link-settings" class="dropdown-item">View Settings</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._users') }}" id="link-users" class="dropdown-item">Users</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._questions') }}" id="link-questions" class="dropdown-item">Manage Questions</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('view._view') }}" id="link-editor" class="dropdown-item">View Questions</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('editor._editor') }}" id="link-editor" class="dropdown-item">Edit Questions</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-account">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-account"
-                            role="button"
-                            href="{{ url_for('admin._update_user', id=current_user.id) }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Account
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-account"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._update_user', id=current_user.id) }}" id="link-account" class="dropdown-item">Account Settings</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._logout') }}" id="link-logout" class="dropdown-item">Log Out</a>
-                            </li>
-                        </ul>
-                    </li>
-                {% endif %}
-            </ul>
-        </div>
-    </div>
-</nav>

ref-test/app/editor/templates/editor/components/secondary-navs/tests.html

@@ -1,23 +0,0 @@
-<div class="navbar navbar-expand-sm navbar-light bg-light">
-    <div class="container-fluid">
-    <div class="expand navbar-expand justify-content-center" id="navbar_secondary">
-        <ul class="nav nav-pills">
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='active') }}">Active</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='scheduled') }}">Scheduled</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='expired') }}">Expired</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='all') }}">All</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='create') }}">Create</a>
-            </li>
-        </ul>
-    </div>
-    </div>
-</div>

ref-test/app/editor/templates/editor/components/server-alerts.html

@@ -1,43 +0,0 @@
-{% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-        {% set cookie_flash_flag = namespace(value=False) %}
-        {% for category, message in messages %}
-            {% if category == "error" %}
-                <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                    <i class="bi bi-exclamation-triangle-fill" title="Error" aria-title="Error"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "success" %}
-                <div class="alert alert-success alert-dismissible fade show" role="alert">
-                    <i class="bi bi-check2-circle" title="Success" aria-title="Success"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "warning" %}
-                <div class="alert alert-warning alert-dismissible fade show" role="alert">
-                    <i class="bi bi-info-circle-fill" aria-title="Warning" title="Warning"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "cookie_alert" %}
-                {% if not cookie_flash_flag.value %}
-                    <div class="alert alert-primary alert-dismissible fade show" id="cookie-alert" role="alert">
-                        <i class="bi bi-info-circle-fill" title="Cookie Alert" aria-title="Cookie Alert"></i>
-                        {{ message|safe }}
-                        <div class="d-flex justify-content-center w-100">
-                            <button type="button" id="dismiss-cookie-alert" class="btn btn-success" data-bs-dismiss="alert" aria-label="Close">Accept</button>
-                        </div>
-                    </div>
-                    {% set cookie_flash_flag.value = True %}
-                {% endif %}
-            {% else %}
-                <div class="alert alert-primary alert-dismissible fade show" role="alert">
-                    <i class="bi bi-info-circle-fill" title="Alert"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% endif %}
-        {% endfor %}
-    {% endif %}
-{% endwith %}

ref-test/app/editor/templates/editor/console.html

@@ -1,150 +0,0 @@
-{% extends "editor/components/base.html" %}
-
-{% block style %}
-<link 
-    rel="stylesheet"
-    href="{{ url_for('.static', filename='css/editor.css') }}"
-/>
-{% endblock %}
-
-{% block content %}
-    <h1>Editor</h1>
-    <div class="container">
-        <p class="lead">
-            Use this console to edit the questions in this dataset. For more information on using the editor console, click on the the blue Information button. To preview the questions in the current dataset, click on the green View Questions button.
-        </p>
-    </div>
-    <div class="container control-panel">
-        <button class="btn btn-primary" aria-title="Information" title="Information" data-action="info"><i class="bi bi-info-circle-fill"></i></button>
-        <button class="btn btn-success" aria-title="View Questions" title="View Questions" data-action="view"><i class="bi bi-book-fill"></i></button>
-    </div>
-    <div class="container info-panel">
-        <h3>
-            About the Editor Console
-        </h3>
-        <p>
-            This console will allow you to edit the question data for the RefTest App.
-            All of the questions will be visually displayed as blocks on the screen that you can minimise, expand, and rearrange.
-        </p>
-        <p>
-            Blocks can be of two types: <strong>Blocks</strong> of multiple related questions, and <strong>Single Questions</strong> that are not part of a block.
-            You can add, remove, or edit both Blockss and Questions through this editor.
-        </p>
-        <p>
-            <strong>Blocks</strong> are useful when you have a section of the test that contains multiple questions that are related to each other, for example if there is a scenario-based section where a series of questions are about the same situation.
-        </p>
-        <p>
-            Blocks can contain any number of questions within them, but cannot contain nested blocks.
-        </p>
-        <p>
-            When you set up a block, you can also add <strong>header text</strong> that will be displayed with each question.
-            You can use this to provide common information for a scenario across a series of questions.
-        </p>
-        <p>
-            Questions come in three types:
-            <ul>
-                <li>
-                    <strong>Yes/No</strong> for when there is only a yes or no option, 
-                </li>
-                <li>
-                    <strong>Multiple Choice</strong> for your regular multiple choice questions, and
-                </li>
-                <li>
-                    <strong>Ordered List</strong> for multiple choice questions that will be displayed in the same order as listed here.
-                </li>
-            </ul>
-        </p>
-        <p>
-            Normally, multiple choice questions will have the order of the options randomised.
-        </p>
-        <p>
-            Questions will be displayed to candidates in a randomised order.
-            Blocks of questions will be kept together, but the order within the block will also be randomised.
-        </p>
-        <p><strong>Do not use language that will assume the flow of questions, such as saying &lsquo;the previous question&rsquo;, or &lsquo;the next question&rsquo;, etc. because of randomisation.</strong></p>
-        <p>
-            Each option will be referenced by an <strong>index number</strong>.
-            Make sure to select which index number represents the <strong>correct option</strong>.
-        </p>
-        <p>
-            You will also be able to define <strong>tags</strong> for each question.
-            Separate multiple tags in <strong>new lines</strong>.
-            Make sure to keep the spelling, capitalisation, and punctuation for tags consistent.
-        </p>
-        <p class="lead">
-            Placeholder for Questions Remaining in a Block
-        </p>
-        <p>
-            In order to show how many questions are remaining inside a block, e.g. to say &lsquo;the next n questions are about a specific scenario&rsquo;, use the placeholder <code>&lt;block_remaining_questions&gt;</code>.
-        </p>
-    </div>
-    <div class="container viewer-panel">
-    </div>
-    <div class="container editor-panel">
-        <h3>
-            Edit Questions
-        </h3>
-        <div class="container dataset-metadata">
-            <div class="input-group mb-3">
-                <span class="input-group-text">Dataset Name</span>
-                <input type="text" class="form-control dataset-name" value="{{ dataset.get_name() }}">
-            </div>
-            <div class="input-group mb-3">
-                <span class="input-group-text">Author</span>
-                <select class="form-select dataset-creator">
-                    {% for user in users %}
-                        <option value="{{ user.id }}" {{default if dataset.user == user else None }}>{{ user.get_username() }}</option>
-                    {% endfor %}
-                </select>
-            </div>
-            <div class="input-group mb-3">
-                <span class="input-group-text">Last Updated</span>
-                <span class="form-control">
-                    {{ dataset.date.strftime('%d %b %Y %H:%M') }}
-                </span>
-            </div>
-            <div class="input-group mb-3">
-                <span class="input-group-text">
-                    <input type="checkbox" aria-label="Default" class="dataset-default" {% if dataset.default %}checked{% endif %}>
-                </span>
-                <span class="form-control">
-                    Make Dataset the Default
-                </select>
-            </div>
-        </div>
-        <div class="accordion" id="editor-root" data-target="{{ url_for('api._editor') }}" data-id="{{ dataset.id }}">
-        </div>
-        {% include "editor/components/client-alerts.html" %}
-        <div class="editor-controls container">
-            <a href="javascript:void(0);" class="btn btn-primary" data-action="add-block" title="Add Block" aria-title="Add Block">
-                <i class="bi bi-folder-plus"></i>
-                Add Block
-            </a>
-            <a href="javascript:void(0);" class="btn btn-primary" data-action="add-question" title="Add Question" aria-title="Add Question">
-                <i class="bi bi-file-plus-fill"></i>
-                Add Question
-            </a>
-        </div>
-        <div class="editor-controls container">
-            <a href="javascript:void(0);" class="btn btn-warning" data-action="discard" title="Discard Changes" aria-title="Discard Changes">
-                <i class="bi bi-x-circle-fill"></i>
-                Discard Changes
-            </a>
-            <a href="javascript:void(0);" class="btn btn-danger {% if datasets <=1 or dataset.default or dataset.tests|length > 0 %}disabled{% endif %}" data-action="delete" title="Delete" aria-title="Delete">
-                <i class="bi bi-trash-fill"></i>
-                Delete
-            </a>
-            <a href="javascript:void(0);" class="btn btn-success" data-action="save" title="Save" aria-title="Save">
-                <i class="bi bi-cloud-arrow-up-fill"></i>
-                Save Changes
-            </a>
-        </div>
-    </div>
-{% endblock %}
-
-{% block script %}
-<script
-    type="text/javascript"
-    src="{{ url_for('.static', filename='js/editor.js') }}"
-></script>
-{% endblock %}

ref-test/app/editor/templates/editor/index.html

@@ -1,31 +0,0 @@
-{% extends "editor/components/input-forms.html" %}
-
-{% block content %}
-    <div class="form-container">
-        <form name="form-editor" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for(request.endpoint, **request.view_args) }}">
-            {% include "admin/components/server-alerts.html" %}
-            <h2 class="form">Edit Questions</h2>
-            {{ form.hidden_tag() }}
-            <div class="form-select-input">
-                {{ form.dataset(placeholder="Select Question Dataset") }}
-                {{ form.dataset.label }}
-            </div>
-            {% include "admin/components/client-alerts.html" %}
-            <div class="container form-submission-button">
-                <div class="row">
-                    <div class="col text-center">
-                        <button class="btn btn-md btn-success btn-block" type="submit">
-                            <i class="bi bi-pencil-fill button-icon"></i>
-                            Edit
-                        </button>
-                        <button title="New" class="btn btn-md btn-primary create-new-dataset">
-                            <i class="bi bi-cloud-plus-fill button-icon"></i>
-                            New
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    
-    </div>
-{% endblock %}

ref-test/app/editor/views.py

@@ -1,45 +0,0 @@
-from ..forms.admin import EditDataset
-from ..models import Dataset, User
-from ..tools.data import check_dataset_exists
-from ..tools.forms import get_dataset_choices, send_errors_to_client
-from ..tools.logs import write
-
-from flask import Blueprint, jsonify, render_template
-from flask.helpers import abort, flash, redirect, request, url_for
-from flask_login import login_required
-
-editor = Blueprint(
-    name='editor',
-    import_name=__name__,
-    template_folder='templates',
-    static_folder='static'
-)
-
-@editor.route('/', methods=['GET','POST'])
-@login_required
-def _editor():
-    form = EditDataset()
-    form.dataset.choices = get_dataset_choices()
-    if request.method == 'POST':
-        if form.validate_on_submit():
-            id = request.form.get('dataset')
-            return jsonify({'success': 'Selected dataset', 'redirect_to': url_for('editor._editor_console', id=id)}),200
-        return send_errors_to_client(form=form)
-    form.process()
-    return render_template('/editor/index.html', form=form)
-
-@editor.route('/<string:id>/')
-@check_dataset_exists
-@login_required
-def _editor_console(id:str=None):
-    try:
-        dataset = Dataset.query.filter_by(id=id).first()
-        datasets = Dataset.query.count()
-        users = User.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not dataset:
-        flash('Invalid dataset ID.', 'error')
-        return redirect(url_for('admin._questions'))
-    return render_template('/editor/console.html', dataset=dataset, datasets=datasets, users=users)

ref-test/app/extensions.py

@@ -1,10 +0,0 @@
-from flask_bootstrap import Bootstrap
-bootstrap = Bootstrap()
-from flask_wtf.csrf import CSRFProtect
-csrf = CSRFProtect()
-from flask_sqlalchemy import SQLAlchemy
-db = SQLAlchemy()
-from flask_login import LoginManager
-login_manager = LoginManager()
-from flask_mail import Mail
-mail = Mail()

ref-test/app/models/__init__.py

@@ -1,4 +0,0 @@
-from .entry import Entry
-from .test import Test
-from .user import User
-from .dataset import Dataset

ref-test/app/models/dataset.py

@@ -1,133 +0,0 @@
-from ..extensions import db
-from ..tools.encryption import decrypt, encrypt
-from ..tools.logs import write
-
-from flask import current_app as app
-from flask.helpers import flash
-from flask_login import current_user
-from werkzeug.utils import secure_filename
-
-from datetime import datetime
-from json import dump
-from os import path, remove
-from pathlib import Path
-from uuid import uuid4
-
-class Dataset(db.Model):
-    id = db.Column(db.String(36), index=True, primary_key=True)
-    name = db.Column(db.String(128), nullable=False)
-    tests = db.relationship('Test', backref='dataset')
-    creator_id = db.Column(db.String(36), db.ForeignKey('user.id'))
-    date = db.Column(db.DateTime, nullable=False)
-    default = db.Column(db.Boolean, default=False, nullable=True)
-    accessed = db.Column(db.DateTime, nullable=True)
-    locked = db.Column(db.Boolean, default=False, nullable=True)
-
-    def __repr__(self):
-        return f'<Dataset {self.id}>.'
-
-    @property
-    def generate_id(self): raise AttributeError('generate_id is not a readable attribute.')
-
-    generate_id.setter
-    def generate_id(self): self.id = uuid4().hex
-
-    @property
-    def set_name(self): raise AttributeError('set_name is not a readable attribute.')
-    
-    set_name.setter
-    def set_name(self, name:str): self.name = encrypt(name)
-    
-    def get_name(self): return decrypt(self.name)
-
-    def make_default(self):
-        try:
-            for dataset in Dataset.query.all(): dataset.default = False
-        except Exception as exception:
-            write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-            return False, f'Database error {exception}.'
-        self.default = True
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-            return False, f'Database error {exception}.'
-        write('system.log', f'Dataset {self.id} set as default by {current_user.get_username()}.')
-        flash(message='Dataset set as default.', category='success')
-        return True, f'Dataset set as default.'
-    
-    def delete(self):
-        if self.default:
-            message = 'Cannot delete the default dataset.'
-            flash(message, 'error')
-            return False, message
-        try:
-            if Dataset.query.count() == 1:
-                message = 'Cannot delete the only dataset.'
-                flash(message, 'error')
-                return False, message
-        except Exception as exception:
-            write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-            return False, f'Database error {exception}.'
-        write('system.log', f'Dataset {self.id} deleted by {current_user.get_username()}.')
-        filename = secure_filename('.'.join([self.id,'json']))
-        data = Path(app.config.get('DATA'))
-        file_path = path.join(data, 'questions', filename)
-        try:
-            db.session.delete(self)
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when trying to delete dataset {self.id}: {exception}')
-            return False, f'Database error: {exception}'
-        remove(file_path)
-        return True, 'Dataset deleted.'
-    
-    def create(self, data:list, default:bool=False):
-        self.generate_id()
-        timestamp = datetime.now()
-        file_path = self.get_file()
-        with open(file_path, 'w') as file:
-            dump(data, file, indent=2)
-        self.date = timestamp
-        self.creator = current_user
-        if default: self.make_default()
-        write('system.log', f'New dataset {self.get_name()} added by {current_user.get_username()}.')
-        try:
-            db.session.add(self)
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when trying to crreate dataset {self.id}: {exception}')
-            return False, f'Database error: {exception}'
-        return True, 'Dataset created.'
-
-    def check_file(self):
-        filename = secure_filename('.'.join([self.id,'json']))
-        data = Path(app.config.get('DATA'))
-        file_path = path.join(data, 'questions', filename)
-        if not path.isfile(file_path): return False, 'Data file is missing.'
-        return True, 'Data file found.'
-
-    def get_file(self):
-        filename = secure_filename('.'.join([self.id,'json']))
-        data = Path(app.config.get('DATA'))
-        file_path = path.join(data, 'questions', filename)
-        return file_path
-    
-    def update(self, data:list=None, default:bool=False):
-        self.date = datetime.now()
-        if default: self.make_default()
-        file_path = self.get_file()
-        with open(file_path, 'w') as file:
-            dump(data, file, indent=2)
-        write('system.log', f'Dataset {self.id} edited by {current_user.get_username()}.')
-        flash(f'Dataset {self.get_name()} successfully edited.', 'success')
-        try:
-            db.session.add(self)
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when trying to update dataset {self.id}: {exception}')
-            return False, f'Database error: {exception}'
-        return True, 'Dataset successfully edited.'

ref-test/app/models/entry.py

@@ -1,199 +0,0 @@
-from ..extensions import db, mail
-from ..tools.encryption import decrypt, encrypt
-from ..tools.logs import write
-from .test import Test
-
-from flask_login import current_user
-from flask_mail import Message
-from sqlalchemy_json import MutableJson
-
-from datetime import datetime, timedelta
-from uuid import uuid4
-
-class Entry(db.Model):
-    id = db.Column(db.String(36), index=True, primary_key=True)
-    first_name = db.Column(db.String(128), nullable=False)
-    surname = db.Column(db.String(128), nullable=False)
-    email = db.Column(db.String(128), nullable=False)
-    club = db.Column(db.String(128), nullable=True)
-    test_id = db.Column(db.String(36), db.ForeignKey('test.id'))
-    user_code = db.Column(db.String(6), nullable=True)
-    start_time = db.Column(db.DateTime, index=True, nullable=True)
-    end_time = db.Column(db.DateTime, index=True, nullable=True)
-    status = db.Column(db.String(16), nullable=True)
-    valid = db.Column(db.Boolean, default=True, nullable=True)
-    answers = db.Column(MutableJson, nullable=True)
-    result = db.Column(MutableJson, nullable=True)
-    
-    def __repr__(self):
-        return f'<New entry by {self.first_name} {self.surname}> was added with <id {self.id}>.'
-
-    @property
-    def generate_id(self): raise AttributeError('generate_id is not a readable attribute.')
-
-    generate_id.setter
-    def generate_id(self): self.id = uuid4().hex
-
-    @property
-    def set_first_name(self): raise AttributeError('set_first_name is not a readable attribute.')
-
-    set_first_name.setter
-    def set_first_name(self, name:str): self.first_name = encrypt(name)
-
-    def get_first_name(self): return decrypt(self.first_name)
-
-    @property
-    def set_surname(self): raise AttributeError('set_first_name is not a readable attribute.')
-
-    set_surname.setter
-    def set_surname(self, name:str): self.surname = encrypt(name)
-
-    def get_surname(self): return decrypt(self.surname)
-
-    @property
-    def set_email(self): raise AttributeError('set_email is not a readable attribute.')
-
-    set_email.setter
-    def set_email(self, email:str): self.email = encrypt(email)
-
-    def get_email(self): return decrypt(self.email)
-
-    @property
-    def set_club(self): raise AttributeError('set_club is not a readable attribute.')
-
-    set_club.setter
-    def set_club(self, club:str): self.club = encrypt(club)
-
-    def get_club(self): return decrypt(self.club)
-
-    def ready(self):
-        self.generate_id()
-        try:
-            db.session.add(self)
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when preparing new entry for {self.get_surname()}, {self.get_first_name()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('tests.log', f'New test ready for {self.get_surname()}, {self.get_first_name()} with id {self.id}.')
-        return True, f'Test ready.'
-
-    def start(self):
-        self.start_time = datetime.now()
-        self.status = 'started'
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when starting test for {self.get_surname()}, {self.get_first_name()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('tests.log', f'Test started by {self.get_surname()}, {self.get_first_name()} with id {self.id}.')
-        return True, f'New test started with id {self.id}.'
-
-    def complete(self, answers:dict=None, result:dict=None):
-        self.end_time = datetime.now()
-        self.answers = answers
-        self.result = result
-        delta = timedelta(minutes=int(0 if self.test.time_limit is None else self.test.time_limit)+1)
-        if not self.test.time_limit or self.end_time <= self.start_time + delta:
-            self.status = 'completed'
-            self.valid = True
-        else:
-            self.status = 'late'
-            self.valid = False
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when submitting entry for {self.get_surname()}, {self.get_first_name()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('tests.log', f'Test completed by {self.get_surname()}, {self.get_first_name()} with id {self.id}.')
-        return True, f'Test entry completed for id {self.id}.'
-
-    def validate(self):
-        if self.valid: return False, f'The entry is already valid.'
-        if self.status == 'started': return False, 'The entry is still pending.'
-        self.valid = True
-        self.status = 'completed'
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when validating entry {self.id}: {exception}')
-            return False, f'Database error: {exception}'
-        write('system.log', f'The entry {self.id} has been validated by {current_user.get_username()}.')
-        return True, f'The entry {self.id} has been validated.'
-
-    def delete(self):
-        id = self.id
-        name = f'{self.get_first_name()} {self.get_surname()}'
-        try:
-            db.session.delete(self)
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when deleting entry {id}: {exception}')
-            return False, f'Database error: {exception}'
-        write('system.log', f'The entry {id} by {name} has been deleted by {current_user.get_username()}.')
-        return True, 'Entry deleted.'
-    
-    def notify_result(self):
-        score = round(100*self.result['score']/self.result['max'])
-        tags_low = { tag: tag_result['max'] - tag_result['scored'] for tag, tag_result in self.result['tags'].items() }
-        sorted_low_tags = sorted(tags_low.items(), key=lambda x: x[1], reverse=True)
-        tag_output = [ tag[0] for tag in sorted_low_tags[0:3] if tag[1] > 3]
-        revision_plain = ''
-        revision_html = ''
-        if self.result['grade'] == 'pass':
-            flavour_text = """Well done on successfully completing the refereeing theory exam. We really appreciate members of our community taking the time to get qualified to referee.
-            """
-        elif self.result['grade'] == 'merit':
-            flavour_text = """Congratulations on achieving a merit in the refereeing exam. We are delighted that members of our community work so hard with refereeing.
-            """
-        elif self.result['grade'] == 'fail':
-            flavour_text = """Unfortunately, you were not successful in passing the theory exam in this attempt. We hope that this does not dissuade you, and that you try again in the future.
-            """
-            revision_plain = f"""Based on your answers, we would also suggest you brush up on the following topics for your next attempt:\n\n
-                {','.join(tag_output)}\n\n
-            """
-            revision_html = f"""<p>Based on your answers, we would also suggest you brush up on the following topics for your next attempt:</p>
-                <ul>
-                <li>{'</li><li>'.join(tag_output)}</li>
-                </ul>
-            """
-        email = Message(
-            subject='RefTest | SKA Refereeing Theory Exam Results',
-            recipients=[self.get_email()],
-            body=f"""
-            SKA Refereeing Theory Exam
-            Candidate Results
-            Dear {self.get_first_name()},
-            This email is to confirm that you have taken the SKA Refereeing Theory Exam. Your submission has been evaluated and your results are as follows:
-            {self.get_surname()}, {self.get_first_name()}
-            Email Address: {self.get_email()}
-            {f'Club: {self.get_club()}' if self.club else ''}
-            Date of Exam: {self.end_time.strftime('%d %b %Y')}
-            Score: {score}%
-            Grade: {self.result['grade']}
-            {flavour_text}
-            {revision_plain}
-            Thank you for taking the time to become a qualified referee.
-            Best wishes,
-            SKA Refereeing
-            """,
-            html=f"""
-            <h1>SKA Refereeing Theory Exam</h1>
-            <h2>Candidate Results</h2>
-            <p>Dear {self.get_first_name()},</p>
-            <p>This email is to confirm that you have taken the SKA Refereeing Theory Exam. Your submission has been evaluated and your results are as follows:</p>
-            <h3>{self.get_surname()}, {self.get_first_name()}</h3>
-            <p><strong>Email Address</strong>: {self.get_email()}</p>
-            {f'<p><strong>Club</strong>: {self.get_club()}</p>' if self.club else ''}
-            <h1>{score}%</h1>
-            <h2>{self.result['grade']}</h2>
-            <p>{flavour_text}</p>
-            {revision_html}
-            <p>Thank you for taking the time to become a qualified referee.</p>
-            <p>Have a nice day!</p>
-            <p>Best wishes, <br/> SKA Refereeing</p>
-            """
-        )
-        try: mail.send(email)
-        except Exception as exception: write('system.log', f'SMTP Error when trying to notify results to {self.get_surname()}, {self.get_first_name()} with error: {exception}')

ref-test/app/models/test.py

@@ -1,137 +0,0 @@
-from ..extensions import db
-from ..tools.logs import write
-
-from flask_login import current_user
-from sqlalchemy_json import MutableJson
-
-from datetime import date, datetime
-import secrets
-from uuid import uuid4
-
-class Test(db.Model):
-    id = db.Column(db.String(36), index=True, primary_key=True)
-    code = db.Column(db.String(36), index=True, nullable=False)
-    start_date = db.Column(db.DateTime, index=True, nullable=True)
-    end_date = db.Column(db.DateTime, nullable=True)
-    time_limit = db.Column(db.Integer, nullable=True)
-    creator_id = db.Column(db.String(36), db.ForeignKey('user.id'))
-    dataset_id = db.Column(db.String(36), db.ForeignKey('dataset.id'))
-    adjustments = db.Column(MutableJson, nullable=True)
-    entries = db.relationship('Entry', backref='test')
-
-    def __repr__(self):
-        return f'<Test with code {self.get_code()} was created by {current_user.get_username()}.>'
-
-    @property
-    def generate_id(self): raise AttributeError('generate_id is not a readable attribute.')
-
-    generate_id.setter
-    def generate_id(self): self.id = uuid4().hex
-
-    @property
-    def generate_code(self): raise AttributeError('generate_code is not a readable attribute.')
-
-    generate_code.setter
-    def generate_code(self): self.code = secrets.token_hex(6).lower()
-
-    def get_code(self):
-        code = self.code.upper()
-        return '—'.join([code[:4], code[4:8], code[8:]])
-
-    def create(self):
-        self.generate_id()
-        self.generate_code()
-        self.creator = current_user
-        errors = []
-        if self.start_date.date() < date.today():
-            errors.append('The start date cannot be in the past.')
-        if self.end_date.date() < date.today():
-            errors.append('The expiry date cannot be in the past.')
-        if self.end_date < self.start_date:
-            errors.append('The expiry date cannot be before the start date.')
-        if errors:
-            return False, errors
-        try:
-            db.session.add(self)
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when creating test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('system.log', f'Test with code {self.get_code()} created by {current_user.get_username()}.')
-        return True, f'Test with code {self.get_code()} has been created.'
-    
-    def delete(self):
-        if self.entries: return False, f'Cannot delete a test with submitted entries.'
-        db.session.delete(self)
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when deleting test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('system.log', f'Test with code {self.get_code()} has been deleted by {current_user.get_username()}.')
-        return True, f'Test with code {self.get_code()} has been deleted.'
-    
-    def start(self):
-        now = datetime.now()
-        if self.start_date.date() > now.date():
-            self.start_date = now
-            try: db.session.commit()
-            except Exception as exception:
-                db.session.rollback()
-                write('system.log', f'Database error when launching test {self.get_code()}: {exception}')
-                return False, f'Database error: {exception}'
-            write('system.log', f'Test with code {self.get_code()} has been started by {current_user.get_username()}.')
-            return True,  f'Test with code {self.get_code()} has been started.'
-        return False, f'Test with code {self.get_code()} has already started.'
-
-    def end(self):
-        now = datetime.now()
-        if self.end_date >= now:
-            self.end_date = now
-            try: db.session.commit()
-            except Exception as exception:
-                db.session.rollback()
-                write('system.log', f'Database error when closing test {self.get_code()}: {exception}')
-                return False, f'Database error: {exception}'
-            write('system.log', f'Test with code {self.get_code()} ended by {current_user.get_username()}.')
-            return True, f'Test with code {self.get_code()} has been ended.'
-        return False, f'Test with code {self.get_code()} has already ended.'
-
-    def add_adjustment(self, time:int):
-        adjustments = self.adjustments if self.adjustments is not None else {}
-        code = secrets.token_hex(3).lower()
-        adjustments[code] = time
-        self.adjustments = adjustments
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when adding adjustment to test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('system.log', f'Time adjustment for {time} minutes with code {code} added to test {self.get_code()} by {current_user.get_username()}.')
-        return True, f'Time adjustment for {time} minutes added to test {self.get_code()}. This can be accessed using the user code {code.upper()}.'
-
-    def remove_adjustment(self, code:str):
-        if not self.adjustments: return False, f'There are no adjustments configured for test {self.get_code()}.'
-        self.adjustments.pop(code)
-        if not self.adjustments: self.adjustments = None
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when deleting adjustment from test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('system.log', f'Time adjustment for with code {code} has been removed from test {self.get_code()} by {current_user.get_username()}.')
-        return True, f'Time adjustment for with code {code} has been removed from test {self.get_code()}.'
-
-    def update(self, start_date:datetime=None, end_date:datetime=None, time_limit:int=None):
-        if not start_date and not end_date and time_limit is None: return False, 'There were no changes requested.'
-        if start_date: self.start_date = start_date
-        if end_date: self.end_date = end_date
-        if time_limit is not None: self.time_limit = time_limit
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when updating test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('system.log', f'Test with code {self.get_code()} has been updated by user {current_user.get_username()}.')
-        return True, f'Test with code {self.get_code()} has been updated by.'

ref-test/app/models/user.py

@@ -1,259 +0,0 @@
-from ..extensions import db, mail
-from ..tools.encryption import decrypt, encrypt
-from ..tools.logs import write
-
-from flask import jsonify, session
-from flask.helpers import flash, url_for
-from flask_login import current_user, login_user, logout_user, UserMixin
-from flask_mail import Message
-from werkzeug.security import check_password_hash, generate_password_hash
-
-import secrets
-from uuid import uuid4
-class User(UserMixin, db.Model):
-    id = db.Column(db.String(36), index=True, primary_key=True)
-    username = db.Column(db.String(128), nullable=False)
-    password = db.Column(db.String(128), nullable=False)
-    email = db.Column(db.String(128), nullable=False)
-    reset_token = db.Column(db.String(20), index=True, nullable=True)
-    verification_token = db.Column(db.String(20), nullable=True)
-    tests = db.relationship('Test', backref='creator')
-    datasets = db.relationship('Dataset', backref='creator')
-
-    def __repr__(self):
-        return f'<user {self.username}> was added with <id {self.id}>.'
-    
-    @property
-    def generate_id(self): raise AttributeError('generate_id is not a readable attribute.')
-
-    generate_id.setter
-    def generate_id(self): self.id = uuid4().hex
-
-    @property
-    def set_username(self): raise AttributeError('set_username is not a readable attribute.')
-    
-    set_username.setter
-    def set_username(self, username:str): self.username = encrypt(username)
-    
-    def get_username(self): return decrypt(self.username)
-
-    @property
-    def set_password(self): raise AttributeError('set_password is not a readable attribute.')
-
-    set_password.setter
-    def set_password(self, password:str): self.password = generate_password_hash(password, method="sha256")
-
-    def verify_password(self, password:str): return check_password_hash(self.password, password)
-
-    @property
-    def set_email(self): raise AttributeError('set_email is not a readable attribute.')
-    
-    set_email.setter
-    def set_email(self, email:str): self.email = encrypt(email)
-    
-    def get_email(self): return decrypt(self.email)
-
-    def register(self, notify:bool=False, password:str=None):
-        self.generate_id()
-        try: users = User.query.all()
-        except Exception as exception:
-            write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-            return False, f'Database error {exception}.'
-        for user in users:
-            if user.get_username() == self.get_username(): return False, f'Username {self.get_username()} already in use.'
-            if user.get_email() == self.get_email(): return False, f'Email address {self.get_email()} already in use.'
-        self.set_password(password=password)
-        try:
-            db.session.add(self)
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when registering user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('users.log', f'User \'{self.get_username()}\' was created with id \'{self.id}\'.')
-        if notify:
-            email = Message(
-                subject='RefTest | Registration Confirmation',
-                recipients=[self.email],
-                body=f"""
-                Hello {self.get_username()},\n\n
-                You have been registered as an administrator on the SKA RefTest App!\n\n
-                You can access your account using the username '{self.get_username()}'\n\n
-                Your password is as follows:\n\n
-                {password}\n\n
-                You can log in to the admin console via the following URL, where you can administer the test or change your password:\n\n
-                {url_for('admin._home', _external=True)}\n\n
-                Have a nice day!\n\n
-                SKA Refereeing
-                """,
-                html=f"""
-                <p>Hello {self.get_username()},</p>
-                <p>You have been registered as an administrator on the SKA RefTest App!</p>
-                <p>You can access your account using the username '{self.get_username()}'</p>
-                <p>Your password is as follows:</p>
-                <strong>{password}</strong>
-                <p>You can log in to the admin console via the following URL, where you can administer the test or change your password:</p>
-                <p><a href='{url_for('admin._home', _external=True)}'>{url_for('admin._home', _external=True)}</a></p>
-                <p>Have a nice day!</p>
-                <p>SKA Refereeing</p>
-                """
-            )
-            try: mail.send(email)
-            except Exception as exception: write('system.log', f'SMTP Error while trying to notify new user account creation to {self.get_username()} with error: {exception}')
-        return True, f'User {self.get_username()} was created successfully.'
-
-    def login(self, remember:bool=False):
-        login_user(self, remember = remember)
-        write('users.log', f'User \'{self.get_username()}\' has logged in.')
-        flash(message=f'Welcome {self.get_username()}', category='success')
-    
-    def logout(self):
-        session['remembered_username'] = self.get_username()
-        logout_user()
-        write('users.log', f'User \'{self.get_username()}\' has logged out.')
-        flash(message='You have successfully logged out.', category='success')
-    
-    def reset_password(self):
-        new_password = secrets.token_hex(12)
-        self.set_password(new_password)
-        self.reset_token = secrets.token_urlsafe(16)
-        self.verification_token = secrets.token_urlsafe(16)
-        email = Message(
-            subject='RefTest | Password Reset',
-            recipients=[self.get_email()],
-            body=f"""
-            Hello {self.get_username()},\n\n
-            This email was generated because we received a request to reset the password for your administrator account for the SKA RefTest app.\n\n
-            If you did not make this request, please ignore this email.\n\n
-            If you did make this request, then you have two options to recover your account.\n\n
-            Your password has been reset to the following:\n\n
-            {new_password}\n\n
-            You may use this to log back in to your account, and subsequently change your password to something more suitable.\n\n
-            Alternatively, you may visit the following private link using your unique token to override your password. Copy and paste the following link in a web browser. Please note that this token is only valid once:\n\n
-            {url_for('admin._reset', token = self.reset_token, verification = self.verification_token, _external = True)}\n\n
-            Hopefully, this should enable access to your account once again.\n\n
-            Have a nice day!\n\n
-            SKA Refereeing
-            """,
-            html=f"""
-            <p>Hello {self.get_username()},</p>
-            <p>This email was generated because we received a request to reset the password for your administrator account for the SKA RefTest app.</p>
-            <p>If you did not make this request, please ignore this email.</p>
-            <p>If you did make this request, then you have two options to recover your account.</p>
-            <p>Your password has been reset to the following:</p>
-            <strong>{new_password}</strong>
-            <p>You may use this to log back in to your account, and subsequently change your password to something more suitable.</p>
-            <p>Alternatively, you may visit the following private link using your unique token to override your password. Copy and paste the following link in a web browser. Please note that this token is only valid once:</p>
-            <p><a href='{url_for('admin._reset', token = self.reset_token, verification = self.verification_token, _external = True)}'>{url_for('admin._reset', token = self.reset_token, verification = self.verification_token, _external = True)}</a></p>
-            <p>Hopefully, this should enable access to your account once again.</p>
-            <p>Have a nice day!</p>
-            <p>SKA Refereeing</p>
-            """
-        )
-        try: mail.send(email)
-        except Exception as exception:
-            write('system.log', f'SMTP Error while trying to reset password for {self.get_username()} with error: {exception}')
-            db.session.rollback()
-            return jsonify({'error': f'SMTP Error: {exception}'}), 500
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when resetting password for user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
-        return jsonify({'success': 'Your password reset link has been generated.'}), 200
-
-    def clear_reset_tokens(self):
-        self.reset_token = self.verification_token = None
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when resetting clearing reset tokens for user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
-    
-    def delete(self, notify:bool=False):
-        username = self.get_username()
-        email_address = self.get_email()
-        try:
-            db.session.delete(self)
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when deleting user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
-        message = f'User \'{username}\' was deleted by \'{current_user.get_username()}\'.'
-        write('users.log', message)
-        if notify:
-            email = Message(
-                subject='RefTest | Account Deletion',
-                recipients=[email_address],
-                bcc=[current_user.get_email()],
-                body=f"""
-                Hello {username},\n\n
-                Your administrator account for the SKA RefTest App, as well as all data associated with the account, have been deleted by {current_user.get_username()}.\n\n
-                If you believe this was done in error, please contact them immediately.\n\n
-                If you would like to register to administer the app, please ask an existing administrator to create a new account.\n\n
-                Have a nice day!\n\n
-                SKA Refereeing
-                """,
-                html=f"""
-                <p>Hello {username},</p>
-                <p>Your administrator account for the SKA RefTest App, as well as all data associated with the account, have been deleted by {current_user.get_username()}.</p>
-                <p>If you believe this was done in error, please contact them immediately.</p>
-                <p>If you would like to register to administer the app, please ask an existing administrator to create a new account.</p>
-                <p>Have a nice day!</p>
-                <p>SKA Refereeing</p>
-                """
-            )
-            try: mail.send(email)
-            except Exception as exception: write('system.log', f'SMTP Error when trying to delete account {username} with error: {exception}')
-        return True, message
-
-    def update(self, password:str=None, email:str=None, notify:bool=False):
-        if not password and not email: return False, 'There were no changes requested.'
-        if password: self.set_password(password)
-        old_email = self.get_email()
-        if email:
-            try:
-                for entry in User.query.all():
-                    if entry.get_email() == email and not entry == self: return False, f'The email address {email} is already in use.'
-            except Exception as exception:
-                write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-                return False, f'Database error {exception}.'
-            self.set_email(email)
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when updating user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
-        _current_user = 'command line' if not current_user else 'anonymous' if not current_user.is_authenticated else current_user.get_username()
-        write('system.log', f'Information for user {self.get_username()} has been updated by {_current_user}.')
-        if notify:
-            message = Message(
-                subject='RefTest | Account Update',
-                recipients=[email],
-                bcc=[old_email,current_user.get_email()],
-                body=f"""
-                Hello {self.get_username()},\n\n
-                Your administrator account for the SKA RefTest App has been updated by {_current_user}.\n\n
-                Your new account details are as follows:\n\n
-                Email: {email}\n
-                Password: {password if password else '<same as old>'}\n\n
-                You can update your email address and password by logging in to the admin console using the following URL:\n\n
-                {url_for('admin._home', _external=True)}\n\n
-                Have a nice day!\n\n
-                SKA Refereeing
-                """,
-                html=f"""
-                <p>Hello {self.get_username()},</p>
-                <p>Your administrator account for the SKA RefTest App has been updated by {_current_user}.</p>
-                <p>Your new account details are as follows:</p>
-                <p>Email: {email} <br/> Password: <strong>{password if password else '&lt;same as old&gt;'}</strong></p>
-                <p>You can update your email address and password by logging in to the admin console using the following URL:</p>
-                <p><a href='{url_for('admin._home', _external=True)}'>{url_for('admin._home', _external=True)}</a></p>
-                <p>Have a nice day!</p>
-                <p>SKA Refereeing</p>
-                """
-            )
-            try: mail.send(message)
-            except Exception as exception: write('system.log', f'SMTP Error when trying to update account {self.get_username()} with error: {exception}')
-        return True, f'Account {self.get_username()} has been updated.'

ref-test/app/quiz/static/js/quiz.js

@@ -1,650 +0,0 @@
-// Bind Listeners
-
-$("input[name='font-select']").change(function(){
-    let $choice = $(this).val()
-    set_font($choice)
-})
-
-$("input[name='font-size']").change(function(){
-    let $choice = $(this).val()
-    set_font_size($choice)
-})
-
-$("input[name='bg-select']").change(function(){
-    let $choice = $(this).val()
-    set_bg_colour($choice)
-})
-
-$(".bg-select-area").click(function(event){
-    $(this).find("input[name='bg-select']").prop("checked", true).change()
-})
-
-$("#btn-toggle-navigator").click(function(event){
-    check_answered()
-    update_navigator()
-    if ($quiz_navigator.is(":hidden")) {
-        if ($quiz_settings.is(":visible")) {
-            toggle_settings = true
-            $quiz_settings.fadeOut()
-        }
-        $quiz_render.fadeOut()
-        $quiz_navigator.fadeIn()
-        $(".navigator-text").fadeIn()
-        $(".review-text").fadeOut()
-        toggle_navigator = false
-        $(window).scrollTop(0)
-    } else {
-        $quiz_navigator.fadeOut()
-        if (toggle_settings) {
-            $quiz_settings.fadeIn()
-            $(window).scrollTop(0)
-            toggle_settings = false
-        } else {
-            $quiz_render.fadeIn()
-            $(window).scrollTop(0)
-        }
-    }
-    event.preventDefault()
-})
-
-$("#btn-toggle-settings").click(function(event){
-    if (($quiz_settings).is(":hidden")) {
-        if ($quiz_navigator.is(":visible")) {
-            toggle_navigator = true
-            $quiz_navigator.fadeOut()
-        }
-        $quiz_render.fadeOut()
-        $quiz_settings.fadeIn()
-        $(window).scrollTop(0)
-        toggle_settings = false
-    } else {
-        $quiz_settings.fadeOut()
-        if (toggle_navigator) {
-            $quiz_navigator.fadeIn()
-            toggle_navigator = false
-            $(window).scrollTop(0)
-        } else {
-            $quiz_render.fadeIn()
-            $(window).scrollTop(0)
-        }
-    }
-    event.preventDefault()
-})
-
-$(".btn-quiz-return").click(function(event){
-    $quiz_navigator.fadeOut()
-    $quiz_settings.fadeOut()
-    $quiz_render.fadeIn()
-    $(window).scrollTop(0)
-    toggle_settings = false
-    toggle_navigator = false
-    event.preventDefault()
-})
-
-$(".btn-dummy").click(function(event){
-    event.preventDefault()
-})
-
-$("#navigator-container").on("click", ".q-navigator-button", function(event){
-    check_answered()
-    update_navigator()
-    current_question = parseInt($(this).prop("name"))
-    $quiz_navigator.fadeOut()
-    $quiz_render.fadeIn()
-    $question_title.focus()
-    $(window).scrollTop(0)
-    toggle_navigator = false
-    toggle_settings = false
-    render_question()
-    check_flag()
-    event.preventDefault()
-})
-
-$(".q-question-nav").click(function(event){
-    check_answered()
-    update_navigator()
-    if ($(this).prop("id") == "q-nav-next") {
-        if (current_question < questions.length) {
-            current_question ++
-        }
-    } else if ($(this).prop("id") == "q-nav-prev") {
-        if (current_question > 0) {
-            current_question --
-        }
-    } else if ($(this).hasClass("q-navigator-button")) {
-        current_question = $(this).prop("name")
-        $quiz_render.fadeIn()
-        $quiz_navigator.fadeOut()
-        toggle_navigator = false
-        toggle_settings = false
-    }
-    render_question()
-    check_flag()
-    event.preventDefault()
-})
-
-$("#q-nav-flag").click(function(event){
-    if (question_status[current_question] != 1) {
-        question_status[current_question] = 1
-        $(this).removeClass().addClass("btn btn-warning")
-        $(this).prop("title", "Question Flagged for revision. Click to un-flag.")
-    } else {
-        question_status[current_question] = 0
-        $(this).removeClass().addClass("btn btn-secondary")
-        $(this).prop("title", "Question Un-Flagged. Click to flag for revision.")
-    }
-    window.localStorage.setItem('question_status', JSON.stringify(question_status))
-    update_navigator()
-    event.preventDefault()
-})
-
-$("#btn-start-quiz").click(function(event){
-
-    $.ajax({
-        url: `/api/questions/`,
-        type: 'POST',
-        data: JSON.stringify({'id': id}),
-        contentType: "application/json",
-        success: function(response) {
-            $("#btn-start-quiz").fadeOut()
-            $(".btn-quiz-return").fadeIn()
-            $(".quiz-console").fadeIn()
-            $("#quiz-settings").fadeOut()
-            $("#quiz-navigator").fadeOut()
-            $(".quiz-start-text").fadeOut()
-            time_limit = response.time_limit
-            start_time = response.start_time
-            questions = response.questions
-            total_questions = questions.length
-            window.localStorage.setItem('questions', JSON.stringify(questions))
-            window.localStorage.setItem('start_time', JSON.stringify(start_time))
-            window.localStorage.setItem('time_limit', JSON.stringify(time_limit))
-            render_question()
-            build_navigator()
-            check_flag()
-            if (time_limit != 'null' && time_limit != null) {
-                $("#q-timer-widget").fadeIn()
-                time_remaining = get_time_remaining()
-                clock = setInterval(timer, 1000)
-            }
-            if (response.time_adjustment > 0) {
-                const $alert = $("#alert-box")
-                $alert.html(
-                    `<div class="alert alert-primary alert-dismissible fade show" role="alert">
-                    <i class="bi bi-exclamation-triangle-fill" title="Alert"></i>
-                    User code validated. Extra time of ${response.time_adjustment} minutes added to the exam time limit.
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-                `
-                )
-                $alert.focus()
-            }
-        },
-        error: function(response) {
-            error_response(response)
-        }
-    })
-
-    event.preventDefault()
-})
-
-$("#quiz-question-options").on("change", ".quiz-option", function(event){
-    $name = parseInt($(this).prop("name"))
-    $value = $(this).prop("value")
-    answers[$name] = $value
-    window.localStorage.setItem('answers', JSON.stringify(answers))
-})
-
-$("#q-review-answers").click(function(event){
-    check_answered()
-    update_navigator()
-    if ($quiz_navigator.is(":hidden")) {
-        if ($quiz_settings.is(":visible")) {
-            toggle_settings = true
-            $quiz_settings.fadeOut()
-        }
-        $quiz_render.fadeOut()
-        $quiz_navigator.fadeIn()
-        $(".navigator-text").fadeOut()
-        $(".review-text").fadeIn()
-        toggle_navigator = false
-        $(window).scrollTop(0)
-    } else {
-        $quiz_navigator.fadeOut()
-        if (toggle_settings) {
-            $quiz_settings.fadeIn()
-            toggle_settings = false
-        } else {
-            $quiz_render.fadeIn()
-        }
-    }
-    event.preventDefault()
-})
-
-$(".quiz-button-submit").click(function(event){
-    let submission = {
-        'id': id,
-        'answers': answers
-    }
-
-    $.ajax({
-        url: `/api/submit/`,
-        type: 'POST',
-        data: JSON.stringify(submission),
-        contentType: "application/json",
-        success: function(response) {
-            window.localStorage.clear()
-            window.location.href = `/result/`
-        },
-        error: function(response) {
-            error_response(response)
-        }
-    })
-
-    event.preventDefault()
-})
-
-// Functions
-
-function set_font(value = 'osdefault') {
-    let font_styles = ['arial', 'comicsans', 'opendyslexic', 'tahoma', 'verdana']
-
-    for (let i = 0; i < font_styles.length; i ++) {
-        if (font_styles[i] != value) {
-            $("body").removeClass( `q-f-${font_styles[i]}` )
-        }
-    }
-
-    if (value != 'osdefault') {
-        $("body").addClass(`q-f-${value}`)
-    }
-    
-    display_settings['font-select'] = value
-    window.localStorage.setItem('display_settings', JSON.stringify(display_settings))
-    $('input[name="font-select"][value="' + value + '"]').prop('checked', true)
-}
-
-function set_font_size(value = '14pt') {
-    let font_sizes = ['12pt', '16pt', '18pt']
-
-    for (let i = 0; i < font_sizes.length; i ++) {
-        if (font_sizes[i] != value) {
-            $("body").removeClass( `q-f-${font_sizes[i]}` )
-        }
-    }
-
-    if (value != '14pt') {
-        $("body").addClass(`q-f-${value}`)
-    }
-
-    display_settings['font-size'] = value
-    window.localStorage.setItem('display_settings', JSON.stringify(display_settings))
-    $('input[name="font-size"][value="' + value + '"]').prop('checked', true)
-}
-
-function set_bg_colour(value = 'bg-light') {
-    let backgrounds = ['bg-light', 'q-bg-light-1', 'q-bg-light-2', 'alert-primary', 'alert-secondary', 'alert-dark', 'bg-dark']
-
-    for (let i = 0; i < backgrounds.length; i ++) {
-        if (backgrounds[i] != value) {
-            $("body").removeClass(backgrounds[i])
-            if (backgrounds[i] == 'bg-dark') {
-                $("body").removeClass('text-light')
-            }
-            if (backgrounds[i] == 'alert-primary' || backgrounds[i] == 'alert-secondary' || backgrounds[i] == 'alert-dark') {
-                $("body").removeClass('text-dark')
-            }
-        }
-    }
-
-    $("body").addClass(value)
-    if (value == 'bg-dark') {
-        $("body").addClass('text-light')
-    }
-    if (value == 'alert-primary' || value == 'alert-secondary' || value == 'alert-dark') {
-        $("body").addClass('text-dark')
-    }
-
-    display_settings['bg-select'] = value
-    window.localStorage.setItem('display_settings', JSON.stringify(display_settings))
-    $('input[name="bg-select"][value="' + value + '"]').prop('checked', true)
-}
-
-function get_settings_from_storage() {
-    let display_settings = window.localStorage.getItem('display_settings')
-    if (display_settings != null) {
-        return JSON.parse(display_settings)
-    }
-    return {
-        'font-select': 'osdefault',
-        'font-size': '14pt',
-        'bg-select': 'bg-light'
-    }
-}
-
-function apply_settings(settings) {
-    set_font(settings['font-select'])
-    set_font_size(settings['font-size'])
-    set_bg_colour(settings['bg-select'])
-}
-
-function render_question() {
-    if (current_question == 0) {
-        $nav_prev.addClass('disabled')
-    }
-    if (current_question == questions.length - 1) {
-        $nav_next.addClass('disabled')
-    }
-    if ($nav_prev.hasClass('disabled') && current_question > 0) {
-        $nav_prev.removeClass('disabled')
-    }
-    if ($nav_next.hasClass('disabled') && current_question < questions.length - 1) {
-        $nav_next.removeClass('disabled')
-    }
-    var question = questions[current_question]
-    let header_text = question.question_header
-    var block_length = 0
-    if ('block_length' in question) {
-        block_length = question['block_length']
-    }
-    var block_q_no = 0
-    if ('block_q_no' in question) {
-        block_q_no = question['block_q_no']
-    }
-    let remaining_qs = (block_length - block_q_no).toString()
-    if (block_length - block_q_no > 1) {
-        remaining_qs += ' questions'
-    } else {
-        remaining_qs += ' question'
-    }
-    header_text = header_text.replace('<block_remaining_questions>', remaining_qs)
-    $question_header.html(header_text)
-    $question_text.html(question.text)
-    $question_title.html(`Question ${current_question + 1} of ${ questions.length }.`)
-
-    var q_no = question['q_no']
-    var options = question.options
-    var options_output = ''
-    for (let i = 0; i < options.length; i ++) {
-        var add_checked = ''
-        if (q_no in answers) {
-            if (answers[q_no] == options[i][0]) {
-                add_checked = 'checked'
-            }
-        }
-        options_output += `<div class="form-check">
-            <input type="radio" class="form-check-input quiz-option" id="q${current_question}-${i}" name="${q_no}" value="${options[i][0]}" ${add_checked}>
-            <label for="q${current_question}-${i}" class="form-check-label">${options[i][1]}</label>
-        </div>`
-    }
-    $question_options.html(options_output)
-    let skipped = count_questions(-1)
-    let answered = count_questions(2)
-    let flagged = count_questions(1)
-
-    $progress_skipped.prop('title', `Skipped: ${skipped}`)
-    $progress_skipped.prop('aria-valuenow', skipped)
-    $progress_skipped.css('width', `${skipped}%`)
-    $skipped_count.text(`Skipped: ${skipped}`)
-    if (skipped < 1) {
-        $skipped_count.fadeOut()
-    } else {
-        $skipped_count.fadeIn()
-    }
-
-    $progress_flagged.prop('title', `Flagged: ${flagged}`)
-    $progress_flagged.prop('aria-valuenow', flagged)
-    $progress_flagged.css('width', `${flagged}%`)
-    $flagged_count.text(`Flagged: ${flagged}`)
-    if (flagged < 1) {
-        $flagged_count.fadeOut()
-    } else {
-        $flagged_count.fadeIn()
-    }
-
-    $progress_answered.prop('title', `Answered: ${answered}`)
-    $progress_answered.prop('aria-valuenow', answered)
-    $progress_answered.css('width', `${answered}%`)
-    $answered_count.text(`Answered: ${answered}`)
-    if (answered < 1) {
-        $answered_count.fadeOut()
-    } else {
-        $answered_count.fadeIn()
-    }
-
-    $question_title.focus()
-    $(window).scrollTop(0)
-}
-
-function check_answered() {
-    var question = questions[current_question]
-    var name = question.q_no
-    if (question_status[current_question] == 0 || question_status[current_question] == -1) {
-        if (!$(`input[name='${name}']:checked`).val()) {
-            question_status[current_question] = -1
-        } else {
-            question_status[current_question] = 2
-        }
-        window.localStorage.setItem('question_status', JSON.stringify(question_status))
-    }
-}
-
-function check_flag() {
-    if (!(current_question in question_status)) {
-        question_status[current_question] = 0
-        window.localStorage.setItem('question_status', JSON.stringify(question_status))
-    }
-    switch (question_status[current_question]) {
-        case -1:
-            $nav_flag.removeClass().addClass('btn btn-danger progress-bar-striped')
-            $nav_flag.prop("title", "Question Incomplete. Click to flag for revision.")
-            break
-        case 1:
-            $nav_flag.removeClass().addClass('btn btn-warning')
-            $nav_flag.prop("title", "Question Flagged for revision. Click to un-flag.")
-            break
-        case 2:
-            $nav_flag.removeClass().addClass('btn btn-success')
-            $nav_flag.prop("title", "Question Answered. Click to flag for revision.")
-            break
-        default:
-            $nav_flag.removeClass().addClass('btn btn-secondary')
-            $nav_flag.prop("title", "Question Un-Flagged. Click to flag for revision.")
-    }
-}
-
-function build_navigator() {
-    $nav_container.html('')
-    var output = ''
-    for (let i = 0; i < questions.length; i ++) {
-        let add_class, add_href, add_status = ''
-        switch (question_status[i]) {
-            case -1:
-                add_class = 'btn-danger progress-bar-striped'
-                add_href = 'href="#"'
-                add_status = 'Incomplete'
-                break
-            case 1:
-                add_class = 'btn-warning'
-                add_href = 'href="#"'
-                add_status = 'Flagged'
-                break
-            case 2:
-                add_class = 'btn-success'
-                add_href = 'href="#"'
-                add_status = 'Answered'
-                break
-            default:
-                add_class = 'btn-secondary disabled'
-                add_href = ''
-                add_status = 'Unseen'
-        }
-        output += `<a ${add_href} class="q-navigator-button btn ${add_class}" name=${i} title="Question ${i+1}: ${add_status}">Q${i + 1}</a>`
-    }
-    $nav_container.html(output)
-}
-
-function update_navigator() {
-    let button = $(`.q-navigator-button[name=${current_question}]`)
-    if (current_question in question_status) {
-        switch (question_status[current_question]) {
-            case -1:
-                button.removeClass().addClass("q-navigator-button btn btn-danger progress-bar-striped")
-                button.prop("title", `Question ${current_question + 1}: Incomplete`)
-                break
-            case 1:
-                button.removeClass().addClass("q-navigator-button btn btn-warning")
-                button.prop("title", `Question ${current_question + 1}: Flagged`)
-                break
-            case 2:
-                button.removeClass().addClass("q-navigator-button btn btn-success")
-                button.prop("title", `Question ${current_question + 1}: Answered`)
-                break
-            default:
-                button.removeClass().addClass("q-navigator-button btn btn-secondary disabled")
-                button.prop("title", `Question ${current_question + 1}: Unseen`)
-        }
-    }
-}
-
-function start() {
-    $("#btn-start-quiz").fadeOut()
-    $(".btn-quiz-return").fadeIn()
-    $(".quiz-console").fadeIn()
-    $("#quiz-settings").fadeOut()
-    $("#quiz-navigator").fadeOut()
-    $(".quiz-start-text").fadeOut()
-
-    questions = JSON.parse(window.localStorage.getItem('questions'))
-    total_questions = questions.length
-    start_time = window.localStorage.getItem('start_time')
-    time_limit = window.localStorage.getItem('time_limit')
-
-    let get_answers = window.localStorage.getItem('answers')
-    if (get_answers != null) {
-        answers = JSON.parse(get_answers)
-    }
-
-    let get_status = window.localStorage.getItem('question_status')
-    if (get_status != null) {
-        question_status = JSON.parse(get_status)
-    }
-
-    render_question()
-    build_navigator()
-    check_flag()
-    if (time_limit != 'null' && time_limit != null) {
-        $("#q-timer-widget").fadeIn()
-        time_remaining = get_time_remaining()
-        clock = setInterval(timer, 1000)
-    }
-}
-
-function check_started() {
-    let questions = window.localStorage.getItem('questions')
-    let time_limit = window.localStorage.getItem('time_limit')
-    let start_time = window.localStorage.getItem('start_time')
-    if (questions != null && start_time != null && time_limit != null) {
-        start()
-    }
-}
-
-function get_time_remaining() {
-    var end_time = new Date(time_limit).getTime()
-    var _start_time = new Date().getTime()
-    return end_time - _start_time
-}
-
-function timer() {
-    var hours = Math.floor((time_remaining % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
-    var minutes = Math.floor((time_remaining % (1000 * 60 * 60)) / (1000 * 60))
-    var seconds = Math.floor((time_remaining % (1000 * 60)) / 1000)
-
-    if (time_remaining > 0) {
-        var timer_display = ''
-        if (hours > 0) {
-            timer_display = `${hours.toString()}:`
-        }
-        if (minutes > 0 || hours > 0) {
-            if (minutes < 10) {
-                timer_display += `0${minutes.toString()}:`
-            } else {
-                timer_display += `${minutes.toString()}:`
-            }
-        }
-        if (seconds < 10) {
-            timer_display += `0${seconds.toString()}`
-        } else {
-            timer_display += seconds.toString()
-        }
-        $timer.html(timer_display)
-        time_remaining -= 1000
-    } else {
-        $timer.html('Expired')
-        clearInterval(clock)
-        stop()
-    }
-}
-
-function stop() {
-    $quiz_render.fadeOut()
-    $quiz_navigator.fadeOut()
-    $quiz_timeout.fadeIn()
-    $("#btn-toggle-navigator").addClass('disabled')
-    $("#btn-toggle-settings").addClass('disabled')
-}
-
-function count_questions(status) {
-    output = 0
-    for (let i = 0; i < Object.keys(question_status).length; i++) {
-        key = Object.keys(question_status)[i]
-        if (question_status[key] == status){
-            output ++
-        }
-    }
-    return output
-}
-
-// Variable Definitions
-
-const id = window.localStorage.getItem('id')
-
-var current_question = 0
-var total_questions = 0
-var question_status = {}
-var answers = {}
-var questions = []
-var time_limit, start_time, time_remaining
-
-var display_settings = get_settings_from_storage()
-
-const $quiz_settings = $("#quiz-settings")
-const $quiz_navigator = $("#quiz-navigator")
-const $quiz_render = $("#quiz-render")
-const $quiz_timeout = $("#quiz-timeout")
-const $nav_flag = $("#q-nav-flag")
-const $nav_next = $("#q-nav-next")
-const $nav_prev = $("#q-nav-prev")
-const $nav_container = $("#navigator-container")
-const $timer = $("#q-timer-display")
-var clock
-
-var toggle_settings = false
-var toggle_navigator = false
-
-const $question_title = $("#quiz-question-title")
-const $question_header = $("#quiz-question-header")
-const $question_text = $("#quiz-question-text")
-const $question_options = $("#quiz-question-options")
-
-const $progress_skipped = $("#skipped-bar")
-const $progress_answered = $("#answered-bar")
-const $progress_flagged = $("#flagged-bar")
-const $skipped_count = $("#skipped-count")
-const $answered_count = $("#answered-count")
-const $flagged_count = $("#flagged-count")
-
-// Execution on Load
-
-apply_settings(display_settings)
-check_started()

ref-test/app/quiz/templates/quiz/components/navbar.html

@@ -1,14 +0,0 @@
-<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark" id="primary-nav">
-    <div class="container">
-        <p class="navbar-brand mb-0 h1">SKA Refereeing Test</p>
-        <div class="quiz-console w-100" style="display: none;" id="q-topbar">
-            <div class="d-flex justify-content align-middle">
-                <div class="container d-flex justify-content-center">
-                    <span class="text-light q-timer" id="q-timer-widget" style="display: none;"><i class="bi bi-stopwatch-fill"></i>&nbsp;<span id="q-timer-display"></span></span>
-                </div>
-                <a href="#" class="btn btn-warning" aria-title="Question Grid" title="Question Grid" id="btn-toggle-navigator"><i class="bi bi-table"></i></a>
-                <a href="#" class="btn btn-danger" aria-title="Settings" title="Settings" id="btn-toggle-settings"><i class="bi bi-gear-fill"></i></a>
-            </div>
-        </div>
-    </div>
-</nav>

ref-test/app/quiz/templates/quiz/components/og-meta.html

@@ -1,18 +0,0 @@
-<meta name="description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta property="og:locale" content="en_UK" />
-<meta property="og:type" content="website" />
-<meta property="og:description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta property="og:url" content="{{ url_for(request.endpoint, _external = True, **(request.view_args or {})) }}" />
-<meta property="og:site_name" content="Scottish Korfball Association Referee Theory Exam" />
-<meta property="og:image" content="{{ url_for('.static', filename='favicon.png', _external = True) }}" />
-<meta property="og:image:alt" content="Logo of the SKA Refereeing Exam App" />
-<meta property="og:image:width" content="512" />
-<meta property="og:image:height" content="512" />
-<meta name="twitter:card" content="summary" />
-<meta name="twitter:description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta name="twitter:image" content="{{ url_for('.static', filename='favicon.png', _external = True) }}" />
-<meta name="twitter:image:alt" content="Logo of the SKA Refereeing Exam App" />
-<meta name="twitter:creator" content="@viveksantayana" />
-<meta name="twitter:site" content="@viveksantayana" />
-<meta name="theme-color" content="#343a40" />
-<link rel="shortcut icon" href="{{ url_for('.static', filename='favicon.ico') }}">

ref-test/app/quiz/views.py

@@ -1,108 +0,0 @@
-from ..forms.quiz import StartQuiz
-from ..models import Entry, Test
-from ..tools.forms import send_errors_to_client
-from ..tools.logs import write
-from ..tools.test import redirect_if_started
-
-from flask import Blueprint, jsonify, render_template, request, session
-from flask.helpers import abort, flash, redirect, url_for
-
-from datetime import datetime
-
-quiz = Blueprint(
-    name='quiz',
-    import_name=__name__,
-    template_folder='templates',
-    static_folder='static',
-    static_url_path='/quiz/static'
-)
-
-@quiz.route('/')
-@quiz.route('/home/')
-@redirect_if_started
-def _home():
-    return render_template('/quiz/index.html')
-
-@quiz.route('/instructions/')
-def _instructions():
-    return render_template('/quiz/instructions.html')
-
-@quiz.route('/start/', methods=['GET', 'POST'])
-def _start():
-    clubs = [
-        'Dundee Korfball Club',
-        'Edinburgh City Korfball Club',
-        'Edinburgh Mavericks Korfball Club',
-        'Edinburgh University Korfball Club',
-        'Glasgow Korfball Club',
-        'Saint Andrews University Korfball Club',
-        'Strathclyde University Korfball Club'
-    ]
-    try: entries = Entry.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    for entry in entries: clubs.append(entry.get_club())
-    clubs = list(set(clubs))
-    try: clubs.remove('')
-    except: pass
-    form = StartQuiz()
-    if request.method == 'POST':
-        if form.validate_on_submit():
-            entry = Entry()
-            entry.set_first_name(request.form.get('first_name'))
-            entry.set_surname(request.form.get('surname'))
-            entry.set_club(request.form.get('club'))
-            entry.set_email(request.form.get('email'))
-            code = request.form.get('test_code').replace('—', '').lower()
-            try: test = Test.query.filter_by(code=code).first()
-            except Exception as exception:
-                write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-                return abort(500)
-            entry.test = test
-            entry.user_code = request.form.get('user_code')
-            entry.user_code = None if entry.user_code == '' else entry.user_code.lower()
-            if not test:  return jsonify({'error': 'The exam code you entered is invalid.'}), 400
-            if entry.user_code and entry.user_code not in test.adjustments: return jsonify({'error': f'The user code you entered is not valid.'}), 400
-            if test.end_date < datetime.now(): return jsonify({'error': f'The exam code you entered expired on {test["expiry_date"].strftime("%d %b %Y %H:%M")}.'}), 400
-            if test.start_date > datetime.now(): return jsonify({'error': f'The exam has not yet opened. Your exam code will be valid from {test["start_date"].strftime("%d %b %Y %H:%M")}.'}), 400
-            success, message = entry.ready()
-            if success:
-                session['id'] = entry.id
-                return jsonify({
-                    'success': 'Received and validated test and/or user code. Redirecting to test client.',
-                    'id': entry.id
-                }), 200
-            return jsonify({'error': 'There was an error processing the user test and/or user codes.'}), 400
-        return send_errors_to_client(form=form)
-    return render_template('/quiz/start_quiz.html', form = form, clubs = clubs)
-
-@quiz.route('/quiz/')
-def _quiz():
-    id = session.get('id')
-    try:
-        if not id or not Entry.query.filter_by(id=id).first():
-            flash('Your session was not recognised. Please sign in to the quiz again.', 'error')
-            session.pop('id', None)
-            return redirect(url_for('quiz._start'))
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    return render_template('/quiz/client.html')
-
-@quiz.route('/result/')
-def _result():
-    id = session.get('id')
-    try: entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not entry: return abort(404)
-    session.pop('id',None)
-    score = round(100*entry.result['score']/entry.result['max'])
-    tags_low = { tag: tag_result['max'] - tag_result['scored'] for tag, tag_result in entry.result['tags'].items() }
-    sorted_low_tags = sorted(tags_low.items(), key=lambda x: x[1], reverse=True)
-    tag_output = [ tag[0] for tag in sorted_low_tags[0:3] if tag[1] > 3]
-    if not entry.status == 'late':
-        entry.notify_result()
-    return render_template('/quiz/result.html', entry=entry, score=score, tag_output=tag_output)

ref-test/app/root/css/style.css

@@ -1,218 +0,0 @@
-body {
-    padding: 80px 0;
-    line-height: 1.5;
-    font-size: 14pt;
-}
-
-#cookie-alert {
-    padding-right: 16px;
-}
-
-#dismiss-cookie-alert {
-    margin-top: 16px;
-    width: fit-content;
-}
-
-.button-container {
-    margin: 2rem auto;
-    width: fit-content;
-}
-
-.instruction-container {
-    margin: 2rem auto;
-}
-
-.site-footer {
-    background-color: lightgray;
-    font-size: small;
-}
-
-.site-footer p {
-    margin: 0;
-}
-
-.quiz-container {
-    max-width: 720px;
-}
-
-.form-container {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-}
-
-.form-quiz-start {
-    width: 100%;
-    max-width: 420px;
-    padding: 15px;
-    margin: auto;
-}
-
-.form-heading {
-    margin-bottom: 2rem;
-}
-
-.form-label-group {
-    position: relative;
-    margin-bottom: 2rem;
-}
-
-.form-label-group input,
-.form-label-group label {
-    padding: var(--input-padding-y) var(--input-padding-x);
-    font-size: 16pt;
-}
-
-.form-label-group label {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: block;
-    width: 100%;
-    margin-bottom: 0; /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    cursor: text; /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: -1;
-}
-
-.form-label-group input {
-    background-color: transparent;
-    border: none;
-    border-radius: 0%;
-    border-bottom: 2px solid #585858;
-}
-
-.form-label-group input:active, .form-label-group input:focus {
-    background-color: transparent;
-}
-
-.form-label-group input::-webkit-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-moz-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:not(:placeholder-shown) {
-    padding-top: calc(var(--input-padding-y) + var(--input-padding-y) * (2 / 3));
-    padding-bottom: calc(var(--input-padding-y) / 3);
-}
-  
-.form-label-group input:not(:placeholder-shown) ~ label {
-    padding-top: calc(var(--input-padding-y) / 3);
-    padding-bottom: calc(var(--input-padding-y) / 3);
-    font-size: 12px;
-    color: #777;
-}
-
-.form-check-margin {
-    margin-bottom: 2rem;
-}
-
-.checkbox input {
-    transform: scale(1.5);
-    margin-right: 1rem;
-}
-
-.signin-forgot-password {
-    font-size: 14pt;
-}
-
-.form-submission-button {
-    margin-bottom: 2rem;
-}
-
-.form-submission-button button, .form-submission-button a {
-    margin: 1rem;
-    vertical-align: middle;
-}
-
-.form-submission-button button span, .form-submission-button button svg, .form-submission-button a span, .form-submission-button a svg {
-    margin: 0 2px;
-}
-
-.results-name {
-    margin: 3rem auto;
-}
-
-.results-name .surname {
-    font-variant: small-caps;
-    font-size: 24pt;
-}
-
-.results-score {
-    margin: 2rem auto;
-    width: fit-content;
-    font-size: 36pt;
-}
-
-.results-score::after {
-    content: '%';
-}
-
-.results-grade {
-    margin: 2rem auto;
-    width: fit-content;
-    font-size: 26pt;
-}
-
-.button-icon {
-    font-size: 20px;
-    margin-right: 2px;
-}
-
-/* Change Autocomplete styles in Chrome*/
-input:-webkit-autofill,
-input:-webkit-autofill:hover, 
-input:-webkit-autofill:focus,
-textarea:-webkit-autofill,
-textarea:-webkit-autofill:hover,
-textarea:-webkit-autofill:focus,
-select:-webkit-autofill,
-select:-webkit-autofill:hover,
-select:-webkit-autofill:focus {
-  transition: background-color 5000s ease-in-out 0s;
-}
-
-/* Fallback for Edge
--------------------------------------------------- */
-@supports (-ms-ime-align: auto) {
-    .form-label-group label {
-      display: none;
-    }
-    .form-label-group input::-ms-input-placeholder {
-      color: #777;
-    }
-}
-  
-  /* Fallback for IE
-  -------------------------------------------------- */
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-    .form-label-group label {
-        display: none;
-    }
-    .form-label-group input:-ms-input-placeholder {
-        color: #777;
-    }
-}
-  

ref-test/app/root/js/script.js

@@ -1,86 +0,0 @@
-$(document).ready(function() {
-    $("#od-font-test").click(function(){
-        $("body").css("font-family", "opendyslexic3regular")
-    })
-
-    $('.test-code-input').keyup(function() {
-        var input = $(this).val().split("-").join("").split("—").join("")
-        if (input.length > 0) {
-          input = input.match(new RegExp('.{1,4}', 'g')).join("—")
-        }
-        $(this).val(input)
-    })
-})
-
-$('form[name=form-quiz-start]').submit(function(event) {
-    
-    var $form = $(this)
-    var data = $form.serialize()
-
-    $.ajax({
-        url: window.location.pathname,
-        type: 'POST',
-        data: data,
-        dataType: 'json',
-        success: function(response) {
-            var id = response.id
-            window.localStorage.setItem('id', id)
-            window.location.href = `/quiz/`
-        },
-        error: function(response) {
-            error_response(response)
-        }
-    })
-
-    event.preventDefault()
-})
-
-function error_response(response) {
-
-    const $alert = $("#alert-box")
-    $alert.html('')
-
-    if (typeof response.responseJSON.error === 'string' || response.responseJSON.error instanceof String) {
-        $alert.html(`
-        <div class="alert alert-danger alert-dismissible fade show" role="alert">
-            <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
-            ${response.responseJSON.error}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-        </div>
-        `)
-    } else if (response.responseJSON.error instanceof Array) {
-        var output = ''
-        for (let i = 0; i < response.responseJSON.error.length; i ++) {
-            output += `
-            <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
-                ${response.responseJSON.error[i]}
-                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-            </div>
-            `
-            $alert.html(output)
-        }
-    }
-}
-
-// Dismiss Cookie Alert
-$('#dismiss-cookie-alert').click(function(event){
-
-    $.ajax({
-        url: '/cookies/',
-        type: 'POST',
-        data: {
-            time: Date.now()
-        },
-        dataType: 'json',
-        success: function(response){
-            console.log(response)
-        },
-        error: function(response){
-            console.log(response)
-        }
-    })
-
-    event.preventDefault()
-
-})