From 70d7497edad53642014d2e90f44220b77ef24915 Mon Sep 17 00:00:00 2001 From: Sebastian Frank Date: Tue, 19 Mar 2019 11:15:32 +0100 Subject: [PATCH] better project layout --- .gitignore | 4 ++-- build.sh | 5 ---- RELEASE.md => build/RELEASE.md | 0 VERSION => build/VERSION | 0 .drone.yml => build/ci/.drone.yml | 22 +++++++++--------- Dockerfile => build/package/Dockerfile | 2 +- {mark2web => cmd/mark2web}/main.go | 6 ++--- {_example => example}/assets/css/main.css | 0 {_example => example}/assets/img/de.png | Bin {_example => example}/assets/img/en.png | Bin {_example => example}/assets/img/logo.png | Bin {_example => example}/config.yml | 0 {_example => example}/content/README.md | 0 {_example => example}/content/config.yml | 0 {_example => example}/content/de/config.yml | 0 .../content/de/main/01_home/README.md | 0 .../content/de/main/01_home/config.yml | 0 .../02_Leistungen und Referenzen/README.md | 0 .../02_Leistungen und Referenzen/bild.jpg | Bin .../de/main/03_kontakt/01_adresse/README.md | 0 .../de/main/03_kontakt/01_adresse/bild.jpg | Bin .../de/main/03_kontakt/01_adresse/config.yml | 0 .../de/main/03_kontakt/02_anfahrt/README.md | 0 .../content/de/main/03_kontakt/config.yml | 0 .../content/de/main/04_impressum/config.yml | 0 .../content/de/main/_zeug/links.md | 0 .../de/service/01_datenschutz/README.md | 0 .../content/de/service/02_agb/README.md | 0 .../content/de/service/03_impressum/README.md | 0 {_example => example}/content/en/config.yml | 0 .../content/en/main/01_home/README.md | 0 .../content/en/main/02_services/README.md | 0 .../content/en/main/03_contact/README.md | 0 .../content/en/main/04_imprint/config.yml | 0 .../content/en/service/01_terms/README.md | 0 .../content/en/service/02_imprint/README.md | 0 {_example => example}/templates/base.html | 0 .../templates/base_intro.html | 0 .../templates/base_multipart.html | 0 {filter => pkg/filter}/custom.go | 4 ++-- {filter => pkg/filter}/dump.go | 0 {filter => pkg/filter}/image_process.go | 4 ++-- {filter => pkg/filter}/init.go | 0 {filter => pkg/filter}/json.go | 0 {filter => pkg/filter}/markdown.go | 4 ++-- {filter => pkg/filter}/relative_path.go | 2 +- {helper => pkg/helper}/dir.go | 0 {helper => pkg/helper}/logger.go | 0 map_string.go => pkg/helper/map_string.go | 2 +- {helper => pkg/helper}/markdown.go | 0 {helper => pkg/helper}/merge.go | 0 {helper => pkg/helper}/webrequest.go | 0 assets.go => pkg/mark2web/assets.go | 2 +- .../mark2web/config_global.go | 0 config_path.go => pkg/mark2web/config_path.go | 6 +++-- content.go => pkg/mark2web/content.go | 2 +- context.go => pkg/mark2web/context.go | 6 ++--- context_fn.go => pkg/mark2web/context_fn.go | 2 +- navigation.go => pkg/mark2web/navigation.go | 4 ++-- path.go => pkg/mark2web/path.go | 2 +- render.go => pkg/mark2web/render.go | 0 tree.go => pkg/mark2web/tree.go | 4 +++- scripts/build.sh | 7 ++++++ test.rest => test/test.rest | 0 testfile | 0 {_website => website}/config.yml | 0 {_website => website}/content/config.yml | 0 .../de/01_Navigation/01_mark2web/README.md | 0 .../01_Navigation/02_Installation/README.md | 0 .../de/01_Navigation/02_Installation/bild.jpg | Bin .../03_Benutzung/01_Ordnerstruktur/README.md | 0 .../03_Benutzung/01_Ordnerstruktur/config.yml | 0 .../03_Benutzung/02_Konfiguration/README.md | 0 .../03_Benutzung/02_Konfiguration/config.yml | 0 .../03_Benutzung/03_Inhalte/README.md | 0 .../03_Benutzung/03_Inhalte/config.yml | 0 .../03_Benutzung/04_Templates/README.md | 0 .../03_Benutzung/04_Templates/config.yml | 0 .../de/01_Navigation/03_Benutzung/config.yml | 0 .../de/01_Navigation/04_Blog/README.md | 0 .../de/01_Navigation/04_Blog/config.yml | 0 .../de/02_Rechtliches/01_Impressum/README.md | 0 .../02_Datenschutzerklärung/README.md | 0 {_website => website}/img/blog.jpg | Bin {_website => website}/img/coffee.jpg | Bin {_website => website}/img/design.jpg | Bin {_website => website}/img/desk.jpg | Bin {_website => website}/img/folder.jpg | Bin {_website => website}/img/gears.jpg | Bin {_website => website}/img/html.jpg | Bin {_website => website}/img/keyboard.jpg | Bin {_website => website}/img/laptop.jpg | Bin {_website => website}/img/laptop2.jpg | Bin {_website => website}/img/wire.jpg | Bin {_website => website}/img/write.jpg | Bin .../project-files/css/grid.css | 0 .../project-files/css/main.css | 0 .../project-files/css/menu.css | 0 .../project-files/css/preloader.css | 0 .../project-files/css/slider.css | 0 .../fonts/font-awesome/FontAwesome.otf | Bin .../fonts/font-awesome/font-awesome.css | 0 .../font-awesome/fontawesome-webfont.eot | Bin .../font-awesome/fontawesome-webfont.svg | 0 .../font-awesome/fontawesome-webfont.ttf | Bin .../font-awesome/fontawesome-webfont.woff | Bin .../font-awesome/fontawesome-webfont.woff2 | Bin .../project-files/img/favicon.ico | Bin .../project-files/img/logo.png | Bin .../project-files/img/logo_small.png | Bin .../project-files/img/logo_text.png | Bin .../project-files/js/functions.js | 0 .../project-files/js/preloader.js | 0 .../project-files/js/slick/ajax-loader.gif | Bin .../project-files/js/slick/fonts/slick.eot | Bin .../project-files/js/slick/fonts/slick.svg | 0 .../project-files/js/slick/fonts/slick.ttf | Bin .../project-files/js/slick/fonts/slick.woff | Bin .../project-files/js/slick/slick-custom.js | 0 .../project-files/js/slick/slick-theme.css | 0 .../project-files/js/slick/slick.css | 0 .../project-files/js/slick/slick.min.js | 0 {_website => website}/templates/base.html | 0 .../templates/base_blog.html | 0 .../templates/base_blog_details.html | 0 .../templates/filters/datum.js | 0 .../templates/filters/lib/strings.js | 0 .../templates/partials/matomo.html | 0 128 files changed, 48 insertions(+), 42 deletions(-) delete mode 100755 build.sh rename RELEASE.md => build/RELEASE.md (100%) rename VERSION => build/VERSION (100%) rename .drone.yml => build/ci/.drone.yml (82%) rename Dockerfile => build/package/Dockerfile (85%) rename {mark2web => cmd/mark2web}/main.go (96%) rename {_example => example}/assets/css/main.css (100%) rename {_example => example}/assets/img/de.png (100%) rename {_example => example}/assets/img/en.png (100%) rename {_example => example}/assets/img/logo.png (100%) rename {_example => example}/config.yml (100%) rename {_example => example}/content/README.md (100%) rename {_example => example}/content/config.yml (100%) rename {_example => example}/content/de/config.yml (100%) rename {_example => example}/content/de/main/01_home/README.md (100%) rename {_example => example}/content/de/main/01_home/config.yml (100%) rename {_example => example}/content/de/main/02_Leistungen und Referenzen/README.md (100%) rename {_example => example}/content/de/main/02_Leistungen und Referenzen/bild.jpg (100%) rename {_example => example}/content/de/main/03_kontakt/01_adresse/README.md (100%) rename {_example => example}/content/de/main/03_kontakt/01_adresse/bild.jpg (100%) rename {_example => example}/content/de/main/03_kontakt/01_adresse/config.yml (100%) rename {_example => example}/content/de/main/03_kontakt/02_anfahrt/README.md (100%) rename {_example => example}/content/de/main/03_kontakt/config.yml (100%) rename {_example => example}/content/de/main/04_impressum/config.yml (100%) rename {_example => example}/content/de/main/_zeug/links.md (100%) rename {_example => example}/content/de/service/01_datenschutz/README.md (100%) rename {_example => example}/content/de/service/02_agb/README.md (100%) rename {_example => example}/content/de/service/03_impressum/README.md (100%) rename {_example => example}/content/en/config.yml (100%) rename {_example => example}/content/en/main/01_home/README.md (100%) rename {_example => example}/content/en/main/02_services/README.md (100%) rename {_example => example}/content/en/main/03_contact/README.md (100%) rename {_example => example}/content/en/main/04_imprint/config.yml (100%) rename {_example => example}/content/en/service/01_terms/README.md (100%) rename {_example => example}/content/en/service/02_imprint/README.md (100%) rename {_example => example}/templates/base.html (100%) rename {_example => example}/templates/base_intro.html (100%) rename {_example => example}/templates/base_multipart.html (100%) rename {filter => pkg/filter}/custom.go (95%) rename {filter => pkg/filter}/dump.go (100%) rename {filter => pkg/filter}/image_process.go (98%) rename {filter => pkg/filter}/init.go (100%) rename {filter => pkg/filter}/json.go (100%) rename {filter => pkg/filter}/markdown.go (88%) rename {filter => pkg/filter}/relative_path.go (87%) rename {helper => pkg/helper}/dir.go (100%) rename {helper => pkg/helper}/logger.go (100%) rename map_string.go => pkg/helper/map_string.go (98%) rename {helper => pkg/helper}/markdown.go (100%) rename {helper => pkg/helper}/merge.go (100%) rename {helper => pkg/helper}/webrequest.go (100%) rename assets.go => pkg/mark2web/assets.go (96%) rename config_global.go => pkg/mark2web/config_global.go (100%) rename config_path.go => pkg/mark2web/config_path.go (94%) rename content.go => pkg/mark2web/content.go (99%) rename context.go => pkg/mark2web/context.go (98%) rename context_fn.go => pkg/mark2web/context_fn.go (94%) rename navigation.go => pkg/mark2web/navigation.go (97%) rename path.go => pkg/mark2web/path.go (95%) rename render.go => pkg/mark2web/render.go (100%) rename tree.go => pkg/mark2web/tree.go (82%) create mode 100755 scripts/build.sh rename test.rest => test/test.rest (100%) delete mode 100644 testfile rename {_website => website}/config.yml (100%) rename {_website => website}/content/config.yml (100%) rename {_website => website}/content/de/01_Navigation/01_mark2web/README.md (100%) rename {_website => website}/content/de/01_Navigation/02_Installation/README.md (100%) rename {_website => website}/content/de/01_Navigation/02_Installation/bild.jpg (100%) rename {_website => website}/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/README.md (100%) rename {_website => website}/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/config.yml (100%) rename {_website => website}/content/de/01_Navigation/03_Benutzung/02_Konfiguration/README.md (100%) rename {_website => website}/content/de/01_Navigation/03_Benutzung/02_Konfiguration/config.yml (100%) rename {_website => website}/content/de/01_Navigation/03_Benutzung/03_Inhalte/README.md (100%) rename {_website => website}/content/de/01_Navigation/03_Benutzung/03_Inhalte/config.yml (100%) rename {_website => website}/content/de/01_Navigation/03_Benutzung/04_Templates/README.md (100%) rename {_website => website}/content/de/01_Navigation/03_Benutzung/04_Templates/config.yml (100%) rename {_website => website}/content/de/01_Navigation/03_Benutzung/config.yml (100%) rename {_website => website}/content/de/01_Navigation/04_Blog/README.md (100%) rename {_website => website}/content/de/01_Navigation/04_Blog/config.yml (100%) rename {_website => website}/content/de/02_Rechtliches/01_Impressum/README.md (100%) rename {_website => website}/content/de/02_Rechtliches/02_Datenschutzerklärung/README.md (100%) rename {_website => website}/img/blog.jpg (100%) rename {_website => website}/img/coffee.jpg (100%) rename {_website => website}/img/design.jpg (100%) rename {_website => website}/img/desk.jpg (100%) rename {_website => website}/img/folder.jpg (100%) rename {_website => website}/img/gears.jpg (100%) rename {_website => website}/img/html.jpg (100%) rename {_website => website}/img/keyboard.jpg (100%) rename {_website => website}/img/laptop.jpg (100%) rename {_website => website}/img/laptop2.jpg (100%) rename {_website => website}/img/wire.jpg (100%) rename {_website => website}/img/write.jpg (100%) rename {_website => website}/project-files/css/grid.css (100%) rename {_website => website}/project-files/css/main.css (100%) rename {_website => website}/project-files/css/menu.css (100%) rename {_website => website}/project-files/css/preloader.css (100%) rename {_website => website}/project-files/css/slider.css (100%) rename {_website => website}/project-files/fonts/font-awesome/FontAwesome.otf (100%) rename {_website => website}/project-files/fonts/font-awesome/font-awesome.css (100%) rename {_website => website}/project-files/fonts/font-awesome/fontawesome-webfont.eot (100%) rename {_website => website}/project-files/fonts/font-awesome/fontawesome-webfont.svg (100%) rename {_website => website}/project-files/fonts/font-awesome/fontawesome-webfont.ttf (100%) rename {_website => website}/project-files/fonts/font-awesome/fontawesome-webfont.woff (100%) rename {_website => website}/project-files/fonts/font-awesome/fontawesome-webfont.woff2 (100%) rename {_website => website}/project-files/img/favicon.ico (100%) rename {_website => website}/project-files/img/logo.png (100%) rename {_website => website}/project-files/img/logo_small.png (100%) rename {_website => website}/project-files/img/logo_text.png (100%) rename {_website => website}/project-files/js/functions.js (100%) rename {_website => website}/project-files/js/preloader.js (100%) rename {_website => website}/project-files/js/slick/ajax-loader.gif (100%) rename {_website => website}/project-files/js/slick/fonts/slick.eot (100%) rename {_website => website}/project-files/js/slick/fonts/slick.svg (100%) rename {_website => website}/project-files/js/slick/fonts/slick.ttf (100%) rename {_website => website}/project-files/js/slick/fonts/slick.woff (100%) rename {_website => website}/project-files/js/slick/slick-custom.js (100%) rename {_website => website}/project-files/js/slick/slick-theme.css (100%) rename {_website => website}/project-files/js/slick/slick.css (100%) rename {_website => website}/project-files/js/slick/slick.min.js (100%) rename {_website => website}/templates/base.html (100%) rename {_website => website}/templates/base_blog.html (100%) rename {_website => website}/templates/base_blog_details.html (100%) rename {_website => website}/templates/filters/datum.js (100%) rename {_website => website}/templates/filters/lib/strings.js (100%) rename {_website => website}/templates/partials/matomo.html (100%) diff --git a/.gitignore b/.gitignore index f0566f5..dcc0cc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -test.html -html/ \ No newline at end of file +html/ +build/dist \ No newline at end of file diff --git a/build.sh b/build.sh deleted file mode 100755 index df18b1e..0000000 --- a/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mkdir -p dist -go build -v -ldflags "-X main.Version=`git describe --tags --long` -X main.GitHash=`git rev-parse HEAD` -X main.BuildTime=`date -u '+%Y-%m-%d_%I:%M:%S%p'`" -o dist/mark2web-`cat VERSION`-${GOOS}-${GOARCH}${FILEEXT} mark2web/main.go - diff --git a/RELEASE.md b/build/RELEASE.md similarity index 100% rename from RELEASE.md rename to build/RELEASE.md diff --git a/VERSION b/build/VERSION similarity index 100% rename from VERSION rename to build/VERSION diff --git a/.drone.yml b/build/ci/.drone.yml similarity index 82% rename from .drone.yml rename to build/ci/.drone.yml index 52c1d52..bff8ad4 100644 --- a/.drone.yml +++ b/build/ci/.drone.yml @@ -15,15 +15,15 @@ steps: commands: - git submodule update --init --recursive - git fetch --tags - - ./build.sh + - scripts/build.sh when: event: [ push, tag ] - name: test with example content image: alpine commands: - - ./dist/mark2web-`cat VERSION`-linux-amd64 -version - - ./dist/mark2web-`cat VERSION`-linux-amd64 -in _example -out example_out -create -logLevel debug + - dist/mark2web-`cat build/VERSION`-linux-amd64 -version + - dist/mark2web-`cat build/VERSION`-linux-amd64 -in example -out example_out -create -logLevel debug when: event: [ push, tag ] @@ -34,7 +34,7 @@ steps: GOOS: freebsd GOARCH: amd64 commands: - - ./build.sh + - scripts/build.sh when: event: [ tag ] @@ -45,7 +45,7 @@ steps: GOOS: darwin GOARCH: amd64 commands: - - ./build.sh + - scripts/build.sh when: event: [ tag ] @@ -57,7 +57,7 @@ steps: GOARCH: amd64 FILEEXT: .exe commands: - - ./build.sh + - scripts/build.sh when: event: [ tag ] @@ -65,7 +65,7 @@ steps: image: docker commands: - cp dist/mark2web-`cat VERSION`-linux-amd64 mark2web - - docker build -t apairon/mark2web . + - docker build -t apairon/mark2web build/package volumes: - name: docker path: /var/run/docker.sock @@ -81,7 +81,7 @@ steps: from_secret: rsync_pass commands: - /mark2web -version - - /mark2web -in _website -out html -create -logLevel info + - /mark2web -in website -out html -create -logLevel info - ' rsync -rlcgD -i -u -v --stats --delete @@ -110,8 +110,8 @@ steps: base_url: https://gitbase.de files: - dist/* - title: VERSION - note: RELEASE.md + title: build/VERSION + note: build/RELEASE.md checksum: - md5 - sha256 @@ -121,4 +121,4 @@ steps: volumes: - name: docker host: - path: /var/run/docker.sock \ No newline at end of file + path: /var/run/docker.sock diff --git a/Dockerfile b/build/package/Dockerfile similarity index 85% rename from Dockerfile rename to build/package/Dockerfile index 310b3e3..1924f05 100644 --- a/Dockerfile +++ b/build/package/Dockerfile @@ -1,4 +1,4 @@ FROM alpine RUN apk update && apk add ca-certificates openssh-client sshpass rsync gzip && rm -r /var/cache/ -ADD mark2web / +ADD ../../mark2web / CMD ["/mark2web"] diff --git a/mark2web/main.go b/cmd/mark2web/main.go similarity index 96% rename from mark2web/main.go rename to cmd/mark2web/main.go index 728ab27..df95038 100644 --- a/mark2web/main.go +++ b/cmd/mark2web/main.go @@ -6,9 +6,9 @@ import ( "os" "path" - "gitbase.de/apairon/mark2web" - "gitbase.de/apairon/mark2web/filter" - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/filter" + "gitbase.de/apairon/mark2web/pkg/helper" + "gitbase.de/apairon/mark2web/pkg/mark2web" ) var ( diff --git a/_example/assets/css/main.css b/example/assets/css/main.css similarity index 100% rename from _example/assets/css/main.css rename to example/assets/css/main.css diff --git a/_example/assets/img/de.png b/example/assets/img/de.png similarity index 100% rename from _example/assets/img/de.png rename to example/assets/img/de.png diff --git a/_example/assets/img/en.png b/example/assets/img/en.png similarity index 100% rename from _example/assets/img/en.png rename to example/assets/img/en.png diff --git a/_example/assets/img/logo.png b/example/assets/img/logo.png similarity index 100% rename from _example/assets/img/logo.png rename to example/assets/img/logo.png diff --git a/_example/config.yml b/example/config.yml similarity index 100% rename from _example/config.yml rename to example/config.yml diff --git a/_example/content/README.md b/example/content/README.md similarity index 100% rename from _example/content/README.md rename to example/content/README.md diff --git a/_example/content/config.yml b/example/content/config.yml similarity index 100% rename from _example/content/config.yml rename to example/content/config.yml diff --git a/_example/content/de/config.yml b/example/content/de/config.yml similarity index 100% rename from _example/content/de/config.yml rename to example/content/de/config.yml diff --git a/_example/content/de/main/01_home/README.md b/example/content/de/main/01_home/README.md similarity index 100% rename from _example/content/de/main/01_home/README.md rename to example/content/de/main/01_home/README.md diff --git a/_example/content/de/main/01_home/config.yml b/example/content/de/main/01_home/config.yml similarity index 100% rename from _example/content/de/main/01_home/config.yml rename to example/content/de/main/01_home/config.yml diff --git a/_example/content/de/main/02_Leistungen und Referenzen/README.md b/example/content/de/main/02_Leistungen und Referenzen/README.md similarity index 100% rename from _example/content/de/main/02_Leistungen und Referenzen/README.md rename to example/content/de/main/02_Leistungen und Referenzen/README.md diff --git a/_example/content/de/main/02_Leistungen und Referenzen/bild.jpg b/example/content/de/main/02_Leistungen und Referenzen/bild.jpg similarity index 100% rename from _example/content/de/main/02_Leistungen und Referenzen/bild.jpg rename to example/content/de/main/02_Leistungen und Referenzen/bild.jpg diff --git a/_example/content/de/main/03_kontakt/01_adresse/README.md b/example/content/de/main/03_kontakt/01_adresse/README.md similarity index 100% rename from _example/content/de/main/03_kontakt/01_adresse/README.md rename to example/content/de/main/03_kontakt/01_adresse/README.md diff --git a/_example/content/de/main/03_kontakt/01_adresse/bild.jpg b/example/content/de/main/03_kontakt/01_adresse/bild.jpg similarity index 100% rename from _example/content/de/main/03_kontakt/01_adresse/bild.jpg rename to example/content/de/main/03_kontakt/01_adresse/bild.jpg diff --git a/_example/content/de/main/03_kontakt/01_adresse/config.yml b/example/content/de/main/03_kontakt/01_adresse/config.yml similarity index 100% rename from _example/content/de/main/03_kontakt/01_adresse/config.yml rename to example/content/de/main/03_kontakt/01_adresse/config.yml diff --git a/_example/content/de/main/03_kontakt/02_anfahrt/README.md b/example/content/de/main/03_kontakt/02_anfahrt/README.md similarity index 100% rename from _example/content/de/main/03_kontakt/02_anfahrt/README.md rename to example/content/de/main/03_kontakt/02_anfahrt/README.md diff --git a/_example/content/de/main/03_kontakt/config.yml b/example/content/de/main/03_kontakt/config.yml similarity index 100% rename from _example/content/de/main/03_kontakt/config.yml rename to example/content/de/main/03_kontakt/config.yml diff --git a/_example/content/de/main/04_impressum/config.yml b/example/content/de/main/04_impressum/config.yml similarity index 100% rename from _example/content/de/main/04_impressum/config.yml rename to example/content/de/main/04_impressum/config.yml diff --git a/_example/content/de/main/_zeug/links.md b/example/content/de/main/_zeug/links.md similarity index 100% rename from _example/content/de/main/_zeug/links.md rename to example/content/de/main/_zeug/links.md diff --git a/_example/content/de/service/01_datenschutz/README.md b/example/content/de/service/01_datenschutz/README.md similarity index 100% rename from _example/content/de/service/01_datenschutz/README.md rename to example/content/de/service/01_datenschutz/README.md diff --git a/_example/content/de/service/02_agb/README.md b/example/content/de/service/02_agb/README.md similarity index 100% rename from _example/content/de/service/02_agb/README.md rename to example/content/de/service/02_agb/README.md diff --git a/_example/content/de/service/03_impressum/README.md b/example/content/de/service/03_impressum/README.md similarity index 100% rename from _example/content/de/service/03_impressum/README.md rename to example/content/de/service/03_impressum/README.md diff --git a/_example/content/en/config.yml b/example/content/en/config.yml similarity index 100% rename from _example/content/en/config.yml rename to example/content/en/config.yml diff --git a/_example/content/en/main/01_home/README.md b/example/content/en/main/01_home/README.md similarity index 100% rename from _example/content/en/main/01_home/README.md rename to example/content/en/main/01_home/README.md diff --git a/_example/content/en/main/02_services/README.md b/example/content/en/main/02_services/README.md similarity index 100% rename from _example/content/en/main/02_services/README.md rename to example/content/en/main/02_services/README.md diff --git a/_example/content/en/main/03_contact/README.md b/example/content/en/main/03_contact/README.md similarity index 100% rename from _example/content/en/main/03_contact/README.md rename to example/content/en/main/03_contact/README.md diff --git a/_example/content/en/main/04_imprint/config.yml b/example/content/en/main/04_imprint/config.yml similarity index 100% rename from _example/content/en/main/04_imprint/config.yml rename to example/content/en/main/04_imprint/config.yml diff --git a/_example/content/en/service/01_terms/README.md b/example/content/en/service/01_terms/README.md similarity index 100% rename from _example/content/en/service/01_terms/README.md rename to example/content/en/service/01_terms/README.md diff --git a/_example/content/en/service/02_imprint/README.md b/example/content/en/service/02_imprint/README.md similarity index 100% rename from _example/content/en/service/02_imprint/README.md rename to example/content/en/service/02_imprint/README.md diff --git a/_example/templates/base.html b/example/templates/base.html similarity index 100% rename from _example/templates/base.html rename to example/templates/base.html diff --git a/_example/templates/base_intro.html b/example/templates/base_intro.html similarity index 100% rename from _example/templates/base_intro.html rename to example/templates/base_intro.html diff --git a/_example/templates/base_multipart.html b/example/templates/base_multipart.html similarity index 100% rename from _example/templates/base_multipart.html rename to example/templates/base_multipart.html diff --git a/filter/custom.go b/pkg/filter/custom.go similarity index 95% rename from filter/custom.go rename to pkg/filter/custom.go index a1bd608..cd54838 100644 --- a/filter/custom.go +++ b/pkg/filter/custom.go @@ -5,8 +5,8 @@ import ( "path" "strings" - "gitbase.de/apairon/mark2web" - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/helper" + "gitbase.de/apairon/mark2web/pkg/mark2web" "github.com/ddliu/motto" "github.com/flosch/pongo2" _ "github.com/robertkrimen/otto/underscore" diff --git a/filter/dump.go b/pkg/filter/dump.go similarity index 100% rename from filter/dump.go rename to pkg/filter/dump.go diff --git a/filter/image_process.go b/pkg/filter/image_process.go similarity index 98% rename from filter/image_process.go rename to pkg/filter/image_process.go index 175e1a2..296df22 100644 --- a/filter/image_process.go +++ b/pkg/filter/image_process.go @@ -12,8 +12,8 @@ import ( "strconv" "strings" - "gitbase.de/apairon/mark2web" - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/helper" + "gitbase.de/apairon/mark2web/pkg/mark2web" "github.com/disintegration/imaging" "github.com/flosch/pongo2" ) diff --git a/filter/init.go b/pkg/filter/init.go similarity index 100% rename from filter/init.go rename to pkg/filter/init.go diff --git a/filter/json.go b/pkg/filter/json.go similarity index 100% rename from filter/json.go rename to pkg/filter/json.go diff --git a/filter/markdown.go b/pkg/filter/markdown.go similarity index 88% rename from filter/markdown.go rename to pkg/filter/markdown.go index 86b1237..681080c 100644 --- a/filter/markdown.go +++ b/pkg/filter/markdown.go @@ -1,8 +1,8 @@ package filter import ( - "gitbase.de/apairon/mark2web" - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/helper" + "gitbase.de/apairon/mark2web/pkg/mark2web" "github.com/flosch/pongo2" ) diff --git a/filter/relative_path.go b/pkg/filter/relative_path.go similarity index 87% rename from filter/relative_path.go rename to pkg/filter/relative_path.go index 81b8392..298909c 100644 --- a/filter/relative_path.go +++ b/pkg/filter/relative_path.go @@ -1,7 +1,7 @@ package filter import ( - "gitbase.de/apairon/mark2web" + "gitbase.de/apairon/mark2web/pkg/mark2web" "github.com/flosch/pongo2" ) diff --git a/helper/dir.go b/pkg/helper/dir.go similarity index 100% rename from helper/dir.go rename to pkg/helper/dir.go diff --git a/helper/logger.go b/pkg/helper/logger.go similarity index 100% rename from helper/logger.go rename to pkg/helper/logger.go diff --git a/map_string.go b/pkg/helper/map_string.go similarity index 98% rename from map_string.go rename to pkg/helper/map_string.go index 54bbb55..a63633b 100644 --- a/map_string.go +++ b/pkg/helper/map_string.go @@ -1,4 +1,4 @@ -package mark2web +package helper import "fmt" diff --git a/helper/markdown.go b/pkg/helper/markdown.go similarity index 100% rename from helper/markdown.go rename to pkg/helper/markdown.go diff --git a/helper/merge.go b/pkg/helper/merge.go similarity index 100% rename from helper/merge.go rename to pkg/helper/merge.go diff --git a/helper/webrequest.go b/pkg/helper/webrequest.go similarity index 100% rename from helper/webrequest.go rename to pkg/helper/webrequest.go diff --git a/assets.go b/pkg/mark2web/assets.go similarity index 96% rename from assets.go rename to pkg/mark2web/assets.go index 9ae4235..bf965f5 100644 --- a/assets.go +++ b/pkg/mark2web/assets.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/helper" cpy "github.com/otiai10/copy" ) diff --git a/config_global.go b/pkg/mark2web/config_global.go similarity index 100% rename from config_global.go rename to pkg/mark2web/config_global.go diff --git a/config_path.go b/pkg/mark2web/config_path.go similarity index 94% rename from config_path.go rename to pkg/mark2web/config_path.go index 37a2527..e8af503 100644 --- a/config_path.go +++ b/pkg/mark2web/config_path.go @@ -1,5 +1,7 @@ package mark2web +import "gitbase.de/apairon/mark2web/pkg/helper" + // CollectionConfig describes a collection type CollectionConfig struct { Name *string `yaml:"Name"` @@ -21,7 +23,7 @@ type ThisPathConfig struct { Navname *string `yaml:"Navname"` GoTo *string `yaml:"GoTo"` Collections []*CollectionConfig `yaml:"Collections"` - Data MapString `yaml:"Data"` + Data helper.MapString `yaml:"Data"` } // IndexConfig describes index input and output file @@ -81,5 +83,5 @@ type PathConfig struct { Markdown *MarkdownConfig `yaml:"Markdown"` Imaging *ImagingConfig `yaml:"Imaging"` - Data MapString `yaml:"Data"` + Data helper.MapString `yaml:"Data"` } diff --git a/content.go b/pkg/mark2web/content.go similarity index 99% rename from content.go rename to pkg/mark2web/content.go index a640381..a3ff095 100644 --- a/content.go +++ b/pkg/mark2web/content.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/helper" "github.com/davecgh/go-spew/spew" "github.com/flosch/pongo2" cpy "github.com/otiai10/copy" diff --git a/context.go b/pkg/mark2web/context.go similarity index 98% rename from context.go rename to pkg/mark2web/context.go index c309824..f61589a 100644 --- a/context.go +++ b/pkg/mark2web/context.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/helper" "github.com/davecgh/go-spew/spew" "github.com/extemporalgenome/slug" "github.com/flosch/pongo2" @@ -44,7 +44,7 @@ func (node *TreeNode) handleCollections() { } if node.ColMap == nil { - node.ColMap = make(MapString) + node.ColMap = make(helper.MapString) } ctx := NewContext() ctx["This"] = node.Config.This @@ -239,7 +239,7 @@ func Add2Nav(currentNode *TreeNode, pathConfig *PathConfig, tplFilename, outDir } if dataMapKey != "" { if newNode.Config.Data == nil { - newNode.Config.Data = make(MapString) + newNode.Config.Data = make(helper.MapString) } // as submap in Data newNode.Config.Data[dataMapKey] = ctx diff --git a/context_fn.go b/pkg/mark2web/context_fn.go similarity index 94% rename from context_fn.go rename to pkg/mark2web/context_fn.go index ef6210c..32314a4 100644 --- a/context_fn.go +++ b/pkg/mark2web/context_fn.go @@ -1,7 +1,7 @@ package mark2web import ( - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/helper" "github.com/flosch/pongo2" ) diff --git a/navigation.go b/pkg/mark2web/navigation.go similarity index 97% rename from navigation.go rename to pkg/mark2web/navigation.go index 1e62439..23326a1 100644 --- a/navigation.go +++ b/pkg/mark2web/navigation.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/helper" ) // NavElement is one element with ist attributes and subs @@ -14,7 +14,7 @@ type NavElement struct { GoTo string Active bool - ColMap MapString + ColMap helper.MapString Data interface{} diff --git a/path.go b/pkg/mark2web/path.go similarity index 95% rename from path.go rename to pkg/mark2web/path.go index 9806e6f..5aa3f15 100644 --- a/path.go +++ b/pkg/mark2web/path.go @@ -4,7 +4,7 @@ import ( "path" "strings" - "gitbase.de/apairon/mark2web/helper" + "gitbase.de/apairon/mark2web/pkg/helper" ) // ResolveNavPath fixes nav target relative to current navigation path diff --git a/render.go b/pkg/mark2web/render.go similarity index 100% rename from render.go rename to pkg/mark2web/render.go diff --git a/tree.go b/pkg/mark2web/tree.go similarity index 82% rename from tree.go rename to pkg/mark2web/tree.go index 77c24cd..615d63c 100644 --- a/tree.go +++ b/pkg/mark2web/tree.go @@ -1,12 +1,14 @@ package mark2web +import "gitbase.de/apairon/mark2web/pkg/helper" + // TreeNode is complete config tree of content dir type TreeNode struct { InputPath string OutputPath string Hidden bool // for collections which are not part of the navigation - ColMap MapString + ColMap helper.MapString InputFiles []string OtherFiles []string diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 0000000..ced1678 --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +curdir=$(dirname $0) +distdir="$curdir/../dist" + +mkdir -p "$distdir" +go build -v -ldflags "-X main.Version=`git describe --tags --long` -X main.GitHash=`git rev-parse HEAD` -X main.BuildTime=`date -u '+%Y-%m-%d_%I:%M:%S%p'`" -o "$distdir/mark2web-`cat $curdir/../build/VERSION`-${GOOS}-${GOARCH}${FILEEXT}" "$curdir/../cmd/mark2web/main.go" diff --git a/test.rest b/test/test.rest similarity index 100% rename from test.rest rename to test/test.rest diff --git a/testfile b/testfile deleted file mode 100644 index e69de29..0000000 diff --git a/_website/config.yml b/website/config.yml similarity index 100% rename from _website/config.yml rename to website/config.yml diff --git a/_website/content/config.yml b/website/content/config.yml similarity index 100% rename from _website/content/config.yml rename to website/content/config.yml diff --git a/_website/content/de/01_Navigation/01_mark2web/README.md b/website/content/de/01_Navigation/01_mark2web/README.md similarity index 100% rename from _website/content/de/01_Navigation/01_mark2web/README.md rename to website/content/de/01_Navigation/01_mark2web/README.md diff --git a/_website/content/de/01_Navigation/02_Installation/README.md b/website/content/de/01_Navigation/02_Installation/README.md similarity index 100% rename from _website/content/de/01_Navigation/02_Installation/README.md rename to website/content/de/01_Navigation/02_Installation/README.md diff --git a/_website/content/de/01_Navigation/02_Installation/bild.jpg b/website/content/de/01_Navigation/02_Installation/bild.jpg similarity index 100% rename from _website/content/de/01_Navigation/02_Installation/bild.jpg rename to website/content/de/01_Navigation/02_Installation/bild.jpg diff --git a/_website/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/README.md b/website/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/README.md similarity index 100% rename from _website/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/README.md rename to website/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/README.md diff --git a/_website/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/config.yml b/website/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/config.yml similarity index 100% rename from _website/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/config.yml rename to website/content/de/01_Navigation/03_Benutzung/01_Ordnerstruktur/config.yml diff --git a/_website/content/de/01_Navigation/03_Benutzung/02_Konfiguration/README.md b/website/content/de/01_Navigation/03_Benutzung/02_Konfiguration/README.md similarity index 100% rename from _website/content/de/01_Navigation/03_Benutzung/02_Konfiguration/README.md rename to website/content/de/01_Navigation/03_Benutzung/02_Konfiguration/README.md diff --git a/_website/content/de/01_Navigation/03_Benutzung/02_Konfiguration/config.yml b/website/content/de/01_Navigation/03_Benutzung/02_Konfiguration/config.yml similarity index 100% rename from _website/content/de/01_Navigation/03_Benutzung/02_Konfiguration/config.yml rename to website/content/de/01_Navigation/03_Benutzung/02_Konfiguration/config.yml diff --git a/_website/content/de/01_Navigation/03_Benutzung/03_Inhalte/README.md b/website/content/de/01_Navigation/03_Benutzung/03_Inhalte/README.md similarity index 100% rename from _website/content/de/01_Navigation/03_Benutzung/03_Inhalte/README.md rename to website/content/de/01_Navigation/03_Benutzung/03_Inhalte/README.md diff --git a/_website/content/de/01_Navigation/03_Benutzung/03_Inhalte/config.yml b/website/content/de/01_Navigation/03_Benutzung/03_Inhalte/config.yml similarity index 100% rename from _website/content/de/01_Navigation/03_Benutzung/03_Inhalte/config.yml rename to website/content/de/01_Navigation/03_Benutzung/03_Inhalte/config.yml diff --git a/_website/content/de/01_Navigation/03_Benutzung/04_Templates/README.md b/website/content/de/01_Navigation/03_Benutzung/04_Templates/README.md similarity index 100% rename from _website/content/de/01_Navigation/03_Benutzung/04_Templates/README.md rename to website/content/de/01_Navigation/03_Benutzung/04_Templates/README.md diff --git a/_website/content/de/01_Navigation/03_Benutzung/04_Templates/config.yml b/website/content/de/01_Navigation/03_Benutzung/04_Templates/config.yml similarity index 100% rename from _website/content/de/01_Navigation/03_Benutzung/04_Templates/config.yml rename to website/content/de/01_Navigation/03_Benutzung/04_Templates/config.yml diff --git a/_website/content/de/01_Navigation/03_Benutzung/config.yml b/website/content/de/01_Navigation/03_Benutzung/config.yml similarity index 100% rename from _website/content/de/01_Navigation/03_Benutzung/config.yml rename to website/content/de/01_Navigation/03_Benutzung/config.yml diff --git a/_website/content/de/01_Navigation/04_Blog/README.md b/website/content/de/01_Navigation/04_Blog/README.md similarity index 100% rename from _website/content/de/01_Navigation/04_Blog/README.md rename to website/content/de/01_Navigation/04_Blog/README.md diff --git a/_website/content/de/01_Navigation/04_Blog/config.yml b/website/content/de/01_Navigation/04_Blog/config.yml similarity index 100% rename from _website/content/de/01_Navigation/04_Blog/config.yml rename to website/content/de/01_Navigation/04_Blog/config.yml diff --git a/_website/content/de/02_Rechtliches/01_Impressum/README.md b/website/content/de/02_Rechtliches/01_Impressum/README.md similarity index 100% rename from _website/content/de/02_Rechtliches/01_Impressum/README.md rename to website/content/de/02_Rechtliches/01_Impressum/README.md diff --git a/_website/content/de/02_Rechtliches/02_Datenschutzerklärung/README.md b/website/content/de/02_Rechtliches/02_Datenschutzerklärung/README.md similarity index 100% rename from _website/content/de/02_Rechtliches/02_Datenschutzerklärung/README.md rename to website/content/de/02_Rechtliches/02_Datenschutzerklärung/README.md diff --git a/_website/img/blog.jpg b/website/img/blog.jpg similarity index 100% rename from _website/img/blog.jpg rename to website/img/blog.jpg diff --git a/_website/img/coffee.jpg b/website/img/coffee.jpg similarity index 100% rename from _website/img/coffee.jpg rename to website/img/coffee.jpg diff --git a/_website/img/design.jpg b/website/img/design.jpg similarity index 100% rename from _website/img/design.jpg rename to website/img/design.jpg diff --git a/_website/img/desk.jpg b/website/img/desk.jpg similarity index 100% rename from _website/img/desk.jpg rename to website/img/desk.jpg diff --git a/_website/img/folder.jpg b/website/img/folder.jpg similarity index 100% rename from _website/img/folder.jpg rename to website/img/folder.jpg diff --git a/_website/img/gears.jpg b/website/img/gears.jpg similarity index 100% rename from _website/img/gears.jpg rename to website/img/gears.jpg diff --git a/_website/img/html.jpg b/website/img/html.jpg similarity index 100% rename from _website/img/html.jpg rename to website/img/html.jpg diff --git a/_website/img/keyboard.jpg b/website/img/keyboard.jpg similarity index 100% rename from _website/img/keyboard.jpg rename to website/img/keyboard.jpg diff --git a/_website/img/laptop.jpg b/website/img/laptop.jpg similarity index 100% rename from _website/img/laptop.jpg rename to website/img/laptop.jpg diff --git a/_website/img/laptop2.jpg b/website/img/laptop2.jpg similarity index 100% rename from _website/img/laptop2.jpg rename to website/img/laptop2.jpg diff --git a/_website/img/wire.jpg b/website/img/wire.jpg similarity index 100% rename from _website/img/wire.jpg rename to website/img/wire.jpg diff --git a/_website/img/write.jpg b/website/img/write.jpg similarity index 100% rename from _website/img/write.jpg rename to website/img/write.jpg diff --git a/_website/project-files/css/grid.css b/website/project-files/css/grid.css similarity index 100% rename from _website/project-files/css/grid.css rename to website/project-files/css/grid.css diff --git a/_website/project-files/css/main.css b/website/project-files/css/main.css similarity index 100% rename from _website/project-files/css/main.css rename to website/project-files/css/main.css diff --git a/_website/project-files/css/menu.css b/website/project-files/css/menu.css similarity index 100% rename from _website/project-files/css/menu.css rename to website/project-files/css/menu.css diff --git a/_website/project-files/css/preloader.css b/website/project-files/css/preloader.css similarity index 100% rename from _website/project-files/css/preloader.css rename to website/project-files/css/preloader.css diff --git a/_website/project-files/css/slider.css b/website/project-files/css/slider.css similarity index 100% rename from _website/project-files/css/slider.css rename to website/project-files/css/slider.css diff --git a/_website/project-files/fonts/font-awesome/FontAwesome.otf b/website/project-files/fonts/font-awesome/FontAwesome.otf similarity index 100% rename from _website/project-files/fonts/font-awesome/FontAwesome.otf rename to website/project-files/fonts/font-awesome/FontAwesome.otf diff --git a/_website/project-files/fonts/font-awesome/font-awesome.css b/website/project-files/fonts/font-awesome/font-awesome.css similarity index 100% rename from _website/project-files/fonts/font-awesome/font-awesome.css rename to website/project-files/fonts/font-awesome/font-awesome.css diff --git a/_website/project-files/fonts/font-awesome/fontawesome-webfont.eot b/website/project-files/fonts/font-awesome/fontawesome-webfont.eot similarity index 100% rename from _website/project-files/fonts/font-awesome/fontawesome-webfont.eot rename to website/project-files/fonts/font-awesome/fontawesome-webfont.eot diff --git a/_website/project-files/fonts/font-awesome/fontawesome-webfont.svg b/website/project-files/fonts/font-awesome/fontawesome-webfont.svg similarity index 100% rename from _website/project-files/fonts/font-awesome/fontawesome-webfont.svg rename to website/project-files/fonts/font-awesome/fontawesome-webfont.svg diff --git a/_website/project-files/fonts/font-awesome/fontawesome-webfont.ttf b/website/project-files/fonts/font-awesome/fontawesome-webfont.ttf similarity index 100% rename from _website/project-files/fonts/font-awesome/fontawesome-webfont.ttf rename to website/project-files/fonts/font-awesome/fontawesome-webfont.ttf diff --git a/_website/project-files/fonts/font-awesome/fontawesome-webfont.woff b/website/project-files/fonts/font-awesome/fontawesome-webfont.woff similarity index 100% rename from _website/project-files/fonts/font-awesome/fontawesome-webfont.woff rename to website/project-files/fonts/font-awesome/fontawesome-webfont.woff diff --git a/_website/project-files/fonts/font-awesome/fontawesome-webfont.woff2 b/website/project-files/fonts/font-awesome/fontawesome-webfont.woff2 similarity index 100% rename from _website/project-files/fonts/font-awesome/fontawesome-webfont.woff2 rename to website/project-files/fonts/font-awesome/fontawesome-webfont.woff2 diff --git a/_website/project-files/img/favicon.ico b/website/project-files/img/favicon.ico similarity index 100% rename from _website/project-files/img/favicon.ico rename to website/project-files/img/favicon.ico diff --git a/_website/project-files/img/logo.png b/website/project-files/img/logo.png similarity index 100% rename from _website/project-files/img/logo.png rename to website/project-files/img/logo.png diff --git a/_website/project-files/img/logo_small.png b/website/project-files/img/logo_small.png similarity index 100% rename from _website/project-files/img/logo_small.png rename to website/project-files/img/logo_small.png diff --git a/_website/project-files/img/logo_text.png b/website/project-files/img/logo_text.png similarity index 100% rename from _website/project-files/img/logo_text.png rename to website/project-files/img/logo_text.png diff --git a/_website/project-files/js/functions.js b/website/project-files/js/functions.js similarity index 100% rename from _website/project-files/js/functions.js rename to website/project-files/js/functions.js diff --git a/_website/project-files/js/preloader.js b/website/project-files/js/preloader.js similarity index 100% rename from _website/project-files/js/preloader.js rename to website/project-files/js/preloader.js diff --git a/_website/project-files/js/slick/ajax-loader.gif b/website/project-files/js/slick/ajax-loader.gif similarity index 100% rename from _website/project-files/js/slick/ajax-loader.gif rename to website/project-files/js/slick/ajax-loader.gif diff --git a/_website/project-files/js/slick/fonts/slick.eot b/website/project-files/js/slick/fonts/slick.eot similarity index 100% rename from _website/project-files/js/slick/fonts/slick.eot rename to website/project-files/js/slick/fonts/slick.eot diff --git a/_website/project-files/js/slick/fonts/slick.svg b/website/project-files/js/slick/fonts/slick.svg similarity index 100% rename from _website/project-files/js/slick/fonts/slick.svg rename to website/project-files/js/slick/fonts/slick.svg diff --git a/_website/project-files/js/slick/fonts/slick.ttf b/website/project-files/js/slick/fonts/slick.ttf similarity index 100% rename from _website/project-files/js/slick/fonts/slick.ttf rename to website/project-files/js/slick/fonts/slick.ttf diff --git a/_website/project-files/js/slick/fonts/slick.woff b/website/project-files/js/slick/fonts/slick.woff similarity index 100% rename from _website/project-files/js/slick/fonts/slick.woff rename to website/project-files/js/slick/fonts/slick.woff diff --git a/_website/project-files/js/slick/slick-custom.js b/website/project-files/js/slick/slick-custom.js similarity index 100% rename from _website/project-files/js/slick/slick-custom.js rename to website/project-files/js/slick/slick-custom.js diff --git a/_website/project-files/js/slick/slick-theme.css b/website/project-files/js/slick/slick-theme.css similarity index 100% rename from _website/project-files/js/slick/slick-theme.css rename to website/project-files/js/slick/slick-theme.css diff --git a/_website/project-files/js/slick/slick.css b/website/project-files/js/slick/slick.css similarity index 100% rename from _website/project-files/js/slick/slick.css rename to website/project-files/js/slick/slick.css diff --git a/_website/project-files/js/slick/slick.min.js b/website/project-files/js/slick/slick.min.js similarity index 100% rename from _website/project-files/js/slick/slick.min.js rename to website/project-files/js/slick/slick.min.js diff --git a/_website/templates/base.html b/website/templates/base.html similarity index 100% rename from _website/templates/base.html rename to website/templates/base.html diff --git a/_website/templates/base_blog.html b/website/templates/base_blog.html similarity index 100% rename from _website/templates/base_blog.html rename to website/templates/base_blog.html diff --git a/_website/templates/base_blog_details.html b/website/templates/base_blog_details.html similarity index 100% rename from _website/templates/base_blog_details.html rename to website/templates/base_blog_details.html diff --git a/_website/templates/filters/datum.js b/website/templates/filters/datum.js similarity index 100% rename from _website/templates/filters/datum.js rename to website/templates/filters/datum.js diff --git a/_website/templates/filters/lib/strings.js b/website/templates/filters/lib/strings.js similarity index 100% rename from _website/templates/filters/lib/strings.js rename to website/templates/filters/lib/strings.js diff --git a/_website/templates/partials/matomo.html b/website/templates/partials/matomo.html similarity index 100% rename from _website/templates/partials/matomo.html rename to website/templates/partials/matomo.html