Skip to content

New_create_event #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aevinj merged 11 commits into from
Mar 13, 2025
Merged

New_create_event #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cafbf42
first v0 generation
aevinj Mar 8, 2025
bf555a5
change duration to dropdown
aevinj Mar 9, 2025
7662379
comment some lines
aevinj Mar 10, 2025
591a992
updated calendar view to show potential timeslots
aevinj Mar 10, 2025
aa44514
add calendar header and switch to correct overlaying
aevinj Mar 10, 2025
81acba2
show user conflicts on weekly calendar for create event
aevinj Mar 10, 2025
d00aa0f
no longer allow adding yourself as a participant
aevinj Mar 10, 2025
ebd3379
better formatting
aevinj Mar 10, 2025
d8e66ce
fix api call for event creation & UI changes
aevinj Mar 13, 2025
c52be05
update calendar views
aevinj Mar 13, 2025
7fe0865
resolve some linting errors
aevinj Mar 13, 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
379 changes: 221 additions & 158 deletions src/components/calendar-overview.tsx
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/components/calendar/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from 'date-fns'
import { cn } from '@/lib/utils'
import { Badge } from '@/components/ui/badge'
import { CreateEventDialog } from '@/components/calendar/create-event-dialog'
import { CreateManualEventDialog } from '@/components/calendar/create-manual-event-dialog'
import { DayEventsDialog } from '@/components/calendar/day-events-dialog'
import { CalendarHeader } from '@/components/calendar/calendar-header'
import { AnimatePresence, motion } from 'framer-motion'
Expand Down Expand Up @@ -126,7 +126,7 @@ export function DisplayCalendar() {
<time
dateTime={format(day, 'yyyy-MM-dd')}
className={cn(
'ml-auto font-medium',
'font-medium',
isToday(day) &&
'bg-focusColor text-primary-foreground rounded-full w-6 h-6 flex items-center justify-center',
)}
Expand All @@ -148,7 +148,7 @@ export function DisplayCalendar() {
>
{event.startTime &&
format(parseISO(event.startTime), 'HH:mm')}{' '}
{event.subject}
{event.subject ? event.subject : '(No Name)'}
</Badge>
))}
{dayEvents.length > 2 && (
Expand All @@ -167,7 +167,7 @@ export function DisplayCalendar() {
</motion.div>
</AnimatePresence>

<CreateEventDialog
<CreateManualEventDialog
open={isCreateEventDialogOpen}
onOpenChangeAction={setIsCreateEventDialogOpen}
selectedDate={selectedDate}
Expand Down
Loading