Skip to content

Commit

Permalink
add time picker
Browse files Browse the repository at this point in the history
  • Loading branch information
fmtabbara committed Dec 6, 2024
1 parent 687fbf4 commit 66fafd0
Show file tree
Hide file tree
Showing 11 changed files with 318 additions and 29 deletions.
2 changes: 2 additions & 0 deletions suncityla/app/booking/actions/onSubmitAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const onSubmitAction = async (prvState: FormState, data: FormData): Promise<Form
state: parsed.data.state,
postalCode: parsed.data['postal-code'],
bookingDate: parsed.data.bookingDate,
bookingTime: parsed.data.bookingTime,
},
});
} else {
Expand All @@ -50,6 +51,7 @@ const onSubmitAction = async (prvState: FormState, data: FormData): Promise<Form
state: parsed.data.state,
postalCode: parsed.data['postal-code'],
bookingDate: parsed.data.bookingDate,
bookingTime: parsed.data.bookingTime,
},
});
}
Expand Down
2 changes: 2 additions & 0 deletions suncityla/app/booking/components/BookingCard/BookingEntry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const BookingEntry = ({ booking }: { booking: Booking }) => {
<TableHead>Firstname</TableHead>
<TableHead>Lastname</TableHead>
<TableHead>Booking date</TableHead>
<TableHead>Booking time</TableHead>
<TableHead>Address line 1</TableHead>
<TableHead>Address line 2</TableHead>
<TableHead>State</TableHead>
Expand All @@ -40,6 +41,7 @@ const BookingEntry = ({ booking }: { booking: Booking }) => {
<TableCell>{booking.firstname}</TableCell>
<TableCell>{booking.lastname}</TableCell>
<TableCell>{format(new Date(booking.bookingDate), 'yyyy-MM-dd')}</TableCell>
<TableCell>{booking.bookingTime}</TableCell>
<TableCell>{booking.streetAddress}</TableCell>
<TableCell>{booking.postalCode}</TableCell>
<TableCell>{booking.state}</TableCell>
Expand Down
4 changes: 4 additions & 0 deletions suncityla/app/booking/components/BookingForm/BookingForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import LoadingModal from '@/components/modals/Loading';
import onSubmitAction from '@/app/booking/actions/onSubmitAction';
import { bookingFormSchema } from '../../schemas/newBookingForm';
import { Booking } from '@prisma/client';
import TimeSelect from '../TimeSelect/TimeSelect';
import availableTimes from '../TimeSelect/times';

export type BookingFormData = z.infer<typeof bookingFormSchema>;

Expand All @@ -33,6 +35,7 @@ export default function BookingForm({ booking }: { booking?: Booking | null }) {
'postal-code': booking?.postalCode ?? '',
state: 'LA',
bookingDate: booking?.bookingDate.toISOString() ?? new Date().toISOString(),
bookingTime: booking?.bookingTime || availableTimes[0].time,
...(state.fields ?? {}),
},
});
Expand Down Expand Up @@ -76,6 +79,7 @@ export default function BookingForm({ booking }: { booking?: Booking | null }) {
<BookingFormField placeholder="Postcode" name="postal-code" />
<BookingFormField placeholder="State" name="state" disabled />
<DateTimePickerForm />
<TimeSelect />
<div className="flex gap-1 justify-end mt-4">
<Button onClick={handleClearForm} variant="outline">
Clear
Expand Down
44 changes: 44 additions & 0 deletions suncityla/app/booking/components/TimeSelect/TimeSelect.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import * as React from 'react';

import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectLabel,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import availableTimes from './times';
import { FormField, FormItem } from '@/components/ui/form';

export function TimeSelect() {
return (
<FormField
name="bookingTime"
render={({ field }) => (
<FormItem>
<Select {...field} onValueChange={field.onChange}>
<SelectTrigger className="w-[180px] bg-white">
<SelectValue placeholder="Select a time" />
</SelectTrigger>
<div className="bg-white">
<SelectContent>
<SelectGroup>
<SelectLabel>Times</SelectLabel>
{availableTimes.map(({ time }) => (
<SelectItem key={time} value={time}>
{time}
</SelectItem>
))}
</SelectGroup>
</SelectContent>
</div>
</Select>
</FormItem>
)}
/>
);
}

export default TimeSelect;
18 changes: 18 additions & 0 deletions suncityla/app/booking/components/TimeSelect/times.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const availableTimes = [
{ time: '8:00 - 9:00 AM' },
{ time: '9:00 - 10:00 AM' },
{ time: '10:00 - 11:00 AM' },
{ time: '11:00 - 12:00 PM' },
{ time: '12:00 - 1:00 PM' },
{ time: '1:00 - 2:00 PM' },
{ time: '2:00 - 3:00 PM' },
{ time: '3:00 - 4:00 PM' },
{ time: '4:00 - 5:00 PM' },
{ time: '5:00 - 6:00 PM' },
{ time: '6:00 - 7:00 PM' },
{ time: '7:00 - 8:00 PM' },
{ time: '8:00 - 9:00 PM' },
{ time: '9:00 - 10:00 PM' },
];

export default availableTimes;
1 change: 1 addition & 0 deletions suncityla/app/booking/schemas/newBookingForm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ export const bookingFormSchema = z.object({
message: 'Booking date must be in the future.',
},
),
bookingTime: z.string(),
bookingId: z.string().optional(),
});
152 changes: 152 additions & 0 deletions suncityla/components/ui/select.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
'use client';

import * as React from 'react';
import * as SelectPrimitive from '@radix-ui/react-select';
import { Check, ChevronDown, ChevronUp } from 'lucide-react';

import { cn } from '@/lib/utils';

const Select = SelectPrimitive.Root;

const SelectGroup = SelectPrimitive.Group;

const SelectValue = SelectPrimitive.Value;

const SelectTrigger = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
>(({ className, children, ...props }, ref) => (
<SelectPrimitive.Trigger
ref={ref}
className={cn(
'flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-zinc-200 bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-white placeholder:text-zinc-500 focus:outline-none focus:ring-1 focus:ring-zinc-950 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1 dark:border-zinc-800 dark:ring-offset-zinc-950 dark:placeholder:text-zinc-400 dark:focus:ring-zinc-300',
className,
)}
{...props}
>
{children}
<SelectPrimitive.Icon asChild>
<ChevronDown className="h-4 w-4 opacity-50" />
</SelectPrimitive.Icon>
</SelectPrimitive.Trigger>
));
SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;

const SelectScrollUpButton = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
>(({ className, ...props }, ref) => (
<SelectPrimitive.ScrollUpButton
ref={ref}
className={cn('flex cursor-default items-center justify-center py-1', className)}
{...props}
>
<ChevronUp className="h-4 w-4" />
</SelectPrimitive.ScrollUpButton>
));
SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;

const SelectScrollDownButton = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
>(({ className, ...props }, ref) => (
<SelectPrimitive.ScrollDownButton
ref={ref}
className={cn('flex cursor-default items-center justify-center py-1', className)}
{...props}
>
<ChevronDown className="h-4 w-4" />
</SelectPrimitive.ScrollDownButton>
));
SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName;

const SelectContent = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
>(({ className, children, position = 'popper', ...props }, ref) => (
<SelectPrimitive.Portal>
<SelectPrimitive.Content
ref={ref}
className={cn(
'relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-zinc-200 bg-white text-zinc-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-zinc-800 dark:bg-zinc-950 dark:text-zinc-50',
position === 'popper' &&
'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
className,
)}
position={position}
{...props}
>
<SelectScrollUpButton />
<SelectPrimitive.Viewport
className={cn(
'p-1',
position === 'popper' &&
'h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]',
)}
>
{children}
</SelectPrimitive.Viewport>
<SelectScrollDownButton />
</SelectPrimitive.Content>
</SelectPrimitive.Portal>
));
SelectContent.displayName = SelectPrimitive.Content.displayName;

const SelectLabel = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Label>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
>(({ className, ...props }, ref) => (
<SelectPrimitive.Label
ref={ref}
className={cn('px-2 py-1.5 text-sm font-semibold', className)}
{...props}
/>
));
SelectLabel.displayName = SelectPrimitive.Label.displayName;

const SelectItem = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
>(({ className, children, ...props }, ref) => (
<SelectPrimitive.Item
ref={ref}
className={cn(
'relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-zinc-100 focus:text-zinc-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-zinc-800 dark:focus:text-zinc-50',
className,
)}
{...props}
>
<span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
<SelectPrimitive.ItemIndicator>
<Check className="h-4 w-4" />
</SelectPrimitive.ItemIndicator>
</span>
<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
</SelectPrimitive.Item>
));
SelectItem.displayName = SelectPrimitive.Item.displayName;

const SelectSeparator = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
>(({ className, ...props }, ref) => (
<SelectPrimitive.Separator
ref={ref}
className={cn('-mx-1 my-1 h-px bg-zinc-100 dark:bg-zinc-800', className)}
{...props}
/>
));
SelectSeparator.displayName = SelectPrimitive.Separator.displayName;

export {
Select,
SelectGroup,
SelectValue,
SelectTrigger,
SelectContent,
SelectLabel,
SelectItem,
SelectSeparator,
SelectScrollUpButton,
SelectScrollDownButton,
};
62 changes: 62 additions & 0 deletions suncityla/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions suncityla/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-select": "^2.1.2",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-toast": "^1.2.2",
"@tanstack/react-table": "^8.20.5",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "Booking" ADD COLUMN "bookingTime" TEXT;
Loading

0 comments on commit 66fafd0

Please sign in to comment.