diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..2877d9d --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,34 @@ +pipeline: + build: + image: archlinux + commands: + - pacman -Syu --noconfirm hugo git + - hugo --destination /woodpecker/build/ --minify --cleanDestinationDir + + upload-stable: + image: archlinux + commands: + - pacman -Syu --noconfirm openssh rsync + - mkdir -p /root/.ssh + - echo "$SSH_KEY" > /root/.ssh/id_ed25519 + - chmod 700 /root/.ssh/id_ed25519 + - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config + - rsync -rv --delete -e "ssh -p $SSH_PORT -i /root/.ssh/id_ed25519" /woodpecker/build/ caddy@$SSH_HOST:/var/lib/caddy/woodpecker/vrifox.cc/ --mkpath --checksum + secrets: [ ssh_key, ssh_port, ssh_host ] + when: + branch: [ main ] + + upload-dev: + image: archlinux + commands: + - pacman -Syu --noconfirm openssh rsync + - mkdir -p /root/.ssh + - echo "$SSH_KEY" > /root/.ssh/id_ed25519 + - chmod 700 /root/.ssh/id_ed25519 + - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config + - rsync -rv --delete -e "ssh -p $SSH_PORT -i /root/.ssh/id_ed25519" /woodpecker/build/ caddy@$SSH_HOST:/var/lib/caddy/woodpecker/vrifox.cc-dev/CI_COMMIT_BRANCH/$CI_COMMIT_SHA/ --mkpath --checksum + - echo "The preview is now available on https://dev.vrifox.cc/CI_COMMIT_BRANCH/$CI_COMMIT_SHA/" + secrets: [ ssh_key, ssh_port, ssh_host ] + when: + branch: + exclude: [ main ] \ No newline at end of file diff --git a/.woodpecker/.hugo-build.yml b/.woodpecker/.hugo-build.yml deleted file mode 100644 index 18c11a3..0000000 --- a/.woodpecker/.hugo-build.yml +++ /dev/null @@ -1,53 +0,0 @@ -steps: - build-stable: - image: code.cozy.town/vrifox/hugoci:latest - commands: - - hugo --destination /woodpecker/build/ --minify --cleanDestinationDir - volumes: - - /srv/woodpecker-cache/vrifox.cc:/woodpecker/src/code.cozy.town/vrifox/website/resources/_gen - when: - - branch: main - event: [push, pull_request_closed, manual] - - build-dev: - image: code.cozy.town/vrifox/hugoci:latest - commands: - - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/" --cleanDestinationDir - volumes: - - /srv/woodpecker-cache/vrifox.cc:/woodpecker/src/code.cozy.town/vrifox.cc/website/resources/_gen - when: - - branch: - exclude: main - event: [push, pull_request, manual] - - upload-stable: - image: code.cozy.town/vrifox/hugoci:latest - commands: - - mkdir -p /root/.ssh - - echo "$${DEPLOY_BOT_SSH_KEY}" > /root/.ssh/id_ed25519 - - chmod 400 /root/.ssh/id_ed25519 - - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config - - rsync -rv --delete -e "ssh -p 42824 -i /root/.ssh/id_ed25519" /woodpecker/build/ deploy-bot@cozytown-main.cozy.town:/srv/http/vrifox.cc/ --mkpath --checksum - environment: - DEPLOY_BOT_SSH_KEY: - from_secret: deploy_bot_ssh_key - when: - - branch: main - event: [push, pull_request_closed, manual] - - upload-dev: - image: code.cozy.town/vrifox/hugoci:latest - commands: - - mkdir -p /root/.ssh - - echo "$${DEPLOY_BOT_SSH_KEY}" > /root/.ssh/id_ed25519 - - chmod 400 /root/.ssh/id_ed25519 - - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config - - rsync -rv --delete -e "ssh -p 42824 -i /root/.ssh/id_ed25519" /woodpecker/build/ deploy-bot@cozytown-main.cozy.town:/srv/http/vrifox.cc-dev/ --mkpath --checksum - - echo "The preview is now available on https://dev.vrifox.cc/" - environment: - DEPLOY_BOT_SSH_KEY: - from_secret: deploy_bot_ssh_key - when: - - branch: - exclude: main - event: [push, pull_request, manual] diff --git a/assets/icons/blog.svg b/assets/icons/blog.svg index cff106d..fd47943 100644 --- a/assets/icons/blog.svg +++ b/assets/icons/blog.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/scss/fonts/playfair.scss b/assets/scss/fonts/playfair.scss index 87605d2..12f2d93 100644 --- a/assets/scss/fonts/playfair.scss +++ b/assets/scss/fonts/playfair.scss @@ -1,14 +1,12 @@ @font-face { font-family: "playfair"; src: local("Playfair"), - url("../fonts/playfair/PlayfairDisplay-Regular.woff2") format(woff2); - font-display: swap; + url("/fonts/playfair/PlayfairDisplay-Regular.woff2") format(woff2); } @font-face { font-family: "playfair"; src: local("Playfair"), - url("../fonts/playfair/PlayfairDisplay-Bold.woff2") format(woff2); + url("/fonts/playfair/PlayfairDisplay-Bold.woff2") format(woff2); font-weight: bold; - font-display: swap; } \ No newline at end of file diff --git a/assets/scss/partials/sidebar.scss b/assets/scss/partials/sidebar.scss index bf161e3..e94e8c8 100644 --- a/assets/scss/partials/sidebar.scss +++ b/assets/scss/partials/sidebar.scss @@ -81,7 +81,7 @@ } } - #avatar-wrapper { + header { text-align: center; user-select: none; padding: inherit; @@ -230,84 +230,86 @@ } } } - #social-links { - text-align: center; + aside { + #social-links { + text-align: center; - @media (max-width: 1140px) { - display: none; - } - - a { - display: flex; - padding: 1rem; - place-content: center; - - &:hover { - .mastodon-icon { - color: hsl(251.5, 58.9%, 51.4%); - } + @media (max-width: 1140px) { + display: none; } - .mastodon-icon { - color: hsl(239.6, 100%, 69.4%); - } - - .icon { - height: 1.25rem; - width: 1.25rem; - display: block; + a { + display: flex; + padding: 1rem; + place-content: center; - @media (prefers-reduced-motion: no-preference) { - transition: color 0.2s ease-in-out; + &:hover { + .mastodon-icon { + color: hsl(251.5, 58.9%, 51.4%); + } + } + + .mastodon-icon { + color: hsl(239.6, 100%, 69.4%); + } + + .icon { + height: 1.25rem; + width: 1.25rem; + display: block; + + @media (prefers-reduced-motion: no-preference) { + transition: color 0.2s ease-in-out; + } } } } - } - #languages { - text-align: center; - border-radius: 0.5rem 0.5rem 1.85rem 0.5rem; - - @media (max-width: 1140px) { - border-radius: 4rem; - position: absolute; - top: 1rem; - left: calc(100vw - 1em - 64px); - font-size: 1.4rem; - border-radius: 100%; - background-color: var(--sidebar-accent-1); - aspect-ratio: 1 / 1; - width: 64px; - display: flex; - align-items: center; - justify-content: center; - overflow: hidden; - } - @media (prefers-reduced-motion: no-preference) { - transition: background-color 0.2s ease-in-out; - } - - &:hover { - background-color: var(--sidebar-accent-1); - + #languages { + text-align: center; + border-radius: 0.5rem 0.5rem 1.85rem 0.5rem; + @media (max-width: 1140px) { + border-radius: 4rem; + position: absolute; + top: 1rem; + left: calc(100vw - 1em - 64px); + font-size: 1.4rem; + border-radius: 100%; + background-color: var(--sidebar-accent-1); + aspect-ratio: 1 / 1; + width: 64px; + display: flex; + align-items: center; + justify-content: center; + overflow: hidden; + } + @media (prefers-reduced-motion: no-preference) { + transition: background-color 0.2s ease-in-out; + } + + &:hover { + background-color: var(--sidebar-accent-1); + + @media (max-width: 1140px) { + background-color: var(--sidebar-accent-2); + } + } + &:active { background-color: var(--sidebar-accent-2); - } - } - &:active { - background-color: var(--sidebar-accent-2); - @media (max-width: 1140px) { - background-color: var(--sidebar-accent-3); + @media (max-width: 1140px) { + background-color: var(--sidebar-accent-3); + } } - } - #language { - display: block; - text-decoration: none; - width: 100%; - height: 100%; - padding: 1rem; - pointer-events: all; + #language { + display: block; + text-decoration: none; + width: 100%; + height: 100%; + padding: 1rem; + pointer-events: all; + } } } } \ No newline at end of file diff --git a/config/_default/config.yaml b/config/_default/config.yaml index 05a5675..a2ebc12 100644 --- a/config/_default/config.yaml +++ b/config/_default/config.yaml @@ -1,7 +1,7 @@ baseURL: "https://vrifox.cc/" title: "Vris Cute Corner" -enableRobotsTXT: false +enableRobotsTXT: true defaultContentLanguage: de defaultContentLanguageInSubdir: true enableGitInfo: true diff --git a/config/_default/menu.yaml b/config/_default/menu.yaml index 1a1fc37..51af38d 100644 --- a/config/_default/menu.yaml +++ b/config/_default/menu.yaml @@ -19,12 +19,8 @@ main: # name: "Empfehlungen" # pageref: "/blogroll/" # weight: 5 -footer: - - identifier: "gpg" - name: "GPG" - url: "/gpg/" - weight: 1 +footer_source: - identifier: "sourcecode" name: "Quellcode" url: "https://code.cozy.town/vri/website" - weight: 2 \ No newline at end of file + weight: 1 \ No newline at end of file diff --git a/content/_index.de.md b/content/_index.de.md deleted file mode 100644 index 06217a2..0000000 --- a/content/_index.de.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: "Hola πŸ––" -description: "Die Website von Vri aka vrifox. Sie erstellt Websites und Grafiken. Außerdem betreibt und betreut sie Cozy Town." ---- \ No newline at end of file diff --git a/content/_index.en.md b/content/_index.en.md deleted file mode 100644 index 0566936..0000000 --- a/content/_index.en.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: "Hola πŸ––" -description: "The website of Vri aka vrifox. She creates websites and graphics. Additionally she hosts and maintains Cozy Town." ---- \ No newline at end of file diff --git a/content/_index.md b/content/_index.md new file mode 100644 index 0000000..e5222e1 --- /dev/null +++ b/content/_index.md @@ -0,0 +1,6 @@ +--- +title: "Hola πŸ––" +--- +I create Websites and Graphics + +Additinaly I host and maintain [Cozy Town](https://cozy.town) \ No newline at end of file diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 1fd6ae2..0000000 --- a/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 5aca172..0000000 --- a/flake.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - - outputs = { - nixpkgs, - self, - }: let - pkgs = nixpkgs; - - mkAllSystems = genAttrs [ - "aarch64-darwin" - "aarch64-linux" - "i686-linux" - "x86_64-darwin" - "x86_64-linux" - ]; - - inherit (lib) genAttrs; - inherit (pkgs) alejandra lib; - in { - formatter = mkAllSystems (system: alejandra); - - devShells = mkAllSystems (system: let - pkgs = nixpkgs.legacyPackages.${system}; - - inherit (pkgs) mkShell; - in { - default = mkShell { - nativeBuildInputs = [pkgs.hugo]; - shellHook = "hugo server"; - }; - }); - }; -} diff --git a/i18n/en.yaml b/i18n/en.yaml index 3f08843..716669c 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -30,9 +30,9 @@ introduction-sub: other: and Computer Science is my passion. home-websites-and-graphics: - other: I create websites and graphics + other: Ich erstelle Websites und Grafiken home-cozy-town: - other: Additionally I host and maintain Cozy Town + other: Zudem betreibe und betreue ich Cozy Town # Blog blog-heading: diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0506706..42a6217 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,4 +1,4 @@ - + {{ with .Title }} {{ . }} – {{ end }}{{ .Site.Title }} @@ -7,15 +7,8 @@ - - + {{- block "header" . }}{{ end }} {{ partial "sidebar.html" . }} {{- block "main" . }}{{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 94125af..7d40504 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,16 +1,16 @@ {{- define "stylesheet" -}} -{{- $style := resources.Get "/scss/default.scss" | css.Sass (dict "outputStyle" "compressed") -}} - + {{- $style := resources.Get "/scss/default.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}} + {{- end -}} {{- define "main" }} -
-

{{ .Title }}

-

{{ .Content }}

- {{- range .Pages }} -

{{ .Title }} {{ .Date | time.Format ":date_long" }}

- {{- end }} -
+
+

{{ .Title }}

+

{{ .Content }}

+ {{- range .Pages }} +

{{ .Title }} {{ .Date | time.Format ":date_long" }}

+ {{- end }} +
-{{- end }} \ No newline at end of file +{{- end }} diff --git a/layouts/_default/robots.txt b/layouts/_default/robots.txt new file mode 100644 index 0000000..77470cb --- /dev/null +++ b/layouts/_default/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 5d330ac..e4c8157 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,31 +1,31 @@ {{- define "stylesheet" -}} -{{- $style := resources.Get "/scss/default.scss" | css.Sass (dict "outputStyle" "compressed") -}} - + {{- $style := resources.Get "/scss/default.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}} + {{- end -}} {{- define "main" }} -
- {{- if eq .Params.type "post" }} -

{{ .Date | time.Format "2. January 2006" }}

- {{- end }} -

{{ .Title }}

- {{ .Content -}} - -
-{{- end }} \ No newline at end of file +
+ {{- if eq .Params.type "post" }} +

{{ .Date | time.Format "2. January 2006" }}

+ {{- end }} +

{{ .Title }}

+ {{ .Content -}} + +
+{{- end }} diff --git a/layouts/blog/list.html b/layouts/blog/list.html index 90c3431..d111df3 100644 --- a/layouts/blog/list.html +++ b/layouts/blog/list.html @@ -1,6 +1,6 @@ {{- define "stylesheet" -}} -{{- $style := resources.Get "/scss/blog.scss" | css.Sass (dict "outputStyle" "compressed") -}} - + {{- $style := resources.Get "/scss/blog.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}} + {{- end -}} {{- define "header" }} @@ -12,19 +12,19 @@ {{- define "main" }} -
-
+
+ +
+ +
- - -{{- end }} \ No newline at end of file +{{- end }} diff --git a/layouts/blog/single.html b/layouts/blog/single.html index 2f2f22b..1da7cc1 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -1,29 +1,31 @@ {{- define "stylesheet" -}} -{{- $style := resources.Get "/scss/blog.scss" | css.Sass (dict "outputStyle" "compressed") -}} - + {{- $style := resources.Get "/scss/blog.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}} + {{- end -}} {{- define "header" }} -
-

{{ .Title }}

-

- - {{ .Date | time.Format "2. January 2006" }} - - - {{ i18n "blog-post-updated" }} {{ .Lastmod | time.Format "2. January 2006" }} - -

-
+
+

{{ .Title }}

+

+ + {{ .Date | time.Format "2. January 2006" }} + + + {{ i18n "blog-post-updated" }} {{ .Lastmod | time.Format "2. January 2006" }} + +

+
{{ end }} {{- define "main" }} -
-
+
{{ .Content -}} {{ partial "moreposts.html" . }} -
-
-{{- end }} \ No newline at end of file + +{{- end }} diff --git a/layouts/errorpages/list.html b/layouts/errorpages/list.html index 126038e..308c258 100644 --- a/layouts/errorpages/list.html +++ b/layouts/errorpages/list.html @@ -1,11 +1,11 @@ {{- define "stylesheet" -}} -{{- $style := resources.Get "/scss/default.scss" | css.Sass (dict "outputStyle" "compressed") -}} - + {{- $style := resources.Get "/scss/default.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}} + {{- end -}} {{- define "main" }} -
-

{{ .Params.heading }}

-

{{ .Params.subheading}}

-
-{{- end }} \ No newline at end of file +
+

{{ .Params.heading }}

+

{{ .Params.subheading}}

+
+{{- end }} diff --git a/layouts/errorpages/single.html b/layouts/errorpages/single.html index 126038e..308c258 100644 --- a/layouts/errorpages/single.html +++ b/layouts/errorpages/single.html @@ -1,11 +1,11 @@ {{- define "stylesheet" -}} -{{- $style := resources.Get "/scss/default.scss" | css.Sass (dict "outputStyle" "compressed") -}} - + {{- $style := resources.Get "/scss/default.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}} + {{- end -}} {{- define "main" }} -
-

{{ .Params.heading }}

-

{{ .Params.subheading}}

-
-{{- end }} \ No newline at end of file +
+

{{ .Params.heading }}

+

{{ .Params.subheading}}

+
+{{- end }} diff --git a/layouts/index.html b/layouts/index.html index 83137e1..356f775 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,6 +1,6 @@ {{- define "stylesheet" -}} -{{- $style := resources.Get "/scss/home.scss" | css.Sass (dict "outputStyle" "compressed") -}} - + {{- $style := resources.Get "/scss/home.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}} + {{- end -}} {{- define "header" }} @@ -12,15 +12,15 @@ {{ end }} {{- define "main" }} -
-
-

- {{ i18n "home-websites-and-graphics" | safeHTML }} -

-

- {{ i18n "home-cozy-town" | safeHTML }} -

-
- {{ partial "moreposts.html" . }} -
-{{- end }} \ No newline at end of file +
+
+

+ {{ i18n "home-websites-and-graphics" | safeHTML }} +

+

+ {{ i18n "home-cozy-town" | safeHTML }} +

+
+ {{ partial "moreposts.html" . }} +
+{{- end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index cb71cbb..61d56e0 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,12 +1,12 @@ diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index b9561f2..9b07a0a 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,14 +1,14 @@ {{ $currentPage := . }} - + + + diff --git a/layouts/robots.txt b/layouts/robots.txt new file mode 100644 index 0000000..d336aa6 --- /dev/null +++ b/layouts/robots.txt @@ -0,0 +1,5 @@ +User-agent: * + +{{range .Pages}} +Disallow: {{.RelPermalink}} +{{end}} diff --git a/static/google3423f546928945a1.html b/static/google3423f546928945a1.html deleted file mode 100644 index ae6d3fd..0000000 --- a/static/google3423f546928945a1.html +++ /dev/null @@ -1 +0,0 @@ -google-site-verification: google3423f546928945a1.html \ No newline at end of file