Add event location (#124)

* add event location * Prettier format
acmutsa · Oct 14, 2024 · aec7a29 · aec7a29
1 parent 56fcc55
commit aec7a29
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 10 deletions.
diff --git a/apps/web/src/app/api/admin/events/create/route.ts b/apps/web/src/app/api/admin/events/create/route.ts
@@ -37,6 +37,7 @@ export async function POST(req: Request) {
 			description: parsedBody.data.description,
 			startTime: parsedBody.data.startTime,
 			endTime: parsedBody.data.endTime,
+			location: parsedBody.data.location,
 			type: parsedBody.data.type,
 			host:
 				parsedBody.data.host && parsedBody.data.host.length > 0

diff --git a/apps/web/src/components/events/admin/EventDetails.tsx b/apps/web/src/components/events/admin/EventDetails.tsx
@@ -52,6 +52,11 @@ export default function EventFull({ event }: { event: Event }) {
 				<h2 className="mb-20 text-lg font-bold">
 					Hosted by {event.host}
 				</h2>
+				<h3 className="mb-2 font-bold">
+					Location:{" "}
+					<span className="font-normal">{event.location}</span>
+				</h3>
+
 				<h3 className="mb-2 font-bold">Description:</h3>
 				<p>
 					<Balancer>{event.description}</Balancer>

diff --git a/apps/web/src/components/events/admin/NewEventForm.tsx b/apps/web/src/components/events/admin/NewEventForm.tsx
@@ -48,6 +48,8 @@ export default function NewEventForm({ defaultDate }: NewEventFormProps) {
 			type: "" as any,
 			host: "",
 			startTime: defaultDate,
+			points: 0,
+			location: "TBD",
 			endTime: new Date(defaultDate.getTime() + ONE_HOUR_IN_MILLISECONDS),
 		},
 	});
@@ -92,6 +94,7 @@ export default function NewEventForm({ defaultDate }: NewEventFormProps) {
 						</FormItem>
 					)}
 				/>
+
 				<FormField
 					control={form.control}
 					name="description"
@@ -105,6 +108,25 @@ export default function NewEventForm({ defaultDate }: NewEventFormProps) {
 						</FormItem>
 					)}
 				/>
+				<FormField
+					control={form.control}
+					name="location"
+					render={({ field }) => (
+						<FormItem>
+							<FormLabel>Location</FormLabel>
+							<FormControl>
+								<Input
+									{...field}
+									value={field.value ?? "TBD"}
+								/>
+							</FormControl>
+							{/* <FormDescription>
+								Keep title short and concise
+							</FormDescription> */}
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
 				<div className="grid grid-cols-2 gap-x-2">
 					<FormField
 						control={form.control}
@@ -166,15 +188,15 @@ export default function NewEventForm({ defaultDate }: NewEventFormProps) {
 								<FormLabel>Event Start</FormLabel>
 								<DateTimePicker
 									value={
-										!!field.value
+										field.value
 											? parseAbsolute(
 													field.value.toISOString(),
 													userLocalTimeZone,
 												)
 											: null
 									}
 									onChange={(date) => {
-										const newDate = !!date
+										const newDate = date
 											? date.toDate(userLocalTimeZone)
 											: null;
 										field.onChange(newDate);

diff --git a/apps/web/src/components/events/shared/EventColumns.tsx b/apps/web/src/components/events/shared/EventColumns.tsx
@@ -29,6 +29,11 @@ export const columns: ColumnDef<eventTableValidatorType>[] = [
 			</span>
 		),
 	},
+	{
+		accessorKey: "location",
+		header: "Location",
+		cell: ({ row }) => <span>{row.original.location}</span>,
+	},
 	{
 		accessorKey: "startTime",
 		header: "Start",

diff --git a/apps/web/src/lib/types/events.ts b/apps/web/src/lib/types/events.ts
@@ -8,7 +8,7 @@ export interface EventType extends InferSelectModel<typeof events> {}
 
 export type eventTableValidatorType = Pick<
 	z.infer<typeof eventDataTableValidator>,
-	"title" | "startTime" | "endTime" | "id" | "type"
+	"title" | "location" | "startTime" | "endTime" | "id" | "type"
 >;
 
 export interface NewEventFormProps {

diff --git a/apps/web/src/validators/event.ts b/apps/web/src/validators/event.ts
@@ -7,6 +7,7 @@ import c from "config";
 export const newEventFormSchema = createInsertSchema(events, {
 	title: z.string().min(1),
 	description: z.string().min(1),
+	location: z.string().min(1),
 	startTime: z.date(),
 	endTime: z.date(),
 	host: z.string().optional(),

diff --git a/packages/db/functions/events.ts b/packages/db/functions/events.ts
@@ -18,9 +18,9 @@ export function createNewEvent(event: eventInsertType) {
 
 export function getAllEvents(options?: getAllEventsOptions) {
 	const orderByClause = options?.descending
-	? [desc(events.startTime)]
-	: [asc(events.startTime)]
-		
+		? [desc(events.startTime)]
+		: [asc(events.startTime)];
+
 	return db.query.events.findMany({
 		orderBy: orderByClause,
 	});

diff --git a/packages/db/schema.ts b/packages/db/schema.ts
@@ -159,10 +159,8 @@ export const events = pgTable("events", {
 	title: varchar("name", { length: 255 }).notNull(),
 	startTime: timestamp("start_time").notNull(),
 	endTime: timestamp("end_time").notNull(),
-	// checkinStartTime: timestamp("checkin_start_time").notNull(),
-	// checkinEndTime: timestamp("checkin_end_time").notNull(),
-	// location: varchar("location", { length: 255 }).notNull(),
-	// points: integer("points").notNull().default(0),
+	location: varchar("location", { length: 255 }).default("TBD"),
+	points: integer("points").notNull().default(0),
 	description: text("description").notNull(),
 	type: varchar("type", { length: 50 }).notNull(),
 	host: varchar("host", { length: 255 }),