Compare commits

..

1 commit

Author SHA1 Message Date
83fe2c772c
fix: event cards layout bugs
Some checks failed
tests / Tests (pull_request) Has been cancelled
docker-build / docker (pull_request) Has been cancelled
container-scan / Container Scan (pull_request) Has been cancelled
2025-07-01 11:45:19 +02:00
2 changed files with 6 additions and 10 deletions

View file

@ -8,7 +8,6 @@ import {
useDeleteApiEventEventID,
useGetApiEventEventID,
} from '@/generated/api/event/event';
import { useGetApiUserMe } from '@/generated/api/user/user';
import { RedirectButton } from '@/components/buttons/redirect-button';
import { useSession } from 'next-auth/react';
import ParticipantListEntry from '@/components/custom-ui/participant-list-entry';
@ -35,10 +34,9 @@ export default function ShowEvent() {
// Fetch event data
const { data: eventData, isLoading, error } = useGetApiEventEventID(eventID);
const { data: userData, isLoading: userLoading } = useGetApiUserMe();
const deleteEvent = useDeleteApiEventEventID();
if (isLoading || userLoading) {
if (isLoading) {
return (
<div className='flex justify-center items-center h-full'>Loading...</div>
);
@ -143,7 +141,7 @@ export default function ShowEvent() {
Organiser:
</Label>
<Label size='large'>
{userData?.data.user?.name || 'Unknown User'}
{eventData.data.event.organizer.name || 'Unknown User'}
</Label>
</div>
</div>

View file

@ -30,6 +30,7 @@ import {
DialogTitle,
DialogTrigger,
} from '../ui/dialog';
import { useGetApiUserMe } from '@/generated/api/user/user';
type User = zod.output<typeof PublicUserSchema>;
@ -56,13 +57,10 @@ const EventForm: React.FC<EventFormProps> = (props) => {
isSuccess,
error,
} = usePostApiEvent();
const {
data: eventData,
isLoading,
isError,
} = useGetApiEventEventID(props.eventId!, {
const { data: eventData } = useGetApiEventEventID(props.eventId!, {
query: { enabled: props.type === 'edit' },
});
const { data, isLoading, isError } = useGetApiUserMe();
const patchEvent = usePatchApiEventEventID();
const router = useRouter();
@ -299,7 +297,7 @@ const EventForm: React.FC<EventFormProps> = (props) => {
<p className='text-[var(--color-neutral-300)]'>
{!isClient || isLoading
? 'Loading...'
: eventData?.data.event.organizer.name || 'Unknown User'}
: data?.data.user.name || 'Unknown User'}
</p>
</div>
</div>