diff --git a/.eleventy.js b/.eleventy.js index f6a5ba6..9a02e4b 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,20 +1,20 @@ const eleventyNavigationPlugin = require("@11ty/eleventy-navigation"); module.exports = function(eleventyConfig) { - eleventyConfig.addWatchTarget("./scss/"); + eleventyConfig.addWatchTarget("./src/scss/"); eleventyConfig.addPlugin(eleventyNavigationPlugin); eleventyConfig.setUseGitIgnore(false); eleventyConfig.addPassthroughCopy({ - "img": "img", - "font": "font", + "src/img": "img", + "src/font": "font", "node_modules/@fortawesome/fontawesome-free/webfonts/": "font", "node_modules/flag-icon-css/flags/4x3/(de|us)*": "flags" }); return { dir: { - input: "sites", + input: "src", includes: "_includes", layouts: "_includes/layouts", output: "dist" diff --git a/package.json b/package.json index 6e45a8d..3124934 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "description": "website for sp-codes.de", "scripts": { - "compile-sass": "node-sass --output-style compressed --importer=node_modules/node-sass-tilde-importer scss/main.scss dist/css/main.css", + "compile-sass": "node-sass --output-style compressed --importer=node_modules/node-sass-tilde-importer src/scss/main.scss dist/css/main.css", "watch:eleventy": "eleventy --serve", "watch:sass": "npm run compile-sass -- --watch", "start": "npm-run-all compile-sass --parallel watch:*", @@ -16,7 +16,7 @@ "url": "https://git.sp-codes.de/samuel-p/sp-codes.de" }, "optionalDependencies": { - "browser-sync": "^2.26.10" + "browser-sync": "^2.26.12" }, "devDependencies": { "@11ty/eleventy": "^0.11.0", diff --git a/sites/de/404.md b/sites/de/404.md deleted file mode 100644 index 6c7444c..0000000 --- a/sites/de/404.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -layout: base.njk -key: 404 -title: Nicht gefunden ---- -# Nicht gefunden - -Diese Seite existiert (noch) nicht. Schau später nochmal vorbei, oder fang von vorne an: [Home](/{{locale}}/) diff --git a/sites/en/404.md b/sites/en/404.md deleted file mode 100644 index dafed38..0000000 --- a/sites/en/404.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -layout: base.njk -key: 404 -title: Not Found ---- -# Not Found - -This page does not exist (yet). Come back later or take a look at the beginning: [Home](/{{locale}}/) diff --git a/sites/_data/services.json b/src/_data/services.json similarity index 100% rename from sites/_data/services.json rename to src/_data/services.json diff --git a/sites/_data/site.js b/src/_data/site.js similarity index 100% rename from sites/_data/site.js rename to src/_data/site.js diff --git a/sites/_data/strings.json b/src/_data/strings.json similarity index 100% rename from sites/_data/strings.json rename to src/_data/strings.json diff --git a/sites/_includes/layouts/base.njk b/src/_includes/layouts/base.njk similarity index 99% rename from sites/_includes/layouts/base.njk rename to src/_includes/layouts/base.njk index 90e0f64..26cad56 100644 --- a/sites/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -36,7 +36,7 @@ title: sp-codes -
+
{%- for entry in collections.all | eleventyNavigation %} {% if entry.url.includes(locale) %}
@@ -66,7 +66,7 @@ title: sp-codes {{ content | safe }}
-
+
Made with in Germany
Samuel Philipp
diff --git a/sites/_includes/layouts/home.njk b/src/_includes/layouts/home.njk similarity index 70% rename from sites/_includes/layouts/home.njk rename to src/_includes/layouts/home.njk index 0d2d5a8..246a92a 100644 --- a/sites/_includes/layouts/home.njk +++ b/src/_includes/layouts/home.njk @@ -3,7 +3,7 @@ layout: base.njk ---
- +
diff --git a/sites/_includes/layouts/services.njk b/src/_includes/layouts/services.njk similarity index 100% rename from sites/_includes/layouts/services.njk rename to src/_includes/layouts/services.njk diff --git a/sites/_includes/profiles.html b/src/_includes/profiles.html similarity index 93% rename from sites/_includes/profiles.html rename to src/_includes/profiles.html index 1d1da51..c7d9e9f 100644 --- a/sites/_includes/profiles.html +++ b/src/_includes/profiles.html @@ -2,7 +2,7 @@
-
+