From c89867c3d9fcdd38616de788ad3bf27b540fc35e Mon Sep 17 00:00:00 2001
From: samuel-p <codes@samuel-philipp.de>
Date: Mon, 27 Jul 2020 17:41:08 +0200
Subject: [PATCH] restructured project (closes #5)

---
 .eleventy.js                                  |   8 +++---
 package.json                                  |   2 +-
 sites/de/404.md                               |   8 ------
 sites/en/404.md                               |   8 ------
 {sites => src}/_data/services.json            |   0
 {sites => src}/_data/site.js                  |   0
 {sites => src}/_data/strings.json             |   0
 {sites => src}/_includes/layouts/base.njk     |   0
 {sites => src}/_includes/layouts/home.njk     |   2 +-
 {sites => src}/_includes/layouts/services.njk |   0
 {sites => src}/_includes/profiles.html        |   2 +-
 .../_includes/services-extended.html          |   0
 {sites => src}/_includes/services-simple.html |   0
 {sites => src}/de/de.json                     |   0
 {sites => src}/de/imprint.html                |   0
 {sites => src}/de/index.html                  |   0
 {sites => src}/de/privacy.html                |   0
 {sites => src}/de/services.html               |   0
 .../de/services/connectivitycheck.md          |   0
 {sites => src}/de/services/firefox-sync.md    |   0
 {sites => src}/de/services/gitea.md           |   0
 {sites => src}/de/services/invidious.md       |   0
 {sites => src}/de/services/matrix.md          |   0
 {sites => src}/de/services/searx.md           |   0
 {sites => src}/en/en.json                     |   0
 {sites => src}/en/imprint.html                |   0
 {sites => src}/en/index.html                  |   0
 {sites => src}/en/privacy.html                |   0
 {sites => src}/en/services.html               |   0
 .../en/services/connectivitycheck.md          |   0
 {sites => src}/en/services/firefox-sync.md    |   0
 {sites => src}/en/services/gitea.md           |   0
 {sites => src}/en/services/invidious.md       |   0
 {sites => src}/en/services/matrix.md          |   0
 {sites => src}/en/services/searx.md           |   0
 {img => src/img}/bg.png                       | Bin
 {img => src/img}/matrix.png                   | Bin
 {img => src/img}/samuel.png                   | Bin
 {img => src/img}/sp-codes.jpg                 | Bin
 {scss => src/scss}/main.scss                  |  24 +++++++++---------
 40 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 sites/de/404.md
 delete mode 100644 sites/en/404.md
 rename {sites => src}/_data/services.json (100%)
 rename {sites => src}/_data/site.js (100%)
 rename {sites => src}/_data/strings.json (100%)
 rename {sites => src}/_includes/layouts/base.njk (100%)
 rename {sites => src}/_includes/layouts/home.njk (70%)
 rename {sites => src}/_includes/layouts/services.njk (100%)
 rename {sites => src}/_includes/profiles.html (93%)
 rename {sites => src}/_includes/services-extended.html (100%)
 rename {sites => src}/_includes/services-simple.html (100%)
 rename {sites => src}/de/de.json (100%)
 rename {sites => src}/de/imprint.html (100%)
 rename {sites => src}/de/index.html (100%)
 rename {sites => src}/de/privacy.html (100%)
 rename {sites => src}/de/services.html (100%)
 rename {sites => src}/de/services/connectivitycheck.md (100%)
 rename {sites => src}/de/services/firefox-sync.md (100%)
 rename {sites => src}/de/services/gitea.md (100%)
 rename {sites => src}/de/services/invidious.md (100%)
 rename {sites => src}/de/services/matrix.md (100%)
 rename {sites => src}/de/services/searx.md (100%)
 rename {sites => src}/en/en.json (100%)
 rename {sites => src}/en/imprint.html (100%)
 rename {sites => src}/en/index.html (100%)
 rename {sites => src}/en/privacy.html (100%)
 rename {sites => src}/en/services.html (100%)
 rename {sites => src}/en/services/connectivitycheck.md (100%)
 rename {sites => src}/en/services/firefox-sync.md (100%)
 rename {sites => src}/en/services/gitea.md (100%)
 rename {sites => src}/en/services/invidious.md (100%)
 rename {sites => src}/en/services/matrix.md (100%)
 rename {sites => src}/en/services/searx.md (100%)
 rename {img => src/img}/bg.png (100%)
 rename {img => src/img}/matrix.png (100%)
 rename {img => src/img}/samuel.png (100%)
 rename {img => src/img}/sp-codes.jpg (100%)
 rename {scss => src/scss}/main.scss (79%)

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..d8a17a9 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:*",
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 100%
rename from sites/_includes/layouts/base.njk
rename to src/_includes/layouts/base.njk
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
 ---
 <div class="row py-5">
   <div class="col">
-    <img class="logo" src="/img/samuel.png">
+    <img class="logo" src="img/samuel.png">
   </div>
 </div>
 
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 @@
     <div class="m-2"><a href="mailto:mail@sp-codes.de"><span
             class="fas fa-fw fa-4x fa-envelope"></span></a></div>
     <div class="m-2"><a href="https://matrix.to/#/@samuel-p:matrix.sp-codes.de">
-        <img class="matrix-icon" src="img/matrix.png" alt=""></a></div>
+        <img class="matrix-icon" src="../img/matrix.png" alt=""></a></div>
     <div class="m-2"><a rel="me" href="https://social.tchncs.de/@samuel_p"><span
             class="fab fa-fw fa-4x fa-mastodon"></span></a></div>
     <div class="m-2"><a href="https://stackoverflow.com/users/9662601/samuel-p"><span
diff --git a/sites/_includes/services-extended.html b/src/_includes/services-extended.html
similarity index 100%
rename from sites/_includes/services-extended.html
rename to src/_includes/services-extended.html
diff --git a/sites/_includes/services-simple.html b/src/_includes/services-simple.html
similarity index 100%
rename from sites/_includes/services-simple.html
rename to src/_includes/services-simple.html
diff --git a/sites/de/de.json b/src/de/de.json
similarity index 100%
rename from sites/de/de.json
rename to src/de/de.json
diff --git a/sites/de/imprint.html b/src/de/imprint.html
similarity index 100%
rename from sites/de/imprint.html
rename to src/de/imprint.html
diff --git a/sites/de/index.html b/src/de/index.html
similarity index 100%
rename from sites/de/index.html
rename to src/de/index.html
diff --git a/sites/de/privacy.html b/src/de/privacy.html
similarity index 100%
rename from sites/de/privacy.html
rename to src/de/privacy.html
diff --git a/sites/de/services.html b/src/de/services.html
similarity index 100%
rename from sites/de/services.html
rename to src/de/services.html
diff --git a/sites/de/services/connectivitycheck.md b/src/de/services/connectivitycheck.md
similarity index 100%
rename from sites/de/services/connectivitycheck.md
rename to src/de/services/connectivitycheck.md
diff --git a/sites/de/services/firefox-sync.md b/src/de/services/firefox-sync.md
similarity index 100%
rename from sites/de/services/firefox-sync.md
rename to src/de/services/firefox-sync.md
diff --git a/sites/de/services/gitea.md b/src/de/services/gitea.md
similarity index 100%
rename from sites/de/services/gitea.md
rename to src/de/services/gitea.md
diff --git a/sites/de/services/invidious.md b/src/de/services/invidious.md
similarity index 100%
rename from sites/de/services/invidious.md
rename to src/de/services/invidious.md
diff --git a/sites/de/services/matrix.md b/src/de/services/matrix.md
similarity index 100%
rename from sites/de/services/matrix.md
rename to src/de/services/matrix.md
diff --git a/sites/de/services/searx.md b/src/de/services/searx.md
similarity index 100%
rename from sites/de/services/searx.md
rename to src/de/services/searx.md
diff --git a/sites/en/en.json b/src/en/en.json
similarity index 100%
rename from sites/en/en.json
rename to src/en/en.json
diff --git a/sites/en/imprint.html b/src/en/imprint.html
similarity index 100%
rename from sites/en/imprint.html
rename to src/en/imprint.html
diff --git a/sites/en/index.html b/src/en/index.html
similarity index 100%
rename from sites/en/index.html
rename to src/en/index.html
diff --git a/sites/en/privacy.html b/src/en/privacy.html
similarity index 100%
rename from sites/en/privacy.html
rename to src/en/privacy.html
diff --git a/sites/en/services.html b/src/en/services.html
similarity index 100%
rename from sites/en/services.html
rename to src/en/services.html
diff --git a/sites/en/services/connectivitycheck.md b/src/en/services/connectivitycheck.md
similarity index 100%
rename from sites/en/services/connectivitycheck.md
rename to src/en/services/connectivitycheck.md
diff --git a/sites/en/services/firefox-sync.md b/src/en/services/firefox-sync.md
similarity index 100%
rename from sites/en/services/firefox-sync.md
rename to src/en/services/firefox-sync.md
diff --git a/sites/en/services/gitea.md b/src/en/services/gitea.md
similarity index 100%
rename from sites/en/services/gitea.md
rename to src/en/services/gitea.md
diff --git a/sites/en/services/invidious.md b/src/en/services/invidious.md
similarity index 100%
rename from sites/en/services/invidious.md
rename to src/en/services/invidious.md
diff --git a/sites/en/services/matrix.md b/src/en/services/matrix.md
similarity index 100%
rename from sites/en/services/matrix.md
rename to src/en/services/matrix.md
diff --git a/sites/en/services/searx.md b/src/en/services/searx.md
similarity index 100%
rename from sites/en/services/searx.md
rename to src/en/services/searx.md
diff --git a/img/bg.png b/src/img/bg.png
similarity index 100%
rename from img/bg.png
rename to src/img/bg.png
diff --git a/img/matrix.png b/src/img/matrix.png
similarity index 100%
rename from img/matrix.png
rename to src/img/matrix.png
diff --git a/img/samuel.png b/src/img/samuel.png
similarity index 100%
rename from img/samuel.png
rename to src/img/samuel.png
diff --git a/img/sp-codes.jpg b/src/img/sp-codes.jpg
similarity index 100%
rename from img/sp-codes.jpg
rename to src/img/sp-codes.jpg
diff --git a/scss/main.scss b/src/scss/main.scss
similarity index 79%
rename from scss/main.scss
rename to src/scss/main.scss
index 2c51c5e..96a0e4e 100644
--- a/scss/main.scss
+++ b/src/scss/main.scss
@@ -1,18 +1,18 @@
-@import "~bootstrap/scss/bootstrap-grid";
-@import "~bootstrap/scss/bootstrap-reboot";
-@import "~bootstrap/scss/utilities/align";
-@import "~bootstrap/scss/utilities/spacing";
-@import "~bootstrap/scss/utilities/display";
-@import "~bootstrap/scss/utilities/text";
-@import "~bootstrap/scss/utilities/float";
+@import "node_modules/bootstrap/scss/bootstrap-grid";
+@import "node_modules/bootstrap/scss/bootstrap-reboot";
+@import "node_modules/bootstrap/scss/utilities/align";
+@import "node_modules/bootstrap/scss/utilities/spacing";
+@import "node_modules/bootstrap/scss/utilities/display";
+@import "node_modules/bootstrap/scss/utilities/text";
+@import "node_modules/bootstrap/scss/utilities/float";
 
 $fa-font-path: "../font";
-@import "~@fortawesome/fontawesome-free/scss/fontawesome";
-@import "~@fortawesome/fontawesome-free/scss/solid";
-@import "~@fortawesome/fontawesome-free/scss/brands";
-@import "~@fortawesome/fontawesome-free/scss/regular";
+@import "node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
+@import "node_modules/@fortawesome/fontawesome-free/scss/solid";
+@import "node_modules/@fortawesome/fontawesome-free/scss/brands";
+@import "node_modules/@fortawesome/fontawesome-free/scss/regular";
 $flag-icon-rect-path: '';
-@import "~flag-icon-css/sass/flag-icon";
+@import "node_modules/flag-icon-css/sass/flag-icon";
 
 html, body {
   height: 100%;