From 19d73744e65de1fd64e1a7ca555eb9789d14567b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 28 Jan 2025 23:17:52 +0100 Subject: [PATCH 1/8] page: plenum: Fix Plenum dates Ab jetzt wird das Plenum immer am 2. und 4. Dienstag im Monat statt finden. --- content/page/plenum.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/page/plenum.md b/content/page/plenum.md index ec2835c..4e8920c 100644 --- a/content/page/plenum.md +++ b/content/page/plenum.md @@ -4,10 +4,10 @@ subtitle: "Instrument der internen Konsensfindung" date: 2018-05-18T01:11:54+02:00 dtstart: 20180704T200000 dtend: 20180704T220000 -rrule: "FREQ=MONTHLY;BYSETPOS=1;BYDAY=WE;INTERVAL=1" +rrule: "FREQ=MONTHLY;BYDAY=2TU,4TU;INTERVAL=1;WKST=MO" --- -Das Plenum findet in der Regel am ersten Mittwoch des Monats ab 20:00 Uhr in den Clubräumen +Das Plenum findet in der Regel am 2. und 4. Dienstag im Monat ab 20:00 Uhr in den Clubräumen des CCCB statt. Als Instrument der internen Konsensbildung, bei dem Interna diskutiert werden, From 3a029cbffb1be613330481293bb4acc65459f39e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 29 Jan 2025 00:58:55 +0100 Subject: [PATCH 2/8] page: Fix Date syntax Die Syntax ist: bywdaylist = ( weekdaynum *("," weekdaynum) ) weekdaynum = [[plus / minus] ordwk] weekday ordwk = 1*2DIGIT ;1 to 53 Siehe: https://datatracker.ietf.org/doc/html/rfc5545 --- content/page/bastel-_und_filmeabend.md | 4 ++-- content/page/spieleabend.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/page/bastel-_und_filmeabend.md b/content/page/bastel-_und_filmeabend.md index 811400a..f38b88b 100644 --- a/content/page/bastel-_und_filmeabend.md +++ b/content/page/bastel-_und_filmeabend.md @@ -4,7 +4,7 @@ subtitle: "Der Bastel- und Filmeabend jeden 1. und 3. Samstag im Monat" date: 2025-01-08T20:00:00+02:00 dtstart: 20250118T170000 dtend: 20250118T230000 -rrule: "FREQ=MONTHLY;BYDAY=SA(1),SA(3);WKST=MO" +rrule: "FREQ=MONTHLY;BYDAY=1SA,3SA;WKST=MO" --- -**Jeden 2. und 4. Samstag im Monat ist ab 17 Uhr Spieleabend im Club.** \ No newline at end of file +**Jeden 1. und 3. Samstag im Monat ist ab 17 Uhr Bastel- und Filmeabend im Club.** diff --git a/content/page/spieleabend.md b/content/page/spieleabend.md index 020e322..a604129 100644 --- a/content/page/spieleabend.md +++ b/content/page/spieleabend.md @@ -4,7 +4,7 @@ subtitle: "Der Spieleabend jeden 2. und 4. Samstag im Monat" date: 2025-01-08T20:00:00+02:00 dtstart: 20250125T170000 dtend: 20250125T230000 -rrule: "FREQ=MONTHLY;BYDAY=SA(2),SA(4);WKST=MO" +rrule: "FREQ=MONTHLY;BYDAY=2SA,4SA;WKST=MO" --- -**Jeden 2. und 4. Samstag im Monat ist ab 17 Uhr Spieleabend im Club.** \ No newline at end of file +**Jeden 2. und 4. Samstag im Monat ist ab 17 Uhr Spieleabend im Club.** From d4c3658b1e29e536a44eba4ab3cf5fd8e9f1ae33 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Thu, 30 Jan 2025 22:05:48 +0100 Subject: [PATCH 3/8] page: add Tag Des Offenen Hackerspace event --- content/tag_des_offenen_hackerspace.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 content/tag_des_offenen_hackerspace.md diff --git a/content/tag_des_offenen_hackerspace.md b/content/tag_des_offenen_hackerspace.md new file mode 100644 index 0000000..327bb64 --- /dev/null +++ b/content/tag_des_offenen_hackerspace.md @@ -0,0 +1,13 @@ +--- +title: "Tag Des Offenen Hackerspace" +subtitle: "Der CCCB lädt ein zum kennenlernen und entdecken." +date: 2025-03-29T13:00:00+02:00 +dtstart: 20250329T130000 +dtend: 20250329T200000 +--- + +Der [Tag des offenen Hackerspace](https://events.ccc.de/2024/02/23/tag-des-offenen-hackspace-einladung/) findet dieses Jahr auch im CCCB statt. +Es wird Führungen durch die Räume geben und Möglichkeiten zum kennenlernen und Spaß am Gerät. + +- Programm folgt :-) + From 8d7a5dcf7582700579a1e270b99493f850f8e402 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 1 Feb 2025 14:14:20 +0100 Subject: [PATCH 4/8] bump email address year --- config.yaml | 2 +- content/page/impressum.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index 114a3e2..73af8d7 100644 --- a/config.yaml +++ b/config.yaml @@ -29,7 +29,7 @@ permalinks: Author: twitter: "clubdiscordia" - email: "mail2024@berlin.ccc.de" + email: "mail2025@berlin.ccc.de" mastodon: "chaos.social/@clubdiscordia" irc: "https://webirc.hackint.org/#ircs://irc.hackint.org/#cccb" diff --git a/content/page/impressum.md b/content/page/impressum.md index eeea254..ec6fdab 100644 --- a/content/page/impressum.md +++ b/content/page/impressum.md @@ -24,7 +24,7 @@ Postfach 64 02 36 10048 Berlin ``` -E-Mail: +E-Mail: Eingetragen im Vereinsregister des Amtsgerichts Berlin Charlottenburg unter der Vereinsregisternummer 16058. From d94203aa15606e3035374c37e50ed98abd0cd45b Mon Sep 17 00:00:00 2001 From: Marek Krug Date: Tue, 11 Feb 2025 22:51:09 +0100 Subject: [PATCH 5/8] dummy testing for calendar logic --- build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index d60aa87..56d4f8d 100755 --- a/build.sh +++ b/build.sh @@ -3,6 +3,9 @@ hugo $(cat .hugo-params) ./tools/merge_cals.py upcoming="$(tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" +echo $upcoming +cat public/index.html cp static/all.ics public/all.ics sed -i "s#CALENDAR#$upcoming#g" public/index.html - +cat public/index.html +echo $upcoming \ No newline at end of file From c5a5ae90d076577e9fdf5041559a82664d5fd2c2 Mon Sep 17 00:00:00 2001 From: Marek Krug Date: Tue, 11 Feb 2025 22:56:09 +0100 Subject: [PATCH 6/8] another test for calendar --- .github/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dc1d46a..fd74c65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,10 @@ jobs: - name: Copy calendar to output dir run: cp static/all.ics public/all.ics - name: Update homepage with latest event - run: upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html + run: | + upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html + echo $upcoming + cat public/index.html - uses: actions/upload-artifact@v4 name: Upload pages with: From dec4fce900820f868a5d0c0926998083e0a127db Mon Sep 17 00:00:00 2001 From: Marek Krug Date: Tue, 11 Feb 2025 23:12:21 +0100 Subject: [PATCH 7/8] removed test code and removed filmabend --- .github/workflows/release.yml | 5 +---- .gitignore | 5 ++++- build.sh | 6 +----- content/page/{bastel-_und_filmeabend.md => bastelabend.md} | 4 ++-- content/{ => post}/tag_des_offenen_hackerspace.md | 0 5 files changed, 8 insertions(+), 12 deletions(-) rename content/page/{bastel-_und_filmeabend.md => bastelabend.md} (50%) rename content/{ => post}/tag_des_offenen_hackerspace.md (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd74c65..dc1d46a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,10 +63,7 @@ jobs: - name: Copy calendar to output dir run: cp static/all.ics public/all.ics - name: Update homepage with latest event - run: | - upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html - echo $upcoming - cat public/index.html + run: upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html - uses: actions/upload-artifact@v4 name: Upload pages with: diff --git a/.gitignore b/.gitignore index 584da93..349c2d2 100644 --- a/.gitignore +++ b/.gitignore @@ -97,4 +97,7 @@ $RECYCLE.BIN/ # NixOS: .envrc shell.nix -.direnv \ No newline at end of file +.direnv + +# Python +.venv \ No newline at end of file diff --git a/build.sh b/build.sh index 56d4f8d..11d85bf 100755 --- a/build.sh +++ b/build.sh @@ -3,9 +3,5 @@ hugo $(cat .hugo-params) ./tools/merge_cals.py upcoming="$(tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" -echo $upcoming -cat public/index.html cp static/all.ics public/all.ics -sed -i "s#CALENDAR#$upcoming#g" public/index.html -cat public/index.html -echo $upcoming \ No newline at end of file +sed -i "s#CALENDAR#$upcoming#g" public/index.html \ No newline at end of file diff --git a/content/page/bastel-_und_filmeabend.md b/content/page/bastelabend.md similarity index 50% rename from content/page/bastel-_und_filmeabend.md rename to content/page/bastelabend.md index f38b88b..8c1ff4e 100644 --- a/content/page/bastel-_und_filmeabend.md +++ b/content/page/bastelabend.md @@ -1,10 +1,10 @@ --- title: "Bastelabend" -subtitle: "Der Bastel- und Filmeabend jeden 1. und 3. Samstag im Monat" +subtitle: "Der Bastelabend jeden 1. und 3. Samstag im Monat" date: 2025-01-08T20:00:00+02:00 dtstart: 20250118T170000 dtend: 20250118T230000 rrule: "FREQ=MONTHLY;BYDAY=1SA,3SA;WKST=MO" --- -**Jeden 1. und 3. Samstag im Monat ist ab 17 Uhr Bastel- und Filmeabend im Club.** +**Jeden 1. und 3. Samstag im Monat ist ab 17 Uhr Bastelabend im Club.** diff --git a/content/tag_des_offenen_hackerspace.md b/content/post/tag_des_offenen_hackerspace.md similarity index 100% rename from content/tag_des_offenen_hackerspace.md rename to content/post/tag_des_offenen_hackerspace.md From e5cb1af1ee8f29abce2d6c2d82749b9f85433ccf Mon Sep 17 00:00:00 2001 From: Marek Krug Date: Tue, 11 Feb 2025 23:19:41 +0100 Subject: [PATCH 8/8] change tdoh date --- content/post/tag_des_offenen_hackerspace.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/post/tag_des_offenen_hackerspace.md b/content/post/tag_des_offenen_hackerspace.md index 327bb64..3f165a9 100644 --- a/content/post/tag_des_offenen_hackerspace.md +++ b/content/post/tag_des_offenen_hackerspace.md @@ -1,7 +1,7 @@ --- title: "Tag Des Offenen Hackerspace" subtitle: "Der CCCB lädt ein zum kennenlernen und entdecken." -date: 2025-03-29T13:00:00+02:00 +date: 2025-02-10T12:00:00+02:00 dtstart: 20250329T130000 dtend: 20250329T200000 ---