From 9ec1afb7d218567796f38e2bb7c86566e275293a Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Mon, 2 Nov 2026 10:21:45 +0100 Subject: [PATCH 01/58] feat(labels): the bazaar decides whether labels carry the seller number Without a number a label holds nothing specific to one bazaar, so sellers can reuse it at the next one. On by default, older clients keep the value. Drafts saved before a new switch existed take its default. Co-Authored-By: Claude Opus 5.5 --- backend/src/modules/events.rs | 13 +++++++- backend/src/modules/features.rs | 5 +++ backend/src/modules/labels.rs | 11 ++++--- backend/src/modules/products.rs | 1 + backend/tests/api/reminders.rs | 32 +++++++++++++++++++ src/lib/api/types.ts | 12 +++++++ src/locales/de/company.json | 2 +- src/locales/de/organizer.json | 6 +++- src/locales/de/seller.json | 1 + src/locales/en/company.json | 2 +- src/locales/en/organizer.json | 6 +++- src/locales/en/seller.json | 1 + src/pages/organizer/events/EditEventForm.tsx | 11 ++++++- .../events/components/EditEventFeatures.tsx | 7 ++++ .../components/wizard/WizardPreviews.tsx | 22 +++++++++++-- .../components/EventSettingsSummary.tsx | 1 + .../components/LabelPrintDialog.test.tsx | 17 ++++++++++ .../products/components/LabelPrintDialog.tsx | 3 ++ src/shared/eventFeatures.ts | 6 ++++ 19 files changed, 146 insertions(+), 13 deletions(-) diff --git a/backend/src/modules/events.rs b/backend/src/modules/events.rs index 43220e24..b0d92de7 100644 --- a/backend/src/modules/events.rs +++ b/backend/src/modules/events.rs @@ -578,6 +578,7 @@ struct FeaturesArgs { max_items_per_seller: Option, label_format: Option, price_on_label: Option, + seller_number_on_label: Option, intake_fee: Option, private_sellers_only: Option, fixed_seller_data: Option, @@ -701,6 +702,15 @@ fn sanitize_features(features: FeaturesArgs, previous: Option<&Value>) -> AppRes "priceOnLabel", json!(features.price_on_label.unwrap_or(false)), ); + put( + "sellerNumberOnLabel", + json!( + features + .seller_number_on_label + .or(previous_bool("sellerNumberOnLabel")) + .unwrap_or(true) + ), + ); put( "intakeFee", json!(sanitize_intake_fee(features.intake_fee)?), @@ -1483,7 +1493,7 @@ mod tests { intake_fee: Some(0.555), ..FeaturesArgs::default() }, - Some(&json!({ "fixedSellerData": true })), + Some(&json!({ "fixedSellerData": true, "sellerNumberOnLabel": false })), ) .unwrap(); assert_eq!(stored["discounts"], false); @@ -1492,6 +1502,7 @@ mod tests { assert_eq!(stored["intakeFee"], 0.56); // Not sent by an older client: kept assert_eq!(stored["fixedSellerData"], true); + assert_eq!(stored["sellerNumberOnLabel"], false); assert_eq!(stored["labelFormat"], "standard"); } diff --git a/backend/src/modules/features.rs b/backend/src/modules/features.rs index 820c833a..921dc6c9 100644 --- a/backend/src/modules/features.rs +++ b/backend/src/modules/features.rs @@ -28,6 +28,7 @@ struct Stored { max_items_per_seller: Option, label_format: Option, price_on_label: Option, + seller_number_on_label: Option, intake_fee: Option, private_sellers_only: Option, fixed_seller_data: Option, @@ -47,6 +48,8 @@ pub struct EventFeatures { pub max_items_per_seller: Option, pub label_format: String, pub price_on_label: bool, + /// Off: labels carry no seller number, so they stay valid for the seller's next bazaar + pub seller_number_on_label: bool, /// Fixed fee in € per accepted item, kept from the payout pub intake_fee: Option, pub private_sellers_only: bool, @@ -76,6 +79,7 @@ pub fn resolve(features: Option<&Value>) -> EventFeatures { max_items_per_seller: stored.max_items_per_seller.map(|n| n.max(0.0) as u32), label_format: stored.label_format.unwrap_or_else(|| "standard".to_owned()), price_on_label: stored.price_on_label.unwrap_or(false), + seller_number_on_label: stored.seller_number_on_label.unwrap_or(true), intake_fee: stored .intake_fee .and_then(Decimal::from_f64_retain) @@ -147,6 +151,7 @@ mod tests { assert_eq!(features.max_discount_percent, 50); assert!(!features.price_offers && !features.questions && !features.fixed_seller_data); assert_eq!(features.label_format, "standard"); + assert!(features.seller_number_on_label); } #[test] diff --git a/backend/src/modules/labels.rs b/backend/src/modules/labels.rs index 199aba40..c0a1b04e 100644 --- a/backend/src/modules/labels.rs +++ b/backend/src/modules/labels.rs @@ -98,10 +98,13 @@ async fn get_label_data(ctx: &mut Ctx, args: LabelArgs) -> AppResult { let mut seller_number = None; let mut price = None; if let Some(label_event) = &label_event { - seller_number = docs::event_seller(ctx.conn(), label_event.id, product.vendor_id) - .await? - .and_then(|row| row.number); - let format = label_event.resolved_features().label_format; + let features = label_event.resolved_features(); + if features.seller_number_on_label { + seller_number = docs::event_seller(ctx.conn(), label_event.id, product.vendor_id) + .await? + .and_then(|row| row.number); + } + let format = features.label_format; if !formats.contains(&format) { formats.push(format); } diff --git a/backend/src/modules/products.rs b/backend/src/modules/products.rs index 3e3fbfa9..6835b5cd 100644 --- a/backend/src/modules/products.rs +++ b/backend/src/modules/products.rs @@ -653,6 +653,7 @@ fn features_json(event: &Event) -> Value { "photosOptional": f.photos_optional, "labelFormat": f.label_format, "priceOnLabel": f.price_on_label, + "sellerNumberOnLabel": f.seller_number_on_label, "privateSellersOnly": f.private_sellers_only, "fixedSellerData": f.fixed_seller_data, }); diff --git a/backend/tests/api/reminders.rs b/backend/tests/api/reminders.rs index 3557096e..6a28aeb8 100644 --- a/backend/tests/api/reminders.rs +++ b/backend/tests/api/reminders.rs @@ -382,6 +382,38 @@ async fn label_data_for_sellers_and_the_team(db: PgPool) { ); } +#[sqlx::test(migrator = "bazarpro_backend::MIGRATOR")] +async fn labels_without_the_seller_number_when_the_bazaar_turns_it_off(db: PgPool) { + let app = TestApp::new(db.clone()); + let organizer = fixtures::user(&db, "Orga").await; + let seller = fixtures::user(&db, "Seller").await; + let event = fixtures::event( + &db, + EventSpec { + features: json!({ "sellerNumberOnLabel": false }), + ..EventSpec::new("Basar", organizer) + }, + ) + .await; + fixtures::role(&db, event, seller, "seller").await; + fixtures::event_seller(&db, event, seller, 12, false).await; + let jacket = fixtures::product(&db, seller, "Jacke", 15.0).await; + fixtures::event_product(&db, event, jacket, "announced").await; + + let as_seller = fixtures::session(&db, seller).await; + let data = app + .query( + "labels.getLabelData", + json!({ "productIds": [jacket], "eventId": event }), + Some(&as_seller), + ) + .await + .body["value"] + .clone(); + assert_eq!(data["labels"][0]["title"], "Jacke"); + assert!(data["labels"][0].get("sellerNumber").is_none()); +} + async fn end_days_ago(db: &PgPool, event: Uuid, days: i32) { sqlx::query( "UPDATE events SET start_date = now() - make_interval(days => $2, hours => 6), diff --git a/src/lib/api/types.ts b/src/lib/api/types.ts index eaf0ea9a..9dc8a8a8 100644 --- a/src/lib/api/types.ts +++ b/src/lib/api/types.ts @@ -104,6 +104,7 @@ export interface Docs { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -368,6 +369,7 @@ export type EventFeatures = { maxItemsPerSeller?: number | undefined; labelFormat: 'small' | 'standard'; priceOnLabel: boolean; + sellerNumberOnLabel: boolean; intakeFee?: number | undefined; privateSellersOnly: boolean; fixedSellerData: boolean; @@ -977,6 +979,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1044,6 +1047,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1113,6 +1117,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1182,6 +1187,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1259,6 +1265,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1329,6 +1336,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1396,6 +1404,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1449,6 +1458,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1500,6 +1510,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1569,6 +1580,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; + sellerNumberOnLabel?: boolean | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; diff --git a/src/locales/de/company.json b/src/locales/de/company.json index f2a71453..1329b728 100644 --- a/src/locales/de/company.json +++ b/src/locales/de/company.json @@ -13,7 +13,7 @@ }, "qrLabels": { "title": "QR-Etiketten in zwei Größen", - "text": "Verkäufer drucken ihre Etiketten selbst: groß für Fahrräder, klein mit 40 pro Seite für Kleidung, immer mit Verkäufernummer. Ohne Preis darauf gehen Rabatte ohne Neudruck." + "text": "Verkäufer drucken ihre Etiketten selbst: groß für Fahrräder, klein mit 40 pro Seite für Kleidung, mit Verkäufernummer oder zum Wiederverwenden ohne. Ohne Preis darauf gehen Rabatte ohne Neudruck." }, "phoneCheckout": { "title": "Kasse mit Warenkorb", diff --git a/src/locales/de/organizer.json b/src/locales/de/organizer.json index 2ec052b0..110ad16d 100644 --- a/src/locales/de/organizer.json +++ b/src/locales/de/organizer.json @@ -138,7 +138,9 @@ "labels": "Etiketten", "labelsLarge": "Groß – 12 pro A4-Seite (z. B. Fahrräder)", "labelsSmall": "Klein – 40 pro A4-Seite (z. B. Kleidung)", - "labelsHint": "Auf jedem Etikett stehen QR-Code, Verkäufernummer, Titel und – wenn angegeben – die Größe.", + "labelsHint": "Auf jedem Etikett stehen QR-Code, Titel und – wenn angegeben – die Größe.", + "sellerNumberOnLabel": "Verkäufernummer aufs Etikett drucken", + "sellerNumberOnLabelText": "Hilft beim Zurücksortieren nach dem Basar. Ausgeschaltet können Verkäufer ihre Etiketten beim nächsten Basar wiederverwenden. Der QR-Code bleibt gültig.", "priceOnLabel": "Preis aufs Etikett drucken", "priceOnLabelText": "Hilft an der Kasse ohne Scanner. Der Preis auf dem Etikett ist fest – bei Rabatten wird er deshalb nicht gedruckt.", "priceOnLabelDiscounts": "Rabatte sind eingeschaltet, deshalb erscheint kein Preis auf den Etiketten.", @@ -259,6 +261,7 @@ "labelsSmall": "Kleine Etiketten (40 pro Seite)", "labelsLarge": "Große Etiketten (12 pro Seite)", "priceOnLabel": "Preis auf dem Etikett", + "sellerNumberOnLabel": "Verkäufernummer auf dem Etikett", "questionsDuringEvent": "erst während des Basars", "requiredFields": "Pflichtangaben: {{fields}}", "privateSellers": "Nur Privatverkäufer", @@ -812,6 +815,7 @@ "labelSmall": "Kleines Etikett · 40 pro A4-Seite", "labelPriceHidden": "Ohne Preis: Rabatte ändern ihn ja noch.", "labelNumber": "Nr. {{seller}}-{{item}}", + "labelReusable": "Ohne Verkäufernummer: Das Etikett passt auch beim nächsten Basar.", "photoRequired": "Foto Pflicht", "photoOptional": "Ohne Foto", "maxItems": "Bis zu {{count}} Artikel pro Verkäufer", diff --git a/src/locales/de/seller.json b/src/locales/de/seller.json index 7ad5b52d..91223956 100644 --- a/src/locales/de/seller.json +++ b/src/locales/de/seller.json @@ -198,6 +198,7 @@ "formatStandard": "Format Standard: {{perPage}} große Etiketten pro Seite", "formatSmall": "Format Klein: {{perPage}} kleine Etiketten pro Seite", "formatPerItem": "Format und Verkäufernummer nach dem jeweils nächsten Basar des Artikels, sonst Standard", + "reusable": "Ohne Verkäufernummer: Du kannst diese Etiketten beim nächsten Basar wiederverwenden.", "download": "PDF herunterladen", "created_one": "{{count}} Etikett erstellt", "created_other": "{{count}} Etiketten erstellt", diff --git a/src/locales/en/company.json b/src/locales/en/company.json index e078fcb5..72786b72 100644 --- a/src/locales/en/company.json +++ b/src/locales/en/company.json @@ -13,7 +13,7 @@ }, "qrLabels": { "title": "QR labels in two sizes", - "text": "Sellers print their own labels: large for bikes, small with 40 per page for clothes, always with the seller number. Without a price on them, discounts work without reprinting." + "text": "Sellers print their own labels: large for bikes, small with 40 per page for clothes, with the seller number or without it for reuse. Without a price on them, discounts work without reprinting." }, "phoneCheckout": { "title": "Checkout with a cart", diff --git a/src/locales/en/organizer.json b/src/locales/en/organizer.json index 8f11f2bf..0726310d 100644 --- a/src/locales/en/organizer.json +++ b/src/locales/en/organizer.json @@ -138,7 +138,9 @@ "labels": "Labels", "labelsLarge": "Large – 12 per A4 page (e.g. bikes)", "labelsSmall": "Small – 40 per A4 page (e.g. clothes)", - "labelsHint": "Every label shows QR code, seller number, title and – if given – the size.", + "labelsHint": "Every label shows QR code, title and – if given – the size.", + "sellerNumberOnLabel": "Print the seller number on the label", + "sellerNumberOnLabelText": "Helps sorting items back after the bazaar. Switched off, sellers can reuse their labels at the next bazaar. The QR code stays valid.", "priceOnLabel": "Print the price on the label", "priceOnLabelText": "Helps at a cash desk without scanner. The printed price is fixed – so it is not printed when discounts are on.", "priceOnLabelDiscounts": "Discounts are switched on, so no price appears on the labels.", @@ -259,6 +261,7 @@ "labelsSmall": "Small labels (40 per page)", "labelsLarge": "Large labels (12 per page)", "priceOnLabel": "Price on the label", + "sellerNumberOnLabel": "Seller number on the label", "questionsDuringEvent": "only during the bazaar", "requiredFields": "Required details: {{fields}}", "privateSellers": "Private sellers only", @@ -812,6 +815,7 @@ "labelSmall": "Small label · 40 per A4 page", "labelPriceHidden": "No price: discounts may still change it.", "labelNumber": "No. {{seller}}-{{item}}", + "labelReusable": "No seller number: the label also works at the next bazaar.", "photoRequired": "Photo required", "photoOptional": "No photo", "maxItems": "Up to {{count}} items per seller", diff --git a/src/locales/en/seller.json b/src/locales/en/seller.json index efe152c2..458d6969 100644 --- a/src/locales/en/seller.json +++ b/src/locales/en/seller.json @@ -198,6 +198,7 @@ "formatStandard": "Standard format: {{perPage}} large labels per page", "formatSmall": "Small format: {{perPage}} small labels per page", "formatPerItem": "Format and seller number from each item's next bazaar, otherwise standard", + "reusable": "No seller number: you can reuse these labels at the next bazaar.", "download": "Download PDF", "created_one": "{{count}} label created", "created_other": "{{count}} labels created", diff --git a/src/pages/organizer/events/EditEventForm.tsx b/src/pages/organizer/events/EditEventForm.tsx index 63125252..998a9197 100644 --- a/src/pages/organizer/events/EditEventForm.tsx +++ b/src/pages/organizer/events/EditEventForm.tsx @@ -163,6 +163,7 @@ const buildEventSchema = ( .or(z.nan()), labelFormat: z.enum(LABEL_FORMATS), priceOnLabel: z.boolean(), + sellerNumberOnLabel: z.boolean(), privateSellersOnly: z.boolean(), fixedSellerData: z.boolean(), intakeFee: z @@ -270,6 +271,7 @@ function featuresToForm(stored: StoredEventFeatures | undefined): FeatureFormDat maxItemsPerSeller: features.maxItemsPerSeller, labelFormat: features.labelFormat, priceOnLabel: features.priceOnLabel, + sellerNumberOnLabel: features.sellerNumberOnLabel, intakeFee: features.intakeFee, privateSellersOnly: features.privateSellersOnly, fixedSellerData: features.fixedSellerData, @@ -296,6 +298,7 @@ function featuresFromForm(features: FeatureFormData): StoredEventFeatures { : undefined, labelFormat: features.labelFormat, priceOnLabel: features.priceOnLabel, + sellerNumberOnLabel: features.sellerNumberOnLabel, intakeFee: typeof features.intakeFee === 'number' && !isNaN(features.intakeFee) && features.intakeFee > 0 ? features.intakeFee @@ -717,7 +720,13 @@ export function EditEventForm() { } return; } - reset({ ...methods.getValues(), ...draft.values }); + // Switches added after the draft was saved keep their default + const current = methods.getValues(); + reset({ + ...current, + ...draft.values, + features: { ...current.features, ...draft.values.features }, + }); setPendingLocationCategories(draft.pendingLocationCategories); setEventType(findEventType(draft.eventType)?.id); setStep(WIZARD_STEPS.length - 1); diff --git a/src/pages/organizer/events/components/EditEventFeatures.tsx b/src/pages/organizer/events/components/EditEventFeatures.tsx index 6e1e7375..daa59b24 100644 --- a/src/pages/organizer/events/components/EditEventFeatures.tsx +++ b/src/pages/organizer/events/components/EditEventFeatures.tsx @@ -18,6 +18,7 @@ type FeatureKey = | 'questions' | 'photosOptional' | 'priceOnLabel' + | 'sellerNumberOnLabel' | 'privateSellersOnly' | 'fixedSellerData'; @@ -338,6 +339,12 @@ export function EditEventFeatures({

{t('features.labelsHint')}

+ +
- {small &&

Nr. 17

} + {small && withNumber &&

Nr. 17

}

- {[!small && number, price !== undefined && `${formatPriceDE(price)} €`] + {[!small && withNumber && number, price !== undefined && `${formatPriceDE(price)} €`] .filter(Boolean) .join(' · ')}

@@ -396,6 +407,7 @@ export function ItemsPreview({ type }: { type?: EventType }) { const limit = given(features.maxItemsPerSeller); const small = features.labelFormat === 'small'; const showPrice = !!features.priceOnLabel && !features.discounts; + const withNumber = features.sellerNumberOnLabel !== false; return ( · {t('wizard.preview.labelPriceHidden')}} + {!withNumber && ( + }>{t('wizard.preview.labelReusable')} + )} }> {chosen.length > 0 ? t('wizard.preview.categories', { categories: chosen.join(', ') }) @@ -455,6 +470,7 @@ export function ItemsPreview({ type }: { type?: EventType }) { small={small} title={items[0].title} price={showPrice ? items[0].price : undefined} + withNumber={withNumber} />
diff --git a/src/pages/organizer/events/dashboard/components/EventSettingsSummary.tsx b/src/pages/organizer/events/dashboard/components/EventSettingsSummary.tsx index b4319ac0..c2b0c9ba 100644 --- a/src/pages/organizer/events/dashboard/components/EventSettingsSummary.tsx +++ b/src/pages/organizer/events/dashboard/components/EventSettingsSummary.tsx @@ -155,6 +155,7 @@ export function EventSettingsSummary({ event }: { event: EventWithLabels }) { features.labelFormat === 'small' ? t('summary.labelsSmall') : t('summary.labelsLarge') } /> + { ); }); + it('tells the seller when the labels of a bazaar can be reused', async () => { + const reusable = { + ...events[0], + features: { sellerNumberOnLabel: false }, + } as unknown as Doc<'events'>; + render( + {}} + events={[reusable]} + products={products} + eventId="later" + /> + ); + expect(await screen.findByText(/beim nächsten Basar wiederverwenden/)).toBeInTheDocument(); + }); + it('prints the unsold items of the chosen bazaar for that bazaar', async () => { renderDialog('later'); expect(await screen.findByText('1 Etikett auf 1 A4-Seite')).toBeInTheDocument(); diff --git a/src/pages/seller/products/components/LabelPrintDialog.tsx b/src/pages/seller/products/components/LabelPrintDialog.tsx index 2d4ad2b5..657149ec 100644 --- a/src/pages/seller/products/components/LabelPrintDialog.tsx +++ b/src/pages/seller/products/components/LabelPrintDialog.tsx @@ -128,6 +128,9 @@ export function LabelPrintDialog({ }) : t('labels.formatPerItem')}

+ {bazaar?.event.features?.sellerNumberOnLabel === false && ( +

{t('labels.reusable')}

+ )} diff --git a/src/shared/eventFeatures.ts b/src/shared/eventFeatures.ts index d4403fac..1a44c4b6 100644 --- a/src/shared/eventFeatures.ts +++ b/src/shared/eventFeatures.ts @@ -37,6 +37,11 @@ export interface EventFeatures { labelFormat: LabelFormat; /** Print the price on labels; only takes effect while discounts are off. */ priceOnLabel: boolean; + /** + * Print the seller number on labels. Off, a label holds nothing specific to this bazaar + * (the QR code only links to the item), so sellers can reuse it at their next one. + */ + sellerNumberOnLabel: boolean; /** Fixed fee in € per accepted item (sold or not), kept from the payout; unset means none. */ intakeFee?: number; /** Sellers confirm when joining that they sell as private persons, not as traders. */ @@ -65,6 +70,7 @@ export const DEFAULT_EVENT_FEATURES: EventFeatures = { photosOptional: false, labelFormat: 'standard', priceOnLabel: false, + sellerNumberOnLabel: true, privateSellersOnly: false, fixedSellerData: false, }; From 67db16a0eb437b962c8d8c2aa8bc909fc9f11f9b Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Mon, 2 Nov 2026 10:27:36 +0100 Subject: [PATCH 02/58] fix(events): address everywhere, drafts that stay out of the way, pages that load again - Reminders, calendar, exports and lists name the full address; address parts count as repeated only as whole words; a street alone reaches the JSON-LD - A draft returns to its step and can be discarded; ?type= beats an old draft; only a finished draft is created by itself; cancel and sign-out clear it - Missing draft after the sign-up says where it is; a removed cover stays removed - Failed page chunks load again without a manual reload; a reload only when the server answers; preloading retries; no onboarding prompt after the wizard - Wizard preview prints the label number as the real label does Co-Authored-By: Claude Opus 5.5 --- backend/src/modules/features.rs | 76 +++++++++++++++++++ backend/src/modules/reminders.rs | 7 +- backend/src/modules/seller_records.rs | 2 +- backend/src/modules/settlement.rs | 2 +- src/components/layout/PageErrorBoundary.tsx | 4 +- src/lib/api/react.tsx | 7 +- src/lib/eventDraft.ts | 4 + src/lib/lazyPage.test.ts | 26 +++++++ src/lib/lazyPage.ts | 74 ++++++++++++++---- src/locales/de/organizer.json | 4 +- src/locales/en/organizer.json | 4 +- src/pages/administrator/AdminEventsPage.tsx | 2 +- src/pages/organizer/events/EditEventForm.tsx | 76 ++++++++++++++----- .../events/EditEventForm.wizard.test.tsx | 51 +++++++++++++ .../events/components/EventPageSidebar.tsx | 4 +- .../components/wizard/WizardPreviews.tsx | 2 +- src/pages/public/auth/RegisterPage.tsx | 8 +- .../components/MyProductSelectEvents.tsx | 3 +- src/shared/eventJsonLd.test.ts | 32 ++++++++ src/shared/eventJsonLd.ts | 14 +++- src/shared/reminderContent.ts | 10 ++- 21 files changed, 355 insertions(+), 57 deletions(-) create mode 100644 src/lib/lazyPage.test.ts diff --git a/backend/src/modules/features.rs b/backend/src/modules/features.rs index 921dc6c9..f581bbf4 100644 --- a/backend/src/modules/features.rs +++ b/backend/src/modules/features.rs @@ -93,6 +93,51 @@ impl Event { pub fn resolved_features(&self) -> EventFeatures { resolve(self.features.as_ref()) } + + /// "Turnhalle Nord, Hauptstr. 5, 89073 Ulm" (formatEventPlace in the app). + pub fn place(&self) -> String { + format_place( + &self.location, + self.street.as_deref(), + self.postal_code.as_deref(), + self.city.as_deref(), + ) + } +} + +/// Whether `part` stands in `text` as whole words: "Ulm" is not in "Ulmer Halle". +fn contains_words(text: &str, part: &str) -> bool { + let text = text.to_lowercase(); + let part = part.to_lowercase(); + text.match_indices(&part).any(|(start, _)| { + let before = text[..start].chars().next_back(); + let after = text[start + part.len()..].chars().next(); + !before.is_some_and(char::is_alphanumeric) && !after.is_some_and(char::is_alphanumeric) + }) +} + +fn format_place( + location: &str, + street: Option<&str>, + postal_code: Option<&str>, + city: Option<&str>, +) -> String { + let location = location.trim(); + let town = [postal_code, city] + .into_iter() + .flatten() + .map(str::trim) + .filter(|part| !part.is_empty()) + .collect::>() + .join(" "); + let mut parts = vec![location.to_owned()]; + for part in [street.unwrap_or_default().trim(), town.as_str()] { + if !part.is_empty() && !contains_words(location, part) { + parts.push(part.to_owned()); + } + } + parts.retain(|part| !part.is_empty()); + parts.join(", ") } /// Whether questions on items of this event can be asked right now. @@ -170,6 +215,37 @@ mod tests { ); } + #[test] + fn the_place_names_venue_and_address_once() { + assert_eq!( + format_place( + "Turnhalle Nord", + Some("Hauptstr. 5"), + Some("89073"), + Some("Ulm") + ), + "Turnhalle Nord, Hauptstr. 5, 89073 Ulm" + ); + assert_eq!( + format_place( + "Halle, Hauptstr. 5, 89073 Ulm", + Some("hauptstr. 5"), + Some("89073"), + Some("Ulm") + ), + "Halle, Hauptstr. 5, 89073 Ulm" + ); + // Only whole words count as already there + assert_eq!( + format_place("Ulmer Stadthalle", None, None, Some("Ulm")), + "Ulmer Stadthalle, Ulm" + ); + assert_eq!( + format_place("Halle, Hauptstr. 50", Some("Hauptstr. 5"), None, None), + "Halle, Hauptstr. 50, Hauptstr. 5" + ); + } + #[test] fn discounted_prices() { assert_eq!( diff --git a/backend/src/modules/reminders.rs b/backend/src/modules/reminders.rs index 06dcd45b..3a8ab30c 100644 --- a/backend/src/modules/reminders.rs +++ b/backend/src/modules/reminders.rs @@ -247,7 +247,7 @@ pub fn day_before_info( }, Detail { label: t.t("reminder.location", &[]), - value: event.location.clone(), + value: event.place(), }, ]; if let Some(dropoff) = &dropoff { @@ -312,12 +312,13 @@ pub fn pickup_reminder( if !unsold.is_empty() { paragraphs.push(t.t("reminder.pickup.toPickUp", &[("items", &listed)])); } + let place = event.place(); paragraphs.push(match &pickup { Some(pickup) => t.t( "reminder.pickup.when", - &[("pickup", pickup), ("location", &event.location)], + &[("pickup", pickup), ("location", &place)], ), - None => t.t("reminder.pickup.where", &[("location", &event.location)]), + None => t.t("reminder.pickup.where", &[("location", &place)]), }); paragraphs.extend(note_paragraphs(event)); paragraphs.extend(contact_paragraph(event, t)); diff --git a/backend/src/modules/seller_records.rs b/backend/src/modules/seller_records.rs index c7e0d060..69783f0d 100644 --- a/backend/src/modules/seller_records.rs +++ b/backend/src/modules/seller_records.rs @@ -504,8 +504,8 @@ async fn get_proof_of_offers(ctx: &mut Ctx, args: EventArgs) -> AppResult }); Ok(Proof { event: ProofEvent { + location: event.place(), title: event.title, - location: event.location, start_date: event.start_date, end_date: event.end_date, }, diff --git a/backend/src/modules/settlement.rs b/backend/src/modules/settlement.rs index bd82c685..d29226d5 100644 --- a/backend/src/modules/settlement.rs +++ b/backend/src/modules/settlement.rs @@ -140,8 +140,8 @@ async fn get_export(ctx: &mut Ctx, args: EventArgs) -> AppResult { sellers.sort_by_key(|seller| seller.seller_number.unwrap_or(i32::MAX)); Ok(Export { event: ExportEvent { + location: event.place(), title: event.title, - location: event.location, start_date: event.start_date, end_date: event.end_date, commission: event.commission, diff --git a/src/components/layout/PageErrorBoundary.tsx b/src/components/layout/PageErrorBoundary.tsx index d764b643..3efc1844 100644 --- a/src/components/layout/PageErrorBoundary.tsx +++ b/src/components/layout/PageErrorBoundary.tsx @@ -5,6 +5,7 @@ import { AlertTriangle } from 'lucide-react'; import { ApiError } from '../../lib/api/client'; import { useApiClient } from '../../lib/api/react'; import { getUserFacingErrorMessage } from '../../lib/errors'; +import { PageLoadError, retryPageLoad } from '../../lib/lazyPage'; import { RetryButton } from '../ui/loading'; function PageError({ error, onRetry }: { error: unknown; onRetry: () => void }) { @@ -22,7 +23,8 @@ function PageError({ error, onRetry }: { error: unknown; onRetry: () => void }) { client.retryFailed(); - onRetry(); + if (error instanceof PageLoadError) void retryPageLoad().finally(onRetry); + else onRetry(); }} /> diff --git a/src/lib/api/react.tsx b/src/lib/api/react.tsx index 6ea9dc23..f2998a6b 100644 --- a/src/lib/api/react.tsx +++ b/src/lib/api/react.tsx @@ -1,3 +1,4 @@ +import { clearEventDraft } from '../eventDraft'; import { createContext, useCallback, @@ -132,7 +133,11 @@ export function useAuthActions() { () => ({ signIn: (provider: string, params?: Record) => client.signIn(provider, params), - signOut: () => client.signOut(), + signOut: () => { + // A draft in this browser must not wait for the next person signing in + clearEventDraft(); + return client.signOut(); + }, changePassword: (oldPassword: string, newPassword: string) => client.changePassword(oldPassword, newPassword), }), diff --git a/src/lib/eventDraft.ts b/src/lib/eventDraft.ts index dfc98056..f9ba429b 100644 --- a/src/lib/eventDraft.ts +++ b/src/lib/eventDraft.ts @@ -14,6 +14,10 @@ export interface EventDraft { values: Values; pendingLocationCategories: string[]; eventType?: string; + /** The wizard step to come back to; drafts without one go to the last step */ + step?: number; + /** The guest finished the wizard: only then the sign-up creates the bazaar by itself */ + submitted?: boolean; savedAt: number; } diff --git a/src/lib/lazyPage.test.ts b/src/lib/lazyPage.test.ts new file mode 100644 index 00000000..2f721689 --- /dev/null +++ b/src/lib/lazyPage.test.ts @@ -0,0 +1,26 @@ +import { afterEach, describe, expect, it, vi } from 'vitest'; +import { isServerReachable } from './lazyPage'; + +describe('isServerReachable', () => { + afterEach(() => vi.restoreAllMocks()); + + it('asks the server even when the browser says online', async () => { + vi.spyOn(navigator, 'onLine', 'get').mockReturnValue(true); + const fetchMock = vi.spyOn(globalThis, 'fetch').mockRejectedValue(new TypeError('no internet')); + await expect(isServerReachable()).resolves.toBe(false); + expect(fetchMock).toHaveBeenCalledTimes(1); + }); + + it('is fine with any answer of the server', async () => { + vi.spyOn(navigator, 'onLine', 'get').mockReturnValue(true); + vi.spyOn(globalThis, 'fetch').mockResolvedValue(new Response(null, { status: 404 })); + await expect(isServerReachable()).resolves.toBe(true); + }); + + it('does not ask while the browser is offline', async () => { + vi.spyOn(navigator, 'onLine', 'get').mockReturnValue(false); + const fetchMock = vi.spyOn(globalThis, 'fetch'); + await expect(isServerReachable()).resolves.toBe(false); + expect(fetchMock).not.toHaveBeenCalled(); + }); +}); diff --git a/src/lib/lazyPage.ts b/src/lib/lazyPage.ts index ad89003a..7e95a99a 100644 --- a/src/lib/lazyPage.ts +++ b/src/lib/lazyPage.ts @@ -1,4 +1,4 @@ -import { lazy, type ComponentType } from 'react'; +import { createElement, lazy, type ComponentType } from 'react'; /** * Pages behind the sign-in load as their own chunks, so visitors of the public pages @@ -10,13 +10,36 @@ const loaders: (() => Promise)[] = []; const RELOADED_KEY = 'bazarpro.chunkReload'; const RELOAD_PAUSE_MS = 10_000; +const PRELOAD_RETRY_MS = 60_000; + +/** A page's code could not be loaded: the connection is gone or a new version is out. */ +export class PageLoadError extends Error { + constructor(cause: unknown) { + super('Page could not be loaded', { cause }); + this.name = 'PageLoadError'; + } +} + +/** + * navigator.onLine also says yes on a hall Wi-Fi without internet, where a reload would + * end on the browser's error page and lose the running app: ask the server first. + */ +export async function isServerReachable(): Promise { + if (typeof navigator !== 'undefined' && !navigator.onLine) return false; + try { + await fetch(window.location.origin, { method: 'HEAD', cache: 'no-store' }); + return true; + } catch { + return false; + } +} /** - * A chunk that fails to load while online is from an older deploy: its file is gone. - * Loading the page again fetches the current ones, once; offline the error stays. + * A chunk that fails to load while the server answers is from an older deploy: its file + * is gone. Loading the page again fetches the current ones, once. */ -function reloadForNewDeploy(error: unknown): never { - if (typeof navigator !== 'undefined' && navigator.onLine) { +async function reloadForNewDeploy(error: unknown): Promise { + if (await isServerReachable()) { try { const last = Number(sessionStorage.getItem(RELOADED_KEY) ?? 0); if (Date.now() - last > RELOAD_PAUSE_MS) { @@ -27,25 +50,44 @@ function reloadForNewDeploy(error: unknown): never { // No session storage: show the error instead of risking a reload loop } } - throw error; + throw new PageLoadError(error); +} + +/** "Try again" after a failed page: browsers may keep a failed import until a reload. */ +export async function retryPageLoad(): Promise { + if (await isServerReachable()) window.location.reload(); } /** A named page export as lazy component: `lazyPage(() => import('./X'), 'X')`. */ export function lazyPage(load: () => Promise, name: K) { loaders.push(load); - return lazy(() => - load().then( - (module) => ({ default: module[name] as ComponentType> }), - reloadForNewDeploy - ) - ); + // React.lazy keeps a failure for good: after one, the next render starts a new attempt + const create = () => + lazy(() => + load().then( + (module) => ({ default: module[name] as ComponentType> }), + (error: unknown) => { + current = create(); + return reloadForNewDeploy(error); + } + ) + ); + let current = create(); + return function LazyPage() { + return createElement(current); + }; } let preloaded = false; +let preloading = false; -/** Loads all lazy pages in the background, once. */ +/** Loads all lazy pages in the background, until all are there. */ export function preloadPages() { - if (preloaded) return; - preloaded = true; - for (const load of loaders) void load().catch(() => undefined); + if (preloaded || preloading) return; + preloading = true; + void Promise.allSettled(loaders.map((load) => load())).then((results) => { + preloading = false; + if (results.every((result) => result.status === 'fulfilled')) preloaded = true; + else setTimeout(preloadPages, PRELOAD_RETRY_MS); + }); } diff --git a/src/locales/de/organizer.json b/src/locales/de/organizer.json index 110ad16d..b1c0aab7 100644 --- a/src/locales/de/organizer.json +++ b/src/locales/de/organizer.json @@ -791,6 +791,8 @@ "fixErrors": "Bitte prüfe die markierten Angaben.", "guestCreate": "Konto anlegen und Basar erstellen", "draftRestored": "Dein Entwurf ist wieder da.", + "draftElsewhere": "Dein Entwurf liegt im Browser, in dem du den Basar eingerichtet hast. Öffne BazarPro dort, um ihn anzulegen, oder beginne hier neu.", + "draftDiscard": "Neu beginnen", "creatingDraft": "Dein Basar wird angelegt …", "preview": { "label": "Vorschau", @@ -814,7 +816,7 @@ "labelLarge": "Großes Etikett · 12 pro A4-Seite", "labelSmall": "Kleines Etikett · 40 pro A4-Seite", "labelPriceHidden": "Ohne Preis: Rabatte ändern ihn ja noch.", - "labelNumber": "Nr. {{seller}}-{{item}}", + "labelNumber": "Nr. {{seller}}", "labelReusable": "Ohne Verkäufernummer: Das Etikett passt auch beim nächsten Basar.", "photoRequired": "Foto Pflicht", "photoOptional": "Ohne Foto", diff --git a/src/locales/en/organizer.json b/src/locales/en/organizer.json index 0726310d..02724ddf 100644 --- a/src/locales/en/organizer.json +++ b/src/locales/en/organizer.json @@ -791,6 +791,8 @@ "fixErrors": "Please check the marked details.", "guestCreate": "Sign up and create bazaar", "draftRestored": "Your draft is back.", + "draftElsewhere": "Your draft is in the browser where you set up the bazaar. Open BazarPro there to create it, or start again here.", + "draftDiscard": "Start over", "creatingDraft": "Creating your bazaar …", "preview": { "label": "Preview", @@ -814,7 +816,7 @@ "labelLarge": "Large label · 12 per A4 page", "labelSmall": "Small label · 40 per A4 page", "labelPriceHidden": "No price: discounts may still change it.", - "labelNumber": "No. {{seller}}-{{item}}", + "labelNumber": "No. {{seller}}", "labelReusable": "No seller number: the label also works at the next bazaar.", "photoRequired": "Photo required", "photoOptional": "No photo", diff --git a/src/pages/administrator/AdminEventsPage.tsx b/src/pages/administrator/AdminEventsPage.tsx index d5f0a170..46cb32c4 100644 --- a/src/pages/administrator/AdminEventsPage.tsx +++ b/src/pages/administrator/AdminEventsPage.tsx @@ -206,7 +206,7 @@ function Events() {
{event.title}
-
{event.location}
+
{formatEventPlace(event)}
{event.moderation && (
{t('events.blockedReason', { reason: event.moderation.reason })} diff --git a/src/pages/organizer/events/EditEventForm.tsx b/src/pages/organizer/events/EditEventForm.tsx index 998a9197..842ddb4c 100644 --- a/src/pages/organizer/events/EditEventForm.tsx +++ b/src/pages/organizer/events/EditEventForm.tsx @@ -244,14 +244,19 @@ type FeatureFormData = EventFormData['features']; /** What a draft keeps: everything but own pictures, which cannot wait in the browser */ type DraftValues = Omit< EventFormData, - 'coverImageFile' | 'eventMapImageFile' | 'removeCoverImage' | 'removeEventMapImage' ->; + | 'coverImageFile' + | 'eventMapImageFile' + | 'removeCoverImage' + | 'removeEventMapImage' + | 'coverTemplate' +> & { coverTemplate: EventFormData['coverTemplate'] | null }; function draftValues(data: EventFormData): DraftValues { // eslint-disable-next-line @typescript-eslint/no-unused-vars -- left out on purpose const { coverImageFile, eventMapImageFile, removeCoverImage, removeEventMapImage, ...rest } = data; - return rest; + // null: JSON would drop undefined, and a removed cover would come back as the default + return { ...rest, coverTemplate: rest.coverTemplate ?? null }; } function featuresToForm(stored: StoredEventFeatures | undefined): FeatureFormData { @@ -676,48 +681,67 @@ export function EditEventForm() { if (index >= 0) setStep(index); toast.error(t('wizard.fixErrors')); }; - const keepDraft = () => + const keepDraft = (draftStep: number, submitted = false) => saveEventDraft({ values: draftValues(methods.getValues()), pendingLocationCategories, eventType, + step: draftStep, + submitted, }); const goToStep = async (next: number) => { if (next > step) { const fields = WIZARD_STEPS[step].fields; if (fields.length > 0 && !(await methods.trigger(fields as never))) return; } - if (isGuest) keepDraft(); + if (isGuest) keepDraft(next); setStep(next); }; // Own pictures need an account: back here after the login, the draft is still there const loginForPictures = () => { - keepDraft(); + keepDraft(step); navigate(`/login?redirect=${encodeURIComponent('/events/new')}`); }; // Last step without an account: keep the bazaar and create it right after the sign-up const onGuestSubmit = () => { - keepDraft(); + keepDraft(step, true); navigate(`/register?redirect=${encodeURIComponent(CREATE_DRAFT_PATH)}`); }; // A waiting draft comes back once the form is ready; after the sign-up it is created const draftHandled = useRef(false); const [creatingDraft, setCreatingDraft] = useState(false); + const [draftRestored, setDraftRestored] = useState(false); + const discardDraft = () => { + clearEventDraft(); + reset(); + setPendingLocationCategories([]); + setEventType(undefined); + setDraftRestored(false); + setStep(0); + }; useEffect(() => { if (isEditing || isAuthLoading || !categories || draftHandled.current) return; draftHandled.current = true; + const wantsDraft = searchParams.get('draft') === '1'; + if (wantsDraft) searchParams.delete('draft'); + // From the landing page: start with the kind of bazaar the visitor picked there, + // even over an older draft + const type = wantsDraft ? undefined : findEventType(searchParams.get('type') ?? undefined); + if (type) { + clearEventDraft(); + searchParams.delete('type'); + setSearchParams(searchParams, { replace: true }); + applyEventType(type.id); + return; + } + if (wantsDraft) setSearchParams(searchParams, { replace: true }); const draft = loadEventDraft(); if (!draft) { - // From the landing page: start with the kind of bazaar the visitor picked there - const type = findEventType(searchParams.get('type') ?? undefined); - if (type) { - searchParams.delete('type'); - setSearchParams(searchParams, { replace: true }); - applyEventType(type.id); - } + // The link of the confirmation mail may open in another browser than the wizard + if (wantsDraft) toast.warning(t('wizard.draftElsewhere'), { duration: 15_000 }); return; } // Switches added after the draft was saved keep their default @@ -725,17 +749,16 @@ export function EditEventForm() { reset({ ...current, ...draft.values, + coverTemplate: draft.values.coverTemplate ?? undefined, features: { ...current.features, ...draft.values.features }, }); setPendingLocationCategories(draft.pendingLocationCategories); setEventType(findEventType(draft.eventType)?.id); - setStep(WIZARD_STEPS.length - 1); - if (isAuthenticated && searchParams.get('draft') === '1') { - searchParams.delete('draft'); - setSearchParams(searchParams, { replace: true }); + setStep(Math.min(draft.step ?? WIZARD_STEPS.length - 1, WIZARD_STEPS.length - 1)); + if (isAuthenticated && wantsDraft && draft.submitted) { setCreatingDraft(true); } else { - toast.info(t('wizard.draftRestored')); + setDraftRestored(true); } // eslint-disable-next-line react-hooks/exhaustive-deps -- once, when auth and categories are known }, [isEditing, isAuthLoading, categories, isAuthenticated]); @@ -962,6 +985,16 @@ export function EditEventForm() { }} className="space-y-6" > + {draftRestored && ( + + + {t('wizard.draftRestored')} + + + + )} void goToStep(index)} />
navigate('/')} + onClick={() => { + clearEventDraft(); + navigate('/'); + }} disabled={isSubmitting} > {t('actions.cancel', { ns: 'common' })} diff --git a/src/pages/organizer/events/EditEventForm.wizard.test.tsx b/src/pages/organizer/events/EditEventForm.wizard.test.tsx index 9a8138d3..0c0260bb 100644 --- a/src/pages/organizer/events/EditEventForm.wizard.test.tsx +++ b/src/pages/organizer/events/EditEventForm.wizard.test.tsx @@ -301,6 +301,57 @@ describe('event creation wizard', () => { consoleError.mockRestore(); }, 20_000); + const storeDraft = (extra: Record) => + localStorage.setItem( + 'bazarpro.eventDraft', + JSON.stringify({ + values: { title: 'Alter Entwurf', coverTemplate: 'market' }, + pendingLocationCategories: [], + savedAt: Date.now(), + ...extra, + }) + ); + + it('comes back to the step of the draft and can start over', async () => { + auth.current = { isLoading: false, isAuthenticated: false }; + storeDraft({ step: 1 }); + renderWizard(); + expect(await screen.findByText('Wie wird verkauft?')).toBeInTheDocument(); + fireEvent.click(screen.getByRole('button', { name: 'Neu beginnen' })); + expect(localStorage.getItem('bazarpro.eventDraft')).toBeNull(); + expect(screen.queryByText('Wie wird verkauft?')).toBeNull(); + expect(screen.queryByRole('button', { name: 'Neu beginnen' })).toBeNull(); + }, 20_000); + + it('takes the kind picked on the landing page over an older draft', async () => { + auth.current = { isLoading: false, isAuthenticated: false }; + storeDraft({ step: 7 }); + renderWizard('/events/new?type=kidsBazaar'); + expect(await screen.findByText('Wie wird verkauft?')).toBeInTheDocument(); + expect(localStorage.getItem('bazarpro.eventDraft')).toBeNull(); + }, 20_000); + + it('does not create an unfinished draft by itself', async () => { + storeDraft({ step: 7 }); + renderWizard('/events/new?draft=1'); + expect(await screen.findByRole('button', { name: 'Neu beginnen' })).toBeInTheDocument(); + expect(createEvent).not.toHaveBeenCalled(); + }, 20_000); + + it('keeps a removed cover removed in the draft', async () => { + auth.current = { isLoading: false, isAuthenticated: false }; + storeDraft({ values: { title: 'Basar', coverTemplate: 'ski' } }); + renderWizard(); + const chosen = await screen.findByRole('button', { name: 'Vorlage „Skipiste“ wählen' }); + fireEvent.click(chosen); + expect(chosen).toHaveAttribute('aria-pressed', 'false'); + fireEvent.click(screen.getAllByRole('button', { name: 'Anmelden und hochladen' })[0]); + expect(await screen.findByText(/^Registrierung/)).toBeInTheDocument(); + expect( + JSON.parse(localStorage.getItem('bazarpro.eventDraft')!).values.coverTemplate + ).toBeNull(); + }, 20_000); + it('lets visitors pick a template, but own pictures need the login', async () => { auth.current = { isLoading: false, isAuthenticated: false }; localStorage.setItem( diff --git a/src/pages/organizer/events/components/EventPageSidebar.tsx b/src/pages/organizer/events/components/EventPageSidebar.tsx index e58d4a9f..0c1cd83b 100644 --- a/src/pages/organizer/events/components/EventPageSidebar.tsx +++ b/src/pages/organizer/events/components/EventPageSidebar.tsx @@ -49,7 +49,7 @@ export function EventPageSidebar({ event, conditions }: EventPageSidebarProps) { const googleCalendarUrl = createGoogleCalendarUrl({ title: event.title, description: event.description, - location: event.location, + location: formatEventPlace(event), startDate: event.startDate, endDate: event.endDate, url: eventUrl, @@ -155,7 +155,7 @@ export function EventPageSidebar({ event, conditions }: EventPageSidebarProps) { downloadIcsEvent({ title: event.title, description: event.description, - location: event.location, + location: formatEventPlace(event), startDate: event.startDate, endDate: event.endDate, url: eventUrl, diff --git a/src/pages/organizer/events/components/wizard/WizardPreviews.tsx b/src/pages/organizer/events/components/wizard/WizardPreviews.tsx index b1202ece..09ae56c2 100644 --- a/src/pages/organizer/events/components/wizard/WizardPreviews.tsx +++ b/src/pages/organizer/events/components/wizard/WizardPreviews.tsx @@ -351,7 +351,7 @@ function LabelPreview({ withNumber: boolean; }) { const { t } = useTranslation('organizer'); - const number = t('wizard.preview.labelNumber', { seller: 17, item: 42 }); + const number = t('wizard.preview.labelNumber', { seller: 17 }); return (
diff --git a/src/pages/public/auth/RegisterPage.tsx b/src/pages/public/auth/RegisterPage.tsx index e7d6e1ba..a1be9ec4 100644 --- a/src/pages/public/auth/RegisterPage.tsx +++ b/src/pages/public/auth/RegisterPage.tsx @@ -1,3 +1,4 @@ +import { CREATE_DRAFT_PATH } from '../../../lib/eventDraft'; import { PasswordInput } from '../../../components/auth/PasswordInput'; import { MIN_PASSWORD_LENGTH } from '../../../shared/constants'; import { BackButton } from '../../../components/navigation/BackButton'; @@ -72,9 +73,12 @@ export function RegisterPage() { : (returnTo ?? BROWSE_EVENTS_PATH); useEffect(() => { - if (!redirectAfterLogin || verificationEmail || joinEventId) return; + // Coming from the wizard the choice is made: the user is creating a bazaar + if (!redirectAfterLogin || verificationEmail || joinEventId || returnTo === CREATE_DRAFT_PATH) { + return; + } setFlowSelectionOnboardingPending(); - }, [redirectAfterLogin, verificationEmail, joinEventId]); + }, [redirectAfterLogin, verificationEmail, joinEventId, returnTo]); const { register, diff --git a/src/pages/seller/products/components/MyProductSelectEvents.tsx b/src/pages/seller/products/components/MyProductSelectEvents.tsx index 78eac2cf..cc618720 100644 --- a/src/pages/seller/products/components/MyProductSelectEvents.tsx +++ b/src/pages/seller/products/components/MyProductSelectEvents.tsx @@ -1,3 +1,4 @@ +import { formatEventPlace } from '../../../../shared/eventJsonLd'; import { useFormContext } from 'react-hook-form'; import { Label } from '../../../../components/ui/label'; import { Checkbox } from '../../../../components/ui/checkbox'; @@ -97,7 +98,7 @@ export function MyProductSelectEvents({ {event.title} {isPast && t('form.ended')}
- {formatDateRangeDE(event.startDate, event.endDate)} - {event.location} + {formatDateRangeDE(event.startDate, event.endDate)} - {formatEventPlace(event)}
diff --git a/src/shared/eventJsonLd.test.ts b/src/shared/eventJsonLd.test.ts index 09883ce0..c1578051 100644 --- a/src/shared/eventJsonLd.test.ts +++ b/src/shared/eventJsonLd.test.ts @@ -121,3 +121,35 @@ describe('formatEventPlace and eventTown', () => { expect(eventTown({ location: 'Halle Ulm', city: ' ' })).toBe('Halle Ulm'); }); }); + +describe('formatEventPlace with whole words', () => { + it('keeps a town that only looks like part of the venue', () => { + expect(formatEventPlace({ location: 'Ulmer Stadthalle', city: 'Ulm' })).toBe( + 'Ulmer Stadthalle, Ulm' + ); + expect(formatEventPlace({ location: 'Halle, Hauptstr. 50', street: 'Hauptstr. 5' })).toBe( + 'Halle, Hauptstr. 50, Hauptstr. 5' + ); + }); + + it('does not repeat what the venue already says', () => { + expect( + formatEventPlace({ + location: 'Halle, Hauptstr. 5, 89073 Ulm', + street: 'hauptstr. 5', + postalCode: '89073', + city: 'Ulm', + }) + ).toBe('Halle, Hauptstr. 5, 89073 Ulm'); + }); +}); + +describe('placeOf with a street only', () => { + it('keeps street and country', () => { + expect(placeOf({ location: 'Halle', street: 'Hauptstr. 5', country: 'AT' }).address).toEqual({ + '@type': 'PostalAddress', + streetAddress: 'Hauptstr. 5', + addressCountry: 'AT', + }); + }); +}); diff --git a/src/shared/eventJsonLd.ts b/src/shared/eventJsonLd.ts index 08f8544c..9b8e11f2 100644 --- a/src/shared/eventJsonLd.ts +++ b/src/shared/eventJsonLd.ts @@ -10,6 +10,12 @@ export interface EventPlace { country?: string | null; } +/** Whether `part` stands in `text` as whole words: "Ulm" is not in "Ulmer Stadthalle". */ +function containsWords(text: string, part: string): boolean { + const escaped = part.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + return new RegExp(`(^|[^\\p{L}\\p{N}])${escaped}($|[^\\p{L}\\p{N}])`, 'iu').test(text); +} + /** "Turnhalle Nord, Hauptstr. 5, 89073 Ulm"; parts already in the location are not repeated. */ export function formatEventPlace(event: EventPlace): string { const location = event.location.trim(); @@ -19,7 +25,7 @@ export function formatEventPlace(event: EventPlace): string { .join(' '); const parts = [location]; for (const part of [event.street?.trim(), town]) { - if (part && !location.toLowerCase().includes(part.toLowerCase())) parts.push(part); + if (part && !containsWords(location, part)) parts.push(part); } return parts.filter(Boolean).join(', '); } @@ -54,7 +60,11 @@ export function placeOf(event: EventPlace): Place { const street = event.street?.trim(); const postalCode = event.postalCode?.trim(); const city = event.city?.trim(); - if (!postalCode && !city) return placeFromLocation(event.location); + if (!postalCode && !city) { + // Only a street is no address yet, unless the location of an older event has the rest + const parsed = placeFromLocation(event.location); + if (!street || typeof parsed.address !== 'string') return parsed; + } return { '@type': 'Place', name: event.location.trim() || formatEventPlace(event), diff --git a/src/shared/reminderContent.ts b/src/shared/reminderContent.ts index 41244adf..685b5fb2 100644 --- a/src/shared/reminderContent.ts +++ b/src/shared/reminderContent.ts @@ -1,5 +1,6 @@ import type { NotificationCategory } from './constants'; import { formatBerlinRange } from './berlinTime'; +import { formatEventPlace } from './eventJsonLd'; import type { MailT } from './i18n'; /** An email of the backend (backend/src/modules/notifications.rs), here for the previews. */ @@ -23,6 +24,9 @@ export interface ReminderEvent { _id: string; title: string; location: string; + street?: string | null; + postalCode?: string | null; + city?: string | null; startDate: number; endDate: number; contactInfo: string; @@ -64,7 +68,7 @@ export function dayBeforeInfo( label: t('reminder.bazaar'), value: formatBerlinRange(event.startDate, event.endDate, t.locale), }, - { label: t('reminder.location'), value: event.location }, + { label: t('reminder.location'), value: formatEventPlace(event) }, ...(dropoff ? [{ label: t('reminder.dropoff'), value: dropoff }] : []), ...(seller.sellerNumber !== undefined ? [{ label: t('reminder.yourNumber'), value: String(seller.sellerNumber) }] @@ -109,8 +113,8 @@ export function pickupReminder( t('reminder.pickup.over', { event: event.title, count: seller.soldCount }), ...(unsold.length > 0 ? [t('reminder.pickup.toPickUp', { items: listed + more })] : []), pickup - ? t('reminder.pickup.when', { pickup, location: event.location }) - : t('reminder.pickup.where', { location: event.location }), + ? t('reminder.pickup.when', { pickup, location: formatEventPlace(event) }) + : t('reminder.pickup.where', { location: formatEventPlace(event) }), ...noteParagraphs(event), ...contactParagraph(event, t), ], From 711736771a8036d710ebeef63793604a0fffb0b6 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Mon, 2 Nov 2026 10:43:27 +0100 Subject: [PATCH 03/58] feat(labels): universal labels for many small items, start place on the sheet A bazaar chooses what marks the seller on labels: the number, a universal mark or nothing. The universal mark stays with the seller (users.sort_code), so printed labels work at other bazaars: a large digit and three fields to sort by sight. Fields have color and symbol, so black and white prints work and color-blind helpers can tell them apart. Only on the small sheet. The team prints one sheet per basket, in sorting order. Sellers can start on a free place of a partly used sheet (#238). Co-Authored-By: Claude Opus 5.5 --- backend/migrations/0017_user_sort_code.sql | 4 + backend/src/modules/event_roles.rs | 13 +++ backend/src/modules/events.rs | 23 +++-- backend/src/modules/features.rs | 20 +++-- backend/src/modules/labels.rs | 27 ++++-- backend/src/modules/products.rs | 2 +- backend/tests/api/reminders.rs | 55 +++++++----- src/components/sellers/SortMarkBadge.tsx | 49 +++++++++++ src/lib/api/types.ts | 27 +++--- src/lib/productQRCodePdf.test.ts | 20 +++++ src/lib/productQRCodePdf.ts | 31 +++++-- src/lib/sortMarkPdf.ts | 77 +++++++++++++++++ src/lib/sortSheetsPdf.ts | 45 ++++++++++ src/locales/de/company.json | 2 +- src/locales/de/organizer.json | 16 +++- src/locales/de/seller.json | 3 + src/locales/en/company.json | 2 +- src/locales/en/organizer.json | 16 +++- src/locales/en/seller.json | 3 + src/pages/organizer/events/EditEventForm.tsx | 8 +- .../events/components/EditEventFeatures.tsx | 36 ++++++-- .../components/wizard/WizardPreviews.tsx | 30 +++++-- .../events/dashboard/SellerManagementPage.tsx | 27 ++++++ .../components/EventSettingsSummary.tsx | 10 ++- .../components/LabelPrintDialog.test.tsx | 26 +++++- .../products/components/LabelPrintDialog.tsx | 37 ++++++++- src/shared/constants.ts | 4 + src/shared/eventFeatures.ts | 19 +++-- src/shared/sortCode.test.ts | 37 +++++++++ src/shared/sortCode.ts | 83 +++++++++++++++++++ 30 files changed, 652 insertions(+), 100 deletions(-) create mode 100644 backend/migrations/0017_user_sort_code.sql create mode 100644 src/components/sellers/SortMarkBadge.tsx create mode 100644 src/lib/sortMarkPdf.ts create mode 100644 src/lib/sortSheetsPdf.ts create mode 100644 src/shared/sortCode.test.ts create mode 100644 src/shared/sortCode.ts diff --git a/backend/migrations/0017_user_sort_code.sql b/backend/migrations/0017_user_sort_code.sql new file mode 100644 index 00000000..d1b07f00 --- /dev/null +++ b/backend/migrations/0017_user_sort_code.sql @@ -0,0 +1,4 @@ +-- A number that stays with a seller across all bazaars. Universal labels print it as a +-- digit, symbols and colors (src/shared/sortCode.ts), so they can be reused. Numbers are +-- not given out again, also after an account is deleted. +ALTER TABLE users ADD COLUMN sort_code integer GENERATED BY DEFAULT AS IDENTITY UNIQUE; diff --git a/backend/src/modules/event_roles.rs b/backend/src/modules/event_roles.rs index c792d0f7..3cf9dd81 100644 --- a/backend/src/modules/event_roles.rs +++ b/backend/src/modules/event_roles.rs @@ -10,6 +10,7 @@ use uuid::Uuid; use super::access::is_platform_admin; use super::docs::{self, User}; +use super::features::label_mark; use super::sales::{self, IntakeFee}; use super::seller_records::{keeps_seller_record, with_snapshot}; use crate::error::{AppError, AppResult}; @@ -234,6 +235,8 @@ pub struct VendorWithCalculations { pub is_helper: bool, /// Seller number of this event; missing for sellers from before numbers existed pub seller_number: Option, + /// The seller's lasting code, on bazaars with universal labels + pub sort_code: Option, /// Bazaars with fixedSellerData: name and address are recorded (first item accepted). /// Before, the team checks them against the ID card and the seller may still correct them. pub details_recorded: Option, @@ -281,6 +284,7 @@ pub async fn load_vendors_with_calculations( let users = docs::users(ctx.conn(), &vendor_ids).await?; let over = event.end_date < Utc::now(); let keeps_record = keeps_seller_record(&event); + let universal = label_mark(&event) == "universal"; for vendor in vendor_ids { let Some(mut user) = users.iter().find(|user| user.id == vendor).cloned() else { continue; @@ -305,6 +309,14 @@ pub async fn load_vendors_with_calculations( seller.as_ref(), accepted.get(&vendor).copied().unwrap_or(0), ); + let sort_code = if universal { + sqlx::query_scalar("SELECT sort_code FROM users WHERE id = $1") + .bind(vendor) + .fetch_optional(ctx.conn()) + .await? + } else { + None + }; vendors.push(VendorWithCalculations { user, total_revenue, @@ -321,6 +333,7 @@ pub async fn load_vendors_with_calculations( .is_some_and(|seller| seller.seller_snapshot.is_some()) }), seller_number: seller.and_then(|seller| seller.number), + sort_code, }); } Ok(vendors) diff --git a/backend/src/modules/events.rs b/backend/src/modules/events.rs index b0d92de7..de374aee 100644 --- a/backend/src/modules/events.rs +++ b/backend/src/modules/events.rs @@ -48,6 +48,7 @@ const SERVICES: [&str; 5] = [ ]; const VISIBILITIES: [&str; 3] = ["public", "logged-in", "approved"]; const LABEL_FORMATS: [&str; 2] = ["standard", "small"]; +const LABEL_MARKS: [&str; 3] = ["number", "universal", "none"]; /// What viewers outside the team see instead of the access code const HIDDEN_ACCESS_CODE: &str = "••••"; @@ -578,7 +579,7 @@ struct FeaturesArgs { max_items_per_seller: Option, label_format: Option, price_on_label: Option, - seller_number_on_label: Option, + label_mark: Option, intake_fee: Option, private_sellers_only: Option, fixed_seller_data: Option, @@ -624,6 +625,11 @@ fn sanitize_features(features: FeaturesArgs, previous: Option<&Value>) -> AppRes { return Err(invalid("labelFormat")); } + if let Some(mark) = &features.label_mark + && !LABEL_MARKS.contains(&mark.as_str()) + { + return Err(invalid("labelMark")); + } let previous_bool = |key: &str| previous.and_then(|p| p.get(key)).and_then(Value::as_bool); let required_fields: Option> = match features.required_fields { Some(fields) => fields, @@ -703,12 +709,15 @@ fn sanitize_features(features: FeaturesArgs, previous: Option<&Value>) -> AppRes json!(features.price_on_label.unwrap_or(false)), ); put( - "sellerNumberOnLabel", + "labelMark", json!( features - .seller_number_on_label - .or(previous_bool("sellerNumberOnLabel")) - .unwrap_or(true) + .label_mark + .or_else(|| previous + .and_then(|p| p.get("labelMark")) + .and_then(Value::as_str) + .map(str::to_owned)) + .unwrap_or_else(|| "number".to_owned()) ), ); put( @@ -1493,7 +1502,7 @@ mod tests { intake_fee: Some(0.555), ..FeaturesArgs::default() }, - Some(&json!({ "fixedSellerData": true, "sellerNumberOnLabel": false })), + Some(&json!({ "fixedSellerData": true, "labelMark": "universal" })), ) .unwrap(); assert_eq!(stored["discounts"], false); @@ -1502,7 +1511,7 @@ mod tests { assert_eq!(stored["intakeFee"], 0.56); // Not sent by an older client: kept assert_eq!(stored["fixedSellerData"], true); - assert_eq!(stored["sellerNumberOnLabel"], false); + assert_eq!(stored["labelMark"], "universal"); assert_eq!(stored["labelFormat"], "standard"); } diff --git a/backend/src/modules/features.rs b/backend/src/modules/features.rs index f581bbf4..fad0cedb 100644 --- a/backend/src/modules/features.rs +++ b/backend/src/modules/features.rs @@ -28,7 +28,7 @@ struct Stored { max_items_per_seller: Option, label_format: Option, price_on_label: Option, - seller_number_on_label: Option, + label_mark: Option, intake_fee: Option, private_sellers_only: Option, fixed_seller_data: Option, @@ -48,8 +48,8 @@ pub struct EventFeatures { pub max_items_per_seller: Option, pub label_format: String, pub price_on_label: bool, - /// Off: labels carry no seller number, so they stay valid for the seller's next bazaar - pub seller_number_on_label: bool, + /// What tells the sellers' items apart on labels: see `label_mark` + pub label_mark: String, /// Fixed fee in € per accepted item, kept from the payout pub intake_fee: Option, pub private_sellers_only: bool, @@ -79,7 +79,7 @@ pub fn resolve(features: Option<&Value>) -> EventFeatures { max_items_per_seller: stored.max_items_per_seller.map(|n| n.max(0.0) as u32), label_format: stored.label_format.unwrap_or_else(|| "standard".to_owned()), price_on_label: stored.price_on_label.unwrap_or(false), - seller_number_on_label: stored.seller_number_on_label.unwrap_or(true), + label_mark: stored.label_mark.unwrap_or_else(|| "number".to_owned()), intake_fee: stored .intake_fee .and_then(Decimal::from_f64_retain) @@ -178,6 +178,16 @@ pub fn are_offers_open(status: &str, event: &Event, now: DateTime) -> bool status == "available" && event.start_date <= now && now <= event.end_date } +/// The seller's mark on the labels of this bazaar: `number` of this bazaar, `universal` +/// (the seller's lasting sorting code, for the many items on small labels) or `none`. +pub fn label_mark(event: &Event) -> String { + let features = event.resolved_features(); + if features.label_mark == "universal" && features.label_format != "small" { + return "number".to_owned(); + } + features.label_mark +} + /// Labels show the price only without discounts: a discount would make it wrong. pub fn shows_price_on_label(event: &Event) -> bool { let features = event.resolved_features(); @@ -196,7 +206,7 @@ mod tests { assert_eq!(features.max_discount_percent, 50); assert!(!features.price_offers && !features.questions && !features.fixed_seller_data); assert_eq!(features.label_format, "standard"); - assert!(features.seller_number_on_label); + assert_eq!(features.label_mark, "number"); } #[test] diff --git a/backend/src/modules/labels.rs b/backend/src/modules/labels.rs index c0a1b04e..c5e035be 100644 --- a/backend/src/modules/labels.rs +++ b/backend/src/modules/labels.rs @@ -9,7 +9,7 @@ use uuid::Uuid; use super::docs::{self, Event}; use super::event_products::{find_active_listing, relation}; use super::event_roles::{TEAM, has_any_role_or_admin}; -use super::features::shows_price_on_label; +use super::features::{label_mark, shows_price_on_label}; use crate::error::{AppError, AppResult}; use crate::realtime::Topic; use crate::register; @@ -37,6 +37,8 @@ struct Label { product_id: Uuid, title: String, seller_number: Option, + /// The seller's lasting code instead of the number (universal labels) + sort_code: Option, size: Option, price: Option, } @@ -96,15 +98,25 @@ async fn get_label_data(ctx: &mut Ctx, args: LabelArgs) -> AppResult { .map(|(event, _)| event), }; let mut seller_number = None; + let mut sort_code = None; let mut price = None; if let Some(label_event) = &label_event { - let features = label_event.resolved_features(); - if features.seller_number_on_label { - seller_number = docs::event_seller(ctx.conn(), label_event.id, product.vendor_id) - .await? - .and_then(|row| row.number); + match label_mark(label_event).as_str() { + "number" => { + seller_number = + docs::event_seller(ctx.conn(), label_event.id, product.vendor_id) + .await? + .and_then(|row| row.number); + } + "universal" => { + sort_code = sqlx::query_scalar("SELECT sort_code FROM users WHERE id = $1") + .bind(product.vendor_id) + .fetch_optional(ctx.conn()) + .await?; + } + _ => {} } - let format = features.label_format; + let format = label_event.resolved_features().label_format; if !formats.contains(&format) { formats.push(format); } @@ -122,6 +134,7 @@ async fn get_label_data(ctx: &mut Ctx, args: LabelArgs) -> AppResult { .map(str::to_owned), title: product.title, seller_number, + sort_code, price, }); } diff --git a/backend/src/modules/products.rs b/backend/src/modules/products.rs index 6835b5cd..1d44ff7b 100644 --- a/backend/src/modules/products.rs +++ b/backend/src/modules/products.rs @@ -653,7 +653,7 @@ fn features_json(event: &Event) -> Value { "photosOptional": f.photos_optional, "labelFormat": f.label_format, "priceOnLabel": f.price_on_label, - "sellerNumberOnLabel": f.seller_number_on_label, + "labelMark": f.label_mark, "privateSellersOnly": f.private_sellers_only, "fixedSellerData": f.fixed_seller_data, }); diff --git a/backend/tests/api/reminders.rs b/backend/tests/api/reminders.rs index 6a28aeb8..aced5bba 100644 --- a/backend/tests/api/reminders.rs +++ b/backend/tests/api/reminders.rs @@ -383,35 +383,50 @@ async fn label_data_for_sellers_and_the_team(db: PgPool) { } #[sqlx::test(migrator = "bazarpro_backend::MIGRATOR")] -async fn labels_without_the_seller_number_when_the_bazaar_turns_it_off(db: PgPool) { +async fn the_bazaar_decides_what_marks_the_seller_on_labels(db: PgPool) { let app = TestApp::new(db.clone()); let organizer = fixtures::user(&db, "Orga").await; let seller = fixtures::user(&db, "Seller").await; - let event = fixtures::event( - &db, - EventSpec { - features: json!({ "sellerNumberOnLabel": false }), - ..EventSpec::new("Basar", organizer) - }, - ) - .await; - fixtures::role(&db, event, seller, "seller").await; - fixtures::event_seller(&db, event, seller, 12, false).await; - let jacket = fixtures::product(&db, seller, "Jacke", 15.0).await; - fixtures::event_product(&db, event, jacket, "announced").await; - let as_seller = fixtures::session(&db, seller).await; - let data = app - .query( + let code: i32 = sqlx::query_scalar("SELECT sort_code FROM users WHERE id = $1") + .bind(seller) + .fetch_one(&db) + .await + .unwrap(); + let jacket = fixtures::product(&db, seller, "Jacke", 15.0).await; + let label_for = async |features: serde_json::Value| { + let event = fixtures::event( + &db, + EventSpec { + features, + ..EventSpec::new("Basar", organizer) + }, + ) + .await; + fixtures::role(&db, event, seller, "seller").await; + fixtures::event_seller(&db, event, seller, 12, false).await; + fixtures::event_product(&db, event, jacket, "announced").await; + app.query( "labels.getLabelData", json!({ "productIds": [jacket], "eventId": event }), Some(&as_seller), ) .await - .body["value"] - .clone(); - assert_eq!(data["labels"][0]["title"], "Jacke"); - assert!(data["labels"][0].get("sellerNumber").is_none()); + .body["value"]["labels"][0] + .clone() + }; + + let none = label_for(json!({ "labelMark": "none" })).await; + assert!(none.get("sellerNumber").is_none() && none.get("sortCode").is_none()); + + let universal = label_for(json!({ "labelMark": "universal", "labelFormat": "small" })).await; + assert_eq!(universal["sortCode"], code); + assert!(universal.get("sellerNumber").is_none()); + + // Large labels have the number: sorting by sight is for many small items + let large = label_for(json!({ "labelMark": "universal", "labelFormat": "standard" })).await; + assert_eq!(large["sellerNumber"], 12); + assert!(large.get("sortCode").is_none()); } async fn end_days_ago(db: &PgPool, event: Uuid, days: i32) { diff --git a/src/components/sellers/SortMarkBadge.tsx b/src/components/sellers/SortMarkBadge.tsx new file mode 100644 index 00000000..4b0621ae --- /dev/null +++ b/src/components/sellers/SortMarkBadge.tsx @@ -0,0 +1,49 @@ +import { sortMark, type SortSymbol } from '../../shared/sortCode'; +import { cn } from '../../lib/utils'; + +const rgb = (color: readonly [number, number, number]) => `rgb(${color.join(' ')})`; + +function Symbol({ symbol }: { symbol: SortSymbol }) { + const ink = rgb(symbol.ink); + return ( + + ); +} + +function Field({ symbol, className }: { symbol: SortSymbol; className?: string }) { + return ( + + + + ); +} + +/** The sorting code as it is printed: large digit, one wide field over two small ones. */ +export function SortMarkBadge({ code, className }: { code: number; className?: string }) { + const { digit, fields, letter } = sortMark(code); + return ( + + + {digit} + {letter && {letter}} + + + + + + + + ); +} diff --git a/src/lib/api/types.ts b/src/lib/api/types.ts index 9dc8a8a8..518d68db 100644 --- a/src/lib/api/types.ts +++ b/src/lib/api/types.ts @@ -104,7 +104,7 @@ export interface Docs { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -369,7 +369,7 @@ export type EventFeatures = { maxItemsPerSeller?: number | undefined; labelFormat: 'small' | 'standard'; priceOnLabel: boolean; - sellerNumberOnLabel: boolean; + labelMark: 'number' | 'universal' | 'none'; intakeFee?: number | undefined; privateSellersOnly: boolean; fixedSellerData: boolean; @@ -544,6 +544,8 @@ export type VendorWithCalculations = { totalDiscount: number; isHelper: boolean; sellerNumber?: number | undefined; + /** The seller's lasting code, on bazaars with universal labels */ + sortCode?: number | undefined; /** Bazaars with fixedSellerData: name and address are recorded (first item accepted) */ detailsRecorded?: boolean | undefined; }; @@ -979,7 +981,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1047,7 +1049,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1117,7 +1119,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1187,7 +1189,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1265,7 +1267,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1336,7 +1338,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1404,7 +1406,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1458,7 +1460,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1510,7 +1512,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1580,7 +1582,7 @@ export interface Api { maxItemsPerSeller?: number | undefined; labelFormat?: 'small' | 'standard' | undefined; priceOnLabel?: boolean | undefined; - sellerNumberOnLabel?: boolean | undefined; + labelMark?: 'number' | 'universal' | 'none' | undefined; intakeFee?: number | undefined; privateSellersOnly?: boolean | undefined; fixedSellerData?: boolean | undefined; @@ -1693,6 +1695,7 @@ export interface Api { productId: Id<'products'>; title: string; sellerNumber: number | undefined; + sortCode: number | undefined; size: string | undefined; price: number | undefined; }[]; diff --git a/src/lib/productQRCodePdf.test.ts b/src/lib/productQRCodePdf.test.ts index b50ef748..b1c03a69 100644 --- a/src/lib/productQRCodePdf.test.ts +++ b/src/lib/productQRCodePdf.test.ts @@ -60,4 +60,24 @@ describe('labels', () => { expect(save).toHaveBeenCalledWith('BazarPro-Etiketten.pdf'); expect(await downloadLabelsPdf(client, [])).toBe(0); }); + + const label = (n: number) => ({ productId: id(n), title: `Teil ${n}`, sortCode: 175 }); + const pages = (doc: ReturnType) => doc.getNumberOfPages(); + + it('starts on a free place and goes on with a new sheet', () => { + const labels = Array.from({ length: 3 }, (_, i) => label(i)); + expect(pages(buildLabelsPdf(labels, 'small', 38))).toBe(1); + expect(pages(buildLabelsPdf(labels, 'small', 39))).toBe(2); + expect(pages(buildLabelsPdf(labels, 'small', 40))).toBe(2); + expect(pages(buildLabelsPdf(labels, 'small', 999))).toBe(2); + expect(pages(buildLabelsPdf(labels, 'small', -3))).toBe(1); + }); + + it('draws the sorting mark in both formats', () => { + for (const format of ['small', 'standard'] as const) { + const pdf = buildLabelsPdf([label(1)], format).output(); + // The digit of the code 175 + expect(pdf).toContain('(5) Tj'); + } + }); }); diff --git a/src/lib/productQRCodePdf.ts b/src/lib/productQRCodePdf.ts index dc1d0808..25ca7529 100644 --- a/src/lib/productQRCodePdf.ts +++ b/src/lib/productQRCodePdf.ts @@ -4,6 +4,7 @@ import { api } from './api/functions'; import type { Id } from './api/types'; import type { LabelFormat } from '../shared/constants'; import { drawLabelQr, labelUrl } from './labelQr'; +import { drawSortMark } from './sortMarkPdf'; import { formatPriceDE } from './utils'; import { savePdf } from './saveFile'; @@ -23,6 +24,8 @@ export interface LabelData { title: string; /** Seller number at the bazaar, for sorting the items back after the sale */ sellerNumber?: number; + /** Universal labels: the seller's lasting code instead of the number */ + sortCode?: number; size?: string; /** Only when the bazaar prints prices (and has no discounts) */ price?: number; @@ -102,6 +105,11 @@ function drawStandard(doc: jsPDF, label: LabelData, cell: Cell): void { doc.setFontSize(11); doc.text(info, centerX, qrY + qrSize + 4.5 + titleLines.length * 4, { align: 'center' }); } + // Only with items of bazaars with different sheets; the code stays the seller's + if (label.sortCode !== undefined) { + const y = qrY + qrSize + 6 + titleLines.length * 4; + drawSortMark(doc, label.sortCode, centerX - 11, y, 22, 7); + } } /** QR code on the left, large seller number, title and size/price on the right. */ @@ -113,7 +121,10 @@ function drawSmall(doc: jsPDF, label: LabelData, cell: Cell): void { const textX = cell.x + padding + qrSize + 1.5; const textWidth = cell.x + cell.width - padding - textX; let lineY = cell.y + padding + 4; - if (label.sellerNumber !== undefined) { + if (label.sortCode !== undefined) { + drawSortMark(doc, label.sortCode, textX, cell.y + padding, textWidth, 11); + lineY = cell.y + padding + 14; + } else if (label.sellerNumber !== undefined) { doc.setFont('helvetica', 'bold'); doc.setFontSize(13); doc.text(`Nr. ${label.sellerNumber}`, textX, lineY); @@ -140,8 +151,11 @@ function drawSmall(doc: jsPDF, label: LabelData, cell: Cell): void { doc.rect(cell.x, cell.y, cell.width, cell.height); } -/** A4 pages with one label per item in the given format. */ -export function buildLabelsPdf(labels: LabelData[], format: LabelFormat): jsPDF { +/** + * A4 pages with one label per item in the given format. `startAt`: the first free place on + * a sheet that is partly used, counted from 1 row by row. + */ +export function buildLabelsPdf(labels: LabelData[], format: LabelFormat, startAt = 1): jsPDF { const { cols, rows } = LABEL_LAYOUTS[format]; const width = (PAGE_WIDTH - 2 * MARGIN_MM) / cols; const height = (PAGE_HEIGHT - 2 * MARGIN_MM) / rows; @@ -149,9 +163,11 @@ export function buildLabelsPdf(labels: LabelData[], format: LabelFormat): jsPDF const doc = new jsPDF({ orientation: 'portrait', unit: 'mm', format: 'a4' }); doc.setTextColor(0, 0, 0); + const skipped = Math.min(Math.max(Math.trunc(startAt) || 1, 1), perPage) - 1; for (const [i, label] of labels.entries()) { - if (i > 0 && i % perPage === 0) doc.addPage(); - const index = i % perPage; + const place = i + skipped; + if (i > 0 && place % perPage === 0) doc.addPage(); + const index = place % perPage; const cell = { x: MARGIN_MM + (index % cols) * width, y: MARGIN_MM + Math.floor(index / cols) * height, @@ -171,12 +187,13 @@ export function buildLabelsPdf(labels: LabelData[], format: LabelFormat): jsPDF export async function downloadLabelsPdf( client: ApiClient, productIds: Id<'products'>[], - eventId?: Id<'events'> + eventId?: Id<'events'>, + startAt = 1 ): Promise { if (productIds.length === 0) return 0; const data = await client.query(api.labels.getLabelData, { productIds, eventId }); if (data.labels.length === 0) return 0; - const doc = buildLabelsPdf(data.labels, data.format); + const doc = buildLabelsPdf(data.labels, data.format, startAt); await savePdf(doc, 'BazarPro-Etiketten.pdf'); return data.labels.length; } diff --git a/src/lib/sortMarkPdf.ts b/src/lib/sortMarkPdf.ts new file mode 100644 index 00000000..da5fa129 --- /dev/null +++ b/src/lib/sortMarkPdf.ts @@ -0,0 +1,77 @@ +import type { jsPDF } from 'jspdf'; +import { sortMark, type SortSymbol } from '../shared/sortCode'; + +function drawSymbol(doc: jsPDF, symbol: SortSymbol, cx: number, cy: number, size: number) { + const r = size / 2; + doc.setFillColor(...symbol.ink); + switch (symbol.id) { + case 'circle': + doc.circle(cx, cy, r, 'F'); + break; + case 'triangle': + doc.triangle(cx, cy - r, cx - r, cy + r, cx + r, cy + r, 'F'); + break; + case 'square': + doc.rect(cx - r, cy - r, size, size, 'F'); + break; + case 'diamond': + doc.triangle(cx - r, cy, cx + r, cy, cx, cy - r, 'F'); + // A hair of overlap, so PDF viewers show no seam + doc.triangle(cx - r, cy - 0.02, cx + r, cy - 0.02, cx, cy + r, 'F'); + break; + case 'cross': + doc.rect(cx - r, cy - r / 3, size, (2 * r) / 3, 'F'); + doc.rect(cx - r / 3, cy - r, (2 * r) / 3, size, 'F'); + break; + case 'bars': + doc.rect(cx - r, cy - r, size, size / 4, 'F'); + doc.rect(cx - r, cy - size / 8, size, size / 4, 'F'); + doc.rect(cx - r, cy + r - size / 4, size, size / 4, 'F'); + break; + } +} + +function drawField(doc: jsPDF, symbol: SortSymbol, x: number, y: number, w: number, h: number) { + doc.setFillColor(...symbol.fill); + doc.rect(x, y, w, h, 'F'); + drawSymbol(doc, symbol, x + w / 2, y + h / 2, Math.min(w, h) * 0.6); +} + +/** The large digit (with the letter, if any) and one wide field over two small ones. */ +export function drawSortMark( + doc: jsPDF, + code: number, + x: number, + y: number, + width: number, + height: number +) { + const mark = sortMark(code); + const digitWidth = height * 0.72; + doc.setTextColor(0, 0, 0); + doc.setFont('helvetica', 'bold'); + // 1 pt is 0.353 mm; digits are about 0.72 of the font size high + doc.setFontSize(((mark.letter ? height * 0.72 : height) / 0.353) * 1.05); + const digitY = mark.letter ? y + height * 0.68 : y + height * 0.86; + doc.text(String(mark.digit), x + digitWidth / 2, digitY, { align: 'center' }); + if (mark.letter) { + doc.setFontSize((height * 0.3) / 0.353); + doc.text(mark.letter, x + digitWidth / 2, y + height * 0.98, { align: 'center' }); + } + + const fieldX = x + digitWidth; + const fieldWidth = width - digitWidth; + const gap = height * 0.03; + const rowHeight = (height - gap) / 2; + drawField(doc, mark.fields[0], fieldX, y, fieldWidth, rowHeight); + const smallWidth = (fieldWidth - gap) / 2; + drawField(doc, mark.fields[1], fieldX, y + rowHeight + gap, smallWidth, rowHeight); + drawField( + doc, + mark.fields[2], + fieldX + smallWidth + gap, + y + rowHeight + gap, + smallWidth, + rowHeight + ); +} diff --git a/src/lib/sortSheetsPdf.ts b/src/lib/sortSheetsPdf.ts new file mode 100644 index 00000000..57f9fcb9 --- /dev/null +++ b/src/lib/sortSheetsPdf.ts @@ -0,0 +1,45 @@ +import { jsPDF } from 'jspdf'; +import { compareSortCodes } from '../shared/sortCode'; +import { savePdf } from './saveFile'; +import { drawSortMark } from './sortMarkPdf'; + +const PAGE_WIDTH = 210; +const PAGE_HEIGHT = 297; +const MARGIN = 15; + +export interface SortSheetSeller { + sortCode: number; + name: string; + sellerNumber?: number; +} + +/** A4 pages with two sheets each, in sorting order: one for each seller's basket. */ +export function buildSortSheetsPdf(sellers: SortSheetSeller[]): jsPDF { + const doc = new jsPDF({ orientation: 'portrait', unit: 'mm', format: 'a4' }); + const sheetHeight = PAGE_HEIGHT / 2; + const sorted = [...sellers].sort((a, b) => compareSortCodes(a.sortCode, b.sortCode)); + for (const [i, seller] of sorted.entries()) { + if (i > 0 && i % 2 === 0) doc.addPage(); + const y = (i % 2) * sheetHeight; + drawSortMark(doc, seller.sortCode, MARGIN, y + MARGIN, PAGE_WIDTH - 2 * MARGIN, 90); + doc.setTextColor(0, 0, 0); + doc.setFont('helvetica', 'bold'); + doc.setFontSize(24); + doc.text(seller.name, MARGIN, y + MARGIN + 104, { maxWidth: PAGE_WIDTH - 2 * MARGIN - 30 }); + if (seller.sellerNumber !== undefined) { + doc.text(`Nr. ${seller.sellerNumber}`, PAGE_WIDTH - MARGIN, y + MARGIN + 104, { + align: 'right', + }); + } + if (i % 2 === 0) { + doc.setDrawColor(190); + doc.setLineWidth(0.1); + doc.line(0, sheetHeight, PAGE_WIDTH, sheetHeight); + } + } + return doc; +} + +export async function downloadSortSheets(sellers: SortSheetSeller[]): Promise { + await savePdf(buildSortSheetsPdf(sellers), 'BazarPro-Sortierblaetter.pdf'); +} diff --git a/src/locales/de/company.json b/src/locales/de/company.json index 1329b728..824565f7 100644 --- a/src/locales/de/company.json +++ b/src/locales/de/company.json @@ -13,7 +13,7 @@ }, "qrLabels": { "title": "QR-Etiketten in zwei Größen", - "text": "Verkäufer drucken ihre Etiketten selbst: groß für Fahrräder, klein mit 40 pro Seite für Kleidung, mit Verkäufernummer oder zum Wiederverwenden ohne. Ohne Preis darauf gehen Rabatte ohne Neudruck." + "text": "Verkäufer drucken ihre Etiketten selbst: groß für Fahrräder, klein mit 40 pro Seite für Kleidung, mit Verkäufernummer oder als Universal-Etikett zum Wiederverwenden. Ohne Preis darauf gehen Rabatte ohne Neudruck." }, "phoneCheckout": { "title": "Kasse mit Warenkorb", diff --git a/src/locales/de/organizer.json b/src/locales/de/organizer.json index b1c0aab7..69db4127 100644 --- a/src/locales/de/organizer.json +++ b/src/locales/de/organizer.json @@ -139,8 +139,14 @@ "labelsLarge": "Groß – 12 pro A4-Seite (z. B. Fahrräder)", "labelsSmall": "Klein – 40 pro A4-Seite (z. B. Kleidung)", "labelsHint": "Auf jedem Etikett stehen QR-Code, Titel und – wenn angegeben – die Größe.", - "sellerNumberOnLabel": "Verkäufernummer aufs Etikett drucken", - "sellerNumberOnLabelText": "Hilft beim Zurücksortieren nach dem Basar. Ausgeschaltet können Verkäufer ihre Etiketten beim nächsten Basar wiederverwenden. Der QR-Code bleibt gültig.", + "labelMark": "Verkäufer auf dem Etikett", + "labelMarkNumber": "Verkäufernummer dieses Basars", + "labelMarkUniversal": "Universal-Etikett: Ziffer und Sortierzeichen (nur kleine Etiketten)", + "labelMarkNone": "Nichts, nur QR-Code", + "labelMarkNumberHint": "Am einfachsten zu lesen. Die Nummer gilt nur für diesen Basar, Verkäufer drucken für den nächsten neu.", + "labelMarkUniversalHint": "Für viele kleine Teile: Helfer sortieren erst nach der großen Ziffer, dann nach Farben und Symbolen, ohne zu lesen. Das Zeichen bleibt beim Verkäufer, die Etiketten passen also auch bei anderen Basaren mit Universal-Etiketten. Es funktioniert auch im Schwarz-Weiß-Druck.", + "labelMarkNoneHint": "Die Etiketten lassen sich wiederverwenden. Zum Zurücksortieren muss das Team aber jeden Artikel scannen.", + "labelMarkNeedsSmall": "Universal-Etiketten gibt es nur im kleinen Format. Im großen Format wird die Verkäufernummer gedruckt.", "priceOnLabel": "Preis aufs Etikett drucken", "priceOnLabelText": "Hilft an der Kasse ohne Scanner. Der Preis auf dem Etikett ist fest – bei Rabatten wird er deshalb nicht gedruckt.", "priceOnLabelDiscounts": "Rabatte sind eingeschaltet, deshalb erscheint kein Preis auf den Etiketten.", @@ -261,13 +267,16 @@ "labelsSmall": "Kleine Etiketten (40 pro Seite)", "labelsLarge": "Große Etiketten (12 pro Seite)", "priceOnLabel": "Preis auf dem Etikett", - "sellerNumberOnLabel": "Verkäufernummer auf dem Etikett", + "labelMarkNumber": "Verkäufernummer auf dem Etikett", + "labelMarkUniversal": "Universal-Etikett mit Sortierzeichen", "questionsDuringEvent": "erst während des Basars", "requiredFields": "Pflichtangaben: {{fields}}", "privateSellers": "Nur Privatverkäufer", "fixedData": "Feste Daten für den Nachweis" }, "sellers": { + "sortSheets": "Sortierblätter", + "sortSheetsHint": "Ein Blatt pro Verkäufer für die Kiste, in Sortierreihenfolge", "helperRemoved": "{{name}} ist kein Helfer mehr", "helperAdded": "{{name}} wurde als Helfer hinzugefügt", "actionFailed": "Aktion fehlgeschlagen", @@ -818,6 +827,7 @@ "labelPriceHidden": "Ohne Preis: Rabatte ändern ihn ja noch.", "labelNumber": "Nr. {{seller}}", "labelReusable": "Ohne Verkäufernummer: Das Etikett passt auch beim nächsten Basar.", + "labelUniversal": "Universal-Etikett: Ziffer, Farben und Symbole bleiben beim Verkäufer. Das Team sortiert danach und braucht nichts zu lesen.", "photoRequired": "Foto Pflicht", "photoOptional": "Ohne Foto", "maxItems": "Bis zu {{count}} Artikel pro Verkäufer", diff --git a/src/locales/de/seller.json b/src/locales/de/seller.json index 91223956..53e7776f 100644 --- a/src/locales/de/seller.json +++ b/src/locales/de/seller.json @@ -199,6 +199,9 @@ "formatSmall": "Format Klein: {{perPage}} kleine Etiketten pro Seite", "formatPerItem": "Format und Verkäufernummer nach dem jeweils nächsten Basar des Artikels, sonst Standard", "reusable": "Ohne Verkäufernummer: Du kannst diese Etiketten beim nächsten Basar wiederverwenden.", + "reusableUniversal": "Mit Sortierzeichen statt Nummer: Diese Etiketten kannst du bei anderen Basaren mit Universal-Etiketten wiederverwenden.", + "startAt": "Erstes freies Feld auf dem Bogen", + "startAtHint": "Für angebrochene Bögen: Zeile für Zeile gezählt, 1 bis {{perPage}}.", "download": "PDF herunterladen", "created_one": "{{count}} Etikett erstellt", "created_other": "{{count}} Etiketten erstellt", diff --git a/src/locales/en/company.json b/src/locales/en/company.json index 72786b72..dd7c0d6d 100644 --- a/src/locales/en/company.json +++ b/src/locales/en/company.json @@ -13,7 +13,7 @@ }, "qrLabels": { "title": "QR labels in two sizes", - "text": "Sellers print their own labels: large for bikes, small with 40 per page for clothes, with the seller number or without it for reuse. Without a price on them, discounts work without reprinting." + "text": "Sellers print their own labels: large for bikes, small with 40 per page for clothes, with the seller number or as a reusable universal label. Without a price on them, discounts work without reprinting." }, "phoneCheckout": { "title": "Checkout with a cart", diff --git a/src/locales/en/organizer.json b/src/locales/en/organizer.json index 02724ddf..321a9453 100644 --- a/src/locales/en/organizer.json +++ b/src/locales/en/organizer.json @@ -139,8 +139,14 @@ "labelsLarge": "Large – 12 per A4 page (e.g. bikes)", "labelsSmall": "Small – 40 per A4 page (e.g. clothes)", "labelsHint": "Every label shows QR code, title and – if given – the size.", - "sellerNumberOnLabel": "Print the seller number on the label", - "sellerNumberOnLabelText": "Helps sorting items back after the bazaar. Switched off, sellers can reuse their labels at the next bazaar. The QR code stays valid.", + "labelMark": "Seller on the label", + "labelMarkNumber": "Seller number of this bazaar", + "labelMarkUniversal": "Universal label: digit and sorting mark (small labels only)", + "labelMarkNone": "Nothing, QR code only", + "labelMarkNumberHint": "Easiest to read. The number is only valid for this bazaar, sellers print again for the next.", + "labelMarkUniversalHint": "For many small items: helpers sort by the large digit first, then by colors and symbols, without reading. The mark stays with the seller, so labels also work at other bazaars with universal labels. It also works in black and white.", + "labelMarkNoneHint": "Labels can be reused. To sort items back, the team has to scan every one.", + "labelMarkNeedsSmall": "Universal labels only exist in the small format. The large format prints the seller number.", "priceOnLabel": "Print the price on the label", "priceOnLabelText": "Helps at a cash desk without scanner. The printed price is fixed – so it is not printed when discounts are on.", "priceOnLabelDiscounts": "Discounts are switched on, so no price appears on the labels.", @@ -261,13 +267,16 @@ "labelsSmall": "Small labels (40 per page)", "labelsLarge": "Large labels (12 per page)", "priceOnLabel": "Price on the label", - "sellerNumberOnLabel": "Seller number on the label", + "labelMarkNumber": "Seller number on the label", + "labelMarkUniversal": "Universal label with sorting mark", "questionsDuringEvent": "only during the bazaar", "requiredFields": "Required details: {{fields}}", "privateSellers": "Private sellers only", "fixedData": "Fixed data for the record" }, "sellers": { + "sortSheets": "Sorting sheets", + "sortSheetsHint": "One sheet per seller for the basket, in sorting order", "helperRemoved": "{{name}} is no longer a helper", "helperAdded": "{{name}} was added as a helper", "actionFailed": "Action failed", @@ -818,6 +827,7 @@ "labelPriceHidden": "No price: discounts may still change it.", "labelNumber": "No. {{seller}}", "labelReusable": "No seller number: the label also works at the next bazaar.", + "labelUniversal": "Universal label: digit, colors and symbols stay with the seller. The team sorts by them without reading.", "photoRequired": "Photo required", "photoOptional": "No photo", "maxItems": "Up to {{count}} items per seller", diff --git a/src/locales/en/seller.json b/src/locales/en/seller.json index 458d6969..a6be5552 100644 --- a/src/locales/en/seller.json +++ b/src/locales/en/seller.json @@ -199,6 +199,9 @@ "formatSmall": "Small format: {{perPage}} small labels per page", "formatPerItem": "Format and seller number from each item's next bazaar, otherwise standard", "reusable": "No seller number: you can reuse these labels at the next bazaar.", + "reusableUniversal": "With a sorting mark instead of a number: you can reuse these labels at other bazaars with universal labels.", + "startAt": "First free place on the sheet", + "startAtHint": "For partly used sheets: counted row by row, 1 to {{perPage}}.", "download": "Download PDF", "created_one": "{{count}} label created", "created_other": "{{count}} labels created", diff --git a/src/pages/organizer/events/EditEventForm.tsx b/src/pages/organizer/events/EditEventForm.tsx index 842ddb4c..edb3fae9 100644 --- a/src/pages/organizer/events/EditEventForm.tsx +++ b/src/pages/organizer/events/EditEventForm.tsx @@ -8,7 +8,7 @@ import { Button } from '../../../components/ui/button'; import { useApiClient, useAuthState, useMutation, useQuery } from '../../../lib/api/react'; import { api } from '../../../lib/api/functions'; import type { Doc, Id } from '../../../lib/api/types'; -import { LABEL_FORMATS } from '../../../shared/constants'; +import { LABEL_FORMATS, LABEL_MARKS } from '../../../shared/constants'; import { EditEventBasicInfo } from './components/EditEventBasicInfo'; import { EditEventCategories } from './components/EditEventCategories'; import { EditEventContact } from './components/EditEventContact'; @@ -163,7 +163,7 @@ const buildEventSchema = ( .or(z.nan()), labelFormat: z.enum(LABEL_FORMATS), priceOnLabel: z.boolean(), - sellerNumberOnLabel: z.boolean(), + labelMark: z.enum(LABEL_MARKS), privateSellersOnly: z.boolean(), fixedSellerData: z.boolean(), intakeFee: z @@ -276,7 +276,7 @@ function featuresToForm(stored: StoredEventFeatures | undefined): FeatureFormDat maxItemsPerSeller: features.maxItemsPerSeller, labelFormat: features.labelFormat, priceOnLabel: features.priceOnLabel, - sellerNumberOnLabel: features.sellerNumberOnLabel, + labelMark: features.labelMark, intakeFee: features.intakeFee, privateSellersOnly: features.privateSellersOnly, fixedSellerData: features.fixedSellerData, @@ -303,7 +303,7 @@ function featuresFromForm(features: FeatureFormData): StoredEventFeatures { : undefined, labelFormat: features.labelFormat, priceOnLabel: features.priceOnLabel, - sellerNumberOnLabel: features.sellerNumberOnLabel, + labelMark: features.labelMark, intakeFee: typeof features.intakeFee === 'number' && !isNaN(features.intakeFee) && features.intakeFee > 0 ? features.intakeFee diff --git a/src/pages/organizer/events/components/EditEventFeatures.tsx b/src/pages/organizer/events/components/EditEventFeatures.tsx index daa59b24..0be5213c 100644 --- a/src/pages/organizer/events/components/EditEventFeatures.tsx +++ b/src/pages/organizer/events/components/EditEventFeatures.tsx @@ -18,7 +18,6 @@ type FeatureKey = | 'questions' | 'photosOptional' | 'priceOnLabel' - | 'sellerNumberOnLabel' | 'privateSellersOnly' | 'fixedSellerData'; @@ -223,6 +222,8 @@ export function EditEventFeatures({ } = useFormContext(); const discounts = watch('features.discounts') as boolean; const priceOnLabel = watch('features.priceOnLabel') as boolean; + const labelFormat = watch('features.labelFormat') as string; + const labelMark = watch('features.labelMark') as string; const featureErrors = errors.features as | Partial< Record<'maxDiscountPercent' | 'intakeFee' | 'maxItemsPerSeller', { message?: string }> @@ -339,11 +340,34 @@ export function EditEventFeatures({

{t('features.labelsHint')}

- +
+ + +

+ {t( + labelMark === 'universal' + ? 'features.labelMarkUniversalHint' + : labelMark === 'none' + ? 'features.labelMarkNoneHint' + : 'features.labelMarkNumberHint' + )} +

+ {labelMark === 'universal' && labelFormat !== 'small' && ( +

+ {t('features.labelMarkNeedsSmall')} +

+ )} +
- {small && withNumber &&

Nr. 17

} + {small && mark === 'number' &&

Nr. 17

} + {small && mark === 'universal' && ( + + )}

- {[!small && withNumber && number, price !== undefined && `${formatPriceDE(price)} €`] + {[ + !small && mark === 'number' && number, + price !== undefined && `${formatPriceDE(price)} €`, + ] .filter(Boolean) .join(' · ')}

@@ -407,7 +418,7 @@ export function ItemsPreview({ type }: { type?: EventType }) { const limit = given(features.maxItemsPerSeller); const small = features.labelFormat === 'small'; const showPrice = !!features.priceOnLabel && !features.discounts; - const withNumber = features.sellerNumberOnLabel !== false; + const mark = effectiveLabelMark({ features: features as StoredEventFeatures }); return ( · {t('wizard.preview.labelPriceHidden')}} - {!withNumber && ( + {mark === 'universal' && ( + }>{t('wizard.preview.labelUniversal')} + )} + {mark === 'none' && ( }>{t('wizard.preview.labelReusable')} )} }> @@ -470,7 +484,7 @@ export function ItemsPreview({ type }: { type?: EventType }) { small={small} title={items[0].title} price={showPrice ? items[0].price : undefined} - withNumber={withNumber} + mark={mark} />
diff --git a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx index e18d6f31..e0693721 100644 --- a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx +++ b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx @@ -1,3 +1,5 @@ +import { SortMarkBadge } from '../../../../components/sellers/SortMarkBadge'; +import { downloadSortSheets } from '../../../../lib/sortSheetsPdf'; import { useMemo, useState } from 'react'; import { WalkInBadge } from '../../../../components/walkIn/WalkInBadge'; import { SellerNumberBadge } from '../../../../components/sellers/SellerNumberBadge'; @@ -32,12 +34,14 @@ import { AlertTriangle, Info, Megaphone, + Printer, } from 'lucide-react'; import { formatPriceDE } from '../../../../lib/utils'; import type { VendorWithCalculations } from '../../../../lib/api/types'; import { Tabs, TabsList, TabsTrigger } from '../../../../components/ui/tabs'; import { Button } from '../../../../components/ui/button'; import { toast } from 'sonner'; +import { getUserFacingErrorMessage } from '../../../../lib/errors'; import { AlertDialog, AlertDialogAction, @@ -86,6 +90,12 @@ export function SellerManagementPage() { const vendors = useQuery(api.eventRoles.getVendorsForEvent, { eventId: eventId as Id<'events'>, }) as VendorWithCalculations[] | undefined; + // Only universal labels bring a sorting code along: one sheet for each seller's basket + const sortSheetSellers = (vendors ?? []).flatMap((v) => + v.sortCode === undefined + ? [] + : [{ sortCode: v.sortCode, name: v.name ?? '-', sellerNumber: v.sellerNumber }] + ); const addHelper = useMutation(api.eventRoles.addCoOrganizerForEvent); useAssignMissingSellerNumbers(eventId as Id<'events'>, vendors, canManage); @@ -169,6 +179,20 @@ export function SellerManagementPage() { > {t('sellers.walkIn')} + {sortSheetSellers.length > 0 && ( + + )}
{v.name} + {v.sortCode !== undefined && ( + + )} {v.managedByEventId && } {v.isHelper && !isOwner && ( diff --git a/src/pages/organizer/events/dashboard/components/EventSettingsSummary.tsx b/src/pages/organizer/events/dashboard/components/EventSettingsSummary.tsx index c2b0c9ba..363d2ee0 100644 --- a/src/pages/organizer/events/dashboard/components/EventSettingsSummary.tsx +++ b/src/pages/organizer/events/dashboard/components/EventSettingsSummary.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react'; import { Check, Minus } from 'lucide-react'; import type { Doc } from '../../../../../lib/api/types'; -import { resolveEventFeatures } from '../../../../../shared/eventFeatures'; +import { effectiveLabelMark, resolveEventFeatures } from '../../../../../shared/eventFeatures'; import { VISIBILITY_OPTIONS } from '../../../../../constants/records'; import { formatDateRangeDE, formatPriceDE } from '../../../../../lib/utils'; import { Badge } from '../../../../../components/ui/badge'; @@ -64,6 +64,7 @@ export function EventSettingsSummary({ event }: { event: EventWithLabels }) { minute: '2-digit', }); const features = resolveEventFeatures(event); + const labelMark = effectiveLabelMark(event); const logistics = event.sellerLogistics; const discountDetail = [ features.discountStartsAt @@ -155,7 +156,12 @@ export function EventSettingsSummary({ event }: { event: EventWithLabels }) { features.labelFormat === 'small' ? t('summary.labelsSmall') : t('summary.labelsLarge') } /> - + { it('tells the seller when the labels of a bazaar can be reused', async () => { const reusable = { ...events[0], - features: { sellerNumberOnLabel: false }, + features: { labelFormat: 'small', labelMark: 'universal' }, } as unknown as Doc<'events'>; render( { eventId="later" /> ); - expect(await screen.findByText(/beim nächsten Basar wiederverwenden/)).toBeInTheDocument(); + expect( + await screen.findByText(/anderen Basaren mit Universal-Etiketten wiederverwenden/) + ).toBeInTheDocument(); + }); + + it('starts on a free place of a partly used sheet (#238)', async () => { + renderDialog('next'); + expect(await screen.findByText('42 Etiketten auf 2 A4-Seiten')).toBeInTheDocument(); + fireEvent.change(screen.getByLabelText('Erstes freies Feld auf dem Bogen'), { + target: { value: '40' }, + }); + // One label left on the first sheet, 41 need two more + expect(await screen.findByText('42 Etiketten auf 3 A4-Seiten')).toBeInTheDocument(); + fireEvent.click(screen.getByRole('button', { name: 'PDF herunterladen' })); + await waitFor(() => + expect(downloadLabelsPdf).toHaveBeenCalledWith(client, expect.any(Array), 'next', 40) + ); }); it('prints the unsold items of the chosen bazaar for that bazaar', async () => { @@ -87,7 +103,9 @@ describe('LabelPrintDialog', () => { expect(await screen.findByText('1 Etikett auf 1 A4-Seite')).toBeInTheDocument(); expect(screen.getByText('Format Standard: 12 große Etiketten pro Seite')).toBeInTheDocument(); fireEvent.click(screen.getByRole('button', { name: 'PDF herunterladen' })); - await waitFor(() => expect(downloadLabelsPdf).toHaveBeenCalledWith(client, ['p101'], 'later')); + await waitFor(() => + expect(downloadLabelsPdf).toHaveBeenCalledWith(client, ['p101'], 'later', 1) + ); }); it('falls back to all available items without a bazaar', async () => { @@ -98,7 +116,7 @@ describe('LabelPrintDialog', () => { expect(screen.getByText(/nach dem jeweils nächsten Basar/)).toBeInTheDocument(); fireEvent.click(screen.getByRole('button', { name: 'PDF herunterladen' })); await waitFor(() => - expect(downloadLabelsPdf).toHaveBeenCalledWith(client, expect.any(Array), undefined) + expect(downloadLabelsPdf).toHaveBeenCalledWith(client, expect.any(Array), undefined, 1) ); expect(vi.mocked(downloadLabelsPdf).mock.calls[0][1]).toHaveLength(43); }); diff --git a/src/pages/seller/products/components/LabelPrintDialog.tsx b/src/pages/seller/products/components/LabelPrintDialog.tsx index 657149ec..1a312658 100644 --- a/src/pages/seller/products/components/LabelPrintDialog.tsx +++ b/src/pages/seller/products/components/LabelPrintDialog.tsx @@ -11,6 +11,8 @@ import { DialogTitle, } from '../../../../components/ui/dialog'; import { Button } from '../../../../components/ui/button'; +import { Input } from '../../../../components/ui/input'; +import { Label } from '../../../../components/ui/label'; import { Select, SelectContent, @@ -23,6 +25,7 @@ import type { Doc, Id } from '../../../../lib/api/types'; import { getUserFacingErrorMessage } from '../../../../lib/errors'; import { LABEL_LAYOUTS, downloadLabelsPdf } from '../../../../lib/productQRCodePdf'; import { formatDateDE } from '../../../../lib/utils'; +import { effectiveLabelMark } from '../../../../shared/eventFeatures'; /** Without a bazaar: all available items, each on the sheet of its next bazaar */ const ALL = 'all'; @@ -51,6 +54,7 @@ export function LabelPrintDialog({ const client = useApiClient(); const [choice, setChoice] = useState(ALL); const [isCreating, setIsCreating] = useState(false); + const [startInput, setStartInput] = useState('1'); const available = useMemo(() => products.filter((p) => !p.sold), [products]); @@ -71,18 +75,23 @@ export function LabelPrintDialog({ if (!open) return; const preselected = bazaars.find((bazaar) => bazaar.event._id === eventId); setChoice(preselected?.event._id ?? bazaars[0]?.event._id ?? ALL); + setStartInput('1'); }, [open, eventId, bazaars]); const bazaar = bazaars.find((entry) => entry.event._id === choice); const ids = bazaar ? bazaar.ids : available.map((p) => p._id); const format = bazaar?.event.features?.labelFormat ?? 'standard'; const { cols, rows } = LABEL_LAYOUTS[format]; - const pages = Math.ceil(ids.length / (cols * rows)); + const perPage = cols * rows; + // Only for one bazaar: only then the sheet is known before the PDF is made + const startAt = bazaar ? Math.min(Math.max(Math.trunc(Number(startInput)) || 1, 1), perPage) : 1; + const pages = Math.ceil((ids.length + startAt - 1) / perPage); + const mark = bazaar && effectiveLabelMark(bazaar.event); const create = async () => { setIsCreating(true); try { - const count = await downloadLabelsPdf(client, ids, bazaar?.event._id); + const count = await downloadLabelsPdf(client, ids, bazaar?.event._id, startAt); toast.success(t('labels.created', { count })); onOpenChange(false); } catch (e) { @@ -128,10 +137,30 @@ export function LabelPrintDialog({ }) : t('labels.formatPerItem')}

- {bazaar?.event.features?.sellerNumberOnLabel === false && ( -

{t('labels.reusable')}

+ {mark === 'universal' && ( +

{t('labels.reusableUniversal')}

)} + {mark === 'none' &&

{t('labels.reusable')}

}
+ + {bazaar && ( +
+ + setStartInput(e.target.value)} + /> +

+ {t('labels.startAtHint', { perPage })} +

+
+ )} diff --git a/src/shared/constants.ts b/src/shared/constants.ts index d7d6aff6..6404ebfb 100644 --- a/src/shared/constants.ts +++ b/src/shared/constants.ts @@ -25,6 +25,10 @@ export const PLACEHOLDER_PATTERN = /\[\[[^\]]+\]\]/; export const LABEL_FORMATS = ['standard', 'small'] as const; export type LabelFormat = (typeof LABEL_FORMATS)[number]; +/** What tells sellers' items apart on labels: see EventFeatures.labelMark */ +export const LABEL_MARKS = ['number', 'universal', 'none'] as const; +export type LabelMark = (typeof LABEL_MARKS)[number]; + export const SYSTEM_ROLES = ['admin', 'user'] as const; // leave admin always on position SYSTEM_ROLES[0]!! export type SystemRole = (typeof SYSTEM_ROLES)[number]; diff --git a/src/shared/eventFeatures.ts b/src/shared/eventFeatures.ts index 1a44c4b6..ae602e1e 100644 --- a/src/shared/eventFeatures.ts +++ b/src/shared/eventFeatures.ts @@ -1,4 +1,4 @@ -import type { LabelFormat } from './constants'; +import type { LabelFormat, LabelMark } from './constants'; import type { ErrorCode } from './errorCodes'; import type { CategoryField } from './categoryFields'; /** @@ -38,10 +38,11 @@ export interface EventFeatures { /** Print the price on labels; only takes effect while discounts are off. */ priceOnLabel: boolean; /** - * Print the seller number on labels. Off, a label holds nothing specific to this bazaar - * (the QR code only links to the item), so sellers can reuse it at their next one. + * The seller's mark on labels. `number`: the number at this bazaar. `universal`: a code + * that stays with the seller, read by sight (small labels only). `none`: only the QR code, + * which just links to the item. The last two can be reused at the next bazaar. */ - sellerNumberOnLabel: boolean; + labelMark: LabelMark; /** Fixed fee in € per accepted item (sold or not), kept from the payout; unset means none. */ intakeFee?: number; /** Sellers confirm when joining that they sell as private persons, not as traders. */ @@ -70,7 +71,7 @@ export const DEFAULT_EVENT_FEATURES: EventFeatures = { photosOptional: false, labelFormat: 'standard', priceOnLabel: false, - sellerNumberOnLabel: true, + labelMark: 'number', privateSellersOnly: false, fixedSellerData: false, }; @@ -185,6 +186,14 @@ export function areOffersOpen( return listing.status === 'available' && listing.startDate <= now && now <= listing.endDate; } +/** The mark labels of this event really carry: universal ones need the small sheet. */ +export function effectiveLabelMark(event: { features?: StoredEventFeatures }): LabelMark { + const features = resolveEventFeatures(event); + return features.labelMark === 'universal' && features.labelFormat !== 'small' + ? 'number' + : features.labelMark; +} + /** Whether labels of this event show the price: a discount would make a printed price wrong. */ export function showsPriceOnLabel(event: { features?: StoredEventFeatures }): boolean { const features = resolveEventFeatures(event); diff --git a/src/shared/sortCode.test.ts b/src/shared/sortCode.test.ts new file mode 100644 index 00000000..e7091533 --- /dev/null +++ b/src/shared/sortCode.test.ts @@ -0,0 +1,37 @@ +import { describe, expect, it } from 'vitest'; +import { compareSortCodes, sortMark } from './sortCode'; + +const signature = (code: number) => { + const mark = sortMark(code); + return `${mark.digit}|${mark.fields.map((field) => field.id).join()}|${mark.letter}`; +}; + +describe('sortMark', () => { + it('gives every seller an own mark', () => { + const marks = new Set(Array.from({ length: 30_000 }, (_, code) => signature(code + 1))); + expect(marks.size).toBe(30_000); + }); + + it('needs no letter for the first 2160 sellers', () => { + expect(sortMark(1).letter).toBe(''); + expect(sortMark(2159).letter).toBe(''); + expect(sortMark(2160).letter).toBe('A'); + expect(sortMark(2160 * 26).letter).toBe('Z'); + expect(sortMark(2160 * 27).letter).toBe('AA'); + }); + + it('makes codes of one pile differ in all fields, also one after the other', () => { + const [a, b] = [sortMark(15), sortMark(25)]; + expect(a.digit).toBe(b.digit); + a.fields.forEach((field, i) => expect(field.id).not.toBe(b.fields[i].id)); + }); + + it('stays the same: printed labels depend on it', () => { + expect(signature(175)).toBe('5|diamond,circle,bars|'); + }); + + it('sorts by digit first', () => { + const sorted = [13, 22, 31, 40].sort(compareSortCodes); + expect(sorted.map((code) => code % 10)).toEqual([0, 1, 2, 3]); + }); +}); diff --git a/src/shared/sortCode.ts b/src/shared/sortCode.ts new file mode 100644 index 00000000..69d9ad09 --- /dev/null +++ b/src/shared/sortCode.ts @@ -0,0 +1,83 @@ +/** + * Sorting code of universal labels. Unsold items are sorted back without reading: first + * into piles by the large digit, then by the three fields. A seller keeps the code at + * every bazaar, so printed labels stay valid. + * + * Every field has a color and its own symbol: most sellers print in black and white, and + * not every helper tells all colors apart. A letter only appears after the first 2160 + * sellers, to tell two sellers with the same digit and fields apart. + */ + +export interface SortSymbol { + id: 'circle' | 'triangle' | 'square' | 'diamond' | 'cross' | 'bars'; + /** Field color, also distinct for color-blind helpers (Okabe-Ito) */ + fill: [number, number, number]; + /** Color of the symbol on the field, the stronger contrast also in black and white */ + ink: [number, number, number]; +} + +const WHITE: [number, number, number] = [255, 255, 255]; +const BLACK: [number, number, number] = [0, 0, 0]; + +export const SORT_SYMBOLS: readonly SortSymbol[] = [ + { id: 'circle', fill: [0, 114, 178], ink: WHITE }, + { id: 'triangle', fill: [230, 159, 0], ink: BLACK }, + { id: 'square', fill: [0, 120, 90], ink: WHITE }, + { id: 'diamond', fill: [240, 228, 66], ink: BLACK }, + { id: 'cross', fill: [204, 121, 167], ink: BLACK }, + { id: 'bars', fill: [30, 30, 30], ink: WHITE }, +]; + +const PATTERNS = SORT_SYMBOLS.length ** 3; +/** + * Walks through all patterns so that neighboring codes differ in all three fields: + * sellers who sign up one after the other are easy to tell apart. Coprime to PATTERNS. + */ +const PATTERN_STEP = 121; + +export interface SortMark { + digit: number; + fields: [SortSymbol, SortSymbol, SortSymbol]; + /** Empty for most sellers */ + letter: string; +} + +function letterOf(index: number): string { + let letter = ''; + for (let rest = index; rest > 0; rest = Math.floor((rest - 1) / 26)) { + letter = String.fromCharCode(65 + ((rest - 1) % 26)) + letter; + } + return letter; +} + +export function sortMark(code: number): SortMark { + const group = Math.floor(code / 10); + const pattern = (group * PATTERN_STEP) % PATTERNS; + const count = SORT_SYMBOLS.length; + return { + digit: code % 10, + fields: [ + SORT_SYMBOLS[Math.floor(pattern / count ** 2)], + SORT_SYMBOLS[Math.floor(pattern / count) % count], + SORT_SYMBOLS[pattern % count], + ], + letter: letterOf(Math.floor(group / PATTERNS)), + }; +} + +/** For putting the baskets in a row in sorting order: by digit, then by the fields. */ +export function compareSortCodes(a: number, b: number): number { + const key = (code: number) => { + const mark = sortMark(code); + return [ + mark.digit, + ...mark.fields.map((field) => SORT_SYMBOLS.indexOf(field)), + mark.letter.length, + ]; + }; + const [left, right] = [key(a), key(b)]; + for (const [i, value] of left.entries()) { + if (value !== right[i]) return value - right[i]; + } + return sortMark(a).letter.localeCompare(sortMark(b).letter); +} From c1d3f0113238f2eab43e772d89d2b572ccd9618d Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Mon, 2 Nov 2026 10:59:05 +0100 Subject: [PATCH 04/58] feat(events): universal labels by default for kids and clothing bazaars Co-Authored-By: Claude Opus 5.5 --- src/lib/eventTypes.test.ts | 14 +++++++++++++- src/lib/eventTypes.ts | 4 ++++ src/locales/de/organizer.json | 2 +- src/locales/en/organizer.json | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/lib/eventTypes.test.ts b/src/lib/eventTypes.test.ts index 278d7990..21370d55 100644 --- a/src/lib/eventTypes.test.ts +++ b/src/lib/eventTypes.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; import { EVENT_TYPES, findEventType } from './eventTypes'; -import { showsPriceOnLabel } from '../shared/eventFeatures'; +import { effectiveLabelMark, showsPriceOnLabel } from '../shared/eventFeatures'; import { REQUIRABLE_FIELD_KEYS } from '../shared/categoryFields'; import i18n from '../i18n'; @@ -21,6 +21,18 @@ describe('event types', () => { } }); + it('uses universal labels where many small items are sorted back', () => { + const marks = Object.fromEntries( + EVENT_TYPES.map((type) => [type.id, effectiveLabelMark(type)]) + ); + expect(marks).toEqual({ + kidsBazaar: 'universal', + clothingBazaar: 'universal', + skiBazaar: 'number', + bikeExchange: 'number', + }); + }); + it('the most asked for kinds come first, each with examples for the previews', () => { expect(EVENT_TYPES.map((type) => type.id)).toEqual([ 'kidsBazaar', diff --git a/src/lib/eventTypes.ts b/src/lib/eventTypes.ts index 0db4bc4b..af51467a 100644 --- a/src/lib/eventTypes.ts +++ b/src/lib/eventTypes.ts @@ -38,6 +38,8 @@ export const EVENT_TYPES: EventType[] = [ photosOptional: true, maxItemsPerSeller: 50, labelFormat: 'small', + // Many small items: sorted back by sight, and the labels work at the next bazaar + labelMark: 'universal', priceOnLabel: false, }, categoryMatch: /kind|baby|spiel|kleid|schuh|buch/i, @@ -57,6 +59,8 @@ export const EVENT_TYPES: EventType[] = [ photosOptional: true, maxItemsPerSeller: 30, labelFormat: 'small', + // Many small items: sorted back by sight, and the labels work at the next bazaar + labelMark: 'universal', priceOnLabel: false, }, categoryMatch: /kleid|schuh|accessoir|haushalt|buch|spiel/i, diff --git a/src/locales/de/organizer.json b/src/locales/de/organizer.json index 69db4127..5ed54778 100644 --- a/src/locales/de/organizer.json +++ b/src/locales/de/organizer.json @@ -902,7 +902,7 @@ "kidsBazaar": { "title": "Kinderbasar", "text": "Kinderkleidung, Spielzeug, Bücher und Ausstattung – viele kleine Teile pro Familie.", - "highlights": ["Kleine Etiketten", "Fotos freiwillig", "Rabatte zum Schluss"], + "highlights": ["Universal-Etiketten", "Fotos freiwillig", "Rabatte zum Schluss"], "exampleTitle": "Kinderbasar", "exampleItems": [ "T-Shirt und Latzhose, Gr. 98", diff --git a/src/locales/en/organizer.json b/src/locales/en/organizer.json index 321a9453..bc006076 100644 --- a/src/locales/en/organizer.json +++ b/src/locales/en/organizer.json @@ -902,7 +902,7 @@ "kidsBazaar": { "title": "Children's bazaar", "text": "Children's clothes, toys, books and gear – many small items per family.", - "highlights": ["Small labels", "Photos optional", "Discounts at the end"], + "highlights": ["Universal labels", "Photos optional", "Discounts at the end"], "exampleTitle": "Children's bazaar", "exampleItems": ["T-shirt and dungarees, size 98", "Lego box, mixed", "Rubber boots, size 27"] }, From d00c820d945d4b6f5546c67c2029b167c341274e Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Mon, 2 Nov 2026 13:43:57 +0100 Subject: [PATCH 05/58] feat(demo): seed universal labels, QR-only labels and venue addresses The kids and clothing bazaars print universal labels, the flea market QR-only labels. Venues get a structured address, including one in Austria. Co-Authored-By: Claude Opus 5.5 --- backend/src/demo/extended.rs | 54 ++++++++++++++++++++++++++++++++--- backend/tests/api/demo.rs | 55 ++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 4 deletions(-) diff --git a/backend/src/demo/extended.rs b/backend/src/demo/extended.rs index 57c5cddf..bfd47e87 100644 --- a/backend/src/demo/extended.rs +++ b/backend/src/demo/extended.rs @@ -108,11 +108,21 @@ struct Demo<'a> { single: bool, } +/// Address of the venue. Empty parts in English: the address form knows no British towns, +/// those demos keep it all in the location, as older events do. +struct Venue { + street: Text, + postal_code: Text, + city: Text, + country: &'static str, +} + struct EventPlan { organizer: Uuid, title: Text, description: Text, location: Text, + address: Option, contact: &'static str, services: &'static [&'static str], visibility: &'static str, @@ -239,6 +249,14 @@ impl Demo<'_> { "commission": plan.commission, "features": plan.features, }); + if let Some(venue) = &plan.address { + args["address"] = json!({ + "street": self.text(venue.street), + "postalCode": self.text(venue.postal_code), + "city": self.text(venue.city), + "country": venue.country, + }); + } if let Some(cover) = self.seeder.image(plan.cover) { args["coverImage"] = json!(cover); } @@ -659,9 +677,15 @@ async fn kids_bazaar(demo: &mut Demo<'_>, people: &People) -> anyhow::Result<()> "Second-hand bazaar for children's clothes, toys, books and prams. Run by the parents' council, 15 % go to the nursery. With a cake buffet!\n\nDrop-off the day before, unsold items can be picked up from 3 pm.", ), location: t( - "Kita Sonnenschein, Turnraum, Lindenstraße 4, Ulm", + "Kita Sonnenschein, Turnraum", "Sunshine Nursery, gym, 4 Linden Street, Oxford", ), + address: Some(Venue { + street: t("Lindenstraße 4", ""), + postal_code: t("89073", ""), + city: t("Ulm", ""), + country: "DE", + }), contact: "elternbeirat@example.org", services: &["Imbiss", "Getränke"], visibility: "public", @@ -678,6 +702,7 @@ async fn kids_bazaar(demo: &mut Demo<'_>, people: &People) -> anyhow::Result<()> "minimumPrice": true, "questions": true, "labelFormat": "small", + "labelMark": "universal", "intakeFee": 0.5, "privateSellersOnly": true, "fixedSellerData": true, @@ -948,9 +973,15 @@ async fn ski_bazaar(demo: &mut Demo<'_>, people: &People) -> anyhow::Result<()> "Used skis, snowboards, boots, helmets and winter clothing. Our instructors help you choose, and the waxing service is on site.\n\nSellers register with the access code from the club newsletter.", ), location: t( - "Mehrzweckhalle Blaustein, Am Sportplatz 2", + "Mehrzweckhalle Blaustein", "Blue Valley sports hall, 2 Sports Ground Road", ), + address: Some(Venue { + street: t("Am Sportplatz 2", ""), + postal_code: t("89134", ""), + city: t("Blaustein", ""), + country: "DE", + }), contact: "skibasar@example.org", services: &["Parkplatz", "Skiservice", "Getränke"], visibility: "public", @@ -1096,9 +1127,15 @@ async fn flea_market(demo: &mut Demo<'_>, people: &People) -> anyhow::Result<()> "Flea market in the courtyard of the community centre: household goods, furniture, electronics, bikes and clothes. Coffee and waffles from the neighbourhood café.", ), location: t( - "Stadtteiltreff Südstadt, Gartenweg 12", + "Stadtteiltreff Südstadt", "Southside community centre, 12 Garden Lane", ), + address: Some(Venue { + street: t("Gartenweg 12", ""), + postal_code: t("89077", ""), + city: t("Ulm", ""), + country: "DE", + }), contact: "suedstadt@example.org", services: &["Gastronomie"], visibility: "public", @@ -1114,6 +1151,8 @@ async fn flea_market(demo: &mut Demo<'_>, people: &People) -> anyhow::Result<()> "priceOffers": true, "minimumPrice": true, "questions": true, + // Only the QR code: sellers bring the labels of their last flea market + "labelMark": "none", }), }, true, @@ -1290,6 +1329,12 @@ async fn book_market(demo: &mut Demo<'_>, people: &People) -> anyhow::Result<()> "Second-hand books for a good cause: novels, non-fiction and children's books. Proceeds go to reading programmes.", ), location: t("Stadtbibliothek, Foyer", "City library, foyer"), + address: Some(Venue { + street: t("Kirchstraße 12", "Kirchstraße 12"), + postal_code: t("6900", "6900"), + city: t("Bregenz", "Bregenz"), + country: "AT", + }), contact: "bibliothek@example.org", services: &["Getränke"], visibility: "public", @@ -1354,6 +1399,7 @@ async fn other_events(demo: &mut Demo<'_>, people: &People) -> anyhow::Result<() title, description, location, + address: None, contact: "kontakt@example.org", services: &[], visibility: "public", @@ -1431,7 +1477,7 @@ async fn other_events(demo: &mut Demo<'_>, people: &People) -> anyhow::Result<() vendor_limit: Some(3), visibility: "logged-in", categories: &[Cat::Clothing, Cat::Shoes], - features: json!({ "discounts": false, "labelFormat": "small" }), + features: json!({ "discounts": false, "labelFormat": "small", "labelMark": "universal" }), ..plan( sabine, t("Kleiderbasar Gemeindehaus", "Parish Hall Clothes Sale"), diff --git a/backend/tests/api/demo.rs b/backend/tests/api/demo.rs index 2db9d361..73321117 100644 --- a/backend/tests/api/demo.rs +++ b/backend/tests/api/demo.rs @@ -157,6 +157,61 @@ async fn bazaars_in_every_state(db: PgPool) { // The views of organizers, sellers and admins work on the data let kids = event_id(&db, "Kinderbasar Kita Sonnenschein").await; + // Universal labels: the seller's lasting code instead of the number of this bazaar + let item: String = sqlx::query_scalar( + "SELECT p.id::text FROM products p + JOIN event_products ep ON ep.product_id = p.id + JOIN events e ON e.id = ep.event_id + JOIN users u ON u.id = p.vendor_id + WHERE e.title = 'Kinderbasar Kita Sonnenschein' AND u.email = 'anna.schmidt@example.org' + LIMIT 1", + ) + .fetch_one(&db) + .await + .unwrap(); + let labels = ok( + &app, + "labels.getLabelData", + json!({ "productIds": [item], "eventId": kids }), + Some(&seller), + ) + .await; + assert_eq!(labels["format"], "small"); + assert!(labels["labels"][0]["sortCode"].is_number()); + assert!(labels["labels"][0].get("sellerNumber").is_none()); + let vendors = ok( + &app, + "eventRoles.getVendorsForEvent", + json!({ "eventId": kids }), + Some(&organizer), + ) + .await; + assert!( + vendors + .as_array() + .unwrap() + .iter() + .any(|vendor| vendor["sortCode"].is_number()) + ); + // The address form: venue name and address apart, also outside of Germany + assert_eq!( + count( + &db, + "SELECT count(*) FROM events WHERE title = 'Kinderbasar Kita Sonnenschein' + AND location = 'Kita Sonnenschein, Turnraum' AND street = 'Lindenstraße 4' + AND postal_code = '89073' AND city = 'Ulm'" + ) + .await, + 1 + ); + assert_eq!( + count( + &db, + "SELECT count(*) FROM events WHERE country = 'AT' AND city = 'Bregenz'" + ) + .await, + 1 + ); let event = json!({ "eventId": kids }); let summary = ok( &app, From 66fc7943439b148bc4745c4e3aecc76fc0a724c5 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Mon, 2 Nov 2026 21:36:49 +0100 Subject: [PATCH 06/58] feat(marketing): explain universal labels on the public pages The features page shows example labels and links to the guide, the pricing FAQ answers what a universal label is, and the short texts name the option. Co-Authored-By: Claude Opus 5.5 --- src/locales/de/company.json | 31 ++++++- src/locales/de/landing.json | 2 +- src/locales/de/organizer.json | 2 +- src/locales/en/company.json | 31 ++++++- src/locales/en/landing.json | 2 +- src/locales/en/organizer.json | 2 +- src/pages/public/company/FeaturesPage.tsx | 3 + src/pages/public/company/PricingPage.tsx | 2 +- .../components/UniversalLabelSection.tsx | 91 +++++++++++++++++++ 9 files changed, 157 insertions(+), 9 deletions(-) create mode 100644 src/pages/public/company/components/UniversalLabelSection.tsx diff --git a/src/locales/de/company.json b/src/locales/de/company.json index 824565f7..7263f1eb 100644 --- a/src/locales/de/company.json +++ b/src/locales/de/company.json @@ -44,6 +44,29 @@ "text": "App und E-Mails gibt es auf Deutsch und Englisch. Jeder bekommt Mails in seiner Sprache." } }, + "universalLabel": { + "eyebrow": "Universal-Etikett", + "title": "Zurücksortieren, ohne zu lesen", + "text": "Bei Kinder- und Kleiderbasaren müssen am Ende Hunderte kleine Teile zurück zu ihren Verkäufern. Dabei hilft ein Zeichen aus Ziffer, Farben und Symbolen, das jeder Verkäufer behält.", + "example": "Beispiel für drei Etiketten eines Verkäufers mit demselben Sortierzeichen", + "exampleItems": ["Body mit Bären", "Regenjacke", "Gummistiefel"], + "steps": { + "sort": { + "title": "Auf einen Blick sortieren", + "text": "Helfer legen die Ware erst nach der großen Ziffer auf Stapel und dann nach Farben und Symbolen in die Kiste des Verkäufers. Die Sortierblätter für die Kisten druckt BazarPro." + }, + "reuse": { + "title": "Beim nächsten Basar wiederverwenden", + "text": "Das Zeichen bleibt beim Verkäufer. Unverkaufte Teile behalten ihr Etikett, wenn auch der nächste Basar Universal-Etiketten nutzt." + }, + "print": { + "title": "Auf jedem Drucker", + "text": "Jede Farbe hat ihr eigenes Symbol, deshalb klappt es auch im Schwarz-Weiß-Druck und für farbenblinde Helfer." + } + }, + "default": "Bei den Vorlagen für Kinder- und Kleiderbasare schon eingestellt. Für wenige große Artikel wie Fahrräder bleibt die Verkäufernummer die bessere Wahl.", + "guide": "So funktioniert das Universal-Etikett" + }, "useCases": { "eyebrow": "Einsatzbereiche", "title": "Für jeden Second-Hand-Basar", @@ -53,7 +76,7 @@ "bazaarTypes": { "kids": { "title": "Kinderkleiderbasar", - "text": "Kleiderbasar, Kinderbasar oder Nummernbasar: viele kleine Teile, kleine Etiketten, Fotos freiwillig." + "text": "Kleiderbasar, Kinderbasar oder Nummernbasar: viele kleine Teile, Universal-Etiketten zum Wiederverwenden, Fotos freiwillig." }, "bikes": { "title": "Fahrradbörse", @@ -80,7 +103,7 @@ "wizard": "Assistent zum Anlegen mit Vorlagen für Fahrradbörse, Kinderbasar und Flohmarkt", "registration": "Online-Anmeldung von Verkäufern mit Zugangscode und Teilnehmerlimit", "listing": "Artikel mit Foto und Preis online erfassen", - "labels": "QR-Code-Etiketten als PDF, groß oder klein, mit Verkäufernummer", + "labels": "QR-Code-Etiketten als PDF, groß oder klein, mit Verkäufernummer oder als wiederverwendbares Universal-Etikett", "scan": "Warenannahme und Kasse per Smartphone-Scan", "cart": "Kasse mit Warenkorb, per Handykamera oder Hand-Scanner", "offline": "Offline-Kasse in der App: verkauft ohne Internet und bucht später nach", @@ -216,6 +239,10 @@ "question": "Brauche ich eine Kasse oder einen Scanner?", "answer": "Nein. Warenannahme und Verkauf laufen im Browser über die Kamera eines Smartphones oder Tablets. Einen Hand-Scanner kannst du an der Kasse zusätzlich nutzen. Etiketten druckst du auf normalem Papier." }, + "universalLabels": { + "question": "Was ist ein Universal-Etikett?", + "answer": "Ein kleines Etikett, das statt der Verkäufernummer ein festes Zeichen des Verkäufers aus Ziffer, Farben und Symbolen trägt. Helfer sortieren unverkaufte Ware danach zurück, ohne zu lesen. Unverkaufte Teile behalten ihr Etikett beim nächsten Basar mit Universal-Etiketten, und es funktioniert auch im Schwarz-Weiß-Druck." + }, "selfHost": { "question": "Kann ich BazarPro auf meinem eigenen Server betreiben?", "answer": "Ja. BazarPro ist Open Source unter MIT-Lizenz. Mit Docker Compose läuft es auf einem eigenen Server – die Anleitung steht in der Dokumentation unter docs.bazarpro.de." diff --git a/src/locales/de/landing.json b/src/locales/de/landing.json index 17d4629b..b7e4a7b8 100644 --- a/src/locales/de/landing.json +++ b/src/locales/de/landing.json @@ -18,7 +18,7 @@ }, "printer": { "title": "Etiketten als PDF", - "text": "Groß oder klein, mit Verkäufernummer – einzeln oder alle auf einmal." + "text": "Groß oder klein, mit Verkäufernummer oder als Universal-Etikett zum Wiederverwenden – einzeln oder alle auf einmal." }, "badgePercent": { "title": "Rabatte", diff --git a/src/locales/de/organizer.json b/src/locales/de/organizer.json index 5ed54778..04cfa5f8 100644 --- a/src/locales/de/organizer.json +++ b/src/locales/de/organizer.json @@ -913,7 +913,7 @@ "clothingBazaar": { "title": "Kleider- & Second-Hand-Basar", "text": "Damen-, Herren- oder Familienkleidung, Schuhe und Haushalt – oder ein klassischer Flohmarkt.", - "highlights": ["Preisvorschläge", "Fragen an Verkäufer", "Rabatte"], + "highlights": ["Universal-Etiketten", "Preisvorschläge", "Fragen an Verkäufer"], "exampleTitle": "Second-Hand-Basar", "exampleItems": ["Jacke, Gr. 38", "Lederstiefel, Gr. 39", "Handtasche, Leder"] }, diff --git a/src/locales/en/company.json b/src/locales/en/company.json index dd7c0d6d..4afc655e 100644 --- a/src/locales/en/company.json +++ b/src/locales/en/company.json @@ -44,6 +44,29 @@ "text": "The app and its emails are available in German and English. Everyone gets emails in their own language." } }, + "universalLabel": { + "eyebrow": "Universal label", + "title": "Sort items back without reading", + "text": "At kids' and clothing bazaars, hundreds of small items have to go back to their sellers at the end. A mark made of a digit, colors and symbols, which each seller keeps, makes this easier.", + "example": "Example of three labels from one seller with the same sorting mark", + "exampleItems": ["Bodysuit with bears", "Rain jacket", "Rubber boots"], + "steps": { + "sort": { + "title": "Sort at a glance", + "text": "Helpers pile the items by the large digit first, then put them into the seller's basket by colors and symbols. BazarPro prints the sorting sheets for the baskets." + }, + "reuse": { + "title": "Reuse at the next bazaar", + "text": "The mark stays with the seller. Unsold items keep their label if the next bazaar uses universal labels too." + }, + "print": { + "title": "On any printer", + "text": "Every color has its own symbol, so it also works in black and white and for color-blind helpers." + } + }, + "default": "Already set in the templates for kids' and clothing bazaars. For a few large items such as bikes, the seller number remains the better choice.", + "guide": "How the universal label works" + }, "useCases": { "eyebrow": "Use cases", "title": "For every second-hand bazaar", @@ -53,7 +76,7 @@ "bazaarTypes": { "kids": { "title": "Children's clothing bazaar", - "text": "Clothing, kids' or numbered bazaar: many small items, small labels, photos optional." + "text": "Clothing, kids' or numbered bazaar: many small items, reusable universal labels, photos optional." }, "bikes": { "title": "Bike sale", @@ -80,7 +103,7 @@ "wizard": "Creation wizard with presets for bike sales, kids' bazaars and flea markets", "registration": "Online seller registration with access code and participant limit", "listing": "Enter items online with photo and price", - "labels": "QR code labels as PDF, large or small, with seller number", + "labels": "QR code labels as PDF, large or small, with seller number or as a reusable universal label", "scan": "Drop-off and checkout by smartphone scan", "cart": "Checkout with a cart, by phone camera or hand scanner", "offline": "Offline checkout in the app: sells without internet and books the sales later", @@ -216,6 +239,10 @@ "question": "Do I need a till or a scanner?", "answer": "No. Drop-off and sales run in the browser using the camera of a smartphone or tablet. You can also use a hand scanner at the checkout. You print labels on regular paper." }, + "universalLabels": { + "question": "What is a universal label?", + "answer": "A small label that carries a seller's lasting mark made of a digit, colors and symbols instead of the seller number. Helpers sort unsold items back by it without reading. Unsold items keep their label at the next bazaar with universal labels, and it also works in black and white." + }, "selfHost": { "question": "Can I run BazarPro on my own server?", "answer": "Yes. BazarPro is open source under the MIT license. With Docker Compose it runs on your own server – the guide is in the documentation at docs.bazarpro.de." diff --git a/src/locales/en/landing.json b/src/locales/en/landing.json index 286e8ef8..97adf42b 100644 --- a/src/locales/en/landing.json +++ b/src/locales/en/landing.json @@ -18,7 +18,7 @@ }, "printer": { "title": "Labels as PDF", - "text": "Large or small, with your seller number – one by one or all at once." + "text": "Large or small, with your seller number or as a reusable universal label – one by one or all at once." }, "badgePercent": { "title": "Discounts", diff --git a/src/locales/en/organizer.json b/src/locales/en/organizer.json index bc006076..bd0dbc0b 100644 --- a/src/locales/en/organizer.json +++ b/src/locales/en/organizer.json @@ -909,7 +909,7 @@ "clothingBazaar": { "title": "Clothing & second-hand bazaar", "text": "Women's, men's or family clothing, shoes and household goods – or a classic flea market.", - "highlights": ["Price offers", "Questions to sellers", "Discounts"], + "highlights": ["Universal labels", "Price offers", "Questions to sellers"], "exampleTitle": "Second-hand bazaar", "exampleItems": ["Jacket, size 38", "Leather boots, size 39", "Leather handbag"] }, diff --git a/src/pages/public/company/FeaturesPage.tsx b/src/pages/public/company/FeaturesPage.tsx index e7cddb4f..f3fa1523 100644 --- a/src/pages/public/company/FeaturesPage.tsx +++ b/src/pages/public/company/FeaturesPage.tsx @@ -27,6 +27,7 @@ import { LandingCTA } from '../landing/components/LandingCTA'; import { LandingFeatures } from '../landing/components/LandingFeatures'; import { MarketingHero, SectionHeading } from './components/MarketingHero'; import { OpenSourceSection } from './components/OpenSourceSection'; +import { UniversalLabelSection } from './components/UniversalLabelSection'; import { useStartActions } from './components/useStartActions'; import { Trans, useTranslation } from 'react-i18next'; @@ -186,6 +187,8 @@ export function FeaturesPage() { + + {/* Use cases */}
diff --git a/src/pages/public/company/PricingPage.tsx b/src/pages/public/company/PricingPage.tsx index 011d7d66..4ea30193 100644 --- a/src/pages/public/company/PricingPage.tsx +++ b/src/pages/public/company/PricingPage.tsx @@ -15,7 +15,7 @@ const HOSTED_FEATURES = ['unlimited', 'labels', 'settlement', 'instant'] as cons const SELFHOSTED_FEATURES = ['allFeatures', 'ownData', 'ownDomain', 'docker'] as const; -const FAQ = ['free', 'useCases', 'commission', 'hardware', 'selfHost'] as const; +const FAQ = ['free', 'useCases', 'commission', 'hardware', 'universalLabels', 'selfHost'] as const; export function PricingPage() { const { isAuthenticated, goToOrganizer, goToSeller } = useStartActions(); diff --git a/src/pages/public/company/components/UniversalLabelSection.tsx b/src/pages/public/company/components/UniversalLabelSection.tsx new file mode 100644 index 00000000..2a05c159 --- /dev/null +++ b/src/pages/public/company/components/UniversalLabelSection.tsx @@ -0,0 +1,91 @@ +import { ArrowRight, Printer, Recycle, ScanEye, type LucideIcon } from 'lucide-react'; +import { QRCodeSVG } from 'qrcode.react'; +import { useTranslation } from 'react-i18next'; +import { SortMarkBadge } from '../../../../components/sellers/SortMarkBadge'; +import { docsUrl } from '../../../../lib/links'; +import { SectionHeading } from './MarketingHero'; + +/** Any code gives a realistic mark; this one has three clearly different fields. */ +const EXAMPLE_SORT_CODE = 175; + +const STEPS: { icon: LucideIcon; id: 'sort' | 'reuse' | 'print' }[] = [ + { icon: ScanEye, id: 'sort' }, + { icon: Recycle, id: 'reuse' }, + { icon: Printer, id: 'print' }, +]; + +/** Explains universal labels with labels as they are printed, in every theme on white. */ +export function UniversalLabelSection() { + const { t, i18n } = useTranslation('company'); + const items = t('featuresPage.universalLabel.exampleItems', { + returnObjects: true, + }) as string[]; + + return ( +
+
+ + {t('featuresPage.universalLabel.text')} + +
+
+ {items.map((title) => ( +
+ +
+ +

{title}

+
+
+ ))} +
+
+ {STEPS.map(({ icon: Icon, id }) => ( +
+ + + +
+

+ {t(`featuresPage.universalLabel.steps.${id}.title`)} +

+

+ {t(`featuresPage.universalLabel.steps.${id}.text`)} +

+
+
+ ))} +

+ {t('featuresPage.universalLabel.default')} +

+ + {t('featuresPage.universalLabel.guide')} + + +
+
+
+
+ ); +} From 89d84a45978d22005d13ea6e1d6cc1c5db34036c Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Tue, 3 Nov 2026 04:51:32 +0100 Subject: [PATCH 07/58] feat(account): country selector in the profile and the join wizard Profiles now store country codes like events do, and the postal code is checked by the chosen country. A migration converts common spellings; other text stays selectable and is shown as typed. Co-Authored-By: Claude Opus 5.5 --- backend/migrations/0018_user_country_code.sql | 13 +++++ backend/src/demo/catalog.rs | 6 +-- backend/src/demo/core.rs | 2 +- backend/src/modules/users.rs | 2 +- backend/tests/api/users.rs | 34 +++++++++++++ .../ValidateProfileInformation.test.tsx | 50 +++++++++++++++++++ .../events/ValidateProfileInformation.tsx | 32 ++++++------ src/components/sellers/SellerIdCheck.tsx | 3 +- src/components/ui/country-select.tsx | 34 +++++++++++++ src/i18n/countries.test.ts | 20 ++++++++ src/i18n/countries.ts | 11 ++++ src/lib/proofOfOffersPdf.ts | 4 +- src/locales/de/account.json | 4 +- src/locales/de/common.json | 7 +++ src/locales/de/organizer.json | 7 --- src/locales/en/account.json | 4 +- src/locales/en/common.json | 7 +++ src/locales/en/organizer.json | 7 --- src/pages/account/components/ProfileCard.tsx | 22 ++++---- src/pages/organizer/events/EditEventForm.tsx | 6 +-- .../events/components/EditEventBasicInfo.tsx | 15 +----- .../dashboard/ProductManagementPage.tsx | 5 +- src/shared/constants.ts | 15 ++++-- src/tests/auth/profile.spec.ts | 4 +- 24 files changed, 240 insertions(+), 74 deletions(-) create mode 100644 backend/migrations/0018_user_country_code.sql create mode 100644 src/components/events/ValidateProfileInformation.test.tsx create mode 100644 src/components/ui/country-select.tsx create mode 100644 src/i18n/countries.test.ts create mode 100644 src/i18n/countries.ts diff --git a/backend/migrations/0018_user_country_code.sql b/backend/migrations/0018_user_country_code.sql new file mode 100644 index 00000000..5e138199 --- /dev/null +++ b/backend/migrations/0018_user_country_code.sql @@ -0,0 +1,13 @@ +-- Profile countries were free text; now they are ISO 3166-1 alpha-2 codes like those of events. +-- Other values stay as they are and keep being shown as typed. Snapshots of sellers keep what +-- was true when they were taken. +UPDATE users SET country = CASE + WHEN lower(trim(country)) IN ('de', 'd', 'deu', 'ger', 'brd', 'deutschland', 'germany') THEN 'DE' + -- translate: lower() leaves Ö alone in databases with the C locale + WHEN translate(lower(trim(country)), 'Ö', 'ö') IN ('at', 'a', 'aut', 'österreich', 'oesterreich', 'austria') THEN 'AT' + WHEN lower(trim(country)) IN ('ch', 'che', 'schweiz', 'switzerland', 'suisse', 'svizzera') THEN 'CH' + WHEN lower(trim(country)) IN ('li', 'lie', 'liechtenstein') THEN 'LI' + WHEN lower(trim(country)) IN ('lu', 'lux', 'luxemburg', 'luxembourg') THEN 'LU' + ELSE country + END +WHERE country IS NOT NULL; diff --git a/backend/src/demo/catalog.rs b/backend/src/demo/catalog.rs index 670a1bee..7e379f81 100644 --- a/backend/src/demo/catalog.rs +++ b/backend/src/demo/catalog.rs @@ -211,17 +211,17 @@ pub fn city(locale: Locale, index: usize) -> City { City { zip: "89073", name: "Ulm", - country: "Deutschland", + country: "DE", }, City { zip: "89231", name: "Neu-Ulm", - country: "Deutschland", + country: "DE", }, City { zip: "89077", name: "Ulm", - country: "Deutschland", + country: "DE", }, ]; const EN: [City; 3] = [ diff --git a/backend/src/demo/core.rs b/backend/src/demo/core.rs index d96fefcd..1f66e96b 100644 --- a/backend/src/demo/core.rs +++ b/backend/src/demo/core.rs @@ -653,7 +653,7 @@ pub async fn insert_users(seeder: &Seeder, ctx: &mut Ctx) -> AppResult AppResult String { + sqlx::query("UPDATE users SET country = $2 WHERE id = $1") + .bind(user) + .bind(stored) + .execute(&db) + .await + .unwrap(); + sqlx::raw_sql(include_str!("../../migrations/0018_user_country_code.sql")) + .execute(&db) + .await + .unwrap(); + sqlx::query_scalar("SELECT country FROM users WHERE id = $1") + .bind(user) + .fetch_one(&db) + .await + .unwrap() + }; + for (stored, code) in [ + ("Deutschland", "DE"), + (" germany ", "DE"), + ("de", "DE"), + ("Österreich", "AT"), + ("ÖSTERREICH", "AT"), + ("Schweiz", "CH"), + ("Luxembourg", "LU"), + ("United Kingdom", "United Kingdom"), + ] { + assert_eq!(country(stored).await, code); + } +} diff --git a/src/components/events/ValidateProfileInformation.test.tsx b/src/components/events/ValidateProfileInformation.test.tsx new file mode 100644 index 00000000..d21bcd07 --- /dev/null +++ b/src/components/events/ValidateProfileInformation.test.tsx @@ -0,0 +1,50 @@ +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import type { Doc } from '../../lib/api/types'; +import { ValidateProfileInformation } from './ValidateProfileInformation'; + +const update = vi.hoisted(() => vi.fn(async () => undefined)); +vi.mock('../../lib/api/react', () => ({ useMutation: () => update })); + +const fill = (label: string, value: string) => + fireEvent.change(screen.getByLabelText(label), { target: { value } }); + +function renderAddressStep(country?: string) { + render( + } + /> + ); + fill('Straße und Hausnummer', 'Kirchstraße 12'); + fill('Ort', 'Bregenz'); +} + +describe('ValidateProfileInformation', () => { + beforeEach(() => update.mockClear()); + + it('preselects Germany and checks the postal code by the chosen country', async () => { + renderAddressStep(); + expect(screen.getByLabelText('Land')).toHaveValue('DE'); + fill('Postleitzahl', '6900'); + fireEvent.click(screen.getByRole('button', { name: 'Adresse speichern' })); + expect(await screen.findByText('Ungültige Postleitzahl für dieses Land')).toBeVisible(); + expect(update).not.toHaveBeenCalled(); + + fill('Land', 'AT'); + fireEvent.click(screen.getByRole('button', { name: 'Adresse speichern' })); + await waitFor(() => + expect(update).toHaveBeenCalledWith({ + street: 'Kirchstraße 12', + city: 'Bregenz', + zipCode: '6900', + country: 'AT', + }) + ); + }); + + it('keeps a country typed into an older profile', () => { + renderAddressStep('United Kingdom'); + expect(screen.getByLabelText('Land')).toHaveValue('United Kingdom'); + }); +}); diff --git a/src/components/events/ValidateProfileInformation.tsx b/src/components/events/ValidateProfileInformation.tsx index 094ffc14..1d1dc5a3 100644 --- a/src/components/events/ValidateProfileInformation.tsx +++ b/src/components/events/ValidateProfileInformation.tsx @@ -2,6 +2,7 @@ import { useEffect } from 'react'; import { Label } from '../ui/label'; import { Input } from '../ui/input'; import { Button } from '../ui/button'; +import { CountrySelect } from '../ui/country-select'; import { useMutation } from '../../lib/api/react'; import { api } from '../../lib/api/functions'; import type { Doc } from '../../lib/api/types'; @@ -11,6 +12,7 @@ import { useForm } from 'react-hook-form'; import { getUserFacingErrorMessage } from '../../lib/errors'; import { useTranslation } from 'react-i18next'; import i18n from '../../i18n'; +import { isPostalCodeValid } from '../../shared/constants'; /** Error text in the current language, read when validating */ const msg = (key: string, ns = 'events') => ({ @@ -27,10 +29,7 @@ const profileSchema = z.object({ .regex(/^\+?[0-9\s\-()]{7,20}$/, msg('profile.invalidPhone', 'account')), street: z.string().trim().min(1, msg('profile.streetRequired')), city: z.string().trim().min(1, msg('profile.cityRequired')), - zipCode: z - .string() - .trim() - .regex(/^\d{5}$/, msg('profile.invalidZip', 'account')), + zipCode: z.string().trim().min(1, msg('profile.invalidZip', 'account')), country: z.string().trim().min(1, msg('profile.countryRequired')), }); @@ -40,12 +39,17 @@ const basicProfileSchema = profileSchema.pick({ phone: true, }); -const addressProfileSchema = profileSchema.pick({ - street: true, - city: true, - zipCode: true, - country: true, -}); +const addressProfileSchema = profileSchema + .pick({ + street: true, + city: true, + zipCode: true, + country: true, + }) + .refine((address) => isPostalCodeValid(address.zipCode, address.country), { + path: ['zipCode'], + ...msg('profile.invalidZip', 'account'), + }); type ProfileFormData = z.infer; type BasicProfileFormData = z.infer; @@ -93,7 +97,7 @@ export function ValidateProfileInformation({ street: user.street ?? '', city: user.city ?? '', zipCode: user.zipCode ?? '', - country: user.country ?? '', + country: user.country || 'DE', }); }, [user, isDirty, reset]); @@ -259,11 +263,7 @@ export function ValidateProfileInformation({
- + {errors.country && (

{errors.country.message}

)} diff --git a/src/components/sellers/SellerIdCheck.tsx b/src/components/sellers/SellerIdCheck.tsx index 67cb5afb..fe4cba74 100644 --- a/src/components/sellers/SellerIdCheck.tsx +++ b/src/components/sellers/SellerIdCheck.tsx @@ -2,6 +2,7 @@ import { IdCard } from 'lucide-react'; import { useTranslation } from 'react-i18next'; import { Alert, AlertDescription, AlertTitle } from '../ui/alert'; import type { VendorWithCalculations } from '../../lib/api/types'; +import { countryName } from '../../i18n/countries'; /** * Bazaars with fixedSellerData: name and address as they will be recorded with the first @@ -20,7 +21,7 @@ export function SellerIdCheck({ seller }: { seller: VendorWithCalculations }) { {name &&
{name}
} {seller.street &&
{seller.street}
} {place &&
{place}
} - {seller.country &&
{seller.country}
} + {seller.country &&
{countryName(seller.country)}
}

{t('products.idCheckText')}

diff --git a/src/components/ui/country-select.tsx b/src/components/ui/country-select.tsx new file mode 100644 index 00000000..3790e594 --- /dev/null +++ b/src/components/ui/country-select.tsx @@ -0,0 +1,34 @@ +import type { ComponentProps } from 'react'; +import { useTranslation } from 'react-i18next'; +import { isCountry } from '../../i18n/countries'; +import { COUNTRIES } from '../../shared/constants'; +import { cn } from '../utils'; + +interface CountrySelectProps extends ComponentProps<'select'> { + /** Value already saved: free text of an older profile stays selectable, not overwritten */ + saved?: string; + /** Adds a choice for no country, with this label */ + emptyLabel?: string; +} + +export function CountrySelect({ saved, emptyLabel, className, ...props }: CountrySelectProps) { + const { t } = useTranslation('common'); + return ( + + ); +} diff --git a/src/i18n/countries.test.ts b/src/i18n/countries.test.ts new file mode 100644 index 00000000..693cf9fc --- /dev/null +++ b/src/i18n/countries.test.ts @@ -0,0 +1,20 @@ +import { describe, expect, it } from 'vitest'; +import { isPostalCodeValid } from '../shared/constants'; +import { countryName } from './countries'; + +describe('countries', () => { + it('names known codes and leaves the free text of older profiles', () => { + expect(countryName('AT')).toBe('Österreich'); + expect(countryName('United Kingdom')).toBe('United Kingdom'); + }); + + it('checks postal codes by country', () => { + expect(isPostalCodeValid('89073', 'DE')).toBe(true); + expect(isPostalCodeValid('6900', 'DE')).toBe(false); + expect(isPostalCodeValid('6900', 'AT')).toBe(true); + expect(isPostalCodeValid('89073', 'AT')).toBe(false); + // No country counts as Germany, free text has no known format + expect(isPostalCodeValid('6900', '')).toBe(false); + expect(isPostalCodeValid('OX1 2JD', 'United Kingdom')).toBe(true); + }); +}); diff --git a/src/i18n/countries.ts b/src/i18n/countries.ts new file mode 100644 index 00000000..4c9a9ed1 --- /dev/null +++ b/src/i18n/countries.ts @@ -0,0 +1,11 @@ +import i18n from '.'; +import { COUNTRIES, type Country } from '../shared/constants'; + +export function isCountry(value: string | null | undefined): value is Country { + return COUNTRIES.some((code) => code === value); +} + +/** Name in the current language; older profiles and records may hold free text, shown as is. */ +export function countryName(value: string): string { + return isCountry(value) ? (i18n.t(`countries.${value}`, { ns: 'common' }) as string) : value; +} diff --git a/src/lib/proofOfOffersPdf.ts b/src/lib/proofOfOffersPdf.ts index 91165cb9..e3407ee9 100644 --- a/src/lib/proofOfOffersPdf.ts +++ b/src/lib/proofOfOffersPdf.ts @@ -2,6 +2,7 @@ import { jsPDF } from 'jspdf'; import type { ProofItem, ProofSeller } from './api/types'; import { formatPriceDE } from './utils'; import { categoryFieldText } from '../i18n/categoryFields'; +import { countryName } from '../i18n/countries'; import i18n from '../i18n'; import { dateLocale } from '../i18n/format'; import { saveFile, savePdf } from './saveFile'; @@ -36,7 +37,8 @@ export function sellerAddress( seller: Pick ): string { const city = [seller.zipCode, seller.city].filter(Boolean).join(' '); - return [seller.street, city, seller.country].filter(Boolean).join(', ') || '–'; + const country = seller.country && countryName(seller.country); + return [seller.street, city, country].filter(Boolean).join(', ') || '–'; } function contact(seller: ProofSeller): string { diff --git a/src/locales/de/account.json b/src/locales/de/account.json index c149a144..9fb7e84e 100644 --- a/src/locales/de/account.json +++ b/src/locales/de/account.json @@ -16,9 +16,9 @@ "city": "Ort", "cityPlaceholder": "Musterstadt", "country": "Land", - "countryPlaceholder": "Deutschland", + "countryNone": "Bitte wählen", "invalidPhone": "Ungültiges Telefonnummer-Format (z. B. +49 123 456789)", - "invalidZip": "Ungültige Postleitzahl (5 Ziffern erforderlich)", + "invalidZip": "Ungültige Postleitzahl für dieses Land", "save": "Profil aktualisieren", "saved": "Profil erfolgreich aktualisiert!", "saveFailed": "Fehler beim Aktualisieren des Profils.", diff --git a/src/locales/de/common.json b/src/locales/de/common.json index 443d5729..f3ddebec 100644 --- a/src/locales/de/common.json +++ b/src/locales/de/common.json @@ -1,4 +1,11 @@ { + "countries": { + "DE": "Deutschland", + "AT": "Österreich", + "CH": "Schweiz", + "LI": "Liechtenstein", + "LU": "Luxemburg" + }, "header": { "login": "Anmelden", "register": "Registrieren", diff --git a/src/locales/de/organizer.json b/src/locales/de/organizer.json index 04cfa5f8..27b91008 100644 --- a/src/locales/de/organizer.json +++ b/src/locales/de/organizer.json @@ -64,13 +64,6 @@ "postalCode": "PLZ", "city": "Ort", "country": "Land", - "countries": { - "DE": "Deutschland", - "AT": "Österreich", - "CH": "Schweiz", - "LI": "Liechtenstein", - "LU": "Luxemburg" - }, "start": "Startdatum *", "end": "Enddatum *" }, diff --git a/src/locales/en/account.json b/src/locales/en/account.json index 19a06890..f7f245ff 100644 --- a/src/locales/en/account.json +++ b/src/locales/en/account.json @@ -16,9 +16,9 @@ "city": "City", "cityPlaceholder": "Sample City", "country": "Country", - "countryPlaceholder": "Germany", + "countryNone": "Please choose", "invalidPhone": "Invalid phone number format (e.g. +49 123 456789)", - "invalidZip": "Invalid postal code (5 digits required)", + "invalidZip": "Invalid postal code for this country", "save": "Update profile", "saved": "Profile updated!", "saveFailed": "The profile could not be updated.", diff --git a/src/locales/en/common.json b/src/locales/en/common.json index f1b5e964..ec7b5189 100644 --- a/src/locales/en/common.json +++ b/src/locales/en/common.json @@ -1,4 +1,11 @@ { + "countries": { + "DE": "Germany", + "AT": "Austria", + "CH": "Switzerland", + "LI": "Liechtenstein", + "LU": "Luxembourg" + }, "header": { "login": "Log in", "register": "Sign up", diff --git a/src/locales/en/organizer.json b/src/locales/en/organizer.json index bd0dbc0b..4e1aca14 100644 --- a/src/locales/en/organizer.json +++ b/src/locales/en/organizer.json @@ -64,13 +64,6 @@ "postalCode": "Postal code", "city": "Town", "country": "Country", - "countries": { - "DE": "Germany", - "AT": "Austria", - "CH": "Switzerland", - "LI": "Liechtenstein", - "LU": "Luxembourg" - }, "start": "Start date *", "end": "End date *" }, diff --git a/src/pages/account/components/ProfileCard.tsx b/src/pages/account/components/ProfileCard.tsx index eaadc968..fea5b32d 100644 --- a/src/pages/account/components/ProfileCard.tsx +++ b/src/pages/account/components/ProfileCard.tsx @@ -5,6 +5,7 @@ import { z } from 'zod'; import { useMutation, useQuery } from '../../../lib/api/react'; import { api } from '../../../lib/api/functions'; import { Button } from '../../../components/ui/button'; +import { CountrySelect } from '../../../components/ui/country-select'; import { Input } from '../../../components/ui/input'; import { Label } from '../../../components/ui/label'; import { Separator } from '../../../components/ui/separator'; @@ -15,9 +16,10 @@ import { getUserFacingErrorMessage } from '../../../lib/errors'; import { useTranslation } from 'react-i18next'; import type { TFunction } from 'i18next'; import { Alert, AlertDescription } from '../../../components/ui/alert'; +import { isPostalCodeValid } from '../../../shared/constants'; function buildProfileSchema(t: TFunction<'account'>) { - return z.object({ + const schema = z.object({ firstName: z.string().optional(), lastName: z.string().optional(), phone: z @@ -28,14 +30,13 @@ function buildProfileSchema(t: TFunction<'account'>) { }), street: z.string().optional(), city: z.string().optional(), - zipCode: z - .string() - .optional() - .refine((val) => !val || /^\d{5}$/.test(val), { - message: t('profile.invalidZip'), - }), + zipCode: z.string().optional(), country: z.string().optional(), }); + return schema.refine(({ zipCode, country }) => !zipCode || isPostalCodeValid(zipCode, country), { + path: ['zipCode'], + message: t('profile.invalidZip'), + }); } type ProfileFormData = z.infer>; @@ -200,10 +201,11 @@ export function ProfileCard({ user }: ProfileCardProps) {
- {errors.country && ( diff --git a/src/pages/organizer/events/EditEventForm.tsx b/src/pages/organizer/events/EditEventForm.tsx index edb3fae9..a3d484e7 100644 --- a/src/pages/organizer/events/EditEventForm.tsx +++ b/src/pages/organizer/events/EditEventForm.tsx @@ -23,7 +23,7 @@ import { type StoredEventFeatures, } from '../../../shared/eventFeatures'; import { - EVENT_COUNTRIES, + COUNTRIES, EVENT_SERVICES, EVENT_VISIBILITY, POSTAL_CODE_PATTERNS, @@ -93,7 +93,7 @@ const buildEventSchema = ( street: z.string().max(200, zodMessage('form.addressTooLong', 'organizer')), postalCode: z.string().trim(), city: z.string().max(100, zodMessage('form.addressTooLong', 'organizer')), - country: z.enum(EVENT_COUNTRIES), + country: z.enum(COUNTRIES), }) .refine( (address) => @@ -320,7 +320,7 @@ function addressToForm(event: EventPlace | null | undefined): AddressFormData { const empty: AddressFormData = { street: '', postalCode: '', city: '', country: 'DE' }; if (!event) return empty; if (event.street || event.postalCode || event.city) { - const country = EVENT_COUNTRIES.find((code) => code === event.country) ?? 'DE'; + const country = COUNTRIES.find((code) => code === event.country) ?? 'DE'; return { street: event.street ?? '', postalCode: event.postalCode ?? '', diff --git a/src/pages/organizer/events/components/EditEventBasicInfo.tsx b/src/pages/organizer/events/components/EditEventBasicInfo.tsx index f48b4395..b505080f 100644 --- a/src/pages/organizer/events/components/EditEventBasicInfo.tsx +++ b/src/pages/organizer/events/components/EditEventBasicInfo.tsx @@ -8,7 +8,7 @@ import { ImageUpload } from '../../../../components/ui/ImageUpload'; import { SafeMarkdown } from '../../../../components/markdown/SafeMarkdown'; import { IMAGE_UPLOAD_MAX_HEIGHT, IMAGE_UPLOAD_MAX_WIDTH } from '../../../../lib/imageProcessing'; import { Trans, useTranslation } from 'react-i18next'; -import { EVENT_COUNTRIES } from '../../../../shared/constants'; +import { CountrySelect } from '../../../../components/ui/country-select'; interface EditEventBasicInfoProps { initialCoverImageUrl?: string | null; @@ -294,18 +294,7 @@ export function EditEventBasicInfo({ - +
{addressErrors && (

diff --git a/src/pages/organizer/events/dashboard/ProductManagementPage.tsx b/src/pages/organizer/events/dashboard/ProductManagementPage.tsx index 7ab18bb3..2f95247f 100644 --- a/src/pages/organizer/events/dashboard/ProductManagementPage.tsx +++ b/src/pages/organizer/events/dashboard/ProductManagementPage.tsx @@ -1,4 +1,5 @@ import { useDeferredValue, useEffect, useMemo, useState, useRef } from 'react'; +import { countryName } from '../../../../i18n/countries'; import { useApiClient, useMutation, useQuery } from '../../../../lib/api/react'; import { useNavigate, useParams, useLocation, useSearchParams } from 'react-router-dom'; import { api } from '../../../../lib/api/functions'; @@ -716,7 +717,9 @@ export function ProductManagementPage() { )} {selectedVendor.country && ( - {selectedVendor.country} + + {countryName(selectedVendor.country)} + )} diff --git a/src/shared/constants.ts b/src/shared/constants.ts index 6404ebfb..402bac93 100644 --- a/src/shared/constants.ts +++ b/src/shared/constants.ts @@ -192,15 +192,22 @@ export const LOCALE_NAMES: Record = { de: 'Deutsch', en: 'Englis */ export const MIN_PASSWORD_LENGTH = 10; -/** Countries of event addresses (ISO 3166-1 alpha-2); events without one are in Germany. */ -export const EVENT_COUNTRIES = ['DE', 'AT', 'CH', 'LI', 'LU'] as const; -export type EventCountry = (typeof EVENT_COUNTRIES)[number]; +/** Countries of addresses (ISO 3166-1 alpha-2); events without one are in Germany. */ +export const COUNTRIES = ['DE', 'AT', 'CH', 'LI', 'LU'] as const; +export type Country = (typeof COUNTRIES)[number]; /** Postal codes per country: five digits in Germany, four in the others. */ -export const POSTAL_CODE_PATTERNS: Record = { +export const POSTAL_CODE_PATTERNS: Record = { DE: /^\d{5}$/, AT: /^\d{4}$/, CH: /^\d{4}$/, LI: /^\d{4}$/, LU: /^(L-)?\d{4}$/i, }; + +/** No country counts as Germany; free text of older profiles has no known format. */ +export function isPostalCodeValid(postalCode: string, country: string | undefined): boolean { + if (!country) return POSTAL_CODE_PATTERNS.DE.test(postalCode); + const known = COUNTRIES.find((code) => code === country); + return !known || POSTAL_CODE_PATTERNS[known].test(postalCode); +} diff --git a/src/tests/auth/profile.spec.ts b/src/tests/auth/profile.spec.ts index 86331785..8d4cb219 100644 --- a/src/tests/auth/profile.spec.ts +++ b/src/tests/auth/profile.spec.ts @@ -26,7 +26,7 @@ test.describe('profile page', () => { await page.getByRole('button', { name: 'Profil aktualisieren' }).click(); await expect(page.getByText('Ungültiges Telefonnummer-Format')).toBeVisible(); - await expect(page.getByText('Ungültige Postleitzahl (5 Ziffern erforderlich)')).toBeVisible(); + await expect(page.getByText('Ungültige Postleitzahl für dieses Land')).toBeVisible(); await page.locator('#firstName').fill(firstName); await page.locator('#lastName').fill(lastName); @@ -34,7 +34,7 @@ test.describe('profile page', () => { await page.locator('#street').fill('Musterstraße 1'); await page.locator('#zipCode').fill('89073'); await page.locator('#city').fill('Ulm'); - await page.locator('#country').fill('Deutschland'); + await page.locator('#country').selectOption('DE'); await page.getByRole('button', { name: 'Profil aktualisieren' }).click(); await expect(page.getByText('Profil erfolgreich aktualisiert!')).toBeVisible(); From 1dd2b89694072c2d3f6c9f60c02db727c04d9f19 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 10:13:34 +0100 Subject: [PATCH 08/58] refactor(styles): one set of design tokens App.css repeated index.css and loaded after it, so it silently decided the dark destructive colour. Co-Authored-By: Claude Opus 5.5 --- src/App.tsx | 1 - src/styles/App.css | 189 --------------------------------------------- 2 files changed, 190 deletions(-) delete mode 100644 src/styles/App.css diff --git a/src/App.tsx b/src/App.tsx index 80d15a0f..b815989b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,3 @@ -import './styles/App.css'; import { useAuthState, useQuery, useAuthActions } from './lib/api/react'; import { Suspense, useEffect } from 'react'; import { diff --git a/src/styles/App.css b/src/styles/App.css deleted file mode 100644 index d69d0274..00000000 --- a/src/styles/App.css +++ /dev/null @@ -1,189 +0,0 @@ -@custom-variant dark (&:is(.dark *)); - -:root { - --font-size: 16px; - --background: #ffffff; - --foreground: oklch(0.145 0 0); - --card: #ffffff; - --card-foreground: oklch(0.145 0 0); - --popover: oklch(1 0 0); - --popover-foreground: oklch(0.145 0 0); - --primary: oklch(0.488 0.243 264.376); - --primary-foreground: oklch(1 0 0); - --secondary: oklch(0.95 0.0058 264.53); - --secondary-foreground: #030213; - --muted: #ececf0; - --muted-foreground: #717182; - --accent: #e9ebef; - --accent-foreground: #030213; - --destructive: #d4183d; - --destructive-foreground: #ffffff; - --border: rgba(0, 0, 0, 0.1); - --input: transparent; - --input-background: #f3f3f5; - --switch-background: #cbced4; - --font-weight-medium: 500; - --font-weight-normal: 400; - --ring: oklch(0.708 0 0); - --chart-1: oklch(0.646 0.222 41.116); - --chart-2: oklch(0.6 0.118 184.704); - --chart-3: oklch(0.398 0.07 227.392); - --chart-4: oklch(0.828 0.189 84.429); - --chart-5: oklch(0.769 0.188 70.08); - --radius: 0.625rem; - --sidebar: oklch(0.985 0 0); - --sidebar-foreground: oklch(0.145 0 0); - --sidebar-primary: #030213; - --sidebar-primary-foreground: oklch(0.985 0 0); - --sidebar-accent: oklch(0.97 0 0); - --sidebar-accent-foreground: oklch(0.205 0 0); - --sidebar-border: oklch(0.922 0 0); - --sidebar-ring: oklch(0.708 0 0); -} - -.dark { - --background: oklch(0.145 0 0); - --foreground: oklch(0.985 0 0); - --card: oklch(0.205 0 0); - --card-foreground: oklch(0.985 0 0); - --popover: oklch(0.145 0 0); - --popover-foreground: oklch(0.985 0 0); - --primary: oklch(0.588 0.243 264.376); - --primary-foreground: oklch(0.985 0 0); - --secondary: oklch(0.269 0 0); - --secondary-foreground: oklch(0.985 0 0); - --muted: oklch(0.269 0 0); - --muted-foreground: oklch(0.708 0 0); - --accent: oklch(0.269 0 0); - --accent-foreground: oklch(0.985 0 0); - --destructive: oklch(0.396 0.141 25.723); - --destructive-foreground: oklch(0.637 0.237 25.331); - --border: oklch(0.269 0 0); - --input: oklch(0.269 0 0); - --ring: oklch(0.439 0 0); - --font-weight-medium: 500; - --font-weight-normal: 400; - --chart-1: oklch(0.488 0.243 264.376); - --chart-2: oklch(0.696 0.17 162.48); - --chart-3: oklch(0.769 0.188 70.08); - --chart-4: oklch(0.627 0.265 303.9); - --chart-5: oklch(0.645 0.246 16.439); - --sidebar: oklch(0.205 0 0); - --sidebar-foreground: oklch(0.985 0 0); - --sidebar-primary: oklch(0.488 0.243 264.376); - --sidebar-primary-foreground: oklch(0.985 0 0); - --sidebar-accent: oklch(0.269 0 0); - --sidebar-accent-foreground: oklch(0.985 0 0); - --sidebar-border: oklch(0.269 0 0); - --sidebar-ring: oklch(0.439 0 0); -} - -@theme inline { - --color-background: var(--background); - --color-foreground: var(--foreground); - --color-card: var(--card); - --color-card-foreground: var(--card-foreground); - --color-popover: var(--popover); - --color-popover-foreground: var(--popover-foreground); - --color-primary: var(--primary); - --color-primary-foreground: var(--primary-foreground); - --color-secondary: var(--secondary); - --color-secondary-foreground: var(--secondary-foreground); - --color-muted: var(--muted); - --color-muted-foreground: var(--muted-foreground); - --color-accent: var(--accent); - --color-accent-foreground: var(--accent-foreground); - --color-destructive: var(--destructive); - --color-destructive-foreground: var(--destructive-foreground); - --color-border: var(--border); - --color-input: var(--input); - --color-input-background: var(--input-background); - --color-switch-background: var(--switch-background); - --color-ring: var(--ring); - --color-chart-1: var(--chart-1); - --color-chart-2: var(--chart-2); - --color-chart-3: var(--chart-3); - --color-chart-4: var(--chart-4); - --color-chart-5: var(--chart-5); - --radius-sm: calc(var(--radius) - 4px); - --radius-md: calc(var(--radius) - 2px); - --radius-lg: var(--radius); - --radius-xl: calc(var(--radius) + 4px); - --color-sidebar: var(--sidebar); - --color-sidebar-foreground: var(--sidebar-foreground); - --color-sidebar-primary: var(--sidebar-primary); - --color-sidebar-primary-foreground: var(--sidebar-primary-foreground); - --color-sidebar-accent: var(--sidebar-accent); - --color-sidebar-accent-foreground: var(--sidebar-accent-foreground); - --color-sidebar-border: var(--sidebar-border); - --color-sidebar-ring: var(--sidebar-ring); -} - -@layer base { - #root * { - @apply border-border outline-ring/50; - } - - body { - @apply bg-background text-foreground; - } -} - -/** - * Base typography. This is not applied to elements which have an ancestor with a Tailwind text class. - */ -@layer base { - #root :where(:not(:has([class*=' text-']), :not(:has([class^='text-'])))) { - h1 { - font-size: var(--text-2xl); - font-weight: var(--font-weight-medium); - line-height: 1.5; - } - - h2 { - font-size: var(--text-xl); - font-weight: var(--font-weight-medium); - line-height: 1.5; - } - - h3 { - font-size: var(--text-lg); - font-weight: var(--font-weight-medium); - line-height: 1.5; - } - - h4 { - font-size: var(--text-base); - font-weight: var(--font-weight-medium); - line-height: 1.5; - } - - p { - font-size: var(--text-base); - font-weight: var(--font-weight-normal); - line-height: 1.5; - } - - label { - font-size: var(--text-base); - font-weight: var(--font-weight-medium); - line-height: 1.5; - } - - button { - font-size: var(--text-base); - font-weight: var(--font-weight-medium); - line-height: 1.5; - } - - input { - font-size: var(--text-base); - font-weight: var(--font-weight-normal); - line-height: 1.5; - } - } -} - -html { - font-size: var(--font-size); -} From aa797545aaa68d75fa46ec78de89c7891943b66f Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 10:13:34 +0100 Subject: [PATCH 09/58] style(tokens): calmer primary, visible field edges, focus ring in the brand colour Dark destructive was too dark to read as text (discounted prices, block reasons). Co-Authored-By: Claude Opus 5.5 --- src/styles/index.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/styles/index.css b/src/styles/index.css index c20ecfa6..e7cc3f39 100644 --- a/src/styles/index.css +++ b/src/styles/index.css @@ -9,7 +9,7 @@ --card-foreground: oklch(0.145 0 0); --popover: oklch(1 0 0); --popover-foreground: oklch(0.145 0 0); - --primary: oklch(0.488 0.243 264.376); + --primary: oklch(0.47 0.19 264); --primary-foreground: oklch(1 0 0); --secondary: oklch(0.95 0.0058 264.53); --secondary-foreground: #030213; @@ -20,12 +20,12 @@ --destructive: #d4183d; --destructive-foreground: #ffffff; --border: rgba(0, 0, 0, 0.1); - --input: transparent; - --input-background: #f3f3f5; + --input: oklch(0.88 0.006 264); + --input-background: #ffffff; --switch-background: #cbced4; --font-weight-medium: 500; --font-weight-normal: 400; - --ring: oklch(0.708 0 0); + --ring: oklch(0.6 0.15 264); --chart-1: oklch(0.646 0.222 41.116); --chart-2: oklch(0.6 0.118 184.704); --chart-3: oklch(0.398 0.07 227.392); @@ -49,7 +49,7 @@ --card-foreground: oklch(0.985 0 0); --popover: oklch(0.145 0 0); --popover-foreground: oklch(0.985 0 0); - --primary: oklch(0.588 0.243 264.376); + --primary: oklch(0.58 0.17 264); --primary-foreground: oklch(0.985 0 0); --secondary: oklch(0.269 0 0); --secondary-foreground: oklch(0.985 0 0); @@ -57,11 +57,11 @@ --muted-foreground: oklch(0.708 0 0); --accent: oklch(0.269 0 0); --accent-foreground: oklch(0.985 0 0); - --destructive: #d4183d; + --destructive: oklch(0.6 0.2 22); --destructive-foreground: #ffffff; --border: oklch(0.269 0 0); - --input: oklch(0.269 0 0); - --ring: oklch(0.439 0 0); + --input: oklch(0.35 0 0); + --ring: oklch(0.62 0.15 264); --font-weight-medium: 500; --font-weight-normal: 400; --chart-1: oklch(0.488 0.243 264.376); From a29a8d1f6973aa1612bc57cfc4d61728e1f9623c Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 10:13:34 +0100 Subject: [PATCH 10/58] style(ui): one look for cards, tabs, tables, badges and empty states Single icon gap in buttons, softer card shadow, muted table heads, and a soft button variant for repeated or current actions. Tables can stack on phones. Co-Authored-By: Claude Opus 5.5 --- src/components/ui/badge-variants.ts | 7 ++++++- src/components/ui/button-variants.ts | 4 +++- src/components/ui/card.tsx | 4 ++-- src/components/ui/empty-state.tsx | 6 ++++-- src/components/ui/page-header.tsx | 2 +- src/components/ui/table.tsx | 18 +++++++++++++----- src/components/ui/tabs.tsx | 4 ++-- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/components/ui/badge-variants.ts b/src/components/ui/badge-variants.ts index f77688c5..e877e73b 100644 --- a/src/components/ui/badge-variants.ts +++ b/src/components/ui/badge-variants.ts @@ -1,7 +1,7 @@ import { cva } from 'class-variance-authority'; export const badgeVariants = cva( - 'inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden', + 'inline-flex items-center justify-center rounded-full border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden', { variants: { variant: { @@ -11,6 +11,11 @@ export const badgeVariants = cva( destructive: 'border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60', outline: 'text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground', + success: + 'border-transparent bg-green-100 text-green-800 dark:bg-green-900/60 dark:text-green-200', + warning: + 'border-transparent bg-amber-100 text-amber-800 dark:bg-amber-900/60 dark:text-amber-200', + info: 'border-transparent bg-primary/10 text-primary dark:bg-primary/25 dark:text-foreground', }, }, defaultVariants: { diff --git a/src/components/ui/button-variants.ts b/src/components/ui/button-variants.ts index e0652532..85ab0135 100644 --- a/src/components/ui/button-variants.ts +++ b/src/components/ui/button-variants.ts @@ -1,7 +1,7 @@ import { cva } from 'class-variance-authority'; export const buttonVariants = cva( - "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all cursor-pointer disabled:pointer-events-none disabled:opacity-50 disabled:cursor-not-allowed [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive", + "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md [&>svg]:mr-0 [&>svg]:ml-0 text-sm font-medium transition-all cursor-pointer disabled:pointer-events-none disabled:opacity-50 disabled:cursor-not-allowed [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive", { variants: { variant: { @@ -11,6 +11,8 @@ export const buttonVariants = cva( outline: 'border bg-background text-foreground hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50', secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80', + /** Repeated or current actions: the active menu entry, an action per list row */ + soft: 'bg-primary/10 text-primary hover:bg-primary/15 dark:bg-primary/20 dark:text-foreground dark:hover:bg-primary/30', ghost: 'hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50', link: 'text-primary underline-offset-4 hover:underline', }, diff --git a/src/components/ui/card.tsx b/src/components/ui/card.tsx index 3f125a64..de0d1799 100644 --- a/src/components/ui/card.tsx +++ b/src/components/ui/card.tsx @@ -6,7 +6,7 @@ const Card = React.forwardRef (

) @@ -24,7 +24,7 @@ const CardTitle = React.forwardRef (

) diff --git a/src/components/ui/empty-state.tsx b/src/components/ui/empty-state.tsx index 0ee37add..d5b3cac5 100644 --- a/src/components/ui/empty-state.tsx +++ b/src/components/ui/empty-state.tsx @@ -18,8 +18,10 @@ export function EmptyState({ className?: string; }) { return ( -
- {Icon && } +
+ {Icon && + + }

{title}

{text &&

{text}

} {children &&
{children}
} diff --git a/src/components/ui/page-header.tsx b/src/components/ui/page-header.tsx index 8aae8a67..0fdcc3ff 100644 --- a/src/components/ui/page-header.tsx +++ b/src/components/ui/page-header.tsx @@ -21,7 +21,7 @@ export function PageHeader({ )} >
-

{title}

+

{title}

{description &&
{description}
}
{actions} diff --git a/src/components/ui/table.tsx b/src/components/ui/table.tsx index d27a47bc..cef079d9 100644 --- a/src/components/ui/table.tsx +++ b/src/components/ui/table.tsx @@ -3,12 +3,20 @@ import * as React from 'react'; import { cn } from '../../lib/utils'; -function Table({ className, ...props }: React.ComponentProps<'table'>) { +/** Under `md`, `stacked` shows each row as a block; cells name their column with `data-label`. */ +const STACKED = + 'max-md:[&_thead]:hidden max-md:[&_tbody]:block max-md:[&_tr]:block max-md:[&_tr]:space-y-2 max-md:[&_tr]:p-4 max-md:[&_td]:block max-md:[&_td]:h-auto max-md:[&_td]:whitespace-normal max-md:[&_td]:p-0! max-md:[&_td]:text-left max-md:[&_td[data-label]]:before:mr-2 max-md:[&_td[data-label]]:before:text-muted-foreground max-md:[&_td[data-label]]:before:content-[attr(data-label)]'; + +function Table({ + className, + stacked, + ...props +}: React.ComponentProps<'table'> & { stacked?: boolean }) { return (
@@ -16,7 +24,7 @@ function Table({ className, ...props }: React.ComponentProps<'table'>) { } function TableHeader({ className, ...props }: React.ComponentProps<'thead'>) { - return ; + return ; } function TableBody({ className, ...props }: React.ComponentProps<'tbody'>) { @@ -57,7 +65,7 @@ function TableHead({ className, ...props }: React.ComponentProps<'th'>) { ; + return ( + + ); } function TableBody({ className, ...props }: React.ComponentProps<'tbody'>) { From ddbaa35459aefb707433c355629d66eced07fadf Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 10:17:15 +0100 Subject: [PATCH 13/58] style(admin): roomy tiles without overlaps, tables that fit and stack on phones The events table ran past the page and hid its actions; each row grew to five lines of buttons. Co-Authored-By: Claude Opus 5.5 --- src/pages/administrator/AdminEventsPage.tsx | 19 +++++---- src/pages/administrator/AdminLogPage.tsx | 20 ++++++---- src/pages/administrator/AdminOverviewPage.tsx | 40 +++++-------------- src/pages/administrator/AdminUsersPage.tsx | 14 ++++--- 4 files changed, 44 insertions(+), 49 deletions(-) diff --git a/src/pages/administrator/AdminEventsPage.tsx b/src/pages/administrator/AdminEventsPage.tsx index 8047e98c..cd36af69 100644 --- a/src/pages/administrator/AdminEventsPage.tsx +++ b/src/pages/administrator/AdminEventsPage.tsx @@ -148,8 +148,8 @@ export function AdminEventsPage() { /> -
-
[role=checkbox]]:translate-y-[2px]', + 'text-muted-foreground h-10 px-3 text-left align-middle text-xs font-medium whitespace-nowrap first:pl-4 last:pr-4 [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]', className )} {...props} @@ -70,7 +78,7 @@ function TableCell({ className, ...props }: React.ComponentProps<'td'>) { [role=checkbox]]:translate-y-[2px]', + 'px-3 py-2.5 align-middle whitespace-nowrap first:pl-4 last:pr-4 [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]', className )} {...props} diff --git a/src/components/ui/tabs.tsx b/src/components/ui/tabs.tsx index 9b190be1..52ebba2b 100644 --- a/src/components/ui/tabs.tsx +++ b/src/components/ui/tabs.tsx @@ -19,7 +19,7 @@ function TabsList({ className, ...props }: React.ComponentProps Date: Wed, 4 Nov 2026 10:13:34 +0100 Subject: [PATCH 11/58] style: soft active menu entry, calmer event hero, back button aligned with the content Co-Authored-By: Claude Opus 5.5 --- src/components/EventHero.tsx | 8 ++++---- src/components/layout/Sidebar.tsx | 2 +- src/components/navigation/BackButton.tsx | 17 +++++++++++++++-- .../administrator/components/AdminShared.tsx | 8 ++++---- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/components/EventHero.tsx b/src/components/EventHero.tsx index 0ccb8812..9ab6fcfb 100644 --- a/src/components/EventHero.tsx +++ b/src/components/EventHero.tsx @@ -34,7 +34,7 @@ export function EventHero({ const hasActions = publicEventButton || children; return ( -
+
)}
-
+
-

{title}

-
+

{title}

+
{formatDateRangeDE(startDate, endDate)} diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx index 5859904b..b4613058 100644 --- a/src/components/layout/Sidebar.tsx +++ b/src/components/layout/Sidebar.tsx @@ -221,7 +221,7 @@ export function Sidebar({ return ( diff --git a/src/pages/administrator/components/AdminShared.tsx b/src/pages/administrator/components/AdminShared.tsx index 37dc8833..8563bab7 100644 --- a/src/pages/administrator/components/AdminShared.tsx +++ b/src/pages/administrator/components/AdminShared.tsx @@ -27,7 +27,7 @@ export function FilterTabs({ options: { value: T; label: string; count?: number }[]; }) { return ( -
+
{options.map((option) => (
+
+
{t('events.event')} @@ -165,7 +165,7 @@ export function AdminEventsPage() { ) : filtered.length ? ( filtered.map((event) => ( - +
{event.title}
{event.location}
{event.moderation && ( @@ -174,18 +174,21 @@ export function AdminEventsPage() { )}
- + {formatDateRangeDE(event.startDate, event.endDate)} - +
{event.organizerName || t('events.unknown')}
-
+
{event.organizerEmail || '—'}
{renderStatus(event)} - -
+ +
+
+
{t('log.time')} @@ -48,22 +49,27 @@ export function AdminLogPage() { {entries.map((entry) => ( - + {formatDateTime(entry.createdAt)} - {MODERATION_ACTION_LABELS[entry.action]} + {MODERATION_ACTION_LABELS[entry.action]} - + {REPORT_TARGET_LABELS[entry.targetType]}
{entry.targetLabel}
- + {entry.reason ?? '—'} - {entry.adminName} + {entry.adminName}
))}
diff --git a/src/pages/administrator/AdminOverviewPage.tsx b/src/pages/administrator/AdminOverviewPage.tsx index d75aad61..9477d0fe 100644 --- a/src/pages/administrator/AdminOverviewPage.tsx +++ b/src/pages/administrator/AdminOverviewPage.tsx @@ -1,9 +1,8 @@ import { PageHeader } from '../../components/ui/page-header'; +import { StatTile } from '../../components/ui/stat-tile'; import { useQuery } from '../../lib/api/react'; -import { useNavigate } from 'react-router-dom'; import { CalendarClock, - ChevronRight, EyeOff, Flag, Inbox, @@ -13,7 +12,6 @@ import { type LucideIcon, } from 'lucide-react'; import { api } from '../../lib/api/functions'; -import { cn } from '../../lib/utils'; import { runtimeConfig } from '../../lib/runtimeConfig'; import { useTranslation } from 'react-i18next'; import { dateLocale } from '../../i18n/format'; @@ -30,7 +28,6 @@ interface Tile { export function AdminOverviewPage() { const { t } = useTranslation('admin'); - const navigate = useNavigate(); const overview = useQuery(api.moderation.getOverview, {}); const legalPages = useQuery(api.sitePages.listForAdmin, {}); // A self-hosted instance must publish its own texts; bazarpro.de falls back to built-in ones @@ -120,30 +117,15 @@ export function AdminOverviewPage() { ]; const renderTile = (tile: Tile) => ( - + icon={tile.icon} + label={tile.label} + value={tile.value ?? '–'} + hint={tile.hint} + to={tile.path} + urgent={tile.urgent} + /> ); return ( @@ -152,12 +134,12 @@ export function AdminOverviewPage() {

{t('overview.todo')}

-
{todo.map(renderTile)}
+
{todo.map(renderTile)}

{t('overview.platform')}

-
{stats.map(renderTile)}
+
{stats.map(renderTile)}
); diff --git a/src/pages/administrator/AdminUsersPage.tsx b/src/pages/administrator/AdminUsersPage.tsx index df3656ba..9a023f32 100644 --- a/src/pages/administrator/AdminUsersPage.tsx +++ b/src/pages/administrator/AdminUsersPage.tsx @@ -107,8 +107,8 @@ export function AdminUsersPage() { /> -
-
+
+
{t('users.user')} @@ -133,7 +133,7 @@ export function AdminUsersPage() { return ( -
+
{u.name || t('users.unknown')} {u.systemRole === 'admin' && {t('users.admin')}} {u.isWalkIn && } @@ -155,8 +155,12 @@ export function AdminUsersPage() { {statusLabel(status)} - {formatDateDEShort(u._creationTime)} - {u.lastLoginAt ? formatDateDEShort(u.lastLoginAt) : '—'} + + {formatDateDEShort(u._creationTime)} + + + {u.lastLoginAt ? formatDateDEShort(u.lastLoginAt) : '—'} +
{/* Desktop Table View */} -
+
- + {t('sellers.participant')} {t('sellers.details')} {t('sellers.netRevenue')} @@ -225,16 +225,19 @@ export function SellerManagementPage() {
- {v.name} + {v.name} {v.managedByEventId && } {v.isHelper && !isOwner && ( )}
- - {v.managedByEventId ? t('sellers.walkInCreated') : v.email} - + {/* Mail and phone follow in the next column */} + {v.managedByEventId && ( + + {t('sellers.walkInCreated')} + + )}
@@ -253,7 +256,7 @@ export function SellerManagementPage() { -
+
{formatPriceDE(v.totalRevenue)} €
@@ -275,9 +278,9 @@ export function SellerManagementPage() { ) : canManageHelpers && !v.managedByEventId ? ( - + {getEventProductStatusTitle(product.status)}
@@ -300,7 +301,7 @@ function ProductRow({
{product.sale ? ( <> -
{formatPriceDE(product.sale.totalAmount)} €
+
{formatPriceDE(product.sale.totalAmount)} €
{product.sale.totalAmount < product.sale.listPrice - 0.005 && (
{formatPriceDE(product.sale.listPrice)} €{' '} @@ -310,7 +311,7 @@ function ProductRow({ ) : product.discountPercent ? ( <> -
+
{formatPriceDE(discountedPrice(product.price, product.discountPercent))} €
@@ -319,7 +320,7 @@ function ProductRow({
) : ( -
{formatPriceDE(product.price)} €
+
{formatPriceDE(product.price)} €
)}
@@ -330,6 +331,7 @@ function ProductRow({ {product.status === 'announced' && !isVendorPaid && (
{group.paid ? ( - + {' '} {owes ? t('mySales.paidFee') : t('mySales.paid')} From 83b0b8e0d2b61a8650273e0c82c066e5915bb9ee Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 10:24:24 +0100 Subject: [PATCH 16/58] fix(styles): soft borders in dialogs and menus too The default border colour only reached #root, so everything in a portal got black lines. The cash and return confirmation boxes keep their dark outline on purpose. Co-Authored-By: Claude Opus 5.5 --- src/components/products/UnifiedReturnDialog.tsx | 3 ++- src/components/products/UnifiedSaleDialog.tsx | 3 ++- .../organizer/events/dashboard/components/VendorSettlement.tsx | 3 ++- src/styles/index.css | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/products/UnifiedReturnDialog.tsx b/src/components/products/UnifiedReturnDialog.tsx index d8c2cc96..cb580d7a 100644 --- a/src/components/products/UnifiedReturnDialog.tsx +++ b/src/components/products/UnifiedReturnDialog.tsx @@ -114,10 +114,11 @@ export function UnifiedReturnDialog({
setReturnConfirmed(!returnConfirmed)} > setReturnConfirmed(!!checked)} diff --git a/src/components/products/UnifiedSaleDialog.tsx b/src/components/products/UnifiedSaleDialog.tsx index 5f411f8d..90d9e09c 100644 --- a/src/components/products/UnifiedSaleDialog.tsx +++ b/src/components/products/UnifiedSaleDialog.tsx @@ -262,10 +262,11 @@ export function UnifiedSaleDialog({
setPaymentConfirmed(!paymentConfirmed)} > setPaymentConfirmed(!!checked)} diff --git a/src/pages/organizer/events/dashboard/components/VendorSettlement.tsx b/src/pages/organizer/events/dashboard/components/VendorSettlement.tsx index b733daad..722b8d19 100644 --- a/src/pages/organizer/events/dashboard/components/VendorSettlement.tsx +++ b/src/pages/organizer/events/dashboard/components/VendorSettlement.tsx @@ -104,8 +104,9 @@ export function VendorSettlement({ destructive > {hasMoney && ( -
+
setMoneyBack(!!checked)} diff --git a/src/styles/index.css b/src/styles/index.css index e7cc3f39..0e1ba399 100644 --- a/src/styles/index.css +++ b/src/styles/index.css @@ -121,7 +121,8 @@ } @layer base { - #root * { + /* Everywhere, not only in #root: dialogs and menus render outside of it */ + * { @apply border-border outline-ring/50; } From 44d396345bc84b243f19a87a50c3fe3fd378073d Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 10:24:24 +0100 Subject: [PATCH 17/58] style(ui): opaque status badges for use on photos, checkboxes with a visible edge Co-Authored-By: Claude Opus 5.5 --- src/components/ui/badge-variants.ts | 4 ++-- src/components/ui/checkbox.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/ui/badge-variants.ts b/src/components/ui/badge-variants.ts index e877e73b..38fd5da7 100644 --- a/src/components/ui/badge-variants.ts +++ b/src/components/ui/badge-variants.ts @@ -12,9 +12,9 @@ export const badgeVariants = cva( 'border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60', outline: 'text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground', success: - 'border-transparent bg-green-100 text-green-800 dark:bg-green-900/60 dark:text-green-200', + 'border-transparent bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200', warning: - 'border-transparent bg-amber-100 text-amber-800 dark:bg-amber-900/60 dark:text-amber-200', + 'border-transparent bg-amber-100 text-amber-800 dark:bg-amber-900 dark:text-amber-200', info: 'border-transparent bg-primary/10 text-primary dark:bg-primary/25 dark:text-foreground', }, }, diff --git a/src/components/ui/checkbox.tsx b/src/components/ui/checkbox.tsx index a303b2e6..5405bb66 100644 --- a/src/components/ui/checkbox.tsx +++ b/src/components/ui/checkbox.tsx @@ -11,7 +11,7 @@ function Checkbox({ className, ...props }: React.ComponentProps Date: Wed, 4 Nov 2026 10:24:24 +0100 Subject: [PATCH 18/58] style: no empty log reason on phones, landing title back on two lines, calm seller pill Co-Authored-By: Claude Opus 5.5 --- src/pages/administrator/AdminLogPage.tsx | 2 +- src/pages/public/events/PublicEventPage.tsx | 10 +++++----- src/pages/public/landing/components/LandingHero.tsx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/administrator/AdminLogPage.tsx b/src/pages/administrator/AdminLogPage.tsx index 3e7ec50d..e7287d6e 100644 --- a/src/pages/administrator/AdminLogPage.tsx +++ b/src/pages/administrator/AdminLogPage.tsx @@ -64,7 +64,7 @@ export function AdminLogPage() { {entry.reason ?? '—'} diff --git a/src/pages/public/events/PublicEventPage.tsx b/src/pages/public/events/PublicEventPage.tsx index f994b6b1..e54909da 100644 --- a/src/pages/public/events/PublicEventPage.tsx +++ b/src/pages/public/events/PublicEventPage.tsx @@ -203,7 +203,7 @@ export function PublicEventLanding({ eventId, onNavigate }: PublicEventLandingPr > {isSeller ? (
- + {isPast ? t('page.soldHere') : t('page.sellingHere')} {sellerNumber @@ -258,7 +258,7 @@ export function PublicEventLanding({ eventId, onNavigate }: PublicEventLandingPr
-
+
+

{t('page.categories')}

{event.categoryLabels?.map((category: string) => ( @@ -285,7 +285,7 @@ export function PublicEventLanding({ eventId, onNavigate }: PublicEventLandingPr
{event.services.length > 0 && ( -
+

{t('page.services')}

{event.services.map((service: string) => ( @@ -298,7 +298,7 @@ export function PublicEventLanding({ eventId, onNavigate }: PublicEventLandingPr )} {event.eventMapImageUrl && ( -
+

{t('page.map')}

-
+
{/* "Second-Hand-Basare" does not break: on phones the size follows the width */} -

+

{t('hero.titleStart')}
From 6cff72f0dd257e49dc8fd13dcae06980badbec09 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 10:24:24 +0100 Subject: [PATCH 19/58] style: one radius and shadow for the remaining cards Co-Authored-By: Claude Opus 5.5 --- src/components/broadcasts/BroadcastList.tsx | 2 +- src/components/broadcasts/RecentBroadcastsCard.tsx | 2 +- src/components/events/EventFilters.tsx | 2 +- src/components/layout/PageErrorBoundary.tsx | 2 +- src/components/products/ProductFilters.tsx | 2 +- src/components/ui/loading.tsx | 8 ++++---- src/native/StartProblem.tsx | 2 +- src/native/Welcome.tsx | 2 +- src/pages/account/components/DangerZoneCard.tsx | 2 +- src/pages/account/components/DigitalIdCard.tsx | 2 +- src/pages/account/components/NotificationsCard.tsx | 2 +- src/pages/account/components/ProfileCard.tsx | 2 +- src/pages/account/components/SecurityCard.tsx | 2 +- src/pages/administrator/AdminMessagesPage.tsx | 2 +- src/pages/administrator/AdminReportsPage.tsx | 2 +- src/pages/organizer/events/EditEventForm.tsx | 2 +- src/pages/organizer/events/components/EditEventAccess.tsx | 2 +- .../organizer/events/components/EditEventBasicInfo.tsx | 2 +- .../organizer/events/components/EditEventCategories.tsx | 2 +- .../organizer/events/components/EditEventContact.tsx | 2 +- .../organizer/events/components/EditEventFeatures.tsx | 2 +- .../organizer/events/components/EditEventMapSection.tsx | 2 +- .../organizer/events/components/EditEventSellerInfo.tsx | 2 +- .../organizer/events/components/EventPageSidebar.tsx | 6 +++--- .../organizer/events/components/wizard/WizardPictures.tsx | 2 +- .../organizer/events/dashboard/CashReconciliationPage.tsx | 4 ++-- src/pages/organizer/events/dashboard/SettingsPage.tsx | 2 +- .../events/dashboard/components/ProofOfOffersCard.tsx | 2 +- .../events/dashboard/components/SettlementExportCard.tsx | 2 +- src/pages/public/auth/LoginPage.tsx | 2 +- src/pages/public/auth/RegisterPage.tsx | 2 +- src/pages/public/company/AboutPage.tsx | 8 ++++---- src/pages/public/company/ContactPage.tsx | 2 +- src/pages/public/company/FeaturesPage.tsx | 4 ++-- src/pages/public/company/PricingPage.tsx | 2 +- src/pages/public/company/components/OpenSourceSection.tsx | 2 +- src/pages/public/events/PublicEventProductsPage.tsx | 2 +- src/pages/public/products/PublicProduct.tsx | 2 +- .../seller/products/components/MyProductBasicInfo.tsx | 2 +- .../seller/products/components/MyProductEditImages.tsx | 2 +- src/pages/seller/sales/MySalesPage.tsx | 2 +- 41 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/components/broadcasts/BroadcastList.tsx b/src/components/broadcasts/BroadcastList.tsx index ed8431a1..500186d4 100644 --- a/src/components/broadcasts/BroadcastList.tsx +++ b/src/components/broadcasts/BroadcastList.tsx @@ -24,7 +24,7 @@ export function BroadcastList({ if (!broadcasts || broadcasts.length === 0) return null; return ( -
+

{title}

diff --git a/src/components/broadcasts/RecentBroadcastsCard.tsx b/src/components/broadcasts/RecentBroadcastsCard.tsx index 777c59b4..57401f12 100644 --- a/src/components/broadcasts/RecentBroadcastsCard.tsx +++ b/src/components/broadcasts/RecentBroadcastsCard.tsx @@ -29,7 +29,7 @@ export function RecentBroadcastsCard({ if (broadcasts === undefined) return null; return ( -
+

{t('broadcasts.recentTitle')} diff --git a/src/components/events/EventFilters.tsx b/src/components/events/EventFilters.tsx index 2e966c70..72c3908b 100644 --- a/src/components/events/EventFilters.tsx +++ b/src/components/events/EventFilters.tsx @@ -23,7 +23,7 @@ export function EventFilters({ }: EventFiltersProps) { const { t } = useTranslation('events'); return ( -
+
void }) return (
-
+

{t('loadState.failed')}

{detail &&

{detail}

} diff --git a/src/components/products/ProductFilters.tsx b/src/components/products/ProductFilters.tsx index fa3fe9ec..cb3f341a 100644 --- a/src/components/products/ProductFilters.tsx +++ b/src/components/products/ProductFilters.tsx @@ -82,7 +82,7 @@ export function ProductFilters({ }, [eventSelectionMode, showBulkSelection]); return ( -
+
void }) { function SlowNotice() { const { t } = useTranslation(); return ( -
+

{t('loadState.slow')}

@@ -78,7 +78,7 @@ export function ListSkeleton({ rows = 4, className }: { rows?: number; className return (
{Array.from({ length: rows }, (_, index) => ( -
+
@@ -96,7 +96,7 @@ export function CardGridSkeleton({ count = 6, className }: { count?: number; cla return (
{Array.from({ length: count }, (_, index) => ( -
+
@@ -174,7 +174,7 @@ export function PageSkeleton({ {variant === 'detail' && (
-
+
diff --git a/src/native/StartProblem.tsx b/src/native/StartProblem.tsx index 42da2c8f..fbd5603d 100644 --- a/src/native/StartProblem.tsx +++ b/src/native/StartProblem.tsx @@ -21,7 +21,7 @@ export function StartProblem({

{t('app.start.title')}

diff --git a/src/native/Welcome.tsx b/src/native/Welcome.tsx index 7bcdf51b..2f708001 100644 --- a/src/native/Welcome.tsx +++ b/src/native/Welcome.tsx @@ -105,7 +105,7 @@ export function Welcome({ server }: { server: string }) { aria-label={t('app.welcome.slide', { index: index + 1, count: CARDS.length })} className="w-full shrink-0 snap-center px-6" > -
+
diff --git a/src/pages/account/components/DangerZoneCard.tsx b/src/pages/account/components/DangerZoneCard.tsx index d15ec228..f1a1b737 100644 --- a/src/pages/account/components/DangerZoneCard.tsx +++ b/src/pages/account/components/DangerZoneCard.tsx @@ -79,7 +79,7 @@ export function DangerZoneCard() { }; return ( -
+

{t('danger.title')}

diff --git a/src/pages/account/components/DigitalIdCard.tsx b/src/pages/account/components/DigitalIdCard.tsx index 60f680dc..dc1e39e3 100644 --- a/src/pages/account/components/DigitalIdCard.tsx +++ b/src/pages/account/components/DigitalIdCard.tsx @@ -128,7 +128,7 @@ export function DigitalIdCard() { }; return ( -
+
diff --git a/src/pages/account/components/NotificationsCard.tsx b/src/pages/account/components/NotificationsCard.tsx index 227ceb4a..ab3230db 100644 --- a/src/pages/account/components/NotificationsCard.tsx +++ b/src/pages/account/components/NotificationsCard.tsx @@ -38,7 +38,7 @@ export function NotificationsCard() {

{t('notifications.title')} diff --git a/src/pages/account/components/ProfileCard.tsx b/src/pages/account/components/ProfileCard.tsx index ea6b8acc..ad2ad836 100644 --- a/src/pages/account/components/ProfileCard.tsx +++ b/src/pages/account/components/ProfileCard.tsx @@ -90,7 +90,7 @@ export function ProfileCard({ user }: ProfileCardProps) { }; return ( -
+
diff --git a/src/pages/account/components/SecurityCard.tsx b/src/pages/account/components/SecurityCard.tsx index 8bb61e2a..32145d87 100644 --- a/src/pages/account/components/SecurityCard.tsx +++ b/src/pages/account/components/SecurityCard.tsx @@ -73,7 +73,7 @@ export function SecurityCard({ providers }: SecurityCardProps) { }; return ( -
+
diff --git a/src/pages/administrator/AdminMessagesPage.tsx b/src/pages/administrator/AdminMessagesPage.tsx index 9055a8fa..6b6ea125 100644 --- a/src/pages/administrator/AdminMessagesPage.tsx +++ b/src/pages/administrator/AdminMessagesPage.tsx @@ -41,7 +41,7 @@ export function AdminMessagesPage() { ) : (
    {messages.map((message) => ( -
  • +
  • {message.name}

    diff --git a/src/pages/administrator/AdminReportsPage.tsx b/src/pages/administrator/AdminReportsPage.tsx index c19e86b4..54fe4bf5 100644 --- a/src/pages/administrator/AdminReportsPage.tsx +++ b/src/pages/administrator/AdminReportsPage.tsx @@ -68,7 +68,7 @@ export function AdminReportsPage() { return (
  • diff --git a/src/pages/organizer/events/EditEventForm.tsx b/src/pages/organizer/events/EditEventForm.tsx index f468bf9f..a2526258 100644 --- a/src/pages/organizer/events/EditEventForm.tsx +++ b/src/pages/organizer/events/EditEventForm.tsx @@ -438,7 +438,7 @@ function WizardFinal({ type }: { type?: EventType }) { sellerLogistics: logisticsFromForm(values.sellerLogistics), }} /> -
    +
    {t('wizard.summary.title')}
    {values.title || '–'}
    diff --git a/src/pages/organizer/events/components/EditEventAccess.tsx b/src/pages/organizer/events/components/EditEventAccess.tsx index d8d0f362..56670bdd 100644 --- a/src/pages/organizer/events/components/EditEventAccess.tsx +++ b/src/pages/organizer/events/components/EditEventAccess.tsx @@ -11,7 +11,7 @@ export function EditEventAccess({ lockVisibility = false }: { lockVisibility?: b const { register, control } = useFormContext(); return ( -
    +

    {t('access.title')}

    diff --git a/src/pages/organizer/events/components/EditEventBasicInfo.tsx b/src/pages/organizer/events/components/EditEventBasicInfo.tsx index 724a6624..6f412583 100644 --- a/src/pages/organizer/events/components/EditEventBasicInfo.tsx +++ b/src/pages/organizer/events/components/EditEventBasicInfo.tsx @@ -130,7 +130,7 @@ export function EditEventBasicInfo({ }; return ( -
    +

    {t('basic.title')}

    diff --git a/src/pages/organizer/events/components/EditEventCategories.tsx b/src/pages/organizer/events/components/EditEventCategories.tsx index b8d75e1d..1f98a543 100644 --- a/src/pages/organizer/events/components/EditEventCategories.tsx +++ b/src/pages/organizer/events/components/EditEventCategories.tsx @@ -46,7 +46,7 @@ export function EditEventCategories({ categoryList }: EventCategoriesProbs) { }; return ( -
    +

    {t('categories.title')}

    diff --git a/src/pages/organizer/events/components/EditEventContact.tsx b/src/pages/organizer/events/components/EditEventContact.tsx index 71eeeb30..7bb6104e 100644 --- a/src/pages/organizer/events/components/EditEventContact.tsx +++ b/src/pages/organizer/events/components/EditEventContact.tsx @@ -23,7 +23,7 @@ export function EditEventContact({ } = useFormContext(); return ( -
    +
    {parts.includes('contact') &&

    {t('contact.title')}

    } {parts.includes('contact') && ( diff --git a/src/pages/organizer/events/components/EditEventFeatures.tsx b/src/pages/organizer/events/components/EditEventFeatures.tsx index 6e1e7375..4b61d145 100644 --- a/src/pages/organizer/events/components/EditEventFeatures.tsx +++ b/src/pages/organizer/events/components/EditEventFeatures.tsx @@ -231,7 +231,7 @@ export function EditEventFeatures({ const show = (part: FeaturePart) => parts.includes(part); return ( -
    +
    {showHeader && (

    {t('features.title')}

    diff --git a/src/pages/organizer/events/components/EditEventMapSection.tsx b/src/pages/organizer/events/components/EditEventMapSection.tsx index a7e0085b..a7452bf4 100644 --- a/src/pages/organizer/events/components/EditEventMapSection.tsx +++ b/src/pages/organizer/events/components/EditEventMapSection.tsx @@ -252,7 +252,7 @@ export function EditEventMapSection({ }; return ( -
    +

    {allowMapImage ? t('map.title') : t('map.categories')}

    {allowMapImage &&

    {t('map.intro')}

    } diff --git a/src/pages/organizer/events/components/EditEventSellerInfo.tsx b/src/pages/organizer/events/components/EditEventSellerInfo.tsx index 31075e0b..e795fcf9 100644 --- a/src/pages/organizer/events/components/EditEventSellerInfo.tsx +++ b/src/pages/organizer/events/components/EditEventSellerInfo.tsx @@ -48,7 +48,7 @@ export function EditEventSellerInfo() { : null; return ( -
    +

    {t('logistics.title')}

    {t('logistics.intro')}

    diff --git a/src/pages/organizer/events/components/EventPageSidebar.tsx b/src/pages/organizer/events/components/EventPageSidebar.tsx index fad427ce..995a393d 100644 --- a/src/pages/organizer/events/components/EventPageSidebar.tsx +++ b/src/pages/organizer/events/components/EventPageSidebar.tsx @@ -62,7 +62,7 @@ export function EventPageSidebar({ event, conditions }: EventPageSidebarProps) { return (
    -
    +

    {t('sidebar.details')}

    {isSameDay ? ( @@ -178,10 +178,10 @@ export function EventPageSidebar({ event, conditions }: EventPageSidebarProps) {
    {conditions && ( - + )} -
    +

    {t('sidebar.contact')}

    {event.contactInfo}

    diff --git a/src/pages/organizer/events/components/wizard/WizardPictures.tsx b/src/pages/organizer/events/components/wizard/WizardPictures.tsx index 56fab4c5..6e4100cc 100644 --- a/src/pages/organizer/events/components/wizard/WizardPictures.tsx +++ b/src/pages/organizer/events/components/wizard/WizardPictures.tsx @@ -48,7 +48,7 @@ export function WizardPictures({ }; return ( -
    +

    {t('wizard.pictures.title')}

    {t('wizard.pictures.intro')}

    diff --git a/src/pages/organizer/events/dashboard/CashReconciliationPage.tsx b/src/pages/organizer/events/dashboard/CashReconciliationPage.tsx index c46558b5..37b66224 100644 --- a/src/pages/organizer/events/dashboard/CashReconciliationPage.tsx +++ b/src/pages/organizer/events/dashboard/CashReconciliationPage.tsx @@ -58,14 +58,14 @@ export function CashReconciliationPage() { collecting ? 'sm:grid-cols-[1fr_auto_1fr_auto_1fr]' : 'sm:grid-cols-[1fr_auto_1fr]' }`} > -
    +

    {t('cash.pending')}

    {formatPriceDE(summary.totalPendingPayout)} €

    + -
    +

    {summary.totalIntakeFees > 0 ? t('cash.commissionAndFees') : t('cash.commission')}

    diff --git a/src/pages/organizer/events/dashboard/SettingsPage.tsx b/src/pages/organizer/events/dashboard/SettingsPage.tsx index 860db5d1..d437261a 100644 --- a/src/pages/organizer/events/dashboard/SettingsPage.tsx +++ b/src/pages/organizer/events/dashboard/SettingsPage.tsx @@ -67,7 +67,7 @@ export function SettingsPage() {
    -
    +
    diff --git a/src/pages/organizer/events/dashboard/components/ProofOfOffersCard.tsx b/src/pages/organizer/events/dashboard/components/ProofOfOffersCard.tsx index 60b0750d..86e8ea14 100644 --- a/src/pages/organizer/events/dashboard/components/ProofOfOffersCard.tsx +++ b/src/pages/organizer/events/dashboard/components/ProofOfOffersCard.tsx @@ -35,7 +35,7 @@ export function ProofOfOffersCard({ eventId }: { eventId: Id<'events'> }) { }; return ( -
    +

    {t('proof.cardTitle')}

    diff --git a/src/pages/organizer/events/dashboard/components/SettlementExportCard.tsx b/src/pages/organizer/events/dashboard/components/SettlementExportCard.tsx index 32370ac4..830c4c41 100644 --- a/src/pages/organizer/events/dashboard/components/SettlementExportCard.tsx +++ b/src/pages/organizer/events/dashboard/components/SettlementExportCard.tsx @@ -32,7 +32,7 @@ export function SettlementExportCard({ eventId }: { eventId: Id<'events'> }) { }; return ( -
    +

    {t('export.cardTitle')}

    diff --git a/src/pages/public/auth/LoginPage.tsx b/src/pages/public/auth/LoginPage.tsx index 0b30b813..6f61d562 100644 --- a/src/pages/public/auth/LoginPage.tsx +++ b/src/pages/public/auth/LoginPage.tsx @@ -262,7 +262,7 @@ export function LoginPage() {
    -
    +
    {!verificationEmail && !showForgotPassword && ( <>

    {t('login.title')}

    diff --git a/src/pages/public/auth/RegisterPage.tsx b/src/pages/public/auth/RegisterPage.tsx index e7d6e1ba..17e69186 100644 --- a/src/pages/public/auth/RegisterPage.tsx +++ b/src/pages/public/auth/RegisterPage.tsx @@ -252,7 +252,7 @@ export function RegisterPage() {
    -
    +
    {!verificationEmail ? (
    diff --git a/src/pages/public/company/AboutPage.tsx b/src/pages/public/company/AboutPage.tsx index bbf355a3..e96191b8 100644 --- a/src/pages/public/company/AboutPage.tsx +++ b/src/pages/public/company/AboutPage.tsx @@ -143,7 +143,7 @@ export function AboutPage() { {TEAM.map((name) => (
    {initials(name)} @@ -154,7 +154,7 @@ export function AboutPage() { ))}
    -
    +
    @@ -199,7 +199,7 @@ export function AboutPage() { {STACK.map((tech) => ( {tech} @@ -243,7 +243,7 @@ function StatusCard({ text: string; }) { return ( -
    +
    diff --git a/src/pages/public/company/ContactPage.tsx b/src/pages/public/company/ContactPage.tsx index 29f097c6..b96aa843 100644 --- a/src/pages/public/company/ContactPage.tsx +++ b/src/pages/public/company/ContactPage.tsx @@ -65,7 +65,7 @@ export function ContactPage() {

    {t('contact.title')}

    -
    +

    {t('contact.subtitle')}

    diff --git a/src/pages/public/company/FeaturesPage.tsx b/src/pages/public/company/FeaturesPage.tsx index e7cddb4f..a7765d07 100644 --- a/src/pages/public/company/FeaturesPage.tsx +++ b/src/pages/public/company/FeaturesPage.tsx @@ -170,7 +170,7 @@ export function FeaturesPage() { {HIGHLIGHTS.map(({ icon: Icon, id }) => (

    @@ -197,7 +197,7 @@ export function FeaturesPage() {
      {BAZAAR_TYPES.map(({ icon: Icon, id, guide }) => ( -
    • +
    • {t(`featuresPage.bazaarTypes.${id}.title`)} diff --git a/src/pages/public/company/PricingPage.tsx b/src/pages/public/company/PricingPage.tsx index 011d7d66..209166be 100644 --- a/src/pages/public/company/PricingPage.tsx +++ b/src/pages/public/company/PricingPage.tsx @@ -109,7 +109,7 @@ export function PricingPage() { {FAQ.map((id) => (

      {t(`pricing.faq.items.${id}.question`)}

      diff --git a/src/pages/public/company/components/OpenSourceSection.tsx b/src/pages/public/company/components/OpenSourceSection.tsx index ca4fd97e..554d9908 100644 --- a/src/pages/public/company/components/OpenSourceSection.tsx +++ b/src/pages/public/company/components/OpenSourceSection.tsx @@ -9,7 +9,7 @@ export function OpenSourceSection() { return (
      -
      +

      {t('openSource.eyebrow')} diff --git a/src/pages/public/events/PublicEventProductsPage.tsx b/src/pages/public/events/PublicEventProductsPage.tsx index bd28f5e9..1eacd1e7 100644 --- a/src/pages/public/events/PublicEventProductsPage.tsx +++ b/src/pages/public/events/PublicEventProductsPage.tsx @@ -275,7 +275,7 @@ export function PublicEventProductsPage() { /> {filteredProducts.length === 0 && ( -

      +

      {t('offers.empty')}

      {t('offers.emptyText')}

      diff --git a/src/pages/public/products/PublicProduct.tsx b/src/pages/public/products/PublicProduct.tsx index 21049606..440ee8a8 100644 --- a/src/pages/public/products/PublicProduct.tsx +++ b/src/pages/public/products/PublicProduct.tsx @@ -253,7 +253,7 @@ export function PublicProduct() { {/* Buy box and the tools of the active role */}

    • + ))} +
    + +
    ); } function QuestionList({ search, askerId, + page, + onPageChange, onRequest, }: { search: string; askerId?: Id<'users'>; + page: number; + onPageChange: (page: number) => void; onRequest: (request: ModerationRequest) => void; }) { const { t } = useTranslation('admin'); - const questions = useQuery(api.moderation.listQuestions, { search, askerId }); + const result = useQuery(api.moderation.listQuestions, { search, askerId, page }); - if (questions === undefined) return ; - if (questions.length === 0) return ; + if (result === undefined) return ; + if (result.items.length === 0) return ; return ( -
      - {questions.map((question) => ( -
    • -
      -

      - - {question.productTitle} - {' '} - ·{' '} - - {question.askerName} - {' '} - · {formatDateTime(question.createdAt)} -

      -

      {question.question}

      - {question.answer && ( -

      {question.answer}

      - )} -
      - -
    • - ))} -
    +
    +

    + + {question.productTitle} + {' '} + ·{' '} + + {question.askerName} + {' '} + · {formatDateTime(question.createdAt)} +

    +

    {question.question}

    + {question.answer && ( +

    {question.answer}

    + )} +
    + +
  • + ))} +
+ +
); } From 79f4cbd82f1a18d68814ef9f20b474de9c912d81 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 19:49:25 +0100 Subject: [PATCH 31/58] style(admin): tables stack when they lack room, shorter user and event lists Tables scrolled sideways on tablets, where the side menu takes room, so they now follow their own width instead of the screen's. Users and events show 20 rows per page. Co-Authored-By: Claude Opus 5.5 --- src/components/ui/table.tsx | 13 +++++++--- src/hooks/usePagedItems.ts | 18 +++++++++++++ src/pages/administrator/AdminEventsPage.tsx | 28 ++++++++++++++------- src/pages/administrator/AdminLogPage.tsx | 10 ++++---- src/pages/administrator/AdminUsersPage.tsx | 27 ++++++++++++++++---- src/tests/helpers/eventApproval.ts | 2 ++ 6 files changed, 75 insertions(+), 23 deletions(-) create mode 100644 src/hooks/usePagedItems.ts diff --git a/src/components/ui/table.tsx b/src/components/ui/table.tsx index 393a3520..5ed1b822 100644 --- a/src/components/ui/table.tsx +++ b/src/components/ui/table.tsx @@ -4,11 +4,13 @@ import * as React from 'react'; import { cn } from '../../lib/utils'; /** - * Under `md`, `stacked` shows each row as a block instead of a table to scroll sideways. - * Cells take a full line; those with `data-label` name their column and share a line. + * `stacked` shows each row as a block instead of a table to scroll sideways, whenever the + * table itself has too little room (the side menu takes some on tablets, too). Cells take a + * full line; those with `data-label` name their column and share a line, those with + * `data-inline` share a line without a name. */ const STACKED = - 'max-md:[&_thead]:hidden max-md:[&_tbody]:block max-md:[&_tr]:flex max-md:[&_tr]:flex-wrap max-md:[&_tr]:items-center max-md:[&_tr]:gap-x-4 max-md:[&_tr]:gap-y-1.5 max-md:[&_tr]:p-4 max-md:[&_td]:block max-md:[&_td]:basis-full max-md:[&_td[data-label]]:basis-auto max-md:[&_td]:h-auto max-md:[&_td]:whitespace-normal max-md:[&_td]:p-0! max-md:[&_td]:text-left max-md:[&_td[data-label]]:before:mr-2 max-md:[&_td[data-label]]:before:text-muted-foreground max-md:[&_td[data-label]]:before:content-[attr(data-label)]'; + '@max-4xl:[&_thead]:hidden @max-4xl:[&_tbody]:block @max-4xl:[&_tr]:flex @max-4xl:[&_tr]:flex-wrap @max-4xl:[&_tr]:items-center @max-4xl:[&_tr]:gap-x-4 @max-4xl:[&_tr]:gap-y-1.5 @max-4xl:[&_tr]:p-4 @max-4xl:[&_td]:block @max-4xl:[&_td]:basis-full @max-4xl:[&_td[data-label]]:basis-auto @max-4xl:[&_td[data-inline]]:basis-auto @max-4xl:[&_td]:h-auto @max-4xl:[&_td]:whitespace-normal @max-4xl:[&_td]:p-0! @max-4xl:[&_td]:text-left @max-4xl:[&_td[data-label]]:before:mr-2 @max-4xl:[&_td[data-label]]:before:text-muted-foreground @max-4xl:[&_td[data-label]]:before:content-[attr(data-label)]'; function Table({ className, @@ -16,7 +18,10 @@ function Table({ ...props }: React.ComponentProps<'table'> & { stacked?: boolean }) { return ( -
+

(items: T[], resetKey: string, perPage = 20) { + const [state, setState] = useState({ page: 1, resetKey }); + if (state.resetKey !== resetKey) setState({ page: 1, resetKey }); + const requested = state.resetKey === resetKey ? state.page : 1; + + const totalPages = Math.max(1, Math.ceil(items.length / perPage)); + // The list may have become shorter than the page shown + const page = Math.min(requested, totalPages); + return { + pageItems: items.slice((page - 1) * perPage, page * perPage), + page, + totalPages, + setPage: (next: number) => setState({ page: next, resetKey }), + }; +} diff --git a/src/pages/administrator/AdminEventsPage.tsx b/src/pages/administrator/AdminEventsPage.tsx index cd36af69..8957f122 100644 --- a/src/pages/administrator/AdminEventsPage.tsx +++ b/src/pages/administrator/AdminEventsPage.tsx @@ -26,6 +26,8 @@ import { getUserFacingErrorMessage } from '../../lib/errors'; import { FilterTabs } from './components/AdminShared'; import { useTranslation } from 'react-i18next'; import { TableRowsSkeleton } from '../../components/ui/loading'; +import { Pagination } from '../../components/ui/pagination'; +import { usePagedItems } from '../../hooks/usePagedItems'; import { formatEventPlace } from '../../shared/eventJsonLd'; type AdminEvent = Doc<'events'> & { @@ -74,6 +76,7 @@ export function AdminEventsPage() { ) .sort((a, b) => b.startDate - a.startDate); }, [events, filter, search]); + const { pageItems, page, totalPages, setPage } = usePagedItems(filtered, `${filter}:${search}`); const pendingCount = (events ?? []).filter( (event) => event.visibility === 'public' && event.approvalStatus === 'pending' @@ -127,7 +130,10 @@ export function AdminEventsPage() {
-
+
) : filtered.length ? ( - filtered.map((event) => ( + pageItems.map((event) => ( - +
{event.title}
{event.location}
{event.moderation && ( @@ -174,10 +180,7 @@ export function AdminEventsPage() {
)} - + {formatDateRangeDE(event.startDate, event.endDate)} @@ -187,8 +190,8 @@ export function AdminEventsPage() {
{renderStatus(event)} - -
+ +
+ + !open && setRejectEventId(null)} diff --git a/src/pages/administrator/AdminLogPage.tsx b/src/pages/administrator/AdminLogPage.tsx index e7287d6e..abc03a4e 100644 --- a/src/pages/administrator/AdminLogPage.tsx +++ b/src/pages/administrator/AdminLogPage.tsx @@ -49,13 +49,13 @@ export function AdminLogPage() { {entries.map((entry) => ( - + {formatDateTime(entry.createdAt)} - + {MODERATION_ACTION_LABELS[entry.action]} - + {REPORT_TARGET_LABELS[entry.targetType]} @@ -63,8 +63,8 @@ export function AdminLogPage() { {entry.reason ?? '—'} diff --git a/src/pages/administrator/AdminUsersPage.tsx b/src/pages/administrator/AdminUsersPage.tsx index 9a023f32..4f7178b7 100644 --- a/src/pages/administrator/AdminUsersPage.tsx +++ b/src/pages/administrator/AdminUsersPage.tsx @@ -37,6 +37,8 @@ import { useTranslation } from 'react-i18next'; import i18n from '../../i18n'; import { PastEventsHandover } from '../../components/account/PastEventsHandover'; import { TableRowsSkeleton } from '../../components/ui/loading'; +import { Pagination } from '../../components/ui/pagination'; +import { usePagedItems } from '../../hooks/usePagedItems'; /** Status name in the current language; unknown values are shown as they are. */ function statusLabel(status: string): string { @@ -75,6 +77,7 @@ export function AdminUsersPage() { ) .sort((a, b) => b._creationTime - a._creationTime); }, [users, search, filter]); + const { pageItems, page, totalPages, setPage } = usePagedItems(filtered, `${filter}:${search}`); const openUser = (userId: Id<'users'> | undefined) => { const next = new URLSearchParams(params); @@ -87,7 +90,10 @@ export function AdminUsersPage() {
-
+
) : ( - filtered.map((u) => { + pageItems.map((u) => { const status = u.status ?? 'active'; return ( - +
{u.name || t('users.unknown')} @@ -142,7 +152,7 @@ export function AdminUsersPage() { {u.email || u.phone || t('users.noContact')}
- + {u.lastLoginAt ? formatDateDEShort(u.lastLoginAt) : '—'} - + @@ -174,6 +184,13 @@ export function AdminUsersPage() {
+ + {selectedId && openUser(undefined)} />}
); diff --git a/src/tests/helpers/eventApproval.ts b/src/tests/helpers/eventApproval.ts index a382739b..33b72d8a 100644 --- a/src/tests/helpers/eventApproval.ts +++ b/src/tests/helpers/eventApproval.ts @@ -4,6 +4,8 @@ export async function approveEventByTitle(page: Page, eventTitle: string) { await page.goto('/admin/events'); await expect(page.getByRole('heading', { name: 'Events', exact: true })).toBeVisible(); + // The list is paged: the event may not be on the first page + await page.getByPlaceholder('Titel, Ort oder Veranstalter').fill(eventTitle); const row = page.getByRole('row', { name: new RegExp(eventTitle) }); await expect(row).toBeVisible(); From c0f672342b1f94e2ca5427950c5443d45bada6ee Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 19:49:25 +0100 Subject: [PATCH 32/58] style(organizer): seller cards where the table does not fit, no overflow on small phones Also keeps amounts on one line in the settlement and gives export buttons one width. Co-Authored-By: Claude Opus 5.5 --- .../administrator/AdminLegalPagesPage.tsx | 6 +- src/pages/administrator/AdminMessagesPage.tsx | 8 +- src/pages/administrator/AdminReportsPage.tsx | 2 +- src/pages/organizer/events/EditEventForm.tsx | 5 +- .../events/components/EditEventFeatures.tsx | 4 +- .../dashboard/CashReconciliationPage.tsx | 52 ++- .../events/dashboard/SellerManagementPage.tsx | 399 +++++++++--------- .../components/ProofOfOffersCard.tsx | 2 +- .../components/SettlementExportCard.tsx | 2 +- .../dashboard/components/VendorSettlement.tsx | 18 +- 10 files changed, 262 insertions(+), 236 deletions(-) diff --git a/src/pages/administrator/AdminLegalPagesPage.tsx b/src/pages/administrator/AdminLegalPagesPage.tsx index 638e6576..4dabfe6d 100644 --- a/src/pages/administrator/AdminLegalPagesPage.tsx +++ b/src/pages/administrator/AdminLegalPagesPage.tsx @@ -114,7 +114,7 @@ export function AdminLegalPagesPage() { ? t('legal.missingSingle') : t('legal.missingPlatform')} -
+
-
+

{title}

(
  • -
    -

    {message.name}

    +
    -

    {message.message}

    +

    {message.message}

    -
    +
    {formatDateTime(report.createdAt)}
    {t('reports.from', { name: report.reporterLabel })}
    diff --git a/src/pages/organizer/events/EditEventForm.tsx b/src/pages/organizer/events/EditEventForm.tsx index a2526258..47c2d3a1 100644 --- a/src/pages/organizer/events/EditEventForm.tsx +++ b/src/pages/organizer/events/EditEventForm.tsx @@ -893,7 +893,10 @@ export function EditEventForm() { {isEditing ? ( -
    +
    {isRunning && ( {t('form.running')} diff --git a/src/pages/organizer/events/components/EditEventFeatures.tsx b/src/pages/organizer/events/components/EditEventFeatures.tsx index 4b61d145..a00716c3 100644 --- a/src/pages/organizer/events/components/EditEventFeatures.tsx +++ b/src/pages/organizer/events/components/EditEventFeatures.tsx @@ -131,7 +131,7 @@ function RequiredFieldsPicker() { render={({ field }) => { const value = (field.value as string[] | undefined) ?? []; return ( -
    +
    {fields.map((categoryField) => { const id = `required-${categoryField.key}`; return ( @@ -246,7 +246,7 @@ export function EditEventFeatures({ title={t('features.discounts')} description={t('features.discountsText')} > -
    +
    {withDiscountStart && }
    diff --git a/src/pages/organizer/events/dashboard/CashReconciliationPage.tsx b/src/pages/organizer/events/dashboard/CashReconciliationPage.tsx index 37b66224..fd40ac12 100644 --- a/src/pages/organizer/events/dashboard/CashReconciliationPage.tsx +++ b/src/pages/organizer/events/dashboard/CashReconciliationPage.tsx @@ -47,7 +47,7 @@ export function CashReconciliationPage() {

    {t('cash.shouldBe')}

    -

    +

    {formatPriceDE(summary.cashInHandSoll)} €

    @@ -84,7 +84,7 @@ export function CashReconciliationPage() { {collecting && ( <> − -
    +

    {t('cash.feesToCollect')}

    {formatPriceDE(summary.totalFeesToCollect)} € @@ -103,26 +103,30 @@ export function CashReconciliationPage() {

    -
    +
    {t('cash.income', { count: summary.salesCount })}
    -
    {formatPriceDE(summary.totalNetRevenue)} €
    +
    + {formatPriceDE(summary.totalNetRevenue)} € +
    -
    +
    {t('cash.paidOut')}
    -
    +
    {summary.totalPaidOut > 0 ? '−' : ''} {formatPriceDE(summary.totalPaidOut)} €
    {summary.totalFeesCollected > 0.005 && ( -
    +
    {t('cash.feesCollectedIncome')}
    -
    +{formatPriceDE(summary.totalFeesCollected)} €
    +
    + +{formatPriceDE(summary.totalFeesCollected)} € +
    )} -
    +
    {t('cash.inCash')}
    -
    {formatPriceDE(summary.cashInHandSoll)} €
    +
    {formatPriceDE(summary.cashInHandSoll)} €
    {summary.totalDiscounts > 0.005 && ( @@ -157,24 +161,32 @@ export function CashReconciliationPage() {
    -
    +
    {t('cash.paid')}
    -
    {formatPriceDE(summary.totalPaidOut)} €
    +
    + {formatPriceDE(summary.totalPaidOut)} € +
    -
    +
    {t('cash.open')}
    -
    {formatPriceDE(summary.totalPendingPayout)} €
    +
    + {formatPriceDE(summary.totalPendingPayout)} € +
    {summary.totalFeesCollected > 0.005 && ( -
    +
    {t('cash.feesCollected')}
    -
    {formatPriceDE(summary.totalFeesCollected)} €
    +
    + {formatPriceDE(summary.totalFeesCollected)} € +
    )} {collecting && ( -
    +
    {t('cash.feesOpen')}
    -
    {formatPriceDE(summary.totalFeesToCollect)} €
    +
    + {formatPriceDE(summary.totalFeesToCollect)} € +
    )}
    @@ -190,7 +202,9 @@ export function CashReconciliationPage() { : ''} {seller.name} - {formatPriceDE(seller.amount)} € + + {formatPriceDE(seller.amount)} € +
  • ))} diff --git a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx index c351cccd..582b1c15 100644 --- a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx +++ b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx @@ -138,7 +138,7 @@ export function SellerManagementPage() { +
    {canBroadcast && (
    - {/* Desktop Table View */} -
    - - - - {t('sellers.participant')} - {t('sellers.details')} - {t('sellers.netRevenue')} - {t('sellers.status')} - {t('sellers.role')} - - - - - {filteredVendors.length === 0 ? ( + {/* Table only where it fits; the side menu takes room on tablets, too */} +
    +
    +
    + - - {activeFilter === 'helpers' && !searchTerm - ? t('sellers.noHelpers') - : t('sellers.noneForFilter')} - + {t('sellers.participant')} + {t('sellers.details')} + {t('sellers.netRevenue')} + {t('sellers.status')} + {t('sellers.role')} + - ) : ( - filteredVendors.map((v) => { - const isOwner = event?.organizerId === v._id; - return ( - handleSelectVendor(v._id)} - > - -
    -
    - {isOwner ? ( - - ) : ( - - )} -
    -
    -
    - {v.name} - - {v.managedByEventId && } - {v.isHelper && !isOwner && ( - + + + {filteredVendors.length === 0 ? ( + + + {activeFilter === 'helpers' && !searchTerm + ? t('sellers.noHelpers') + : t('sellers.noneForFilter')} + + + ) : ( + filteredVendors.map((v) => { + const isOwner = event?.organizerId === v._id; + return ( + handleSelectVendor(v._id)} + > + +
    +
    + {isOwner ? ( + + ) : ( + )}
    - {/* Mail and phone follow in the next column */} - {v.managedByEventId && ( - - {t('sellers.walkInCreated')} - +
    +
    + {v.name} + + {v.managedByEventId && } + {v.isHelper && !isOwner && ( + + )} +
    + {/* Mail and phone follow in the next column */} + {v.managedByEventId && ( + + {t('sellers.walkInCreated')} + + )} +
    +
    +
    + +
    + {(v.email ?? v.contactEmail) && ( +
    + {v.email ?? v.contactEmail} +
    + )} + {v.phone && ( +
    + {v.phone} +
    )}
    -
    - - -
    - {(v.email ?? v.contactEmail) && ( -
    - {v.email ?? v.contactEmail} -
    + + +
    + {formatPriceDE(v.totalRevenue)} € +
    +
    + + {v.paid ? ( + + {t('sellers.paid')} + + ) : ( + + {t('sellers.open')} + )} - {v.phone && ( -
    - {v.phone} -
    +
    + + {isOwner ? ( + + {t('sellers.owner')} + + ) : canManageHelpers && !v.managedByEventId ? ( + + ) : v.isHelper ? ( + + {t('sellers.helpers')} + + ) : null} + + + + + + ); + }) + )} + +
    +
    + +
    + {filteredVendors.length === 0 ? ( +
    + {activeFilter === 'helpers' && !searchTerm + ? t('sellers.noHelpers') + : t('sellers.none')} +
    + ) : ( + filteredVendors.map((v) => { + const isOwner = event?.organizerId === v._id; + return ( +
    handleSelectVendor(v._id)} + > +
    +
    +
    + {isOwner ? ( + + ) : ( + )}
    - - -
    +
    +
    + {v.name} + + {v.managedByEventId && } + {isOwner && } + {v.isHelper && !isOwner && ( + + )} +
    +
    + {v.managedByEventId ? t('sellers.walkInCreated') : v.email} +
    +
    +
    + +
    + +
    +
    +
    {t('sellers.revenue')}
    +
    {formatPriceDE(v.totalRevenue)} €
    - - +
    +
    +
    {t('sellers.status')}
    {v.paid ? ( - - {t('sellers.paid')} + + {t('sellers.paid')} ) : ( - - {t('sellers.open')} + + {t('sellers.open')} )} - - - {isOwner ? ( - - {t('sellers.owner')} - - ) : canManageHelpers && !v.managedByEventId ? ( - - ) : v.isHelper ? ( - - {t('sellers.helpers')} - - ) : null} - - - - - - ); - }) - )} - - -
    - - {/* Mobile Card View */} -
    - {filteredVendors.length === 0 ? ( -
    - {activeFilter === 'helpers' && !searchTerm ? t('sellers.noHelpers') : t('sellers.none')} -
    - ) : ( - filteredVendors.map((v) => { - const isOwner = event?.organizerId === v._id; - return ( -
    handleSelectVendor(v._id)} - > -
    -
    -
    - {isOwner ? : } -
    -
    -
    - {v.name} - - {v.managedByEventId && } - {isOwner && } - {v.isHelper && !isOwner && ( - - )} -
    -
    - {v.managedByEventId ? t('sellers.walkInCreated') : v.email} -
    - -
    -
    -
    -
    {t('sellers.revenue')}
    -
    - {formatPriceDE(v.totalRevenue)} € + {canManageHelpers && !isOwner && !v.managedByEventId && ( +
    +
    -
    -
    -
    {t('sellers.status')}
    - {v.paid ? ( - - {t('sellers.paid')} - - ) : ( - - {t('sellers.open')} - - )} -
    + )}
    - - {canManageHelpers && !isOwner && !v.managedByEventId && ( -
    - -
    - )} -
    - ); - }) - )} + ); + }) + )} +
    } title={t('sellers.sentMessages')} /> diff --git a/src/pages/organizer/events/dashboard/components/ProofOfOffersCard.tsx b/src/pages/organizer/events/dashboard/components/ProofOfOffersCard.tsx index 86e8ea14..8517950b 100644 --- a/src/pages/organizer/events/dashboard/components/ProofOfOffersCard.tsx +++ b/src/pages/organizer/events/dashboard/components/ProofOfOffersCard.tsx @@ -40,7 +40,7 @@ export function ProofOfOffersCard({ eventId }: { eventId: Id<'events'> }) { {t('proof.cardTitle')}

    {t('proof.cardText')}

    -
    +
    diff --git a/src/pages/organizer/events/dashboard/components/SettlementExportCard.tsx b/src/pages/organizer/events/dashboard/components/SettlementExportCard.tsx index 830c4c41..25b488ac 100644 --- a/src/pages/organizer/events/dashboard/components/SettlementExportCard.tsx +++ b/src/pages/organizer/events/dashboard/components/SettlementExportCard.tsx @@ -37,7 +37,7 @@ export function SettlementExportCard({ eventId }: { eventId: Id<'events'> }) { {t('export.cardTitle')}

    {t('export.cardText')}

    -
    +
    diff --git a/src/pages/organizer/events/dashboard/components/VendorSettlement.tsx b/src/pages/organizer/events/dashboard/components/VendorSettlement.tsx index 722b8d19..0c367512 100644 --- a/src/pages/organizer/events/dashboard/components/VendorSettlement.tsx +++ b/src/pages/organizer/events/dashboard/components/VendorSettlement.tsx @@ -174,33 +174,35 @@ export function VendorSettlement({ {owes ? t('settle.collectFee') : t('settle.payOut')}
    -
    +
    {t('settle.sold', { count: soldCount })}
    -
    {formatPriceDE(vendor.totalRevenue)} €
    +
    {formatPriceDE(vendor.totalRevenue)} €
    -
    +
    {t('settle.commission', { percent: commissionPercent })}
    -
    +
    {vendor.commission > 0 ? '−' : ''} {formatPriceDE(vendor.commission)} €
    {vendor.intakeFee.total > 0 && ( -
    +
    {t('settle.intakeFee', { items: vendor.intakeFee.items, perItem: formatPriceDE(vendor.intakeFee.perItem), })}
    -
    −{formatPriceDE(vendor.intakeFee.total)} €
    +
    −{formatPriceDE(vendor.intakeFee.total)} €
    )} -
    +
    {owes ? t('settle.pays', { name }) : t('settle.payout')}
    -
    {amount} €
    +
    + {amount} € +
    From 7454bf940120b462288987b761af0bb4c0864136 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 20:20:29 +0100 Subject: [PATCH 33/58] fix(settings): darkmode selector --- src/styles/index.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/styles/index.css b/src/styles/index.css index 0e1ba399..c0e109cc 100644 --- a/src/styles/index.css +++ b/src/styles/index.css @@ -43,6 +43,8 @@ } .dark { + /* Browser-drawn parts follow the theme: select lists, date pickers, scrollbars */ + color-scheme: dark; --background: oklch(0.145 0 0); --foreground: oklch(0.985 0 0); --card: oklch(0.205 0 0); @@ -129,6 +131,13 @@ body { @apply bg-background text-foreground; } + + /* Some browsers take the list's colours from here; the text color is inherited otherwise */ + option, + optgroup { + background-color: var(--popover); + color: var(--popover-foreground); + } } /** From bbe353e26391daf7f78fd37979e18d6b3a8d233e Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 20:38:00 +0100 Subject: [PATCH 34/58] feat(labels): sellers and the team print a label for the basket Sellers get a button on their items page, the team one for each seller next to the mark. The label is the sorting sheet of that basket and warns about a look-alike basket of the bazaar. Co-Authored-By: Claude Opus 5.5 --- backend/src/modules/labels.rs | 25 ++++++++++++++ backend/tests/api/reminders.rs | 25 ++++++++++++++ src/lib/api/types.ts | 5 +++ src/lib/sortSheetsPdf.test.ts | 17 ++++++++++ src/lib/sortSheetsPdf.ts | 22 ++++++++++-- src/locales/de/organizer.json | 3 +- src/locales/de/seller.json | 4 ++- src/locales/en/organizer.json | 3 +- src/locales/en/seller.json | 4 ++- .../events/dashboard/SellerManagementPage.tsx | 34 +++++++++++++++++-- src/pages/seller/products/MyProductsPage.tsx | 13 +++++++ .../components/MyProductsPageHeader.tsx | 16 ++++++++- 12 files changed, 161 insertions(+), 10 deletions(-) create mode 100644 src/lib/sortSheetsPdf.test.ts diff --git a/backend/src/modules/labels.rs b/backend/src/modules/labels.rs index 4f469ab3..62271eb5 100644 --- a/backend/src/modules/labels.rs +++ b/backend/src/modules/labels.rs @@ -24,6 +24,7 @@ const SORT_PATTERNS: i32 = 100_000; pub fn register(registry: &mut Registry) { register!(registry, Query "labels.getLabelData" => get_label_data); register!(registry, Query "labels.getSortMarkClashes" => get_sort_mark_clashes); + register!(registry, Query "labels.getMyBasketLabel" => get_my_basket_label); } #[derive(Deserialize)] @@ -190,3 +191,27 @@ async fn get_sort_mark_clashes(ctx: &mut Ctx, args: ClashArgs) -> AppResult, +} + +/// What the viewer's basket label shows; none before the first item or bazaar. +async fn get_my_basket_label(ctx: &mut Ctx, _: NoArgs) -> AppResult> { + let user = ctx.require_user()?; + ctx.read(Topic::User(user)); + let row: Option<(Option, Option)> = + sqlx::query_as("SELECT sort_code, name FROM users WHERE id = $1") + .bind(user) + .fetch_optional(ctx.conn()) + .await?; + Ok(row.and_then(|(code, name)| code.map(|sort_code| BasketLabel { sort_code, name }))) +} diff --git a/backend/tests/api/reminders.rs b/backend/tests/api/reminders.rs index 227d1699..f970d489 100644 --- a/backend/tests/api/reminders.rs +++ b/backend/tests/api/reminders.rs @@ -465,6 +465,31 @@ async fn only_sellers_get_a_sort_code_and_never_the_same(db: PgPool) { assert_eq!(code_of(buyer).await, None); } +#[sqlx::test(migrator = "bazarpro_backend::MIGRATOR")] +async fn sellers_get_their_own_basket_label(db: PgPool) { + let app = TestApp::new(db.clone()); + let seller = fixtures::user(&db, "Seller").await; + let as_seller = fixtures::session(&db, seller).await; + let label = async || { + app.query("labels.getMyBasketLabel", json!({}), Some(&as_seller)) + .await + .body["value"] + .clone() + }; + // No code before the first item + assert_eq!(label().await, Value::Null); + + fixtures::product(&db, seller, "Jacke", 15.0).await; + let code: i32 = sqlx::query_scalar("SELECT sort_code FROM users WHERE id = $1") + .bind(seller) + .fetch_one(&db) + .await + .unwrap(); + let body = label().await; + assert_eq!(body["sortCode"], code); + assert_eq!(body["name"], "Seller"); +} + #[sqlx::test(migrator = "bazarpro_backend::MIGRATOR")] async fn sort_codes_are_random_and_tell_nothing_about_the_order(db: PgPool) { let mut codes: Vec = Vec::new(); diff --git a/src/lib/api/types.ts b/src/lib/api/types.ts index 76241104..92317180 100644 --- a/src/lib/api/types.ts +++ b/src/lib/api/types.ts @@ -1707,6 +1707,11 @@ export interface Api { >; }; labels: { + getMyBasketLabel: FunctionReference< + 'query', + EmptyObject, + { sortCode: number; name?: string | undefined } | null + >; getSortMarkClashes: FunctionReference<'query', { eventIds: Id<'events'>[] }, Id<'events'>[]>; getLabelData: FunctionReference< 'query', diff --git a/src/lib/sortSheetsPdf.test.ts b/src/lib/sortSheetsPdf.test.ts new file mode 100644 index 00000000..a57b511c --- /dev/null +++ b/src/lib/sortSheetsPdf.test.ts @@ -0,0 +1,17 @@ +import { describe, expect, it } from 'vitest'; +import { buildSortSheetsPdf } from './sortSheetsPdf'; + +const NOTE = 'Achte auf den Buchstaben'; + +describe('sort sheets', () => { + it('prints two sheets per page, one for each basket', () => { + const sellers = [1, 2, 3].map((n) => ({ sortCode: n, name: `Verkäufer ${n}` })); + expect(buildSortSheetsPdf(sellers).getNumberOfPages()).toBe(2); + }); + + it('warns on a single basket label about a look-alike basket of the bazaar', () => { + const seller = { sortCode: 66_647, name: 'Anna' }; + expect(buildSortSheetsPdf([seller], NOTE).output()).not.toContain(NOTE); + expect(buildSortSheetsPdf([seller], NOTE, [66_647, 166_647]).output()).toContain(NOTE); + }); +}); diff --git a/src/lib/sortSheetsPdf.ts b/src/lib/sortSheetsPdf.ts index 6f6a65e7..f43af39f 100644 --- a/src/lib/sortSheetsPdf.ts +++ b/src/lib/sortSheetsPdf.ts @@ -13,9 +13,16 @@ export interface SortSheetSeller { sellerNumber?: number; } -/** A4 pages with two sheets each, in sorting order: one for each seller's basket. */ -export function buildSortSheetsPdf(sellers: SortSheetSeller[], clashNote = ''): jsPDF { - const clashing = clashingSortCodes(sellers.map((seller) => seller.sortCode)); +/** + * A4 pages with two sheets each, in sorting order: one for each seller's basket. `bazaarCodes`: + * all codes of the bazaar, when printing only some of its baskets. + */ +export function buildSortSheetsPdf( + sellers: SortSheetSeller[], + clashNote = '', + bazaarCodes = sellers.map((seller) => seller.sortCode) +): jsPDF { + const clashing = clashingSortCodes(bazaarCodes); const doc = new jsPDF({ orientation: 'portrait', unit: 'mm', format: 'a4' }); const sheetHeight = PAGE_HEIGHT / 2; const sorted = [...sellers].sort((a, b) => compareSortCodes(a.sortCode, b.sortCode)); @@ -52,3 +59,12 @@ export async function downloadSortSheets( ): Promise { await savePdf(buildSortSheetsPdf(sellers, clashNote), 'BazarPro-Sortierblaetter.pdf'); } + +/** The sheet for one basket, to stick on it. */ +export async function downloadBasketLabel( + seller: SortSheetSeller, + clashNote = '', + bazaarCodes?: number[] +): Promise { + await savePdf(buildSortSheetsPdf([seller], clashNote, bazaarCodes), 'BazarPro-Korb-Etikett.pdf'); +} diff --git a/src/locales/de/organizer.json b/src/locales/de/organizer.json index 349b9ba1..8fdf33e6 100644 --- a/src/locales/de/organizer.json +++ b/src/locales/de/organizer.json @@ -304,7 +304,8 @@ "noHelpers": "Noch keine Helfer. Über „Helfer hinzufügen“ ernennst du Teilnehmer zu Helfern.", "sortClash_one": "{{count}} Korb hat dasselbe Muster wie ein anderer und unterscheidet sich nur im Buchstaben.", "sortClash_other": "{{count}} Körbe haben dasselbe Muster wie ein anderer und unterscheiden sich nur im Buchstaben. Die Sortierblätter weisen darauf hin.", - "sortClashNote": "Achtung: Ein anderer Korb hat dasselbe Muster. Achte auf den Buchstaben: Etiketten ohne Buchstabe gehören in den Korb ohne Buchstabe." + "sortClashNote": "Achtung: Ein anderer Korb hat dasselbe Muster. Achte auf den Buchstaben: Etiketten ohne Buchstabe gehören in den Korb ohne Buchstabe.", + "basketLabel": "Korb-Etikett drucken" }, "settle": { "seller": "Verkäufer", diff --git a/src/locales/de/seller.json b/src/locales/de/seller.json index a296f720..7992dfee 100644 --- a/src/locales/de/seller.json +++ b/src/locales/de/seller.json @@ -198,6 +198,8 @@ "created_other": "{{count}} Etiketten erstellt", "open": "Etiketten drucken", "clash": "Achtung: Ein anderer Verkäufer bei diesem Basar hat dasselbe Muster wie du. Eure Etiketten unterscheiden sich nur im Buchstaben. Du musst nichts ändern, das Team sieht es auf den Sortierblättern. Bitte weise beim Abgeben darauf hin.", - "clashAt": "Achtung: Bei {{bazaars}} hat ein anderer Verkäufer dasselbe Muster wie du. Eure Etiketten unterscheiden sich nur im Buchstaben. Bitte weise beim Abgeben darauf hin." + "clashAt": "Achtung: Bei {{bazaars}} hat ein anderer Verkäufer dasselbe Muster wie du. Eure Etiketten unterscheiden sich nur im Buchstaben. Bitte weise beim Abgeben darauf hin.", + "basket": "Korb-Etikett drucken", + "basketHint": "Dein Sortierzeichen groß zum Aufkleben auf deinen Korb" } } diff --git a/src/locales/en/organizer.json b/src/locales/en/organizer.json index c3a6f587..b5d41766 100644 --- a/src/locales/en/organizer.json +++ b/src/locales/en/organizer.json @@ -304,7 +304,8 @@ "noHelpers": "No helpers yet. Use “Add helper” to make participants helpers.", "sortClash_one": "{{count}} basket has the same pattern as another one and differs by the letter only.", "sortClash_other": "{{count}} baskets have the same pattern as another one and differ by the letter only. The sorting sheets point this out.", - "sortClashNote": "Note: another basket has the same pattern. Check the letter: labels without a letter belong in the basket without a letter." + "sortClashNote": "Note: another basket has the same pattern. Check the letter: labels without a letter belong in the basket without a letter.", + "basketLabel": "Print basket label" }, "settle": { "seller": "Seller", diff --git a/src/locales/en/seller.json b/src/locales/en/seller.json index 42edb7e6..b328d019 100644 --- a/src/locales/en/seller.json +++ b/src/locales/en/seller.json @@ -198,6 +198,8 @@ "created_other": "{{count}} labels created", "open": "Print labels", "clash": "Note: another seller at this bazaar has the same pattern as you. Your labels differ by the letter only. You need not change anything, the team sees it on the sorting sheets. Please point it out when you hand in your items.", - "clashAt": "Note: at {{bazaars}} another seller has the same pattern as you. Your labels differ by the letter only. Please point it out when you hand in your items." + "clashAt": "Note: at {{bazaars}} another seller has the same pattern as you. Your labels differ by the letter only. Please point it out when you hand in your items.", + "basket": "Print basket label", + "basketHint": "Your sorting mark in large print to stick on your basket" } } diff --git a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx index 6ca1c069..7ef1e2c7 100644 --- a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx +++ b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx @@ -1,5 +1,5 @@ import { SortMarkBadge } from '../../../../components/sellers/SortMarkBadge'; -import { downloadSortSheets } from '../../../../lib/sortSheetsPdf'; +import { downloadBasketLabel, downloadSortSheets } from '../../../../lib/sortSheetsPdf'; import { clashingSortCodes } from '../../../../shared/sortCode'; import { PageSkeleton } from '../../../../components/ui/loading'; import { PageHeader } from '../../../../components/ui/page-header'; @@ -90,6 +90,27 @@ export function SellerManagementPage() { // Baskets that differ by the letter only const clashingCodes = clashingSortCodes(sortSheetSellers.map((seller) => seller.sortCode)); + // The row opens the seller, the button only prints + const basketLabelButton = (vendor: VendorWithCalculations, sortCode: number) => ( + + ); + const addHelper = useMutation(api.eventRoles.addCoOrganizerForEvent); useAssignMissingSellerNumbers(eventId as Id<'events'>, vendors, canManage); const removeHelper = useMutation(api.eventRoles.removeCoOrganizerForEvent); @@ -265,7 +286,10 @@ export function SellerManagementPage() { {v.name} {v.sortCode !== undefined && ( - + <> + + {basketLabelButton(v, v.sortCode)} + )} {v.managedByEventId && } {v.isHelper && !isOwner && ( @@ -374,6 +398,12 @@ export function SellerManagementPage() {
    {v.name} + {v.sortCode !== undefined && ( + <> + + {basketLabelButton(v, v.sortCode)} + + )} {v.managedByEventId && } {isOwner && } {v.isHelper && !isOwner && ( diff --git a/src/pages/seller/products/MyProductsPage.tsx b/src/pages/seller/products/MyProductsPage.tsx index 9bee2a53..28b1c566 100644 --- a/src/pages/seller/products/MyProductsPage.tsx +++ b/src/pages/seller/products/MyProductsPage.tsx @@ -23,6 +23,8 @@ import { import type { MyProductCardProduct } from './components/MyProductCard'; import { MyProductsGrid } from './components/MyProductsGrid'; import { MyProductsPageHeader } from './components/MyProductsPageHeader'; +import { downloadBasketLabel } from '../../../lib/sortSheetsPdf'; +import { resolveEventFeatures } from '../../../shared/eventFeatures'; import { LabelPrintDialog } from '../../../components/products/LabelPrintDialog'; import { ProductDiscountDialog } from './components/ProductDiscountDialog'; import { toast } from 'sonner'; @@ -493,6 +495,16 @@ export function MyProductsPage() { navigate('/products/new', { state: { initialEventId: filterEvent } }); }; + const basketLabel = useQuery(api.labels.getMyBasketLabel); + const printBasketLabel = + basketLabel && events?.some((event) => resolveEventFeatures(event).labelMark === 'universal') + ? () => + void downloadBasketLabel({ + sortCode: basketLabel.sortCode, + name: basketLabel.name ?? '', + }).catch((e: unknown) => toast.error(getUserFacingErrorMessage(e))) + : undefined; + const selectedSet = new Set(selectedProducts); const selectedForLabels = filteredProducts .filter((p) => selectedSet.has(p._id) && !p.sold) @@ -517,6 +529,7 @@ export function MyProductsPage() { )} !p.sold) ? () => setIsLabelDialogOpen(true) : undefined } diff --git a/src/pages/seller/products/components/MyProductsPageHeader.tsx b/src/pages/seller/products/components/MyProductsPageHeader.tsx index d2a0703e..0b11997e 100644 --- a/src/pages/seller/products/components/MyProductsPageHeader.tsx +++ b/src/pages/seller/products/components/MyProductsPageHeader.tsx @@ -1,5 +1,5 @@ import { PageHeader } from '../../../../components/ui/page-header'; -import { Plus, Printer } from 'lucide-react'; +import { Plus, Printer, ShoppingBasket } from 'lucide-react'; import { Button } from '../../../../components/ui/button'; import { useTranslation } from 'react-i18next'; @@ -11,11 +11,14 @@ interface MyProductsPageHeaderProps { onCreateProduct: () => void; /** Missing while there is nothing to label */ onPrintLabels?: () => void; + /** Missing without a sorting mark or a bazaar with universal labels */ + onPrintBasketLabel?: () => void; } export function MyProductsPageHeader({ onCreateProduct, onPrintLabels, + onPrintBasketLabel, }: MyProductsPageHeaderProps) { const { t } = useTranslation('seller'); return ( @@ -24,6 +27,17 @@ export function MyProductsPageHeader({ title={t('header.title')} actions={
    + {onPrintBasketLabel && ( + + )} {onPrintLabels && ( )} + {sellerMode === 'acceptance' && selectedVendor.sortCode !== undefined && ( +
    + + +
    + )} {sellerMode === 'acceptance' && ( - ); - const addHelper = useMutation(api.eventRoles.addCoOrganizerForEvent); useAssignMissingSellerNumbers(eventId as Id<'events'>, vendors, canManage); const removeHelper = useMutation(api.eventRoles.removeCoOrganizerForEvent); @@ -285,12 +263,6 @@ export function SellerManagementPage() {
    {v.name} - {v.sortCode !== undefined && ( - <> - - {basketLabelButton(v, v.sortCode)} - - )} {v.managedByEventId && } {v.isHelper && !isOwner && ( @@ -398,12 +370,6 @@ export function SellerManagementPage() {
    {v.name} - {v.sortCode !== undefined && ( - <> - - {basketLabelButton(v, v.sortCode)} - - )} {v.managedByEventId && } {isOwner && } {v.isHelper && !isOwner && ( diff --git a/src/shared/sortCode.test.ts b/src/shared/sortCode.test.ts index 05ba2969..42360cc4 100644 --- a/src/shared/sortCode.test.ts +++ b/src/shared/sortCode.test.ts @@ -1,3 +1,4 @@ +import { jsPDF } from 'jspdf'; import { describe, expect, it } from 'vitest'; import { SORT_COLORS, @@ -5,6 +6,7 @@ import { clashingSortCodes, compareSortCodes, sortMark, + sortMarkLayout, sortMarkText, } from './sortCode'; @@ -57,3 +59,48 @@ describe('compareSortCodes', () => { expect([...codes].sort(compareSortCodes)).toEqual([247, 100_247, 257, 248]); }); }); + +describe('sortMarkLayout', () => { + // Small and large labels, a sorting sheet and the badge in the app + const SIZES = [ + [18.3, 11], + [19.1, 11.5], + [180, 90], + [183, 110], + ]; + // A, W (the widest letter), AA, AAA + const LETTERED = [100_000, 2_300_000, 2_700_000, 70_300_000]; + + it('moves nothing for a letter, in any size', () => { + for (const [width, height] of SIZES) { + const { letters: none, ...plain } = sortMarkLayout(sortMark(66_647), width, height); + expect(none).toEqual([]); + for (const code of LETTERED) { + const { letters, ...lettered } = sortMarkLayout(sortMark(code + 66_647), width, height); + expect(lettered).toEqual(plain); + expect(letters).toHaveLength(sortMark(code).letter.length); + } + } + }); + + it('keeps letters inside the pile and clear of the digit, in any size', () => { + const doc = new jsPDF({ unit: 'mm' }); + doc.setFont('helvetica', 'bold'); + const pts = doc.internal.scaleFactor; + for (const [width, height] of SIZES) { + for (const code of LETTERED) { + const { pile, letters } = sortMarkLayout(sortMark(code + 66_647), width, height); + doc.setFontSize(pile.digit.em * pts); + const digitRight = pile.digit.x + doc.getTextWidth('7') / 2; + for (const { char, x, y, em } of letters) { + doc.setFontSize(em * pts); + const half = doc.getTextWidth(char) / 2; + expect(x - half).toBeGreaterThanOrEqual(digitRight); + expect(x + half).toBeLessThanOrEqual(pile.x + pile.width); + expect(y - em * 0.72).toBeGreaterThanOrEqual(pile.y); + expect(y).toBeLessThanOrEqual(pile.y + pile.height); + } + } + } + }); +}); diff --git a/src/shared/sortCode.ts b/src/shared/sortCode.ts index 649b8e9c..b102394c 100644 --- a/src/shared/sortCode.ts +++ b/src/shared/sortCode.ts @@ -154,7 +154,20 @@ export interface SortMarkLayout { size: number; number: { x: number; y: number; em: number }; }[]; - letter?: { x: number; y: number; em: number }; + /** Beside the digit, in the free space of the pile: nothing else moves for a letter */ + letters: { char: string; x: number; y: number; em: number }[]; +} + +/** Width of a bold digit and of the widest letter (W), in font sizes */ +const DIGIT_WIDTH = 0.56; +const LETTER_WIDTH = 0.95; +/** Distance of stacked letters, in font sizes */ +const LETTER_LINE = 0.85; + +/** As large as fits next to the digit, with more letters stacked as high as the digit. */ +function letterEm(digitEm: number, pileWidth: number, letters: number): number { + const beside = ((pileWidth - digitEm * DIGIT_WIDTH) / 2) * 0.9; + return Math.min(beside / LETTER_WIDTH, (digitEm * 0.85) / (letters * LETTER_LINE)); } /** Where the parts of a mark go, in the app and in the PDF. Sizes in the unit of the box. */ @@ -165,11 +178,9 @@ export function sortMarkLayout(mark: SortMark, width: number, height: number): S const gap = inner * 0.05; const size = (inner - gap) / 2; const numberWidth = size * 0.8; - const letterWidth = mark.letter ? inner * 0.24 * mark.letter.length : 0; - const pileWidth = width - 2 * inset - size - numberWidth - letterWidth - 2 * gap; + const pileWidth = width - 2 * inset - size - numberWidth - 2 * gap; const shapeSize = Math.min(inner * 0.32, pileWidth * 0.7); const shapeX = inset + pileWidth + 2 * gap; - const center = height / 2; const digitEm = Math.min(inner * 0.6, pileWidth * 1.3); // Digits are about 0.72 of the font size high return { @@ -194,12 +205,14 @@ export function sortMarkLayout(mark: SortMark, width: number, height: number): S number: { x: shapeX + size + numberWidth / 2, y: y + size / 2 + em * 0.36, em }, }; }), - letter: mark.letter - ? { - x: width - inset - letterWidth / 2, - y: center + (inner * 0.3 * 0.72) / 2, - em: Math.min(inner * 0.3, letterWidth / mark.letter.length), - } - : undefined, + letters: [...mark.letter].reverse().map((char, i) => { + const em = letterEm(digitEm, pileWidth, mark.letter.length); + return { + char, + x: inset + pileWidth - (pileWidth - digitEm * DIGIT_WIDTH) / 4, + y: inset + inner * 0.94 - i * em * LETTER_LINE, + em, + }; + }), }; } From b4fc4c1c68fbed5783f514acde7e4b1abf5945ef Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Wed, 4 Nov 2026 21:50:56 +0100 Subject: [PATCH 36/58] feat(labels): the team exports the labels of all sellers of a bazaar A button on the seller page opens the print dialog with all items that still need a label, seller by seller. The export asks the backend in batches and compresses the PDF, so a large bazaar fits. Co-Authored-By: Claude Opus 5.5 --- backend/src/modules/labels.rs | 28 +++++++++++ backend/tests/api/reminders.rs | 50 +++++++++++++++++++ src/lib/api/types.ts | 1 + src/lib/productQRCodePdf.test.ts | 25 +++++++++- src/lib/productQRCodePdf.ts | 33 +++++++++--- src/locales/de/organizer.json | 4 +- src/locales/en/organizer.json | 4 +- .../events/dashboard/SellerManagementPage.tsx | 23 +++++++++ 8 files changed, 157 insertions(+), 11 deletions(-) diff --git a/backend/src/modules/labels.rs b/backend/src/modules/labels.rs index 62271eb5..05a6cf7e 100644 --- a/backend/src/modules/labels.rs +++ b/backend/src/modules/labels.rs @@ -25,6 +25,7 @@ pub fn register(registry: &mut Registry) { register!(registry, Query "labels.getLabelData" => get_label_data); register!(registry, Query "labels.getSortMarkClashes" => get_sort_mark_clashes); register!(registry, Query "labels.getMyBasketLabel" => get_my_basket_label); + register!(registry, Query "labels.getEventLabelIds" => get_event_label_ids); } #[derive(Deserialize)] @@ -215,3 +216,30 @@ async fn get_my_basket_label(ctx: &mut Ctx, _: NoArgs) -> AppResult AppResult> { + let user = ctx.require_user()?; + if !has_any_role_or_admin(ctx.conn(), args.event_id.0, user, &TEAM).await? { + return Err(AppError::forbidden("auth.forbidden")); + } + ctx.read(Topic::Event(args.event_id.0)); + Ok(sqlx::query_scalar( + "SELECT p.id + FROM event_products ep + JOIN products p ON p.id = ep.product_id + JOIN users u ON u.id = p.vendor_id + WHERE ep.event_id = $1 AND ep.status IN ('announced', 'available') + ORDER BY u.sort_code, u.id, p.created_at, p.id", + ) + .bind(args.event_id.0) + .fetch_all(ctx.conn()) + .await?) +} diff --git a/backend/tests/api/reminders.rs b/backend/tests/api/reminders.rs index f970d489..9dc016b6 100644 --- a/backend/tests/api/reminders.rs +++ b/backend/tests/api/reminders.rs @@ -465,6 +465,56 @@ async fn only_sellers_get_a_sort_code_and_never_the_same(db: PgPool) { assert_eq!(code_of(buyer).await, None); } +#[sqlx::test(migrator = "bazarpro_backend::MIGRATOR")] +async fn the_team_exports_the_labels_of_all_sellers(db: PgPool) { + let app = TestApp::new(db.clone()); + let organizer = fixtures::user(&db, "Orga").await; + let first = fixtures::user(&db, "First").await; + let second = fixtures::user(&db, "Second").await; + let event = fixtures::event(&db, EventSpec::new("Basar", organizer)).await; + let other_event = fixtures::event(&db, EventSpec::new("Anderer", organizer)).await; + let item = async |seller: Uuid, target: Uuid, status: &str| { + let product = fixtures::product(&db, seller, "Teil", 5.0).await; + fixtures::event_product(&db, target, product, status).await; + product + }; + let announced = item(first, event, "announced").await; + let available = item(second, event, "available").await; + let also_first = item(first, event, "available").await; + item(first, event, "sold").await; + item(second, event, "returned").await; + item(second, other_event, "available").await; + for (seller, code) in [(first, 10), (second, 20)] { + sqlx::query("UPDATE users SET sort_code = $2 WHERE id = $1") + .bind(seller) + .bind(code) + .execute(&db) + .await + .unwrap(); + } + + let team = fixtures::session(&db, organizer).await; + let ids = app + .query( + "labels.getEventLabelIds", + json!({ "eventId": event }), + Some(&team), + ) + .await; + // Only open items of this bazaar, seller by seller + assert_eq!(ids.body["value"], json!([announced, also_first, available])); + + let as_seller = fixtures::session(&db, first).await; + let forbidden = app + .query( + "labels.getEventLabelIds", + json!({ "eventId": event }), + Some(&as_seller), + ) + .await; + assert_eq!(forbidden.body["code"], "auth.forbidden"); +} + #[sqlx::test(migrator = "bazarpro_backend::MIGRATOR")] async fn sellers_get_their_own_basket_label(db: PgPool) { let app = TestApp::new(db.clone()); diff --git a/src/lib/api/types.ts b/src/lib/api/types.ts index 48518281..f53ff083 100644 --- a/src/lib/api/types.ts +++ b/src/lib/api/types.ts @@ -1712,6 +1712,7 @@ export interface Api { EmptyObject, { sortCode: number; name?: string | undefined } | null >; + getEventLabelIds: FunctionReference<'query', { eventId: Id<'events'> }, Id<'products'>[]>; getSortMarkClashes: FunctionReference<'query', { eventIds: Id<'events'>[] }, Id<'events'>[]>; getLabelData: FunctionReference< 'query', diff --git a/src/lib/productQRCodePdf.test.ts b/src/lib/productQRCodePdf.test.ts index bf954466..9db1cfcb 100644 --- a/src/lib/productQRCodePdf.test.ts +++ b/src/lib/productQRCodePdf.test.ts @@ -60,6 +60,27 @@ describe('labels', () => { expect(await downloadLabelsPdf(client, [])).toBe(0); }); + it('asks the backend in batches, so a large bazaar fits', async () => { + const query = vi.fn(async (_fn: unknown, args: { productIds: string[] }) => ({ + format: 'small', + labels: args.productIds.map((productId) => ({ productId, title: 'Teil' })), + })); + const ids = Array.from({ length: 1201 }, (_, i) => id(i)); + expect(await downloadLabelsPdf({ query } as never, ids, 'event1' as Id<'events'>)).toBe(1201); + expect(query.mock.calls.map(([, args]) => args.productIds.length)).toEqual([500, 500, 201]); + }); + + it('compresses the labels of a whole bazaar', () => { + const labels = Array.from({ length: 80 }, (_, i) => ({ + productId: id(i), + title: `Teil ${i}`, + sortCode: 66_647, + })); + const size = (compress: boolean) => + buildLabelsPdf(labels, 'small', 1, compress).output('arraybuffer').byteLength; + expect(size(true)).toBeLessThan(size(false) / 2); + }); + const label = (n: number) => ({ productId: id(n), title: `Teil ${n}`, sortCode: 88_875 }); const pages = (doc: ReturnType) => doc.getNumberOfPages(); @@ -74,14 +95,14 @@ describe('labels', () => { it('says where to cut in both formats', () => { for (const format of ['small', 'standard'] as const) { - const doc = buildLabelsPdf([label(1), label(2)], format); + const doc = buildLabelsPdf([label(1), label(2)], format, 1, false); expect(doc.output()).toContain('Entlang der grauen Linien ausschneiden'); } }); it('draws the sorting mark in both formats', () => { for (const format of ['small', 'standard'] as const) { - const pdf = buildLabelsPdf([label(1)], format).output(); + const pdf = buildLabelsPdf([label(1)], format, 1, false).output(); // The pile and a basket mark of the code 88875 expect(pdf).toContain('(5) Tj'); expect(pdf).toContain('(88) Tj'); diff --git a/src/lib/productQRCodePdf.ts b/src/lib/productQRCodePdf.ts index 35586513..a2bb77ee 100644 --- a/src/lib/productQRCodePdf.ts +++ b/src/lib/productQRCodePdf.ts @@ -13,6 +13,9 @@ const PAGE_WIDTH = 210; const PAGE_HEIGHT = 297; const MARGIN_MM = 10; +/** MAX_LABELS in backend/src/modules/labels.rs */ +const LABELS_PER_REQUEST = 500; + /** Grid of one page: large labels (e.g. bikes) or small ones for clothes. */ export const LABEL_LAYOUTS: Record = { standard: { cols: 3, rows: 4 }, @@ -175,12 +178,17 @@ function drawCutHint(doc: jsPDF): void { * A4 pages with one label per item in the given format. `startAt`: the first free place on * a sheet that is partly used, counted from 1 row by row. */ -export function buildLabelsPdf(labels: LabelData[], format: LabelFormat, startAt = 1): jsPDF { +export function buildLabelsPdf( + labels: LabelData[], + format: LabelFormat, + startAt = 1, + compress = true +): jsPDF { const { cols, rows } = LABEL_LAYOUTS[format]; const width = (PAGE_WIDTH - 2 * MARGIN_MM) / cols; const height = (PAGE_HEIGHT - 2 * MARGIN_MM) / rows; const perPage = cols * rows; - const doc = new jsPDF({ orientation: 'portrait', unit: 'mm', format: 'a4' }); + const doc = new jsPDF({ orientation: 'portrait', unit: 'mm', format: 'a4', compress }); doc.setTextColor(0, 0, 0); const skipped = Math.min(Math.max(Math.trunc(startAt) || 1, 1), perPage) - 1; @@ -215,9 +223,20 @@ export async function downloadLabelsPdf( startAt = 1 ): Promise { if (productIds.length === 0) return 0; - const data = await client.query(api.labels.getLabelData, { productIds, eventId }); - if (data.labels.length === 0) return 0; - const doc = buildLabelsPdf(data.labels, data.format, startAt); - await savePdf(doc, 'BazarPro-Etiketten.pdf'); - return data.labels.length; + const labels: LabelData[] = []; + const formats = new Set(); + // The backend answers for a limited number of items at once + for (let i = 0; i < productIds.length; i += LABELS_PER_REQUEST) { + const data = await client.query(api.labels.getLabelData, { + productIds: productIds.slice(i, i + LABELS_PER_REQUEST), + eventId, + }); + if (data.labels.length > 0) formats.add(data.format); + labels.push(...data.labels); + } + if (labels.length === 0) return 0; + // Items of bazaars with different sheets: the large labels + const format = formats.size === 1 ? [...formats][0] : 'standard'; + await savePdf(buildLabelsPdf(labels, format, startAt), 'BazarPro-Etiketten.pdf'); + return labels.length; } diff --git a/src/locales/de/organizer.json b/src/locales/de/organizer.json index 8fdf33e6..a6cc4d32 100644 --- a/src/locales/de/organizer.json +++ b/src/locales/de/organizer.json @@ -305,7 +305,9 @@ "sortClash_one": "{{count}} Korb hat dasselbe Muster wie ein anderer und unterscheidet sich nur im Buchstaben.", "sortClash_other": "{{count}} Körbe haben dasselbe Muster wie ein anderer und unterscheiden sich nur im Buchstaben. Die Sortierblätter weisen darauf hin.", "sortClashNote": "Achtung: Ein anderer Korb hat dasselbe Muster. Achte auf den Buchstaben: Etiketten ohne Buchstabe gehören in den Korb ohne Buchstabe.", - "basketLabel": "Korb-Etikett drucken" + "basketLabel": "Korb-Etikett drucken", + "allLabels": "Alle Etiketten", + "allLabelsHint": "Die Artikel-Etiketten aller Verkäufer dieses Basars als ein PDF, Verkäufer für Verkäufer" }, "settle": { "seller": "Verkäufer", diff --git a/src/locales/en/organizer.json b/src/locales/en/organizer.json index b5d41766..c85cc924 100644 --- a/src/locales/en/organizer.json +++ b/src/locales/en/organizer.json @@ -305,7 +305,9 @@ "sortClash_one": "{{count}} basket has the same pattern as another one and differs by the letter only.", "sortClash_other": "{{count}} baskets have the same pattern as another one and differ by the letter only. The sorting sheets point this out.", "sortClashNote": "Note: another basket has the same pattern. Check the letter: labels without a letter belong in the basket without a letter.", - "basketLabel": "Print basket label" + "basketLabel": "Print basket label", + "allLabels": "All labels", + "allLabelsHint": "The item labels of all sellers of this bazaar as one PDF, seller by seller" }, "settle": { "seller": "Seller", diff --git a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx index e00c8058..6cba4560 100644 --- a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx +++ b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx @@ -1,3 +1,4 @@ +import { LabelPrintDialog } from '../../../../components/products/LabelPrintDialog'; import { downloadSortSheets } from '../../../../lib/sortSheetsPdf'; import { clashingSortCodes } from '../../../../shared/sortCode'; import { PageSkeleton } from '../../../../components/ui/loading'; @@ -47,6 +48,8 @@ import { BroadcastList } from '../../../../components/broadcasts/BroadcastList'; import { HelperPickerDialog } from '../../../../components/helpers/HelperPickerDialog'; import { Trans, useTranslation } from 'react-i18next'; +const NO_LABELS: Id<'products'>[] = []; + type SellerFilter = 'all' | 'open' | 'paid' | 'helpers'; export function SellerManagementPage() { @@ -58,6 +61,11 @@ export function SellerManagementPage() { const [walkInDialogOpen, setWalkInDialogOpen] = useState(false); const [broadcastOpen, setBroadcastOpen] = useState(false); const [helperPickerOpen, setHelperPickerOpen] = useState(false); + const [allLabelsOpen, setAllLabelsOpen] = useState(false); + const allLabelIds = useQuery( + api.labels.getEventLabelIds, + allLabelsOpen ? { eventId: eventId as Id<'events'> } : 'skip' + ); // State for Helper Dialogs const [helperAction, setHelperAction] = useState<{ @@ -170,6 +178,14 @@ export function SellerManagementPage() { > {t('sellers.walkIn')} + {sortSheetSellers.length > 0 && (
    {addressErrors && ( -

    + { (addressErrors.street?.message ?? addressErrors.postalCode?.message ?? addressErrors.city?.message) as string } -

    + )} @@ -318,9 +314,7 @@ export function EditEventBasicInfo({ className={lockDates ? 'opacity-60 cursor-not-allowed' : undefined} {...register('startDate')} /> - {errors.startDate && ( -

    {errors.startDate.message as string}

    - )} + {errors.startDate && {errors.startDate.message as string}}
    @@ -332,12 +326,10 @@ export function EditEventBasicInfo({ className={lockDates ? 'opacity-60 cursor-not-allowed' : undefined} {...register('endDate')} /> - {errors.endDate && ( -

    {errors.endDate.message as string}

    - )} + {errors.endDate && {errors.endDate.message as string}}
    {afterDates} -
    + ); } diff --git a/src/pages/organizer/events/components/EditEventCategories.tsx b/src/pages/organizer/events/components/EditEventCategories.tsx index a201ecd3..9b8568ec 100644 --- a/src/pages/organizer/events/components/EditEventCategories.tsx +++ b/src/pages/organizer/events/components/EditEventCategories.tsx @@ -1,3 +1,5 @@ +import { FormSection } from '../../../../components/ui/form-section'; +import { FieldError } from '../../../../components/ui/field-error'; import { useFormContext } from 'react-hook-form'; import { Label } from '../../../../components/ui/label'; import { Badge } from '../../../../components/ui/badge'; @@ -47,9 +49,7 @@ export function EditEventCategories({ categoryList }: EventCategoriesProbs) { }; return ( -
    -

    {t('categories.title')}

    - +
    @@ -67,9 +67,7 @@ export function EditEventCategories({ categoryList }: EventCategoriesProbs) { ); })}
    - {errors.categories && ( -

    {errors.categories.message as string}

    - )} + {errors.categories && {errors.categories.message as string}}
    @@ -87,6 +85,6 @@ export function EditEventCategories({ categoryList }: EventCategoriesProbs) { ))}
    - + ); } diff --git a/src/pages/organizer/events/components/EditEventContact.tsx b/src/pages/organizer/events/components/EditEventContact.tsx index 7bb6104e..c828d6e5 100644 --- a/src/pages/organizer/events/components/EditEventContact.tsx +++ b/src/pages/organizer/events/components/EditEventContact.tsx @@ -1,3 +1,5 @@ +import { FormSection } from '../../../../components/ui/form-section'; +import { FieldError } from '../../../../components/ui/field-error'; import { useFormContext } from 'react-hook-form'; import { Label } from '../../../../components/ui/label'; import { Textarea } from '../../../../components/ui/text-area'; @@ -23,9 +25,7 @@ export function EditEventContact({ } = useFormContext(); return ( -
    - {parts.includes('contact') &&

    {t('contact.title')}

    } - + {parts.includes('contact') && (
    @@ -35,9 +35,7 @@ export function EditEventContact({ placeholder={t('contact.placeholder')} rows={3} /> - {errors.contactInfo && ( -

    {errors.contactInfo.message as string}

    - )} + {errors.contactInfo && {errors.contactInfo.message as string}}
    )} @@ -56,11 +54,9 @@ export function EditEventContact({

    {feeLock ? feeLockHint(feeLock) : t('contact.commissionHint')}

    - {errors.commission && ( -

    {errors.commission.message as string}

    - )} + {errors.commission && {errors.commission.message as string}}
    )} - + ); } diff --git a/src/pages/organizer/events/components/EditEventFeatures.tsx b/src/pages/organizer/events/components/EditEventFeatures.tsx index bc2f4267..254fc8b4 100644 --- a/src/pages/organizer/events/components/EditEventFeatures.tsx +++ b/src/pages/organizer/events/components/EditEventFeatures.tsx @@ -1,3 +1,6 @@ +import { FormSection, FORM_ROWS } from '../../../../components/ui/form-section'; +import { NativeSelect } from '../../../../components/ui/native-select'; +import { FieldError } from '../../../../components/ui/field-error'; import type { ReactNode } from 'react'; import { Controller, useFormContext } from 'react-hook-form'; import { Checkbox } from '../../../../components/ui/checkbox'; @@ -37,7 +40,7 @@ function FeatureToggle({ const id = `feature-${name}`; return ( -
    +
    +

    {t('features.requiredFields')}

    {t('features.requiredFieldsText')}

    @@ -192,7 +195,7 @@ export function DiscountStartField() {

    {datesSet ? t('features.discountFromHint') : t('features.discountFromNeedsDates')}

    - {error &&

    {error.message}

    } + {error && {error.message}}
    ); } @@ -232,14 +235,11 @@ export function EditEventFeatures({ const show = (part: FeaturePart) => parts.includes(part); return ( -
    - {showHeader && ( -
    -

    {t('features.title')}

    -

    {t('features.intro')}

    -
    - )} - + {show('sale') && ( <> {featureErrors?.maxDiscountPercent && ( -

    - {featureErrors.maxDiscountPercent.message} -

    + {featureErrors.maxDiscountPercent.message} )}
    @@ -271,7 +269,7 @@ export function EditEventFeatures({ {/* The field is hidden once the discounts are off, its error must not be */} {!discounts && featureErrors?.maxDiscountPercent && ( -

    {featureErrors.maxDiscountPercent.message}

    + {featureErrors.maxDiscountPercent.message} )} -
    +
    {featureErrors?.maxItemsPerSeller && ( -

    {featureErrors.maxItemsPerSeller.message}

    + {featureErrors.maxItemsPerSeller.message} )}
    -
    +
    - +

    {t('features.labelsHint')}

    @@ -388,7 +386,7 @@ export function EditEventFeatures({ )} {show('fees') && ( -
    +
    {feeLock ? feeLockHint(feeLock) : t('features.intakeFeeHint')}

    - {featureErrors?.intakeFee && ( -

    {featureErrors.intakeFee.message}

    - )} + {featureErrors?.intakeFee && {featureErrors.intakeFee.message}}
    )} {show('sale') &&

    {t('features.payOnSite')}

    } -
    + ); } diff --git a/src/pages/organizer/events/components/EditEventMapSection.tsx b/src/pages/organizer/events/components/EditEventMapSection.tsx index a7452bf4..7e933a37 100644 --- a/src/pages/organizer/events/components/EditEventMapSection.tsx +++ b/src/pages/organizer/events/components/EditEventMapSection.tsx @@ -1,3 +1,4 @@ +import { FormSection } from '../../../../components/ui/form-section'; import { useState, type ChangeEvent, type KeyboardEvent } from 'react'; import { useFormContext } from 'react-hook-form'; import { useMutation, useQuery } from '../../../../lib/api/react'; @@ -252,10 +253,10 @@ export function EditEventMapSection({ }; return ( -
    -

    {allowMapImage ? t('map.title') : t('map.categories')}

    - {allowMapImage &&

    {t('map.intro')}

    } - + {allowMapImage && (
    @@ -285,6 +286,6 @@ export function EditEventMapSection({ /> )}
    -
    + ); } diff --git a/src/pages/organizer/events/components/EditEventSellerInfo.tsx b/src/pages/organizer/events/components/EditEventSellerInfo.tsx index e795fcf9..aba1a5e8 100644 --- a/src/pages/organizer/events/components/EditEventSellerInfo.tsx +++ b/src/pages/organizer/events/components/EditEventSellerInfo.tsx @@ -1,3 +1,4 @@ +import { FormSection } from '../../../../components/ui/form-section'; import { useFormContext } from 'react-hook-form'; import { Input } from '../../../../components/ui/input'; import { Label } from '../../../../components/ui/label'; @@ -48,11 +49,7 @@ export function EditEventSellerInfo() { : null; return ( -
    -
    -

    {t('logistics.title')}

    -

    {t('logistics.intro')}

    -
    +
    {TIME_FIELDS.map((field) => (
    @@ -94,6 +91,6 @@ export function EditEventSellerInfo() {
    )} -
    +
    ); } diff --git a/src/pages/public/notifications/UnsubscribePage.tsx b/src/pages/public/notifications/UnsubscribePage.tsx index 3becf86a..d18bbafd 100644 --- a/src/pages/public/notifications/UnsubscribePage.tsx +++ b/src/pages/public/notifications/UnsubscribePage.tsx @@ -1,3 +1,4 @@ +import { FieldError } from '../../../components/ui/field-error'; import { useState } from 'react'; import { Link, useSearchParams } from 'react-router-dom'; import { useMutation, useQuery } from '../../../lib/api/react'; @@ -75,7 +76,7 @@ export function UnsubscribePage() { > {t('unsubscribe.confirm')} - {error &&

    {error}

    } + {error && {error}} )} {info?.canLogIn && ( diff --git a/src/pages/seller/products/components/MyProductBasicInfo.tsx b/src/pages/seller/products/components/MyProductBasicInfo.tsx index 211e3c34..5bc1dc4b 100644 --- a/src/pages/seller/products/components/MyProductBasicInfo.tsx +++ b/src/pages/seller/products/components/MyProductBasicInfo.tsx @@ -1,3 +1,4 @@ +import { FieldError } from '../../../../components/ui/field-error'; import { useFormContext } from 'react-hook-form'; import { categoryName } from '../../../../i18n/categories'; import { Label } from '../../../../components/ui/label'; @@ -66,7 +67,7 @@ export function MyProductBasicInfo({ {...register('title')} placeholder={t('form.namePlaceholder')} /> - {errors.title &&

    {errors.title.message as string}

    } + {errors.title && {errors.title.message as string}}
    @@ -77,9 +78,7 @@ export function MyProductBasicInfo({ placeholder={t('form.descriptionPlaceholder')} rows={4} /> - {errors.description && ( -

    {errors.description.message as string}

    - )} + {errors.description && {errors.description.message as string}}
    @@ -100,9 +99,7 @@ export function MyProductBasicInfo({ ))} - {errors.condition && ( -

    {errors.condition.message as string}

    - )} + {errors.condition && {errors.condition.message as string}}
    @@ -123,9 +120,7 @@ export function MyProductBasicInfo({ ))} - {errors.categoryId && ( -

    {errors.categoryId.message as string}

    - )} + {errors.categoryId && {errors.categoryId.message as string}}
    @@ -142,7 +137,7 @@ export function MyProductBasicInfo({ {...register('price', { valueAsNumber: true })} placeholder="0.00" /> - {errors.price &&

    {errors.price.message as string}

    } + {errors.price && {errors.price.message as string}}
    diff --git a/src/pages/seller/products/components/MyProductEditImages.tsx b/src/pages/seller/products/components/MyProductEditImages.tsx index c6ce2f7f..89d2283f 100644 --- a/src/pages/seller/products/components/MyProductEditImages.tsx +++ b/src/pages/seller/products/components/MyProductEditImages.tsx @@ -1,3 +1,4 @@ +import { FieldError } from '../../../../components/ui/field-error'; import { useFormContext } from 'react-hook-form'; import { Label } from '../../../../components/ui/label'; import { ImageUpload } from '../../../../components/ui/ImageUpload'; @@ -56,7 +57,7 @@ export function MyProductEditImages({ initialImageUrls={existingImageUrls} onRemoveExistingImage={handleRemoveExistingImage} /> - {imageError &&

    {String(imageError)}

    } + {imageError && {String(imageError)}}
    ); diff --git a/src/pages/seller/products/components/MyProductExtras.tsx b/src/pages/seller/products/components/MyProductExtras.tsx index d3f5b045..e3e6a556 100644 --- a/src/pages/seller/products/components/MyProductExtras.tsx +++ b/src/pages/seller/products/components/MyProductExtras.tsx @@ -1,3 +1,4 @@ +import { FieldError } from '../../../../components/ui/field-error'; import { Controller, useFormContext } from 'react-hook-form'; import { useQuery } from '../../../../lib/api/react'; import { api } from '../../../../lib/api/functions'; @@ -47,7 +48,7 @@ export function MyProductCategoryFields({ {...register(`attributes.${field.key}`)} /> {fieldErrors?.[field.key]?.message ? ( -

    {fieldErrors[field.key].message}

    + {fieldErrors[field.key].message} ) : ( categoryFieldText(field, 'hint') && (

    {categoryFieldText(field, 'hint')}

    @@ -116,9 +117,7 @@ export function MyProductNegotiation({ allowOffers = true }: { allowOffers?: boo })} />

    {t('form.minimumHint')}

    - {errors.minimumPrice && ( -

    {errors.minimumPrice.message as string}

    - )} + {errors.minimumPrice && {errors.minimumPrice.message as string}}
    ); From 7a4bae60799cf51180c78633826754be663c45fe Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Thu, 5 Nov 2026 03:29:53 +0100 Subject: [PATCH 39/58] feat(nav): one navigation list, tab bar on phones, area switch on top Sidebar and tab bar read the same list. The area switch moves to the top of the menu, because it decides what the menu below is about. Co-Authored-By: Claude Opus 5.5 --- src/components/layout/BottomNav.tsx | 81 +++++ src/components/layout/Header.tsx | 3 +- src/components/layout/ResponsiveSidebar.tsx | 27 +- src/components/layout/Sidebar.tsx | 359 +++++--------------- src/components/layout/useNavigation.ts | 232 +++++++++++++ 5 files changed, 427 insertions(+), 275 deletions(-) create mode 100644 src/components/layout/BottomNav.tsx create mode 100644 src/components/layout/useNavigation.ts diff --git a/src/components/layout/BottomNav.tsx b/src/components/layout/BottomNav.tsx new file mode 100644 index 00000000..80da60c0 --- /dev/null +++ b/src/components/layout/BottomNav.tsx @@ -0,0 +1,81 @@ +import { Menu } from 'lucide-react'; +import { useTranslation } from 'react-i18next'; +import { useNavigate } from 'react-router-dom'; +import type { UserRole } from '../../context/UserRoleContext'; +import { useSidebar } from '../../context/SidebarContext'; +import type { Id } from '../../lib/api/types'; +import { cn } from '../../lib/utils'; +import { isActivePage, useNavigation } from './useNavigation'; + +const TAB_CLASS = + 'relative flex min-w-0 flex-1 flex-col items-center gap-0.5 px-1 pb-1.5 pt-2 text-[11px] font-medium text-muted-foreground transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring'; + +/** On phones: the main pages one tap away with the thumb, the rest behind "Menü". */ +export function BottomNav({ + role, + isAdmin, + currentPage, + eventId, +}: { + role: UserRole; + isAdmin: boolean; + currentPage: string; + eventId?: Id<'events'>; +}) { + const { t } = useTranslation(); + const navigate = useNavigate(); + const { setMobileSidebarOpen } = useSidebar(); + const { tabs, mainItems, eventItems } = useNavigation({ role, isAdmin, eventId }); + const allItems = [...mainItems, ...eventItems]; + // Whatever waits behind the menu must not stay hidden there + const waitingInMenu = allItems + .filter((item) => !item.tab) + .reduce((sum, item) => sum + (item.badge ?? 0), 0); + + return ( + + ); +} + +function Dot() { + return ( + + ); +} diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx index 8f97bafc..b09f8ef6 100644 --- a/src/components/layout/Header.tsx +++ b/src/components/layout/Header.tsx @@ -174,7 +174,8 @@ export function Header() { -
    + {/* With the sidebar or the phone's tab bar the menu is already there */} +
    + ); + })} +
    - + )} - {/* User Actions Section */} - -
    - {showRoleSwitch && ( -
    -
    {t('menu.switchRole')}
    - {canOrganize && ( - - )} - - {isAdmin && ( - + {eventTitle} +
    )} + {eventItems.map(renderItem)}
    )} - + ); } -interface MenuItem { - icon: LucideIcon; - label: string; - page: string; - badge?: number; - badgeLabel?: BadgeKind; +function roleBadgeFor(role: UserRole, current: UserRole, badges: Record) { + return role === current ? 0 : badges[role]; } -type BadgeKind = - | 'notifications' - | 'sales' - | 'reports' - | 'approvals' - | 'messages' - | 'organizerMessages'; - /** Small counter at the end of a menu entry, e.g. events waiting for approval. */ function PendingBadge({ count, kind }: { count: number; kind: BadgeKind }) { const { t } = useTranslation(); diff --git a/src/components/layout/useNavigation.ts b/src/components/layout/useNavigation.ts new file mode 100644 index 00000000..391a378a --- /dev/null +++ b/src/components/layout/useNavigation.ts @@ -0,0 +1,232 @@ +import { + Banknote, + Box, + Calendar, + FileText, + Flag, + Home, + Inbox, + LayoutDashboard, + LayoutGrid, + Package, + Receipt, + Scale, + ScrollText, + Search, + Settings, + ShoppingCart, + Tags, + Users, + type LucideIcon, +} from 'lucide-react'; +import { useEffect } from 'react'; +import { useTranslation } from 'react-i18next'; +import { useUserRole, type UserRole } from '../../context/UserRoleContext'; +import { useInstanceConfig } from '../../hooks/useInstanceConfig'; +import { api } from '../../lib/api/functions'; +import { useQuery } from '../../lib/api/react'; +import type { Id } from '../../lib/api/types'; + +export type BadgeKind = + | 'notifications' + | 'sales' + | 'reports' + | 'approvals' + | 'messages' + | 'organizerMessages'; + +export interface NavItem { + icon: LucideIcon; + label: string; + /** Shorter name in the phone's tab bar */ + tabLabel?: string; + page: string; + badge?: number; + badgeLabel?: BadgeKind; + /** Also in the phone's tab bar; the rest stays behind "Menü" */ + tab?: boolean; + onboardingId?: string; +} + +/** + * Everything one can navigate to, by role: the one list behind the sidebar and the phone's + * tab bar. `roleBadges` are what waits in the other roles, for the role switch. + */ +export function useNavigation({ + role, + isAdmin, + eventId, +}: { + role: UserRole; + isAdmin: boolean; + eventId?: Id<'events'>; +}) { + const { t } = useTranslation(); + const { changeRole } = useUserRole(); + const { isSingle } = useInstanceConfig(); + // A self-hosted association approves nothing: its admins create the bazaars + const pendingApprovals = + useQuery(api.events.countPendingApprovals, isAdmin && !isSingle ? {} : 'skip') ?? 0; + const access = useQuery(api.instance.getMyAccess, {}); + const canOrganize = access?.canOrganize ?? !isSingle; + const adminCounts = useQuery(api.moderation.getMenuCounts, isAdmin ? {} : 'skip'); + const notices = useQuery(api.notifications.getUnreadNoticeCounts, {}); + + // Without access, a remembered organizer role falls back to participant + useEffect(() => { + if (access && !access.canOrganize && role === 'organizer') { + changeRole('participant'); + } + }, [access, role, changeRole]); + + const overview: NavItem = { icon: Home, label: t('menu.overview'), page: '/', tab: true }; + + const participantItems: NavItem[] = [ + overview, + { + icon: Package, + label: t('menu.myProducts'), + tabLabel: t('menu.products'), + page: '/my-products', + badge: notices?.products ?? 0, + badgeLabel: 'notifications', + tab: true, + }, + { + icon: Receipt, + label: t('menu.mySales'), + tabLabel: t('menu.sales'), + page: '/my-sales', + badge: notices?.sales ?? 0, + badgeLabel: 'sales', + tab: true, + }, + { + icon: Search, + label: isSingle ? t('menu.currentBazaar') : t('menu.events'), + tabLabel: t('menu.events'), + page: '/browse-events', + badge: notices?.messages ?? 0, + badgeLabel: 'organizerMessages', + tab: true, + onboardingId: 'sidebar-events-search', + }, + ]; + + // Organizers choose their bazaar in the overview; its pages follow below it + const organizerItems: NavItem[] = [ + { + icon: LayoutGrid, + label: t('menu.allBazaars'), + page: '/', + badge: notices?.events ?? 0, + badgeLabel: 'notifications', + // On a phone the bazaar's own pages take the bar, once there is one + tab: !eventId, + }, + ]; + + const adminItems: NavItem[] = [ + // The overview shows the admin overview in this role (src/pages/dashboard) + overview, + { + icon: Flag, + label: t('menu.reports'), + page: '/admin/reports', + badge: adminCounts?.openReports ?? 0, + badgeLabel: 'reports', + tab: true, + }, + { icon: FileText, label: t('menu.content'), page: '/admin/content' }, + { + icon: Calendar, + label: t('menu.events'), + page: '/admin/events', + badge: pendingApprovals, + badgeLabel: 'approvals', + tab: true, + }, + { icon: Users, label: t('menu.users'), page: '/admin/users', tab: true }, + { + icon: Inbox, + label: t('menu.messages'), + page: '/admin/messages', + badge: adminCounts?.unhandledMessages ?? 0, + badgeLabel: 'messages', + }, + { icon: ScrollText, label: t('menu.log'), page: '/admin/log' }, + { icon: Tags, label: t('menu.categories'), page: '/admin/categories' }, + { icon: Scale, label: t('menu.legalPages'), page: '/admin/pages' }, + { icon: Settings, label: t('menu.settings'), page: '/admin/settings' }, + ]; + + const eventItems: NavItem[] = eventId + ? [ + { + icon: LayoutDashboard, + label: t('menu.dashboard'), + page: `/events/view/${eventId}`, + tab: true, + }, + { + icon: Users, + label: t('menu.participants'), + page: `/events/view/${eventId}/sellers`, + tab: true, + }, + { + icon: Box, + label: t('menu.products'), + page: `/events/view/${eventId}/products`, + tab: true, + }, + { + icon: ShoppingCart, + label: t('menu.checkout'), + page: `/events/view/${eventId}/checkout`, + tab: true, + }, + { icon: Banknote, label: t('menu.cash'), page: `/events/view/${eventId}/cash` }, + { icon: Settings, label: t('menu.settings'), page: `/events/view/${eventId}/settings` }, + ] + : []; + + const mainItems = + role === 'organizer' + ? organizerItems + : role === 'administrator' + ? adminItems + : participantItems; + + const participantNotices = + (notices?.products ?? 0) + (notices?.sales ?? 0) + (notices?.messages ?? 0); + const organizerNotices = notices?.events ?? 0; + + return { + mainItems, + eventItems, + tabs: [...mainItems, ...eventItems].filter((item) => item.tab), + canOrganize, + roleBadges: { + participant: participantNotices, + organizer: organizerNotices, + administrator: pendingApprovals, + } satisfies Record, + }; +} + +/** Whether a menu entry belongs to the page shown; sub-pages count, e.g. a new item. */ +export function isActivePage(item: NavItem, currentPage: string, allPages: NavItem[]): boolean { + if (item.page === currentPage) return true; + if (item.page === '/') return false; + // The most specific entry wins: the bazaar's overview is not active on its sub-pages + return ( + currentPage.startsWith(`${item.page}/`) && + !allPages.some( + (other) => + other !== item && + other.page.startsWith(`${item.page}/`) && + currentPage.startsWith(other.page) + ) + ); +} From 2c47d2323a323e6a201520a4659526216e9b90f1 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Thu, 5 Nov 2026 03:29:53 +0100 Subject: [PATCH 40/58] feat(events): settings and editing on one page, focused wizard Wizard and settings render the same sections. The wizard runs without the sidebar and keeps its buttons in reach; the old edit address redirects. Shared hook for event access and helper for the approval state. Co-Authored-By: Claude Opus 5.5 --- src/App.tsx | 18 +- src/components/events/EventApprovalBadge.tsx | 17 + src/hooks/useEventAccess.ts | 19 + src/lib/eventApproval.ts | 13 + src/pages/organizer/events/EditEventForm.tsx | 328 +++++++++++------- .../events/dashboard/SettingsPage.tsx | 135 ++++--- 6 files changed, 336 insertions(+), 194 deletions(-) create mode 100644 src/components/events/EventApprovalBadge.tsx create mode 100644 src/hooks/useEventAccess.ts create mode 100644 src/lib/eventApproval.ts diff --git a/src/App.tsx b/src/App.tsx index fab10834..5ffecc3a 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -140,9 +140,22 @@ function PublicEventWrapper() { ); } +function EditEventRedirect() { + const { eventId } = useParams(); + return ; +} + function AppToaster() { const { resolvedTheme } = useTheme(); - return ; + // On phones above the tab bar + return ( + + ); } function ScrollToTop() { @@ -281,7 +294,8 @@ function App() { {/* Old address: the organizer's events are in their overview now */} } /> - } /> + {/* Old address: editing is part of the settings now */} + } /> } diff --git a/src/components/events/EventApprovalBadge.tsx b/src/components/events/EventApprovalBadge.tsx new file mode 100644 index 00000000..736e612c --- /dev/null +++ b/src/components/events/EventApprovalBadge.tsx @@ -0,0 +1,17 @@ +import { useTranslation } from 'react-i18next'; +import { eventApproval } from '../../lib/eventApproval'; +import { Badge } from '../ui/badge'; + +/** Whether a public bazaar has passed the platform's check; nothing for the others. */ +export function EventApprovalBadge({ event }: { event: Parameters[0] }) { + const { t } = useTranslation('organizer'); + const approval = eventApproval(event); + if (approval === 'rejected') { + return {t('settingsPage.rejected')}; + } + if (approval === 'pending') return {t('settingsPage.pending')}; + if (approval === 'approved') { + return {t('settingsPage.approved')}; + } + return null; +} diff --git a/src/hooks/useEventAccess.ts b/src/hooks/useEventAccess.ts new file mode 100644 index 00000000..62fff1a0 --- /dev/null +++ b/src/hooks/useEventAccess.ts @@ -0,0 +1,19 @@ +import { api } from '../lib/api/functions'; +import { useQuery } from '../lib/api/react'; +import type { Id } from '../lib/api/types'; + +/** What the signed-in user may do at a bazaar; the backend checks the same again. */ +export function useEventAccess(eventId: Id<'events'>) { + const roles = useQuery(api.eventRoles.getMyRolesForEvent, { eventId }); + const viewer = useQuery(api.users.viewer); + const isOrganizer = (roles ?? []).includes('organizer'); + return { + /** Still loading: not known yet whether the user may be here */ + isLoading: roles === undefined, + isOrganizer, + /** Organizer or helper: runs the bazaar */ + canManage: isOrganizer || (roles ?? []).includes('coorganizer'), + /** Writing to all sellers and appointing helpers: not for helpers themselves */ + canLead: isOrganizer || viewer?.systemRole === 'admin', + }; +} diff --git a/src/lib/eventApproval.ts b/src/lib/eventApproval.ts new file mode 100644 index 00000000..c4459a53 --- /dev/null +++ b/src/lib/eventApproval.ts @@ -0,0 +1,13 @@ +export type EventApproval = 'approved' | 'pending' | 'rejected'; + +/** Public bazaars are checked by the platform; the others need no approval (`null`). */ +export function eventApproval(event: { + visibility: string; + approvalStatus?: string; + isApproved?: boolean; +}): EventApproval | null { + if (event.visibility !== 'public') return null; + if (event.approvalStatus === 'rejected') return 'rejected'; + if (event.approvalStatus === 'pending' || event.isApproved === false) return 'pending'; + return 'approved'; +} diff --git a/src/pages/organizer/events/EditEventForm.tsx b/src/pages/organizer/events/EditEventForm.tsx index 0c839a51..b318463f 100644 --- a/src/pages/organizer/events/EditEventForm.tsx +++ b/src/pages/organizer/events/EditEventForm.tsx @@ -1,11 +1,12 @@ import { PageHeader } from '../../../components/ui/page-header'; -import { useEffect, useMemo, useRef, useState } from 'react'; +import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react'; import { get, useForm, FormProvider, useFormContext } from 'react-hook-form'; import { useNavigate, useParams, useSearchParams } from 'react-router-dom'; import { zodResolver } from '@hookform/resolvers/zod'; import { z } from 'zod'; -import { Eye } from 'lucide-react'; +import { Eye, X } from 'lucide-react'; import { Button } from '../../../components/ui/button'; +import { StickyActionBar } from '../../../components/ui/sticky-action-bar'; import { useApiClient, useAuthState, useMutation, useQuery } from '../../../lib/api/react'; import { api } from '../../../lib/api/functions'; import type { Doc, Id } from '../../../lib/api/types'; @@ -18,6 +19,7 @@ import { EditEventMapSection } from './components/EditEventMapSection'; import { DiscountStartField, EditEventFeatures } from './components/EditEventFeatures'; import { EditEventSellerInfo } from './components/EditEventSellerInfo'; import { logisticsFromForm } from '../../../lib/sellerLogistics'; +import type { FeeLock } from '../../../lib/sellerFees'; import { MAX_DISCOUNT_PERCENT, resolveEventFeatures, @@ -397,11 +399,33 @@ const WIZARD_STEPS = [ ] as const; type WizardStepId = (typeof WIZARD_STEPS)[number]['id']; -function WizardHeader({ step, onGoTo }: { step: number; onGoTo: (step: number) => void }) { +function WizardHeader({ + step, + onGoTo, + onCancel, + disabled, +}: { + step: number; + onGoTo: (step: number) => void; + onCancel: () => void; + disabled: boolean; +}) { const { t } = useTranslation('organizer'); const id = WIZARD_STEPS[step].id; return ( -
    +
    +
    +

    + {t('form.newTitle')} +

    + + {t('wizard.progress', { step: step + 1, total: WIZARD_STEPS.length })} + + +
      {WIZARD_STEPS.map((candidate, index) => (
    1. @@ -411,6 +435,7 @@ function WizardHeader({ step, onGoTo }: { step: number; onGoTo: (step: number) = onClick={() => onGoTo(index)} disabled={index >= step} aria-current={index === step ? 'step' : undefined} + aria-label={t(`wizard.short.${candidate.id}`)} className="group w-full text-left disabled:cursor-default" > ))}
    -

    - {t('wizard.progress', { step: step + 1, total: WIZARD_STEPS.length })} -

    -

    {t(`wizard.steps.${id}.title`)}

    -

    {t(`wizard.steps.${id}.text`)}

    +
    +

    {t(`wizard.steps.${id}.title`)}

    +

    {t(`wizard.steps.${id}.text`)}

    +
    ); } +/** The sections of the edit page, in the order of the wizard's steps. */ +const EDIT_SECTIONS = ['basics', 'sale', 'items', 'fees', 'registration', 'logistics'] as const; +type EventSectionId = (typeof EDIT_SECTIONS)[number]; + +/** + * One group of settings: the wizard shows them step by step, the edit page all at once. + * Own pictures and locks exist only for an event that is already there (`editing`). + */ +function EventSection({ + id, + categories, + pendingLocationCategories, + onPendingLocationCategoriesChange, + editing, +}: { + id: EventSectionId; + categories: Doc<'categories'>[]; + pendingLocationCategories: string[]; + onPendingLocationCategoriesChange: (labels: string[]) => void; + editing?: { + eventId: Id<'events'>; + coverImageUrl?: string | null; + eventMapImageUrl?: string | null; + isRunning: boolean; + feeLock: FeeLock; + }; +}) { + const { watch } = useFormContext(); + const discounts = watch('features.discounts'); + const feeLock = editing?.feeLock ?? null; + switch (id) { + case 'basics': + return ( + <> + : undefined} + /> + + + + ); + case 'sale': + return ( + + ); + case 'items': + return ( + <> + + + + ); + case 'fees': + return ( + <> + + + + ); + case 'registration': + return ( + <> + + + + ); + case 'logistics': + return ; + } +} + /** Last step: the bazaar page as visitors will see it, and the key facts. */ function WizardFinal({ type }: { type?: EventType }) { const { t } = useTranslation('organizer'); @@ -500,7 +605,7 @@ function StepPreview({ id, type }: { id: WizardStepId; type?: EventType }) { } } -export function EditEventForm() { +export function EditEventForm({ after }: { after?: ReactNode } = {}) { const { t } = useTranslation('organizer'); const navigate = useNavigate(); const createEvent = useMutation(api.events.createEvent); @@ -686,6 +791,16 @@ export function EditEventForm() { if (index >= 0) setStep(index); toast.error(t('wizard.fixErrors')); }; + // The edit page shows everything: the first error may be far off the screen + const showFirstInvalidSection = (errors: Record) => { + const invalid = WIZARD_STEPS.find((candidate) => + candidate.fields.some((field) => get(errors, field)) + ); + if (invalid) { + document.getElementById(`section-${invalid.id}`)?.scrollIntoView?.({ behavior: 'smooth' }); + } + toast.error(t('wizard.fixErrors')); + }; const keepDraft = (draftStep: number, submitted = false) => saveEventDraft({ values: draftValues(methods.getValues()), @@ -921,10 +1036,7 @@ export function EditEventForm() {
    - + {isEditing && } {!isEventCreationEnabled && !isEditing && ( @@ -934,56 +1046,68 @@ export function EditEventForm() { {isEditing ? ( - -
    + {isRunning && ( + + {t('form.running')} + + )} + {/* Long page: its parts are one tap away, in the order of the wizard */} +
    + {EDIT_SECTIONS.map((id) => ( + + ))} + + {EDIT_SECTIONS.map((id) => ( +
    +
    +

    + {t(`wizard.steps.${id}.title`)} +

    +
    + +
    + ))} -
    - - -
    + {isDirty && ( + {t('form.unsaved')} + )} + ) : (
    )} - void goToStep(index)} /> + void goToStep(index)} + onCancel={() => { + clearEventDraft(); + navigate('/'); + }} + disabled={isSubmitting} + />
    )} - {stepId === 'sale' && ( - )} - {stepId === 'items' && ( - <> - - - - )} - {stepId === 'fees' && ( - <> - - - - )} - {stepId === 'registration' && ( - <> - - - - )} - {stepId === 'basics' && ( - <> - : undefined - } - /> - - - - )} - {stepId === 'logistics' && } {stepId === 'preview' && (
    @@ -1104,12 +1202,11 @@ export function EditEventForm() { )}
    -
    + {step > 0 && ( )} - -
    + )} + {after}
    diff --git a/src/pages/organizer/events/dashboard/SettingsPage.tsx b/src/pages/organizer/events/dashboard/SettingsPage.tsx index d437261a..76648ec0 100644 --- a/src/pages/organizer/events/dashboard/SettingsPage.tsx +++ b/src/pages/organizer/events/dashboard/SettingsPage.tsx @@ -8,7 +8,11 @@ import type { Id } from '../../../../lib/api/types'; import { toast } from 'sonner'; import { getUserFacingErrorMessage } from '../../../../lib/errors'; import { useEffect } from 'react'; -import { Badge } from '../../../../components/ui/badge'; +import { EventApprovalBadge } from '../../../../components/events/EventApprovalBadge'; +import { useEventAccess } from '../../../../hooks/useEventAccess'; +import { eventApproval } from '../../../../lib/eventApproval'; +import { FormSection } from '../../../../components/ui/form-section'; +import { EditEventForm } from '../EditEventForm'; import { EventSettingsSummary } from './components/EventSettingsSummary'; import { useTranslation } from 'react-i18next'; import { PageSkeleton } from '../../../../components/ui/loading'; @@ -21,16 +25,13 @@ export function SettingsPage() { const deleteEvent = useMutation(api.events.deleteEvent); const event = useQuery(api.events.getEvent, { id: eventId }); - const myRoles = useQuery(api.eventRoles.getMyRolesForEvent, { eventId }); - const canManage = - (myRoles ?? []).includes('organizer') || (myRoles ?? []).includes('coorganizer'); - const isOrganizer = (myRoles ?? []).includes('organizer'); + const { isLoading, canManage, isOrganizer } = useEventAccess(eventId); useEffect(() => { - if (myRoles !== undefined && !canManage) { + if (!isLoading && !canManage) { navigate('/', { replace: true }); } - }, [myRoles, canManage, navigate]); + }, [isLoading, canManage, navigate]); if (event === null) { return ( @@ -39,15 +40,13 @@ export function SettingsPage() {
    ); } - if (myRoles === undefined || !event || !canManage) { + if (isLoading || !event || !canManage) { return ; } - const approvalStatus = event.approvalStatus; - const isPublic = event.visibility === 'public'; - const isRejected = isPublic && approvalStatus === 'rejected'; - const isPending = isPublic && (approvalStatus === 'pending' || event.isApproved === false); - const isApproved = isPublic && approvalStatus === 'approved'; + const approvalState = eventApproval(event); + const isRejected = approvalState === 'rejected'; + const isPending = approvalState === 'pending'; const handleDelete = async () => { try { @@ -62,67 +61,61 @@ export function SettingsPage() { } }; - return ( -
    -
    - + const approval = approvalState && ( +
    +
    +
    {t('settingsPage.approval')}
    + +
    + {isRejected && event.rejectionReason && ( +
    + {t('settingsPage.reason', { reason: event.rejectionReason })} +
    + )} + {isPending && ( +
    {t('settingsPage.reviewing')}
    + )} +
    + ); -
    -
    - -
    - {event.endDate < Date.now() && ( -

    {t('settingsPage.ended')}

    - )} - {isPublic && ( -
    -
    -
    {t('settingsPage.approval')}
    - {isApproved && {t('settingsPage.approved')}} - {isPending && {t('settingsPage.pending')}} - {isRejected && {t('settingsPage.rejected')}} -
    - {isRejected && event.rejectionReason && ( -
    - {t('settingsPage.reason', { reason: event.rejectionReason })} -
    - )} - {isPending && ( -
    - {t('settingsPage.reviewing')} -
    - )} -
    - )} -
    - - - {t('settingsPage.delete')} - - } - title={t('settingsPage.deleteTitle')} - description={t('settingsPage.deleteText')} - confirmLabel={t('settingsPage.deleteConfirm')} - onConfirm={handleDelete} - destructive - /> + const deletion = isOrganizer && ( + + {t('settingsPage.delete')}} + title={t('settingsPage.deleteTitle')} + description={t('settingsPage.deleteText')} + confirmLabel={t('settingsPage.deleteConfirm')} + onConfirm={handleDelete} + destructive + /> + + ); + + // Who may change the settings changes them right here; everybody else reads them + if (isOrganizer && event.endDate >= Date.now()) { + return ( + + {approval} + {deletion}
    -
    + } + /> + ); + } + + return ( +
    + + {event.endDate < Date.now() && ( +

    {t('settingsPage.ended')}

    + )} +
    +
    + {approval} + {deletion}
    ); } From 30cad8822d811534bacdb6afc34543ac04ce419e Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Thu, 5 Nov 2026 03:29:53 +0100 Subject: [PATCH 41/58] feat(dashboard): next steps instead of tiles that repeat the menu Sellers and organizers see the way through a bazaar and what is due now. Sellers page: adding and printing move into menus, messages live here only. Co-Authored-By: Claude Opus 5.5 --- src/components/broadcasts/Broadcasts.test.tsx | 36 --- .../broadcasts/RecentBroadcastsCard.tsx | 84 ------ src/components/ui/next-steps.tsx | 74 +++++ src/pages/dashboard/DashboardPage.tsx | 283 +++++++----------- .../events/EventManagementDashboard.tsx | 114 ++++--- .../dashboard/ProductManagementPage.tsx | 7 +- .../events/dashboard/SellerManagementPage.tsx | 224 +++++++------- .../PublicProductOrganizerActions.tsx | 4 +- 8 files changed, 373 insertions(+), 453 deletions(-) delete mode 100644 src/components/broadcasts/RecentBroadcastsCard.tsx create mode 100644 src/components/ui/next-steps.tsx diff --git a/src/components/broadcasts/Broadcasts.test.tsx b/src/components/broadcasts/Broadcasts.test.tsx index 36be0245..02a6deff 100644 --- a/src/components/broadcasts/Broadcasts.test.tsx +++ b/src/components/broadcasts/Broadcasts.test.tsx @@ -6,7 +6,6 @@ import { getFunctionName } from '../../lib/api/functions'; import type { Id } from '../../lib/api/types'; import { BroadcastDialog } from './BroadcastDialog'; import { BroadcastList } from './BroadcastList'; -import { RecentBroadcastsCard } from './RecentBroadcastsCard'; import { SellerBroadcasts } from './SellerBroadcasts'; vi.mock('../../lib/api/react', () => ({ useQuery: vi.fn(), useMutation: vi.fn() })); @@ -126,38 +125,3 @@ describe('SellerBroadcasts', () => { expect(screen.getByText('Abholung bis 16 Uhr').parentElement).toHaveTextContent('Neu'); }); }); - -describe('RecentBroadcastsCard', () => { - beforeEach(() => { - vi.mocked(useMutation).mockReturnValue(send as unknown as ReturnType); - }); - - it('shows the latest messages; only the organizer can write', () => { - mockQueries({ - 'broadcasts.listEventBroadcasts': MESSAGES.map((message) => ({ - ...message, - audience: 'pickup', - recipientCount: 4, - })), - }); - const onShowAll = vi.fn(); - const { rerender } = render( - - ); - expect(screen.getByText('Abholung bis 16 Uhr')).toBeInTheDocument(); - expect(screen.getAllByText(/an 4 Verkäufer \(mit abzuholenden Artikeln\)/)).toHaveLength(2); - expect(screen.queryByRole('button', { name: /Nachricht an Verkäufer/ })).toBeNull(); - fireEvent.click(screen.getByRole('button', { name: /Alle Nachrichten/ })); - expect(onShowAll).toHaveBeenCalled(); - - rerender(); - expect(screen.getByRole('button', { name: /Nachricht an Verkäufer/ })).toBeInTheDocument(); - }); - - it('explains the messages while there are none', () => { - mockQueries({ 'broadcasts.listEventBroadcasts': [] }); - render(); - expect(screen.getByText(/Noch keine Nachrichten verschickt/)).toBeInTheDocument(); - expect(screen.queryByRole('button', { name: /Alle Nachrichten/ })).toBeNull(); - }); -}); diff --git a/src/components/broadcasts/RecentBroadcastsCard.tsx b/src/components/broadcasts/RecentBroadcastsCard.tsx deleted file mode 100644 index 57401f12..00000000 --- a/src/components/broadcasts/RecentBroadcastsCard.tsx +++ /dev/null @@ -1,84 +0,0 @@ -import { useState } from 'react'; -import { useQuery } from '../../lib/api/react'; -import { AlertTriangle, ChevronRight, Megaphone } from 'lucide-react'; -import { api } from '../../lib/api/functions'; -import type { Id } from '../../lib/api/types'; -import { Button } from '../ui/button'; -import { useTranslation } from 'react-i18next'; -import { dateLocale } from '../../i18n/format'; -import { BroadcastDialog } from './BroadcastDialog'; - -const SHOWN = 3; - -/** - * The latest messages to the sellers on the event dashboard, with the button to write - * one (organizer only). The full log is on the participants page. - */ -export function RecentBroadcastsCard({ - eventId, - canSend, - onShowAll, -}: { - eventId: Id<'events'>; - canSend: boolean; - onShowAll: () => void; -}) { - const { t } = useTranslation(); - const broadcasts = useQuery(api.broadcasts.listEventBroadcasts, { eventId }); - const [open, setOpen] = useState(false); - if (broadcasts === undefined) return null; - - return ( -
    -
    -

    - {t('broadcasts.recentTitle')} -

    - {canSend && ( - - )} -
    - {broadcasts.length === 0 ? ( -

    {t('broadcasts.noneSent')}

    - ) : ( -
      - {broadcasts.slice(0, SHOWN).map((broadcast) => ( -
    • -

      - {broadcast.important && ( - - )} - {broadcast.subject} -

      -

      - {new Date(broadcast.createdAt).toLocaleString(dateLocale(), { - dateStyle: 'medium', - timeStyle: 'short', - })} - {broadcast.audience && - t('broadcasts.recipients', { - count: broadcast.recipientCount, - audience: t(`broadcasts.audience.${broadcast.audience}`), - })} -

      -
    • - ))} -
    - )} - {broadcasts.length > 0 && ( - - )} - {canSend && } -
    - ); -} diff --git a/src/components/ui/next-steps.tsx b/src/components/ui/next-steps.tsx new file mode 100644 index 00000000..d72f9018 --- /dev/null +++ b/src/components/ui/next-steps.tsx @@ -0,0 +1,74 @@ +import { Check, ChevronRight, type LucideIcon } from 'lucide-react'; +import type { ReactNode } from 'react'; +import { Link } from 'react-router-dom'; +import { cn } from '../../lib/utils'; + +export interface NextStep { + id: string; + icon: LucideIcon; + title: ReactNode; + /** What is the state right now, e.g. "4 angemeldet" */ + text?: ReactNode; + to?: string; + /** Link state, e.g. a filter for the page */ + state?: unknown; + done?: boolean; + /** The step to do now: at most one, highlighted */ + current?: boolean; +} + +/** The way through a bazaar: what is done, what is next, each step leads to its page. */ +export function NextSteps({ title, steps }: { title: ReactNode; steps: NextStep[] }) { + return ( +
    +

    {title}

    +
      + {steps.map((step) => { + const Icon = step.done ? Check : step.icon; + const content = ( + <> + + + + + + {step.title} + + {step.text && ( + {step.text} + )} + + {step.to && } + + ); + const row = 'flex items-center gap-4 px-5 py-3.5 sm:px-6'; + return ( +
    1. + {step.to ? ( + + {content} + + ) : ( +
      {content}
      + )} +
    2. + ); + })} +
    +
    + ); +} diff --git a/src/pages/dashboard/DashboardPage.tsx b/src/pages/dashboard/DashboardPage.tsx index 0b18edba..8c40a3b1 100644 --- a/src/pages/dashboard/DashboardPage.tsx +++ b/src/pages/dashboard/DashboardPage.tsx @@ -1,6 +1,6 @@ import { EmptyState } from '../../components/ui/empty-state'; import { PageHeader } from '../../components/ui/page-header'; -import { useState, type ComponentType, type ReactNode } from 'react'; +import { useState, type ReactNode } from 'react'; import { Link, useNavigate } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import type { TFunction } from 'i18next'; @@ -11,17 +11,16 @@ import { ChevronDown, MapPin, Package, - Plus, + Printer, Receipt, Search, - ShoppingCart, - Users, } from 'lucide-react'; import { useQuery } from '../../lib/api/react'; import { api } from '../../lib/api/functions'; import type { Doc, FunctionReturnType } from '../../lib/api/types'; import { Badge } from '../../components/ui/badge'; import { Button } from '../../components/ui/button'; +import { NextSteps, type NextStep } from '../../components/ui/next-steps'; import { Card, CardContent } from '../../components/ui/card'; import { StorageImage } from '../../components/ui/StorageImage'; import { ListSkeleton, Loading, PageSkeleton } from '../../components/ui/loading'; @@ -30,10 +29,13 @@ import { useUserRole, type UserRole } from '../../context/UserRoleContext'; import { useFeatureFlags } from '../../hooks/useFeatureFlags'; import { useInstanceConfig } from '../../hooks/useInstanceConfig'; import { useMarkNoticesSeen } from '../../hooks/useMarkNoticesSeen'; -import { selectEvent, selectedOrCurrent, useSelectedEventId } from '../../lib/selectedEvent'; +import { dateLocale } from '../../i18n/format'; +import { selectedOrCurrent, useSelectedEventId } from '../../lib/selectedEvent'; import { formatDateRangeDE, formatPriceDE } from '../../lib/utils'; import { AdminOverviewPage } from '../administrator/AdminOverviewPage'; import { formatEventPlace } from '../../shared/eventJsonLd'; +import { EventApprovalBadge } from '../../components/events/EventApprovalBadge'; +import { eventApproval } from '../../lib/eventApproval'; /** * Start page for signed-in users (#158), one per role of the role switch: sellers see @@ -100,51 +102,85 @@ function SellerOverview() { const registered = useQuery(api.events.getMyRegisteredEvents, {}); const products = useQuery(api.products.getMyProducts); const sales = useQuery(api.purchases.getMySales, {}); - const notices = useQuery(api.notifications.getUnreadNoticeCounts, {}); const upcoming = upcomingFirst(registered); const available = (products ?? []).filter((product) => !product.sold); const [next, ...more] = upcoming; + + if (registered === undefined) { + return ( + + + + ); + } const count = next ? available.filter((product) => product.eventIds?.includes(next._id)).length : 0; const seller = next ? sales?.find((group) => group.event._id === next._id) : undefined; + const started = !!next && next.startDate <= Date.now(); + const dropoff = next?.sellerLogistics?.dropoffStart; + + // The way through a bazaar; the first open step is the one to do now + const steps: NextStep[] = [ + { + id: 'register', + icon: Search, + title: next ? t('steps.registered') : t('steps.register'), + text: next + ? seller?.sellerNumber !== undefined + ? t('nextBazaar.sellerNumber', { number: seller.sellerNumber }) + : undefined + : isSingle + ? t('nextBazaar.noneSingle') + : t('nextBazaar.none'), + to: next ? undefined : '/browse-events', + done: !!next, + }, + { + id: 'products', + icon: Package, + title: t('steps.products'), + text: count > 0 ? t('nextBazaar.products', { count }) : t('nextBazaar.noProducts'), + to: count > 0 ? '/my-products' : '/products/new', + state: count > 0 ? { filterEvent: next?._id } : undefined, + done: count > 0, + }, + { + id: 'labels', + icon: Printer, + title: t('steps.labels'), + text: dropoff + ? t('steps.dropoff', { date: formatDateTimeDE(dropoff) }) + : t('steps.labelsText'), + to: '/my-products', + state: next ? { filterEvent: next._id } : undefined, + done: started, + }, + { + id: 'payout', + icon: Receipt, + title: t('steps.payout'), + text: [salesSummary(sales, t), seller?.paid && t('nextBazaar.paid')] + .filter(Boolean) + .join(' · '), + to: '/my-sales', + done: !!seller?.paid, + }, + ]; + const current = next ? steps.find((step) => !step.done) : steps[0]; + if (current) current.current = true; return ( <> - {registered === undefined ? ( - - - - ) : next ? ( + {next && ( - - {count > 0 ? t('nextBazaar.products', { count }) : t('nextBazaar.noProducts')} - - {seller?.sellerNumber !== undefined && ( - - {t('nextBazaar.sellerNumber', { number: seller.sellerNumber })} - - )} - {seller?.paid && {t('nextBazaar.paid')}} - - } actions={ - <> - - - + } footer={ more.length > 0 && ( @@ -157,55 +193,8 @@ function SellerOverview() { ) } /> - ) : ( - - -

    - {isSingle ? t('nextBazaar.noneSingle') : t('nextBazaar.none')} -

    - -
    -
    - )} - -
    - - - - -
    - - {!isSingle && ( -

    - - {t('aboutBazarPro')} - -

    )} + ); } @@ -248,10 +237,8 @@ function OrganizerOverview({ canCreate }: { canCreate: boolean }) { .sort((a, b) => b.startDate - a.startDate); const shownUpcoming = showAll ? upcoming : upcoming.slice(0, VISIBLE_UPCOMING); - const choose = (event: Doc<'events'>) => { - selectEvent(event._id); - window.scrollTo({ top: 0, behavior: 'smooth' }); - }; + // Opening a bazaar also makes it the chosen one (ResponsiveSidebar) + const open = (event: Doc<'events'>) => navigate(`/events/view/${event._id}`); const createButton = canCreate && ( - - - + } /> @@ -310,7 +284,7 @@ function OrganizerOverview({ canCreate }: { canCreate: boolean }) { {upcoming.length === 0 ? (

    {t('organizer.none')}

    ) : ( - + )} {upcoming.length > VISIBLE_UPCOMING && ( - {showPast && } + {showPast && } )} @@ -348,11 +322,11 @@ const VISIBLE_UPCOMING = 3; function EventList({ events, isHelper, - onChoose, + onOpen, }: { events: Doc<'events'>[]; isHelper: (event: Doc<'events'>) => boolean; - onChoose: (event: Doc<'events'>) => void; + onOpen: (event: Doc<'events'>) => void; }) { const { t } = useTranslation('dashboard'); return ( @@ -368,7 +342,7 @@ function EventList({

    {event.title}

    {formatDateRangeDE(event.startDate, event.endDate)} - + {isHelper(event) && ( {t('myEvents.helper', { ns: 'organizer' })} )} @@ -378,9 +352,9 @@ function EventList({ size="sm" variant="outline" className="shrink-0" - onClick={() => onChoose(event)} + onClick={() => onOpen(event)} > - {t('organizer.select')} + {t('organizer.open')} ))} @@ -390,23 +364,10 @@ function EventList({ ); } -/** Public events are checked by the platform; the others need no approval. */ -function ApprovalBadge({ event }: { event: Doc<'events'> }) { - const { t } = useTranslation('dashboard'); - if (event.visibility !== 'public') return null; - if (event.approvalStatus === 'rejected') { - return {t('myEvents.rejected', { ns: 'organizer' })}; - } - if (event.approvalStatus === 'pending' || event.isApproved === false) { - return {t('myEvents.pending', { ns: 'organizer' })}; - } - return {t('organizer.approved')}; -} - function ApprovalNote({ event }: { event: Doc<'events'> }) { const { t } = useTranslation('dashboard'); - if (event.visibility !== 'public') return null; - if (event.approvalStatus === 'rejected' && event.rejectionReason) { + const approval = eventApproval(event); + if (approval === 'rejected' && event.rejectionReason) { return (
    @@ -416,7 +377,7 @@ function ApprovalNote({ event }: { event: Doc<'events'> }) {
    ); } - if (event.approvalStatus === 'pending' || event.isApproved === false) { + if (approval === 'pending') { return (
    {t('myEvents.reviewing', { ns: 'organizer' })} @@ -436,6 +397,13 @@ function upcomingFirst(events: Doc<'events'>[] | undefined): Doc<'events'>[] { type SalesGroups = FunctionReturnType | undefined; +function formatDateTimeDE(timestamp: number): string { + return new Date(timestamp).toLocaleString(dateLocale(), { + dateStyle: 'medium', + timeStyle: 'short', + }); +} + function salesSummary(sales: SalesGroups, t: TFunction<'dashboard'>): string { const sold = (sales ?? []).reduce((sum, group) => sum + group.items.length, 0); if (sold === 0) return t('seller.noSales'); @@ -467,23 +435,24 @@ function BazaarHero({ const [failedImage, setFailedImage] = useState(null); const running = event.startDate <= Date.now(); return ( - + {event.coverImage && event.coverImage !== failedImage && ( setFailedImage(event.coverImage ?? null)} /> )} - +
    - {label} + {label} {running && {t('nextBazaar.running')}} + {badges}
    {/* Full title: long names of bazaars wrap instead of being cut off */} -

    {event.title}

    -
    +

    {event.title}

    +
    {formatDateRangeDE(event.startDate, event.endDate)} @@ -495,56 +464,10 @@ function BazaarHero({ )}
    - {badges &&
    {badges}
    } {note} -
    {actions}
    +
    {actions}
    {footer &&

    {footer}

    } ); } - -function Section({ title, children }: { title: string; children: ReactNode }) { - return ( -
    -

    {title}

    -
    {children}
    -
    - ); -} - -function Tile({ - to, - icon: Icon, - title, - text, - badge = 0, -}: { - to: string; - icon: ComponentType<{ className?: string }>; - title: string; - text?: string; - badge?: number; -}) { - return ( - - - - - - - {title} - {badge > 0 && ( - - {badge} - - )} - - {text && {text}} - - - ); -} diff --git a/src/pages/organizer/events/EventManagementDashboard.tsx b/src/pages/organizer/events/EventManagementDashboard.tsx index 08243c47..18e24a83 100644 --- a/src/pages/organizer/events/EventManagementDashboard.tsx +++ b/src/pages/organizer/events/EventManagementDashboard.tsx @@ -1,12 +1,14 @@ import type { ProductWithStatus } from './dashboard/components/inventoryTypes'; import { ConfirmDialog } from '../../../components/ui/confirm-dialog'; import { OfflineReadyCard } from './dashboard/components/OfflineReadyCard'; -import { StatTile } from '../../../components/ui/stat-tile'; -import { ShoppingBag, Users, DollarSign, Eye, XCircle } from 'lucide-react'; +import { NextSteps, type NextStep } from '../../../components/ui/next-steps'; +import { Banknote, Eye, PackageCheck, ShoppingCart, Users, XCircle } from 'lucide-react'; import { Button } from '../../../components/ui/button'; import { EventHero } from '../../../components/EventHero'; import { useNavigate, useParams } from 'react-router-dom'; import { useMutation, useQuery } from '../../../lib/api/react'; +import { useEventAccess } from '../../../hooks/useEventAccess'; +import { eventApproval } from '../../../lib/eventApproval'; import { api } from '../../../lib/api/functions'; import type { Id } from '../../../lib/api/types'; import { formatPriceDE } from '../../../lib/utils'; @@ -14,7 +16,6 @@ import { useEffect, useState } from 'react'; import { Alert, AlertDescription, AlertTitle } from '../../../components/ui/alert'; import { toast } from 'sonner'; import { AdminEventBanner } from '../../../components/moderation/AdminEventBanner'; -import { RecentBroadcastsCard } from '../../../components/broadcasts/RecentBroadcastsCard'; import { ModerationNotice } from '../../../components/moderation/ModerationNotice'; import { Trans, useTranslation } from 'react-i18next'; import { PageSkeleton } from '../../../components/ui/loading'; @@ -28,12 +29,7 @@ export function EventManagementDashboard() { const navigate = useNavigate(); - const myRoles = useQuery(api.eventRoles.getMyRolesForEvent, { eventId }); - const viewer = useQuery(api.users.viewer); - // Writing to all sellers stays with the organizer, helpers only see the messages - const canBroadcast = (myRoles ?? []).includes('organizer') || viewer?.systemRole === 'admin'; - const canManage = - (myRoles ?? []).includes('organizer') || (myRoles ?? []).includes('coorganizer'); + const { isLoading, canManage, canLead } = useEventAccess(eventId); const products = useQuery( api.eventProducts.getProductsForEventManagement, @@ -49,12 +45,12 @@ export function EventManagementDashboard() { const [isResubmitting, setIsResubmitting] = useState(false); useEffect(() => { - if (myRoles !== undefined && !canManage) { + if (!isLoading && !canManage) { navigate('/', { replace: true }); } - }, [myRoles, canManage, navigate]); + }, [isLoading, canManage, navigate]); - if (myRoles === undefined || !canManage) { + if (isLoading || !canManage) { return ; } @@ -77,10 +73,63 @@ export function EventManagementDashboard() { .filter((p) => p.status === 'sold') .reduce((sum, p) => sum + (p.sale?.totalAmount ?? p.price), 0); - const approvalStatus = event.approvalStatus; - const isPendingApproval = - event.visibility === 'public' && (approvalStatus === 'pending' || event.isApproved === false); - const isRejected = event.visibility === 'public' && approvalStatus === 'rejected'; + // The way through the bazaar: what is done, and what is due now + const now = Date.now(); + const hasEnded = event.endDate < now; + const hasStarted = event.startDate <= now; + const waiting = products.filter((p) => p.status === 'announced').length; + const sold = products.filter((p) => p.status === 'sold').length; + const settled = vendors.filter((v) => v.paid).length; + const base = `/events/view/${eventId}`; + const steps: NextStep[] = [ + { + id: 'sellers', + icon: Users, + title: t('dashboard.steps.sellers'), + text: t('dashboard.steps.sellersText', { count: vendors.length }), + to: `${base}/sellers`, + done: vendors.length > 0, + current: !hasStarted && vendors.length === 0, + }, + { + id: 'intake', + icon: PackageCheck, + title: t('dashboard.steps.intake'), + text: + waiting > 0 + ? t('dashboard.steps.intakeWaiting', { count: waiting }) + : t('dashboard.steps.intakeText', { count: products.length }), + to: `${base}/products?tab=announced`, + done: products.length > 0 && waiting === 0, + current: !hasStarted && vendors.length > 0, + }, + { + id: 'sale', + icon: ShoppingCart, + title: t('dashboard.steps.sale'), + text: t('dashboard.steps.saleText', { + sold, + total: products.length, + revenue: formatPriceDE(totalRevenue), + }), + to: `${base}/checkout`, + done: hasEnded, + current: hasStarted && !hasEnded, + }, + { + id: 'settle', + icon: Banknote, + title: t('dashboard.steps.settle'), + text: t('dashboard.steps.settleText', { settled, total: vendors.length }), + to: `${base}/cash`, + done: vendors.length > 0 && settled === vendors.length, + current: hasEnded && settled < vendors.length, + }, + ]; + + const approval = eventApproval(event); + const isPendingApproval = approval === 'pending'; + const isRejected = approval === 'rejected'; const canRequestReview = isRejected; const handleRequestReview = async () => { @@ -105,7 +154,7 @@ export function EventManagementDashboard() {
    )} - + {(isPendingApproval || isRejected) && ( {isRejected ? : } @@ -155,7 +204,7 @@ export function EventManagementDashboard() { startDate={event.startDate} endDate={event.endDate} location={formatEventPlace(event)} - maxHeightClassName="h-[300px] w-full max-h-none min-h-0 aspect-auto" + maxHeightClassName="h-[320px] sm:h-[220px] w-full max-h-none min-h-0 aspect-auto" publicEventButton={
    ); diff --git a/src/pages/organizer/events/dashboard/ProductManagementPage.tsx b/src/pages/organizer/events/dashboard/ProductManagementPage.tsx index ba6408e3..0d794bfb 100644 --- a/src/pages/organizer/events/dashboard/ProductManagementPage.tsx +++ b/src/pages/organizer/events/dashboard/ProductManagementPage.tsx @@ -3,6 +3,7 @@ import { ConfirmDialog } from '../../../../components/ui/confirm-dialog'; import { useDeferredValue, useEffect, useMemo, useState, useRef } from 'react'; import { countryName } from '../../../../i18n/countries'; import { useApiClient, useMutation, useQuery } from '../../../../lib/api/react'; +import { useEventAccess } from '../../../../hooks/useEventAccess'; import { useNavigate, useParams, useLocation, useSearchParams } from 'react-router-dom'; import { api } from '../../../../lib/api/functions'; import type { Id } from '../../../../lib/api/types'; @@ -113,9 +114,7 @@ export function ProductManagementPage() { const lastAutoSwitchedVendorId = useRef | null>(null); // Queries - const myRoles = useQuery(api.eventRoles.getMyRolesForEvent, { eventId }); - const canManage = - (myRoles ?? []).includes('organizer') || (myRoles ?? []).includes('coorganizer'); + const { isLoading: rolesLoading, canManage } = useEventAccess(eventId); const products = useQuery( api.eventProducts.getProductsForEventManagement, @@ -487,7 +486,7 @@ export function ProductManagementPage() { return success; }; - if (myRoles === undefined) return ; + if (rolesLoading) return ; if (!canManage) return null; return ( diff --git a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx index 6cba4560..05176b93 100644 --- a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx +++ b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx @@ -24,7 +24,6 @@ import { import { UserCircle, CheckCircle2, - DollarSign, Mail, Phone, ChevronRight, @@ -33,6 +32,7 @@ import { ShieldCheck, Crown, Megaphone, + Plus, Printer, } from 'lucide-react'; import { formatPriceDE } from '../../../../lib/utils'; @@ -42,6 +42,13 @@ import { Button } from '../../../../components/ui/button'; import { toast } from 'sonner'; import { getUserFacingErrorMessage } from '../../../../lib/errors'; import { ConfirmDialog } from '../../../../components/ui/confirm-dialog'; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, +} from '../../../../components/ui/dropdown-menu'; +import { useEventAccess } from '../../../../hooks/useEventAccess'; import { WalkInSellerDialog } from '../../../../components/walkIn/WalkInSellerDialog'; import { BroadcastDialog } from '../../../../components/broadcasts/BroadcastDialog'; import { BroadcastList } from '../../../../components/broadcasts/BroadcastList'; @@ -74,14 +81,13 @@ export function SellerManagementPage() { } | null>(null); const event = useQuery(api.events.getEvent, { id: eventId as Id<'events'> }); - const viewer = useQuery(api.users.viewer); - const myRoles = useQuery(api.eventRoles.getMyRolesForEvent, { eventId: eventId as Id<'events'> }); - const canManage = - (myRoles ?? []).includes('organizer') || (myRoles ?? []).includes('coorganizer'); - // Writing to all sellers stays with the organizer, helpers only see the log - const canBroadcast = (myRoles ?? []).includes('organizer') || viewer?.systemRole === 'admin'; - - // Organizers and admins appoint helpers (as the backend allows); helpers cannot + // Writing to all sellers and appointing helpers stays with the organizer (and admins), + // helpers only see the log + const { + isLoading: rolesLoading, + canManage, + canLead: canBroadcast, + } = useEventAccess(eventId as Id<'events'>); const canManageHelpers = canBroadcast; const vendors = useQuery(api.eventRoles.getVendorsForEvent, { @@ -151,7 +157,7 @@ export function SellerManagementPage() { } }; - if (myRoles === undefined) return ; + if (rolesLoading) return ; if (!canManage) return
    {t('sellers.noAccess')}
    ; return ( @@ -165,41 +171,53 @@ export function SellerManagementPage() { {t('sellers.broadcast')} )} - {canManageHelpers && ( - - )} - - - {sortSheetSellers.length > 0 && ( - - )} + + + + + + setAllLabelsOpen(true)} + > + {t('sellers.allLabels')} + + {sortSheetSellers.length > 0 && ( + + void downloadSortSheets(sortSheetSellers, t('sellers.sortClashNote')).catch( + (e: unknown) => toast.error(getUserFacingErrorMessage(e)) + ) + } + > + {t('sellers.sortSheets')} + + )} + + + + + + + + setWalkInDialogOpen(true)} + > + {t('sellers.walkIn')} + + {canManageHelpers && ( + setHelperPickerOpen(true)}> + {t('sellers.addHelper')} + + )} + +
    } /> @@ -314,15 +332,7 @@ export function SellerManagementPage() {
    - {v.paid ? ( - - {t('sellers.paid')} - - ) : ( - - {t('sellers.open')} - - )} + {isOwner ? ( @@ -330,25 +340,13 @@ export function SellerManagementPage() { {t('sellers.owner')} ) : canManageHelpers && !v.managedByEventId ? ( - + + setHelperAction({ mode: v.isHelper ? 'remove' : 'add', vendor: v }) + } + /> ) : v.isHelper ? ( {t('sellers.helpers')} @@ -418,39 +416,18 @@ export function SellerManagementPage() {
    {t('sellers.status')}
    - {v.paid ? ( - - {t('sellers.paid')} - - ) : ( - - {t('sellers.open')} - - )} +
    {canManageHelpers && !isOwner && !v.managedByEventId && (
    - + + setHelperAction({ mode: v.isHelper ? 'remove' : 'add', vendor: v }) + } + />
    )}
    @@ -524,3 +501,48 @@ export function SellerManagementPage() { ); } + +/** Whether the seller got their money already. */ +function PaidBadge({ paid }: { paid?: boolean }) { + const { t } = useTranslation('organizer'); + return paid ? ( + + {t('sellers.paid')} + + ) : ( + + {t('sellers.open')} + + ); +} + +/** Appoints a seller as helper or takes it back; quiet, because it is rarely needed. */ +function HelperToggle({ + isHelper, + onToggle, + iconOnly, +}: { + isHelper: boolean; + onToggle: () => void; + iconOnly?: boolean; +}) { + const { t } = useTranslation('organizer'); + const label = isHelper ? t('sellers.removeHelper') : t('sellers.makeHelper'); + const Icon = isHelper ? UserMinus : UserPlus; + return ( + + ); +} diff --git a/src/pages/public/products/components/PublicProductOrganizerActions.tsx b/src/pages/public/products/components/PublicProductOrganizerActions.tsx index 264783d6..1c3cfcbd 100644 --- a/src/pages/public/products/components/PublicProductOrganizerActions.tsx +++ b/src/pages/public/products/components/PublicProductOrganizerActions.tsx @@ -1,5 +1,6 @@ import type { ReactNode } from 'react'; import { useQuery } from '../../../../lib/api/react'; +import { useEventAccess } from '../../../../hooks/useEventAccess'; import { api } from '../../../../lib/api/functions'; import type { Id, Doc } from '../../../../lib/api/types'; import { Button } from '../../../../components/ui/button'; @@ -33,8 +34,7 @@ export function PublicProductOrganizerActions({ const { t } = useTranslation('organizer'); const navigate = useNavigate(); - const myRoles = useQuery(api.eventRoles.getMyRolesForEvent, { eventId }) ?? []; - const canManage = myRoles.includes('organizer') || myRoles.includes('coorganizer'); + const { canManage } = useEventAccess(eventId); const ep = useQuery( api.eventProducts.getEventProduct, From 2df8e14e811676f06f6434ae25d485fc68d6f288 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Thu, 5 Nov 2026 03:29:53 +0100 Subject: [PATCH 42/58] refactor(i18n): one word for each thing, tests follow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bereich Verkaufen/Organisieren instead of roles, Verkäufer instead of Teilnehmer, Abrechnung instead of Kassensturz, Basar instead of Event. Onboarding follows. Co-Authored-By: Claude Opus 5.5 --- src/locales/de/admin.json | 2 +- src/locales/de/common.json | 24 +++--- src/locales/de/dashboard.json | 32 +++---- src/locales/de/events.json | 20 ++--- src/locales/de/onboarding.json | 24 +++--- src/locales/de/organizer.json | 85 +++++++++++-------- src/locales/de/seller.json | 4 +- src/locales/en/admin.json | 2 +- src/locales/en/common.json | 22 +++-- src/locales/en/dashboard.json | 32 +++---- src/locales/en/events.json | 2 +- src/locales/en/onboarding.json | 10 +-- src/locales/en/organizer.json | 61 ++++++++----- src/pages/dashboard/DashboardPage.test.tsx | 42 ++++----- .../events/EditEventForm.edit.test.tsx | 6 +- .../events/EditEventForm.wizard.test.tsx | 6 +- .../seller/events/SearchEventsPage.test.tsx | 8 +- src/tests/admin/event-approval.spec.ts | 4 +- src/tests/admin/moderation.spec.ts | 4 +- src/tests/auth/events.coorganizer.spec.ts | 16 ++-- src/tests/auth/events.spec.ts | 17 ++-- src/tests/auth/features.spec.ts | 36 ++++---- src/tests/auth/navigation.spec.ts | 2 +- src/tests/auth/products.spec.ts | 14 +-- src/tests/auth/profile.spec.ts | 8 +- src/tests/auth/roles.permissions.spec.ts | 40 +++++---- src/tests/helpers/eventApproval.ts | 2 +- src/tests/helpers/eventForm.ts | 8 +- src/tests/public/onboarding-trigger.spec.ts | 10 +-- 29 files changed, 286 insertions(+), 257 deletions(-) diff --git a/src/locales/de/admin.json b/src/locales/de/admin.json index 4c4c35d3..cb1a5001 100644 --- a/src/locales/de/admin.json +++ b/src/locales/de/admin.json @@ -103,7 +103,7 @@ "statusApproved": "Freigegeben", "statusRejected": "Abgelehnt", "statusPending": "Freigabe ausstehend", - "title": "Events", + "title": "Basare", "all": "Alle", "pending": "Zur Freigabe", "running": "Laufend", diff --git a/src/locales/de/common.json b/src/locales/de/common.json index 2760d998..6e83e1ba 100644 --- a/src/locales/de/common.json +++ b/src/locales/de/common.json @@ -32,15 +32,15 @@ }, "menu": { "title": "Menü", - "dashboard": "Dashboard", + "dashboard": "Übersicht", "myProducts": "Meine Artikel", "mySales": "Meine Verkäufe", "currentBazaar": "Aktueller Basar", - "events": "Events", - "participants": "Teilnehmer", + "events": "Basare", + "participants": "Verkäufer", "products": "Artikel", "checkout": "Kasse", - "cash": "Kassensturz", + "cash": "Abrechnung", "settings": "Einstellungen", "overview": "Übersicht", "reports": "Meldungen", @@ -49,19 +49,21 @@ "messages": "Kontaktanfragen", "log": "Protokoll", "legalPages": "Rechtstexte", - "switchRole": "Rolle wechseln", - "organizer": "Veranstalter", - "participant": "Teilnehmer", + "switchRole": "Bereich wechseln", + "organizer": "Organisieren", + "participant": "Verkaufen", "admin": "Admin", "badge": { "notifications": "{{count}} neue Benachrichtigungen", "sales": "{{count}} neue Verkäufe", "reports": "{{count}} offene Meldungen", - "approvals": "{{count}} Events warten auf Freigabe", + "approvals": "{{count}} Basare warten auf Freigabe", "messages": "{{count}} offene Kontaktanfragen", "organizerMessages": "{{count}} neue Nachrichten vom Veranstalter" }, - "categories": "Kategorien" + "categories": "Kategorien", + "allBazaars": "Alle Basare", + "sales": "Verkäufe" }, "footer": { "tagline": "Die moderne Plattform für Marktplatz-Veranstaltungen", @@ -124,10 +126,6 @@ "recipients": " · an {{count}} Verkäufer ({{audience}})", "important": "Wichtig", "new": "Neu", - "recentTitle": "Letzte Nachrichten an Verkäufer", - "write": "Nachricht an Verkäufer", - "noneSent": "Noch keine Nachrichten verschickt. Verkäufer bekommen sie per Mail und sehen einen roten Marker in ihrem Menü.", - "showAll": "Alle Nachrichten", "fromOrganizer": "Nachrichten vom Veranstalter" }, "time": { diff --git a/src/locales/de/dashboard.json b/src/locales/de/dashboard.json index 24d12ced..f7905cd8 100644 --- a/src/locales/de/dashboard.json +++ b/src/locales/de/dashboard.json @@ -9,33 +9,35 @@ "noProducts": "Noch keine Artikel angemeldet", "sellerNumber": "Verkäufernummer {{number}}", "paid": "Gebühr bezahlt", - "manageProducts": "Artikel verwalten", "openEvent": "Zum Basar", "more_one": "und {{count}} weiterer Basar", "more_other": "und {{count}} weitere Basare", "none": "Du bist noch für keinen Basar angemeldet.", - "noneSingle": "Du bist noch nicht für den aktuellen Basar angemeldet.", - "find": "Basar finden" + "noneSingle": "Du bist noch nicht für den aktuellen Basar angemeldet." }, "seller": { - "title": "Verkaufen", - "products_one": "{{count}} verfügbarer Artikel", - "products_other": "{{count}} verfügbare Artikel", "sales_one": "{{count}} verkauft · {{payout}} € Auszahlung", "sales_other": "{{count}} verkauft · {{payout}} € Auszahlung", - "noSales": "Noch nichts verkauft", - "newProduct": "Neuer Artikel" + "noSales": "Noch nichts verkauft" }, "organizer": { - "current": "Deine Veranstaltung", - "later": "Weitere Veranstaltungen", - "none": "Keine weiteren anstehenden Veranstaltungen.", + "current": "Dein aktueller Basar", + "later": "Weitere Basare", + "none": "Keine weiteren anstehenden Basare.", "showAll": "Alle {{count}} anzeigen", "showLess": "Weniger anzeigen", - "past": "Vergangene Veranstaltungen ({{count}})", - "select": "Auswählen", + "past": "Vergangene Basare ({{count}})", "approved": "Freigegeben", - "checkout": "Kasse" + "open": "Öffnen" }, - "aboutBazarPro": "Mehr über BazarPro" + "steps": { + "title": "So geht es weiter", + "register": "Für einen Basar anmelden", + "registered": "Für den Basar angemeldet", + "products": "Artikel anlegen", + "labels": "Etiketten drucken und abgeben", + "labelsText": "Den Abgabetermin nennt dir der Veranstalter", + "dropoff": "Abgabe ab {{date}}", + "payout": "Verkauf und Auszahlung" + } } diff --git a/src/locales/de/events.json b/src/locales/de/events.json index 6230a342..21d0c683 100644 --- a/src/locales/de/events.json +++ b/src/locales/de/events.json @@ -1,11 +1,11 @@ { "search": { - "title": "Events", + "title": "Basare", "mine": "Meine Basare", "discover": "Neue Basare entdecken", "noneNew": "Gerade gibt es keine weiteren Basare.", "productsAndLabels": "{{products}} · Etiketten", - "none": "Keine Events gefunden.", + "none": "Keine Basare gefunden.", "left": "Abmeldung von {{event}} erfolgreich", "unknownError": "Ein unbekannter Fehler ist aufgetreten.", "leaveFailed": "Abmeldung fehlgeschlagen", @@ -14,16 +14,16 @@ "registered": "Angemeldet", "details": "Details", "join": "Anmelden", - "leaveTitle": "Vom Event abmelden", + "leaveTitle": "Vom Basar abmelden", "leaveConfirm": "Möchtest du dich wirklich von „{{event}}“ abmelden?", "leave": "Abmelden", - "leaveLabel": "Vom Event abmelden", + "leaveLabel": "Vom Basar abmelden", "sellerNumber": "Nr. {{number}}", "newMessages_one": "{{count}} neue Nachricht vom Veranstalter", "newMessages_other": "{{count}} neue Nachrichten vom Veranstalter" }, "filters": { - "search": "Events suchen…", + "search": "Basare suchen…", "choose": "Bitte auswählen", "dateAsc": "Datum aufsteigend", "dateDesc": "Datum absteigend", @@ -38,7 +38,7 @@ "title": "Anmeldung für {{event}}", "needsCode": "Diese Veranstaltung erfordert einen Zugangscode für Verkäufer. Bitte gib den Code ein, den du vom Veranstalter erhalten hast.", "needsProfile": "Bitte gib deine Kontaktdaten ein, um dich für die Veranstaltung anzumelden. Die Daten werden in deinem Profil gespeichert.", - "confirmQuestion": "Willst du dich als Verkäufer für das Event anmelden?", + "confirmQuestion": "Willst du dich als Verkäufer für den Basar anmelden?", "accessCode": "Zugangscode", "codePlaceholder": "Code eingeben…", "confirmCode": "Code bestätigen", @@ -62,9 +62,9 @@ }, "registered": { "title": "Anmeldung erfolgreich!", - "text": "Du bist nun für {{event}} angemeldet. Möchtest du direkt Artikel für dieses Event anmelden?", + "text": "Du bist nun für {{event}} angemeldet. Möchtest du direkt Artikel für diesen Basar anmelden?", "addExisting": "Vorhandene Artikel hinzufügen", - "noProducts": "Du hast noch keine Artikel erstellt. Erstelle deinen ersten Artikel, um ihn für dieses Event anzumelden!", + "noProducts": "Du hast noch keine Artikel erstellt. Erstelle deinen ersten Artikel, um ihn für diesen Basar anzumelden!", "createNew": "Neuen Artikel erstellen", "later": "Vorerst nicht, danke" }, @@ -130,11 +130,11 @@ "loginHint": "Vielleicht ist diese Veranstaltung nur für angemeldete Nutzer sichtbar.", "loginAction": "Anmelden", "linkOnlyHint": "Diese Veranstaltung ist nur über diesen Link erreichbar. Zur Anmeldung brauchst du den Zugangscode vom Veranstalter; die Angebote siehst du danach.", - "seoFallback": "Event in {{location}} am {{date}}.", + "seoFallback": "Basar in {{location}} am {{date}}.", "soldHere": "Du hast hier verkauft", "sellingHere": "Du verkaufst hier", "myProducts": "Meine Artikel", - "join": "Als Verkäufer beitreten", + "join": "Als Verkäufer anmelden", "categories": "Kategorien", "services": "Zusätzliche Services", "map": "Lageplan", diff --git a/src/locales/de/onboarding.json b/src/locales/de/onboarding.json index 15c4befc..02d52e25 100644 --- a/src/locales/de/onboarding.json +++ b/src/locales/de/onboarding.json @@ -4,8 +4,8 @@ "description": "Hier findest du die Navigation mit allen wichtigen Funktionen." }, "participant-role-switch": { - "title": "Rolle jederzeit wechseln", - "description": "Du startest in der Teilnehmer-Ansicht. Mit BazarPro kannst du sowohl an Veranstaltungen teilnehmen als auch eigene Events erstellen. Wechsle deine Rolle jederzeit hier." + "title": "Bereich jederzeit wechseln", + "description": "Du startest im Bereich „Verkaufen“. Mit BazarPro kannst du sowohl an Veranstaltungen teilnehmen als auch eigene Basare anlegen. Wechsle den Bereich jederzeit hier." }, "participant-participant-nav": { "title": "Navigation", @@ -24,11 +24,11 @@ "description": "Jeder Artikel hat einen QR-Code, der zur Identifikation bei einer Veranstaltung vor Ort dient. Drucke ihn aus und befestige ihn am Artikel. Kunden können den Code scannen und sehen alle Details zum Artikel. Veranstalter können den Code scannen und so einen Verkauf abwickeln." }, "participant-nav-events-search": { - "title": "Events entdecken", - "description": "Über „Events suchen“ gelangst du zur Veranstaltungsübersicht. Dort kannst du passende Events finden und dich als Verkäufer anmelden." + "title": "Basare entdecken", + "description": "Über „Basare“ gelangst du zur Übersicht. Dort kannst du passende Basare finden und dich als Verkäufer anmelden." }, "participant-events-search": { - "title": "Zu Event anmelden", + "title": "Für einen Basar anmelden", "description": "Finde passende Veranstaltungen und melde dich als Verkäufer an. Danach kannst du deine Artikel dort anbieten." }, "participant-finish": { @@ -36,16 +36,16 @@ "description": "Du kannst jetzt loslegen: Melde dich zu deiner ersten Veranstaltung an und füge deine Artikel hinzu. Wenn du später noch einmal Hilfe brauchst, kannst du das Tutorial jederzeit über das Icon unten rechts erneut starten." }, "organizer-role-switch": { - "title": "Rolle jederzeit wechseln", - "description": "Perfekt! Wir haben für dich direkt die Veranstalter-Ansicht vorausgewählt. Über BazarPro kannst du sowohl an Veranstaltungen teilnehmen als auch selbst Events organisieren. Wechsle deine Rolle jederzeit hier." + "title": "Bereich jederzeit wechseln", + "description": "Perfekt! Wir haben für dich direkt den Bereich „Organisieren“ gewählt. Über BazarPro kannst du sowohl an Veranstaltungen teilnehmen als auch selbst Basare organisieren. Wechsle den Bereich jederzeit hier." }, "organizer-new-event-button": { - "title": "Neue Veranstaltung erstellen", - "description": "Hier startest du mit einer neuen Veranstaltung. Klicke auf „Neue Veranstaltung“, um Titel, Ort, Zeitraum und weitere Details zu definieren." + "title": "Neuen Basar anlegen", + "description": "Hier startest du mit einem neuen Basar. Klicke auf „Neuer Basar“, um Titel, Ort, Zeitraum und weitere Details zu definieren." }, "organizer-new-event-details": { "title": "Veranstaltungsdetails ausfüllen", - "description": "Gib deiner Veranstaltung einen klaren Titel und eine Beschreibung. Diese Informationen sehen später deine Teilnehmer – halte sie präzise und ansprechend." + "description": "Gib deiner Veranstaltung einen klaren Titel und eine Beschreibung. Diese Informationen sehen später Besucher und Verkäufer – halte sie präzise und ansprechend." }, "panel": { "close": "Schließen", @@ -54,8 +54,8 @@ "question": "Was möchtest du als Erstes tun?", "participant": "Als Verkäufer teilnehmen", "participantHint": "Veranstaltungen finden und Artikel inserieren.", - "organizer": "Veranstaltung erstellen", - "organizerHint": "Ein Event anlegen und Verkäufer einladen.", + "organizer": "Basar anlegen", + "organizerHint": "Einen Basar anlegen und Verkäufer einladen.", "stopTitle": "Willst du das Onboarding wirklich beenden?", "stopShort": "Es dauert nur 1–2 Minuten und hilft dir, schnell loszulegen.", "stopRestart": "Du kannst das Onboarding jederzeit über den Button unten rechts erneut starten, wenn du später Hilfe brauchst.", diff --git a/src/locales/de/organizer.json b/src/locales/de/organizer.json index a6cc4d32..8fb612ea 100644 --- a/src/locales/de/organizer.json +++ b/src/locales/de/organizer.json @@ -19,12 +19,11 @@ "endAfterStart": "Enddatum muss nach dem Startdatum liegen", "discountInEvent": "Der Rabattbeginn muss innerhalb der Veranstaltung liegen", "templateApplied": "Daten von Vorlage übernommen. Bitte Daten anpassen.", - "updated": "Veranstaltung erfolgreich aktualisiert", - "created": "Veranstaltung erfolgreich erstellt", - "saveFailed": "Veranstaltung konnte nicht gespeichert werden", - "notFound": "Event nicht gefunden", - "editTitle": "Veranstaltung bearbeiten", - "newTitle": "Neue Veranstaltung erstellen", + "updated": "Basar gespeichert", + "created": "Basar angelegt", + "saveFailed": "Basar konnte nicht gespeichert werden", + "notFound": "Basar nicht gefunden", + "newTitle": "Neuen Basar anlegen", "template": "Daten übernehmen", "templateHint": "Nutze eine deiner vergangenen Veranstaltungen als Vorlage.", "chooseTemplate": "Vorlage wählen…", @@ -32,13 +31,14 @@ "running": "Die Veranstaltung läuft gerade. Datum, Provision und Sichtbarkeit sind bis zum Ende gesperrt, damit Abrechnung und Freigabe stimmen. Alles andere kannst du weiter anpassen, zum Beispiel ab wann Rabatte möglich sind.", "creating": "Wird erstellt…", "save": "Speichern", - "create": "Veranstaltung erstellen", + "create": "Basar anlegen", "registeredMaxCommission": "Verkäufer sind angemeldet: höchstens {{percent}} %", "registeredMaxIntakeFee": "Verkäufer sind angemeldet: höchstens {{fee}} €", "registeredMinItems": "Verkäufer sind angemeldet: mindestens {{min}} Artikel", "postalCodeInvalid": "Bitte eine gültige Postleitzahl eingeben", "cityRequired": "Bitte gib zur Postleitzahl auch den Ort an", - "addressTooLong": "Zu lang" + "addressTooLong": "Zu lang", + "unsaved": "Ungespeicherte Änderungen" }, "basic": { "title": "Grundinformationen", @@ -179,49 +179,64 @@ "rejected": "Abgelehnt", "pending": "Freigabe ausstehend", "reviewing": "Wird geprüft – in der Regel dauert das nur kurz.", - "title": "Meine Veranstaltungen", + "title": "Meine Basare", "showPast": "Vergangene Veranstaltungen anzeigen", - "new": "Neue Veranstaltung", + "new": "Neuer Basar", "ended": "Beendet", "helper": "Helfer", - "open": "Zur Veranstaltung", + "open": "Basar öffnen", "none": "Keine Veranstaltungen gefunden", - "create": "Neue Veranstaltung erstellen" + "create": "Neuen Basar anlegen" }, "dashboard": { - "notFound": "Event wurde nicht gefunden.", + "notFound": "Basar wurde nicht gefunden.", "resubmitted": "Prüfungsanfrage wurde erneut gesendet", "resubmitFailed": "Fehler beim Senden der Anfrage", - "rejectedTitle": "Event wurde abgelehnt", - "reviewTitle": "Event wird geprüft", - "rejectedText": "Dein Event wurde leider abgelehnt. Grund: {{reason}}", + "rejectedTitle": "Basar wurde abgelehnt", + "reviewTitle": "Basar wird geprüft", + "rejectedText": "Dein Basar wurde leider abgelehnt. Grund: {{reason}}", "resubmit": "Erneut einreichen", - "resubmitTitle": "Event erneut zur Prüfung einreichen?", - "resubmitText": "Bitte stelle sicher, dass du die oben genannten Ablehnungsgründe behoben hast, bevor du das Event erneut einreichst.", + "resubmitTitle": "Basar erneut zur Prüfung einreichen?", + "resubmitText": "Bitte stelle sicher, dass du die oben genannten Ablehnungsgründe behoben hast, bevor du den Basar erneut einreichst.", "sending": "Wird gesendet…", "resubmitConfirm": "Ja, erneut einreichen", - "reviewText": "Dieses öffentliche Event wird derzeit von einem Administrator geprüft. Sobald es freigegeben wurde, ist es für alle sichtbar.", + "reviewText": "Dieser öffentliche Basar wird derzeit von einem Administrator geprüft. Sobald er freigegeben wurde, ist er für alle sichtbar.", "publicView": "Öffentliche Ansicht", "products": "Artikel", "participants": "Teilnehmer", - "revenue": "Umsatz" + "revenue": "Umsatz", + "steps": { + "title": "So läuft dein Basar", + "sellers": "Verkäufer anmelden lassen", + "sellersText_one": "{{count}} Verkäufer angemeldet", + "sellersText_other": "{{count}} Verkäufer angemeldet", + "intake": "Artikel annehmen", + "intakeWaiting_one": "{{count}} Artikel wartet auf die Annahme", + "intakeWaiting_other": "{{count}} Artikel warten auf die Annahme", + "intakeText_one": "{{count}} Artikel angemeldet", + "intakeText_other": "{{count}} Artikel angemeldet", + "sale": "An der Kasse verkaufen", + "saleText": "{{sold}} von {{total}} verkauft · {{revenue}} € Umsatz", + "settle": "Abrechnen und auszahlen", + "settleText": "{{settled}} von {{total}} Verkäufern abgerechnet" + } }, "settingsPage": { - "deleted": "Veranstaltung gelöscht", + "deleted": "Basar gelöscht", "deleteFailed": "Löschen fehlgeschlagen", - "title": "Event-Einstellungen", + "title": "Einstellungen", "ended": "Die Veranstaltung ist vorbei und kann nicht mehr bearbeitet werden.", "approval": "Freigabestatus", "approved": "Freigegeben", "pending": "Freigabe ausstehend", "rejected": "Abgelehnt", "reason": "Grund: {{reason}}", - "reviewing": "Dein Event wird geprüft. Das sollte nicht lange dauern – bitte hab einen Moment Geduld.", - "edit": "Einstellungen bearbeiten", - "delete": "Event löschen", - "deleteTitle": "Event wirklich löschen?", - "deleteText": "Diese Aktion kann nicht rückgängig gemacht werden. Alle Event-Daten werden dauerhaft gelöscht.", - "deleteConfirm": "Löschen" + "reviewing": "Dein Basar wird geprüft. Das sollte nicht lange dauern – bitte hab einen Moment Geduld.", + "delete": "Basar löschen", + "deleteTitle": "Basar löschen", + "deleteText": "Diese Aktion kann nicht rückgängig gemacht werden. Alle Daten des Basars werden dauerhaft gelöscht.", + "deleteConfirm": "Löschen", + "deleteHint": "Alle Daten des Basars werden dauerhaft gelöscht. Das lässt sich nicht rückgängig machen." }, "summary": { "active": "aktiv", @@ -269,7 +284,7 @@ "helperAdded": "{{name}} wurde als Helfer hinzugefügt", "actionFailed": "Aktion fehlgeschlagen", "unknownError": "Unbekannter Fehler", - "title": "Teilnehmer & Helfer", + "title": "Verkäufer & Helfer", "broadcast": "Nachricht an Verkäufer", "walkIn": "Verkäufer ohne Konto", "search": "Name, E-Mail oder Nummer", @@ -292,7 +307,7 @@ "sentMessages": "Gesendete Nachrichten", "appointHelper": "Helfer ernennen", "revoke": "Rechte entziehen", - "appointText": "Möchtest du {{name}} wirklich Helfer-Rechte für dieses Event geben?", + "appointText": "Möchtest du {{name}} wirklich Helfer-Rechte für diesen Basar geben?", "canCheckIn": "Warenannahme (Check-in) durchführen", "canSell": "Verkäufe an der Kasse (POS) erfassen", "canSettle": "Verkäufer abrechnen: Rückgabe und Auszahlung", @@ -307,7 +322,9 @@ "sortClashNote": "Achtung: Ein anderer Korb hat dasselbe Muster. Achte auf den Buchstaben: Etiketten ohne Buchstabe gehören in den Korb ohne Buchstabe.", "basketLabel": "Korb-Etikett drucken", "allLabels": "Alle Etiketten", - "allLabelsHint": "Die Artikel-Etiketten aller Verkäufer dieses Basars als ein PDF, Verkäufer für Verkäufer" + "allLabelsHint": "Die Artikel-Etiketten aller Verkäufer dieses Basars als ein PDF, Verkäufer für Verkäufer", + "add": "Hinzufügen", + "print": "Drucken" }, "settle": { "seller": "Verkäufer", @@ -347,7 +364,7 @@ "done": "Erledigt, abschließen" }, "cash": { - "title": "Kassensturz", + "title": "Abrechnung", "shouldBe": "In der Kasse sollten sein", "pending": "Noch an Verkäufer auszuzahlen", "commissionAndFees": "Provision und Annahmegebühren (bleiben beim Veranstalter)", @@ -387,7 +404,7 @@ "noteFailed": "Notiz konnte nicht gespeichert werden", "receiptSent": "Beleg wird per E-Mail verschickt", "noSale": "Zu diesem Artikel wurde kein Verkauf gefunden.", - "title": "Artikelverwaltung", + "title": "Artikel", "search": "Artikel oder Verkäufer suchen...", "clearSearch": "Suche leeren", "suggestions": "Teilnehmer-Vorschläge", @@ -576,7 +593,7 @@ "offersOpen": "Der Verkäufer nimmt Preisvorschläge an: Interessenten können auf dieser Seite angemeldet einen Preis vorschlagen.", "offersLater": "Der Verkäufer nimmt Preisvorschläge an: Interessenten können auf dieser Seite angemeldet einen Preis vorschlagen, sobald der Artikel angenommen wurde und die Veranstaltung läuft.", "panel": "Veranstalter-Verwaltung", - "status": "Status beim Event", + "status": "Status beim Basar", "seller": "Verkäufer", "anonymous": "Anonym", "openManagement": "In der Artikelverwaltung öffnen" diff --git a/src/locales/de/seller.json b/src/locales/de/seller.json index ecb382bb..e66c247e 100644 --- a/src/locales/de/seller.json +++ b/src/locales/de/seller.json @@ -19,7 +19,7 @@ "labelsPdfShort": "Etiketten", "pdfCreating": "PDF wird erstellt…", "addToEvent": "Veranstaltungen festlegen", - "addToEventShort": "Zu Event", + "addToEventShort": "Zu Basar", "delete": "Löschen", "confirmTitle": "Bist du sicher?", "confirmDelete": "Diese Aktion kann nicht rückgängig gemacht werden. Die ausgewählten Artikel werden gelöscht und aus kommenden Events entfernt. Verkäufe bleiben in der Abrechnung des Basars erhalten.", @@ -34,7 +34,7 @@ "editAtEvent": "Artikel bei Veranstaltung bearbeiten", "clearFilter": "Filter löschen", "noneForEvent": "Keine Artikel für diese Veranstaltung gefunden", - "createForEvent": "Artikel für Event erstellen", + "createForEvent": "Artikel für Basar erstellen", "soldHidden_one": "1 verkaufter Artikel ist ausgeblendet.", "soldHidden_other": "{{count}} verkaufte Artikel sind ausgeblendet.", "showAllOrSales": "Alle anzeigen oder zu Meine Verkäufe" diff --git a/src/locales/en/admin.json b/src/locales/en/admin.json index d3e5bd13..8d602106 100644 --- a/src/locales/en/admin.json +++ b/src/locales/en/admin.json @@ -103,7 +103,7 @@ "statusApproved": "Approved", "statusRejected": "Rejected", "statusPending": "Approval pending", - "title": "Events", + "title": "Bazaars", "all": "All", "pending": "To approve", "running": "Running", diff --git a/src/locales/en/common.json b/src/locales/en/common.json index 56b0528e..99dbf1f5 100644 --- a/src/locales/en/common.json +++ b/src/locales/en/common.json @@ -32,15 +32,15 @@ }, "menu": { "title": "Menu", - "dashboard": "Dashboard", + "dashboard": "Overview", "myProducts": "My items", "mySales": "My sales", "currentBazaar": "Current bazaar", - "events": "Events", - "participants": "Participants", + "events": "Bazaars", + "participants": "Sellers", "products": "Items", "checkout": "Cash desk", - "cash": "Cash count", + "cash": "Settlement", "settings": "Settings", "overview": "Overview", "reports": "Reports", @@ -49,9 +49,9 @@ "messages": "Contact requests", "log": "Log", "legalPages": "Legal texts", - "switchRole": "Switch role", - "organizer": "Organizer", - "participant": "Participant", + "switchRole": "Switch area", + "organizer": "Organize", + "participant": "Sell", "admin": "Admin", "badge": { "notifications": "{{count}} new notifications", @@ -61,7 +61,9 @@ "messages": "{{count}} open contact requests", "organizerMessages": "{{count}} new messages from the organizer" }, - "categories": "Categories" + "categories": "Categories", + "allBazaars": "All bazaars", + "sales": "Sales" }, "footer": { "tagline": "The modern platform for marketplace events", @@ -124,10 +126,6 @@ "recipients": " · to {{count}} sellers ({{audience}})", "important": "Important", "new": "New", - "recentTitle": "Latest messages to sellers", - "write": "Message to sellers", - "noneSent": "No messages sent yet. Sellers get them by email and see a red marker in their menu.", - "showAll": "All messages", "fromOrganizer": "Messages from the organizer" }, "time": { diff --git a/src/locales/en/dashboard.json b/src/locales/en/dashboard.json index 790a8dcd..c9aa2dbb 100644 --- a/src/locales/en/dashboard.json +++ b/src/locales/en/dashboard.json @@ -9,33 +9,35 @@ "noProducts": "No items registered yet", "sellerNumber": "Seller number {{number}}", "paid": "Fee paid", - "manageProducts": "Manage items", "openEvent": "View bazaar", "more_one": "and {{count}} more bazaar", "more_other": "and {{count}} more bazaars", "none": "You have not registered for a bazaar yet.", - "noneSingle": "You have not registered for the current bazaar yet.", - "find": "Find a bazaar" + "noneSingle": "You have not registered for the current bazaar yet." }, "seller": { - "title": "Selling", - "products_one": "{{count}} available item", - "products_other": "{{count}} available items", "sales_one": "{{count}} sold · €{{payout}} payout", "sales_other": "{{count}} sold · €{{payout}} payout", - "noSales": "Nothing sold yet", - "newProduct": "New item" + "noSales": "Nothing sold yet" }, "organizer": { - "current": "Your event", - "later": "Other events", - "none": "No other upcoming events.", + "current": "Your current bazaar", + "later": "More bazaars", + "none": "No other upcoming bazaars.", "showAll": "Show all {{count}}", "showLess": "Show less", - "past": "Past events ({{count}})", - "select": "Select", + "past": "Past bazaars ({{count}})", "approved": "Approved", - "checkout": "Checkout" + "open": "Open" }, - "aboutBazarPro": "More about BazarPro" + "steps": { + "title": "What comes next", + "register": "Register for a bazaar", + "registered": "Registered for the bazaar", + "products": "Add items", + "labels": "Print labels and hand in", + "labelsText": "The organizer tells you when to hand in", + "dropoff": "Hand-in from {{date}}", + "payout": "Sale and payout" + } } diff --git a/src/locales/en/events.json b/src/locales/en/events.json index 59225acf..1b07345d 100644 --- a/src/locales/en/events.json +++ b/src/locales/en/events.json @@ -134,7 +134,7 @@ "soldHere": "You sold here", "sellingHere": "You are selling here", "myProducts": "My items", - "join": "Join as a seller", + "join": "Register as a seller", "categories": "Categories", "services": "Additional services", "map": "Site map", diff --git a/src/locales/en/onboarding.json b/src/locales/en/onboarding.json index df108c4b..1beb7c34 100644 --- a/src/locales/en/onboarding.json +++ b/src/locales/en/onboarding.json @@ -5,7 +5,7 @@ }, "participant-role-switch": { "title": "Switch roles at any time", - "description": "You start in the participant view. With BazarPro you can take part in events as well as create your own. Switch your role here at any time." + "description": "You start in the “Sell” area. With BazarPro you can take part in events as well as create your own. Switch the area here at any time." }, "participant-participant-nav": { "title": "Navigation", @@ -37,11 +37,11 @@ }, "organizer-role-switch": { "title": "Switch roles at any time", - "description": "Perfect! We have already selected the organizer view for you. With BazarPro you can take part in events as well as organize events yourself. Switch your role here at any time." + "description": "Perfect! We have already selected the “Organize” area for you. With BazarPro you can take part in events as well as organize events yourself. Switch the area here at any time." }, "organizer-new-event-button": { - "title": "Create a new event", - "description": "Start a new event here. Click “New event” to define title, location, dates and further details." + "title": "Create a new bazaar", + "description": "Start a new event here. Click “New bazaar” to define title, location, dates and further details." }, "organizer-new-event-details": { "title": "Fill in the event details", @@ -54,7 +54,7 @@ "question": "What would you like to do first?", "participant": "Take part as a seller", "participantHint": "Find events and list items.", - "organizer": "Create an event", + "organizer": "Create a bazaar", "organizerHint": "Set up an event and invite sellers.", "stopTitle": "Do you really want to end the tour?", "stopShort": "It only takes 1–2 minutes and helps you get started quickly.", diff --git a/src/locales/en/organizer.json b/src/locales/en/organizer.json index c85cc924..052999d2 100644 --- a/src/locales/en/organizer.json +++ b/src/locales/en/organizer.json @@ -19,12 +19,11 @@ "endAfterStart": "The end date must be after the start date", "discountInEvent": "Discounts must start during the event", "templateApplied": "Data taken from the template. Please adjust it.", - "updated": "Event updated", - "created": "Event created", - "saveFailed": "The event could not be saved", + "updated": "Bazaar saved", + "created": "Bazaar created", + "saveFailed": "Could not save the bazaar", "notFound": "Event not found", - "editTitle": "Edit event", - "newTitle": "Create new event", + "newTitle": "Create a new bazaar", "template": "Use previous data", "templateHint": "Use one of your past events as a template.", "chooseTemplate": "Choose template…", @@ -32,13 +31,14 @@ "running": "The event is running. Dates, commission and visibility are locked until the end so that settlement and approval stay correct. You can still change everything else, for example from when discounts are allowed.", "creating": "Creating…", "save": "Save", - "create": "Create event", + "create": "Create bazaar", "registeredMaxCommission": "Sellers have registered: at most {{percent}} %", "registeredMaxIntakeFee": "Sellers have registered: at most {{fee}} €", "registeredMinItems": "Sellers have registered: at least {{min}} items", "postalCodeInvalid": "Please enter a valid postal code", "cityRequired": "Please add the town to the postal code", - "addressTooLong": "Too long" + "addressTooLong": "Too long", + "unsaved": "Unsaved changes" }, "basic": { "title": "Basic information", @@ -179,14 +179,14 @@ "rejected": "Rejected", "pending": "Approval pending", "reviewing": "Being reviewed – this usually only takes a short time.", - "title": "My events", + "title": "My bazaars", "showPast": "Show past events", - "new": "New event", + "new": "New bazaar", "ended": "Ended", "helper": "Helper", - "open": "Open event", + "open": "Open bazaar", "none": "No events found", - "create": "Create new event" + "create": "Create a new bazaar" }, "dashboard": { "notFound": "Event not found.", @@ -204,12 +204,27 @@ "publicView": "Public view", "products": "Items", "participants": "Participants", - "revenue": "Revenue" + "revenue": "Revenue", + "steps": { + "title": "How your bazaar is going", + "sellers": "Get sellers to register", + "sellersText_one": "{{count}} seller registered", + "sellersText_other": "{{count}} sellers registered", + "intake": "Take in items", + "intakeWaiting_one": "{{count}} item waiting for intake", + "intakeWaiting_other": "{{count}} items waiting for intake", + "intakeText_one": "{{count}} item registered", + "intakeText_other": "{{count}} items registered", + "sale": "Sell at the cash desk", + "saleText": "{{sold}} of {{total}} sold · €{{revenue}} revenue", + "settle": "Settle and pay out", + "settleText": "{{settled}} of {{total}} sellers settled" + } }, "settingsPage": { - "deleted": "Event deleted", + "deleted": "Bazaar deleted", "deleteFailed": "Deleting failed", - "title": "Event settings", + "title": "Settings", "ended": "The event is over and can no longer be edited.", "approval": "Approval status", "approved": "Approved", @@ -217,11 +232,11 @@ "rejected": "Rejected", "reason": "Reason: {{reason}}", "reviewing": "Your event is being reviewed. This should not take long – please be patient for a moment.", - "edit": "Edit settings", - "delete": "Delete event", - "deleteTitle": "Really delete the event?", + "delete": "Delete bazaar", + "deleteTitle": "Delete bazaar", "deleteText": "This cannot be undone. All event data is deleted permanently.", - "deleteConfirm": "Delete" + "deleteConfirm": "Delete", + "deleteHint": "All data of the bazaar is deleted for good. This cannot be undone." }, "summary": { "active": "on", @@ -269,7 +284,7 @@ "helperAdded": "{{name}} was added as a helper", "actionFailed": "Action failed", "unknownError": "Unknown error", - "title": "Participants & helpers", + "title": "Sellers & helpers", "broadcast": "Message to sellers", "walkIn": "Seller without account", "search": "Name, email or number", @@ -307,7 +322,9 @@ "sortClashNote": "Note: another basket has the same pattern. Check the letter: labels without a letter belong in the basket without a letter.", "basketLabel": "Print basket label", "allLabels": "All labels", - "allLabelsHint": "The item labels of all sellers of this bazaar as one PDF, seller by seller" + "allLabelsHint": "The item labels of all sellers of this bazaar as one PDF, seller by seller", + "add": "Add", + "print": "Print" }, "settle": { "seller": "Seller", @@ -347,7 +364,7 @@ "done": "Done, finish" }, "cash": { - "title": "Cash count", + "title": "Settlement", "shouldBe": "Should be in the till", "pending": "Still to pay out to sellers", "commissionAndFees": "Commission and intake fees (stay with the organizer)", @@ -387,7 +404,7 @@ "noteFailed": "The note could not be saved", "receiptSent": "The receipt is being emailed", "noSale": "No sale was found for this item.", - "title": "Item management", + "title": "Items", "search": "Search item or seller…", "clearSearch": "Clear search", "suggestions": "Suggested participants", diff --git a/src/pages/dashboard/DashboardPage.test.tsx b/src/pages/dashboard/DashboardPage.test.tsx index e8eb309f..c610f6ea 100644 --- a/src/pages/dashboard/DashboardPage.test.tsx +++ b/src/pages/dashboard/DashboardPage.test.tsx @@ -98,17 +98,17 @@ describe('DashboardPage', () => { expect(screen.getByRole('heading', { name: kita.title })).toBeInTheDocument(); expect(screen.getByText('2 Artikel angemeldet')).toBeInTheDocument(); expect(screen.getByText('Verkäufernummer 17')).toBeInTheDocument(); - expect(screen.getByText('Gebühr bezahlt')).toBeInTheDocument(); // Past bazaars do not count expect(screen.getByText('und 1 weiterer Basar')).toBeInTheDocument(); - expect(screen.getByText('3 verfügbare Artikel')).toBeInTheDocument(); - expect(screen.getByText('2 verkauft · 12,50 € Auszahlung')).toBeInTheDocument(); + expect( + screen.getByText('2 verkauft · 12,50 € Auszahlung · Gebühr bezahlt') + ).toBeInTheDocument(); }); it('leads to the items of that bazaar', () => { seller(); renderAt(); - fireEvent.click(screen.getByRole('button', { name: 'Artikel verwalten' })); + fireEvent.click(screen.getByRole('link', { name: /Artikel anlegen/ })); expect(screen.getByTestId('where')).toHaveTextContent('/my-products|{"filterEvent":"e1"}'); }); @@ -148,33 +148,27 @@ describe('DashboardPage', () => { const current = screen.getByTestId('current-event'); expect(within(current).getByRole('heading', { name: kita.title })).toBeInTheDocument(); expect(within(current).getByText('Freigegeben')).toBeInTheDocument(); - const later = screen - .getByRole('heading', { name: 'Weitere Veranstaltungen' }) - .closest('section')!; + const later = screen.getByRole('heading', { name: 'Weitere Basare' }).closest('section')!; expect(within(later).getByText('Fahrradbörse Ulm')).toBeInTheDocument(); expect(within(later).getByText('Freigabe ausstehend')).toBeInTheDocument(); // Past events stay folded until asked for expect(screen.queryByText('Frühjahrsbasar')).toBeNull(); - fireEvent.click(screen.getByRole('button', { name: 'Vergangene Veranstaltungen (1)' })); + fireEvent.click(screen.getByRole('button', { name: 'Vergangene Basare (1)' })); expect(screen.getByText('Frühjahrsbasar')).toBeInTheDocument(); // Opening the overview clears the organizer's menu marker expect(markSeen).toHaveBeenCalledWith({ area: 'events' }); // Only this role - expect(screen.queryByRole('heading', { name: 'Verkaufen' })).toBeNull(); - fireEvent.click(within(current).getByRole('button', { name: 'Kasse' })); - expect(screen.getByTestId('where')).toHaveTextContent('/events/view/o1/checkout'); + expect(screen.queryByRole('heading', { name: 'So geht es weiter' })).toBeNull(); + fireEvent.click(within(current).getByRole('button', { name: 'Basar öffnen' })); + expect(screen.getByTestId('where')).toHaveTextContent('/events/view/o1'); }); - it('switches the current event to the one chosen in the overview', () => { + it('opens another event from the overview', () => { organizer([event('o1', kita.title, 3), event('o2', 'Fahrradbörse Ulm', 12)]); renderAt(); - const later = screen - .getByRole('heading', { name: 'Weitere Veranstaltungen' }) - .closest('section')!; - fireEvent.click(within(later).getByRole('button', { name: 'Auswählen' })); - expect( - within(screen.getByTestId('current-event')).getByRole('heading', { name: 'Fahrradbörse Ulm' }) - ).toBeInTheDocument(); + const later = screen.getByRole('heading', { name: 'Weitere Basare' }).closest('section')!; + fireEvent.click(within(later).getByRole('button', { name: 'Öffnen' })); + expect(screen.getByTestId('where')).toHaveTextContent('/events/view/o2'); }); it('keeps an event chosen before, e.g. by opening its page', () => { @@ -205,9 +199,7 @@ describe('DashboardPage', () => { ) ); renderAt(); - const later = screen - .getByRole('heading', { name: 'Weitere Veranstaltungen' }) - .closest('section')!; + const later = screen.getByRole('heading', { name: 'Weitere Basare' }).closest('section')!; expect(within(later).getAllByRole('listitem')).toHaveLength(3); fireEvent.click(within(later).getByRole('button', { name: 'Alle 5 anzeigen' })); expect(within(later).getAllByRole('listitem')).toHaveLength(5); @@ -219,7 +211,7 @@ describe('DashboardPage', () => { organizer([]); renderAt(); expect(screen.getByText('Keine Veranstaltungen gefunden')).toBeInTheDocument(); - fireEvent.click(screen.getByRole('button', { name: 'Neue Veranstaltung' })); + fireEvent.click(screen.getByRole('button', { name: 'Neuer Basar' })); expect(screen.getByTestId('where')).toHaveTextContent('/events/new'); }); @@ -240,7 +232,7 @@ describe('DashboardPage', () => { seller(); role.current = 'organizer'; renderAt(); - expect(screen.getByRole('heading', { name: 'Verkaufen' })).toBeInTheDocument(); + expect(screen.getByRole('heading', { name: 'So geht es weiter' })).toBeInTheDocument(); }); it('shows admins the admin overview', () => { @@ -248,7 +240,7 @@ describe('DashboardPage', () => { role.current = 'administrator'; renderAt(); expect(screen.getByRole('heading', { name: 'Admin-Übersicht' })).toBeInTheDocument(); - expect(screen.queryByRole('heading', { name: 'Verkaufen' })).toBeNull(); + expect(screen.queryByRole('heading', { name: 'So geht es weiter' })).toBeNull(); }); it('speaks of the current bazaar on a self-hosted instance', () => { diff --git a/src/pages/organizer/events/EditEventForm.edit.test.tsx b/src/pages/organizer/events/EditEventForm.edit.test.tsx index 741ad1ce..6ad77b93 100644 --- a/src/pages/organizer/events/EditEventForm.edit.test.tsx +++ b/src/pages/organizer/events/EditEventForm.edit.test.tsx @@ -121,7 +121,7 @@ describe('editing an event', () => { mockBackend({ event: storedEvent(Date.now() + 24 * HOUR) }); renderAt('/events/edit/event1'); - expect(screen.getByRole('heading', { name: 'Veranstaltung bearbeiten' })).toBeInTheDocument(); + expect(screen.getByRole('heading', { name: 'Einstellungen' })).toBeInTheDocument(); expect(screen.queryByText(/Schritt \d von/)).not.toBeInTheDocument(); const title = await screen.findByLabelText('Titel der Veranstaltung *'); await waitFor(() => expect(title).toHaveValue('Fahrradbörse')); @@ -164,7 +164,7 @@ describe('editing an event', () => { it('tells when the event does not exist', () => { mockBackend({ event: null }); renderAt('/events/edit/missing'); - expect(screen.getByText('Event nicht gefunden')).toBeInTheDocument(); + expect(screen.getByText('Basar nicht gefunden')).toBeInTheDocument(); }); }); @@ -228,7 +228,7 @@ describe('creation wizard', () => { // The last step shows the bazaar page expect(await screen.findByText('So sieht dein Basar aus')).toBeInTheDocument(); expect(screen.getByText('bazarpro.de/basar')).toBeInTheDocument(); - fireEvent.click(screen.getByRole('button', { name: 'Veranstaltung erstellen' })); + fireEvent.click(screen.getByRole('button', { name: 'Basar anlegen' })); await waitFor(() => expect(createEvent).toHaveBeenCalledTimes(1)); expect(createEvent.mock.calls[0][0]).toMatchObject({ commission: 15, diff --git a/src/pages/organizer/events/EditEventForm.wizard.test.tsx b/src/pages/organizer/events/EditEventForm.wizard.test.tsx index 0c0260bb..1b4a5a23 100644 --- a/src/pages/organizer/events/EditEventForm.wizard.test.tsx +++ b/src/pages/organizer/events/EditEventForm.wizard.test.tsx @@ -144,7 +144,7 @@ describe('event creation wizard', () => { expect(await screen.findByText('So sieht dein Basar aus')).toBeInTheDocument(); expect(screen.getAllByText('Fahrradbörse Ulm').length).toBeGreaterThan(0); expect(screen.getByText('Hollandrad, 28 Zoll')).toBeInTheDocument(); - fireEvent.click(screen.getByRole('button', { name: 'Veranstaltung erstellen' })); + fireEvent.click(screen.getByRole('button', { name: 'Basar anlegen' })); await waitFor(() => expect(createEvent).toHaveBeenCalledTimes(1)); expect(createEvent.mock.calls[0][0]).toMatchObject({ @@ -266,7 +266,7 @@ describe('event creation wizard', () => { 'aria-pressed', 'true' ); - fireEvent.click(screen.getByRole('button', { name: 'Veranstaltung erstellen' })); + fireEvent.click(screen.getByRole('button', { name: 'Basar anlegen' })); await waitFor(() => expect(createEvent).toHaveBeenCalledTimes(1)); expect(fetch).toHaveBeenCalledWith('/images/covers/kids.webp'); expect(createEvent.mock.calls[0][0]).toMatchObject({ @@ -295,7 +295,7 @@ describe('event creation wizard', () => { expect(await screen.findByText('Abgabe und Abholung')).toBeInTheDocument(); next(); expect(await screen.findByText('So sieht dein Basar aus')).toBeInTheDocument(); - fireEvent.click(screen.getByRole('button', { name: 'Veranstaltung erstellen' })); + fireEvent.click(screen.getByRole('button', { name: 'Basar anlegen' })); await waitFor(() => expect(createEvent).toHaveBeenCalledTimes(1)); expect(createEvent.mock.calls[0][0].coverImage).toBeUndefined(); consoleError.mockRestore(); diff --git a/src/pages/seller/events/SearchEventsPage.test.tsx b/src/pages/seller/events/SearchEventsPage.test.tsx index 1cdab8a3..d3dac147 100644 --- a/src/pages/seller/events/SearchEventsPage.test.tsx +++ b/src/pages/seller/events/SearchEventsPage.test.tsx @@ -100,7 +100,7 @@ function renderPage() { } const search = (text: string) => - fireEvent.change(screen.getByPlaceholderText('Events suchen…'), { target: { value: text } }); + fireEvent.change(screen.getByPlaceholderText('Basare suchen…'), { target: { value: text } }); describe('find bazaars', () => { beforeEach(() => { @@ -159,7 +159,7 @@ describe('find bazaars', () => { expect(within(discover).getByText(LONG_TITLE)).toBeTruthy(); // The own bazaars stay visible whatever the search search('herbst'); - expect(within(discover).getByText('Keine Events gefunden.')).toBeTruthy(); + expect(within(discover).getByText('Keine Basare gefunden.')).toBeTruthy(); expect(screen.getByRole('region', { name: 'Meine Basare' })).toBeTruthy(); }); @@ -191,7 +191,7 @@ describe('find bazaars', () => { leaveEvent.mockResolvedValue(null); mockQueries([MINE]); renderPage(); - fireEvent.click(screen.getByRole('button', { name: 'Vom Event abmelden' })); + fireEvent.click(screen.getByRole('button', { name: 'Vom Basar abmelden' })); fireEvent.click(await screen.findByRole('button', { name: 'Abmelden' })); await waitFor(() => expect(toast.success).toHaveBeenCalledWith('Abmeldung von Herbstbasar erfolgreich') @@ -204,7 +204,7 @@ describe('find bazaars', () => { leaveEvent.mockRejectedValue(new Error('')); mockQueries([MINE]); renderPage(); - fireEvent.click(screen.getByRole('button', { name: 'Vom Event abmelden' })); + fireEvent.click(screen.getByRole('button', { name: 'Vom Basar abmelden' })); fireEvent.click(await screen.findByRole('button', { name: 'Abmelden' })); await waitFor(() => expect(toast.error).toHaveBeenCalledWith('Abmeldung fehlgeschlagen', { diff --git a/src/tests/admin/event-approval.spec.ts b/src/tests/admin/event-approval.spec.ts index 806ba8ea..32e61e07 100644 --- a/src/tests/admin/event-approval.spec.ts +++ b/src/tests/admin/event-approval.spec.ts @@ -36,7 +36,7 @@ async function login(page: Page, email: string, password: string) { async function createEvent(page: Page, eventTitle: string, startDate: Date, endDate: Date) { await page.goto('/my-events'); - await page.getByRole('button', { name: 'Neue Veranstaltung' }).click(); + await page.getByRole('button', { name: 'Neuer Basar' }).click(); await fillEventWizard(page, { title: eventTitle, description: 'E2E Freigabe-Test', @@ -46,7 +46,7 @@ async function createEvent(page: Page, eventTitle: string, startDate: Date, endD category: 'Sport', contact: 'Demo Veranstalter\ninfo@bazarpro.de', }); - await expect(page.getByText('Veranstaltung erfolgreich erstellt')).toBeVisible(); + await expect(page.getByText('Basar angelegt')).toBeVisible(); // A new event opens right away await page.waitForURL(/\/events\/view\/[^/]+/); return extractEventId(page.url()); diff --git a/src/tests/admin/moderation.spec.ts b/src/tests/admin/moderation.spec.ts index da9639f2..8a9bf321 100644 --- a/src/tests/admin/moderation.spec.ts +++ b/src/tests/admin/moderation.spec.ts @@ -33,12 +33,10 @@ test('admin manages a foreign event with organizer rights', async ({ page }, tes // Used to crash with "Not authorized" for admins await page.goto(`/events/view/${showcase.eventId}/products`); - await expect(page.getByRole('heading', { name: 'Artikelverwaltung' })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'Artikel', exact: true })).toBeVisible(); await expect(page.getByText('Trekkingrad Cube Touring').first()).toBeVisible(); await page.goto(`/events/view/${showcase.eventId}/settings`); - await expect(page.getByRole('button', { name: 'Einstellungen bearbeiten' })).toBeEnabled(); - await page.getByRole('button', { name: 'Einstellungen bearbeiten' }).click(); await expect(page.getByLabel('Titel der Veranstaltung *')).toHaveValue(showcase.title); }); diff --git a/src/tests/auth/events.coorganizer.spec.ts b/src/tests/auth/events.coorganizer.spec.ts index 9bc732ae..89e51fa2 100644 --- a/src/tests/auth/events.coorganizer.spec.ts +++ b/src/tests/auth/events.coorganizer.spec.ts @@ -18,7 +18,7 @@ test.describe('co-organizer permissions', () => { await login(page, 'admin@bazarpro.de', '123456'); await page.goto('/my-events'); - const newEventButton = page.getByRole('button', { name: 'Neue Veranstaltung' }); + const newEventButton = page.getByRole('button', { name: 'Neuer Basar' }); await expect(newEventButton).toBeVisible(); await newEventButton.click(); await page.waitForURL('**/events/new'); @@ -31,7 +31,7 @@ test.describe('co-organizer permissions', () => { category: 'Sport', contact: 'Demo Veranstalter\ninfo@bazarpro.de', }); - await expect(page.getByText('Veranstaltung erfolgreich erstellt')).toBeVisible(); + await expect(page.getByText('Basar angelegt')).toBeVisible(); // A new event opens right away await page.waitForURL(/\/events\/view\/[^/]+/); const eventId = extractEventId(page.url()); @@ -46,12 +46,12 @@ test.describe('co-organizer permissions', () => { await page.goto(`/events/view/${eventId}`); const participantsButton = page .getByRole('navigation') - .getByRole('button', { name: 'Teilnehmer' }); + .getByRole('button', { name: 'Verkäufer', exact: true }); await expect(participantsButton).toBeVisible(); await participantsButton.click(); await page.waitForURL('**/sellers'); - await expect(page.getByRole('heading', { name: 'Teilnehmer & Helfer' })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'Verkäufer & Helfer' })).toBeVisible(); // The list might take a moment to sync from the background join action const sellerRow = page.getByRole('row', { name: /Demo Seller/i }); @@ -74,12 +74,12 @@ test.describe('co-organizer permissions', () => { await sellerPage.goto(`/events/view/${eventId}`); const sellerParticipantsButton = sellerPage .getByRole('navigation') - .getByRole('button', { name: 'Teilnehmer' }); + .getByRole('button', { name: 'Verkäufer', exact: true }); await expect(sellerParticipantsButton).toBeVisible(); await sellerParticipantsButton.click(); await sellerPage.waitForURL('**/sellers'); - await expect(sellerPage.getByRole('heading', { name: 'Teilnehmer & Helfer' })).toBeVisible(); + await expect(sellerPage.getByRole('heading', { name: 'Verkäufer & Helfer' })).toBeVisible(); await expect(sellerPage.getByRole('button', { name: 'Zum Helfer ernennen' })).toHaveCount(0); await expect(sellerPage.getByRole('button', { name: 'Helfer-Rechte entziehen' })).toHaveCount( 0 @@ -122,9 +122,9 @@ function extractEventId(url: string) { async function joinEventAsSeller(page: Page, eventId: string) { await page.goto(`/public-events/${eventId}`); - await expect(page.getByRole('button', { name: 'Als Verkäufer beitreten' })).toBeVisible(); + await expect(page.getByRole('button', { name: 'Als Verkäufer anmelden' })).toBeVisible(); - await page.getByRole('button', { name: 'Als Verkäufer beitreten' }).click(); + await page.getByRole('button', { name: 'Als Verkäufer anmelden' }).click(); const profileForm = page.getByTestId('join-event-form'); if (await profileForm.isVisible({ timeout: 5000 }).catch(() => false)) { await fillProfileForm(page); diff --git a/src/tests/auth/events.spec.ts b/src/tests/auth/events.spec.ts index 9fcb6033..56e56474 100644 --- a/src/tests/auth/events.spec.ts +++ b/src/tests/auth/events.spec.ts @@ -17,7 +17,7 @@ test.describe('event creation and co-organizer flow', () => { await login(page, 'admin@bazarpro.de', '123456'); await page.goto('/my-events'); - await page.getByRole('button', { name: 'Neue Veranstaltung' }).click(); + await page.getByRole('button', { name: 'Neuer Basar' }).click(); await fillEventWizard(page, { title: eventTitle, @@ -28,7 +28,7 @@ test.describe('event creation and co-organizer flow', () => { category: 'Sport', contact: 'Demo Veranstalter\ninfo@bazarpro.de', }); - await expect(page.getByText('Veranstaltung erfolgreich erstellt')).toBeVisible(); + await expect(page.getByText('Basar angelegt')).toBeVisible(); // A new event opens right away and becomes the chosen one in the overview await page.waitForURL(/\/events\/view\/[^/]+/); const eventId = extractEventId(page.url()); @@ -36,10 +36,7 @@ test.describe('event creation and co-organizer flow', () => { await expect( page.getByTestId('current-event').getByRole('heading', { name: eventTitle }) ).toBeVisible(); - await page - .getByTestId('current-event') - .getByRole('button', { name: 'Zur Veranstaltung' }) - .click(); + await page.getByTestId('current-event').getByRole('button', { name: 'Basar öffnen' }).click(); await page.waitForURL(`**/events/view/${eventId}`); await approveEventByTitle(page, eventTitle); @@ -47,8 +44,8 @@ test.describe('event creation and co-organizer flow', () => { const sellerPage = await sellerContext.newPage(); await login(sellerPage, 'seller@bazarpro.de', '123456'); await sellerPage.goto(`/public-events/${eventId}`); - await expect(sellerPage.getByRole('button', { name: 'Als Verkäufer beitreten' })).toBeVisible(); - await sellerPage.getByRole('button', { name: 'Als Verkäufer beitreten' }).click(); + await expect(sellerPage.getByRole('button', { name: 'Als Verkäufer anmelden' })).toBeVisible(); + await sellerPage.getByRole('button', { name: 'Als Verkäufer anmelden' }).click(); // Seed users have no phone number, so the dialog may ask for contact data first const firstNameField = sellerPage.getByRole('textbox', { name: 'Vorname' }); if (await firstNameField.isVisible({ timeout: 5000 }).catch(() => false)) { @@ -61,12 +58,12 @@ test.describe('event creation and co-organizer flow', () => { await page.goto(`/events/view/${eventId}`); const participantsButton = page .getByRole('navigation') - .getByRole('button', { name: 'Teilnehmer' }); + .getByRole('button', { name: 'Verkäufer', exact: true }); await expect(participantsButton).toBeVisible(); await participantsButton.click(); await page.waitForURL('**/sellers'); - await expect(page.getByRole('heading', { name: 'Teilnehmer & Helfer' })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'Verkäufer & Helfer' })).toBeVisible(); const sellerRow = page.getByRole('row', { name: /Demo Seller/i }); await expect(sellerRow).toBeVisible(); await sellerRow.getByRole('button', { name: 'Zum Helfer ernennen' }).click(); diff --git a/src/tests/auth/features.spec.ts b/src/tests/auth/features.spec.ts index c2a4f6d0..f64172d1 100644 --- a/src/tests/auth/features.spec.ts +++ b/src/tests/auth/features.spec.ts @@ -27,25 +27,20 @@ test.describe.configure({ timeout: 120_000 }); async function openProductInManagement(page: Page, eventId: string, productId: string) { await page.goto(`/events/view/${eventId}/products?q=${productId}&tab=all`); - await expect(page.getByRole('heading', { name: 'Artikelverwaltung' })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'Artikel', exact: true })).toBeVisible(); } test.describe('event settings', () => { - test('organizer sees the current settings and edits the discount start of a running event', async ({ + test('organizer edits the discount start of a running event in the settings', async ({ page, }, testInfo) => { const showcase = createShowcase(testInfo, 'Settings'); await login(page, ORGANIZER); await page.goto(`/events/view/${showcase.eventId}/settings`); - const summary = page.getByTestId('event-settings-summary'); - await expect(summary).toContainText('10 %'); - await expect(summary).toContainText('Artikel rabattieren'); - await expect(summary).toContainText('höchstens 30 %'); - await expect(summary).toContainText('Preisvorschläge online'); - await expect(summary).toContainText('Fragen an den Verkäufer'); - - await page.getByRole('button', { name: 'Einstellungen bearbeiten' }).click(); + await expect(page.locator('#commission')).toHaveValue('10'); + await expect(page.locator('#maxDiscountPercent')).toHaveValue('30'); + await expect(page.getByLabel('Preisvorschläge online')).toBeChecked(); await expect(page.getByText('Die Veranstaltung läuft gerade.')).toBeVisible(); await expect(page.locator('#startDate')).toHaveAttribute('readonly', ''); await expect(page.locator('#commission')).toHaveAttribute('readonly', ''); @@ -59,10 +54,10 @@ test.describe('event settings', () => { await page.locator('#maxDiscountPercent').fill('25'); await page.getByRole('button', { name: 'Speichern' }).click(); - await expectToast(page, 'Veranstaltung erfolgreich aktualisiert'); + await expectToast(page, 'Basar gespeichert'); await page.goto(`/events/view/${showcase.eventId}/settings`); - await expect(summary).toContainText(`${pad(start.getHours())}:00 Uhr`); - await expect(summary).toContainText('höchstens 25 %'); + await expect(page.locator('#discountStartsAt')).toHaveValue(local); + await expect(page.locator('#maxDiscountPercent')).toHaveValue('25'); }); test('participants list shows the sellers of the event, including walk-ins', async ({ @@ -111,7 +106,11 @@ test.describe('price offers', () => { // Organizer sells with the accepted offer await login(page, ORGANIZER); await openProductInManagement(page, showcase.eventId, showcase.products.trekking); - await page.getByRole('button', { name: 'Verkaufen', exact: true }).first().click(); + await page + .locator('main') + .getByRole('button', { name: 'Verkaufen', exact: true }) + .first() + .click(); await page.getByRole('radio', { name: /Angenommener Vorschlag/ }).click(); await expect(page.getByText('370,00 €').last()).toBeVisible(); await page.getByLabel(/erhalten/).click(); @@ -127,7 +126,11 @@ test.describe('price offers', () => { const showcase = createShowcase(testInfo, 'Negotiate'); await login(page, ORGANIZER); await openProductInManagement(page, showcase.eventId, showcase.products.trekking); - await page.getByRole('button', { name: 'Verkaufen', exact: true }).first().click(); + await page + .locator('main') + .getByRole('button', { name: 'Verkaufen', exact: true }) + .first() + .click(); await page.getByRole('radio', { name: /Verhandelt \(ab 350,00 €\)/ }).click(); const price = page.getByLabel('Verhandelter Preis'); @@ -257,7 +260,8 @@ test.describe('organizer tools', () => { await login(page, ORGANIZER); await page.goto(`/events/view/${showcase.eventId}/sellers`); - await page.getByRole('button', { name: 'Verkäufer ohne Konto' }).click(); + await page.getByRole('button', { name: 'Hinzufügen' }).click(); + await page.getByRole('menuitem', { name: 'Verkäufer ohne Konto' }).click(); await page.getByLabel('Vorname *').fill('Max'); await page.getByLabel('Nachname *').fill('Vorort'); await page.getByLabel('Telefon').fill('0170 1234567'); diff --git a/src/tests/auth/navigation.spec.ts b/src/tests/auth/navigation.spec.ts index 54a2ed75..f9635db7 100644 --- a/src/tests/auth/navigation.spec.ts +++ b/src/tests/auth/navigation.spec.ts @@ -35,7 +35,7 @@ test('logged-in user gets the overview instead of the landing page', async ({ pa await login(page, BUYER); await page.goto('/'); await expect(page.getByRole('heading', { level: 1, name: /^Hallo/ })).toBeVisible(); - await expect(page.getByRole('heading', { name: 'Verkaufen' })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'So geht es weiter' })).toBeVisible(); // The app layout, not the full-width landing page await expect(page.getByRole('button', { name: 'Übersicht' }).first()).toBeVisible(); }); diff --git a/src/tests/auth/products.spec.ts b/src/tests/auth/products.spec.ts index 61b70b14..d7d8fa47 100644 --- a/src/tests/auth/products.spec.ts +++ b/src/tests/auth/products.spec.ts @@ -40,7 +40,7 @@ test.describe('product inventory flow as co-organizer', () => { await sellerProductsButton.click(); await sellerPage.waitForURL('**/products'); - await expect(sellerPage.getByRole('heading', { name: 'Artikelverwaltung' })).toBeVisible(); + await expect(sellerPage.getByRole('heading', { name: 'Artikel', exact: true })).toBeVisible(); await markAvailableAndSell(sellerPage, productTitleSold); await markAvailableAndReturn(sellerPage, productTitleReturn); @@ -59,7 +59,7 @@ async function login(page: Page, email: string, password: string) { async function createEvent(page: Page, eventTitle: string, startDate: Date, endDate: Date) { await page.goto('/my-events'); - await page.getByRole('button', { name: 'Neue Veranstaltung' }).click(); + await page.getByRole('button', { name: 'Neuer Basar' }).click(); await fillEventWizard(page, { title: eventTitle, description: 'E2E Inventur-Veranstaltung', @@ -69,7 +69,7 @@ async function createEvent(page: Page, eventTitle: string, startDate: Date, endD category: 'Sport', contact: 'Demo Veranstalter\ninfo@bazarpro.de', }); - await expect(page.getByText('Veranstaltung erfolgreich erstellt')).toBeVisible(); + await expect(page.getByText('Basar angelegt')).toBeVisible(); // A new event opens right away await page.waitForURL(/\/events\/view\/[^/]+/); return extractEventId(page.url()); @@ -77,8 +77,8 @@ async function createEvent(page: Page, eventTitle: string, startDate: Date, endD async function joinEventAsSeller(page: Page, eventId: string) { await page.goto(`/public-events/${eventId}`); - await expect(page.getByRole('button', { name: 'Als Verkäufer beitreten' })).toBeVisible(); - await page.getByRole('button', { name: 'Als Verkäufer beitreten' }).click(); + await expect(page.getByRole('button', { name: 'Als Verkäufer anmelden' })).toBeVisible(); + await page.getByRole('button', { name: 'Als Verkäufer anmelden' }).click(); const profileForm = page.getByTestId('join-event-form'); if (await profileForm.isVisible({ timeout: 5000 }).catch(() => false)) { await fillProfileForm(page); @@ -174,12 +174,12 @@ async function assignCoOrganizer(page: Page, eventId: string) { await page.goto(`/events/view/${eventId}`); const participantsButton = page .getByRole('navigation') - .getByRole('button', { name: 'Teilnehmer' }); + .getByRole('button', { name: 'Verkäufer', exact: true }); await expect(participantsButton).toBeVisible(); await participantsButton.click(); await page.waitForURL('**/sellers'); - await expect(page.getByRole('heading', { name: 'Teilnehmer & Helfer' })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'Verkäufer & Helfer' })).toBeVisible(); // The list might take a moment to sync from the background join action const sellerRow = page.getByRole('row', { name: /Demo Seller/i }); diff --git a/src/tests/auth/profile.spec.ts b/src/tests/auth/profile.spec.ts index 8a2c6114..a27edf57 100644 --- a/src/tests/auth/profile.spec.ts +++ b/src/tests/auth/profile.spec.ts @@ -146,13 +146,13 @@ test.describe('profile page', () => { await page.goto('/my-events'); - await page.getByRole('button', { name: 'Zur Veranstaltung' }).click(); + await page.getByRole('button', { name: 'Basar öffnen' }).click(); await page.waitForURL('**/events/view/*', { timeout: 10000 }); await page.goto(page.url() + '/settings'); - await expect(page.getByRole('heading', { name: 'Event-Einstellungen' })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'Einstellungen' })).toBeVisible(); - await page.getByRole('button', { name: 'Event löschen' }).click(); - await page.getByRole('button', { name: 'Löschen' }).click(); + await page.getByRole('button', { name: 'Basar löschen' }).click(); + await page.getByRole('button', { name: 'Löschen', exact: true }).click(); await expect(page.getByText('Keine Veranstaltungen gefunden')).toBeVisible({ timeout: 10000, }); diff --git a/src/tests/auth/roles.permissions.spec.ts b/src/tests/auth/roles.permissions.spec.ts index d03f02d1..934a312d 100644 --- a/src/tests/auth/roles.permissions.spec.ts +++ b/src/tests/auth/roles.permissions.spec.ts @@ -31,12 +31,12 @@ test.describe('role permissions', () => { await sellerPage.goto(`/events/view/${eventId}`); const sellerParticipantsButton = sellerPage .getByRole('navigation') - .getByRole('button', { name: 'Teilnehmer' }); + .getByRole('button', { name: 'Verkäufer', exact: true }); await expect(sellerParticipantsButton).toBeVisible(); await sellerParticipantsButton.click(); await sellerPage.waitForURL('**/sellers'); - await expect(sellerPage.getByRole('heading', { name: 'Teilnehmer & Helfer' })).toBeVisible(); + await expect(sellerPage.getByRole('heading', { name: 'Verkäufer & Helfer' })).toBeVisible(); await expect(sellerPage.getByRole('button', { name: 'Zum Helfer ernennen' })).toHaveCount(0); await expect(sellerPage.getByRole('button', { name: 'Helfer-Rechte entziehen' })).toHaveCount( 0 @@ -44,7 +44,9 @@ test.describe('role permissions', () => { // Navigate to Cash page await sellerPage.goto(`/events/view/${eventId}`); - await expect(sellerPage.getByText('Umsatz', { exact: true })).toBeVisible(); + await expect(sellerPage.getByRole('link', { name: /An der Kasse verkaufen/ })).toContainText( + 'Umsatz' + ); // Revenue card might lead to products?tab=sold, but there's no direct cash link in cards yet? // Wait, let's check the cards in EventManagementDashboard.tsx // Card 1: products, Card 2: sellers, Card 3: products?tab=sold @@ -56,19 +58,21 @@ test.describe('role permissions', () => { // No, I should stick to adapting the tests. await sellerPage.goto(`/events/view/${eventId}/cash`); - await expect(sellerPage.getByRole('heading', { name: 'Kassensturz' })).toBeVisible(); + await expect( + sellerPage.getByRole('heading', { name: 'Abrechnung', exact: true }) + ).toBeVisible(); await sellerPage.goto(`/events/view/${eventId}/settings`); - await expect(sellerPage.getByRole('heading', { name: 'Event-Einstellungen' })).toBeVisible(); - await expect( - sellerPage.getByRole('button', { name: 'Einstellungen bearbeiten' }) - ).toBeDisabled(); - await expect(sellerPage.getByRole('button', { name: 'Event löschen' })).toBeDisabled(); + // Helpers read the settings, only the organizer changes them + await expect(sellerPage.getByRole('heading', { name: 'Einstellungen' })).toBeVisible(); + await expect(sellerPage.getByTestId('event-settings-summary')).toBeVisible(); + await expect(sellerPage.getByRole('button', { name: 'Speichern' })).toHaveCount(0); + await expect(sellerPage.getByRole('button', { name: 'Basar löschen' })).toHaveCount(0); await page.goto(`/events/view/${eventId}/settings`); - await expect(page.getByRole('heading', { name: 'Event-Einstellungen' })).toBeVisible(); - await expect(page.getByRole('button', { name: 'Einstellungen bearbeiten' })).toBeEnabled(); - await expect(page.getByRole('button', { name: 'Event löschen' })).toBeEnabled(); + await expect(page.getByRole('heading', { name: 'Einstellungen' })).toBeVisible(); + await expect(page.getByRole('button', { name: 'Speichern' })).toBeEnabled(); + await expect(page.getByRole('button', { name: 'Basar löschen' })).toBeEnabled(); await sellerContext.close(); }); @@ -84,7 +88,7 @@ async function login(page: Page, email: string, password: string) { async function createEvent(page: Page, eventTitle: string, startDate: Date, endDate: Date) { await page.goto('/my-events'); - await page.getByRole('button', { name: 'Neue Veranstaltung' }).click(); + await page.getByRole('button', { name: 'Neuer Basar' }).click(); await fillEventWizard(page, { title: eventTitle, description: 'E2E Rollen-Test', @@ -94,7 +98,7 @@ async function createEvent(page: Page, eventTitle: string, startDate: Date, endD category: 'Sport', contact: 'Demo Veranstalter\ninfo@bazarpro.de', }); - await expect(page.getByText('Veranstaltung erfolgreich erstellt')).toBeVisible(); + await expect(page.getByText('Basar angelegt')).toBeVisible(); // A new event opens right away await page.waitForURL(/\/events\/view\/[^/]+/); return extractEventId(page.url()); @@ -103,9 +107,9 @@ async function createEvent(page: Page, eventTitle: string, startDate: Date, endD async function joinEventAsSeller(page: Page, eventId: string) { await page.goto(`/public-events/${eventId}`); - await expect(page.getByRole('button', { name: 'Als Verkäufer beitreten' })).toBeVisible(); + await expect(page.getByRole('button', { name: 'Als Verkäufer anmelden' })).toBeVisible(); - await page.getByRole('button', { name: 'Als Verkäufer beitreten' }).click(); + await page.getByRole('button', { name: 'Als Verkäufer anmelden' }).click(); const firstNameField = page.getByRole('textbox', { name: 'Vorname' }); if (await firstNameField.isVisible({ timeout: 5000 }).catch(() => false)) { await fillProfileForm(page); @@ -119,12 +123,12 @@ async function assignCoOrganizer(page: Page, eventId: string) { await page.goto(`/events/view/${eventId}`); const participantsButton = page .getByRole('navigation') - .getByRole('button', { name: 'Teilnehmer' }); + .getByRole('button', { name: 'Verkäufer', exact: true }); await expect(participantsButton).toBeVisible(); await participantsButton.click(); await page.waitForURL('**/sellers'); - await expect(page.getByRole('heading', { name: 'Teilnehmer & Helfer' })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'Verkäufer & Helfer' })).toBeVisible(); const sellerRow = page.getByRole('row', { name: /Demo Seller/i }); await sellerRow.getByRole('button', { name: 'Zum Helfer ernennen' }).click(); await page.getByRole('button', { name: 'Als Helfer ernennen' }).click(); diff --git a/src/tests/helpers/eventApproval.ts b/src/tests/helpers/eventApproval.ts index 33b72d8a..2b50dd75 100644 --- a/src/tests/helpers/eventApproval.ts +++ b/src/tests/helpers/eventApproval.ts @@ -2,7 +2,7 @@ import { expect, type Page } from '@playwright/test'; export async function approveEventByTitle(page: Page, eventTitle: string) { await page.goto('/admin/events'); - await expect(page.getByRole('heading', { name: 'Events', exact: true })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'Basare', exact: true })).toBeVisible(); // The list is paged: the event may not be on the first page await page.getByPlaceholder('Titel, Ort oder Veranstalter').fill(eventTitle); diff --git a/src/tests/helpers/eventForm.ts b/src/tests/helpers/eventForm.ts index a643cbe2..09c8dad9 100644 --- a/src/tests/helpers/eventForm.ts +++ b/src/tests/helpers/eventForm.ts @@ -18,7 +18,7 @@ export interface EventFormInput { */ export async function fillEventWizard(page: Page, input: EventFormInput) { const next = () => page.getByRole('button', { name: 'Weiter', exact: true }).click(); - await expect(page.getByRole('heading', { name: 'Neue Veranstaltung erstellen' })).toBeVisible(); + await expect(page.getByRole('heading', { name: 'Neuen Basar anlegen' })).toBeVisible(); await page.getByRole('button', { name: 'Ohne Vorlage weiter' }).click(); // Sale @@ -27,8 +27,8 @@ export async function fillEventWizard(page: Page, input: EventFormInput) { // Items const categorySection = page - .getByRole('heading', { name: 'Kategorien & Services' }) - .locator('..'); + .locator('section') + .filter({ has: page.getByRole('heading', { name: 'Kategorien & Services' }) }); await categorySection.getByText(input.category, { exact: true }).click(); await next(); @@ -51,5 +51,5 @@ export async function fillEventWizard(page: Page, input: EventFormInput) { await next(); await expect(page.getByRole('heading', { name: 'So sieht dein Basar aus' })).toBeVisible(); - await page.getByRole('button', { name: 'Veranstaltung erstellen' }).click(); + await page.getByRole('button', { name: 'Basar anlegen' }).click(); } diff --git a/src/tests/public/onboarding-trigger.spec.ts b/src/tests/public/onboarding-trigger.spec.ts index edf9f1ed..fb10d211 100644 --- a/src/tests/public/onboarding-trigger.spec.ts +++ b/src/tests/public/onboarding-trigger.spec.ts @@ -29,7 +29,7 @@ test('1) Registrierung ohne EventID -> Onboarding-Auswahl kommt sofort', async ( timeout: 15000, }); await expect(page.getByRole('button', { name: 'Als Verkäufer teilnehmen' })).toBeVisible(); - await expect(page.getByRole('button', { name: 'Veranstaltung erstellen' })).toBeVisible(); + await expect(page.getByRole('button', { name: 'Basar anlegen' })).toBeVisible(); }); test('2) Registrierung mit EventID + Neuer Artikel -> Onboarding nach Artikel hinzufügen', async ({ @@ -39,7 +39,7 @@ test('2) Registrierung mit EventID + Neuer Artikel -> Onboarding nach Artikel hi const uniqueEmail = makeUniqueEmail('join-create-product', testInfo.project.name); const eventTitle = await openFirstPublicEvent(page); - await page.getByRole('button', { name: 'Als Verkäufer beitreten' }).click(); + await page.getByRole('button', { name: 'Als Verkäufer anmelden' }).click(); await expect(page).toHaveURL(/\/register\?joinEventId=/); await registerAndVerify(page, uniqueEmail); @@ -49,7 +49,7 @@ test('2) Registrierung mit EventID + Neuer Artikel -> Onboarding nach Artikel hi await page.waitForURL((url) => !url.searchParams.has('openJoinDialog'), { timeout: 30000 }); setProfileForE2E(uniqueEmail); await page.reload(); - await page.getByRole('button', { name: 'Als Verkäufer beitreten' }).click(); + await page.getByRole('button', { name: 'Als Verkäufer anmelden' }).click(); await expect(page.getByRole('heading', { name: /^Anmeldung für / })).toBeVisible({ timeout: 20000, }); @@ -76,7 +76,7 @@ test('3) Registrierung mit EventID + Event-Wizard schließen -> Onboarding sofor const uniqueEmail = makeUniqueEmail('join-close-wizard', testInfo.project.name); await openFirstPublicEvent(page); - await page.getByRole('button', { name: 'Als Verkäufer beitreten' }).click(); + await page.getByRole('button', { name: 'Als Verkäufer anmelden' }).click(); await expect(page).toHaveURL(/\/register\?joinEventId=/); await registerAndVerify(page, uniqueEmail); @@ -86,7 +86,7 @@ test('3) Registrierung mit EventID + Event-Wizard schließen -> Onboarding sofor await page.waitForURL((url) => !url.searchParams.has('openJoinDialog'), { timeout: 30000 }); setProfileForE2E(uniqueEmail); await page.reload(); - await page.getByRole('button', { name: 'Als Verkäufer beitreten' }).click(); + await page.getByRole('button', { name: 'Als Verkäufer anmelden' }).click(); await expect(page.getByRole('heading', { name: /^Anmeldung für / })).toBeVisible({ timeout: 20000, }); From 7fad7f3ec1bf75bb394dc775980418e232534e53 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Thu, 5 Nov 2026 03:52:11 +0100 Subject: [PATCH 43/58] feat(checkout): the button names the amount instead of an extra checkbox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ticking 'received' cost a tap per sale at a busy desk and added no information. The button now says '12,50 € erhalten · Verkauf abschließen' and follows the total, so it confirms the same thing. Sales and returns can still be undone. Sum and button stay in reach on phones, the scanner takes less room there. Co-Authored-By: Claude Opus 5.5 --- .../products/UnifiedReturnDialog.tsx | 29 +------ .../products/UnifiedSaleDialog.test.tsx | 17 ++-- src/components/products/UnifiedSaleDialog.tsx | 35 ++------ src/components/ui/QRCodeScanner.tsx | 12 ++- .../events/dashboard/CheckoutPage.test.tsx | 16 ++-- .../events/dashboard/CheckoutPage.tsx | 80 +++++++++---------- src/tests/auth/offline-checkout.spec.ts | 3 +- src/tests/auth/products.spec.ts | 10 --- 8 files changed, 67 insertions(+), 135 deletions(-) diff --git a/src/components/products/UnifiedReturnDialog.tsx b/src/components/products/UnifiedReturnDialog.tsx index cb580d7a..abe8a0d3 100644 --- a/src/components/products/UnifiedReturnDialog.tsx +++ b/src/components/products/UnifiedReturnDialog.tsx @@ -8,8 +8,6 @@ import { DialogDescription, } from '../ui/dialog'; import { Button } from '../ui/button'; -import { Checkbox } from '../ui/checkbox'; -import { Label } from '../ui/label'; import { CheckCircle2, RotateCcw, Package } from 'lucide-react'; import { Trans, useTranslation } from 'react-i18next'; @@ -31,18 +29,15 @@ export function UnifiedReturnDialog({ isSubmitting, }: UnifiedReturnDialogProps) { const { t } = useTranslation('organizer'); - const [returnConfirmed, setReturnConfirmed] = useState(false); const [returnSuccess, setReturnSuccess] = useState(false); useEffect(() => { if (open) { - setReturnConfirmed(false); setReturnSuccess(false); } }, [open]); const handleReturn = async () => { - if (!returnConfirmed) return; const success = await onConfirmReturn(); if (success) { setReturnSuccess(true); @@ -112,36 +107,16 @@ export function UnifiedReturnDialog({ {t('returnDialog.handOver')} - -
    setReturnConfirmed(!returnConfirmed)} - > - setReturnConfirmed(!!checked)} - /> -
    - -
    -
    - + @@ -292,7 +268,10 @@ export function UnifiedSaleDialog({ disabled={!canSubmit || isSubmitting} className="gap-2" > - {isSubmitting ? t('sale.saving') : t('sale.finish')} + {/* Names the amount: pressing it is the confirmation that the money is there */} + {isSubmitting + ? t('sale.saving') + : t('sale.finish', { amount: formatPriceDE(finalPrice) })} diff --git a/src/components/ui/QRCodeScanner.tsx b/src/components/ui/QRCodeScanner.tsx index 49a9e90e..1114d3bb 100644 --- a/src/components/ui/QRCodeScanner.tsx +++ b/src/components/ui/QRCodeScanner.tsx @@ -1,3 +1,4 @@ +import { cn } from '../../lib/utils'; import { useCallback, useEffect, useRef, useState } from 'react'; import { BarcodeDetector as ZXingBarcodeDetector, @@ -45,10 +46,12 @@ type TorchCapabilities = MediaTrackCapabilities & { torch?: boolean }; interface QRCodeScannerProps { onScanSuccess: (decodedText: string) => void; + /** Less high on phones, when something else needs the room */ + compact?: boolean; active?: boolean; } -export function QRCodeScanner({ onScanSuccess, active = true }: QRCodeScannerProps) { +export function QRCodeScanner({ onScanSuccess, active = true, compact }: QRCodeScannerProps) { const videoRef = useRef(null); const onScanRef = useRef(onScanSuccess); const [state, setState] = useState<'starting' | 'scanning' | 'failed'>('starting'); @@ -145,7 +148,12 @@ export function QRCodeScanner({ onScanSuccess, active = true }: QRCodeScannerPro return (
    -
    +
    - + {/* With items in the cart it takes less room on phones: the cart comes next */} + 0} />
    { @@ -368,12 +365,8 @@ export function CheckoutPage() { )} {cart.length > 0 && ( -
    -
    - {t('checkout.sum', { count: cart.length })} - {formatPriceDE(total)} € -
    -
    + <> +
    {t('checkout.emailInvalid')}

    )}
    -
    - setPaymentConfirmed(!!checked)} - /> - -
    -
    - - -
    - {!allReady && lines.some((line) => line && !line.ok) && ( -

    - - {t('checkout.removeMarked')} -

    - )} -
    + {/* Sum and the way to finish stay in reach, however long the cart is */} + +
    + {t('checkout.sum', { count: cart.length })} + {formatPriceDE(total)} € +
    +
    + + +
    + {!allReady && lines.some((line) => line && !line.ok) && ( +

    + + {t('checkout.removeMarked')} +

    + )} +
    + )}
    diff --git a/src/tests/auth/offline-checkout.spec.ts b/src/tests/auth/offline-checkout.spec.ts index 201b9dce..1924f101 100644 --- a/src/tests/auth/offline-checkout.spec.ts +++ b/src/tests/auth/offline-checkout.spec.ts @@ -29,8 +29,7 @@ async function sellOffline(page: Page, productId: string) { await page.getByLabel('Artikel-Code').fill(productId); await page.getByLabel('Artikel-Code').press('Enter'); await expect(page.getByTestId('checkout-line')).toContainText('Faltrad Brompton M6L'); - await page.getByLabel('600,00 € erhalten').click(); - await page.getByRole('button', { name: 'Verkauf abschließen' }).click(); + await page.getByRole('button', { name: '600,00 € erhalten · Verkauf abschließen' }).click(); await expect(page.getByText(/offline gespeichert/)).toBeVisible(); await expect(page.getByText('1 Verkauf wartet aufs Nachbuchen.')).toBeVisible(); } diff --git a/src/tests/auth/products.spec.ts b/src/tests/auth/products.spec.ts index d7d8fa47..6e6085d5 100644 --- a/src/tests/auth/products.spec.ts +++ b/src/tests/auth/products.spec.ts @@ -201,11 +201,6 @@ async function markAvailableAndSell(page: Page, productTitle: string) { await card.getByRole('button', { name: 'Verkaufen' }).click(); const sellDialog = page.getByRole('dialog', { name: 'Verkauf abwickeln' }); await expect(sellDialog).toBeVisible(); - const paymentConfirmedCheckbox = sellDialog.getByRole('checkbox', { - name: /Betrag von .* erhalten/, - }); - await paymentConfirmedCheckbox.click(); - await expect(paymentConfirmedCheckbox).toBeChecked(); const finalizeSaleButton = sellDialog.getByRole('button', { name: 'Verkauf abschließen' }); await expect(finalizeSaleButton).toBeEnabled(); await finalizeSaleButton.click(); @@ -226,11 +221,6 @@ async function markAvailableAndReturn(page: Page, productTitle: string) { await card.getByRole('button', { name: 'Zurückgeben' }).click(); const returnDialog = page.getByRole('dialog', { name: 'Artikel zurückgeben' }); await expect(returnDialog).toBeVisible(); - const returnConfirmedCheckbox = returnDialog.getByRole('checkbox', { - name: 'Rückgabe bestätigt', - }); - await returnConfirmedCheckbox.click(); - await expect(returnConfirmedCheckbox).toBeChecked(); const finalizeReturnButton = returnDialog.getByRole('button', { name: 'Rückgabe abschließen' }); await expect(finalizeReturnButton).toBeEnabled(); await finalizeReturnButton.click(); From 9a7e14304f45dc8d5f006a57f197e08921ac88aa Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Thu, 5 Nov 2026 03:52:11 +0100 Subject: [PATCH 44/58] fix: what real data showed in the seller views Sold items count as announced, so a seller with sales is not told to add items. Offer buttons wrap instead of leaving the card on phones. Deleting an item no longer competes with saving. Co-Authored-By: Claude Opus 5.5 --- src/pages/dashboard/DashboardPage.test.tsx | 4 ++-- src/pages/dashboard/DashboardPage.tsx | 7 ++++--- .../organizer/events/dashboard/SellerManagementPage.tsx | 2 +- .../products/components/PublicProductOffersForSeller.tsx | 2 +- src/pages/seller/products/ProductForm.tsx | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pages/dashboard/DashboardPage.test.tsx b/src/pages/dashboard/DashboardPage.test.tsx index c610f6ea..5ac7e024 100644 --- a/src/pages/dashboard/DashboardPage.test.tsx +++ b/src/pages/dashboard/DashboardPage.test.tsx @@ -96,7 +96,7 @@ describe('DashboardPage', () => { renderAt(); expect(screen.getByRole('heading', { name: 'Hallo Erika!' })).toBeInTheDocument(); expect(screen.getByRole('heading', { name: kita.title })).toBeInTheDocument(); - expect(screen.getByText('2 Artikel angemeldet')).toBeInTheDocument(); + expect(screen.getByText('3 Artikel angemeldet')).toBeInTheDocument(); expect(screen.getByText('Verkäufernummer 17')).toBeInTheDocument(); // Past bazaars do not count expect(screen.getByText('und 1 weiterer Basar')).toBeInTheDocument(); @@ -210,7 +210,7 @@ describe('DashboardPage', () => { it('invites organizers without events to create one', () => { organizer([]); renderAt(); - expect(screen.getByText('Keine Veranstaltungen gefunden')).toBeInTheDocument(); + expect(screen.getByText('Keine Basare gefunden')).toBeInTheDocument(); fireEvent.click(screen.getByRole('button', { name: 'Neuer Basar' })); expect(screen.getByTestId('where')).toHaveTextContent('/events/new'); }); diff --git a/src/pages/dashboard/DashboardPage.tsx b/src/pages/dashboard/DashboardPage.tsx index 8c40a3b1..b1b0dc5d 100644 --- a/src/pages/dashboard/DashboardPage.tsx +++ b/src/pages/dashboard/DashboardPage.tsx @@ -104,7 +104,6 @@ function SellerOverview() { const sales = useQuery(api.purchases.getMySales, {}); const upcoming = upcomingFirst(registered); - const available = (products ?? []).filter((product) => !product.sold); const [next, ...more] = upcoming; if (registered === undefined) { @@ -115,7 +114,8 @@ function SellerOverview() { ); } const count = next - ? available.filter((product) => product.eventIds?.includes(next._id)).length + ? // Sold ones were announced as well: they must not read as "no items yet" + (products ?? []).filter((product) => product.eventIds?.includes(next._id)).length : 0; const seller = next ? sales?.find((group) => group.event._id === next._id) : undefined; const started = !!next && next.startDate <= Date.now(); @@ -155,7 +155,8 @@ function SellerOverview() { : t('steps.labelsText'), to: '/my-products', state: next ? { filterEvent: next._id } : undefined, - done: started, + // Only with items there was something to hand in + done: started && count > 0, }, { id: 'payout', diff --git a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx index 05176b93..629e86cb 100644 --- a/src/pages/organizer/events/dashboard/SellerManagementPage.tsx +++ b/src/pages/organizer/events/dashboard/SellerManagementPage.tsx @@ -165,7 +165,7 @@ export function SellerManagementPage() { +
    {canBroadcast && ( From e88359c7cc6774a34511f493d4bdff03daf235ef Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Thu, 5 Nov 2026 03:52:11 +0100 Subject: [PATCH 45/58] style(admin): rare bazaar actions move into a menu Co-Authored-By: Claude Opus 5.5 --- src/pages/administrator/AdminEventsPage.tsx | 66 ++++++++++++--------- src/tests/admin/moderation.spec.ts | 19 +++--- 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/src/pages/administrator/AdminEventsPage.tsx b/src/pages/administrator/AdminEventsPage.tsx index 69fb4d6b..9923675a 100644 --- a/src/pages/administrator/AdminEventsPage.tsx +++ b/src/pages/administrator/AdminEventsPage.tsx @@ -1,3 +1,10 @@ +import { MoreHorizontal } from 'lucide-react'; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, +} from '../../components/ui/dropdown-menu'; import { ReasonDialog } from '../../components/moderation/ReasonDialog'; import { SearchInput } from '../../components/ui/search-input'; import { PageHeader } from '../../components/ui/page-header'; @@ -199,35 +206,36 @@ export function AdminEventsPage() { > {t('events.manage')} - {event.visibility === 'public' && ( - - )} - {event.moderation ? ( - - ) : ( - - )} + + + + + + {event.visibility === 'public' && ( + navigate(`/public-events/${event._id}`)} + > + {t('events.view')} + + )} + {event.moderation ? ( + handleRestore(event._id)}> + {t('events.unblock')} + + ) : ( + + setRequest({ kind: 'hideEvent', id: event._id, label: event.title }) + } + > + {t('events.block')} + + )} + + {event.visibility === 'public' && event.approvalStatus === 'pending' && ( <> + + + + ); +} diff --git a/src/components/invitations/OpenInvitations.tsx b/src/components/invitations/OpenInvitations.tsx new file mode 100644 index 00000000..808e4676 --- /dev/null +++ b/src/components/invitations/OpenInvitations.tsx @@ -0,0 +1,53 @@ +import { Mail, X } from 'lucide-react'; +import { useTranslation } from 'react-i18next'; +import { toast } from 'sonner'; +import { api } from '../../lib/api/functions'; +import { useMutation, useQuery } from '../../lib/api/react'; +import type { Id } from '../../lib/api/types'; +import { getUserFacingErrorMessage } from '../../lib/errors'; +import { Badge } from '../ui/badge'; +import { Button } from '../ui/button'; + +/** Who was invited and has not answered yet. Shows nothing without open invitations. */ +export function OpenInvitations({ eventId }: { eventId: Id<'events'> }) { + const { t } = useTranslation('organizer'); + const invitations = useQuery(api.eventInvitations.listOpen, { eventId }); + const revoke = useMutation(api.eventInvitations.revoke); + if (!invitations?.length) return null; + + const withdraw = async (invitationId: Id<'eventInvitations'>) => { + try { + await revoke({ eventId, invitationId }); + toast.success(t('sellers.invitationRevoked')); + } catch (error) { + toast.error(getUserFacingErrorMessage(error)); + } + }; + + return ( +
    +

    {t('sellers.invitations')}

    +
      + {invitations.map((invitation) => ( +
    • + + {invitation.email} + + {invitation.helper ? t('sellers.invitationHelper') : t('sellers.invitationSeller')} + + +
    • + ))} +
    +
    + ); +} diff --git a/src/components/layout/BottomNav.tsx b/src/components/layout/BottomNav.tsx index 80da60c0..005b7971 100644 --- a/src/components/layout/BottomNav.tsx +++ b/src/components/layout/BottomNav.tsx @@ -35,7 +35,7 @@ export function BottomNav({ return (
    - {canManageHelpers && !isOwner && !v.managedByEventId && ( + {canManageHelpers && !isOwner && v.isHelper && (
    - - setHelperAction({ mode: v.isHelper ? 'remove' : 'add', vendor: v }) - } + setHelperAction({ mode: 'remove', vendor: v })} />
    )} @@ -437,6 +445,8 @@ export function SellerManagementPage() {
    + {canManageHelpers && } />} + } title={t('sellers.sentMessages')} /> )} + {canManageHelpers && ( + } + vendors={vendors ?? []} + open={inviteOpen} + onOpenChange={setInviteOpen} + /> + )} } open={walkInDialogOpen} @@ -516,19 +534,10 @@ function PaidBadge({ paid }: { paid?: boolean }) { ); } -/** Appoints a seller as helper or takes it back; quiet, because it is rarely needed. */ -function HelperToggle({ - isHelper, - onToggle, - iconOnly, -}: { - isHelper: boolean; - onToggle: () => void; - iconOnly?: boolean; -}) { +/** Takes the helper role back; quiet, because it is rarely needed. */ +function RemoveHelperButton({ onClick, iconOnly }: { onClick: () => void; iconOnly?: boolean }) { const { t } = useTranslation('organizer'); - const label = isHelper ? t('sellers.removeHelper') : t('sellers.makeHelper'); - const Icon = isHelper ? UserMinus : UserPlus; + const label = t('sellers.removeHelper'); return ( ); diff --git a/src/pages/organizer/events/dashboard/components/InventoryScannerDialog.tsx b/src/pages/organizer/events/dashboard/components/InventoryScannerDialog.tsx deleted file mode 100644 index 28aca58b..00000000 --- a/src/pages/organizer/events/dashboard/components/InventoryScannerDialog.tsx +++ /dev/null @@ -1,80 +0,0 @@ -import { Camera, Keyboard } from 'lucide-react'; -import { Button } from '../../../../../components/ui/button'; -import { Input } from '../../../../../components/ui/input'; -import { - Dialog, - DialogContent, - DialogFooter, - DialogHeader, - DialogTitle, -} from '../../../../../components/ui/dialog'; -import { Tabs, TabsContent, TabsList, TabsTrigger } from '../../../../../components/ui/tabs'; -import { QRCodeScanner } from '../../../../../components/ui/QRCodeScanner'; -import { useTranslation } from 'react-i18next'; - -interface InventoryScannerDialogProps { - open: boolean; - scanInput: string; - onOpenChange: (open: boolean) => void; - onScanInputChange: (value: string) => void; - onProcessScan: (value: string) => void; -} - -export function InventoryScannerDialog({ - open, - scanInput, - onOpenChange, - onScanInputChange, - onProcessScan, -}: InventoryScannerDialogProps) { - const { t } = useTranslation('organizer'); - return ( - - - - {t('scanner.title')} - - - - - - - {t('scanner.camera')} - - - - {t('scanner.manual')} - - - - - - -
    - onScanInputChange(e.target.value)} - onKeyDown={(e) => e.key === 'Enter' && onProcessScan(scanInput)} - autoFocus - /> -
    - -
    -
    - - - - -
    -
    - ); -} diff --git a/src/pages/organizer/events/dashboard/components/ProductManagementList.tsx b/src/pages/organizer/events/dashboard/components/ProductManagementList.tsx index 753eff7c..56c7a9ce 100644 --- a/src/pages/organizer/events/dashboard/components/ProductManagementList.tsx +++ b/src/pages/organizer/events/dashboard/components/ProductManagementList.tsx @@ -49,6 +49,8 @@ interface ProductManagementListProps { discountPercent?: number ) => void; onDownloadPrivateInvoice: (product: ProductWithStatus) => void; + /** Sold at the cash desk, with the buyer's other items */ + onAddToCheckout: (product: ProductWithStatus) => void; onNavigateToProduct: (productId: Id<'products'>) => void; onSelectVendor: (vendorId: Id<'users'>) => void; /** Items of walk-in sellers: the organizer edits and deletes them for the seller */ @@ -89,6 +91,7 @@ export function ProductManagementList({ activeTab, onTabChange, onTriggerConfirm, + onAddToCheckout, onDownloadPrivateInvoice, onNavigateToProduct, onSelectVendor, @@ -156,6 +159,7 @@ export function ProductManagementList({ isSubmitting={isSubmitting} isUndoInventoryActionsEnabled={isUndoInventoryActionsEnabled} onTriggerConfirm={onTriggerConfirm} + onAddToCheckout={onAddToCheckout} onDownloadPrivateInvoice={onDownloadPrivateInvoice} onNavigateToProduct={onNavigateToProduct} onSelectVendor={onSelectVendor} @@ -187,6 +191,7 @@ function ProductRow({ isSubmitting, isUndoInventoryActionsEnabled, onTriggerConfirm, + onAddToCheckout, onDownloadPrivateInvoice, onNavigateToProduct, onSelectVendor, @@ -200,6 +205,7 @@ function ProductRow({ isSubmitting: boolean; isUndoInventoryActionsEnabled: boolean; onTriggerConfirm: ProductManagementListProps['onTriggerConfirm']; + onAddToCheckout: ProductManagementListProps['onAddToCheckout']; onDownloadPrivateInvoice: (product: ProductWithStatus) => void; onNavigateToProduct: (productId: Id<'products'>) => void; onSelectVendor: (vendorId: Id<'users'>) => void; @@ -345,7 +351,7 @@ function ProductRow({ + + ) : isAuthenticated ? ( + + ) : ( +
    +

    {t('invitation.sentTo', { email })}

    + + +
    + )} + + navigate(`/public-events/${event._id}`)} + /> + + ); +} diff --git a/src/pages/seller/products/ProductForm.tsx b/src/pages/seller/products/ProductForm.tsx index eafbc0ca..d27f4e56 100644 --- a/src/pages/seller/products/ProductForm.tsx +++ b/src/pages/seller/products/ProductForm.tsx @@ -1,3 +1,4 @@ +import { scrollPageTo } from '../../../lib/pageScroll'; import { PageHeader } from '../../../components/ui/page-header'; import { ConfirmDialog } from '../../../components/ui/confirm-dialog'; import { useEffect, useMemo, useState } from 'react'; @@ -291,7 +292,7 @@ export function ProductForm() { setExistingImageIds([]); setExistingImageUrls([]); setImageUploadKey((k) => k + 1); - window.scrollTo({ top: 0, behavior: 'smooth' }); + scrollPageTo({ top: 0, behavior: 'smooth' }); methods.setFocus('title'); return; } diff --git a/src/shared/appRoutes.ts b/src/shared/appRoutes.ts index 733e061b..3ee15d00 100644 --- a/src/shared/appRoutes.ts +++ b/src/shared/appRoutes.ts @@ -17,6 +17,7 @@ export const APP_ROUTES = [ '/privacy', '/terms', '/imprint', + '/invite/:token', '/benachrichtigungen/abbestellen', '/products/view/:productId', '/p/:productId', diff --git a/src/styles/index.css b/src/styles/index.css index c0e109cc..584755ed 100644 --- a/src/styles/index.css +++ b/src/styles/index.css @@ -226,3 +226,18 @@ html { opacity: 1; } } + +/* Signed-in phones: only the content scrolls, so the browser's bars stay put and the tab bar + with them (src/lib/pageScroll.ts). From the side menu's width on, the page scrolls as usual. */ +@media (max-width: 1023.98px) { + html.phone-shell, + html.phone-shell body { + height: 100dvh; + overflow: hidden; + } + + html.phone-shell #root { + height: 100dvh; + overflow-y: auto; + } +} diff --git a/src/tests/auth/events.coorganizer.spec.ts b/src/tests/auth/events.coorganizer.spec.ts index 89e51fa2..5a293860 100644 --- a/src/tests/auth/events.coorganizer.spec.ts +++ b/src/tests/auth/events.coorganizer.spec.ts @@ -57,7 +57,12 @@ test.describe('co-organizer permissions', () => { const sellerRow = page.getByRole('row', { name: /Demo Seller/i }); await expect(sellerRow).toBeVisible({ timeout: 15000 }); - await sellerRow.getByRole('button', { name: 'Zum Helfer ernennen' }).click(); + await page.getByRole('button', { name: 'Hinzufügen' }).click(); + await page.getByRole('menuitem', { name: 'Helfer hinzufügen' }).click(); + await page + .getByRole('dialog') + .getByRole('button', { name: /Demo Seller/i }) + .click(); await page.getByRole('button', { name: 'Als Helfer ernennen' }).click(); await expect(page.getByText('wurde als Helfer hinzugefügt')).toBeVisible(); diff --git a/src/tests/auth/events.spec.ts b/src/tests/auth/events.spec.ts index 56e56474..9c5b40c8 100644 --- a/src/tests/auth/events.spec.ts +++ b/src/tests/auth/events.spec.ts @@ -66,7 +66,12 @@ test.describe('event creation and co-organizer flow', () => { await expect(page.getByRole('heading', { name: 'Verkäufer & Helfer' })).toBeVisible(); const sellerRow = page.getByRole('row', { name: /Demo Seller/i }); await expect(sellerRow).toBeVisible(); - await sellerRow.getByRole('button', { name: 'Zum Helfer ernennen' }).click(); + await page.getByRole('button', { name: 'Hinzufügen' }).click(); + await page.getByRole('menuitem', { name: 'Helfer hinzufügen' }).click(); + await page + .getByRole('dialog') + .getByRole('button', { name: /Demo Seller/i }) + .click(); await page.getByRole('button', { name: 'Als Helfer ernennen' }).click(); await expect(page.getByText('wurde als Helfer hinzugefügt')).toBeVisible(); diff --git a/src/tests/auth/features.spec.ts b/src/tests/auth/features.spec.ts index 0cd68a20..48159f04 100644 --- a/src/tests/auth/features.spec.ts +++ b/src/tests/auth/features.spec.ts @@ -108,13 +108,13 @@ test.describe('price offers', () => { await openProductInManagement(page, showcase.eventId, showcase.products.trekking); await page .locator('main') - .getByRole('button', { name: 'Verkaufen', exact: true }) + .getByRole('button', { name: 'Zur Kasse', exact: true }) .first() .click(); - await page.getByRole('radio', { name: /Angenommener Vorschlag/ }).click(); - await expect(page.getByText('370,00 €').last()).toBeVisible(); + await page.getByLabel('Preis', { exact: true }).selectOption({ index: 1 }); + await page.getByLabel('370,00 € erhalten').check(); await page.getByRole('button', { name: 'Verkauf abschließen' }).click(); - await expect(page.getByText('Verkauf erfolgreich!')).toBeVisible(); + await expect(page.getByText('1 Artikel verkauft')).toBeVisible(); await buyer.context().close(); await seller.context().close(); @@ -127,20 +127,21 @@ test.describe('price offers', () => { await openProductInManagement(page, showcase.eventId, showcase.products.trekking); await page .locator('main') - .getByRole('button', { name: 'Verkaufen', exact: true }) + .getByRole('button', { name: 'Zur Kasse', exact: true }) .first() .click(); - await page.getByRole('radio', { name: /Verhandelt \(ab 350,00 €\)/ }).click(); + await page.getByLabel('Preis', { exact: true }).selectOption('negotiated'); const price = page.getByLabel('Verhandelter Preis'); await price.fill('340'); - await expect(page.getByText('Erlaubt sind 350,00 € bis 378,00 €.')).toBeVisible(); + await expect(page.getByText(/350,00 € .*378,00 €/)).toBeVisible(); await expect(page.getByRole('button', { name: 'Verkauf abschließen' })).toBeDisabled(); await price.fill('355'); - await page.getByLabel(/Beleg per E-Mail/).fill('kaeufer@example.com'); + await page.getByLabel(/E-Mail/).fill('kaeufer@example.com'); + await page.getByLabel('355,00 € erhalten').check(); await page.getByRole('button', { name: 'Verkauf abschließen' }).click(); - await expect(page.getByText('Verkauf erfolgreich!')).toBeVisible(); + await expect(page.getByText('1 Artikel verkauft')).toBeVisible(); }); test('buyers never see the minimum price', async ({ page }, testInfo) => { diff --git a/src/tests/auth/offline-checkout.spec.ts b/src/tests/auth/offline-checkout.spec.ts index 1924f101..8f7162d4 100644 --- a/src/tests/auth/offline-checkout.spec.ts +++ b/src/tests/auth/offline-checkout.spec.ts @@ -29,7 +29,8 @@ async function sellOffline(page: Page, productId: string) { await page.getByLabel('Artikel-Code').fill(productId); await page.getByLabel('Artikel-Code').press('Enter'); await expect(page.getByTestId('checkout-line')).toContainText('Faltrad Brompton M6L'); - await page.getByRole('button', { name: '600,00 € erhalten · Verkauf abschließen' }).click(); + await page.getByLabel('600,00 € erhalten').check(); + await page.getByRole('button', { name: 'Verkauf abschließen' }).click(); await expect(page.getByText(/offline gespeichert/)).toBeVisible(); await expect(page.getByText('1 Verkauf wartet aufs Nachbuchen.')).toBeVisible(); } diff --git a/src/tests/auth/products.spec.ts b/src/tests/auth/products.spec.ts index 6e6085d5..36ecf9b8 100644 --- a/src/tests/auth/products.spec.ts +++ b/src/tests/auth/products.spec.ts @@ -185,7 +185,12 @@ async function assignCoOrganizer(page: Page, eventId: string) { const sellerRow = page.getByRole('row', { name: /Demo Seller/i }); await expect(sellerRow).toBeVisible({ timeout: 15000 }); - await sellerRow.getByRole('button', { name: 'Zum Helfer ernennen' }).click(); + await page.getByRole('button', { name: 'Hinzufügen' }).click(); + await page.getByRole('menuitem', { name: 'Helfer hinzufügen' }).click(); + await page + .getByRole('dialog') + .getByRole('button', { name: /Demo Seller/i }) + .click(); await page.getByRole('button', { name: 'Als Helfer ernennen' }).click(); await expect(page.getByText('wurde als Helfer hinzugefügt')).toBeVisible(); } @@ -198,15 +203,15 @@ async function markAvailableAndSell(page: Page, productTitle: string) { await acceptDialog.getByRole('button', { name: 'Annehmen' }).click(); await expect(card.getByText('Erhältlich', { exact: true })).toBeVisible(); - await card.getByRole('button', { name: 'Verkaufen' }).click(); - const sellDialog = page.getByRole('dialog', { name: 'Verkauf abwickeln' }); - await expect(sellDialog).toBeVisible(); - const finalizeSaleButton = sellDialog.getByRole('button', { name: 'Verkauf abschließen' }); - await expect(finalizeSaleButton).toBeEnabled(); - await finalizeSaleButton.click(); - const saleSuccessDialog = page.getByRole('dialog', { name: 'Verkauf erfolgreich!' }); - await expect(saleSuccessDialog).toBeVisible(); - await saleSuccessDialog.getByRole('button', { name: 'Schließen', exact: true }).click(); + // The item joins the cash desk's cart and is sold there + const itemsPage = page.url(); + await card.getByRole('button', { name: 'Zur Kasse' }).click(); + await expect(page).toHaveURL(/\/checkout$/); + await page.getByRole('checkbox', { name: /erhalten/ }).check(); + await page.getByRole('button', { name: 'Verkauf abschließen' }).click(); + await expect(page.getByText('1 Artikel verkauft')).toBeVisible(); + await expect(page.getByRole('button', { name: 'Rechnung erstellen' })).toBeVisible(); + await page.goto(itemsPage); await expect(card.getByText('Verkauft', { exact: true })).toBeVisible(); } diff --git a/src/tests/auth/roles.permissions.spec.ts b/src/tests/auth/roles.permissions.spec.ts index 934a312d..428bc7c2 100644 --- a/src/tests/auth/roles.permissions.spec.ts +++ b/src/tests/auth/roles.permissions.spec.ts @@ -129,8 +129,13 @@ async function assignCoOrganizer(page: Page, eventId: string) { await page.waitForURL('**/sellers'); await expect(page.getByRole('heading', { name: 'Verkäufer & Helfer' })).toBeVisible(); - const sellerRow = page.getByRole('row', { name: /Demo Seller/i }); - await sellerRow.getByRole('button', { name: 'Zum Helfer ernennen' }).click(); + await expect(page.getByRole('row', { name: /Demo Seller/i })).toBeVisible(); + await page.getByRole('button', { name: 'Hinzufügen' }).click(); + await page.getByRole('menuitem', { name: 'Helfer hinzufügen' }).click(); + await page + .getByRole('dialog') + .getByRole('button', { name: /Demo Seller/i }) + .click(); await page.getByRole('button', { name: 'Als Helfer ernennen' }).click(); await expect(page.getByText('wurde als Helfer hinzugefügt')).toBeVisible(); } From 9bb255e41a9594d1c495b9b5bde293d42a776703 Mon Sep 17 00:00:00 2001 From: Ivo Zeitz Date: Thu, 5 Nov 2026 11:21:57 +0100 Subject: [PATCH 49/58] feat(nav): add a central scanner tab on phones - Move the overview into the menu and give bazaar managers quick access to scanning - Restore normal page scrolling and add tab bar spacing for sticky actions --- src/App.tsx | 3 +- src/components/layout/BottomNav.test.tsx | 60 +++++++++++++ src/components/layout/BottomNav.tsx | 86 +++++++++++++------ src/components/layout/Header.tsx | 7 +- src/components/layout/ResponsiveSidebar.tsx | 10 +-- src/components/layout/useNavigation.ts | 3 +- src/components/scanner/TeamScanner.tsx | 2 +- src/components/ui/sticky-action-bar.tsx | 4 +- src/lib/pageScroll.ts | 30 ------- src/locales/de/common.json | 1 + src/locales/en/common.json | 1 + src/pages/organizer/events/EditEventForm.tsx | 3 +- .../public/events/PublicEventProductsPage.tsx | 10 ++- src/pages/seller/products/ProductForm.tsx | 3 +- src/styles/index.css | 15 ---- 15 files changed, 142 insertions(+), 96 deletions(-) create mode 100644 src/components/layout/BottomNav.test.tsx delete mode 100644 src/lib/pageScroll.ts diff --git a/src/App.tsx b/src/App.tsx index 0a54ad4f..a1d10369 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,3 @@ -import { scrollPageTo } from './lib/pageScroll'; import { InvitePage } from './pages/public/invite/InvitePage'; import { useAuthState, useQuery, useAuthActions } from './lib/api/react'; import { Suspense, useEffect } from 'react'; @@ -164,7 +163,7 @@ function ScrollToTop() { const location = useLocation(); useEffect(() => { - scrollPageTo({ top: 0, left: 0, behavior: 'auto' }); + window.scrollTo({ top: 0, left: 0, behavior: 'auto' }); }, [location.pathname, location.search]); return null; diff --git a/src/components/layout/BottomNav.test.tsx b/src/components/layout/BottomNav.test.tsx new file mode 100644 index 00000000..17ba9208 --- /dev/null +++ b/src/components/layout/BottomNav.test.tsx @@ -0,0 +1,60 @@ +import { render, screen, within } from '@testing-library/react'; +import { MemoryRouter } from 'react-router-dom'; +import { describe, expect, it, vi } from 'vitest'; +import type { UserRole } from '../../context/UserRoleContext'; +import { useEventAccess } from '../../hooks/useEventAccess'; +import type { Id } from '../../lib/api/types'; +import '../../i18n'; +import { BottomNav } from './BottomNav'; + +vi.mock('../../lib/api/react', () => ({ useQuery: vi.fn() })); +vi.mock('../../hooks/useInstanceConfig', () => ({ + useInstanceConfig: () => ({ isSingle: false }), +})); +vi.mock('../../context/UserRoleContext', () => ({ + useUserRole: () => ({ changeRole: vi.fn() }), +})); +vi.mock('../../context/SidebarContext', () => ({ + useSidebar: () => ({ setMobileSidebarOpen: vi.fn() }), +})); +vi.mock('../../hooks/useEventAccess', () => ({ useEventAccess: vi.fn() })); +vi.mock('../scanner/TeamScanner', () => ({ TeamScanner: () => null })); + +const EVENT = 'event1' as Id<'events'>; + +function tabLabels(role: UserRole, eventId?: Id<'events'>) { + render( + + + + ); + return within(screen.getByRole('navigation')) + .getAllByRole('button') + .map((tab) => tab.textContent); +} + +function access(canManage: boolean) { + vi.mocked(useEventAccess).mockReturnValue({ canManage } as ReturnType); +} + +describe('tab bar', () => { + it('has the scanner in the middle for whoever runs the bazaar, without the overview', () => { + access(true); + expect(tabLabels('organizer', EVENT)).toEqual([ + 'Verkäufer', + 'Artikel', + 'Scannen', + 'Kasse', + 'Menü', + ]); + }); + + it('has no scanner without the right to run the bazaar', () => { + access(false); + expect(tabLabels('organizer', EVENT)).toEqual(['Verkäufer', 'Artikel', 'Kasse', 'Menü']); + }); + + it('leaves the overview to the menu for sellers too', () => { + expect(tabLabels('participant')).toEqual(['Artikel', 'Verkäufe', 'Basare', 'Menü']); + }); +}); diff --git a/src/components/layout/BottomNav.tsx b/src/components/layout/BottomNav.tsx index 005b7971..aaa2254d 100644 --- a/src/components/layout/BottomNav.tsx +++ b/src/components/layout/BottomNav.tsx @@ -1,16 +1,22 @@ -import { Menu } from 'lucide-react'; +import { Menu, ScanQrCode } from 'lucide-react'; +import { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; import type { UserRole } from '../../context/UserRoleContext'; import { useSidebar } from '../../context/SidebarContext'; +import { useEventAccess } from '../../hooks/useEventAccess'; import type { Id } from '../../lib/api/types'; import { cn } from '../../lib/utils'; -import { isActivePage, useNavigation } from './useNavigation'; +import { TeamScanner } from '../scanner/TeamScanner'; +import { isActivePage, useNavigation, type NavItem } from './useNavigation'; const TAB_CLASS = 'relative flex min-w-0 flex-1 flex-col items-center gap-0.5 px-1 pb-1.5 pt-2 text-[11px] font-medium text-muted-foreground transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring'; -/** On phones: the main pages one tap away with the thumb, the rest behind "Menü". */ +/** + * On phones: the main pages one tap away with the thumb, the rest behind "Menü". Whoever runs + * a bazaar has the scanner in the middle. + */ export function BottomNav({ role, isAdmin, @@ -32,31 +38,36 @@ export function BottomNav({ .filter((item) => !item.tab) .reduce((sum, item) => sum + (item.badge ?? 0), 0); + const renderTab = (item: NavItem) => { + const Icon = item.icon; + const active = isActivePage(item, currentPage, allItems); + return ( + + ); + }; + const middle = Math.ceil(tabs.length / 2); + return (