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
Event list UI fixes
Dave Earley8658fa6c463a
diff --git a/frontend/src/components/common/ActionMenu/index.tsx b/frontend/src/components/common/ActionMenu/index.tsxindex 805227028..3cbfd9a2f 100644--- a/frontend/src/components/common/ActionMenu/index.tsx+++ b/frontend/src/components/common/ActionMenu/index.tsx@@ -21,17 +21,23 @@ interface ActionMenuProps {target?: React.ReactNode;}+const DefaultTarget = () => (+ <Button variant="transparent">+ <IconDotsVertical/>+ </Button>+);+export const ActionMenu: React.FC<ActionMenuProps> = ({itemsGroups,- target = <IconDotsVertical/>+ target = <DefaultTarget/>}) => {return (<Group wrap={'nowrap'} gap={0} justify={'flex-end'}><Menu shadow="md" width={200}><Menu.Target>- <Button variant={'transparent'}>+ <div style={{cursor: 'pointer'}}>{target}- </Button>+ </div></Menu.Target><Menu.Dropdown>@@ -49,7 +55,6 @@ export const ActionMenu: React.FC<ActionMenuProps> = ({{item.label}</Menu.Item>))}-</React.Fragment>))}</Menu.Dropdown>diff --git a/frontend/src/components/common/EventCard/EventCard.module.scss b/frontend/src/components/common/EventCard/EventCard.module.scssindex 3dd2afe04..23b67fc47 100644--- a/frontend/src/components/common/EventCard/EventCard.module.scss+++ b/frontend/src/components/common/EventCard/EventCard.module.scss@@ -9,6 +9,7 @@@include respond-below(sm) {flex-direction: column;gap: 0px;+ padding: var(--mantine-spacing-md) !important;}&:hover .imageAndDate {@@ -92,8 +93,15 @@gap: 20px;align-items: center;- .dotSeparator {+ .infoItem {+ display: flex;+ gap: 5px;+ align-items: center;+ span {+ font-size: var(--mantine-font-size-xs);+ color: var(--mantine-color-gray-6);+ }}@include respond-below(sm) {@@ -113,11 +121,13 @@display: flex;align-items: center;justify-content: flex-end;+ margin: 0 10px;@include respond-below(sm) {align-items: flex-start;justify-content: flex-start;margin-bottom: var(--mantine-spacing-md);+ margin: 0;.mobileButton {display: flex;diff --git a/frontend/src/components/common/EventCard/index.tsx b/frontend/src/components/common/EventCard/index.tsxindex 7644c8287..1ca52bf21 100644--- a/frontend/src/components/common/EventCard/index.tsx+++ b/frontend/src/components/common/EventCard/index.tsx@@ -1,16 +1,19 @@-import {ActionIcon, Button, Group, Text,} from '@mantine/core';+import {ActionIcon, Button,} from '@mantine/core';import {Event, IdParam} from "../../../types.ts";import classes from "./EventCard.module.scss";import {Card} from "../Card";import {NavLink, useNavigate} from "react-router-dom";import {IconArchive,+ IconCash,IconCopy,IconDotsVertical,IconEye,IconMap,IconQrcode,IconSettings,+ IconUsers,+ IconWorld,} from "@tabler/icons-react";import {t} from "@lingui/macro"import {eventHomepagePath} from "../../../utilites/urlHelper.ts";@@ -40,7 +43,7 @@ export function EventCard({event}: EventCardProps) {const eventThumbnailPath = ((eventId: number) => {const result = (eventId % NUMBER_OF_THUMBNAILS);- const imageNumber = result === 0 ? NUMBER_OF_THUMBNAILS : Math.abs(result);+ const imageNumber = result === 0 ? NUMBER_OF_THUMBNAILS : Math.abs(result);return '/images/event-thumbnails/event-thumb-%d.jpg'.replace('%d', String(imageNumber));});@@ -101,24 +104,35 @@ export function EventCard({event}: EventCardProps) {</div><div className={classes.eventInfo}>{event.settings?.location_details?.venue_name && (- <Group gap="xs" wrap="nowrap">- <IconMap color={'#ccc'}/>- <Text size="xs">+ <div className={classes.infoItem}>+ <IconMap size={16} color={'#ccc'}/>+ <span>{event.settings?.location_details?.venue_name}- </Text>- </Group>+ </span>+ </div>)}{event.settings?.is_online_event && (- <Text size="xs">- {t`Online event`}- </Text>+ <div className={classes.infoItem}>+ <IconWorld size={16} color={'#ccc'}/>+ <span>+ {t`Online event`}+ </span>+ </div>)}- <Text size="xs">++ <div className={classes.infoItem}>+ <IconUsers size={16} color={'#ccc'}/>+ <span>{formatNumber(event?.statistics?.tickets_sold || 0)} {t`tickets sold`}- </Text>- <Text size="xs">+ </span>+ </div>++ <div className={classes.infoItem}>+ <IconCash size={16} color={'#ccc'}/>+ <span>{formatCurrency(event?.statistics?.sales_total_gross || 0, event?.currency)} {t`gross sales`}- </Text>+ </span>+ </div></div></div><div className={classes.actions}>@@ -162,7 +176,7 @@ export function EventCard({event}: EventCardProps) {<ActionIcon className={classes.desktopButton} size={"md"} variant={"transparent"}><IconDotsVertical/></ActionIcon>- <Button className={classes.mobileButton} variant={"light"}>+ <Button fullWidth className={classes.mobileButton} variant={"light"}>{t`Manage`}</Button></div>diff --git a/frontend/src/components/common/EventStatusBadge/index.tsx b/frontend/src/components/common/EventStatusBadge/index.tsxindex 4bb6f285e..854af5db0 100644--- a/frontend/src/components/common/EventStatusBadge/index.tsx+++ b/frontend/src/components/common/EventStatusBadge/index.tsx@@ -23,7 +23,7 @@ export const EventStatusBadge = ({event, showLifecycleStatus = true}: EventLifecreturn (<>- <Badge color={event?.status === 'LIVE' ? 'green' : 'gray'}>+ <Badge variant={'outline'} color={event?.status === 'LIVE' ? 'green' : 'gray'}>{event.status} {showLifecycleStatus && (<>• {getLifecycleStatus}@@ -32,4 +32,4 @@ export const EventStatusBadge = ({event, showLifecycleStatus = true}: EventLifec</Badge></>);-}\ No newline at end of file+}diff --git a/frontend/src/components/modals/CreateEventModal/index.tsx b/frontend/src/components/modals/CreateEventModal/index.tsxindex 1039d0688..5f9fc4a1f 100644--- a/frontend/src/components/modals/CreateEventModal/index.tsx+++ b/frontend/src/components/modals/CreateEventModal/index.tsx@@ -1,7 +1,7 @@import {useFormErrorResponseHandler} from "../../../hooks/useFormErrorResponseHandler.tsx";import {useNavigate} from "react-router-dom";import {useGetAccount} from "../../../queries/useGetAccount.ts";-import {Event, GenericModalProps, Organizer} from "../../../types.ts";+import {Event, GenericModalProps, IdParam, Organizer} from "../../../types.ts";import {useEffect, useState} from "react";import {showSuccess} from "../../../utilites/notifications.tsx";import {t} from "@lingui/macro";@@ -16,7 +16,11 @@ import classes from "./CreateEventModal.module.scss";import {OrganizerCreateForm} from "../../forms/OrganizerForm";import {Card} from "../../common/Card";-export const CreateEventModal = ({onClose}: GenericModalProps) => {+interface CreateEventModalProps extends GenericModalProps {+ organizerId?: IdParam;+}++export const CreateEventModal = ({onClose, organizerId}: CreateEventModalProps) => {const errorHandler = useFormErrorResponseHandler();const navigate = useNavigate();const {data: account, isFetched: isAccountFetched} = useGetAccount();@@ -28,7 +32,7 @@ export const CreateEventModal = ({onClose}: GenericModalProps) => {start_date: '',end_date: undefined,description: undefined,- organizer_id: undefined,+ organizer_id: organizerId ? String(organizerId) : undefined,},validate: {title: hasLength({max: 150}, t`Name should be less than 150 characters`),diff --git a/frontend/src/components/routes/organizer/OrganizerDashboard/index.tsx b/frontend/src/components/routes/organizer/OrganizerDashboard/index.tsxindex bde637d1f..730b01173 100644--- a/frontend/src/components/routes/organizer/OrganizerDashboard/index.tsx+++ b/frontend/src/components/routes/organizer/OrganizerDashboard/index.tsx@@ -103,7 +103,7 @@ const OrganizerDashboard = () => {total={Number(pagination?.last_page)}/>}- {createModalOpen && <CreateEventModal onClose={closeCreateModal}/>}+ {createModalOpen && <CreateEventModal organizerId={organizerId} onClose={closeCreateModal}/>}{(editModalOpen && organizer) && <EditOrganizerModal organizerId={organizerId} onClose={closeEditModal}/>}</>);