From e3e56669bee324f7b02349a44ab1ca96c1d36fc0 Mon Sep 17 00:00:00 2001
From: Tristan Maat <tm@tlater.net>
Date: Sun, 3 Feb 2019 02:58:52 +0000
Subject: [PATCH] Adjust to new rocket-based backend

---
 src/index/index.pug            |  2 +-
 src/lib/pug/message-flash.html | 18 +++++++-----------
 src/lib/pug/navigation.pug     |  4 ++--
 src/mail/mail.pug              |  2 +-
 src/pages/index.json           |  2 +-
 src/pages/mail.json            |  2 +-
 src/pages/music.json           |  2 +-
 src/pages/startpage.json       |  2 +-
 webpack.common.js              |  8 ++++++--
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/index/index.pug b/src/index/index.pug
index f4d8930..42cea34 100644
--- a/src/index/index.pug
+++ b/src/index/index.pug
@@ -67,4 +67,4 @@ block content
 
         You may find the following interesting though:
 
-        - A [little web app](/music_sample) showing off what Webgl can do in combination with the JavaScript Audio interface.
+        - A [little web app](music_sample) showing off what Webgl can do in combination with the JavaScript Audio interface.
diff --git a/src/lib/pug/message-flash.html b/src/lib/pug/message-flash.html
index ef7df36..4e72498 100644
--- a/src/lib/pug/message-flash.html
+++ b/src/lib/pug/message-flash.html
@@ -1,12 +1,8 @@
-{% with messages = get_flashed_messages(with_categories=true) %}
-  {% if messages %}
-    {% for category, message in messages %}
-      <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
-        {{ message }}
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+{{#if flash}}
+  <div class="alert alert-{{ flash-type }} alert-dismissible fade show" role="alert">
+      {{ flash }}
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
           <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-    {% endfor %}
-  {% endif %}
-{% endwith %}
+      </button>
+  </div>
+{{/if}}
diff --git a/src/lib/pug/navigation.pug b/src/lib/pug/navigation.pug
index e3b36e9..751922d 100644
--- a/src/lib/pug/navigation.pug
+++ b/src/lib/pug/navigation.pug
@@ -1,6 +1,6 @@
 nav.navbar.navbar-expand-lg.navbar-dark.bg-dark
   .container
-    a.navbar-brand(href="{{ url_for('index') }}") tlater
+    a.navbar-brand(href="/") tlater
     button.navbar-toggler(
       type="button",
       data-toggle="collapse",
@@ -13,5 +13,5 @@ nav.navbar.navbar-expand-lg.navbar-dark.bg-dark
 
     #navbar.navbar-collapse.collapse
       ul.navbar-nav.mr-auto
-        li.nav-item: a.nav-link(href="{{ url_for('mail') }}") E-Mail
+        li.nav-item: a.nav-link(href="mail") E-Mail
         li.nav-item: a.nav-link(href="https://www.github.com/TLATER") GitHub
diff --git a/src/mail/mail.pug b/src/mail/mail.pug
index 71c4a4d..d0efd16 100644
--- a/src/mail/mail.pug
+++ b/src/mail/mail.pug
@@ -6,7 +6,7 @@ block content
   .row
     //- The form
     .col-md-6
-      form#sendmail(role="form", action="{{ url_for('mail') }}", method="post")
+      form#sendmail(role="form", action="mail", method="post")
         //- The sender address
         .form-group
           label.control-label(for="mail") Email address
diff --git a/src/pages/index.json b/src/pages/index.json
index 709714e..a90f936 100644
--- a/src/pages/index.json
+++ b/src/pages/index.json
@@ -1,7 +1,7 @@
 {
     "hash": true,
     "title": "tlater.net",
-    "filename": "../index.html",
+    "filename": "../index.html.hbs",
     "template": "./src/index/index.pug",
     "chunks": ["index"]
 }
diff --git a/src/pages/mail.json b/src/pages/mail.json
index 5b88f62..d0e75ed 100644
--- a/src/pages/mail.json
+++ b/src/pages/mail.json
@@ -1,7 +1,7 @@
 {
     "hash": true,
     "title": "tlater.net contact",
-    "filename": "../mail.html",
+    "filename": "../mail.html.hbs",
     "template": "./src/mail/mail.pug",
     "chunks": ["mail"]
 }
diff --git a/src/pages/music.json b/src/pages/music.json
index 069e517..15006b2 100644
--- a/src/pages/music.json
+++ b/src/pages/music.json
@@ -1,7 +1,7 @@
 {
     "hash": true,
     "title": "tlater.net music",
-    "filename": "../music.html",
+    "filename": "../music.html.hbs",
     "template": "./src/music/music.pug",
     "chunks": ["music"]
 }
diff --git a/src/pages/startpage.json b/src/pages/startpage.json
index 8c9fb6f..6efc31d 100644
--- a/src/pages/startpage.json
+++ b/src/pages/startpage.json
@@ -1,7 +1,7 @@
 {
     "hash": true,
     "title": "tlater.net startpage",
-    "filename": "../startpage.html",
+    "filename": "../startpage.html.hbs",
     "template": "./src/startpage/startpage.pug",
     "chunks": ["startpage"]
 }
diff --git a/webpack.common.js b/webpack.common.js
index 7aa0224..b4c8c62 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -34,7 +34,11 @@ module.exports = {
             jQuery: "jquery"
         }),
         new MiniCssExtractPlugin(),
-        new FaviconsWebpackPlugin(path.resolve(__dirname, "src", "lib", "favicon.png"))
+        new FaviconsWebpackPlugin({
+            logo: path.resolve(__dirname, "src", "lib", "favicon.png"),
+            prefix: "../static/",
+            title: "tlater.net"
+        })
     ].concat(pages.map(page => new HtmlWebpackPlugin(page))),
     module: {
         rules: [
@@ -44,7 +48,7 @@ module.exports = {
                 use: {
                     loader: "babel-loader",
                     options: {
-                        presets: ["babel-preset-env"]
+                        presets: ["@babel/preset-env"]
                     }
                 }
             },