diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index b16d6fa..51df417 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -4,9 +4,14 @@ on:
push:
branches:
- 'main'
+ - 'release/ef-2024'
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: false
+
jobs:
build-and-push-image:
permissions:
@@ -41,7 +46,7 @@ jobs:
REGISTRY_USER: ${{ github.actor }}
REGISTRY_PASS: ${{ secrets.GITHUB_TOKEN }}
- - name: Docker build and push 'latest' image
+ - name: Docker build and push 'latest-ef' image
if: startsWith(github.ref, 'refs/heads/')
run: >
TAG_ARGS=$(echo -n "$IMAGE_TAGS" | sed -r "s_([^ :/]+)_ --tag $REGISTRY/$IMAGE_NAME:\1 _g") &&
@@ -56,7 +61,7 @@ jobs:
env:
REGISTRY: 'ghcr.io'
IMAGE_NAME: ${{ github.repository }}
- IMAGE_TAGS: latest
+ IMAGE_TAGS: latest-ef
FULL_REPO_URL: "https://github.com/${{ github.repository }}"
COMMIT_HASH: ${{ github.sha }}
diff --git a/httpd-container.conf b/httpd-container.conf
index 6e9ce18..b42b85b 100644
--- a/httpd-container.conf
+++ b/httpd-container.conf
@@ -130,6 +130,11 @@ CustomLog /dev/stdout json
SubstituteMaxLineLength 5M
Substitute "s|aN3nNFwFoi5QkyPaVJ54dDTDc6HrrCYGAL6U6GUuyV2uvvekgOxqYe6K2hur|${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}|n"
+ # proxy to onsite UIs (nav page)
+
+ ProxyPass /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/onsite http://onsite:8000/aN3nNFwFoi5QkyPaVJ54dDTDc6HrrCYGAL6U6GUuyV2uvvekgOxqYe6K2hur/onsite disablereuse=On connectiontimeout=20 timeout=60
+ ProxyPassReverse /${HTTPD_CONF_PATH_PREFIX_NO_SLASHES}/onsite http://onsite:8000/aN3nNFwFoi5QkyPaVJ54dDTDc6HrrCYGAL6U6GUuyV2uvvekgOxqYe6K2hur/onsite
+
ServerSignature Off
ErrorDocument 404 /404.html
diff --git a/src/components/funnels/funnels/register/steps/ticket/level.tsx b/src/components/funnels/funnels/register/steps/ticket/level.tsx
index 97f0e21..5003567 100644
--- a/src/components/funnels/funnels/register/steps/ticket/level.tsx
+++ b/src/components/funnels/funnels/register/steps/ticket/level.tsx
@@ -90,7 +90,20 @@ const TicketLevel = (_: ReadonlyRouteComponentProps) => {
label="Late Fee"
price="+15" >
- : undefined }
+
+ :
+
+ }
Select add-ons
diff --git a/src/config.ts b/src/config.ts
index 86ec765..b74394a 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -13,7 +13,7 @@ import { DateTime } from 'luxon'
const apiPath = (path: string) => process.env.GATSBY_API_BASE_URL === undefined ? withPrefix(path) : `${process.env.GATSBY_API_BASE_URL}${path}`
const config = checkConfig({
- version: 4, // increment to prevent loading from local storage (new year, pricing changes, default packages)
+ version: 5, // increment to prevent loading from local storage (new year, pricing changes, default packages)
eventName: 'Eurofurence',
registrationLaunch: DateTime.fromISO('2023-01-21T12:30:23+02:00'),
registrationExpirationDate: DateTime.fromISO('2024-09-22', { zone: 'Europe/Berlin' }),
@@ -83,7 +83,7 @@ const config = checkConfig({
},
'late': {
price: 15,
- default: false, // don't forget to increment version when changing this
+ default: true, // don't forget to increment version when changing this
options: {},
unavailableFor: {
type: ['day'],
diff --git a/src/localizations/de-DE.ftl b/src/localizations/de-DE.ftl
index 93f927a..123a280 100644
--- a/src/localizations/de-DE.ftl
+++ b/src/localizations/de-DE.ftl
@@ -219,8 +219,8 @@ register-ticket-level-card-sponsor =
+ Teilnahme an den regulären Events
+ früher Zugang zu Dealers' Den und Art Show (Donnerstag)
+ Prioritäts-Warteschlange bei bestimmten Events
- + Sponsor-Paket
- + kostenloses T-Shirt
+ + Sponsor-Paket**
+ + kostenloses T-Shirt**
.label = Sponsor
.priceLabel = {$type ->
@@ -236,8 +236,8 @@ register-ticket-level-card-super-sponsor =
+ Teilnahme an den regulären Events
+ Besonders früher Zugang zu Dealers' Den und Art Show (Donnerstag)
+ Prioritäts-Warteschlange bei bestimmten Events
- + Super-Sponsor-Paket
- + kostenloses T-Shirt
+ + Super-Sponsor-Paket**
+ + kostenloses T-Shirt**
.label = Supersponsor
.priceLabel = {$type ->
@@ -253,6 +253,10 @@ register-ticket-level-modifiers-late-fee =
.label = Spätbucheraufschlag (bei Zahlung ab 1. Juni)
.price = +15 €
+register-ticket-level-footnote-late-sponsors =
+ .label = Nach Verfügbarkeit bei Buchung weniger als 1 Monat vor der Convention!
+ .price = .
+
register-ticket-level-expiration-notice = Registriere Dich vor dem {DATETIME($expirationDate, day: "numeric", month: "long")}
register-ticket-level-addons-title = Zusatzoptionen auswählen
@@ -263,7 +267,7 @@ register-ticket-level-addons-item-stage-pass =
register-ticket-level-addons-item-tshirt =
.label = Eurofurence T-shirt
- .description = Hochwertiges T-Shirt aus 100% Baumwolle. Du kannst es auch vor Ort kaufen, aber hier kannst Du es in Deiner Größe vorbestellen.
+ .description = Hochwertiges T-Shirt aus 100% Baumwolle. Du kannst es auch vor Ort kaufen, aber wenn Du es mindestens einen Monat vor der Convention vorbestellst, bekommst Du auch sicher eines.
register-ticket-level-addons-item-tshirt-option-size =
.label = T-Shirt-Größe
diff --git a/src/localizations/en-US.ftl b/src/localizations/en-US.ftl
index 5bf8a18..b9b12d3 100644
--- a/src/localizations/en-US.ftl
+++ b/src/localizations/en-US.ftl
@@ -219,8 +219,8 @@ register-ticket-level-card-sponsor =
+ participation in scheduled events
+ early access to the Dealers' Den and Art Show (Thursday)
+ priority queueing for certain events
- + Sponsor pack
- + free T-shirt
+ + Sponsor pack**
+ + free T-shirt**
.label = Sponsor
.priceLabel = {$type ->
@@ -236,8 +236,8 @@ register-ticket-level-card-super-sponsor =
+ participation in scheduled events
+ super-early access to the Dealers' Den and Art Show (Thursday)
+ priority queueing for certain events
- + Super Sponsor pack
- + free T-shirt
+ + Super Sponsor pack**
+ + free T-shirt**
.label = Super sponsor
.priceLabel = {$type ->
@@ -253,6 +253,10 @@ register-ticket-level-modifiers-late-fee =
.label = Late Fee (if paid June 1st or later)
.price = + €15
+register-ticket-level-footnote-late-sponsors =
+ .label = Subject to availability if booked less than 1 month before the convention!
+ .price = .
+
register-ticket-level-expiration-notice = Register before {DATETIME($expirationDate, day: "numeric", month: "long")}
register-ticket-level-addons-title = Select add-ons
@@ -263,7 +267,7 @@ register-ticket-level-addons-item-stage-pass =
register-ticket-level-addons-item-tshirt =
.label = Eurofurence T-shirt
- .description = 100% cotton, high-quality T-shirts. You can also purchase these at the event, but purchasing one now will guarantee availability of your size.
+ .description = 100% cotton, high-quality T-shirts. You can also purchase these at the event, but purchasing one at least one month before the convention will guarantee availability of your size.
register-ticket-level-addons-item-tshirt-option-size =
.label = T-shirt size