From 4fe76e19b7364a7fb3f140db99c8d1db3423e7f4 Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Wed, 5 Apr 2023 23:23:32 +0200
Subject: [PATCH 1/6] add aria-label to menu entries

---
 layouts/partials/sidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 6a1084f..73de7c4 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -12,9 +12,9 @@
         <ul>
             {{- range .Site.Menus.main }}
                 {{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }}
-                    <li class="active"><a class="hint-text" href="{{ .URL }}" data-title="{{ i18n .Identifier | default .Name }}">{{ partial "helpers/icons" .Identifier }}</a></li>
+                    <li class="active"><a class="hint-text" href="{{ .URL }}" data-title="{{ i18n .Identifier | default .Name }}" aria-label="{{ i18n .Identifier | default .Name }}">{{ partial "helpers/icons" .Identifier }}</a></li>
                 {{ else }}
-                    <li><a class="hint-text" href="{{ .URL }}" data-title="{{ i18n .Identifier | default .Name }}">{{ partial "helpers/icons" .Identifier }}</a></li>
+                    <li><a class="hint-text" href="{{ .URL }}" data-title="{{ i18n .Identifier | default .Name }}" aria-label="{{ i18n .Identifier | default .Name }}">{{ partial "helpers/icons" .Identifier }}</a></li>
                 {{ end }}
             {{- end }}
         </ul>
-- 
2.46.0


From 5981933e13019f0304f0d17885bc38c71cdcdcf6 Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Wed, 5 Apr 2023 23:27:17 +0200
Subject: [PATCH 2/6] fix env vars

---
 .woodpecker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2877d9d..758f8cb 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -26,8 +26,8 @@ pipeline:
       - 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/"
+      - 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: 
-- 
2.46.0


From 06bc9d14c94636acac5e323e6032ca016d08c4cd Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Wed, 5 Apr 2023 23:34:47 +0200
Subject: [PATCH 3/6] [CD] specific dev build step

---
 .woodpecker.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 758f8cb..060845e 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,9 +1,20 @@
 pipeline:
-  build:
+  build-stable:
     image: archlinux
     commands:
       - pacman -Syu --noconfirm hugo git
       - hugo --destination /woodpecker/build/ --minify --cleanDestinationDir
+    when:
+      branch: [ main ]
+
+  build-dev:
+    image: archlinux
+    commands:
+      - pacman -Syu --noconfirm hugo git
+      - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/" --cleanDestinationDir
+    when:
+      branch: 
+        exclude: [ main ]
 
   upload-stable:
     image: archlinux
-- 
2.46.0


From 95245e60116ca942c4059448b3a1702f19b42191 Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Wed, 5 Apr 2023 23:44:37 +0200
Subject: [PATCH 4/6] fix baseurl

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 060845e..b80af5e 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,7 +11,7 @@ pipeline:
     image: archlinux
     commands:
       - pacman -Syu --noconfirm hugo git
-      - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/" --cleanDestinationDir
+      - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/" --cleanDestinationDir
     when:
       branch: 
         exclude: [ main ]
-- 
2.46.0


From 0b325669904a76daf9d3291b3c747acd15ffbbd8 Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Wed, 5 Apr 2023 23:49:56 +0200
Subject: [PATCH 5/6] load fonts relative

---
 assets/scss/fonts/playfair.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/scss/fonts/playfair.scss b/assets/scss/fonts/playfair.scss
index 12f2d93..e2ae1c8 100644
--- a/assets/scss/fonts/playfair.scss
+++ b/assets/scss/fonts/playfair.scss
@@ -1,12 +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-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;
 }
\ No newline at end of file
-- 
2.46.0


From bdc44321ac3fb8a44b582505343da4d2f357feaf Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Wed, 5 Apr 2023 23:50:52 +0200
Subject: [PATCH 6/6] fix: load fonts relative

---
 assets/scss/fonts/playfair.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/scss/fonts/playfair.scss b/assets/scss/fonts/playfair.scss
index e2ae1c8..0c3db89 100644
--- a/assets/scss/fonts/playfair.scss
+++ b/assets/scss/fonts/playfair.scss
@@ -1,12 +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-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;
 }
\ No newline at end of file
-- 
2.46.0