Skip to content

Commit c253e7e

Browse files
zekroTJAzekroTJA
committed
Merge branch 'main' of github.com:zekroTJA/zekro.de
2 parents e65fcd8 + 6ce39f4 commit c253e7e

8 files changed

Lines changed: 83 additions & 17 deletions

File tree

‎build.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ for prescript in scripts/prebuild/*; do
66
bash "$prescript"
77
done
88

9-
temple build --source src --output dist
9+
if [[ $SKIP_TEMPLE_BUILD != "1" ]]; then
10+
temple build --source src --output dist
11+
fi

‎res/bike-gear.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
- title: Bike Setup
2+
items:
3+
- name: "Bike: Stevens Gavere Eco (2025)"
4+
link: https://www.stevensbikes.de/en/de/gravel/gravel/gavere-eco/
5+
- name: "Head Unit: Wahoo Elemnt Roam V2"
6+
- name: "Pulsgurt: Polar H9"
7+
link: https://www.polar.com/us-en/sensors/h9-heart-rate-sensor/
8+
- name: "Licht: Lichtmeister F100"
9+
link: https://www.amazon.de/-/en/dp/B0D7TNDBD2
10+
- name: "Oberrohrtasche: Cyclite Top Tube Bag / 02"
11+
link: https://cyclite.cc/en/collections/bags/products/top-tube-bag-02
12+
- name: "Rahmentasche: Cyclite Frame Bag / 01"
13+
link: https://cyclite.cc/en/collections/bags/products/frame-bag-01
14+
15+
- title: Accessoires
16+
items:
17+
- name: "Power Bank: Anker 533 (30W)"
18+
link: https://geizhals.de/anker-533-power-bank-powercore-30w-v184746.html
19+
20+
- title: Video Equipment
21+
items:
22+
- name: "Action Cam: DJI Osmo Action 4"
23+
link: https://geizhals.de/dji-osmo-action-4-v137074.html

‎res/uploadplan.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
projects:
22
- id: a
33
name: Evolution
4-
wdays: [mon, wed, fri]
4+
wdays: [mon, wed, fri, sun]
55
at: "16:00"
66
url: https://www.youtube.com/playlist?list=PLdqLfCrzPasoRuwmTbxbQapw3QsysvUYP
77
- id: b
8-
name: Elden Ring
9-
wdays: [tue, thu, sun]
8+
name: Hytale Co-Op
9+
wdays: [tue, thu, sat]
1010
at: "16:00"
11-
url: https://www.youtube.com/playlist?list=PLdqLfCrzPasrZ4XTSJPsvijzEvFbOMw5o
12-
- id: s
13-
name: Special
14-
sub: Random Projekte wie Let's Tests, Commentaries, Info-Videos, Edits, ...
15-
wdays: [sat]
16-
at: "18:00"
11+
url: https://youtube.com/playlist?list=PLdqLfCrzPasqjmTL0AorKS_4t_JIlM5FG&si=4Sxeq5w3oDVEKTrx
12+
# - id: s
13+
# name: Special
14+
# sub: Random Projekte wie Let's Tests, Commentaries, Info-Videos, Edits, ...
15+
# wdays: [sat]
16+
# at: "18:00"

‎scripts/prebuild/bike-gear.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
currdir=$(realpath "$(dirname "$0")")
4+
5+
python3 "$currdir/../genlist.py" \
6+
< "$currdir/../../res/bike-gear.yaml" \
7+
> "$currdir/../../src/templates/bike-gear.html"

‎src/pages/bike-gear.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
+++
2+
navignore = true
3+
+++
4+
5+
{{extends base}}
6+
7+
<h1>gear</h1>
8+
9+
{{ use bike-gear }}

‎src/templates/base.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
@@ -23,7 +23,9 @@
2323
<footer>
2424
<span>© Ringo Hoffmann {{currentdate "%Y"}}-present</span>
2525
<span>|</span>
26-
<span>build {{ exec git rev-parse --short HEAD }} at {{ exec date "+%Y-%m-%d %T" }} </span>
26+
<a href="https://github.com/zekroTJA/zekro.de/commit/{{ exec git rev-parse HEAD }}"
27+
>build {{ exec git rev-parse --short HEAD }} at {{ exec date "+%Y-%m-%d %T" }}
28+
</a>
2729
<span>|</span>
2830
<a href="/imprint">imprint</a>
2931
<span>|</span>

‎src/templates/bike-gear.html‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<section id="bike-setup">
2+
<h3>Bike Setup</h3>
3+
<ul>
4+
<li><a target="_blank" rel="noopener" href="https://www.stevensbikes.de/en/de/gravel/gravel/gavere-eco/">Bike: Stevens Gavere Eco (2025)</a></li>
5+
<li>Head Unit: Wahoo Elemnt Roam V2</li>
6+
<li><a target="_blank" rel="noopener" href="https://www.polar.com/us-en/sensors/h9-heart-rate-sensor/">Pulsgurt: Polar H9</a></li>
7+
<li><a target="_blank" rel="noopener" href="https://www.amazon.de/-/en/dp/B0D7TNDBD2">Licht: Lichtmeister F100</a></li>
8+
<li><a target="_blank" rel="noopener" href="https://cyclite.cc/en/collections/bags/products/top-tube-bag-02">Oberrohrtasche: Cyclite Top Tube Bag / 02</a></li>
9+
<li><a target="_blank" rel="noopener" href="https://cyclite.cc/en/collections/bags/products/frame-bag-01">Rahmentasche: Cyclite Frame Bag / 01</a></li>
10+
</ul>
11+
</section>
12+
<section id="accessoires">
13+
<h3>Accessoires</h3>
14+
<ul>
15+
<li><a target="_blank" rel="noopener" href="https://geizhals.de/anker-533-power-bank-powercore-30w-v184746.html">Power Bank: Anker 533 (30W)</a></li>
16+
</ul>
17+
</section>
18+
<section id="video-equipment">
19+
<h3>Video Equipment</h3>
20+
<ul>
21+
<li><a target="_blank" rel="noopener" href="https://geizhals.de/dji-osmo-action-4-v137074.html">Action Cam: DJI Osmo Action 4</a></li>
22+
</ul>
23+
</section>

‎src/templates/gear.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ <h3>pc hardware</h3>
1414
<section id="periphery">
1515
<h3>periphery</h3>
1616
<ul>
17-
<li><a target="_blank" rel="noopener" href="https://geizhals.de/asus-tuf-gaming-vg27aq-90lm0500-b01370-a2112120.html">ASUS TUF Gaming VG27AQ, 27" (Display)</a></li>
18-
<li><a target="_blank" rel="noopener" href="https://geizhals.de/asus-vs229hv-90lme9501t02231c-a1031968.html">ASUS VS229HV 21.5" (Display)</a></li>
17+
<li><a target="_blank" rel="noopener" href="https://geizhals.de/gigabyte-aorus-fi27q-p-a2143689.html">GIGABYTE AORUS FI27Q-P, 27" (Main & Second Display)</a></li>
1918
<li><a target="_blank" rel="noopener" href="https://geizhals.de/logitech-g-pro-x-superlight-2-lightspeed-gaming-mouse-v139760.html">Logitech G Pro X Superlight 2 (Mouse)</a></li>
2019
<li><a target="_blank" rel="noopener" href="https://geizhals.de/keychron-k6-k6-u3-de-a2733410.html">Keychron K6 RGB w/ Gateron Brown Hot Swappable (Keyboard)</a></li>
2120
<li><a target="_blank" rel="noopener" href="https://geizhals.eu/beyerdynamic-dt-990-pro-459-038-a114314.html">beyerdynamic DT 990 PRO (Headphones)</a></li>
@@ -26,6 +25,7 @@ <h3>periphery</h3>
2625
<li><a target="_blank" rel="noopener" href="https://geizhals.de/r-de-smartlav-a1211806.html">RØDE smartLav+ (Lavalier Microphone)</a></li>
2726
<li><a target="_blank" rel="noopener" href="https://geizhals.de/zoom-h1n-schwarz-a1761597.html">Zoom H1n (Mobile Audiorecorder)</a></li>
2827
<li><a target="_blank" rel="noopener" href="https://geizhals.de/microsoft-xbox-elite-wireless-controller-series-2-v84004.html">Microsoft Xbox Elite Series 2 (Controller)</a></li>
28+
<li><a target="_blank" rel="noopener" href="https://geizhals.de/wacom-intuos-pro-m-rev-2-pth-660-n-a1558845.html">Wacom Intuos Pro 2017 Medium (Drawing Tablet)</a></li>
2929
</ul>
3030
</section>
3131
<section id="camera-gear">
@@ -47,8 +47,8 @@ <h3>software</h3>
4747
<li><a target="_blank" rel="noopener" href="https://www.blackmagicdesign.com/products/davinciresolve">Blackmagic DaVinci Resolve</a></li>
4848
<li><a target="_blank" rel="noopener" href="https://lightroom.adobe.com/">Adobe Lightroom</a></li>
4949
<li><a target="_blank" rel="noopener" href="https://photoshop.adobe.com/">Adobe Photoshop</a></li>
50-
<li><a target="_blank" rel="noopener" href="https://affinity.serif.com/en-gb/photo/">Affinity Photo</a></li>
51-
<li><a target="_blank" rel="noopener" href="https://affinity.serif.com/en-gb/designer/">Affinity Designer</a></li>
52-
<li><a target="_blank" rel="noopener" href="https://affinity.serif.com/en-gb/publisher/">Affinity Publisher</a></li>
50+
<li><a target="_blank" rel="noopener" href="https://affinity.serif.com/en-gb/photo/">Affinity Photo 2</a></li>
51+
<li><a target="_blank" rel="noopener" href="https://affinity.serif.com/en-gb/designer/">Affinity Designer 2</a></li>
52+
<li><a target="_blank" rel="noopener" href="https://www.clipstudio.net/en/">Clip Studio Paint Pro</a></li>
5353
</ul>
5454
</section>

0 commit comments

Comments
 (0)