diff --git a/eleventy.config.js b/eleventy.config.js index 627cb16..1b052a1 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -5,17 +5,20 @@ import path from 'path'; let allPlugins = []; export default function (eleventyConfig) { - eleventyConfig.addPassthroughCopy("projects/**/*.png"); - eleventyConfig.addPassthroughCopy("projects/**/*.jpg"); - eleventyConfig.addPassthroughCopy("projects/**/*.jpeg"); - eleventyConfig.addPassthroughCopy("authors/**/*.png"); - eleventyConfig.addPassthroughCopy("authors/**/*.jpg"); - eleventyConfig.addPassthroughCopy("authors/**/*.jpeg"); - eleventyConfig.addPassthroughCopy("assets"); + eleventyConfig.setInputDirectory("src"); + eleventyConfig.setOutputDirectory("public"); + + eleventyConfig.addPassthroughCopy("src/projects/**/*.png"); + eleventyConfig.addPassthroughCopy("src/projects/**/*.jpg"); + eleventyConfig.addPassthroughCopy("src/projects/**/*.jpeg"); + eleventyConfig.addPassthroughCopy("src/authors/**/*.png"); + eleventyConfig.addPassthroughCopy("src/authors/**/*.jpg"); + eleventyConfig.addPassthroughCopy("src/authors/**/*.jpeg"); + eleventyConfig.addPassthroughCopy("src/assets"); eleventyConfig.addPassthroughCopy({ "favicon/*" : "/" }); eleventyConfig.addCollection("projects", function(collection) { - return collection.getFilteredByGlob("./projects/**/*.md"); + return collection.getFilteredByGlob("src/projects/**/*.md"); }); eleventyConfig.addGlobalData("eleventyComputed", { @@ -65,6 +68,6 @@ export default function (eleventyConfig) { allPlugins.forEach(doc => this.addDoc(doc)); }); - fs.writeFileSync('./_site/search_index.json', JSON.stringify(idx)); + fs.writeFileSync('./public/search_index.json', JSON.stringify(idx)); }); }; diff --git a/package.json b/package.json index 63c9789..574e4b7 100644 --- a/package.json +++ b/package.json @@ -7,13 +7,13 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "serve": "npx @11ty/eleventy --serve", - "watch:sass": "sass static/scss:_site/static/css --watch", - "build:sass": "sass static/scss:_site/static/css", + "watch:sass": "sass src/static/scss:public/static/css --watch", + "build:sass": "sass src/static/scss:public/static/css", "watch:eleventy": "eleventy --serve", "build:eleventy": "ELEVENTY_ENV=development eleventy", "start": "npm run watch:eleventy & npm run watch:sass", "build": "npm run build:eleventy & npm run build:sass", - "build:sass:prod": "sass static/scss:_site/static/css --style compressed", + "build:sass:prod": "sass src/static/scss:public/static/css --style compressed", "build:eleventy:prod": "ELEVENTY_ENV=production eleventy", "build:prod": "npm run build:eleventy:prod & npm run build:sass:prod" }, diff --git a/_includes/author.njk b/src/_includes/author.njk similarity index 100% rename from _includes/author.njk rename to src/_includes/author.njk diff --git a/_includes/base.njk b/src/_includes/base.njk similarity index 100% rename from _includes/base.njk rename to src/_includes/base.njk diff --git a/_includes/docs.njk b/src/_includes/docs.njk similarity index 100% rename from _includes/docs.njk rename to src/_includes/docs.njk diff --git a/_includes/error.njk b/src/_includes/error.njk similarity index 100% rename from _includes/error.njk rename to src/_includes/error.njk diff --git a/_includes/featured.njk b/src/_includes/featured.njk similarity index 100% rename from _includes/featured.njk rename to src/_includes/featured.njk diff --git a/_includes/header.njk b/src/_includes/header.njk similarity index 100% rename from _includes/header.njk rename to src/_includes/header.njk diff --git a/_includes/project.njk b/src/_includes/project.njk similarity index 100% rename from _includes/project.njk rename to src/_includes/project.njk diff --git a/_includes/project_image.njk b/src/_includes/project_image.njk similarity index 100% rename from _includes/project_image.njk rename to src/_includes/project_image.njk diff --git a/_includes/skeleton.njk b/src/_includes/skeleton.njk similarity index 100% rename from _includes/skeleton.njk rename to src/_includes/skeleton.njk diff --git a/allprojects.njk b/src/allprojects.njk similarity index 100% rename from allprojects.njk rename to src/allprojects.njk diff --git a/assets/MinecraftRegular-Bmg3.otf b/src/assets/MinecraftRegular-Bmg3.otf similarity index 100% rename from assets/MinecraftRegular-Bmg3.otf rename to src/assets/MinecraftRegular-Bmg3.otf diff --git a/assets/logo.png b/src/assets/logo.png similarity index 100% rename from assets/logo.png rename to src/assets/logo.png diff --git a/assets/mod-placeholder.png b/src/assets/mod-placeholder.png similarity index 100% rename from assets/mod-placeholder.png rename to src/assets/mod-placeholder.png diff --git a/assets/search.js b/src/assets/search.js similarity index 100% rename from assets/search.js rename to src/assets/search.js diff --git a/assets/stylesheets/home.css b/src/assets/stylesheets/home.css similarity index 100% rename from assets/stylesheets/home.css rename to src/assets/stylesheets/home.css diff --git a/assets/stylesheets/project.css b/src/assets/stylesheets/project.css similarity index 100% rename from assets/stylesheets/project.css rename to src/assets/stylesheets/project.css diff --git a/assets/stylesheets/search.css b/src/assets/stylesheets/search.css similarity index 100% rename from assets/stylesheets/search.css rename to src/assets/stylesheets/search.css diff --git a/assets/stylesheets/styles.css b/src/assets/stylesheets/styles.css similarity index 100% rename from assets/stylesheets/styles.css rename to src/assets/stylesheets/styles.css diff --git a/authors/authors.json b/src/authors/authors.json similarity index 100% rename from authors/authors.json rename to src/authors/authors.json diff --git a/authors/tenkuma/index.md b/src/authors/tenkuma/index.md similarity index 100% rename from authors/tenkuma/index.md rename to src/authors/tenkuma/index.md diff --git a/authors/tenkuma/logo.png b/src/authors/tenkuma/logo.png similarity index 100% rename from authors/tenkuma/logo.png rename to src/authors/tenkuma/logo.png diff --git a/authors/tenkuma/tenkuma-mrnando-enderdragon.jpg b/src/authors/tenkuma/tenkuma-mrnando-enderdragon.jpg similarity index 100% rename from authors/tenkuma/tenkuma-mrnando-enderdragon.jpg rename to src/authors/tenkuma/tenkuma-mrnando-enderdragon.jpg diff --git a/authors/tenkuma/tenkuma-silverfish.jpg b/src/authors/tenkuma/tenkuma-silverfish.jpg similarity index 100% rename from authors/tenkuma/tenkuma-silverfish.jpg rename to src/authors/tenkuma/tenkuma-silverfish.jpg diff --git a/error/404.html b/src/error/404.html similarity index 100% rename from error/404.html rename to src/error/404.html diff --git a/error/error.json b/src/error/error.json similarity index 100% rename from error/error.json rename to src/error/error.json diff --git a/favicon/android-chrome-192x192.png b/src/favicon/android-chrome-192x192.png similarity index 100% rename from favicon/android-chrome-192x192.png rename to src/favicon/android-chrome-192x192.png diff --git a/favicon/android-chrome-512x512.png b/src/favicon/android-chrome-512x512.png similarity index 100% rename from favicon/android-chrome-512x512.png rename to src/favicon/android-chrome-512x512.png diff --git a/favicon/apple-touch-icon.png b/src/favicon/apple-touch-icon.png similarity index 100% rename from favicon/apple-touch-icon.png rename to src/favicon/apple-touch-icon.png diff --git a/favicon/favicon-16x16.png b/src/favicon/favicon-16x16.png similarity index 100% rename from favicon/favicon-16x16.png rename to src/favicon/favicon-16x16.png diff --git a/favicon/favicon-32x32.png b/src/favicon/favicon-32x32.png similarity index 100% rename from favicon/favicon-32x32.png rename to src/favicon/favicon-32x32.png diff --git a/favicon/favicon.ico b/src/favicon/favicon.ico similarity index 100% rename from favicon/favicon.ico rename to src/favicon/favicon.ico diff --git a/favicon/site.webmanifest b/src/favicon/site.webmanifest similarity index 100% rename from favicon/site.webmanifest rename to src/favicon/site.webmanifest diff --git a/index.njk b/src/index.njk similarity index 100% rename from index.njk rename to src/index.njk diff --git a/projects/aboukkit/index.json b/src/projects/aboukkit/index.json similarity index 100% rename from projects/aboukkit/index.json rename to src/projects/aboukkit/index.json diff --git a/projects/aboukkit/index.md b/src/projects/aboukkit/index.md similarity index 100% rename from projects/aboukkit/index.md rename to src/projects/aboukkit/index.md diff --git a/projects/aboukkit/logo.png b/src/projects/aboukkit/logo.png similarity index 100% rename from projects/aboukkit/logo.png rename to src/projects/aboukkit/logo.png diff --git a/projects/devilwithin/index.json b/src/projects/devilwithin/index.json similarity index 100% rename from projects/devilwithin/index.json rename to src/projects/devilwithin/index.json diff --git a/projects/devilwithin/index.md b/src/projects/devilwithin/index.md similarity index 100% rename from projects/devilwithin/index.md rename to src/projects/devilwithin/index.md diff --git a/projects/devilwithin/logo.png b/src/projects/devilwithin/logo.png similarity index 100% rename from projects/devilwithin/logo.png rename to src/projects/devilwithin/logo.png diff --git a/projects/ghostsandstuff/anti-spam.png b/src/projects/ghostsandstuff/anti-spam.png similarity index 100% rename from projects/ghostsandstuff/anti-spam.png rename to src/projects/ghostsandstuff/anti-spam.png diff --git a/projects/ghostsandstuff/docs/example_documentation.md b/src/projects/ghostsandstuff/docs/example_documentation.md similarity index 100% rename from projects/ghostsandstuff/docs/example_documentation.md rename to src/projects/ghostsandstuff/docs/example_documentation.md diff --git a/projects/ghostsandstuff/index.json b/src/projects/ghostsandstuff/index.json similarity index 100% rename from projects/ghostsandstuff/index.json rename to src/projects/ghostsandstuff/index.json diff --git a/projects/ghostsandstuff/index.md b/src/projects/ghostsandstuff/index.md similarity index 100% rename from projects/ghostsandstuff/index.md rename to src/projects/ghostsandstuff/index.md diff --git a/projects/ghostsandstuff/logo.png b/src/projects/ghostsandstuff/logo.png similarity index 100% rename from projects/ghostsandstuff/logo.png rename to src/projects/ghostsandstuff/logo.png diff --git a/projects/ghostsandstuff/rainbow-chat.png b/src/projects/ghostsandstuff/rainbow-chat.png similarity index 100% rename from projects/ghostsandstuff/rainbow-chat.png rename to src/projects/ghostsandstuff/rainbow-chat.png diff --git a/projects/ghostsandstuff/skibidi-blocker.png b/src/projects/ghostsandstuff/skibidi-blocker.png similarity index 100% rename from projects/ghostsandstuff/skibidi-blocker.png rename to src/projects/ghostsandstuff/skibidi-blocker.png diff --git a/projects/hangglidere/index.json b/src/projects/hangglidere/index.json similarity index 100% rename from projects/hangglidere/index.json rename to src/projects/hangglidere/index.json diff --git a/projects/hangglidere/index.md b/src/projects/hangglidere/index.md similarity index 100% rename from projects/hangglidere/index.md rename to src/projects/hangglidere/index.md diff --git a/projects/projects.json b/src/projects/projects.json similarity index 100% rename from projects/projects.json rename to src/projects/projects.json diff --git a/projects/tefreezer/index.json b/src/projects/tefreezer/index.json similarity index 100% rename from projects/tefreezer/index.json rename to src/projects/tefreezer/index.json diff --git a/projects/tefreezer/index.md b/src/projects/tefreezer/index.md similarity index 100% rename from projects/tefreezer/index.md rename to src/projects/tefreezer/index.md diff --git a/projects/tefreezer/logo.png b/src/projects/tefreezer/logo.png similarity index 100% rename from projects/tefreezer/logo.png rename to src/projects/tefreezer/logo.png diff --git a/projects/tenkumalib/index.json b/src/projects/tenkumalib/index.json similarity index 100% rename from projects/tenkumalib/index.json rename to src/projects/tenkumalib/index.json diff --git a/projects/tenkumalib/index.md b/src/projects/tenkumalib/index.md similarity index 100% rename from projects/tenkumalib/index.md rename to src/projects/tenkumalib/index.md diff --git a/projects/tenkumalib/logo.png b/src/projects/tenkumalib/logo.png similarity index 100% rename from projects/tenkumalib/logo.png rename to src/projects/tenkumalib/logo.png diff --git a/projects/timekeeper/index.json b/src/projects/timekeeper/index.json similarity index 100% rename from projects/timekeeper/index.json rename to src/projects/timekeeper/index.json diff --git a/projects/timekeeper/index.md b/src/projects/timekeeper/index.md similarity index 100% rename from projects/timekeeper/index.md rename to src/projects/timekeeper/index.md diff --git a/projects/timekeeper/logo.png b/src/projects/timekeeper/logo.png similarity index 100% rename from projects/timekeeper/logo.png rename to src/projects/timekeeper/logo.png diff --git a/search.njk b/src/search.njk similarity index 100% rename from search.njk rename to src/search.njk