diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index e7c4f12..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.eleventy.js b/.eleventy.js index 9c5694d..02efa04 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,39 +1,54 @@ -const CleanCSS = require("clean-css"); +const CleanCSS = require('clean-css') +const { getMetadata } = require('page-metadata-parser') +const domino = require('domino') +const fetch = require('node-fetch') module.exports = function(eleventyConfig) { // css minifier - eleventyConfig.addFilter("cssmin", function(code) { - return new CleanCSS({}).minify(code).styles; - }); + eleventyConfig.addFilter('cssmin', function(code) { + return new CleanCSS({}).minify(code).styles + }) // date prettier - eleventyConfig.addFilter("date", function(date) { - const parsedDate = new Date(date); - return parsedDate.toDateString(); - }); + eleventyConfig.addFilter('date', function(date) { + const parsedDate = new Date(date) + return parsedDate.toDateString() + }) // dump dump - eleventyConfig.addFilter("logDump", function(data) { - console.log(data); - }); + eleventyConfig.addFilter('logDump', function(data) { + console.log(data) + }) // markdown parser - const markdownIt = require("markdown-it"); - const markdownItPrism = require("markdown-it-prism"); + const markdownIt = require('markdown-it') + const markdownItPrism = require('markdown-it-prism') + const customBlock = require('markdown-it-custom-block') const options = { - html: true - }; - let markdownLib = markdownIt(options).use(markdownItPrism); - eleventyConfig.setLibrary("md", markdownLib); + html: true, + linkify: true, + } + let markdownLib = markdownIt(options).use(markdownItPrism) + eleventyConfig.setLibrary('md', markdownLib) + + // async metadata parser + eleventyConfig.addNunjucksAsyncShortcode('metablock', async function(url) { + const response = await fetch(url) + const html = await response.text() + const doc = domino.createWindow(html).document + const metadata = getMetadata(doc, url) + return `
${metadata.title}

${metadata.title}

${metadata.description}

` + }) // config object return { + markdownTemplateEngine: 'njk', dir: { - input: "./src", - output: "./dist", - data: "./_data", - includes: "./_includes", - layouts: "./_layouts" - } - }; -}; + input: './src', + output: './dist', + data: './_data', + includes: './_includes', + layouts: './_layouts', + }, + } +} diff --git a/package-lock.json b/package-lock.json index 124d85f..7c6faee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "heapsgooddev-site-v2", - "version": "2.0.0", + "version": "2.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5362,6 +5362,12 @@ "domelementtype": "1" } }, + "domino": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.4.tgz", + "integrity": "sha512-l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ==", + "dev": true + }, "domutils": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", @@ -10124,6 +10130,12 @@ } } }, + "markdown-it-custom-block": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/markdown-it-custom-block/-/markdown-it-custom-block-0.1.1.tgz", + "integrity": "sha1-kfxKWGKQ02Y2yKrLFfrHk+n+mKA=", + "dev": true + }, "markdown-it-prism": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/markdown-it-prism/-/markdown-it-prism-2.0.3.tgz", @@ -10581,6 +10593,11 @@ "lower-case": "^1.1.1" } }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, "node-forge": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", @@ -11230,6 +11247,12 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, + "page-metadata-parser": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/page-metadata-parser/-/page-metadata-parser-1.1.4.tgz", + "integrity": "sha512-TbPNw7GddbHs4c2DyYinFvh51BVsaMfdrweeylzGlg8qeuzALGxq2NF+6jbmeKc7DnU2BZRDOuWNnEjDwUSqRQ==", + "dev": true + }, "pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", diff --git a/package.json b/package.json index 0a6fb39..2053acc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "heapsgooddev-site-v2", - "version": "2.0.0", + "version": "2.0.2", "description": "", "main": "index.js", "scripts": { @@ -29,7 +29,8 @@ }, "homepage": "https://github.com/heapsgooddev/heapsgooddev-site-v2#readme", "dependencies": { - "background-image-fade-in": "^0.4.4" + "background-image-fade-in": "^0.4.4", + "node-fetch": "^2.6.0" }, "devDependencies": { "@11ty/eleventy": "^0.10.0", @@ -52,14 +53,17 @@ "cross-env": "^5.2.0", "css-loader": "^1.0.1", "cz-conventional-changelog": "^2.1.0", + "domino": "^2.1.4", "file-loader": "^2.0.0", "html-webpack-plugin": "^3.2.0", "husky": "^4.2.3", "image-webpack-loader": "^4.5.0", "lint-staged": "^10.0.7", "markdown-it": "^10.0.0", + "markdown-it-custom-block": "^0.1.1", "markdown-it-prism": "^2.0.3", "mini-css-extract-plugin": "^0.4.4", + "page-metadata-parser": "^1.1.4", "path": "^0.12.7", "postcss-custom-properties": "^8.0.9", "postcss-loader": "^3.0.0", diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 030a4b9..0000000 Binary files a/src/.DS_Store and /dev/null differ diff --git a/src/_assets/.DS_Store b/src/_assets/.DS_Store deleted file mode 100644 index d13cc5e..0000000 Binary files a/src/_assets/.DS_Store and /dev/null differ diff --git a/src/_assets/author-images/danharris.jpg b/src/_assets/author-images/danharris.jpg new file mode 100644 index 0000000..349dd7b Binary files /dev/null and b/src/_assets/author-images/danharris.jpg differ diff --git a/src/_assets/author-images/danharris.png b/src/_assets/author-images/danharris.png deleted file mode 100644 index 585a9dd..0000000 Binary files a/src/_assets/author-images/danharris.png and /dev/null differ diff --git a/src/_assets/author-images/heapsgood.jpg b/src/_assets/author-images/heapsgood.jpg new file mode 100644 index 0000000..1278fda Binary files /dev/null and b/src/_assets/author-images/heapsgood.jpg differ diff --git a/src/_assets/author-images/hgd.png b/src/_assets/author-images/hgd.png deleted file mode 100644 index 9dde362..0000000 Binary files a/src/_assets/author-images/hgd.png and /dev/null differ diff --git a/src/_assets/author-images/scottcabot.jpg b/src/_assets/author-images/scottcabot.jpg new file mode 100644 index 0000000..0e6fa46 Binary files /dev/null and b/src/_assets/author-images/scottcabot.jpg differ diff --git a/src/_assets/author-images/scottcabot.png b/src/_assets/author-images/scottcabot.png deleted file mode 100644 index b9fd396..0000000 Binary files a/src/_assets/author-images/scottcabot.png and /dev/null differ diff --git a/src/_assets/blog-images/.DS_Store b/src/_assets/blog-images/.DS_Store deleted file mode 100644 index 9873aca..0000000 Binary files a/src/_assets/blog-images/.DS_Store and /dev/null differ diff --git a/src/_assets/blog-images/forward-to-2020.jpg b/src/_assets/blog-images/forward-to-2020.jpg index 8323265..34fc21f 100644 Binary files a/src/_assets/blog-images/forward-to-2020.jpg and b/src/_assets/blog-images/forward-to-2020.jpg differ diff --git a/src/_assets/blog-images/heapsgooddev-social.jpg b/src/_assets/blog-images/heapsgooddev-social.jpg new file mode 100755 index 0000000..f32d53d Binary files /dev/null and b/src/_assets/blog-images/heapsgooddev-social.jpg differ diff --git a/src/_assets/blog-images/monthly-march-2020.jpg b/src/_assets/blog-images/monthly-march-2020.jpg new file mode 100644 index 0000000..db0c3ca Binary files /dev/null and b/src/_assets/blog-images/monthly-march-2020.jpg differ diff --git a/src/_assets/heapsgooddev-social.jpg b/src/_assets/heapsgooddev-social.jpg new file mode 100755 index 0000000..f32d53d Binary files /dev/null and b/src/_assets/heapsgooddev-social.jpg differ diff --git a/src/_data/attributiondata.json b/src/_data/attributiondata.json new file mode 100644 index 0000000..4e576a0 --- /dev/null +++ b/src/_data/attributiondata.json @@ -0,0 +1,11 @@ +{ + "flaticon": { + "link": "https://www.flaticon.com", + "authors": [ + { + "name": "Eucalyp", + "link": "https://www.flaticon.com/authors/eucalyp" + } + ] + } +} diff --git a/src/_data/authorsdata.json b/src/_data/authorsdata.json index dd76132..5bc2d30 100644 --- a/src/_data/authorsdata.json +++ b/src/_data/authorsdata.json @@ -6,18 +6,18 @@ "linkedin": "", "website": "" }, + "heapsgood": { + "firstName": "Heaps Good", + "lastName": "Dev", + "twitter": "heapsgooddev", + "linkedin": "", + "website": "" + }, "scottcabot": { "firstName": "Scott", "lastName": "Cabot", "twitter": "iamscottcab", "linkedin": "", "website": "https://scott.cab" - }, - "hgd": { - "firstName": "Heaps", - "lastName": "Good Dev", - "twitter": "heapsgooddev", - "linkedin": "", - "website": "" } } diff --git a/src/_data/tagsdata.json b/src/_data/tagsdata.json new file mode 100644 index 0000000..1d95eda --- /dev/null +++ b/src/_data/tagsdata.json @@ -0,0 +1,3 @@ +{ + "systemTags": ["post", "meta-post"] +} diff --git a/src/_includes/_author.njk b/src/_includes/_author.njk index 294a90c..f13171d 100644 --- a/src/_includes/_author.njk +++ b/src/_includes/_author.njk @@ -3,15 +3,15 @@
- +
-

{{ author.firstName }} {{ author.lastName }}

+

{{ author.firstName }} {{ author.lastName }}

{% if author.twitter %} @{{ author.twitter }} diff --git a/src/_includes/_card.njk b/src/_includes/_card.njk index d16e344..41a7be8 100644 --- a/src/_includes/_card.njk +++ b/src/_includes/_card.njk @@ -14,7 +14,7 @@ {{ publishDate | date }}
+
+

+ + Code of Conduct + +

+

+ + team@heapsgood.dev + +

+

+ Made with ☕️, from adelaide. +

+
+

+ Icons made by + {% for iconAuthor in attributiondata.flaticon.authors | list %} + {{ iconAuthor.name }} , + {% endfor %} + from freepik.com +

+
+

+ © 2020 +

+
diff --git a/src/_includes/_header.html b/src/_includes/_header.html index 68ba3f4..9692915 100644 --- a/src/_includes/_header.html +++ b/src/_includes/_header.html @@ -3,13 +3,13 @@ + content="{{ description if description else "official site for heaps good dev - community of developers & tech peeps in adelaide" }}" /> + content="{{ description if description else "official site for heaps good dev - community of developers & tech peeps in adelaide" }}"> + content="https://heapsgood.dev/{{ base_route if (base_route) and (base_route != 'home') }}{{ "-images/" if (base_route) and (base_route != 'home') }}{{ slug if slug else "heapsgooddev-social" }}.jpg"> @@ -25,5 +25,6 @@ src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js" > - + + \ No newline at end of file diff --git a/src/_includes/_nav.html b/src/_includes/_nav.html index 4999a61..22ed2fb 100644 --- a/src/_includes/_nav.html +++ b/src/_includes/_nav.html @@ -15,17 +15,12 @@
  • blog
    • -
  • - conduct -