Compare commits

..

1 commit

Author SHA1 Message Date
2a95836dcb
fix: settings error message
Some checks failed
container-scan / Container Scan (pull_request) Successful in 2m32s
tests / Tests (pull_request) Has been cancelled
docker-build / docker (pull_request) Successful in 3m41s
2025-07-01 08:59:43 +02:00
2 changed files with 28 additions and 16 deletions

View file

@ -108,7 +108,9 @@ export default function ShowEvent() {
<Label className='text-[var(--color-neutral-300)] mb-2'>
Location
</Label>
<Label size='large'>{eventData.data.event.location || '-'}</Label>
<Label size='large'>
{eventData.data.event.location || '-'}
</Label>
</div>
<div className='flex flex-col gap-4'>
<div className='flex flex-row gap-2'>
@ -116,7 +118,9 @@ export default function ShowEvent() {
created:
</Label>
<Label>
{eventData.data.event.created_at ? formatDate(eventData.data.event.created_at) : '-'}
{eventData.data.event.created_at
? formatDate(eventData.data.event.created_at)
: '-'}
</Label>
</div>
<div className='flex flex-row gap-2'>
@ -124,7 +128,9 @@ export default function ShowEvent() {
updated:
</Label>
<Label>
{eventData.data.event.updated_at ? formatDate(eventData.data.event.updated_at) : '-'}
{eventData.data.event.updated_at
? formatDate(eventData.data.event.updated_at)
: '-'}
</Label>
</div>
</div>
@ -136,14 +142,18 @@ export default function ShowEvent() {
<Label className='text-[var(--color-neutral-300)]'>
Organiser:
</Label>
<Label size='large'>{userData?.data.user?.name || 'Unknown User'}</Label>
<Label size='large'>
{userData?.data.user?.name || 'Unknown User'}
</Label>
</div>
</div>
<div className='h-full w-full'>
<Label className='text-[var(--color-neutral-300)] mb-2'>
Description
</Label>
<Label size='large'>{eventData.data.event.description || '-'}</Label>
<Label size='large'>
{eventData.data.event.description || '-'}
</Label>
</div>
</div>
<div className='h-full w-full mt-2'>
@ -164,7 +174,8 @@ export default function ShowEvent() {
<div className='flex flex-row gap-2 justify-end mt-4 mb-6'>
<div className='w-[20%] grid max-sm:w-full'>
{session.data?.user?.id === eventData.data.event.organizer.id ? (
{session.data?.user?.id ===
eventData.data.event.organizer.id ? (
<Dialog
open={deleteDialogOpen}
onOpenChange={setDeleteDialogOpen}
@ -179,7 +190,8 @@ export default function ShowEvent() {
<DialogTitle>Delete Event</DialogTitle>
<DialogDescription>
Are you sure you want to delete the event &ldquo;
{eventData.data.event.title}&rdquo;? This action cannot be undone.
{eventData.data.event.title}&rdquo;? This action
cannot be undone.
</DialogDescription>
</DialogHeader>
<DialogFooter>
@ -219,7 +231,8 @@ export default function ShowEvent() {
) : null}
</div>
<div className='w-[20%] grid max-sm:w-full'>
{session.data?.user?.id === eventData.data.event.organizer.id ? (
{session.data?.user?.id ===
eventData.data.event.organizer.id ? (
<RedirectButton
redirectUrl={`/events/edit/${eventID}`}
buttonText='edit'

View file

@ -58,14 +58,11 @@ const EventForm: React.FC<EventFormProps> = (props) => {
error,
} = usePostApiEvent();
const { data, isLoading, error: fetchError } = useGetApiUserMe();
const { data: eventData } = useGetApiEventEventID(
props.eventId!,
{
query: { enabled: props.type === 'edit' },
},
);
const { data: eventData } = useGetApiEventEventID(props.eventId!, {
query: { enabled: props.type === 'edit' },
});
const patchEvent = usePatchApiEventEventID();
const router = useRouter();;
const router = useRouter();
// State for date and time fields
const [startDate, setStartDate] = React.useState<Date | undefined>(undefined);
@ -102,7 +99,9 @@ const EventForm: React.FC<EventFormProps> = (props) => {
}
setLocation(eventData?.data?.event.location || '');
setDescription(eventData?.data?.event.description || '');
setSelectedParticipants(eventData?.data?.event.participants?.map((u) => u.user) || []);
setSelectedParticipants(
eventData?.data?.event.participants?.map((u) => u.user) || [],
);
} else if (props.type === 'create' && startFromUrl && endFromUrl) {
// If creating a new event with URL params, set title and dates
setTitle('');