Merge pull request #242 from eurofurence/release/ef-2024

Bring release/ef-2024 to mainline
eurofurence · Dec 10, 2024 · 8893899 · 8893899
2 parents 676bdb9 + b5e1e15
commit 8893899
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 13 deletions.
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
@@ -7,6 +7,10 @@ on:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
   build-and-push-image:
     permissions:

diff --git 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
@@ -90,7 +90,20 @@ const TicketLevel = (_: ReadonlyRouteComponentProps) => {
 						label="Late Fee"
 						price="+15" ></TicketLevelFootnote>
 				</Localized>
-			</ModifiersSection> : undefined }
+				<Localized id="register-ticket-level-footnote-late-sponsors" attrs={{ label: true, description: true, price: false }}>
+					<TicketLevelFootnote
+						marker="**"
+						label="Subject to availability if booked less than 1 month before the convention!"
+						price="" ></TicketLevelFootnote>
+				</Localized>
+			</ModifiersSection> : <ModifiersSection>
+				<Localized id="register-ticket-level-footnote-late-sponsors" attrs={{ label: true, description: true, price: false }}>
+					<TicketLevelFootnote
+						marker="**"
+						label="Subject to availability if booked less than 1 month before the convention!"
+						price="" ></TicketLevelFootnote>
+				</Localized>
+			</ModifiersSection> }
 			<AddonsSection>
 				<Localized id="register-ticket-level-addons-title"><h3>Select add-ons</h3></Localized>
 				<AddonsContainer>

diff --git 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
@@ -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
@@ -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