From 9935d59ab6053425ffe651061d6f85caf347f636 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 15:25:13 +0200
Subject: [PATCH 01/35] add scripts to start server

---
 html/install.sh | 23 +++++++++++++++++++++++
 html/run.sh     | 12 ++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 html/install.sh
 create mode 100644 html/run.sh

diff --git a/html/install.sh b/html/install.sh
new file mode 100644
index 00000000..7cbeb29f
--- /dev/null
+++ b/html/install.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+PAINT_ROOT=/home/paint/PAINT
+ENV_PATH=/home/paint/venv
+
+# Install git.
+sudo apt-get update
+sudo apt-get -y install git
+
+# Clone repository.
+git clone https://github.com/ARTIST-Association/PAINT.git $PAINT_ROOT
+
+# Navigate to repository and create virtual environment if it doesn't exist yet.
+cd $PAINT_ROOT
+if [ ! -d "$ENV_PATH" ]; then
+  python3 -m venv $ENV_PATH
+fi
+
+# Activate virtual environment and upgrade pip.
+source $ENV_PATH/bin/activate
+pip install --upgrade pip
+
+# Install dependencies.
+pip install .
diff --git a/html/run.sh b/html/run.sh
new file mode 100644
index 00000000..bc8c34a4
--- /dev/null
+++ b/html/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+PAINT_ROOT=/home/paint/PAINT
+ENV_PATH=/home/paint/venv
+
+# Activate virtual environment.
+source $ENV_PATH/bin/activate
+
+# Navigate to html directory.
+cd $PAINT_ROOT/html
+
+# Start flask application.
+flask run &

From aa0da2e6b6b27d3ee81580ad58dceb36f698dee9 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 15:29:20 +0200
Subject: [PATCH 02/35] check if repository exists before cloning

---
 html/install.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/html/install.sh b/html/install.sh
index 7cbeb29f..78d3c49d 100644
--- a/html/install.sh
+++ b/html/install.sh
@@ -6,8 +6,12 @@ ENV_PATH=/home/paint/venv
 sudo apt-get update
 sudo apt-get -y install git
 
-# Clone repository.
-git clone https://github.com/ARTIST-Association/PAINT.git $PAINT_ROOT
+# Check if repository exists, if not clone, if it exists pull.
+if [ ! -d "$PAINT_ROOT" ]; then
+  git clone https://github.com/ARTIST-Association/PAINT.git $PAINT_ROOT
+else
+  git pull
+fi
 
 # Navigate to repository and create virtual environment if it doesn't exist yet.
 cd $PAINT_ROOT

From 7ed649289d03c26e055eca2d4f5a215f0d808e5f Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 15:29:44 +0200
Subject: [PATCH 03/35] check if repository exists before cloning

---
 html/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/install.sh b/html/install.sh
index 78d3c49d..5c0947b1 100644
--- a/html/install.sh
+++ b/html/install.sh
@@ -10,6 +10,7 @@ sudo apt-get -y install git
 if [ ! -d "$PAINT_ROOT" ]; then
   git clone https://github.com/ARTIST-Association/PAINT.git $PAINT_ROOT
 else
+  cd $PAINT_ROOT
   git pull
 fi
 

From 2f62eacbd66cc65ace3cdfe2a915b62801e4c897 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 15:32:36 +0200
Subject: [PATCH 04/35] update cd commands

---
 html/install.sh | 4 ++--
 html/run.sh     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/install.sh b/html/install.sh
index 5c0947b1..9d4a13c5 100644
--- a/html/install.sh
+++ b/html/install.sh
@@ -10,12 +10,12 @@ sudo apt-get -y install git
 if [ ! -d "$PAINT_ROOT" ]; then
   git clone https://github.com/ARTIST-Association/PAINT.git $PAINT_ROOT
 else
-  cd $PAINT_ROOT
+  cd "${PAINT_ROOT}" || exit 1
   git pull
 fi
 
 # Navigate to repository and create virtual environment if it doesn't exist yet.
-cd $PAINT_ROOT
+cd "${PAINT_ROOT}" || exit 1
 if [ ! -d "$ENV_PATH" ]; then
   python3 -m venv $ENV_PATH
 fi
diff --git a/html/run.sh b/html/run.sh
index bc8c34a4..bc334920 100644
--- a/html/run.sh
+++ b/html/run.sh
@@ -6,7 +6,7 @@ ENV_PATH=/home/paint/venv
 source $ENV_PATH/bin/activate
 
 # Navigate to html directory.
-cd $PAINT_ROOT/html
+cd ${PAINT_ROOT}/html || exit 1
 
 # Start flask application.
 flask run &

From 0d9e10c5e6f00e45b11ee9ac8f183d7a279b893b Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 15:34:10 +0200
Subject: [PATCH 05/35] Make executable

---
 html/install.sh | 0
 html/run.sh     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 html/install.sh
 mode change 100644 => 100755 html/run.sh

diff --git a/html/install.sh b/html/install.sh
old mode 100644
new mode 100755
diff --git a/html/run.sh b/html/run.sh
old mode 100644
new mode 100755

From 965d0c5ee3050a1af05a2edc04ecb84dd79afd83 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 15:37:50 +0200
Subject: [PATCH 06/35] install venv

---
 html/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/install.sh b/html/install.sh
index 9d4a13c5..2fe5043d 100755
--- a/html/install.sh
+++ b/html/install.sh
@@ -4,7 +4,7 @@ ENV_PATH=/home/paint/venv
 
 # Install git.
 sudo apt-get update
-sudo apt-get -y install git
+sudo apt-get -y install git python3-venv
 
 # Check if repository exists, if not clone, if it exists pull.
 if [ ! -d "$PAINT_ROOT" ]; then

From 8caf2e70f667b4b4c105195acc831fe4ededa88c Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 15:40:52 +0200
Subject: [PATCH 07/35] include upgrade for pip command

---
 html/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/install.sh b/html/install.sh
index 2fe5043d..d6228239 100755
--- a/html/install.sh
+++ b/html/install.sh
@@ -25,4 +25,4 @@ source $ENV_PATH/bin/activate
 pip install --upgrade pip
 
 # Install dependencies.
-pip install .
+pip install --upgrade .

From 48485eb63d6f38510fa7e05fab0d0fb87ea6e01c Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 15:50:46 +0200
Subject: [PATCH 08/35] add waitress dependency

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index a4a4a236..6bf25e20 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,7 +29,8 @@ dependencies = [
     "openpyxl",
     "Flask",
     "pystac",
-    "opencv-python"
+    "opencv-python",
+    "waitress"
 ]
 
 [project.optional-dependencies]

From 91968ec41075a6cf199c981c8861fa1d2f443a2f Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 16:01:10 +0200
Subject: [PATCH 09/35] switch start to waitress

---
 html/wsgi.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/wsgi.py b/html/wsgi.py
index d35d4f68..95a630de 100644
--- a/html/wsgi.py
+++ b/html/wsgi.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 from flask import Flask, render_template
+from waitress import serve
 
 app = Flask(__name__)
 
@@ -97,4 +98,4 @@ def resources() -> str:
 
 
 if __name__ == "__main__":
-    app.run()
+    serve(app, host="127.0.0.1", port=8000)

From 03dc0175bf27ab1dd9ef8ad89dc5b6459e7b381c Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 16:01:26 +0200
Subject: [PATCH 10/35] fix start of flast application

---
 html/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/run.sh b/html/run.sh
index bc334920..5ba2d1de 100755
--- a/html/run.sh
+++ b/html/run.sh
@@ -9,4 +9,4 @@ source $ENV_PATH/bin/activate
 cd ${PAINT_ROOT}/html || exit 1
 
 # Start flask application.
-flask run &
+python wsgi.py &

From a2ff4f1d6eb9e57f5a2bc68871cace093b557a71 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 17:21:50 +0200
Subject: [PATCH 11/35] include apache and enable modules

---
 html/install.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/html/install.sh b/html/install.sh
index d6228239..f04a0d46 100755
--- a/html/install.sh
+++ b/html/install.sh
@@ -4,7 +4,11 @@ ENV_PATH=/home/paint/venv
 
 # Install git.
 sudo apt-get update
-sudo apt-get -y install git python3-venv
+sudo apt-get -y install apache2 git python3-venv
+
+# Enable apache proxy.
+sudo a2enmod proxy
+sudo a2enmod proxy_http
 
 # Check if repository exists, if not clone, if it exists pull.
 if [ ! -d "$PAINT_ROOT" ]; then

From 7c425ef1b610e8ef9e7fab1359407be318bc84b0 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 30 Sep 2024 17:22:11 +0200
Subject: [PATCH 12/35] include server restart

---
 html/run.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/run.sh b/html/run.sh
index 5ba2d1de..d9ef504a 100755
--- a/html/run.sh
+++ b/html/run.sh
@@ -10,3 +10,6 @@ cd ${PAINT_ROOT}/html || exit 1
 
 # Start flask application.
 python wsgi.py &
+
+# Restart apache.
+sudo systemctl restart apache2

From 645ac4b263fab5d4bd8a393963267c749a0b7cad Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Wed, 2 Oct 2024 16:49:41 +0200
Subject: [PATCH 13/35] quick commit to save progress

---
 html/install.sh               |  2 ++
 html/paint_domain-le-ssl.conf | 21 +++++++++++++++++++++
 html/paint_domain.conf        | 21 +++++++++++++++++++++
 html/run.sh                   |  4 ++++
 4 files changed, 48 insertions(+)
 create mode 100644 html/paint_domain-le-ssl.conf
 create mode 100644 html/paint_domain.conf

diff --git a/html/install.sh b/html/install.sh
index f04a0d46..58e16023 100755
--- a/html/install.sh
+++ b/html/install.sh
@@ -9,6 +9,8 @@ sudo apt-get -y install apache2 git python3-venv
 # Enable apache proxy.
 sudo a2enmod proxy
 sudo a2enmod proxy_http
+sudo a2enmod alias
+sudo a2enmod cache
 
 # Check if repository exists, if not clone, if it exists pull.
 if [ ! -d "$PAINT_ROOT" ]; then
diff --git a/html/paint_domain-le-ssl.conf b/html/paint_domain-le-ssl.conf
new file mode 100644
index 00000000..c9c1b22e
--- /dev/null
+++ b/html/paint_domain-le-ssl.conf
@@ -0,0 +1,21 @@
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+    ServerAdmin markus.goetz@kit.edu
+    ServerName paint-database.org
+    ProxyPass /WRI1030197 !
+    Alias /WRI1030197 "/mnt/lsdf/WRI1030197/"
+    <Directory "/mnt/lsdf/WRI1030197">
+      Options Indexes FollowSymLinks
+      Require all granted
+      AddDefaultCharset UTF-8
+      IndexOptions FancyIndexing IconsAreLinks
+    </Directory>
+    ProxyPass / http://127.0.0.1:8000/
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    ServerAlias paint-database.org
+    Include /etc/letsencrypt/options-ssl-apache.conf
+    SSLCertificateFile /etc/letsencrypt/live/paint-database.org/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/paint-database.org/privkey.pem
+</VirtualHost>
+</IfModule>
diff --git a/html/paint_domain.conf b/html/paint_domain.conf
new file mode 100644
index 00000000..8e4ef053
--- /dev/null
+++ b/html/paint_domain.conf
@@ -0,0 +1,21 @@
+<VirtualHost *:80>
+    ServerAdmin markus.goetz@kit.edu
+    ServerName paint-database.org
+    ServerAlias paint-database.org
+    ProxyPass /WRI1030197 !
+    Alias /WRI1030197 "/mnt/lsdf/WRI1030197/"
+    <Directory "/mnt/lsdf/WRI1030197">
+      Options Indexes FollowSymLinks
+      Require all granted
+      AddDefaultCharset UTF-8
+      IndexOptions FancyIndexing IconsAreLinks
+    </Directory>
+    ProxyPass / http://127.0.0.1:8000/
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    RewriteEngine on
+    RewriteCond %{SERVER_NAME} =paint.datamanager.kit.edu [OR]
+    RewriteCond %{SERVER_NAME} =www.paint-database.org [OR]
+    RewriteCond %{SERVER_NAME} =paint-database.org
+    RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
+</VirtualHost>
diff --git a/html/run.sh b/html/run.sh
index d9ef504a..3b1c3122 100755
--- a/html/run.sh
+++ b/html/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 PAINT_ROOT=/home/paint/PAINT
 ENV_PATH=/home/paint/venv
+AVAILABLE_PATH=/etc/apache2/sites-available
+ENABLED_PATH=/etc/apache2/sites-enabled
 
 # Activate virtual environment.
 source $ENV_PATH/bin/activate
@@ -8,6 +10,8 @@ source $ENV_PATH/bin/activate
 # Navigate to html directory.
 cd ${PAINT_ROOT}/html || exit 1
 
+# Copy configuration files to correct folder
+cp
 # Start flask application.
 python wsgi.py &
 

From be3abc22d0fb0ee8258991fb141b89a50570f19f Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Wed, 2 Oct 2024 17:52:57 +0200
Subject: [PATCH 14/35] fix run script

---
 html/run.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/html/run.sh b/html/run.sh
index 3b1c3122..f3f060f2 100755
--- a/html/run.sh
+++ b/html/run.sh
@@ -10,8 +10,14 @@ source $ENV_PATH/bin/activate
 # Navigate to html directory.
 cd ${PAINT_ROOT}/html || exit 1
 
-# Copy configuration files to correct folder
-cp
+# Copy configuration files to correct folder.
+cp paint_domain.conf $AVAILABLE_PATH/paint_domain.conf
+cp paint_domain-le-ssl.conf $AVAILABLE_PATH/paint_domain-le-ssl.conf
+
+# Create symlinks in enabled folder.
+ln -sf $AVAILABLE_PATH/paint_domain.conf $ENABLED_PATH/paint_domain.conf
+ln -sf $AVAILABLE_PATH/paint_domain-le-ssl.conf $ENABLED_PATH/paint_domain-le-ssl.conf
+
 # Start flask application.
 python wsgi.py &
 

From 75420d2155b6e8e160b5369078824667c778ff23 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Wed, 2 Oct 2024 17:54:37 +0200
Subject: [PATCH 15/35] include sudo rights

---
 html/run.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/run.sh b/html/run.sh
index f3f060f2..a0d9889e 100755
--- a/html/run.sh
+++ b/html/run.sh
@@ -11,12 +11,12 @@ source $ENV_PATH/bin/activate
 cd ${PAINT_ROOT}/html || exit 1
 
 # Copy configuration files to correct folder.
-cp paint_domain.conf $AVAILABLE_PATH/paint_domain.conf
-cp paint_domain-le-ssl.conf $AVAILABLE_PATH/paint_domain-le-ssl.conf
+sudo cp paint_domain.conf $AVAILABLE_PATH/paint_domain.conf
+sudo cp paint_domain-le-ssl.conf $AVAILABLE_PATH/paint_domain-le-ssl.conf
 
 # Create symlinks in enabled folder.
-ln -sf $AVAILABLE_PATH/paint_domain.conf $ENABLED_PATH/paint_domain.conf
-ln -sf $AVAILABLE_PATH/paint_domain-le-ssl.conf $ENABLED_PATH/paint_domain-le-ssl.conf
+sudo ln -sf $AVAILABLE_PATH/paint_domain.conf $ENABLED_PATH/paint_domain.conf
+sudo ln -sf $AVAILABLE_PATH/paint_domain-le-ssl.conf $ENABLED_PATH/paint_domain-le-ssl.conf
 
 # Start flask application.
 python wsgi.py &

From 222767ad5a6572d8214688e6bced2060300466b1 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 7 Oct 2024 15:06:26 +0200
Subject: [PATCH 16/35] include icon alias

---
 html/paint_domain-le-ssl.conf | 6 ++++++
 html/paint_domain.conf        | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/html/paint_domain-le-ssl.conf b/html/paint_domain-le-ssl.conf
index c9c1b22e..f86afec0 100644
--- a/html/paint_domain-le-ssl.conf
+++ b/html/paint_domain-le-ssl.conf
@@ -2,6 +2,12 @@
 <VirtualHost *:443>
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
+    Alias /icons/ "/usr/share/apache2/icons/"
+    <Directory "/usr/share/apache2/icons">
+      Options Indexes MultiViews
+      AllowOverride None
+      Require all granted
+    </Directory>
     ProxyPass /WRI1030197 !
     Alias /WRI1030197 "/mnt/lsdf/WRI1030197/"
     <Directory "/mnt/lsdf/WRI1030197">
diff --git a/html/paint_domain.conf b/html/paint_domain.conf
index 8e4ef053..05e9c1d0 100644
--- a/html/paint_domain.conf
+++ b/html/paint_domain.conf
@@ -2,6 +2,12 @@
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
     ServerAlias paint-database.org
+    Alias /icons/ "/usr/share/apache2/icons/"
+    <Directory "/usr/share/apache2/icons">
+      Options Indexes MultiViews
+      AllowOverride None
+      Require all granted
+    </Directory>
     ProxyPass /WRI1030197 !
     Alias /WRI1030197 "/mnt/lsdf/WRI1030197/"
     <Directory "/mnt/lsdf/WRI1030197">

From 7e07e289571d3c14ccfcc8493860e26514b96ac1 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 7 Oct 2024 15:07:30 +0200
Subject: [PATCH 17/35] include kill command for script

---
 html/run.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/run.sh b/html/run.sh
index a0d9889e..7e19ac5b 100755
--- a/html/run.sh
+++ b/html/run.sh
@@ -18,6 +18,9 @@ sudo cp paint_domain-le-ssl.conf $AVAILABLE_PATH/paint_domain-le-ssl.conf
 sudo ln -sf $AVAILABLE_PATH/paint_domain.conf $ENABLED_PATH/paint_domain.conf
 sudo ln -sf $AVAILABLE_PATH/paint_domain-le-ssl.conf $ENABLED_PATH/paint_domain-le-ssl.conf
 
+# Kill flask application.
+kill $(ps aux | grep '[p]ython wsgi.py' | awk '{print $2}')
+
 # Start flask application.
 python wsgi.py &
 

From 4891b356be66f123a0382361cae200cba95255ae Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 7 Oct 2024 15:11:25 +0200
Subject: [PATCH 18/35] fix icon alias

---
 html/paint_domain-le-ssl.conf | 1 +
 html/paint_domain.conf        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/html/paint_domain-le-ssl.conf b/html/paint_domain-le-ssl.conf
index f86afec0..d0c8a443 100644
--- a/html/paint_domain-le-ssl.conf
+++ b/html/paint_domain-le-ssl.conf
@@ -7,6 +7,7 @@
       Options Indexes MultiViews
       AllowOverride None
       Require all granted
+      Allow from all
     </Directory>
     ProxyPass /WRI1030197 !
     Alias /WRI1030197 "/mnt/lsdf/WRI1030197/"
diff --git a/html/paint_domain.conf b/html/paint_domain.conf
index 05e9c1d0..e4c6654b 100644
--- a/html/paint_domain.conf
+++ b/html/paint_domain.conf
@@ -7,6 +7,7 @@
       Options Indexes MultiViews
       AllowOverride None
       Require all granted
+      Allow from all
     </Directory>
     ProxyPass /WRI1030197 !
     Alias /WRI1030197 "/mnt/lsdf/WRI1030197/"

From b225e4cf4db995a4f23fb117b2b7a7e9b5adeb81 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 7 Oct 2024 15:30:46 +0200
Subject: [PATCH 19/35] includ spinner when loading data

---
 html/templates/base.html | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/html/templates/base.html b/html/templates/base.html
index 9b3bfb84..99c2df80 100644
--- a/html/templates/base.html
+++ b/html/templates/base.html
@@ -14,6 +14,12 @@
 </head>
 
 <body>
+    <div id="dataSpinner" class="d-none justify-content-center align-items-center position-fixed top-0 start-0 w-100 h-100 bg-white" style="z-index: 1050;">
+        <div class="spinner-border text-primary" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+
     <nav class="navbar navbar-expand-lg sticky-top bg-white py-0">
         <div class="container col-lg-8">
             <a class="mx-3 navbar-brand text-herman text-primary" href="/">
@@ -45,9 +51,9 @@
                     </li>
                     <li class="nav-item">
                         {% if active == "repository" %}
-                        <a href="/WRI1030197" class="nav-link text-black p-3 active" aria-current="page">
+                        <a href="/WRI1030197" id="dataNavItem" class="nav-link text-black p-3 active" aria-current="page">
                         {% else %}
-                        <a href="/WRI1030197" class="nav-link text-black p-3">
+                        <a href="/WRI1030197" id="dataNavItem" class="nav-link text-black p-3">
                         {% endif %}
                             <i class="bi bi-database-fill me-2"></i> Data
                         </a>
@@ -114,6 +120,25 @@
         </footer>
      </div>
 
+    <script>
+    document.addEventListener('DOMContentLoaded', function() {
+        // Get the "Data" nav item link by its ID
+        var dataNavItem = document.getElementById('dataNavItem');
+
+        // Get the spinner
+        var dataSpinner = document.getElementById('dataSpinner');
+
+        // Add click event listener to the "Data" nav item
+        dataNavItem.addEventListener('click', function(event) {
+            // Show the spinner
+            dataSpinner.classList.remove('d-none');
+            dataSpinner.classList.add('d-flex'); // Show spinner (flexbox)
+
+            // Allow navigation to continue naturally after showing the spinner
+        });
+    });
+</script>
+
 </body>
 
 </html>

From c86f98a3e857302ce6a32b5974afefcf48a132d5 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 7 Oct 2024 15:40:23 +0200
Subject: [PATCH 20/35] fix spinner activation when navigating back

---
 html/templates/base.html | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/html/templates/base.html b/html/templates/base.html
index 99c2df80..ddf8a1ea 100644
--- a/html/templates/base.html
+++ b/html/templates/base.html
@@ -130,11 +130,18 @@
 
         // Add click event listener to the "Data" nav item
         dataNavItem.addEventListener('click', function(event) {
-            // Show the spinner
+            // Show the spinner when clicking on the Data link
             dataSpinner.classList.remove('d-none');
-            dataSpinner.classList.add('d-flex'); // Show spinner (flexbox)
+            dataSpinner.classList.add('d-flex');
+        });
 
-            // Allow navigation to continue naturally after showing the spinner
+        // Handle the pageshow event to ensure the spinner is hidden when navigating back
+        window.addEventListener('pageshow', function(event) {
+            // If the page is loaded from the cache (back/forward navigation), hide the spinner
+            if (event.persisted) {
+                dataSpinner.classList.add('d-none');
+                dataSpinner.classList.remove('d-flex');
+            }
         });
     });
 </script>

From 5880cbd9a66cc8d862d3e26ca457b82d47d3de43 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 09:41:18 +0200
Subject: [PATCH 21/35] include favicon link in header

---
 html/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/templates/base.html b/html/templates/base.html
index ddf8a1ea..700c44ea 100644
--- a/html/templates/base.html
+++ b/html/templates/base.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <title>PAINT – FAIR Concentrating Solar Power Plant Database</title>
-
+    <link rel="icon" href="/favicon.ico" type="image/x-icon">
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 

From 9d8c682419b84326b2175edd7a4e45482ca7385b Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 16:39:49 +0200
Subject: [PATCH 22/35] include custom navbar width

---
 html/static/css/paint.css | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/html/static/css/paint.css b/html/static/css/paint.css
index 33538d4e..a76bb899 100644
--- a/html/static/css/paint.css
+++ b/html/static/css/paint.css
@@ -19,6 +19,34 @@
     font-weight: 400;
 }
 
+@media (min-width: 1300px){
+    .navbar-expand-custom {
+        flex-direction: row;
+        flex-wrap: nowrap;
+        justify-content: flex-start;
+    }
+    .navbar-expand-custom .navbar-nav {
+        flex-direction: row;
+    }
+    .navbar-expand-custom .dropdown-menu {
+        position: absolute;
+    }
+    .navbar-expand-custom .nav-link {
+        padding-right: .5rem;
+        padding-left: .5rem;
+    }
+    .navbar-expand-custom > .container {
+        flex-wrap: nowrap;
+    }
+    .navbar-expand-custom .navbar-collapse {
+        display: flex!important;
+        flex-basis: auto;
+    }
+    .navbar-expand-custom .navbar-toggler {
+        display: none;
+    }
+}
+
 :root {
     --bs-primary: #002864;
     --bs-primary-rgb: 0, 40, 100;

From 8e9a79029ea0b736d06724531e87e2a7a3c7692d Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 16:40:08 +0200
Subject: [PATCH 23/35] move contact to footer and ensure navbar avoids line
 breaks

---
 html/templates/base.html | 152 +++++++++++++++++++--------------------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/html/templates/base.html b/html/templates/base.html
index 700c44ea..395344d0 100644
--- a/html/templates/base.html
+++ b/html/templates/base.html
@@ -2,7 +2,6 @@
 <html lang="en">
 <head>
     <title>PAINT – FAIR Concentrating Solar Power Plant Database</title>
-    <link rel="icon" href="/favicon.ico" type="image/x-icon">
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
@@ -20,80 +19,75 @@
         </div>
     </div>
 
-    <nav class="navbar navbar-expand-lg sticky-top bg-white py-0">
-        <div class="container col-lg-8">
-            <a class="mx-3 navbar-brand text-herman text-primary" href="/">
-                Paint Database
-            </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">
-                    <li class="nav-item">
-                        {% if active == "home" %}
-                        <a href="/" class="nav-link text-black p-3 active" aria-current="page">
-                        {% else %}
-                        <a href="/" class="nav-link text-black p-3">
-                        {% endif %}
-                            <i class="bi bi-house-fill me-2"></i> Home
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        {% if active == "data" %}
-                        <a href="/data" class="nav-link text-black p-3 active" aria-current="page">
-                        {% else %}
-                        <a href="/data" class="nav-link text-black p-3">
-                        {% endif %}
-                            <i class="bi bi-clipboard-data-fill me-2"></i> Overview
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        {% if active == "repository" %}
-                        <a href="/WRI1030197" id="dataNavItem" class="nav-link text-black p-3 active" aria-current="page">
-                        {% else %}
-                        <a href="/WRI1030197" id="dataNavItem" class="nav-link text-black p-3">
-                        {% endif %}
-                            <i class="bi bi-database-fill me-2"></i> Data
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        {% if active == "resources" %}
-                        <a href="/resources" class="nav-link text-black p-3 active" aria-current="page">
-                        {% else %}
-                        <a href="/resources" class="nav-link text-black p-3">
-                        {% endif %}
-                            <i class="bi bi-link me-2"></i> Resources
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        {% if active == "papers" %}
-                        <a href="/papers" class="nav-link text-black p-3 active" aria-current="page">
-                        {% else %}
-                        <a href="/papers" class="nav-link text-black p-3">
-                        {% endif %}
-                            <i class="bi bi-file-text-fill me-2"></i> Papers
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        {% if active == "partners" %}
-                        <a href="/partners" class="nav-link text-black p-3 active" aria-current="page">
-                        {% else %}
-                        <a href="/partners" class="nav-link text-black p-3">
-                        {% endif %}
-                            <i class="bi bi-people-fill me-2"></i> Partners
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#114;&#116;&#105;&#115;&#116;&#64;&#108;&#105;&#115;&#116;&#115;&#46;&#107;&#105;&#116;&#46;&#101;&#100;&#117;" class="nav-link text-black p-3">
-                            <i class="bi bi-envelope-fill me-2"></i> Contact
-                        </a>
-                    </li>
-                </ul>
-            </div>
+<nav class="navbar navbar-expand-custom sticky-top bg-white py-0 col-12">
+    <div class="container col-8">
+        <a class="mx-3 navbar-brand text-herman text-primary" href="/">
+            Paint Database
+        </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">
+                <li class="nav-item">
+                    {% if active == "home" %}
+                    <a href="/" class="nav-link text-black p-3 d-flex align-items-center active" aria-current="page">
+                    {% else %}
+                    <a href="/" class="nav-link text-black p-3 d-flex align-items-center">
+                    {% endif %}
+                        <i class="bi bi-house-fill me-2"></i> Home
+                    </a>
+                </li>
+                <li class="nav-item">
+                    {% if active == "data" %}
+                    <a href="/data" class="nav-link text-black p-3 d-flex align-items-center active" aria-current="page">
+                    {% else %}
+                    <a href="/data" class="nav-link text-black p-3 d-flex align-items-center">
+                    {% endif %}
+                        <i class="bi bi-clipboard-data-fill me-2"></i> Overview
+                    </a>
+                </li>
+                <li class="nav-item">
+                    {% if active == "repository" %}
+                    <a href="/WRI1030197" id="dataNavItem" class="nav-link text-black p-3 d-flex align-items-center active" aria-current="page">
+                    {% else %}
+                    <a href="/WRI1030197" id="dataNavItem" class="nav-link text-black p-3 d-flex align-items-center">
+                    {% endif %}
+                        <i class="bi bi-database-fill me-2"></i> Data
+                    </a>
+                </li>
+                <li class="nav-item">
+                    {% if active == "resources" %}
+                    <a href="/resources" class="nav-link text-black p-3 d-flex align-items-center active" aria-current="page">
+                    {% else %}
+                    <a href="/resources" class="nav-link text-black p-3 d-flex align-items-center">
+                    {% endif %}
+                        <i class="bi bi-link me-2"></i> Resources
+                    </a>
+                </li>
+                <li class="nav-item">
+                    {% if active == "papers" %}
+                    <a href="/papers" class="nav-link text-black p-3 d-flex align-items-center active" aria-current="page">
+                    {% else %}
+                    <a href="/papers" class="nav-link text-black p-3 d-flex align-items-center">
+                    {% endif %}
+                        <i class="bi bi-file-text-fill me-2"></i> Papers
+                    </a>
+                </li>
+                <li class="nav-item">
+                    {% if active == "partners" %}
+                    <a href="/partners" class="nav-link text-black p-3 d-flex align-items-center active" aria-current="page">
+                    {% else %}
+                    <a href="/partners" class="nav-link text-black p-3 d-flex align-items-center">
+                    {% endif %}
+                        <i class="bi bi-people-fill me-2"></i> Partners
+                    </a>
+                </li>
+            </ul>
         </div>
-    </nav>
+    </div>
+</nav>
 
     <!-- main content -->
     <div class="container-fluid col-8">
@@ -110,9 +104,15 @@
             {% endif %}
 
             {% if active == "legal" %}
-            <a href="/legal-information" class="nav-link p-3 active" aria-current="page">Legal information</a>
+            <a href="/legal-information" class="nav-link p-3 me-5 active" aria-current="page">Legal information</a>
+            {% else %}
+            <a href="/legal-information" class="nav-link p-3 me-5 ">Legal information</a>
+            {% endif %}
+
+            {% if active == "contact" %}
+            <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#114;&#116;&#105;&#115;&#116;&#64;&#108;&#105;&#115;&#116;&#115;&#46;&#107;&#105;&#116;&#46;&#101;&#100;&#117;" class="nav-link p-3 me-5 active" aria-current="page">Contact</a>
             {% else %}
-            <a href="/legal-information" class="nav-link p-3">Legal information</a>
+            <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#114;&#116;&#105;&#115;&#116;&#64;&#108;&#105;&#115;&#116;&#115;&#46;&#107;&#105;&#116;&#46;&#101;&#100;&#117;" class="nav-link p-3 me-5 ">Contact</a>
             {% endif %}
 
             <span class="flex-grow-1"></span>

From 6ac5a2fe5d383219a8e459c863562aee65e83f98 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 17:12:03 +0200
Subject: [PATCH 24/35] add script to generate certificate

---
 html/create_certificate.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 html/create_certificate.sh

diff --git a/html/create_certificate.sh b/html/create_certificate.sh
new file mode 100644
index 00000000..1b124b99
--- /dev/null
+++ b/html/create_certificate.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Secure with Lets Encrypt
+sudo apt install certbot python3-certbot-apache
+sudo ufw allow 'WWW Full'
+sudo ufw delete allow 'WWW'
+sudo ufw status
+certbot --apache -d paint-database.org
+ls /etc/letsencrypt/live/
+echo "You can test the website by navigating to https://paint-database.org"

From 8e68505cf4432cf78e23b14c065811450b2fc2ea Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 17:12:15 +0200
Subject: [PATCH 25/35] include vm set up and installation

---
 html/install.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/html/install.sh b/html/install.sh
index 58e16023..17f11308 100755
--- a/html/install.sh
+++ b/html/install.sh
@@ -1,6 +1,37 @@
 #!/bin/bash
 PAINT_ROOT=/home/paint/PAINT
 ENV_PATH=/home/paint/venv
+AVAILABLE_PATH=/etc/apache2/sites-available
+ENABLED_PATH=/etc/apache2/sites-enabled
+
+echo "Assuming that you are logged in as a user with sudo rights"
+
+# Initial Server Setup with Debian 11.
+echo "Setting Up a Basic Firewall"
+sudo apt update
+sudo apt install ufw
+sudo ufw allow OpenSSH
+sudo ufw enable
+sudo ufw status
+
+# Installing Apache
+sudo apt update
+sudo apt install apache2
+sudo ufw app list
+echo "Your output will be a list of the application profiles"
+sudo ufw allow 'WWW'
+sudo ufw status
+echo "The output will provide a list of allowed HTTP traffic"
+echo "Make sure the service is active by running the command for the systemd init system"
+sudo systemctl status apache2
+hostname -I
+sudo apt install curl
+curl -4 icanhazip.com
+IP_ADDRESS=$(hostname -I | awk '{print $1}')
+echo "Enter http://$IP_ADDRESS in the browser"
+sudo mkdir -p /var/www/paint_domain
+sudo chown -R $USER:$USER /var/www/paint_domain
+sudo chmod -R 755 /var/www/paint_domain
 
 # Install git.
 sudo apt-get update
@@ -26,9 +57,29 @@ if [ ! -d "$ENV_PATH" ]; then
   python3 -m venv $ENV_PATH
 fi
 
+# Copy configuration files to correct folder.
+sudo cp paint_domain.conf $AVAILABLE_PATH/paint_domain.conf
+sudo cp paint_domain-le-ssl.conf $AVAILABLE_PATH/paint_domain-le-ssl.conf
+
+# Create symlinks in enabled folder.
+sudo ln -sf $AVAILABLE_PATH/paint_domain.conf $ENABLED_PATH/paint_domain.conf
+sudo ln -sf $AVAILABLE_PATH/paint_domain-le-ssl.conf $ENABLED_PATH/paint_domain-le-ssl.conf
+
+sudo a2ensite paint_domain.conf
+sudo a2dissite 000-default.conf
+sudo apache2ctl configtest
+echo "You should recieve: Syntax OK"
+sudo systemctl restart apache2
+
 # Activate virtual environment and upgrade pip.
 source $ENV_PATH/bin/activate
 pip install --upgrade pip
 
 # Install dependencies.
 pip install --upgrade .
+
+# Mount to the LSDF
+echo "Mount to the LSDF"
+sudo sshfs -o umask=0,uid=0,gid=0,allow_other scc-paint-0001@os-login.lsdf.kit.edu:/lsdf/kit/scc/projects/paint /mnt/lsdf
+
+echo "Installation and setup complete."

From 31d4d695862be1dddeb8e0f0ae029f45a7556890 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 17:12:25 +0200
Subject: [PATCH 26/35] remove certain install commands

---
 html/run.sh | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/html/run.sh b/html/run.sh
index 7e19ac5b..fb0c5d78 100755
--- a/html/run.sh
+++ b/html/run.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 PAINT_ROOT=/home/paint/PAINT
 ENV_PATH=/home/paint/venv
-AVAILABLE_PATH=/etc/apache2/sites-available
-ENABLED_PATH=/etc/apache2/sites-enabled
 
 # Activate virtual environment.
 source $ENV_PATH/bin/activate
@@ -10,14 +8,6 @@ source $ENV_PATH/bin/activate
 # Navigate to html directory.
 cd ${PAINT_ROOT}/html || exit 1
 
-# Copy configuration files to correct folder.
-sudo cp paint_domain.conf $AVAILABLE_PATH/paint_domain.conf
-sudo cp paint_domain-le-ssl.conf $AVAILABLE_PATH/paint_domain-le-ssl.conf
-
-# Create symlinks in enabled folder.
-sudo ln -sf $AVAILABLE_PATH/paint_domain.conf $ENABLED_PATH/paint_domain.conf
-sudo ln -sf $AVAILABLE_PATH/paint_domain-le-ssl.conf $ENABLED_PATH/paint_domain-le-ssl.conf
-
 # Kill flask application.
 kill $(ps aux | grep '[p]ython wsgi.py' | awk '{print $2}')
 

From 8c25835ea55185619fae2538be1d04c416433fee Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 17:13:02 +0200
Subject: [PATCH 27/35] include document root

---
 html/paint_domain-le-ssl.conf | 1 +
 html/paint_domain.conf        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/html/paint_domain-le-ssl.conf b/html/paint_domain-le-ssl.conf
index d0c8a443..fb273d64 100644
--- a/html/paint_domain-le-ssl.conf
+++ b/html/paint_domain-le-ssl.conf
@@ -2,6 +2,7 @@
 <VirtualHost *:443>
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
+    DocumentRoot /var/www/paint_domain
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews
diff --git a/html/paint_domain.conf b/html/paint_domain.conf
index e4c6654b..ea5f953a 100644
--- a/html/paint_domain.conf
+++ b/html/paint_domain.conf
@@ -2,6 +2,7 @@
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
     ServerAlias paint-database.org
+    DocumentRoot /var/www/paint_domain
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews

From 4779282de6318bc2bf7bb692326014899ae5ccaf Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 17:18:44 +0200
Subject: [PATCH 28/35] fix document root location

---
 html/paint_domain-le-ssl.conf | 2 +-
 html/paint_domain.conf        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/paint_domain-le-ssl.conf b/html/paint_domain-le-ssl.conf
index fb273d64..627249fb 100644
--- a/html/paint_domain-le-ssl.conf
+++ b/html/paint_domain-le-ssl.conf
@@ -2,7 +2,7 @@
 <VirtualHost *:443>
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
-    DocumentRoot /var/www/paint_domain
+    DocumentRoot /var/www/html
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews
diff --git a/html/paint_domain.conf b/html/paint_domain.conf
index ea5f953a..e01e3c64 100644
--- a/html/paint_domain.conf
+++ b/html/paint_domain.conf
@@ -2,7 +2,7 @@
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
     ServerAlias paint-database.org
-    DocumentRoot /var/www/paint_domain
+    DocumentRoot /var/www/html
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews

From a44019a5e66994d2d0aeb6638b07539e070959eb Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 22:01:15 +0200
Subject: [PATCH 29/35] fix install script

---
 html/install.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/html/install.sh b/html/install.sh
index 17f11308..6a7d873a 100755
--- a/html/install.sh
+++ b/html/install.sh
@@ -57,6 +57,9 @@ if [ ! -d "$ENV_PATH" ]; then
   python3 -m venv $ENV_PATH
 fi
 
+# Navigate to html directory.
+cd ${PAINT_ROOT}/html || exit 1
+
 # Copy configuration files to correct folder.
 sudo cp paint_domain.conf $AVAILABLE_PATH/paint_domain.conf
 sudo cp paint_domain-le-ssl.conf $AVAILABLE_PATH/paint_domain-le-ssl.conf
@@ -65,6 +68,9 @@ sudo cp paint_domain-le-ssl.conf $AVAILABLE_PATH/paint_domain-le-ssl.conf
 sudo ln -sf $AVAILABLE_PATH/paint_domain.conf $ENABLED_PATH/paint_domain.conf
 sudo ln -sf $AVAILABLE_PATH/paint_domain-le-ssl.conf $ENABLED_PATH/paint_domain-le-ssl.conf
 
+# Navigate back to repository root.
+cd "${PAINT_ROOT}" || exit 1
+
 sudo a2ensite paint_domain.conf
 sudo a2dissite 000-default.conf
 sudo apache2ctl configtest

From 8863b20f26436e3d42aaaf46051377272d93c489 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 22:08:24 +0200
Subject: [PATCH 30/35] add alias to document root

---
 html/paint_domain-le-ssl.conf | 5 +++++
 html/paint_domain.conf        | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/html/paint_domain-le-ssl.conf b/html/paint_domain-le-ssl.conf
index 627249fb..b4cbc3c6 100644
--- a/html/paint_domain-le-ssl.conf
+++ b/html/paint_domain-le-ssl.conf
@@ -3,6 +3,11 @@
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
     DocumentRoot /var/www/html
+    <Directory /var/www/html>
+      Options Indexes FollowSymLinks
+      AllowOverride None
+      Require all granted
+    </Directory>
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews
diff --git a/html/paint_domain.conf b/html/paint_domain.conf
index e01e3c64..00d1e33e 100644
--- a/html/paint_domain.conf
+++ b/html/paint_domain.conf
@@ -3,6 +3,11 @@
     ServerName paint-database.org
     ServerAlias paint-database.org
     DocumentRoot /var/www/html
+    <Directory /var/www/html>
+      Options Indexes FollowSymLinks
+      AllowOverride None
+      Require all granted
+    </Directory>
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews

From 88e9ea13ebfdab2d1fab2e1427ca0f8df775e65a Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 22:12:15 +0200
Subject: [PATCH 31/35] set document root

---
 html/paint_domain-le-ssl.conf | 7 +------
 html/paint_domain.conf        | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/html/paint_domain-le-ssl.conf b/html/paint_domain-le-ssl.conf
index b4cbc3c6..f980eda4 100644
--- a/html/paint_domain-le-ssl.conf
+++ b/html/paint_domain-le-ssl.conf
@@ -2,12 +2,7 @@
 <VirtualHost *:443>
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
-    DocumentRoot /var/www/html
-    <Directory /var/www/html>
-      Options Indexes FollowSymLinks
-      AllowOverride None
-      Require all granted
-    </Directory>
+    DocumentRoot "/var/www/html/"
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews
diff --git a/html/paint_domain.conf b/html/paint_domain.conf
index 00d1e33e..5433617b 100644
--- a/html/paint_domain.conf
+++ b/html/paint_domain.conf
@@ -2,12 +2,7 @@
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
     ServerAlias paint-database.org
-    DocumentRoot /var/www/html
-    <Directory /var/www/html>
-      Options Indexes FollowSymLinks
-      AllowOverride None
-      Require all granted
-    </Directory>
+    DocumentRoot "/var/www/html/"
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews

From d233a15af2bcbb1771fc7278c6b325d964b6e399 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 22:28:46 +0200
Subject: [PATCH 32/35] insert alias for favicon

---
 html/paint_domain-le-ssl.conf | 1 +
 html/paint_domain.conf        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/html/paint_domain-le-ssl.conf b/html/paint_domain-le-ssl.conf
index f980eda4..7d662ce0 100644
--- a/html/paint_domain-le-ssl.conf
+++ b/html/paint_domain-le-ssl.conf
@@ -3,6 +3,7 @@
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
     DocumentRoot "/var/www/html/"
+    Alias /favicon.ico "/var/www/html/favicon.ico"
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews
diff --git a/html/paint_domain.conf b/html/paint_domain.conf
index 5433617b..34aec5af 100644
--- a/html/paint_domain.conf
+++ b/html/paint_domain.conf
@@ -3,6 +3,7 @@
     ServerName paint-database.org
     ServerAlias paint-database.org
     DocumentRoot "/var/www/html/"
+    Alias /favicon.ico "/var/www/html/favicon.ico"
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews

From d0eda8e650b7559c0aab0d245eb21329ce47a475 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 22:35:28 +0200
Subject: [PATCH 33/35] use proxy pass match to display favicon

---
 html/paint_domain-le-ssl.conf | 2 +-
 html/paint_domain.conf        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/paint_domain-le-ssl.conf b/html/paint_domain-le-ssl.conf
index 7d662ce0..ef6a98a7 100644
--- a/html/paint_domain-le-ssl.conf
+++ b/html/paint_domain-le-ssl.conf
@@ -3,7 +3,7 @@
     ServerAdmin markus.goetz@kit.edu
     ServerName paint-database.org
     DocumentRoot "/var/www/html/"
-    Alias /favicon.ico "/var/www/html/favicon.ico"
+    ProxyPassMatch ^/favicon.ico !
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews
diff --git a/html/paint_domain.conf b/html/paint_domain.conf
index 34aec5af..ca92a361 100644
--- a/html/paint_domain.conf
+++ b/html/paint_domain.conf
@@ -3,7 +3,7 @@
     ServerName paint-database.org
     ServerAlias paint-database.org
     DocumentRoot "/var/www/html/"
-    Alias /favicon.ico "/var/www/html/favicon.ico"
+    ProxyPassMatch ^/favicon.ico !
     Alias /icons/ "/usr/share/apache2/icons/"
     <Directory "/usr/share/apache2/icons">
       Options Indexes MultiViews

From 2ded63782709f1bdeda59c233edba849d8da5e2d Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Mon, 14 Oct 2024 22:38:27 +0200
Subject: [PATCH 34/35] include favicon in head

---
 html/templates/base.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/templates/base.html b/html/templates/base.html
index 395344d0..d0b068a8 100644
--- a/html/templates/base.html
+++ b/html/templates/base.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+    <link rel="icon" href="/favicon.ico" type="image/x-icon">
     <title>PAINT – FAIR Concentrating Solar Power Plant Database</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />

From fda7cd92f4cd757fe5854a71f528a1e6defd9f95 Mon Sep 17 00:00:00 2001
From: Kaleb Phipps <kaleb.phipps@kit.edu>
Date: Tue, 15 Oct 2024 12:40:01 +0200
Subject: [PATCH 35/35] favicon as new resource in head

---
 html/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/templates/base.html b/html/templates/base.html
index d0b068a8..d9960397 100644
--- a/html/templates/base.html
+++ b/html/templates/base.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <link rel="icon" href="/favicon.ico" type="image/x-icon">
+    <link rel="icon" href="/favicon.ico?v=2" type="image/x-icon">
     <title>PAINT – FAIR Concentrating Solar Power Plant Database</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />