.woodpecker.yml

@@ -1,47 +1,34 @@
-steps:
+pipeline:
-  build-stable:
+  build:
-    image: code.cozy.town/vrifox/hugoci:latest
+    image: archlinux
     commands:
+      - pacman -Syu --noconfirm hugo git
       - hugo --destination /woodpecker/build/ --minify --cleanDestinationDir
-    when:
-      branch: main
 
   upload-stable:
-    image: code.cozy.town/vrifox/hugoci:latest
+    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:
+    secrets: [ ssh_key, ssh_port, ssh_host ]
-      - ssh_key
-      - ssh_port
-      - ssh_host
     when:
-      branch: main
+      branch: [ main ]
-
-  build-dev:
-    image: code.cozy.town/vrifox/hugoci:latest
-    commands:
-      - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/" --cleanDestinationDir
-    when:
-      branch:
-        exclude: main
 
   upload-dev:
-    image: code.cozy.town/vrifox/hugoci:latest
+    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
+      - 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}/"
+      - echo "The preview is now available on https://dev.vrifox.cc/CI_COMMIT_BRANCH/$CI_COMMIT_SHA/"
-    secrets:
+    secrets: [ ssh_key, ssh_port, ssh_host ]
-      - ssh_key
-      - ssh_port
-      - ssh_host
     when:
       branch: 
-        exclude: main
+        exclude: [ main ]

assets/icons/blog.svg

@@ -1 +1 @@
-<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg" stroke="inherit" fill="inherit"><g transform="rotate(45, 210, 230)"><path d="M 250 375 C 194.772 375 150 319.036 150 250 L 150 100 C 150 44.772 194.772 0 250 0 C 305.228 0 350 44.772 350 100 L 350 250 C 350 319.036 305.228 375 250 375 Z"/><path style="stroke-linecap: round;" d="M 250.001 150 L 250 500.03" transform="matrix(1, -0.000003, 0.000003, 1, -0.000975, 0.00075)"/><path style="stroke-linecap: round;" d="M 249.992 180.713 L 249.991 320.712" transform="matrix(0.707105, -0.707109, 0.707109, 0.707105, -153.556825, 270.705963)"/><path style="stroke-linecap: round;" d="M 249.99 110.004 L 249.989 250.003" transform="matrix(0.707105, -0.707109, 0.707109, 0.707105, -103.558456, 249.994221)"/></g></svg>
+<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg" xmlns:bx="https://boxy-svg.com" stroke="inherit" fill="inherit"><g transform="rotate(45, 210, 230)"><path d="M 250 375 C 194.772 375 150 319.036 150 250 L 150 100 C 150 44.772 194.772 0 250 0 C 305.228 0 350 44.772 350 100 L 350 250 C 350 319.036 305.228 375 250 375 Z"/><path style="stroke-linecap: round;" d="M 250.001 150 L 250 500.03" transform="matrix(1, -0.000003, 0.000003, 1, -0.000975, 0.00075)"/><path style="stroke-linecap: round;" d="M 249.992 180.713 L 249.991 320.712" transform="matrix(0.707105, -0.707109, 0.707109, 0.707105, -153.556825, 270.705963)" bx:origin="0.286467 0.999998"/><path style="stroke-linecap: round;" d="M 249.99 110.004 L 249.989 250.003" transform="matrix(0.707105, -0.707109, 0.707109, 0.707105, -103.558456, 249.994221)" bx:origin="0.286467 0.999998"/></g></svg>

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);
+        url("/fonts/playfair/PlayfairDisplay-Regular.woff2") format(woff2);
-    font-display: swap;
 }
 
 @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;
 }

assets/scss/partials/sidebar.scss

@@ -81,7 +81,7 @@
 		}
 	}
 
-	#avatar-wrapper {
+	header {
 		text-align: center;
 		user-select: none;
 		padding: inherit;
@@ -230,6 +230,7 @@
 			}
 		}
 	}
+	aside {
 		#social-links {
 			text-align: center;
 
@@ -311,3 +312,4 @@
 			}
 		}
 	}
+}

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

config/_default/menu.yaml

@@ -19,12 +19,8 @@ main:
 #    name: "Empfehlungen"
 #    pageref: "/blogroll/"
 #    weight: 5
-footer:
+footer_source:
-  - identifier: "gpg"
-    name: "GPG"
-    url: "/gpg/"
-    weight: 1
   - identifier: "sourcecode"
     name: "Quellcode"
     url: "https://code.cozy.town/vri/website"
-    weight: 2
+    weight: 1

content/_index.de.md

@@ -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."
----

content/_index.en.md

@@ -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."
----

content/_index.md

@@ -0,0 +1,6 @@
+---
+title: "Hola 🖖"
+---
+I create Websites and Graphics
+
+Additinaly I host and maintain [Cozy Town](https://cozy.town)

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 <a href="https://cozy.town">Cozy Town</a>
+    other: Zudem betreibe und betreue ich <a href="https://cozy.town">Cozy Town</a>
 
 # Blog
 blog-heading:

layouts/_default/baseof.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="{{ .Page.Lang }}">
   <head>
     <title>{{ with .Title }} {{ . }} – {{ end }}{{ .Site.Title }}</title>
@@ -7,15 +7,8 @@
     <link href="https://social.anoxinon.de/@vri" rel="me" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content='
-      {{- if (isset .Params "description") -}}
-        {{- index .Params "description" }} – {{ .Site.Title -}}
-      {{- else if (isset .Params "title") -}}
-        {{- index .Params "title" }} – {{ .Site.Title -}}
-      {{- end -}}
-      '>
   </head>
-  <body id="{{ with .File }}{{ .ContentBaseName }}{{ end }}" class="{{ .Page.Section }}">
+  <body id="{{ .File.ContentBaseName }}" class="{{ .Page.Section }}">
     {{- block "header" . }}{{ end }}
     {{ partial "sidebar.html" . }}
     {{- block "main" . }}{{ end }}

layouts/_default/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

layouts/blog/single.html

@@ -7,12 +7,16 @@
     <header id="blog-header">
         <h1 class="title">{{ .Title }}</h1>
         <p>
-        <span id="blog-post-published" title="{{ i18n " blog-post-published" }} {{ .Date |
+            <span
-            time.Format "2. January 2006, 15:04 MST" }}">
+                id="blog-post-published"
+                title="{{ i18n "blog-post-published" }} {{ .Date | time.Format "2. January 2006, 15:04 MST" }}"
+            >
                 {{ .Date | time.Format "2. January 2006" }}
             </span>
-        <span id="blog-post-updated" title="{{ i18n " blog-post-updated" }} {{ .Lastmod |
+            <span
-            time.Format "2. January 2006, 15:04 MST" }}">
+                id="blog-post-updated"
+                title="{{ i18n "blog-post-updated" }} {{ .Lastmod | time.Format "2. January 2006, 15:04 MST" }}"
+            >
                 {{ i18n "blog-post-updated" }} {{ .Lastmod | time.Format "2. January 2006" }}
             </span>
         </p>
@@ -21,9 +25,7 @@
 
 {{- define "main" }}
     <main>
-    <article>
         {{ .Content -}}
         {{ partial "moreposts.html" . }}
-    </article>
     </main>
 {{- end }} 

layouts/index.html

@@ -13,14 +13,14 @@
 
 {{- define "main" }}
     <main id="main">
-        <div id="general-description">
+        <section id="general-description">
             <p id="websites-and-graphics">
                 {{ i18n "home-websites-and-graphics" | safeHTML }}
             </p>
             <p id="cozy-town">
                 {{ i18n "home-cozy-town" | safeHTML }}
             </p>
-        </div>
+        </section>
         {{ partial "moreposts.html" . }}
     </main>
 {{- end }}

layouts/partials/footer.html

@@ -1,12 +1,12 @@
 
      <footer>
         <p>
-            {{- range .Site.Menus.footer -}}
+            <span title='{{ i18n "build-title-tag" }}{{ now | time.Format ":date_full" }}, {{ now | time.Format ":time_full" }}'>{{ i18n "build" }}{{ now | time.Format ":date_short" }}</span>
-            <span><a href="{{ relLangURL .URL }}">{{ i18n .Identifier | default .Name }}</a></span>
+            {{- range .Site.Menus.footer_source -}}
+            <span><a href="{{ .URL }}">{{ i18n .Identifier | default .Name }}</a></span>
             {{- end }}
         </p>
         <p>
-            <span title='{{ i18n "build-title-tag" }}{{ now | time.Format ":date_full" }}, {{ now | time.Format ":time_full" }}'>{{ i18n "build" }}{{ now | time.Format ":date_short" }}</span>
             <span>{{ i18n "made-with" }}<a href='{{ .Site.Params.staticSiteGeneratorLink }}'>{{ .Site.Params.staticSiteGenerator }}</a></span>
         </p>
     </footer>

layouts/partials/sidebar.html

@@ -1,14 +1,14 @@
 {{ $currentPage := . }}
 
-<header id="sidebar">
+<nav id="sidebar">
-    <div id="avatar-wrapper">
+    <header>
         {{ with .Site.Params.avatar }}
             {{ $avatar := resources.Get . }}
-            {{ $avatar := $avatar.Resize "96x webp" }}
+            {{ $avatar := $avatar.Resize "64x webp" }}
             <img id="avatar" alt="{{ $.Site.Params.displayName }}" src="{{ $avatar.RelPermalink }}" />
         {{ end }}
-    </div>
+    </header>
-    <nav id="sidebar-menu" aria-label="primary-navigation">
+    <section id="sidebar-menu">
         <ul>
             {{- range .Site.Menus.main }}
                 {{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }}
@@ -18,12 +18,12 @@
                 {{ end }}
             {{- end }}
         </ul>
-    </nav>
+    </section>
-    <div>
+    <aside>
-        <nav id="social-links" aria-label="social-links">
+        <section id="social-links">
             <a class="hint-text" rel="me" href="https://social.anoxinon.de/@vri" aria-label="Mastodon">{{ partial "helpers/icons" "mastodon" }}</a>
-        </nav>
+        </section>
-        <div id="languages">
+        <section id="languages">
         {{- if .Site.IsMultiLingual }}
             {{ $siteLanguages := .Site.Languages }}
             {{ $pageLanguage := .Page.Lang }}
@@ -39,6 +39,6 @@
                 {{ end }}
             {{ end }}
         {{- end }}
-        </div>
+        </section>
-    </div>
+    </aside>
-</header>
+</nav>

layouts/robots.txt

@@ -0,0 +1,5 @@
+User-agent: *
+
+{{range .Pages}}
+Disallow: {{.RelPermalink}}
+{{end}}

static/google3423f546928945a1.html

@@ -1 +0,0 @@
-google-site-verification: google3423f546928945a1.html