From ccdaa9d95db62815328c6b28f3a0c3d3f13683e5 Mon Sep 17 00:00:00 2001 From: murmeldin Date: Wed, 16 Apr 2025 18:36:08 +0200 Subject: [PATCH 1/2] fixed config + ics timezone --- .gitignore | 3 + build.sh | 2 + config/_default/hugo.toml | 94 ++++++++++++++----------------- config/_default/languages.de.toml | 1 - config/_default/menus.de.toml | 1 - layouts/veranstaltungen/list.ics | 4 +- 6 files changed, 50 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 54e16e8..d2d5473 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,6 @@ shell.nix # Python .venv + +# murmeldin +overview.md \ No newline at end of file diff --git a/build.sh b/build.sh index 3a07414..6bc707a 100755 --- a/build.sh +++ b/build.sh @@ -3,6 +3,8 @@ set -e set -x +rm -rf public/ # delete old generated files + hugo $(cat .hugo-params) ./tools/merge_cals.py upcoming="$(tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml index de88bdd..4253a6e 100644 --- a/config/_default/hugo.toml +++ b/config/_default/hugo.toml @@ -1,14 +1,10 @@ -# -- Site Configuration -- -# Refer to the theme docs for more details about each of these parameters. -# https://blowfish.page/docs/getting-started/ +theme = 'blowfish' +baseURL = 'https://oururl.de/' +defaultContentLanguage = 'de' +relativeURLs = true +canonifyURLs = true -theme = "blowfish" # UNCOMMENT THIS LINE -baseURL = "https://berlin.ccc.de/" -defaultContentLanguage = "de" -RelativeURLs = true -CanonifyURLs = true - -pluralizeListTitles = "false" # hugo function useful for non-english languages, find out more in https://gohugo.io/getting-started/configuration/#pluralizelisttitles +pluralizeListTitles = false enableRobotsTXT = true summaryLength = 0 @@ -18,8 +14,6 @@ buildFuture = false enableEmoji = true -# googleAnalytics = "G-XXXXXXXXX" - [pagination] pagerSize = 100 @@ -27,10 +21,10 @@ enableEmoji = true anchor = 'Center' [taxonomies] - tag = "tags" - category = "categories" - author = "authors" - series = "series" + tag = 'tags' + category = 'categories' + author = 'authors' + series = 'series' [sitemap] changefreq = 'daily' @@ -38,63 +32,61 @@ enableEmoji = true priority = 0.5 [permalinks] - post = "/post/:year/:month/:day/:title/" + post = '/post/:year/:month/:day/:title/' [outputs] - home = ["HTML", "RSS", "JSON"] - section = ["HTML", "Calendar", "RSS", "XML", "ICS"] - page = ["HTML", "Calendar", "ICS"] + home = ['html', 'rss', 'json'] + section = ['html', 'Calendar', 'rss', 'xml'] + page = ['html', 'Calendar'] # Output Formats Configuration [outputFormats.Calendar] - mediaType = "text/calendar" - baseName = "index" + mediaType = 'text/calendar' + baseName = 'index' isPlainText = true notAlternative = true [outputFormats.XML] - mediaType = "application/xml" - baseName = "index" + mediaType = 'application/xml' + baseName = 'index' isPlainText = true [outputFormats.RSS] - mediaType = "application/rss+xml" + mediaType = 'application/rss+xml' # Media Types Configuration [mediaTypes] - [mediaTypes."text/calendar"] - suffixes = ["ics"] - [mediaTypes."application/rss"] - suffixes = ["rss"] - [mediaTypes."application/xml"] - suffixes = ["xml"] + [mediaTypes.'text/calendar'] + suffixes = ['ics'] + [mediaTypes.'application/rss+xml'] + suffixes = ['xml', 'rss'] [related] threshold = 0 toLower = false - [[related.indices]] - name = "tags" - weight = 100 + [[related.indices]] + name = 'tags' + weight = 100 - [[related.indices]] - name = "categories" - weight = 100 + [[related.indices]] + name = 'categories' + weight = 100 - [[related.indices]] - name = "series" - weight = 50 + [[related.indices]] + name = 'series' + weight = 50 - [[related.indices]] - name = "authors" - weight = 20 + [[related.indices]] + name = 'authors' + weight = 20 - [[related.indices]] - name = "date" - weight = 10 - - [[related.indices]] - applyFilter = false - name = 'fragmentrefs' - type = 'fragments' + [[related.indices]] + name = 'date' weight = 10 + + [[related.indices]] + applyFilter = false + name = 'fragmentrefs' + type = 'fragments' + weight = 10 diff --git a/config/_default/languages.de.toml b/config/_default/languages.de.toml index e3fc5ce..71158ad 100644 --- a/config/_default/languages.de.toml +++ b/config/_default/languages.de.toml @@ -29,5 +29,4 @@ title = "Chaos Computer Club Berlin" { forgejo = "https://git.berlin.ccc.de/explore/repos" }, { email = "mailto:mail2025@berlin.ccc.de" }, { github = "https://github.com/cccb/" }, - ] diff --git a/config/_default/menus.de.toml b/config/_default/menus.de.toml index c8bd31f..041c14d 100644 --- a/config/_default/menus.de.toml +++ b/config/_default/menus.de.toml @@ -39,7 +39,6 @@ # The footer menu is displayed at the bottom of the page, just before # the copyright notice. Configure as per the main menu above. - [[footer]] name = "Tags" pageRef = "tags" diff --git a/layouts/veranstaltungen/list.ics b/layouts/veranstaltungen/list.ics index 7830884..0ea06b7 100644 --- a/layouts/veranstaltungen/list.ics +++ b/layouts/veranstaltungen/list.ics @@ -16,8 +16,8 @@ DESCRIPTION:{{ . }} Link: https://berlin.ccc.de{{ $.RelPermalink }} {{ end }} URL:https://berlin.ccc.de{{ .RelPermalink }} -{{ with .Params.dtstart }}DTSTART:{{ . }}{{ end }} -{{ with .Params.dtend }}DTEND:{{ . }}{{ end }} +{{ with .Params.dtstart }}DTSTART;TZID=Europe/Berlin:{{ . }}{{ end }} +{{ with .Params.dtend }}DTEND;TZID=Europe/Berlin:{{ . }}{{ end }} {{ with .Params.rrule }}RRULE:{{ . }}{{ end }} DTSTAMP:{{ now.Format "20060102T150405Z" }} END:VEVENT From 9e90dfd1acd1fe6d756537c634fb8f76d9483d32 Mon Sep 17 00:00:00 2001 From: murmeldin Date: Wed, 16 Apr 2025 18:36:40 +0200 Subject: [PATCH 2/2] added dg 113, dg-preset, improved anfahrt --- .../113/feature-dg-standard-logo.svg | 87 +++++++++++++++++++ content/datengarten/113/index.md | 24 +++++ .../_preset/feature-dg-standard-logo.svg | 87 +++++++++++++++++++ content/datengarten/_preset/index.md | 24 +++++ content/verein/anfahrt.md | 2 +- 5 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 content/datengarten/113/feature-dg-standard-logo.svg create mode 100644 content/datengarten/113/index.md create mode 100644 content/datengarten/_preset/feature-dg-standard-logo.svg create mode 100644 content/datengarten/_preset/index.md diff --git a/content/datengarten/113/feature-dg-standard-logo.svg b/content/datengarten/113/feature-dg-standard-logo.svg new file mode 100644 index 0000000..733a929 --- /dev/null +++ b/content/datengarten/113/feature-dg-standard-logo.svg @@ -0,0 +1,87 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/content/datengarten/113/index.md b/content/datengarten/113/index.md new file mode 100644 index 0000000..db84188 --- /dev/null +++ b/content/datengarten/113/index.md @@ -0,0 +1,24 @@ +--- +categories: ["Datengarten"] +tags: ["not yet announced", "Datengarten", "Veranstaltung"] +series: "Datengarten" +title: "Datengarten 113" +no: 113 +subtitle: "" +speaker: "not yet announced" +date: 2025-03-24T19:00:00+01:00 +event: + start: 2025-04-04T20:00:00+01:00 + end: 2025-04-04T21:30:00+01:00 +location: CCCB +language: de +streaming: true +recording: https://streaming.media.ccc.de/datengarten/cccb +draft: false +--- + +Am 07.05. findet um 20 Uhr wieder ein Datengarten statt, der noch angekündigt wird. Mehr dazu demnächst hier. + +// + +On 07.05., 20:00, there will be another Datengarten, which will be announced soon. You will find more information here soon. diff --git a/content/datengarten/_preset/feature-dg-standard-logo.svg b/content/datengarten/_preset/feature-dg-standard-logo.svg new file mode 100644 index 0000000..733a929 --- /dev/null +++ b/content/datengarten/_preset/feature-dg-standard-logo.svg @@ -0,0 +1,87 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/content/datengarten/_preset/index.md b/content/datengarten/_preset/index.md new file mode 100644 index 0000000..2f38193 --- /dev/null +++ b/content/datengarten/_preset/index.md @@ -0,0 +1,24 @@ +--- +categories: ["Datengarten"] +tags: ["Alltag", "Kompression", "Mediendateien", "Datengarten", "Veranstaltung"] +series: "Datengarten" +title: "Datengarten 1XX" +no: 1XX +subtitle: "" +speaker: "" +date: 2025-03-24T19:00:00+01:00 +event: + start: 2025-04-04T20:00:00+01:00 + end: 2025-04-04T21:30:00+01:00 +location: CCCB +language: de +streaming: true +recording: https://streaming.media.ccc.de/datengarten/cccb +draft: true +--- + +Am 07.05. findet wieder ein Datengarten statt, der noch angekündigt wird. Mehr dazu demnächst hier. + +// + +On 07.05. there will be another Datengarten, which will be announced soon. You will find more information here soon. diff --git a/content/verein/anfahrt.md b/content/verein/anfahrt.md index f256dfb..4451626 100644 --- a/content/verein/anfahrt.md +++ b/content/verein/anfahrt.md @@ -27,7 +27,7 @@ Eine beschränkte Anzahl von Fahrradständern befindet sich im Innenhof. Auf dem ## mit öffentlichem Nahverkehr -Der Club befindet sich in unmittelbarer Nähe zum S+U Bahnhof **Friedrichstraße**, an dem auch Regionalbahnen halten. Vom S-Bahn-Bahnsteig gibt es einen direkten Weg über die Spree unterhalb der Bahnbrücke. Über die Albrechtstraße erreicht ihr die Marienstraße. +Der Club befindet sich in unmittelbarer Nähe zum S+U Bahnhof **Friedrichstraße**, an dem auch Regionalbahnen halten. Vom S-Bahn-Bahnsteig (S3/S5/S7, oberirdisch, Ausgang Schiffbauerdamm) gibt es einen direkten Weg über die Spree unterhalb der Bahnbrücke. Über die Albrechtstraße erreicht ihr die Marienstraße. ## mit dem Fernverkehr