From 915bac6dab769378505e94d0a19d2d6abf864804 Mon Sep 17 00:00:00 2001 From: Nicolas Doby Date: Wed, 9 Nov 2022 10:18:41 +0100 Subject: [PATCH] refactor: migrate images and assets to /blog subdirectory --- eleventy.config.js | 6 +++--- src/_layouts/blog.njk | 8 ++++---- src/_pages/blog/article/exemple.md | 2 +- src/_pages/blog/article/exemple_2.md | 2 +- src/{assets => blog_assets}/css/index.scss | 0 src/{assets => blog_assets}/css/print.scss | 0 src/{assets => blog_assets}/js/index.js | 0 src/{assets => blog_assets}/js/print.js | 0 src/{images => blog_images}/articles/kitty_1.jpeg | Bin src/{images => blog_images}/articles/kitty_2.jpeg | Bin src/{images => blog_images}/favicon.svg | 0 src/{images => blog_images}/logo.svg | 0 webpack.config.common.js | 4 ++-- 13 files changed, 11 insertions(+), 11 deletions(-) rename src/{assets => blog_assets}/css/index.scss (100%) rename src/{assets => blog_assets}/css/print.scss (100%) rename src/{assets => blog_assets}/js/index.js (100%) rename src/{assets => blog_assets}/js/print.js (100%) rename src/{images => blog_images}/articles/kitty_1.jpeg (100%) rename src/{images => blog_images}/articles/kitty_2.jpeg (100%) rename src/{images => blog_images}/favicon.svg (100%) rename src/{images => blog_images}/logo.svg (100%) diff --git a/eleventy.config.js b/eleventy.config.js index ec0992e..b8d96b1 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -27,10 +27,10 @@ module.exports = function(eleventyConfig) { //eleventyConfig.addWatchTarget('./src/compiled-assets/main.js'); //eleventyConfig.addWatchTarget('./src/compiled-assets/vendor.js'); - // Copy src/compiled-assets to /assets - eleventyConfig.addPassthroughCopy({ 'src/compiled-assets': 'assets' }); + // Copy src/compiled-assets to /blog_assets + eleventyConfig.addPassthroughCopy({ 'src/compiled-assets': 'blog_assets' }); // Copy all images - eleventyConfig.addPassthroughCopy('src/images'); + eleventyConfig.addPassthroughCopy('src/blog_images'); // Add plugins eleventyConfig.addPlugin(pluginRss); diff --git a/src/_layouts/blog.njk b/src/_layouts/blog.njk index cfa80c5..6ec01f5 100644 --- a/src/_layouts/blog.njk +++ b/src/_layouts/blog.njk @@ -6,17 +6,17 @@ {{ title or metadata.title }} - - + + - +
diff --git a/src/_pages/blog/article/exemple.md b/src/_pages/blog/article/exemple.md index e8c63ee..5f6cb59 100644 --- a/src/_pages/blog/article/exemple.md +++ b/src/_pages/blog/article/exemple.md @@ -15,7 +15,7 @@ layout: article.njk Leverage agile Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Semper quis lectus nulla at volutpat. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Enim diam vulputate ut pharetra sit amet. Placerat orci nulla pellentesque dignissim. Gravida rutrum quisque non tellus. Condimentum mattis pellentesque id nibh tortor id aliquet lectus proin. Diam sollicitudin tempor id eu nisl nunc mi ipsum faucibus. Tempor id eu nisl nunc mi. Cras pulvinar mattis nunc sed blandit libero volutpat sed cras. Eget magna fermentum iaculis eu non diam phasellus. Est lorem ipsum dolor sit amet consectetur adipiscing. Orci porta non pulvinar neque laoreet suspendisse interdum consectetur. Velit scelerisque in dictum non consectetur a. Lectus sit amet est placerat. Viverra aliquet eget sit amet tellus cras adipiscing enim eu. Ut tristique et egestas quis ipsum suspendisse ultrices. Bibendum est ultricies integer quis auctor elit. Aliquam sem et tortor consequat id porta nibh. to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment. -![Un chaton](/images/articles/kitty_1.jpeg "Un chaton tout mignon 😍") +![Un chaton](/blog_images/articles/kitty_1.jpeg "Un chaton tout mignon 😍") Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Semper quis lectus nulla at volutpat. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Enim diam vulputate ut pharetra sit amet. Placerat orci nulla pellentesque dignissim. Gravida rutrum quisque non tellus. Condimentum mattis pellentesque id nibh tortor id aliquet lectus proin. Diam sollicitudin tempor id eu nisl nunc mi ipsum faucibus. Tempor id eu nisl nunc mi. Cras pulvinar mattis nunc sed blandit libero volutpat sed cras. Eget magna fermentum iaculis eu non diam phasellus. Est lorem ipsum dolor sit amet consectetur adipiscing. Orci porta non pulvinar neque laoreet suspendisse interdum consectetur. Velit scelerisque in dictum non consectetur a. Lectus sit amet est placerat. Viverra aliquet eget sit amet tellus cras adipiscing enim eu. Ut tristique et egestas quis ipsum suspendisse ultrices. Bibendum est ultricies integer quis auctor elit. Aliquam sem et tortor consequat id porta nibh. diff --git a/src/_pages/blog/article/exemple_2.md b/src/_pages/blog/article/exemple_2.md index 4ddf3c9..1566dd5 100644 --- a/src/_pages/blog/article/exemple_2.md +++ b/src/_pages/blog/article/exemple_2.md @@ -54,6 +54,6 @@ console.log('Test'); ## Conclusion -![Un chaton](/images/articles/kitty_2.jpeg) +![Un chaton](/blog_images/articles/kitty_2.jpeg) Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Semper quis lectus nulla at volutpat. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Enim diam vulputate ut pharetra sit amet. Placerat orci nulla pellentesque dignissim. Gravida rutrum quisque non tellus. Condimentum mattis pellentesque id nibh tortor id aliquet lectus proin. Diam sollicitudin tempor id eu nisl nunc mi ipsum faucibus. Tempor id eu nisl nunc mi. Cras pulvinar mattis nunc sed blandit libero volutpat sed cras. Eget magna fermentum iaculis eu non diam phasellus. Est lorem ipsum dolor sit amet consectetur adipiscing. Orci porta non pulvinar neque laoreet suspendisse interdum consectetur. Velit scelerisque in dictum non consectetur a. Lectus sit amet est placerat. Viverra aliquet eget sit amet tellus cras adipiscing enim eu. Ut tristique et egestas quis ipsum suspendisse ultrices. Bibendum est ultricies integer quis auctor elit. Aliquam sem et tortor consequat id porta nibh. diff --git a/src/assets/css/index.scss b/src/blog_assets/css/index.scss similarity index 100% rename from src/assets/css/index.scss rename to src/blog_assets/css/index.scss diff --git a/src/assets/css/print.scss b/src/blog_assets/css/print.scss similarity index 100% rename from src/assets/css/print.scss rename to src/blog_assets/css/print.scss diff --git a/src/assets/js/index.js b/src/blog_assets/js/index.js similarity index 100% rename from src/assets/js/index.js rename to src/blog_assets/js/index.js diff --git a/src/assets/js/print.js b/src/blog_assets/js/print.js similarity index 100% rename from src/assets/js/print.js rename to src/blog_assets/js/print.js diff --git a/src/images/articles/kitty_1.jpeg b/src/blog_images/articles/kitty_1.jpeg similarity index 100% rename from src/images/articles/kitty_1.jpeg rename to src/blog_images/articles/kitty_1.jpeg diff --git a/src/images/articles/kitty_2.jpeg b/src/blog_images/articles/kitty_2.jpeg similarity index 100% rename from src/images/articles/kitty_2.jpeg rename to src/blog_images/articles/kitty_2.jpeg diff --git a/src/images/favicon.svg b/src/blog_images/favicon.svg similarity index 100% rename from src/images/favicon.svg rename to src/blog_images/favicon.svg diff --git a/src/images/logo.svg b/src/blog_images/logo.svg similarity index 100% rename from src/images/logo.svg rename to src/blog_images/logo.svg diff --git a/webpack.config.common.js b/webpack.config.common.js index 1f034f1..c7acb2f 100644 --- a/webpack.config.common.js +++ b/webpack.config.common.js @@ -5,8 +5,8 @@ const path = require('path'); module.exports = { // Our "entry" point entry: { - main: './src/assets/js/index.js', - print: './src/assets/js/print.js' + main: './src/blog_assets/js/index.js', + print: './src/blog_assets/js/print.js' }, output: { // The global variable name any `exports` from `index.js` will be available at