Change input folder to src

LkeMitchll · Jan 11, 2022 · 522a197 · 522a197
1 parent 2071133
commit 522a197
Show file tree

Hide file tree

Showing 91 changed files with 37 additions and 33 deletions.
diff --git a/.eleventy.js b/.eleventy.js
@@ -2,11 +2,11 @@ require("dotenv").config();
 
 const pluginRSS = require("@11ty/eleventy-plugin-rss");
 const pluginReadingTime = require("eleventy-plugin-reading-time");
-const findByID = require("./filters/findByID");
-const limit = require("./filters/limit");
-const date = require("./filters/date");
-const markdown = require("./shortcodes/markdown");
-const responsiveImage = require("./shortcodes/responsiveImage");
+const findByID = require("./src/filters/findByID");
+const limit = require("./src/filters/limit");
+const date = require("./src/filters/date");
+const markdown = require("./src/shortcodes/markdown");
+const responsiveImage = require("./src/shortcodes/responsiveImage");
 const postcss = require("postcss");
 const importPlugin = require("postcss-import");
 const autoprefixerPlugin = require("autoprefixer");
@@ -16,10 +16,10 @@ module.exports = function (eleventyConfig) {
   eleventyConfig.addPlugin(pluginRSS);
   eleventyConfig.addPlugin(pluginReadingTime);
 
-  eleventyConfig.addPassthroughCopy("./assets/fonts");
-  eleventyConfig.addPassthroughCopy("./assets/images");
-  eleventyConfig.addPassthroughCopy("./components/*.js");
-  eleventyConfig.addWatchTarget("./css/");
+  eleventyConfig.addPassthroughCopy("src/assets/fonts");
+  eleventyConfig.addPassthroughCopy("src/assets/images");
+  eleventyConfig.addPassthroughCopy("src/components/*.js");
+  eleventyConfig.addWatchTarget("src/css/");
 
   eleventyConfig.addFilter("findByID", findByID);
   eleventyConfig.addFilter("limit", limit);
@@ -28,12 +28,14 @@ module.exports = function (eleventyConfig) {
   eleventyConfig.addShortcode("renderMarkdown", markdown);
   eleventyConfig.addShortcode("responsiveImage", responsiveImage);
 
+  // PostCSS comile via .pcss file extension
   eleventyConfig.addTemplateFormats("pcss");
   eleventyConfig.addExtension("pcss", {
     outputFileExtension: "css",
 
     compile: async function (inputContent, inputPath) {
-      let result = await postcss([importPlugin, autoprefixerPlugin, nanoPlugin])
+      let plugins = [importPlugin, autoprefixerPlugin, nanoPlugin];
+      let result = await postcss(plugins)
         .process(inputContent, { from: inputPath })
         .then((result) => result.css);
 
@@ -44,7 +46,9 @@ module.exports = function (eleventyConfig) {
   });
 
   return {
+    dir: {
+      input: "src",
+    },
     htmlTemplateEngine: "njk",
-    markdownTemplateEngine: "njk",
   };
 };
diff --git a/netlify/functions/now-playing.js b/netlify/functions/now-playing.js
@@ -1,4 +1,4 @@
-const SpotifyAPI = require("../../providers/spotify");
+const SpotifyAPI = require("../../src/providers/spotify");
 
 exports.handler = async () => {
   const api = new SpotifyAPI();

diff --git a/_data/assets.js → src/_data/assets.js b/_data/assets.js → src/_data/assets.js
diff --git a/_data/bookmarks.js → src/_data/bookmarks.js b/_data/bookmarks.js → src/_data/bookmarks.js
diff --git a/_data/commits.js → src/_data/commits.js b/_data/commits.js → src/_data/commits.js
diff --git a/_data/cv.json → src/_data/cv.json b/_data/cv.json → src/_data/cv.json
diff --git a/_data/dates.js → src/_data/dates.js b/_data/dates.js → src/_data/dates.js
diff --git a/_data/feeds.js → src/_data/feeds.js b/_data/feeds.js → src/_data/feeds.js
diff --git a/_data/list.js → src/_data/list.js b/_data/list.js → src/_data/list.js
diff --git a/_data/metaPosts.js → src/_data/metaPosts.js b/_data/metaPosts.js → src/_data/metaPosts.js
diff --git a/_data/music.js → src/_data/music.js b/_data/music.js → src/_data/music.js
diff --git a/_data/navigation.json → src/_data/navigation.json b/_data/navigation.json → src/_data/navigation.json
diff --git a/_data/now.js → src/_data/now.js b/_data/now.js → src/_data/now.js
diff --git a/_data/pages.js → src/_data/pages.js b/_data/pages.js → src/_data/pages.js
diff --git a/_data/posts.js → src/_data/posts.js b/_data/posts.js → src/_data/posts.js
diff --git a/_data/roundups.js → src/_data/roundups.js b/_data/roundups.js → src/_data/roundups.js
diff --git a/_data/savee.js → src/_data/savee.js b/_data/savee.js → src/_data/savee.js
diff --git a/_includes/bookmarks.html → src/_includes/bookmarks.html b/_includes/bookmarks.html → src/_includes/bookmarks.html
diff --git a/_includes/career.html → src/_includes/career.html b/_includes/career.html → src/_includes/career.html
diff --git a/_includes/commits.html → src/_includes/commits.html b/_includes/commits.html → src/_includes/commits.html
diff --git a/_includes/favouriteBookmarks.html → src/_includes/favouriteBookmarks.html b/_includes/favouriteBookmarks.html → src/_includes/favouriteBookmarks.html
diff --git a/_includes/footer.html → src/_includes/footer.html b/_includes/footer.html → src/_includes/footer.html
diff --git a/_includes/layout.html → src/_includes/layout.html b/_includes/layout.html → src/_includes/layout.html
@@ -29,10 +29,10 @@
     <link rel="stylesheet" href="/css/style.css" />
   </head>
   <body>
-    {% include "_includes/nav.html" %}
+    {% include "./nav.html" %}
     <main>
       {{ content | safe }}
     </main>
-    {% include "_includes/footer.html" %}
+    {% include "./footer.html" %}
   </body>
 </html>
diff --git a/_includes/listening.html → src/_includes/listening.html b/_includes/listening.html → src/_includes/listening.html
@@ -3,7 +3,7 @@ <h2>Listening</h2>
   <section class="columns" style="--cols: 3">
     <div>
       <h3 class="subtitle">Now Playing</h3>
-      {% include "components/now-playing.html" %}
+      {% include "../components/now-playing.html" %}
       <hr class="gap-large" />
       {% for week in [music.lastWeek, music.thisWeek] %}
       <h3 class="subtitle">{{ week.title }}</h3>

diff --git a/_includes/metaLink.html → src/_includes/metaLink.html b/_includes/metaLink.html → src/_includes/metaLink.html
diff --git a/_includes/nav.html → src/_includes/nav.html b/_includes/nav.html → src/_includes/nav.html
diff --git a/_includes/posts.html → src/_includes/posts.html b/_includes/posts.html → src/_includes/posts.html
diff --git a/_includes/reading.html → src/_includes/reading.html b/_includes/reading.html → src/_includes/reading.html
diff --git a/_includes/scrapbook.html → src/_includes/scrapbook.html b/_includes/scrapbook.html → src/_includes/scrapbook.html
diff --git a/_includes/siteDirectory.html → src/_includes/siteDirectory.html b/_includes/siteDirectory.html → src/_includes/siteDirectory.html
diff --git a/_includes/stats.html → src/_includes/stats.html b/_includes/stats.html → src/_includes/stats.html
diff --git a/_includes/toc.html → src/_includes/toc.html b/_includes/toc.html → src/_includes/toc.html
diff --git a/about.html → src/about.html b/about.html → src/about.html
@@ -3,7 +3,7 @@
 title: About Me
 theme: pink
 ---
-{% from '_includes/metaLink.html' import metaLink %}
+{% from './_includes/metaLink.html' import metaLink %}
 {% set heroImage = assets | findByID("5ZI6Cx1N7O5KG8ikkg1wv7") %}
 {% set content = pages | findByID("gs1BugZQXA8mN7DniEOFx") %}
 <header class="flow | gap-large">
@@ -28,8 +28,8 @@ <h1 class="headline">{{ content.fields.title }}</h1>
   </p>
 </article>
 {% set toc = ["History", "Experience", "Clients", "Skills", "Recognition"] %}
-{% include "_includes/toc.html" %}
+{% include "./_includes/toc.html" %}
 <article class="markdown | flow | gap-large">
   {% renderMarkdown content.fields.contentMarkdown, assets %}
 </article>
-{% include "_includes/career.html" %}
+{% include "./_includes/career.html" %}
diff --git a/assets/fonts/Blanco-Italic.subset.woff2 → src/assets/fonts/Blanco-Italic.subset.woff2 b/assets/fonts/Blanco-Italic.subset.woff2 → src/assets/fonts/Blanco-Italic.subset.woff2
diff --git a/assets/fonts/Blanco-Medium.subset.woff2 → src/assets/fonts/Blanco-Medium.subset.woff2 b/assets/fonts/Blanco-Medium.subset.woff2 → src/assets/fonts/Blanco-Medium.subset.woff2
diff --git a/assets/fonts/Blanco-Regular.subset.woff2 → src/assets/fonts/Blanco-Regular.subset.woff2 b/assets/fonts/Blanco-Regular.subset.woff2 → src/assets/fonts/Blanco-Regular.subset.woff2
diff --git a/...s/GT-America-Extended-Medium.subset.woff2 → ...s/GT-America-Extended-Medium.subset.woff2 b/...s/GT-America-Extended-Medium.subset.woff2 → ...s/GT-America-Extended-Medium.subset.woff2
diff --git a/...ts/pitch-web-semibold-italic.subset.woff2 → ...ts/pitch-web-semibold-italic.subset.woff2 b/...ts/pitch-web-semibold-italic.subset.woff2 → ...ts/pitch-web-semibold-italic.subset.woff2
diff --git a/assets/fonts/pitch-web-semibold.subset.woff2 → ...ets/fonts/pitch-web-semibold.subset.woff2 b/assets/fonts/pitch-web-semibold.subset.woff2 → ...ets/fonts/pitch-web-semibold.subset.woff2
diff --git a/...s/signifier-web-light-italic.subset.woff2 → ...s/signifier-web-light-italic.subset.woff2 b/...s/signifier-web-light-italic.subset.woff2 → ...s/signifier-web-light-italic.subset.woff2
diff --git a/...ts/fonts/signifier-web-light.subset.woff2 → ...ts/fonts/signifier-web-light.subset.woff2 b/...ts/fonts/signifier-web-light.subset.woff2 → ...ts/fonts/signifier-web-light.subset.woff2
diff --git a/assets/images/apple-touch-icon.png → src/assets/images/apple-touch-icon.png b/assets/images/apple-touch-icon.png → src/assets/images/apple-touch-icon.png
diff --git a/assets/images/favicon.ico → src/assets/images/favicon.ico b/assets/images/favicon.ico → src/assets/images/favicon.ico
diff --git a/assets/images/favicon.svg → src/assets/images/favicon.svg b/assets/images/favicon.svg → src/assets/images/favicon.svg
diff --git a/bookmarks.html → src/bookmarks.html b/bookmarks.html → src/bookmarks.html
@@ -8,7 +8,7 @@
   alias: year
 permalink: "bookmarks/{% if pagination.pageNumber > 0 %}{{ year.title | lower }}/{% endif %}index.html"
 ---
-{% from '_includes/metaLink.html' import metaLink %}
+{% from "./_includes/metaLink.html" import metaLink %}
 {% set content = pages | findByID("4bctuwqdqxtWxfaNXPLqaI") %}
 {% set lastUpdate = bookmarks[0].bookmarks | limit(1) %}
 {% set roundup = roundups | limit(1) %}
@@ -32,7 +32,7 @@ <h1 class="headline">
   <h2 class="gap-small">Favourites &mdash; <em>{{ roundup.fields.title }}</em></h2>
   <section>
     {% set favouriteBookmarks = roundup.fields.links %}
-    {% include "_includes/favouriteBookmarks.html" %}
+    {% include "./_includes/favouriteBookmarks.html" %}
   </section>
   <hr>
 </article>

diff --git a/colophon.html → src/colophon.html b/colophon.html → src/colophon.html
@@ -16,8 +16,8 @@ <h1 class="headline">{{ content.fields.title }}</h1>
   <div id="updates" class="gap-large">
     <h2>Updates</h2>
     {% set postParent = '/colophon' %}
-    {% include "_includes/posts.html" %}
-    {% include "_includes/commits.html" %}
+    {% include "./_includes/posts.html" %}
+    {% include "./_includes/commits.html" %}
     <hr />
   </div>
   <section id="notes" class="markdown | flow">

diff --git a/components/now-playing.html → src/components/now-playing.html b/components/now-playing.html → src/components/now-playing.html
diff --git a/components/now-playing.js → src/components/now-playing.js b/components/now-playing.js → src/components/now-playing.js
diff --git a/css/base/fonts.css → src/css/base/fonts.css b/css/base/fonts.css → src/css/base/fonts.css
diff --git a/css/base/global.css → src/css/base/global.css b/css/base/global.css → src/css/base/global.css
diff --git a/css/base/typography.css → src/css/base/typography.css b/css/base/typography.css → src/css/base/typography.css
diff --git a/css/base/variables.css → src/css/base/variables.css b/css/base/variables.css → src/css/base/variables.css
diff --git a/css/blocks/accordian.css → src/css/blocks/accordian.css b/css/blocks/accordian.css → src/css/blocks/accordian.css
diff --git a/css/blocks/arrow-link.css → src/css/blocks/arrow-link.css b/css/blocks/arrow-link.css → src/css/blocks/arrow-link.css
diff --git a/css/blocks/bookmark.css → src/css/blocks/bookmark.css b/css/blocks/bookmark.css → src/css/blocks/bookmark.css
diff --git a/css/blocks/figure.css → src/css/blocks/figure.css b/css/blocks/figure.css → src/css/blocks/figure.css
diff --git a/css/blocks/footnote.css → src/css/blocks/footnote.css b/css/blocks/footnote.css → src/css/blocks/footnote.css
diff --git a/css/blocks/grayscale-image.css → src/css/blocks/grayscale-image.css b/css/blocks/grayscale-image.css → src/css/blocks/grayscale-image.css
diff --git a/css/blocks/header.css → src/css/blocks/header.css b/css/blocks/header.css → src/css/blocks/header.css
diff --git a/css/blocks/link.css → src/css/blocks/link.css b/css/blocks/link.css → src/css/blocks/link.css
diff --git a/css/blocks/markdown.css → src/css/blocks/markdown.css b/css/blocks/markdown.css → src/css/blocks/markdown.css
diff --git a/css/blocks/stats.css → src/css/blocks/stats.css b/css/blocks/stats.css → src/css/blocks/stats.css
diff --git a/css/blocks/toc.css → src/css/blocks/toc.css b/css/blocks/toc.css → src/css/blocks/toc.css
diff --git a/css/blocks/track.css → src/css/blocks/track.css b/css/blocks/track.css → src/css/blocks/track.css
diff --git a/css/compositions/columns.css → src/css/compositions/columns.css b/css/compositions/columns.css → src/css/compositions/columns.css
diff --git a/css/compositions/masonry.css → src/css/compositions/masonry.css b/css/compositions/masonry.css → src/css/compositions/masonry.css
diff --git a/css/style.pcss → src/css/style.pcss b/css/style.pcss → src/css/style.pcss
diff --git a/css/utilities.css → src/css/utilities.css b/css/utilities.css → src/css/utilities.css
diff --git a/feeds.html → src/feeds.html b/feeds.html → src/feeds.html
diff --git a/feeds/bookmarks.11ty.js → src/feeds/bookmarks.11ty.js b/feeds/bookmarks.11ty.js → src/feeds/bookmarks.11ty.js
diff --git a/feeds/bookmarks.xml.njk → src/feeds/bookmarks.xml.njk b/feeds/bookmarks.xml.njk → src/feeds/bookmarks.xml.njk
diff --git a/feeds/posts.11ty.js → src/feeds/posts.11ty.js b/feeds/posts.11ty.js → src/feeds/posts.11ty.js
diff --git a/feeds/rss.xml.njk → src/feeds/rss.xml.njk b/feeds/rss.xml.njk → src/feeds/rss.xml.njk
diff --git a/filters/date.js → src/filters/date.js b/filters/date.js → src/filters/date.js
diff --git a/filters/findByID.js → src/filters/findByID.js b/filters/findByID.js → src/filters/findByID.js
diff --git a/filters/limit.js → src/filters/limit.js b/filters/limit.js → src/filters/limit.js
diff --git a/helpers/footnotes.js → src/helpers/footnotes.js b/helpers/footnotes.js → src/helpers/footnotes.js
diff --git a/helpers/imagesWithCaptions.js → src/helpers/imagesWithCaptions.js b/helpers/imagesWithCaptions.js → src/helpers/imagesWithCaptions.js
diff --git a/helpers/references.js → src/helpers/references.js b/helpers/references.js → src/helpers/references.js
diff --git a/index.html → src/index.html b/index.html → src/index.html
@@ -10,20 +10,20 @@ <h1 class="headline">Welcome</h1>
     {% renderMarkdown content.fields.descriptionMarkdown %}
   </div>
   <div class="measure">
-    {% include "_includes/siteDirectory.html" %}
+    {% include "./_includes/siteDirectory.html" %}
   </div>
 </header>
 <article class="columns gap-xx-large" style="--cols:2">
   <section class="flow | gap-x-large">
     <h2 class="title">Recent Posts</h2>
-    {% include "_includes/posts.html" %}
+    {% include "./_includes/posts.html" %}
     <a href="/journal" class="link">See all Posts</a>
   </section>
   <section class="flow">
     <h2 class="title">Recent Bookmarks</h2>
     {% set timePeriod = bookmarks[0] %}
     {% set bookmarks = timePeriod.bookmarks | limit(3) %}
-    {% include "_includes/bookmarks.html" %}
+    {% include "./_includes/bookmarks.html" %}
     <a href="/bookmarks/2021" class="link">See all Bookmarks</a>
   </section>
 </article>
diff --git a/journal.html → src/journal.html b/journal.html → src/journal.html
@@ -3,7 +3,7 @@
 title: Journal
 theme: yellow
 ---
-{% from "_includes/metaLink.html" import metaLink %}
+{% from "./_includes/metaLink.html" import metaLink %}
 {% set content = pages | findByID("5sXnSwGVJePuWZpcOZvIML") %}
 {% set toc = ["Now", "Posts", "Listening", "Reading", "Scrapbook"] %}
 {% set scrapbook = savee | limit(50) %}
@@ -18,7 +18,7 @@ <h1>{{ content.fields.title }}</h1>
   </ul>
   <hr>
 </header>
-{% include "_includes/toc.html" %}
+{% include "./_includes/toc.html" %}
 <article id="now" class="flow | gap-xx-large">
   <h2>Now</h2>
   <section class="markdown | flow">
@@ -44,10 +44,10 @@ <h3 class="subtitle | inline">Current Clients</h3>
 </article>
 <article id="posts" class="flow | gap-xx-large">
   <h2>Posts</h2>
-  {% include "_includes/posts.html" %}
+  {% include "./_includes/posts.html" %}
 </article>
-{% include "_includes/listening.html" %}
-{% include "_includes/reading.html" %}
+{% include "./_includes/listening.html" %}
+{% include "./_includes/reading.html" %}
 <article id="scrapbook" class="flow | gap-xx-large">
   <header>
     <h2>Scrapbook</h2>
@@ -65,5 +65,5 @@ <h2>Scrapbook</h2>
       </small>
     </p>
   </header>
-  {% include "_includes/scrapbook.html" %}
+  {% include "./_includes/scrapbook.html" %}
 </article>
diff --git a/metaPosts.html → src/meta-posts.html b/metaPosts.html → src/meta-posts.html
@@ -6,7 +6,7 @@
 permalink: "colophon/post/{{ post.fields.slug }}/"
 layout: layout.html
 ---
-{% from '_includes/stats.html' import stats %}
+{% from "./_includes/stats.html" import stats %}
 <header class="flow | gap-x-large">
   <h1 class="headline | measure | gap-large">{{ post.fields.title }}</h1>
   <div class="flow" style="--flow-space: var(--space-default)">

diff --git a/posts.html → src/posts.html b/posts.html → src/posts.html
@@ -6,7 +6,7 @@
 permalink: "post/{{ post.fields.slug }}/"
 layout: layout.html
 ---
-{% from '_includes/stats.html' import stats %}
+{% from "./_includes/stats.html" import stats %}
 <header class="flow | gap-x-large">
   <h1 class="headline | measure | gap-large">{{ post.fields.title }}</h1>
   <div class="flow" style="--flow-space: var(--space-default)">

diff --git a/providers/contentful.js → src/providers/contentful.js b/providers/contentful.js → src/providers/contentful.js
diff --git a/providers/feedbin.js → src/providers/feedbin.js b/providers/feedbin.js → src/providers/feedbin.js
diff --git a/providers/github.js → src/providers/github.js b/providers/github.js → src/providers/github.js
diff --git a/providers/lastfm.js → src/providers/lastfm.js b/providers/lastfm.js → src/providers/lastfm.js
diff --git a/providers/spotify.js → src/providers/spotify.js b/providers/spotify.js → src/providers/spotify.js
diff --git a/shortcodes/markdown.js → src/shortcodes/markdown.js b/shortcodes/markdown.js → src/shortcodes/markdown.js
diff --git a/shortcodes/responsiveImage.js → src/shortcodes/responsiveImage.js b/shortcodes/responsiveImage.js → src/shortcodes/responsiveImage.js
diff --git a/uses.html → src/uses.html b/uses.html → src/uses.html