Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/cloudflare-pages-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:

env:
HUGO_VERSION: 0.168.0
NODE_VERSION: 18
NODE_VERSION: '22'

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: recursive

Expand Down Expand Up @@ -55,10 +55,11 @@ jobs:

- name: Publish to Cloudflare Pages
id: deploy
uses: cloudflare/wrangler-action@v3
uses: cloudflare/wrangler-action@v4
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
wranglerVersion: "4.152.0"
command: pages deploy public --project-name=devopsdays-ch --branch=preview-pr-${{ github.event.pull_request.number }} --commit-dirty=true

- name: Comment PR with preview URL
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/cloudflare-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:

env:
HUGO_VERSION: 0.168.0
NODE_VERSION: 18
NODE_VERSION: '22'

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: recursive

Expand Down Expand Up @@ -57,8 +57,9 @@ jobs:
run: hugo --minify --baseURL "${{ vars.CLOUDFLARE_PAGES_URL || 'https://devopsdays.ch' }}"

- name: Publish to Cloudflare Pages
uses: cloudflare/wrangler-action@v3
uses: cloudflare/wrangler-action@v4
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
wranglerVersion: "4.152.0"
command: pages deploy public --project-name=devopsdays-ch --branch=main --commit-dirty=true
2 changes: 1 addition & 1 deletion config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
baseURL: 'https://devopsdays.ch'
languageCode: 'en-us'
locale: 'en-us'
title: DevOpsDays Zurich
theme: 'devopsdays'

Expand Down
11 changes: 11 additions & 0 deletions static/_headers
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Cloudflare Pages custom headers
# https://developers.cloudflare.com/pages/configuration/headers/

# Security headers (shared standard across all sites; CSP in report-only mode)
/*
Strict-Transport-Security: max-age=31536000; includeSubDomains
X-Frame-Options: DENY
X-Content-Type-Options: nosniff
Referrer-Policy: strict-origin-when-cross-origin
Permissions-Policy: camera=(), microphone=(), geolocation=()
Content-Security-Policy-Report-Only: default-src 'self'; base-uri 'self'; object-src 'none'; frame-ancestors 'none'; img-src 'self' data: https:; script-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://js.tito.io; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://js.tito.io; font-src 'self' data: https://cdn.jsdelivr.net; connect-src 'self' https://*.tito.io; frame-src https://www.google.com https://player.vimeo.com https://*.tito.io; form-action 'self' https://devopsdays.us12.list-manage.com
2 changes: 1 addition & 1 deletion themes/devopsdays/layouts/_default/baseof.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">

{{- $upcoming := index (where .Site.Data.events.events "status" "upcoming") 0 -}}
{{- $upcoming := index (where hugo.Data.events.events "status" "upcoming") 0 -}}
{{- $upcomingYear := printf "%.0f" $upcoming.year -}}
{{- $description := cond (ne .Description "") (replace .Description "{YEAR}" $upcomingYear) .Site.Params.description -}}

Expand Down
16 changes: 8 additions & 8 deletions themes/devopsdays/layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
</div>

<!-- Event Details -->
{{ if .Site.Data.events }}
{{ $currentEvent := index (where .Site.Data.events.events "status" "upcoming") 0 }}
{{ if hugo.Data.events }}
{{ $currentEvent := index (where hugo.Data.events.events "status" "upcoming") 0 }}
{{ if $currentEvent }}
<section class="py-16 bg-white">
<div class="container mx-auto px-4">
Expand Down Expand Up @@ -80,28 +80,28 @@
<section class="py-2">
<div class="container mx-auto px-4">
<div class="prose prose-lg max-w-4xl mx-auto">
{{ $currentEvent := index (where .Site.Data.events.events "status" "upcoming") 0 }}
{{ if and .Site.Data.sessions $currentEvent }}
{{ $currentEvent := index (where hugo.Data.events.events "status" "upcoming") 0 }}
{{ if and hugo.Data.sessions $currentEvent }}
<!-- Stats Container - Generated from Data -->
<div class="stats-container">
<div class="stat-item">
<div class="stat-number">{{ $currentEvent.attendees }}</div>
<div class="stat-label">up to Attendees</div>
</div>
<div class="stat-item">
<div class="stat-number">{{ len (where .Site.Data.sessions.sessions "type" "keynote") }}</div>
<div class="stat-number">{{ len (where hugo.Data.sessions.sessions "type" "keynote") }}</div>
<div class="stat-label">Keynote-Speakers</div>
</div>
<div class="stat-item">
<div class="stat-number">{{ len (where .Site.Data.sessions.sessions "type" "talk") }}</div>
<div class="stat-number">{{ len (where hugo.Data.sessions.sessions "type" "talk") }}</div>
<div class="stat-label">Talks</div>
</div>
<div class="stat-item">
<div class="stat-number">{{ len (where .Site.Data.sessions.sessions "type" "ignite") }}</div>
<div class="stat-number">{{ len (where hugo.Data.sessions.sessions "type" "ignite") }}</div>
<div class="stat-label">Ignites</div>
</div>
<div class="stat-item">
<div class="stat-number">{{ len (where .Site.Data.sessions.sessions "type" "workshop") }}</div>
<div class="stat-number">{{ len (where hugo.Data.sessions.sessions "type" "workshop") }}</div>
<div class="stat-label">Workshops</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays/layouts/partials/breadcrumbs.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<span class="mx-2 text-white" aria-hidden="true">→</span>
{{ if and (eq .Type "session") .Params.sessionId }}
{{ $session := index (where .Site.Data.sessions.sessions "id" .Params.sessionId) 0 }}
{{ $session := index (where hugo.Data.sessions.sessions "id" .Params.sessionId) 0 }}
{{ if $session }}
<span class="text-white" aria-current="page">{{ $session.title }}</span>
{{ else }}
Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays/layouts/partials/page-header.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Usage: {{ partial "page-header.html" . }}
*/}}

{{- $upcomingYear := printf "%.0f" (index (where .Site.Data.events.events "status" "upcoming") 0).year -}}
{{- $upcomingYear := printf "%.0f" (index (where hugo.Data.events.events "status" "upcoming") 0).year -}}
<div class="py-8" style="background: linear-gradient(135deg, var(--cerulean), var(--indigo-dye));">
<div class="container mx-auto px-4">
{{ partial "breadcrumbs.html" . }}
Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays/layouts/partials/session-card.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
{{ if $session.speakers }}
<div class="flex flex-wrap items-center gap-2 mt-2">
{{ range $session.speakers }}
{{ $speaker := index (where $ctx.Site.Data.speakers.speakers "id" .) 0 }}
{{ $speaker := index (where hugo.Data.speakers.speakers "id" .) 0 }}
{{ if $speaker }}
<div class="flex items-center rounded-lg p-2 hover:bg-black/5 transition-colors">
<img src="{{ $speaker.image }}" alt="{{ $speaker.name }}"
Expand Down
18 changes: 9 additions & 9 deletions themes/devopsdays/layouts/partials/sponsors.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{{ if .Site.Data.sponsors }}
{{ if hugo.Data.sponsors }}
{{- /* Build a map of level to package name and group levels by group ID */ -}}
{{- $levelToName := dict -}}
{{- $groupedLevels := dict -}}
{{- $groupIdToName := dict -}}
{{- $levelToGroup := dict -}}

{{- /* Build group ID to name mapping */ -}}
{{- range .Site.Data.sponsor_packages.groups -}}
{{- range hugo.Data.sponsor_packages.groups -}}
{{- $groupIdToName = merge $groupIdToName (dict .id .name) -}}
{{- end -}}

{{- /* Build level mappings and group levels */ -}}
{{- range .Site.Data.sponsor_packages.packages -}}
{{- range hugo.Data.sponsor_packages.packages -}}
{{- $levelToName = merge $levelToName (dict .level .name) -}}
{{- if .group -}}
{{- $existingLevels := index $groupedLevels .group | default slice -}}
Expand All @@ -29,7 +29,7 @@ <h3 class="text-2xl font-bold text-center mb-8" style="color: var(--indigo-dye);
{{- $displayedLevels := slice -}}

{{- /* Iterate through groups array in order */ -}}
{{- range .Site.Data.sponsor_packages.groups -}}
{{- range hugo.Data.sponsor_packages.groups -}}
{{- $groupId := .id -}}
{{- $groupName := .name -}}

Expand All @@ -41,7 +41,7 @@ <h3 class="text-2xl font-bold text-center mb-8" style="color: var(--indigo-dye);
{{- $displayedGroups = $displayedGroups | append $groupId -}}
{{- $hasSponsors := false -}}
{{- range $isGroup -}}
{{- $levelSponsors := where $.Site.Data.sponsors.sponsors "level" . -}}
{{- $levelSponsors := where hugo.Data.sponsors.sponsors "level" . -}}
{{- if $levelSponsors -}}
{{- $hasSponsors = true -}}
{{- end -}}
Expand All @@ -53,7 +53,7 @@ <h4 class="text-lg font-semibold text-center mb-6" style="color: var(--indigo-dy
</h4>
<div class="flex flex-wrap justify-center items-center gap-6" data-sponsor-tier="{{ index $isGroup 0 }}">
{{- /* Iterate through all sponsors and display those matching any level in this group */ -}}
{{- range $.Site.Data.sponsors.sponsors -}}
{{- range hugo.Data.sponsors.sponsors -}}
{{- if in $isGroup .level -}}
{{- $displayedLevels = $displayedLevels | append .level -}}
<a href="{{ .website }}" target="_blank" rel="noopener" class="block sponsor-logo-container">
Expand All @@ -68,12 +68,12 @@ <h4 class="text-lg font-semibold text-center mb-6" style="color: var(--indigo-dy
{{- end -}}
{{- else -}}
{{- /* It's an individual level ID - find the level */ -}}
{{- range $.Site.Data.sponsor_packages.packages -}}
{{- range hugo.Data.sponsor_packages.packages -}}
{{- if eq .level $groupId -}}
{{- $level := .level -}}
{{- if not (in $displayedLevels $level) -}}
{{- $displayedLevels = $displayedLevels | append $level -}}
{{- $levelSponsors := where $.Site.Data.sponsors.sponsors "level" $level -}}
{{- $levelSponsors := where hugo.Data.sponsors.sponsors "level" $level -}}
{{ if $levelSponsors }}
<div class="mb-8">
<h4 class="text-lg font-semibold text-center mb-6" style="color: var(--indigo-dye);">{{ $groupName }}</h4>
Expand All @@ -94,7 +94,7 @@ <h4 class="text-lg font-semibold text-center mb-6" style="color: var(--indigo-dy
{{- end -}}

{{- /* Promote sponsoring prominently while no paid sponsors (other than partners/community) are listed */ -}}
{{- $paidSponsors := where .Site.Data.sponsors.sponsors "level" "not in" (slice "partner" "community") -}}
{{- $paidSponsors := where hugo.Data.sponsors.sponsors "level" "not in" (slice "partner" "community") -}}
{{ if $paidSponsors }}
<div class="text-center mt-8">
<a href="/event/sponsors/" class="text-base font-semibold" style="color: var(--cerulean);"
Expand Down
6 changes: 3 additions & 3 deletions themes/devopsdays/layouts/past-events/single.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{{ define "main" }}
{{ partial "page-header.html" . }}

{{- $upcomingYear := (index (where .Site.Data.events.events "status" "upcoming") 0).year -}}
{{- $upcomingYear := (index (where hugo.Data.events.events "status" "upcoming") 0).year -}}

<section class="py-2">
<div class="container mx-auto px-4">
{{ .Content }}

{{ if .Site.Data.events }}
{{ if hugo.Data.events }}
<div class="mt-12">
<div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
{{ range where .Site.Data.events.events "status" "past" }}
{{ range where hugo.Data.events.events "status" "past" }}
<div class="bg-white rounded-lg shadow-md p-6">
<div class="flex items-start justify-between mb-4">
<div>
Expand Down
4 changes: 2 additions & 2 deletions themes/devopsdays/layouts/program/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<div class="container mx-auto px-4">
{{ .Content }}
<!-- Program Schedule -->
{{ if .Site.Data.sessions }}
{{ if hugo.Data.sessions }}
<div class="mt-12">

<!-- Dynamic Column Layout for Days -->
{{ $sessions := .Site.Data.sessions.sessions }}
{{ $sessions := hugo.Data.sessions.sessions }}
{{ $dayMap := dict }}
{{ range $sessions }}
{{ $dayMap = merge $dayMap (dict .day (slice)) }}
Expand Down
8 changes: 4 additions & 4 deletions themes/devopsdays/layouts/program/single.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{ define "main" }}
{{ partial "page-header.html" . }}

{{- $upcoming := index (where .Site.Data.events.events "status" "upcoming") 0 -}}
{{- $upcoming := index (where hugo.Data.events.events "status" "upcoming") 0 -}}
{{- $day1 := $upcoming.date -}}
{{- $day2 := $upcoming.endDate -}}
{{- $day1Label := (time $day1).Format "January 2, 2006" -}}
Expand All @@ -11,7 +11,7 @@
<div class="container mx-auto px-4">
{{ .Content }}
<!-- Program Schedule -->
{{ if .Site.Data.sessions }}
{{ if hugo.Data.sessions }}
<div class="mt-12">

<!-- Two Column Layout for Days -->
Expand All @@ -28,7 +28,7 @@ <h3 class="text-2xl font-bold text-center">
</div>
</div>
<div class="grid gap-3">
{{ range where .Site.Data.sessions.sessions "day" $day1 }}
{{ range where hugo.Data.sessions.sessions "day" $day1 }}
{{ partial "session-card.html" (dict "session" . "context" $) }}
{{ end }}
</div>
Expand All @@ -46,7 +46,7 @@ <h3 class="text-2xl font-bold text-center">
</div>
</div>
<div class="grid gap-3">
{{ range where .Site.Data.sessions.sessions "day" $day2 }}
{{ range where hugo.Data.sessions.sessions "day" $day2 }}
{{ partial "session-card.html" (dict "session" . "context" $) }}
{{ end }}
</div>
Expand Down
6 changes: 3 additions & 3 deletions themes/devopsdays/layouts/session/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{ partial "breadcrumbs.html" . }}

{{ if .Params.sessionId }}
{{ $session := index (where .Site.Data.sessions.sessions "id" .Params.sessionId) 0 }}
{{ $session := index (where hugo.Data.sessions.sessions "id" .Params.sessionId) 0 }}
{{ if $session }}

<!-- Session Type Badge -->
Expand Down Expand Up @@ -60,7 +60,7 @@ <h1 class="text-4xl font-bold text-white">{{ .Title }}</h1>
<article class="py-12">
<div class="container mx-auto px-4">
{{ if .Params.sessionId }}
{{ $session := index (where .Site.Data.sessions.sessions "id" .Params.sessionId) 0 }}
{{ $session := index (where hugo.Data.sessions.sessions "id" .Params.sessionId) 0 }}
{{ if $session }}

<!-- Responsive flex layout that adapts to content length -->
Expand All @@ -81,7 +81,7 @@ <h2 class="text-2xl font-bold mb-6" style="color: var(--indigo-dye);">Session De
<div class="lg:w-96 flex-shrink-0">
<div class="sticky top-8 space-y-6">
{{ range $session.speakers }}
{{ $speaker := index (where $.Site.Data.speakers.speakers "id" .) 0 }}
{{ $speaker := index (where hugo.Data.speakers.speakers "id" .) 0 }}
{{ if $speaker }}
{{ $speakerPage := $.Site.GetPage (printf "/event/speakers/%s" .) }}
{{ if $speakerPage }}
Expand Down
2 changes: 1 addition & 1 deletion themes/devopsdays/layouts/shortcodes/event-year.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{- $upcoming := index (where .Site.Data.events.events "status" "upcoming") 0 -}}
{{- $upcoming := index (where hugo.Data.events.events "status" "upcoming") 0 -}}
{{- printf "%.0f" $upcoming.year -}}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- $packageName := .Get 0 -}}
{{- $packages := .Site.Data.sponsor_packages.packages -}}
{{- $sponsors := .Site.Data.sponsors.sponsors -}}
{{- $packages := hugo.Data.sponsor_packages.packages -}}
{{- $sponsors := hugo.Data.sponsors.sponsors -}}

{{- $sponsorCounts := dict -}}
{{- range $sponsors -}}
Expand Down
4 changes: 2 additions & 2 deletions themes/devopsdays/layouts/speaker/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
{{ .Content }}
</div>

{{ if .Site.Data.speakers }}
{{ if hugo.Data.speakers }}
<div class="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-4 gap-8 max-w-7xl mx-auto">
{{ range .Site.Data.speakers.speakers }}
{{ range hugo.Data.speakers.speakers }}
<a href="/event/speakers/{{ .id }}/" class="group">
<div
class="bg-white rounded-lg shadow-md overflow-hidden hover:shadow-xl transition-all duration-300 transform hover:-translate-y-1">
Expand Down
6 changes: 3 additions & 3 deletions themes/devopsdays/layouts/speaker/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1 class="text-4xl font-bold text-white mb-2">{{ .Title }}</h1>

<!-- Social Media Links -->
{{ $speakerId := .Params.speakerId }}
{{ $speaker := index (where .Site.Data.speakers.speakers "id" $speakerId) 0 }}
{{ $speaker := index (where hugo.Data.speakers.speakers "id" $speakerId) 0 }}
{{ if $speaker }}
{{ if $speaker.social }}
<div class="flex flex-wrap gap-3 mt-4">
Expand Down Expand Up @@ -102,7 +102,7 @@ <h1 class="text-4xl font-bold text-white mb-2">{{ .Title }}</h1>
<!-- Speaker's Sessions -->
{{ $speakerId := .Params.speakerId }}
{{ $sessions := slice }}
{{ range .Site.Data.sessions.sessions }}
{{ range hugo.Data.sessions.sessions }}
{{ if in .speakers $speakerId }}
{{ $sessions = $sessions | append . }}
{{ end }}
Expand Down Expand Up @@ -199,7 +199,7 @@ <h2 class="text-3xl font-bold mb-6" style="color: var(--indigo-dye);">Sessions</
<div class="mt-12">
<h2 class="text-3xl font-bold mb-6" style="color: var(--indigo-dye);">Other Speakers</h2>
<div class="grid grid-cols-2 md:grid-cols-4 lg:grid-cols-6 gap-4">
{{ range .Site.Data.speakers.speakers }}
{{ range hugo.Data.speakers.speakers }}
{{ if ne .id $speakerId }}
<a href="/event/speakers/{{ .id }}/" class="group">
<div class="bg-white rounded-lg shadow-md overflow-hidden hover:shadow-lg transition-shadow">
Expand Down
4 changes: 2 additions & 2 deletions themes/devopsdays/layouts/team/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<div class="container mx-auto px-4">
{{ .Content }}

{{ if .Site.Data.team }}
{{ if hugo.Data.team }}
<div class="mt-2">
<div class="grid grid-cols-1 md:grid-cols-3 gap-8">
{{ range .Site.Data.team.team }}
{{ range hugo.Data.team.team }}
<div class="bg-white rounded-lg shadow-md overflow-hidden">
<img src="{{ .image }}" alt="{{ .name }}" class="w-full h-64 object-cover">
<div class="p-6">
Expand Down
Loading