Skip to content

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 ⭐️

Add NoEvents component

Dave Earley92d5e0b10e62
diff --git a/backend/app/Repository/Eloquent/EventRepository.php b/backend/app/Repository/Eloquent/EventRepository.php
index f11c154a3..4ac9cc83e 100644
--- a/backend/app/Repository/Eloquent/EventRepository.php
+++ b/backend/app/Repository/Eloquent/EventRepository.php
@@ -50,6 +50,17 @@ class EventRepository extends BaseRepository implements EventRepositoryInterface
->orWhere(EventDomainObjectAbstract::END_DATE, '>=', now());
});
};
+
+ $organizerId = $params->filter_fields->first(fn ($filter) => $filter->field === EventDomainObjectAbstract::ORGANIZER_ID)?->value;
+ if ($organizerId) {
+ $where[] = static function (Builder $builder) use ($params) {
+ $builder
+ ->where(EventDomainObjectAbstract::ORGANIZER_ID, $params
+ ->filter_fields
+ ->get(EventDomainObjectAbstract::ORGANIZER_ID)
+ );
+ };
+ }
}
$this->model = $this->model->orderBy(
diff --git a/frontend/src/components/common/EventsDashboardStatusButtons/index.tsx b/frontend/src/components/common/EventsDashboardStatusButtons/index.tsx
new file mode 100644
index 000000000..2ad171a0e
--- /dev/null
+++ b/frontend/src/components/common/EventsDashboardStatusButtons/index.tsx
@@ -0,0 +1,36 @@
+import {Button, Group} from "@mantine/core";
+import {t} from "@lingui/macro";
+import {useNavigate} from "react-router-dom";
+
+interface EventsDashboardStatusButtonsProps {
+ baseUrl: string;
+ eventsState: string;
+}
+
+export const EventsDashboardStatusButtons = ({baseUrl, eventsState}: EventsDashboardStatusButtonsProps) => {
+ const navigate = useNavigate();
+
+ return (
+ <Group mt={10} mb={15}>
+ <Button
+ size={'compact-sm'}
+ variant={eventsState === 'upcoming' || !eventsState ? 'light' : 'transparent'}
+ onClick={() => navigate(baseUrl + '/upcoming' + window.location.search)}
+ >
+ {t`Upcoming`}
+ </Button>
+ <Button size={'compact-sm'}
+ variant={eventsState === 'ended' ? 'light' : 'transparent'}
+ onClick={() => navigate(baseUrl + '/ended' + window.location.search)}
+ >
+ {t`Ended`}
+ </Button>
+ <Button size={'compact-sm'}
+ variant={eventsState === 'archived' ? 'light' : 'transparent'}
+ onClick={() => navigate(baseUrl + '/archived' + window.location.search)}
+ >
+ {t`Archived`}
+ </Button>
+ </Group>
+ );
+}
diff --git a/frontend/src/components/common/NoEventsBlankSlate/index.tsx b/frontend/src/components/common/NoEventsBlankSlate/index.tsx
new file mode 100644
index 000000000..c5740948b
--- /dev/null
+++ b/frontend/src/components/common/NoEventsBlankSlate/index.tsx
@@ -0,0 +1,33 @@
+import {t} from "@lingui/macro";
+import {Button} from "@mantine/core";
+import {IconPlus} from "@tabler/icons-react";
+import {NoResultsSplash} from "../NoResultsSplash";
+
+interface NoEventsBlankSlateProps {
+ eventsState?: 'upcoming' | 'ended' | 'archived' | string
+ openCreateModal: () => void;
+}
+
+export const NoEventsBlankSlate = ({eventsState, openCreateModal}: NoEventsBlankSlateProps) => {
+ return (
+ <NoResultsSplash
+ heading={t`No events to show`}
+ imageHref={'/blank-slate/events.svg'}
+ subHeading={(
+ <>
+ <p>
+ {(eventsState === 'upcoming' || !eventsState) && t`Once you create an event, you'll see it here.`}
+ {eventsState === 'ended' && t`No ended events to show.`}
+ {eventsState === 'archived' && t`No archived events to show.`}
+ </p>
+ <Button
+ size={'xs'}
+ leftSection={<IconPlus/>}
+ color={'green'}
+ onClick={openCreateModal}>{t`Create Event`}
+ </Button>
+ </>
+ )}
+ />
+ );
+}
diff --git a/frontend/src/components/modals/CreateEventModal/index.tsx b/frontend/src/components/modals/CreateEventModal/index.tsx
index 5a54dfc88..f088072a0 100644
--- a/frontend/src/components/modals/CreateEventModal/index.tsx
+++ b/frontend/src/components/modals/CreateEventModal/index.tsx
@@ -24,7 +24,7 @@ export const CreateEventModal = ({onClose}: GenericModalProps) => {
const form = useForm<Partial<Event>>({
initialValues: {
title: '',
- status: '',
+ status: undefined,
start_date: '',
end_date: undefined,
description: undefined,
@@ -43,6 +43,12 @@ export const CreateEventModal = ({onClose}: GenericModalProps) => {
const eventMutation = useCreateEvent();
const [showCreateOrganizer, setShowCreateOrganizer] = useState(false);
+ useEffect(() => {
+ if (organizersQuery.isFetched && organizersQuery.data?.data?.length === 1) {
+ form.setFieldValue('organizer_id', String(organizersQuery.data?.data[0].id));
+ }
+ }, [organizersQuery.isFetched]);
+
useEffect(() => {
if (isAccountFetched) {
form.setFieldValue('currency', account?.currency_code);
@@ -137,4 +143,4 @@ export const CreateEventModal = ({onClose}: GenericModalProps) => {
</form>
</Modal>
);
-}
\ No newline at end of file
+}
diff --git a/frontend/src/components/routes/events/Dashboard/index.tsx b/frontend/src/components/routes/events/Dashboard/index.tsx
index e29265c53..a4c13c6fc 100644
--- a/frontend/src/components/routes/events/Dashboard/index.tsx
+++ b/frontend/src/components/routes/events/Dashboard/index.tsx
@@ -1,9 +1,9 @@
-import {Event, EventStatus, QueryFilterOperator, QueryFilters} from "../../../../types.ts";
+import {Event, QueryFilters} from "../../../../types.ts";
import {useGetEvents} from "../../../../queries/useGetEvents.ts";
import {EventCard} from "../../../common/EventCard";
import {t} from "@lingui/macro";
import {SearchBarWrapper} from "../../../common/SearchBar";
-import {Button, Group, Menu, Skeleton} from "@mantine/core";
+import {Button, Menu, Skeleton} from "@mantine/core";
import {IconCalendarPlus, IconChevronDown, IconPlus, IconUserPlus} from "@tabler/icons-react";
import {ToolBar} from "../../../common/ToolBar";
import {Pagination} from "../../../common/Pagination";
@@ -11,10 +11,12 @@ import {useFilterQueryParamSync} from "../../../../hooks/useFilterQueryParamSync
import {useDisclosure} from "@mantine/hooks";
import {CreateEventModal} from "../../../modals/CreateEventModal";
import {useGetOrganizers} from "../../../../queries/useGetOrganizers.ts";
-import {Navigate, useNavigate, useParams} from "react-router-dom";
-import {NoResultsSplash} from "../../../common/NoResultsSplash";
+import {Navigate, useParams} from "react-router-dom";
import {CreateOrganizerModal} from "../../../modals/CreateOrganizerModal";
import classes from "./Dashboard.module.scss";
+import {getEventQueryFilters} from "../../../../utilites/eventsPageFiltersHelper.ts";
+import {EventsDashboardStatusButtons} from "../../../common/EventsDashboardStatusButtons";
+import {NoEventsBlankSlate} from "../../../common/NoEventsBlankSlate";
const DashboardSkeleton = () => {
return (
@@ -26,48 +28,6 @@ const DashboardSkeleton = () => {
);
}
-export const getEventQueryFilters = (searchParams: Partial<QueryFilters>) => {
- const {eventsState, organizerId} = useParams();
- let filter = {};
- if (eventsState === 'upcoming' || !eventsState) {
- filter = {
- additionalParams: {
- eventsStatus: 'upcoming',
- },
- filterFields: {}
- };
- } else if (eventsState === 'ended') {
- filter = {
- filterFields: {
- end_date: {operator: QueryFilterOperator.LessThanOrEquals, value: 'now'},
- status: {operator: QueryFilterOperator.NotEquals, value: EventStatus.ARCHIVED},
- }
- };
- } else if (eventsState === 'archived') {
- filter = {
- filterFields: {
- status: {operator: QueryFilterOperator.Equals, value: EventStatus.ARCHIVED},
- }
- };
- }
-
- if (organizerId) {
- // add the organizer filter on top of the other filters
- filter = {
- ...filter,
- filterFields: {
- organizer_id: {operator: QueryFilterOperator.Equals, value: organizerId},
- ...filter.filterFields
- }
- }
- }
-
- return {
- ...searchParams,
- ...filter,
- };
-}
-
export function Dashboard() {
const {eventsState} = useParams();
const [searchParams, setSearchParams] = useFilterQueryParamSync();
@@ -85,7 +45,6 @@ export function Dashboard() {
const pagination = eventData?.meta;
const events = eventData?.data;
const organizers = organizersQuery?.data?.data;
- const navigate = useNavigate();
if (organizersQuery.isFetched && organizers?.length === 0) {
return <Navigate to={'/welcome'}/>
@@ -158,50 +117,16 @@ export function Dashboard() {
</>
</ToolBar>
- <Group mt={10} mb={15}>
- <Button
- size={'compact-sm'}
- variant={eventsState === 'upcoming' || !eventsState ? 'light' : 'transparent'}
- onClick={() => navigate('/manage/events' + window.location.search)}
- >
- {t`Upcoming`}
- </Button>
- <Button size={'compact-sm'}
- variant={eventsState === 'ended' ? 'light' : 'transparent'}
- onClick={() => navigate('/manage/events/ended' + window.location.search)}
- >
- {t`Ended`}
- </Button>
- <Button size={'compact-sm'}
- variant={eventsState === 'archived' ? 'light' : 'transparent'}
- onClick={() => navigate('/manage/events/archived' + window.location.search)}
- >
- {t`Archived`}
- </Button>
- </Group>
+ <EventsDashboardStatusButtons
+ baseUrl={`/manage/events`}
+ eventsState={eventsState as string}
+ />
- {events?.length === 0 && isEventsFetched && (
- <NoResultsSplash
- heading={t`No events to show`}
- imageHref={'/blank-slate/events.svg'}
- subHeading={(
- <>
- <p>
- {t`Once you create an event, you'll see it here.`}
- </p>
- <Button
- size={'xs'}
- leftSection={<IconPlus/>}
- color={'green'}
- onClick={() => openCreateModal()}>{t`Create Event`}
- </Button>
- </>
- )}
- />
- )}
+ {(events?.length === 0 && isEventsFetched)
+ && <NoEventsBlankSlate openCreateModal={openCreateModal} eventsState={eventsState}/>}
<div>
- {isEventsFetching && <DashboardSkeleton/>}
+ {(isEventsFetching && !events) && <DashboardSkeleton/>}
{events?.map((event: Event) =>
(
diff --git a/frontend/src/components/routes/organizer/OrganizerDashboard/index.tsx b/frontend/src/components/routes/organizer/OrganizerDashboard/index.tsx
index 11549cb25..bde637d1f 100644
--- a/frontend/src/components/routes/organizer/OrganizerDashboard/index.tsx
+++ b/frontend/src/components/routes/organizer/OrganizerDashboard/index.tsx
@@ -1,25 +1,24 @@
import {useFilterQueryParamSync} from "../../../../hooks/useFilterQueryParamSync.ts";
import {useDisclosure} from "@mantine/hooks";
import {Event, QueryFilters} from "../../../../types.ts";
-import {NavLink, useNavigate, useParams} from "react-router-dom";
+import {NavLink, useParams} from "react-router-dom";
import {t, Trans} from "@lingui/macro";
import {ToolBar} from "../../../common/ToolBar";
import {SearchBarWrapper} from "../../../common/SearchBar";
-import {Button, Group, Skeleton} from "@mantine/core";
-import {IconArrowLeft, IconCalendarPlus, IconPencil, IconPlus} from "@tabler/icons-react";
+import {Button, Skeleton} from "@mantine/core";
+import {IconArrowLeft, IconCalendarPlus, IconPencil} from "@tabler/icons-react";
import {EventCard} from "../../../common/EventCard";
import {Pagination} from "../../../common/Pagination";
import {CreateEventModal} from "../../../modals/CreateEventModal";
import {useGetOrganizer} from "../../../../queries/useGetOrganizer.ts";
-import {useGetOrganizerEvents} from "../../../../queries/useGetOrganizerEvents.ts";
-import {NoResultsSplash} from "../../../common/NoResultsSplash";
import classes from './OrganizerDashboard.module.scss';
import {EditOrganizerModal} from "../../../modals/EditOrganizerModal";
-import {getEventQueryFilters} from "../../events/Dashboard";
import {useGetEvents} from "../../../../queries/useGetEvents.ts";
+import {getEventQueryFilters} from "../../../../utilites/eventsPageFiltersHelper.ts";
+import {EventsDashboardStatusButtons} from "../../../common/EventsDashboardStatusButtons";
+import {NoEventsBlankSlate} from "../../../common/NoEventsBlankSlate";
const OrganizerDashboard = () => {
-
const {organizerId, eventsState} = useParams();
const [searchParams, setSearchParams] = useFilterQueryParamSync();
const [createModalOpen, {open: openCreateModal, close: closeCreateModal}] = useDisclosure(false);
@@ -30,7 +29,6 @@ const OrganizerDashboard = () => {
const pagination = eventsData?.meta;
const events = eventsData?.data;
const {data: organizer, isFetched: isOrganizerFetched} = useGetOrganizer(organizerId);
- const navigate = useNavigate();
return (
<>
@@ -49,7 +47,7 @@ const OrganizerDashboard = () => {
variant="transparent"
leftSection={<IconPencil/>}
onClick={openEditModal}
- >
+ >
{t`Edit Organizer`}
</Button>
</div>
@@ -85,53 +83,18 @@ const OrganizerDashboard = () => {
</>
</ToolBar>
- <Group mt={10} mb={15}>
- <Button
- size={'compact-sm'}
- variant={eventsState === 'upcoming' || !eventsState ? 'light' : 'transparent'}
- onClick={() => navigate('/manage/organizer/' + organizerId + '/events/upcoming' + window.location.search)}
- >
- {t`Upcoming`}
- </Button>
- <Button size={'compact-sm'}
- variant={eventsState === 'ended' ? 'light' : 'transparent'}
- onClick={() => navigate('/manage/organizer/' + organizerId + '/events/ended' + window.location.search)}
- >
- {t`Ended`}
- </Button>
- <Button size={'compact-sm'}
- variant={eventsState === 'archived' ? 'light' : 'transparent'}
- onClick={() => navigate('/manage/organizer/' + organizerId + '/events/archived' + window.location.search)}
- >
- {t`Archived`}
- </Button>
- </Group>
+ <EventsDashboardStatusButtons
+ baseUrl={`/manage/organizer/${organizerId}/events`}
+ eventsState={eventsState as string}
+ />
- {events?.length === 0 && isEventsFetched && (
- <NoResultsSplash
- heading={t`No events for this organizer`}
- imageHref={'/blank-slate/events.svg'}
- subHeading={(
- <>
- <p>
- {t`Once you create an event, you'll see it here.`}
- </p>
- <Button
- size={'xs'}
- leftSection={<IconPlus/>}
- color={'green'}
- onClick={() => openCreateModal()}>{t`Create Event`}
- </Button>
- </>
- )}
- />
- )}
+ {(events?.length === 0 && isEventsFetched)
+ && <NoEventsBlankSlate openCreateModal={openCreateModal} eventsState={eventsState}/>}
<div>
- {events?.map((event: Event) =>
- (
- <EventCard event={event} key={event.id}/>
- ))}
+ {events?.map((event: Event) => (
+ <EventCard event={event} key={event.id}/>
+ ))}
</div>
{isEventsFetched && events && events?.length > 0
@@ -140,7 +103,7 @@ const OrganizerDashboard = () => {
total={Number(pagination?.last_page)}
/>
}
- {createModalOpen && <CreateEventModal onClose={closeCreateModal} />}
+ {createModalOpen && <CreateEventModal onClose={closeCreateModal}/>}
{(editModalOpen && organizer) && <EditOrganizerModal organizerId={organizerId} onClose={closeEditModal}/>}
</>
);
diff --git a/frontend/src/utilites/eventsPageFiltersHelper.ts b/frontend/src/utilites/eventsPageFiltersHelper.ts
new file mode 100644
index 000000000..da5199fcf
--- /dev/null
+++ b/frontend/src/utilites/eventsPageFiltersHelper.ts
@@ -0,0 +1,44 @@
+import {EventStatus, QueryFilterOperator, QueryFilters} from "../types.ts";
+import {useParams} from "react-router-dom";
+
+export const getEventQueryFilters = (searchParams: Partial<QueryFilters>) => {
+ const {eventsState, organizerId} = useParams();
+ let filter = {};
+ if (eventsState === 'upcoming' || !eventsState) {
+ filter = {
+ additionalParams: {
+ eventsStatus: 'upcoming',
+ },
+ filterFields: {}
+ };
+ } else if (eventsState === 'ended') {
+ filter = {
+ filterFields: {
+ end_date: {operator: QueryFilterOperator.LessThanOrEquals, value: 'now'},
+ status: {operator: QueryFilterOperator.NotEquals, value: EventStatus.ARCHIVED},
+ }
+ };
+ } else if (eventsState === 'archived') {
+ filter = {
+ filterFields: {
+ status: {operator: QueryFilterOperator.Equals, value: EventStatus.ARCHIVED},
+ }
+ };
+ }
+
+ if (organizerId) {
+ // add the organizer filter on top of the other filters
+ filter = {
+ ...filter,
+ filterFields: {
+ organizer_id: {operator: QueryFilterOperator.Equals, value: organizerId},
+ ...filter.filterFields
+ }
+ }
+ }
+
+ return {
+ ...searchParams,
+ ...filter,
+ };
+}