Merge pull request #82 from hankchizljaw/feature/0.5.0

Feature/0.5.0
Andy-set-studio · Sep 20, 2019 · a7aaa68 · a7aaa68
2 parents e2546c6 + 34fdb51
commit a7aaa68
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Get started now by **[deploying Hylia to Netlify.][deploy-to-netlify]**
 
 ## Features
 
-Hylia version 0.4.5 features:
+Hylia version 0.5.0 features:
 
 ✍️ A pre-configured [Netlify CMS](https://www.netlifycms.org/) setup  
 🎨 Customisable design tokens to make it your own  

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hylia",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "A simple Eleventy starter kit to help you have a blog of your own",
   "main": "index.js",
   "dependencies": {

diff --git a/src/404.md b/src/404.md
@@ -1,17 +1,17 @@
 ---
-layout: layouts/home.njk
+title: '404 - not found'
+layout: layouts/page.njk
 permalink: 404.html
 eleventyExcludeFromCollections: true
 ---
-# Content not found.
 
-Go <a href="{{ '/' | url }}">home</a>.
+We’re sorry, but that content can’t be found. Please go [back to home](/).
 
 {% comment %}
 Read more: https://www.11ty.io/docs/quicktips/not-found/
 
 This will work for both GitHub pages and Netlify:
 
-* https://help.github.com/articles/creating-a-custom-404-page-for-your-github-pages-site/
-* https://www.netlify.com/docs/redirects/#custom-404
-{% endcomment %}
+- https://help.github.com/articles/creating-a-custom-404-page-for-your-github-pages-site/
+- https://www.netlify.com/docs/redirects/#custom-404
+  {% endcomment %}
diff --git a/src/_data/site.json b/src/_data/site.json
@@ -4,8 +4,10 @@
   "shortDesc": "Hylia is a lightweight Eleventy starter kit to help you to create your own blog or personal website.",
   "url": "https://hylia.website",
   "authorEmail": "me@andy-bell.design",
-  "authorHandle": "@andybelldesign",
+  "authorHandle": "@hankchizljaw",
   "authorName": "Andy Bell",
   "enableThirdPartyComments": false,
-  "maxPostsPerPage": 5
-}
+  "maxPostsPerPage": 5,
+  "paymentPointer": "$pay.stronghold.co/1a171baca7344614a63a0b798870af43b82",
+  "faviconPath": "/images/favicon.png"
+}
diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk
@@ -5,14 +5,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ site.url }}/feed.xml" />
-  <link rel="icon" href="https://hankchizljaw.imgix.net/hylia-favicon.png" type="image/png" />
+  <link rel="icon" href="{{ site.faviconPath }}" type="image/png" />
   <link rel="preload" as="font" type="font/woff2" crossorigin href="/fonts/lora-v13-latin-700.woff2" />
   {% include "partials/global/meta-info.njk" %}
   <script>document.documentElement.classList.remove('no-js');</script>
   <style>{% include "assets/css/global.css" %}</style>
   {% block head %}
   {% endblock %}
-  <script src="https://identity.netlify.com/v1/netlify-identity-widget.js"></script>
 </head>
 <body>
   {% include "partials/global/site-head.njk" %}
@@ -29,5 +28,6 @@
       });
     }
   </script>
+  <script src="https://identity.netlify.com/v1/netlify-identity-widget.js" async defer></script>
 </body>
 </html>
diff --git a/src/_includes/partials/global/meta-info.njk b/src/_includes/partials/global/meta-info.njk
@@ -35,3 +35,7 @@
   <meta property="og:image:alt" content="Page image for {{ site.name }}" />
   <meta name="twitter:image:alt" content="Page image for {{ site.name }}" />
 {% endif %}
+
+{% if site.paymentPointer %}
+  <meta name="monetization" content="{{ site.paymentPointer }}" />
+{% endif %}
diff --git a/src/admin/config.yml b/src/admin/config.yml
@@ -33,7 +33,7 @@ collections:
     fields:
       - {label: "Layout", name: "layout", widget: "hidden", default: "layouts/page.njk"}
       - {label: "Title", name: "title", widget: "string"}
-      - {label: "Permalink Override", name: "permalink", widget: "string"}
+      - {label: "Permalink Override (Pattern: '/your-slug/index.html')", name: "permalink", widget: "string", required: false}
       - {label: "SEO Meta Title", name: "metaTitle", widget: "string", required: false}
       - {label: "SEO Meta Description", name: "metaDesc", widget: "string", required: false}
       - {label: "Social Image", name: "socialImage", widget: "image", required: false}
@@ -70,6 +70,8 @@ collections:
           - {label: "Maximum Posts Per Page", name: "maxPostsPerPage", widget: "number", default: 5}
           - {label: "Show Theme Credit", name: "showThemeCredit", widget: "boolean", default: true}
           - {label: "Enable Third Party Comments Area", name: "enableThirdPartyComments", widget: "boolean", default: false}
+          - {label: "Payment Pointer (Web Monetization: https://bit.ly/2kTRI1b)", name: "paymentPointer", widget: "string"}
+          - {label: "Favicon path (EG: /images/favicon.png)", name: "faviconPath", widget: "string"}
       - label: "Navigation"
         name: "nav"
         delete: false

diff --git a/src/images/favicon.png b/src/images/favicon.png