Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
441952d
refactor: Move seed data outside of main seed file
ZeroWave022 Aug 1, 2025
49142de
feat: Add events table and seed data
ZeroWave022 Aug 1, 2025
830861a
fix: Add locale to eventLocalizations
ZeroWave022 Aug 1, 2025
481a758
feat: Fetch events from db
ZeroWave022 Aug 1, 2025
978f8bb
fix: Fetch internal events only for members
ZeroWave022 Aug 1, 2025
b6884c8
refactor: Move event fetching to tRPC
ZeroWave022 Aug 1, 2025
9d900b2
feat: Add pagination to events page
ZeroWave022 Aug 1, 2025
c2ebba9
fix: Only show image on EventCard if there is one available
ZeroWave022 Aug 1, 2025
b4134a7
refactor: Use next-intl formatter wherever possible
ZeroWave022 Aug 1, 2025
533026a
refactor: Simplify ref prop typing
ZeroWave022 Aug 2, 2025
3506764
feat: Add DateTimePicker
ZeroWave022 Aug 2, 2025
a51918b
fix: Connect events to skills in db schema
ZeroWave022 Aug 2, 2025
7e3f52a
feat: Add event editing form
ZeroWave022 Aug 2, 2025
d396969
refactor: Rename storage procedure to protected edit procedure
ZeroWave022 Aug 3, 2025
1e60c50
refactor: Remove skillIdentifiers, replace with db
ZeroWave022 Aug 3, 2025
7199606
feat: Add default icon if skill identifier doesn't have a custom icon
ZeroWave022 Aug 3, 2025
ed2c340
feat: Event creation
ZeroWave022 Aug 3, 2025
bd7369f
fix: Make summary, description and location required
ZeroWave022 Aug 3, 2025
0436574
feat: Add edit button and back to events button
ZeroWave022 Aug 3, 2025
e52082b
fix: Set initial value in DateTimePicker if provided
ZeroWave022 Aug 3, 2025
4b385ce
feat: Add event editing and deletion
ZeroWave022 Aug 3, 2025
989e3fa
feat: Event image deletion
ZeroWave022 Aug 3, 2025
b940a5f
refactor: Remove skill names from messages, they're stored in db now
ZeroWave022 Aug 3, 2025
02a003d
feat: Add sign-up for events
ZeroWave022 Aug 3, 2025
3da2368
refactor: Rename many-to-many relation SQL tables for consistency
ZeroWave022 Aug 3, 2025
6566985
fix: Disable sign up button when not logged in
ZeroWave022 Aug 3, 2025
f98b070
refactor: Move member avatar to own component
ZeroWave022 Aug 3, 2025
e82b607
feat: Setting member attendance for events
ZeroWave022 Aug 3, 2025
4f82233
feat: Add event deadlines
ZeroWave022 Aug 5, 2025
ef49bdd
fix: Adjust size of MemberAvatar on MemberInfoCard
ZeroWave022 Aug 5, 2025
99f274a
feat: Give participants skills after finished event
ZeroWave022 Aug 5, 2025
63cba55
feat: Use non-relative imports for all VS Code users
ZeroWave022 Aug 5, 2025
2af3ca8
Merge branch 'dev' into feat/events
ZeroWave022 Aug 5, 2025
12b023f
feat: Add loading to new event and edit event pages
ZeroWave022 Aug 5, 2025
181ae9f
Merge branch 'dev' into feat/events
ZeroWave022 Aug 6, 2025
d0f72da
feat: Custom tooltip if event is finished
ZeroWave022 Aug 27, 2025
6820cbe
fix: Adjust the back buttons on event edit pages
ZeroWave022 Aug 27, 2025
37fd6e0
fix: Set initial event start date to next day
ZeroWave022 Aug 27, 2025
241b0a1
refactor: Avoid event localization arrays of length 1
ZeroWave022 Aug 27, 2025
79e062e
refactor: Move API exports
ZeroWave022 Aug 27, 2025
4db409b
fix: Limit name and location lengths on client
ZeroWave022 Aug 27, 2025
8625303
feat: Optimistic UI for event attendance checkbox
ZeroWave022 Aug 27, 2025
06fc6a0
feat: Show skill that can be achieved by participating at event
ZeroWave022 Aug 27, 2025
2ae53a2
Merge branch 'dev' into feat/events
ZeroWave022 Aug 27, 2025
5ab4d0e
Merge branch 'dev' into feat/events
ZeroWave022 Sep 3, 2025
03a4366
fix: Increase max length of event name
ZeroWave022 Sep 3, 2025
24f5557
refactor: Simplify check for user having skill already
ZeroWave022 Sep 3, 2025
1209f39
fix: Don't use div inside HTML paragraph
ZeroWave022 Sep 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Only show image on EventCard if there is one available
  • Loading branch information
ZeroWave022 committed Aug 1, 2025
commit c2ebba944bcb170c91c1332114db05f3e8ea28d4
23 changes: 16 additions & 7 deletions src/components/events/EventCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ function EventCard({
_active,
}: EventCardProps) {
const localization = event.localizations[0];
const imageUrlQuery = api.utils.getFileUrl.useQuery(
{ fileId: event.imageId ?? 0 },
{ enabled: !!event.imageId },
);

const imageUrl = event.imageId ? imageUrlQuery.data : undefined;

if (!localization) return;

const formattedStartDate = format(event.startTime, 'HH:mm, dd.MM.yyyy');
Expand Down Expand Up @@ -77,13 +84,15 @@ function EventCard({
</CardHeader>
<CardContent className='flex flex-col-reverse items-center gap-6 md:flex-row md:justify-center'>
<p className='max-w-96'>{localization.description}</p>
<Avatar className='h-48 w-48 shrink-0'>
<AvatarImage
src='/event.webp'
alt={t.photoOf}
className='object-cover'
/>
</Avatar>
{imageUrl && (
<Avatar className='h-48 w-48 shrink-0'>
<AvatarImage
src={imageUrl}
alt={t.photoOf}
className='object-cover'
/>
</Avatar>
)}
</CardContent>
<CardFooter className='mt-auto flex-col'>
<p>
Expand Down