From c0dad5d8dfb2e3fc74468c509d4b300d896f1f27 Mon Sep 17 00:00:00 2001 From: Johan Van de Wauw Date: Sun, 20 Oct 2024 23:13:49 +0200 Subject: [PATCH 1/4] Fetch fringe from pretalx yaml --- content/fringe-events.yaml | 27 --------------------------- content/fringe.html | 8 ++++++-- 2 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 content/fringe-events.yaml diff --git a/content/fringe-events.yaml b/content/fringe-events.yaml deleted file mode 100644 index 2ed15cbde..000000000 --- a/content/fringe-events.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -kind: internal -events: - 'Config Management Camp 2025': - location: Ghent, Belgium - start: 2025-02-03 - end: 2025-02-05 - cost: Free - registration: Preregistration required for Crowd control purposes - website: https://cfgmgmtcamp.org - contact: info@cfgmgmtcamp.org - 'DuckCon #6': - location: Amsterdam - start: 2025-01-31 - end: 2025-01-31 - cost: free - registration: registration is required - website: https://duckdb.org/2025/01/31/duckcon6 - contact: gabor@duckdb.org - 'CHAOSScon EU 2025': - location: Bedford Hotel & Congress Centre, Rue du Midi 135, Brussels, 1000, Belgium - start: 2025-01-30 - end: 2025-01-30 - cost: $10 - registration: registration is required - website: https://chaoss.community/chaosscon-2025-eu/ - contact: elizabeth@chaoss.community diff --git a/content/fringe.html b/content/fringe.html index 8d786290f..1f55c94f0 100644 --- a/content/fringe.html +++ b/content/fringe.html @@ -1,7 +1,11 @@ --- title: Fringe --- - +<% +file = @site.config.fetch(:pretalx).fetch(:meta_export_file) +pretalx_data = YAML.load_file(file) +fringe = pretalx_data.fetch('fringe', {}) +%>

The FOSDEM Fringe consists of independent events involving free and open source software taking place in the days around the FOSDEM weekend. They are organised independently of FOSDEM so please refer any questions to the contacts listed. @@ -20,7 +24,7 @@ - <% $item_by_id.fetch('/fringe-events/')[:events].to_a.each do |event_name, meta| %> + <% fringe.each do |event_name, meta| %> <%= event_name.to_s %> <%= meta[:location] %> From 75be3b7e12878cf0e836956f0d4b3f7799891948 Mon Sep 17 00:00:00 2001 From: Johan Van de Wauw Date: Mon, 21 Oct 2024 16:56:26 +0200 Subject: [PATCH 2/4] Make pretalx/penta schedule import safer If we add new types such as stands/fringe events the old code could add them to the schedule --- lib/data_sources/schedule.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/data_sources/schedule.rb b/lib/data_sources/schedule.rb index 81ba842ec..cd2ce9285 100644 --- a/lib/data_sources/schedule.rb +++ b/lib/data_sources/schedule.rb @@ -43,7 +43,7 @@ def to_items(hash, name) r = [] cache.each do |k, v| - if k[-1] == 's' + if ['days', 'rooms', 'tracks', 'events', 'speakers'].include?(k) name = k[0..-2] v.each do |id, meta| r << Nanoc3::Item.new('', meta, "/schedule/#{name}/#{id}/", mtime) From 8bb07cff8115eec3fb3177d67e761239f3846276 Mon Sep 17 00:00:00 2001 From: Johan Van de Wauw Date: Wed, 23 Oct 2024 21:09:31 +0200 Subject: [PATCH 3/4] Add sample file --- content/fringe.html | 15 ++++++++------- sample/export/pentabarf.yaml | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/content/fringe.html b/content/fringe.html index 1f55c94f0..208ca36bd 100644 --- a/content/fringe.html +++ b/content/fringe.html @@ -25,14 +25,15 @@ <% fringe.each do |event_name, meta| %> + <%puts meta%> - <%= event_name.to_s %> - <%= meta[:location] %> - <%= meta[:start] %> - <%= meta[:end] %> - <%= meta[:cost] %> - <%= meta[:registration] %> - <%= meta[:contact] %> + "><%= event_name.to_s %> + <%= meta["location"] %> + <%= meta["starts"] %> + <%= meta["ends"] %> + <%= meta["cost"] %> + <%= meta["registration"] %> + "><%= meta["contact"] %> <% end %> diff --git a/sample/export/pentabarf.yaml b/sample/export/pentabarf.yaml index 4eff541b7..f1c096fe4 100644 --- a/sample/export/pentabarf.yaml +++ b/sample/export/pentabarf.yaml @@ -193,3 +193,18 @@ speakers: saturday: - test_event sunday: [] +fringe: + test: + name: test + url: https:// + location: test + description: test + why: test + starts: '2022-02-03 10:00:00+01:00' + ends: '2022-03-03 10:11:00+01:00' + cost: 100 zimbabwean dollar + registration: null + contact: fosdem-test@gisky.be + online: true + submitter: 1 + From 57b49130ff8c12439d4b00ee009c7c5769f49dab Mon Sep 17 00:00:00 2001 From: Johan Van de Wauw Date: Mon, 18 Nov 2024 00:56:51 +0100 Subject: [PATCH 4/4] Fix example fringe event --- sample/export/pentabarf.yaml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sample/export/pentabarf.yaml b/sample/export/pentabarf.yaml index f1c096fe4..445669910 100644 --- a/sample/export/pentabarf.yaml +++ b/sample/export/pentabarf.yaml @@ -195,16 +195,14 @@ speakers: sunday: [] fringe: test: - name: test - url: https:// + name: demo fringe event + url: https://archive.fosdem.org location: test - description: test - why: test - starts: '2022-02-03 10:00:00+01:00' - ends: '2022-03-03 10:11:00+01:00' - cost: 100 zimbabwean dollar - registration: null - contact: fosdem-test@gisky.be + starts: '2022-02-03' + ends: '2022-03-03' + cost: €100 + registration: recommended + contact: fosdem-test@fosdem.org online: true submitter: 1