Start implementing comments

This reverts commit 32b1c4a3b4.

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13-bookworm
+FROM python:3.14-bookworm
 RUN apt-get update
 RUN apt-get -y install apache2 apache2-dev
 COPY src/requirements.txt /var/www/jc/requirements.txt

Jenkinsfile

@@ -41,17 +41,19 @@ pipeline {
         stage('Security scan') {
             when {
                 expression { 
-                   return params.Build == true
+                return params.Build == true
                 }
             }
             steps {
-                sh "docker kill sectest || true"
-                sh "docker rm sectest || true"
-                sh "docker run -d --name sectest git.jakecharman.co.uk/jake/jakecharman.co.uk:$BUILD_NUMBER"
-                sh "docker exec sectest pip3 install pip-audit --break-system-packages"
-                sh "docker exec sectest pip-audit"
-                sh "docker stop sectest"
-                sh "docker rm sectest"
+                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                    sh "docker kill sectest || true"
+                    sh "docker rm sectest || true"
+                    sh "docker run -d --name sectest git.jakecharman.co.uk/jake/jakecharman.co.uk:$BUILD_NUMBER"
+                    sh "docker exec sectest pip3 install pip-audit --break-system-packages"
+                    sh "docker exec sectest pip-audit"
+                    sh "docker stop sectest"
+                    sh "docker rm sectest"
+                }
             }
         }
 

config/httpd.conf

@@ -198,7 +198,7 @@ LoadModule dir_module modules/mod_dir.so
 LoadModule alias_module modules/mod_alias.so
 #LoadModule rewrite_module modules/mod_rewrite.somod_wsgi-express start-server
 
-LoadModule wsgi_module /usr/local/lib/python3.13/site-packages/mod_wsgi/server/mod_wsgi-py313.cpython-313-x86_64-linux-gnu.so
+LoadModule wsgi_module /usr/local/lib/python3.14/site-packages/mod_wsgi/server/mod_wsgi-py314.cpython-314-x86_64-linux-gnu.so
 
 <IfModule unixd_module>
 #

src/.buildinfo.json

@@ -0,0 +1,6 @@
+{
+    "tag": "jc-ng-localtest:",
+    "date": "2025-11-02",
+    "host": "jake-e580",
+    "user": "jake"
+}

src/comments.py

@@ -0,0 +1,30 @@
+#!/usr/bin/python3
+
+import sqlite3
+from os import path
+from datetime import datetime
+import json
+from flask import request, Response, redirect
+from index import app
+from projects import md_directory, get_by_meta_key
+
+database = '/tmp/db' #path.join(md_directory, 'comments.db')
+with sqlite3.Connection(database) as db:
+    db.execute('CREATE TABLE IF NOT EXISTS comments (date INTEGER, article TEXT, name TEXT, comment TEXT)')
+    db.commit()
+
+@app.route('/comments/<article>', methods=['GET', 'POST'])
+def post_comments(article: str):
+    match request.method:
+        case 'POST':
+            if len(get_by_meta_key(md_directory, 'id', article)) == 0:
+                return Response(status=404)
+            with sqlite3.Connection(database) as db:
+                db.execute('INSERT INTO comments (date, article, name, comment) VALUES (?, ?, ?, ?)', (datetime.now(), article, request.form.get('name'), request.form.get('comment')))
+                db.commit()
+            return redirect(f'/projects/{article}')
+        case 'GET':
+            if len(get_by_meta_key(md_directory, 'id', article)) == 1:
+                with sqlite3.Connection(database) as db:
+                    res = db.execute('SELECT * FROM comments WHERE `article` = ?', (article,))
+                    return json.dumps([{'author': x[2], 'date': x[0], 'comment': x[3]} for x in res.fetchall()])

src/index.py

@@ -10,9 +10,10 @@ from flask import Flask, render_template, Response
 app = Flask(__name__)
 
 # These imports need to come after our app is defined as they add routes to it.
+import sitemap  # pylint: disable=wrong-import-position,unused-import
 import projects # pylint: disable=wrong-import-position,unused-import
 import contact  # pylint: disable=wrong-import-position,unused-import
-import sitemap  # pylint: disable=wrong-import-position,unused-import
+import comments  # pylint: disable=wrong-import-position,unused-import
 
 class DiscordLogger(logging.Handler):
     ''' Simple logging handler to send a message to Discord '''
@@ -82,3 +83,6 @@ def error(code) -> str:
     return render_template('error.html',
                            error=f'{code}: {error_definitions.get(int(code))}',
                            description=error_desc.get(int(code)))
+
+if __name__ == '__main__':
+    app.run()

src/static/style/desktop.css

@@ -48,7 +48,7 @@
     }
 
     #projects{
-        align-items: center;
+        align-items: stretch;
         justify-content: center;
         flex-direction: row;
         flex-wrap: wrap;
@@ -58,7 +58,6 @@
     
     .project{
         width: 20vw;
-        height: 25vw;
     }
 
     #top-nav{
@@ -77,6 +76,9 @@
     #article>p>img{
         display: inline;
     }
+    #article>video{
+        display: inline;
+    }
 
     #certs>a {
         max-width: 15%;
@@ -95,18 +97,21 @@
     }
 
     .yt {
-        width: 74%;
-        height: 40vh;
+        width: calc(66% - 40px);
+        min-height: 100%;
     }
 
     .gallery {
         display: flex;
-        height: 35vh;
+        height: fit-content;
         padding: 10px 0;
     }
 
     .gallery * {
-        height: inherit !important;
         padding: 0 20px;
     }
+
+    .gallery>img {
+        width: calc(33% - 40px);
+    }
 }

src/static/style/mobile.css

@@ -212,12 +212,21 @@ label{
 
 #article{
     padding: 0 10px 0 10px;
+    margin-bottom: 25px;
 }
 
 #article>p>img{
     display: block;
     margin: 0 auto 0 auto;
     max-width: 100%;
+    max-height: 50vh;
+}
+
+#article>video{
+    display: block;
+    margin: 0 auto 0 auto;
+    max-width: 100%;
+    max-height: 50vh;
 }
 
 pre{

src/templates/article.html

@@ -6,5 +6,21 @@
         <hr />
         {{post|safe}}
     </section>
+    <section id="comments">
+        <h2>{{ comments | length }} comments</h2>
+        {% for comment in comments %}
+            <div class="comment">
+                <strong>{{ comment[2] }}</strong>
+                <p>{{ comment[3] }}</p>
+            </div>
+        {% endfor %}
+        <form action="/comments/{{ metadata.id }}" method="post">
+            <label for="name">Name:</label>
+            <input type="text" name="name" />
+            <label for="comment">Comment:</label>
+            <textarea name="comment"></textarea>
+            <input type="submit" name="submit" value="Submit">
+        </form>
+    </section>
 </main>
 {% include 'footer.html' %}