Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️
PHP attendize-alternativedoor-managementevent-check-inevent-managementevent-registrationevent-ticketingeventbrite-alternativeeventslaravelopen-sourcephpreactself-hostedsell-ticketssell-tickets-onlineticket-sellingticketing-systemtickettailor-alternativetito-alternative
Fix product preview bg color
Dave Earley1009928152a3
diff --git a/backend/app/Http/Request/Product/UpsertProductRequest.php b/backend/app/Http/Request/Product/UpsertProductRequest.phpindex e9b18e7d8..c53e0cb2f 100644--- a/backend/app/Http/Request/Product/UpsertProductRequest.php+++ b/backend/app/Http/Request/Product/UpsertProductRequest.php@@ -16,20 +16,20 @@ class UpsertProductRequest extends BaseRequest{return ['title' => 'required|max:255',- 'initial_quantity_available' => 'integer|nullable',- 'quantity_sold' => 'integer|default:0',+ 'initial_quantity_available' => [...RulesHelper::INTEGER, 'nullable'],+ 'quantity_sold' => [...RulesHelper::INTEGER, 'default:0'],'sale_start_date' => 'date|nullable','sale_end_date' => 'date|nullable|after:sale_start_date',- 'max_per_order' => 'integer|nullable',+ 'max_per_order' => [...RulesHelper::INTEGER, 'nullable'],'prices' => ['required', 'array'],'prices.*.price' => [...RulesHelper::MONEY, 'required'],'prices.*.label' => ['nullable', ...RulesHelper::STRING, 'required_if:type,'.ProductPriceType::TIERED->name],'prices.*.sale_start_date' => ['date', 'nullable', 'after:sale_start_date'],'prices.*.sale_end_date' => 'date|nullable|after:prices.*.sale_start_date',- 'prices.*.initial_quantity_available' => ['integer', 'nullable', 'min:0'],+ 'prices.*.initial_quantity_available' => [...RulesHelper::INTEGER, 'nullable', 'min:0'],'prices.*.is_hidden' => ['boolean'],'description' => 'string|nullable',- 'min_per_order' => 'integer|nullable',+ 'min_per_order' => [...RulesHelper::INTEGER, 'nullable'],'is_hidden' => 'boolean','hide_before_sale_start_date' => 'boolean','hide_after_sale_end_date' => 'boolean',diff --git a/backend/app/Validators/Rules/RulesHelper.php b/backend/app/Validators/Rules/RulesHelper.phpindex 6a26a4732..aa55f6579 100644--- a/backend/app/Validators/Rules/RulesHelper.php+++ b/backend/app/Validators/Rules/RulesHelper.php@@ -6,6 +6,8 @@ class RulesHelper{public const MONEY = ['gte:0', 'numeric', 'decimal:0,2', 'max:999999999999'];+ public const INTEGER = ['integer', 'max:2147483647'];+public const REQUIRED_STRING = ['string', 'required', 'max:100', 'min:1'];public const REQUIRED_NUMERIC = ['numeric', 'required'];diff --git a/frontend/src/components/forms/ProductForm/ProductPreview.module.scss b/frontend/src/components/forms/ProductForm/ProductPreview.module.scssindex 9be6893e3..445a02aac 100644--- a/frontend/src/components/forms/ProductForm/ProductPreview.module.scss+++ b/frontend/src/components/forms/ProductForm/ProductPreview.module.scss@@ -15,6 +15,7 @@.widgetWrap {pointer-events: none;user-select: none;+ background-color: #ffffff;border-radius: var(--hi-radius-lg);overflow: hidden;transition: opacity 250ms cubic-bezier(0.4, 0, 0.2, 1);diff --git a/frontend/src/components/forms/ProductForm/ProductPreview.tsx b/frontend/src/components/forms/ProductForm/ProductPreview.tsxindex fc0f9ab8e..2dbff7d76 100644--- a/frontend/src/components/forms/ProductForm/ProductPreview.tsx+++ b/frontend/src/components/forms/ProductForm/ProductPreview.tsx@@ -8,7 +8,6 @@ import {Event, Product} from "../../../types.ts";import {useGetEventSettings} from "../../../queries/useGetEventSettings.ts";import {useGetTaxesAndFees} from "../../../queries/useGetTaxesAndFees.ts";import {nowInTimezone} from "../../../utilites/dates.ts";-import {computeThemeVariables, validateThemeSettings} from "../../../utilites/themeUtils.ts";import {buildPreviewEvent} from "./buildPreviewEvent.ts";import {computeVisibilityStatus} from "./visibilityStatus.ts";import SelectProducts from "../../routes/product-widget/SelectProducts";@@ -62,12 +61,6 @@ export const ProductPreview = ({form, event}: ProductPreviewProps) => {);}, [event, debouncedValues, taxesAndFees, eventSettings]);- const themeSettings = useMemo(- () => validateThemeSettings((eventSettings ?? event?.settings)?.homepage_theme_settings),- [eventSettings, event],- );- const themeVariables = useMemo(() => computeThemeVariables(themeSettings), [themeSettings]);-if (!event || !previewEvent) {return null;}@@ -79,7 +72,6 @@ export const ProductPreview = ({form, event}: ProductPreviewProps) => {<div className={classes.eyebrow}>{t`Live preview`}</div><divclassName={classes.widgetWrap}- style={{backgroundColor: themeSettings.background}}data-hidden={isHiddenFromEveryone || undefined}aria-hidden>@@ -89,11 +81,8 @@ export const ProductPreview = ({form, event}: ProductPreviewProps) => {widgetMode="preview"showPoweredBy={false}colors={{- background: 'transparent',- primary: themeSettings.accent,- primaryText: themeVariables['--theme-text-primary'],- secondary: themeSettings.accent,- secondaryText: themeVariables['--theme-accent-contrast'],+ background: '#ffffff',+ primaryText: '#1a1a1a',}}/></div>