From 03cbe99dad77620a274511bee123c4315a4c68f4 Mon Sep 17 00:00:00 2001 From: Marvin Blum Date: Tue, 28 May 2024 16:12:14 +0200 Subject: [PATCH] Switched to Shifu. --- README.md | 2 +- .gitignore => _old/.gitignore | 0 {assets => _old/assets}/avatar.png | Bin .../test.png | Bin .../assets}/favicon/android-icon-144x144.png | Bin .../assets}/favicon/android-icon-192x192.png | Bin .../assets}/favicon/android-icon-36x36.png | Bin .../assets}/favicon/android-icon-48x48.png | Bin .../assets}/favicon/android-icon-72x72.png | Bin .../assets}/favicon/android-icon-96x96.png | Bin .../assets}/favicon/apple-icon-114x114.png | Bin .../assets}/favicon/apple-icon-120x120.png | Bin .../assets}/favicon/apple-icon-144x144.png | Bin .../assets}/favicon/apple-icon-152x152.png | Bin .../assets}/favicon/apple-icon-180x180.png | Bin .../assets}/favicon/apple-icon-57x57.png | Bin .../assets}/favicon/apple-icon-60x60.png | Bin .../assets}/favicon/apple-icon-72x72.png | Bin .../assets}/favicon/apple-icon-76x76.png | Bin .../favicon/apple-icon-precomposed.png | Bin .../assets}/favicon/apple-icon.png | Bin .../assets}/favicon/browserconfig.xml | 0 .../assets}/favicon/favicon-16x16.png | Bin .../assets}/favicon/favicon-32x32.png | Bin .../assets}/favicon/favicon-96x96.png | Bin {assets => _old/assets}/favicon/favicon.ico | Bin {assets => _old/assets}/favicon/manifest.json | 0 .../assets}/favicon/ms-icon-144x144.png | Bin .../assets}/favicon/ms-icon-150x150.png | Bin .../assets}/favicon/ms-icon-310x310.png | Bin .../assets}/favicon/ms-icon-70x70.png | Bin {assets => _old/assets}/font/DMSans-Bold.ttf | Bin .../assets}/font/DMSans-BoldItalic.ttf | Bin .../assets}/font/DMSans-Italic.ttf | Bin .../assets}/font/DMSans-Regular.ttf | Bin {assets => _old/assets}/icons/arrow.svg | 0 {assets => _old/assets}/icons/cv.svg | 0 {assets => _old/assets}/icons/github.svg | 0 .../assets}/icons/indiehackers.svg | 0 {assets => _old/assets}/icons/twitter.svg | 0 {assets => _old/assets}/marvin.jpg | Bin {assets => _old/assets}/style.css | 0 config.toml => _old/config.toml | 0 .../index.html | 0 {content => _old/content}/cv/index.html | 0 {content => _old/content}/index.html | 0 {content => _old/content}/legal/index.html | 0 .../partials}/back-to-homepage.html | 0 {partials => _old/partials}/end.html | 0 {partials => _old/partials}/footer.html | 0 {partials => _old/partials}/head.html | 0 assets/js/main.js | 1 + assets/scss/main.scss | 4 ++ config.json | 45 ++++++++++++++++++ content/home.json | 21 ++++++++ static/main.css | 1 + static/main.css.map | 1 + static/main.min.js | 1 + static/main.min.js.map | 7 +++ tpl/main.html | 13 +++++ 60 files changed, 95 insertions(+), 1 deletion(-) rename .gitignore => _old/.gitignore (100%) rename {assets => _old/assets}/avatar.png (100%) rename {assets => _old/assets}/blog/how-i-built-my-website-using-emvi-as-a-headless-cms/test.png (100%) rename {assets => _old/assets}/favicon/android-icon-144x144.png (100%) rename {assets => _old/assets}/favicon/android-icon-192x192.png (100%) rename {assets => _old/assets}/favicon/android-icon-36x36.png (100%) rename {assets => _old/assets}/favicon/android-icon-48x48.png (100%) rename {assets => _old/assets}/favicon/android-icon-72x72.png (100%) rename {assets => _old/assets}/favicon/android-icon-96x96.png (100%) rename {assets => _old/assets}/favicon/apple-icon-114x114.png (100%) rename {assets => _old/assets}/favicon/apple-icon-120x120.png (100%) rename {assets => _old/assets}/favicon/apple-icon-144x144.png (100%) rename {assets => _old/assets}/favicon/apple-icon-152x152.png (100%) rename {assets => _old/assets}/favicon/apple-icon-180x180.png (100%) rename {assets => _old/assets}/favicon/apple-icon-57x57.png (100%) rename {assets => _old/assets}/favicon/apple-icon-60x60.png (100%) rename {assets => _old/assets}/favicon/apple-icon-72x72.png (100%) rename {assets => _old/assets}/favicon/apple-icon-76x76.png (100%) rename {assets => _old/assets}/favicon/apple-icon-precomposed.png (100%) rename {assets => _old/assets}/favicon/apple-icon.png (100%) rename {assets => _old/assets}/favicon/browserconfig.xml (100%) rename {assets => _old/assets}/favicon/favicon-16x16.png (100%) rename {assets => _old/assets}/favicon/favicon-32x32.png (100%) rename {assets => _old/assets}/favicon/favicon-96x96.png (100%) rename {assets => _old/assets}/favicon/favicon.ico (100%) rename {assets => _old/assets}/favicon/manifest.json (100%) rename {assets => _old/assets}/favicon/ms-icon-144x144.png (100%) rename {assets => _old/assets}/favicon/ms-icon-150x150.png (100%) rename {assets => _old/assets}/favicon/ms-icon-310x310.png (100%) rename {assets => _old/assets}/favicon/ms-icon-70x70.png (100%) rename {assets => _old/assets}/font/DMSans-Bold.ttf (100%) rename {assets => _old/assets}/font/DMSans-BoldItalic.ttf (100%) rename {assets => _old/assets}/font/DMSans-Italic.ttf (100%) rename {assets => _old/assets}/font/DMSans-Regular.ttf (100%) rename {assets => _old/assets}/icons/arrow.svg (100%) rename {assets => _old/assets}/icons/cv.svg (100%) rename {assets => _old/assets}/icons/github.svg (100%) rename {assets => _old/assets}/icons/indiehackers.svg (100%) rename {assets => _old/assets}/icons/twitter.svg (100%) rename {assets => _old/assets}/marvin.jpg (100%) rename {assets => _old/assets}/style.css (100%) rename config.toml => _old/config.toml (100%) rename {content => _old/content}/blog/how-i-built-my-website-using-emvi-as-a-headless-cms-RGaqOqK18w/index.html (100%) rename {content => _old/content}/cv/index.html (100%) rename {content => _old/content}/index.html (100%) rename {content => _old/content}/legal/index.html (100%) rename {partials => _old/partials}/back-to-homepage.html (100%) rename {partials => _old/partials}/end.html (100%) rename {partials => _old/partials}/footer.html (100%) rename {partials => _old/partials}/head.html (100%) create mode 100644 assets/js/main.js create mode 100644 assets/scss/main.scss create mode 100644 config.json create mode 100644 content/home.json create mode 100644 static/main.css create mode 100644 static/main.css.map create mode 100644 static/main.min.js create mode 100644 static/main.min.js.map create mode 100644 tpl/main.html diff --git a/README.md b/README.md index 19dec9f..51b8ad2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # marvinblum.de -My website build using [Oogway](https://github.com/emvi/oogway). +My [website](https://marvinblum.de) built with [Shifu](https://github.com/emvi/shifu). diff --git a/.gitignore b/_old/.gitignore similarity index 100% rename from .gitignore rename to _old/.gitignore diff --git a/assets/avatar.png b/_old/assets/avatar.png similarity index 100% rename from assets/avatar.png rename to _old/assets/avatar.png diff --git a/assets/blog/how-i-built-my-website-using-emvi-as-a-headless-cms/test.png b/_old/assets/blog/how-i-built-my-website-using-emvi-as-a-headless-cms/test.png similarity index 100% rename from assets/blog/how-i-built-my-website-using-emvi-as-a-headless-cms/test.png rename to _old/assets/blog/how-i-built-my-website-using-emvi-as-a-headless-cms/test.png diff --git a/assets/favicon/android-icon-144x144.png b/_old/assets/favicon/android-icon-144x144.png similarity index 100% rename from assets/favicon/android-icon-144x144.png rename to _old/assets/favicon/android-icon-144x144.png diff --git a/assets/favicon/android-icon-192x192.png b/_old/assets/favicon/android-icon-192x192.png similarity index 100% rename from assets/favicon/android-icon-192x192.png rename to _old/assets/favicon/android-icon-192x192.png diff --git a/assets/favicon/android-icon-36x36.png b/_old/assets/favicon/android-icon-36x36.png similarity index 100% rename from assets/favicon/android-icon-36x36.png rename to _old/assets/favicon/android-icon-36x36.png diff --git a/assets/favicon/android-icon-48x48.png b/_old/assets/favicon/android-icon-48x48.png similarity index 100% rename from assets/favicon/android-icon-48x48.png rename to _old/assets/favicon/android-icon-48x48.png diff --git a/assets/favicon/android-icon-72x72.png b/_old/assets/favicon/android-icon-72x72.png similarity index 100% rename from assets/favicon/android-icon-72x72.png rename to _old/assets/favicon/android-icon-72x72.png diff --git a/assets/favicon/android-icon-96x96.png b/_old/assets/favicon/android-icon-96x96.png similarity index 100% rename from assets/favicon/android-icon-96x96.png rename to _old/assets/favicon/android-icon-96x96.png diff --git a/assets/favicon/apple-icon-114x114.png b/_old/assets/favicon/apple-icon-114x114.png similarity index 100% rename from assets/favicon/apple-icon-114x114.png rename to _old/assets/favicon/apple-icon-114x114.png diff --git a/assets/favicon/apple-icon-120x120.png b/_old/assets/favicon/apple-icon-120x120.png similarity index 100% rename from assets/favicon/apple-icon-120x120.png rename to _old/assets/favicon/apple-icon-120x120.png diff --git a/assets/favicon/apple-icon-144x144.png b/_old/assets/favicon/apple-icon-144x144.png similarity index 100% rename from assets/favicon/apple-icon-144x144.png rename to _old/assets/favicon/apple-icon-144x144.png diff --git a/assets/favicon/apple-icon-152x152.png b/_old/assets/favicon/apple-icon-152x152.png similarity index 100% rename from assets/favicon/apple-icon-152x152.png rename to _old/assets/favicon/apple-icon-152x152.png diff --git a/assets/favicon/apple-icon-180x180.png b/_old/assets/favicon/apple-icon-180x180.png similarity index 100% rename from assets/favicon/apple-icon-180x180.png rename to _old/assets/favicon/apple-icon-180x180.png diff --git a/assets/favicon/apple-icon-57x57.png b/_old/assets/favicon/apple-icon-57x57.png similarity index 100% rename from assets/favicon/apple-icon-57x57.png rename to _old/assets/favicon/apple-icon-57x57.png diff --git a/assets/favicon/apple-icon-60x60.png b/_old/assets/favicon/apple-icon-60x60.png similarity index 100% rename from assets/favicon/apple-icon-60x60.png rename to _old/assets/favicon/apple-icon-60x60.png diff --git a/assets/favicon/apple-icon-72x72.png b/_old/assets/favicon/apple-icon-72x72.png similarity index 100% rename from assets/favicon/apple-icon-72x72.png rename to _old/assets/favicon/apple-icon-72x72.png diff --git a/assets/favicon/apple-icon-76x76.png b/_old/assets/favicon/apple-icon-76x76.png similarity index 100% rename from assets/favicon/apple-icon-76x76.png rename to _old/assets/favicon/apple-icon-76x76.png diff --git a/assets/favicon/apple-icon-precomposed.png b/_old/assets/favicon/apple-icon-precomposed.png similarity index 100% rename from assets/favicon/apple-icon-precomposed.png rename to _old/assets/favicon/apple-icon-precomposed.png diff --git a/assets/favicon/apple-icon.png b/_old/assets/favicon/apple-icon.png similarity index 100% rename from assets/favicon/apple-icon.png rename to _old/assets/favicon/apple-icon.png diff --git a/assets/favicon/browserconfig.xml b/_old/assets/favicon/browserconfig.xml similarity index 100% rename from assets/favicon/browserconfig.xml rename to _old/assets/favicon/browserconfig.xml diff --git a/assets/favicon/favicon-16x16.png b/_old/assets/favicon/favicon-16x16.png similarity index 100% rename from assets/favicon/favicon-16x16.png rename to _old/assets/favicon/favicon-16x16.png diff --git a/assets/favicon/favicon-32x32.png b/_old/assets/favicon/favicon-32x32.png similarity index 100% rename from assets/favicon/favicon-32x32.png rename to _old/assets/favicon/favicon-32x32.png diff --git a/assets/favicon/favicon-96x96.png b/_old/assets/favicon/favicon-96x96.png similarity index 100% rename from assets/favicon/favicon-96x96.png rename to _old/assets/favicon/favicon-96x96.png diff --git a/assets/favicon/favicon.ico b/_old/assets/favicon/favicon.ico similarity index 100% rename from assets/favicon/favicon.ico rename to _old/assets/favicon/favicon.ico diff --git a/assets/favicon/manifest.json b/_old/assets/favicon/manifest.json similarity index 100% rename from assets/favicon/manifest.json rename to _old/assets/favicon/manifest.json diff --git a/assets/favicon/ms-icon-144x144.png b/_old/assets/favicon/ms-icon-144x144.png similarity index 100% rename from assets/favicon/ms-icon-144x144.png rename to _old/assets/favicon/ms-icon-144x144.png diff --git a/assets/favicon/ms-icon-150x150.png b/_old/assets/favicon/ms-icon-150x150.png similarity index 100% rename from assets/favicon/ms-icon-150x150.png rename to _old/assets/favicon/ms-icon-150x150.png diff --git a/assets/favicon/ms-icon-310x310.png b/_old/assets/favicon/ms-icon-310x310.png similarity index 100% rename from assets/favicon/ms-icon-310x310.png rename to _old/assets/favicon/ms-icon-310x310.png diff --git a/assets/favicon/ms-icon-70x70.png b/_old/assets/favicon/ms-icon-70x70.png similarity index 100% rename from assets/favicon/ms-icon-70x70.png rename to _old/assets/favicon/ms-icon-70x70.png diff --git a/assets/font/DMSans-Bold.ttf b/_old/assets/font/DMSans-Bold.ttf similarity index 100% rename from assets/font/DMSans-Bold.ttf rename to _old/assets/font/DMSans-Bold.ttf diff --git a/assets/font/DMSans-BoldItalic.ttf b/_old/assets/font/DMSans-BoldItalic.ttf similarity index 100% rename from assets/font/DMSans-BoldItalic.ttf rename to _old/assets/font/DMSans-BoldItalic.ttf diff --git a/assets/font/DMSans-Italic.ttf b/_old/assets/font/DMSans-Italic.ttf similarity index 100% rename from assets/font/DMSans-Italic.ttf rename to _old/assets/font/DMSans-Italic.ttf diff --git a/assets/font/DMSans-Regular.ttf b/_old/assets/font/DMSans-Regular.ttf similarity index 100% rename from assets/font/DMSans-Regular.ttf rename to _old/assets/font/DMSans-Regular.ttf diff --git a/assets/icons/arrow.svg b/_old/assets/icons/arrow.svg similarity index 100% rename from assets/icons/arrow.svg rename to _old/assets/icons/arrow.svg diff --git a/assets/icons/cv.svg b/_old/assets/icons/cv.svg similarity index 100% rename from assets/icons/cv.svg rename to _old/assets/icons/cv.svg diff --git a/assets/icons/github.svg b/_old/assets/icons/github.svg similarity index 100% rename from assets/icons/github.svg rename to _old/assets/icons/github.svg diff --git a/assets/icons/indiehackers.svg b/_old/assets/icons/indiehackers.svg similarity index 100% rename from assets/icons/indiehackers.svg rename to _old/assets/icons/indiehackers.svg diff --git a/assets/icons/twitter.svg b/_old/assets/icons/twitter.svg similarity index 100% rename from assets/icons/twitter.svg rename to _old/assets/icons/twitter.svg diff --git a/assets/marvin.jpg b/_old/assets/marvin.jpg similarity index 100% rename from assets/marvin.jpg rename to _old/assets/marvin.jpg diff --git a/assets/style.css b/_old/assets/style.css similarity index 100% rename from assets/style.css rename to _old/assets/style.css diff --git a/config.toml b/_old/config.toml similarity index 100% rename from config.toml rename to _old/config.toml diff --git a/content/blog/how-i-built-my-website-using-emvi-as-a-headless-cms-RGaqOqK18w/index.html b/_old/content/blog/how-i-built-my-website-using-emvi-as-a-headless-cms-RGaqOqK18w/index.html similarity index 100% rename from content/blog/how-i-built-my-website-using-emvi-as-a-headless-cms-RGaqOqK18w/index.html rename to _old/content/blog/how-i-built-my-website-using-emvi-as-a-headless-cms-RGaqOqK18w/index.html diff --git a/content/cv/index.html b/_old/content/cv/index.html similarity index 100% rename from content/cv/index.html rename to _old/content/cv/index.html diff --git a/content/index.html b/_old/content/index.html similarity index 100% rename from content/index.html rename to _old/content/index.html diff --git a/content/legal/index.html b/_old/content/legal/index.html similarity index 100% rename from content/legal/index.html rename to _old/content/legal/index.html diff --git a/partials/back-to-homepage.html b/_old/partials/back-to-homepage.html similarity index 100% rename from partials/back-to-homepage.html rename to _old/partials/back-to-homepage.html diff --git a/partials/end.html b/_old/partials/end.html similarity index 100% rename from partials/end.html rename to _old/partials/end.html diff --git a/partials/footer.html b/_old/partials/footer.html similarity index 100% rename from partials/footer.html rename to _old/partials/footer.html diff --git a/partials/head.html b/_old/partials/head.html similarity index 100% rename from partials/head.html rename to _old/partials/head.html diff --git a/assets/js/main.js b/assets/js/main.js new file mode 100644 index 0000000..74d5533 --- /dev/null +++ b/assets/js/main.js @@ -0,0 +1 @@ +console.log("Hello from Shifu!"); diff --git a/assets/scss/main.scss b/assets/scss/main.scss new file mode 100644 index 0000000..78bdcb2 --- /dev/null +++ b/assets/scss/main.scss @@ -0,0 +1,4 @@ +body { + max-width: 800px; + margin: 40px; +} diff --git a/config.json b/config.json new file mode 100644 index 0000000..e1b6eb1 --- /dev/null +++ b/config.json @@ -0,0 +1,45 @@ +{ + "dev": true, + "server": { + "host": "localhost", + "port": 8081, + "shutdown_time": 30, + "write_timeout": 5, + "read_timeout": 5, + "tls_cert_file": "", + "tls_key_file": "", + "hostname": "", + "secure_cookies": false, + "cookie_domain_name": "" + }, + "content": { + "provider": "fs", + "update_seconds": 5, + "repository": "" + }, + "cors": { + "origins": "", + "loglevel": "" + }, + "sass": { + "entrypoint": "main.scss", + "dir": "assets/scss", + "watch": true, + "out": "static/main.css", + "out_source_map": "static/main.css.map" + }, + "js": { + "entrypoint": "main.js", + "dir": "assets/js", + "watch": true, + "out": "static/main.min.js", + "source_map": true + }, + "analytics": { + "provider": "", + "client_id": "", + "client_secret": "", + "subnets": null, + "header": null + } +} diff --git a/content/home.json b/content/home.json new file mode 100644 index 0000000..1e73a2d --- /dev/null +++ b/content/home.json @@ -0,0 +1,21 @@ +{ + "path": { + "en": "/" + }, + "sitemap": { + "priority": "1.0" + }, + "content": { + "content": [ + { + "tpl": "main", + "copy": { + "en": { + "title": "Marvin Blum - marvinblum.de", + "headline": "Welcome to my website!" + } + } + } + ] + } +} diff --git a/static/main.css b/static/main.css new file mode 100644 index 0000000..223b698 --- /dev/null +++ b/static/main.css @@ -0,0 +1 @@ +body{max-width:800px;margin:40px}/*# sourceMappingURL=main.css.map */ diff --git a/static/main.css.map b/static/main.css.map new file mode 100644 index 0000000..297b874 --- /dev/null +++ b/static/main.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["../assets/scss/main.scss"],"names":[],"mappings":"AAAA,KACC,gBACA","file":"main.css"} \ No newline at end of file diff --git a/static/main.min.js b/static/main.min.js new file mode 100644 index 0000000..8953f15 --- /dev/null +++ b/static/main.min.js @@ -0,0 +1 @@ +(()=>{console.log("Hello from Shifu!");})(); diff --git a/static/main.min.js.map b/static/main.min.js.map new file mode 100644 index 0000000..a99abfe --- /dev/null +++ b/static/main.min.js.map @@ -0,0 +1,7 @@ +{ + "version": 3, + "sources": ["../assets/js/main.js"], + "sourcesContent": ["console.log(\"Hello from Shifu!\");\n"], + "mappings": "MAAA,QAAQ,IAAI,mBAAmB", + "names": [] +} diff --git a/tpl/main.html b/tpl/main.html new file mode 100644 index 0000000..66dab5c --- /dev/null +++ b/tpl/main.html @@ -0,0 +1,13 @@ + + + + + + + + {{copy .Page .Content "title"}} + + +

{{copy .Page .Content "headline"}}

+ +