diff options
| author | Kevin J Hoerr <kjhoerr@protonmail.com> | 2024-01-03 02:46:57 +0000 |
|---|---|---|
| committer | Kevin J Hoerr <kjhoerr@protonmail.com> | 2024-01-03 02:46:57 +0000 |
| commit | 47d436a0dbaff1f07139f45cde8482a554c6e37e (patch) | |
| tree | 096e3e6ebe37f86a47aef6c736d0fcd84d28e05d | |
| parent | 0b20067cc4e1979173f92a466822e8dceb85cb6e (diff) | |
| download | submelon.dev-47d436a0dbaff1f07139f45cde8482a554c6e37e.tar.gz submelon.dev-47d436a0dbaff1f07139f45cde8482a554c6e37e.tar.bz2 submelon.dev-47d436a0dbaff1f07139f45cde8482a554c6e37e.zip | |
Update template for better page portability
| -rw-r--r-- | config.json | 1 | ||||
| -rw-r--r-- | src/config.ts | 15 | ||||
| -rw-r--r-- | src/pages/404.njk | 2 | ||||
| -rw-r--r-- | src/templates/layouts/page.njk | 12 |
4 files changed, 9 insertions, 21 deletions
diff --git a/config.json b/config.json index c98c635..d3e3dee 100644 --- a/config.json +++ b/config.json @@ -1,4 +1,5 @@ { "url": "https://submelon.dev", + "title": "Kevin J Hoerr <kjhoerr@submelon.tech>", "version": "1704159082" }
\ No newline at end of file diff --git a/src/config.ts b/src/config.ts index 71a6c66..3746503 100644 --- a/src/config.ts +++ b/src/config.ts @@ -47,21 +47,6 @@ ${Object.values(metadata) }, ); - // add `cspMode` shortcode - config.addShortcode("metaCsp", function () { - const runMode = this.eleventy.env.runMode; - let policy: string; - if (runMode === "serve" || runMode == "watch") { - policy = - "default-src http://localhost:8080/;img-src http://localhost:8080/ data:;connect-src ws://localhost:8080/;script-src 'strict-dynamic' 'sha512-7Y25+FX/kRUbZEHtQBOSLffzofBxz8ABQErLAVpGkfzactkpJU5wtTmhIfIZeTw7VHg1JeTIC5kHkzPq7LqR1w==';"; - } else { - // runMode === "build" or unknown - policy = - "default-src 'self';img-src 'self' data:;script-src 'none';object-src 'none';base-uri 'none';connect-src: 'none';"; - } - return `<meta http-equiv="Content-Security-Policy" content="${policy}">`; - }); - // add `date` filter config.addFilter("formatDate", formatDate); diff --git a/src/pages/404.njk b/src/pages/404.njk index 3c965ac..7921b76 100644 --- a/src/pages/404.njk +++ b/src/pages/404.njk @@ -1,5 +1,7 @@ --- layout: layouts/page.njk +title: 404 Not Found +description: The resource to be accessed could not be found. --- <section><h1>Not found</h1></section> <section> diff --git a/src/templates/layouts/page.njk b/src/templates/layouts/page.njk index c14caf5..923ede7 100644 --- a/src/templates/layouts/page.njk +++ b/src/templates/layouts/page.njk @@ -1,10 +1,10 @@ --- -pageTitle: Kevin J Hoerr <kjhoerr@submelon.tech> copyYear: 2024 -author: Kevin J Hoerr +author: kjhoerr description: The official website of Kevin Hoerr, developer of websites. themeColor: "#e1e1e1" --- +{% set pageTitle = site.title | escape | replace('@', '@') %} <!DOCTYPE html> <html lang="en"> <head> @@ -14,10 +14,10 @@ themeColor: "#e1e1e1" <meta name="theme-color" content="{{ themeColor }}"/> <meta name="description" content="{{ description }}"/> <meta name="twitter:description" content="{{ description }}"/> - <meta name="twitter:title" content="{{ pageTitle | escape | replace('@', '@') }}"/> + <meta name="twitter:title" content="{{ title if title else pageTitle }}"/> <meta name="twitter:creator" content="{{ author }}"/> <meta name="twitter:card" content="summary"/> - {% metaCsp %} + <meta http-equiv="Content-Security-Policy" content="{{ ( "default-src 'self';img-src 'self' data:;script-src 'none';object-src 'none';base-uri 'none';connect-src: 'none';" if eleventy.env.runMode == "build" else "default-src http://localhost:8080/;img-src http://localhost:8080/ data:;connect-src ws://localhost:8080/;script-src 'strict-dynamic' 'sha512-7Y25+FX/kRUbZEHtQBOSLffzofBxz8ABQErLAVpGkfzactkpJU5wtTmhIfIZeTw7VHg1JeTIC5kHkzPq7LqR1w==';" ) | safe }}"> <meta name="generator" content="{{ eleventy.generator }}"> <link rel="stylesheet" href="{{ '/styles.css' | url }}"/> <link rel="icon" href="{{ '/favicon-32x32.png' | url }}" type="image/png"/> @@ -30,7 +30,7 @@ themeColor: "#e1e1e1" <link rel="apple-touch-icon" sizes="256x256" href="{{ '/icons/icon-256x256.png' | url }}"/> <link rel="apple-touch-icon" sizes="384x384" href="{{ '/icons/icon-384x384.png' | url }}"/> <link rel="apple-touch-icon" sizes="512x512" href="{{ '/icons/icon-512x512.png' | url }}"/> - <title>{{ pageTitle | escape | replace('@', '@') }}</title> + <title>{{ pageTitle }}{{ " | " if title }}{{ title }}</title> </head> <body> <main> @@ -38,7 +38,7 @@ themeColor: "#e1e1e1" {{ content | safe }} </article> <footer> - <span>©{{ copyYear }} kjhoerr@https://submelon.dev/:{{ buildTimeEncoded }}</span> + <span>©{{ copyYear }} {{ author }}@{{ site.url }}/:{{ buildTimeEncoded }}</span> </footer> </main> </body> |