From c56c0dc8221a883b3e785154173f9346ae35b8e2 Mon Sep 17 00:00:00 2001
From: Vivek Santayana <me@viveksantayana.co.uk>
Date: Mon, 6 Dec 2021 21:58:51 +0000
Subject: [PATCH] OG Meta and navbar bug fix

---
 docker-compose.yml                                     | 2 +-
 nginx/conf.d/default.conf                              | 8 ++++----
 ref-test/admin/templates/admin/components/navbar.html  | 2 +-
 ref-test/admin/templates/admin/components/og-meta.html | 2 +-
 ref-test/main.py                                       | 2 +-
 ref-test/quiz/templates/quiz/components/base.html      | 2 +-
 ref-test/quiz/templates/quiz/components/navbar.html    | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 116a049..ee017e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -69,7 +69,7 @@ services:
       - ./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:
diff --git a/nginx/conf.d/default.conf b/nginx/conf.d/default.conf
index 447440c..8b52bcc 100644
--- a/nginx/conf.d/default.conf
+++ b/nginx/conf.d/default.conf
@@ -2,13 +2,13 @@ server {
 	listen 80 default_server;
 	listen [::]:80 default_server;
 
-	# listen 443 ssl http2 default_server;
-	# listen [::]:443 ssl http2 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;
+	# 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;
diff --git a/ref-test/admin/templates/admin/components/navbar.html b/ref-test/admin/templates/admin/components/navbar.html
index a5b8d00..9f77ae1 100644
--- a/ref-test/admin/templates/admin/components/navbar.html
+++ b/ref-test/admin/templates/admin/components/navbar.html
@@ -1,6 +1,6 @@
 <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 | Admin</a>
+        <a href="{{ url_for('admin_views.home') }}" class="navbar-brand mb-0 h1">RefTest (Beta) | Admin</a>
         <button
             class="navbar-toggler"
             type="button"
diff --git a/ref-test/admin/templates/admin/components/og-meta.html b/ref-test/admin/templates/admin/components/og-meta.html
index 9c02bc6..5c63bca 100644
--- a/ref-test/admin/templates/admin/components/og-meta.html
+++ b/ref-test/admin/templates/admin/components/og-meta.html
@@ -2,7 +2,7 @@
 <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, **request.view_args, _external = True) }}" />
+<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:alt" content="Logo of the SKA Refereeing Exam App" />
diff --git a/ref-test/main.py b/ref-test/main.py
index c1f0efe..aeec7f4 100644
--- a/ref-test/main.py
+++ b/ref-test/main.py
@@ -15,7 +15,7 @@ import config
 
 def create_app():
     app = Flask(__name__)
-    app.config.from_object(config.TestingConfig())
+    app.config.from_object(config.ProductionConfig())
 
     from common.blueprints import cookie_consent
 
diff --git a/ref-test/quiz/templates/quiz/components/base.html b/ref-test/quiz/templates/quiz/components/base.html
index e0951a0..cfcd3c7 100644
--- a/ref-test/quiz/templates/quiz/components/base.html
+++ b/ref-test/quiz/templates/quiz/components/base.html
@@ -17,7 +17,7 @@
         />
         {% block style %}
         {% endblock %}
-        <title>{% block title %} SKA Referee Test {% endblock %}</title>
+        <title>{% block title %} SKA Referee Test Beta {% endblock %}</title>
         {% include "quiz/components/og-meta.html" %}
     </head>
     <body class="bg-light">
diff --git a/ref-test/quiz/templates/quiz/components/navbar.html b/ref-test/quiz/templates/quiz/components/navbar.html
index b0c041b..80bdc2b 100644
--- a/ref-test/quiz/templates/quiz/components/navbar.html
+++ b/ref-test/quiz/templates/quiz/components/navbar.html
@@ -1,6 +1,6 @@
 <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark" id="primary-nav">
     <div class="container">
-        <a href="javascript:void(0);" class="navbar-brand mb-0 h1">SKA Refereeing Test </a>
+        <a href="javascript:void(0);" class="navbar-brand mb-0 h1">SKA Refereeing Test (Beta)</a>
         <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">