Skip to content

Job application tracker and AI-powered job search assistant. Helps job seekers manage their search journey with AI resume review, job matching, task logging, and application analytics, all while keeping your data private.

create and get activities

Khuram Niazcfee4b3c4e2c
diff --git a/src/actions/activity.actions.ts b/src/actions/activity.actions.ts
index 0e2f16a..25f74ef 100644
--- a/src/actions/activity.actions.ts
+++ b/src/actions/activity.actions.ts
@@ -1,7 +1,10 @@
"use server";
import prisma from "@/lib/db";
import { handleError } from "@/lib/utils";
+import { Activity } from "@/models/activity.model";
+import { AddActivityFormSchema } from "@/models/addActivityForm.schema";
import { getCurrentUser } from "@/utils/user.utils";
+import { z } from "zod";
export const getAllActivityTypes = async (): Promise<any | undefined> => {
try {
@@ -48,3 +51,73 @@ export const createActivityType = async (
throw new Error(msg);
}
};
+
+export const getActivitiesList = async (): Promise<any | undefined> => {
+ try {
+ const user = await getCurrentUser();
+
+ if (!user) {
+ throw new Error("Not authenticated");
+ }
+
+ const data = await prisma.activity.findMany({
+ where: {
+ userId: user.id,
+ },
+ select: {
+ id: true,
+ activityName: true,
+ startTime: true,
+ endTime: true,
+ duration: true,
+ description: true,
+ createdAt: true,
+ activityType: true,
+ },
+ orderBy: {
+ createdAt: "desc",
+ },
+ });
+ return { success: true, data };
+ } catch (error) {
+ const msg = "Failed to fetch activities list. ";
+ return handleError(error, msg);
+ }
+};
+
+export const createActivity = async (
+ data: Activity
+): Promise<any | undefined> => {
+ try {
+ const user = await getCurrentUser();
+
+ if (!user) {
+ throw new Error("Not authenticated");
+ }
+
+ const {
+ activityName,
+ activityType,
+ startTime,
+ endTime,
+ duration,
+ description,
+ } = data;
+
+ const activity = await prisma.activity.create({
+ data: {
+ activityName,
+ activityTypeId: activityType as string,
+ userId: user.id,
+ startTime,
+ endTime,
+ duration,
+ description,
+ },
+ });
+ return { activity, success: true };
+ } catch (error) {
+ const msg = "Failed to create activity. ";
+ return handleError(error, msg);
+ }
+};
diff --git a/src/components/activities/ActivitiesContainer.tsx b/src/components/activities/ActivitiesContainer.tsx
index 19fb560..194a2f9 100644
--- a/src/components/activities/ActivitiesContainer.tsx
+++ b/src/components/activities/ActivitiesContainer.tsx
@@ -3,7 +3,7 @@ import ActivitiesTable from "./ActivitiesTable";
import { Card, CardContent, CardHeader, CardTitle } from "../ui/card";
import { Button } from "../ui/button";
import { PlusCircle } from "lucide-react";
-import { useState } from "react";
+import { useEffect, useState } from "react";
import {
Dialog,
DialogContent,
@@ -12,9 +12,21 @@ import {
DialogTrigger,
} from "../ui/dialog";
import { ActivityForm } from "./ActivityForm";
+import { activitiesData } from "@/lib/data/activitiesData";
+import { getActivitiesList } from "@/actions/activity.actions";
+import { Activity } from "@/models/activity.model";
+import { set } from "date-fns";
function ActivitiesContainer() {
const [activityFormOpen, setActivityFormOpen] = useState<boolean>(false);
+ const [activitiesList, setActivitiesList] = useState<Activity[]>([]);
+ const loadActivities = async () => {
+ const response = await getActivitiesList();
+ setActivitiesList(response.data);
+ };
+ useEffect(() => {
+ loadActivities();
+ }, []);
return (
<Card>
<CardHeader className="flex-row justify-between items-center">
@@ -25,7 +37,7 @@ function ActivitiesContainer() {
size="sm"
variant="outline"
className="h-8 gap-1"
- data-testid="add-job-btn"
+ data-testid="add-activity-btn"
>
<PlusCircle className="h-3.5 w-3.5" />
<span className="sr-only sm:not-sr-only sm:whitespace-nowrap">
@@ -33,7 +45,7 @@ function ActivitiesContainer() {
</span>
</Button>
</DialogTrigger>
- <DialogContent className="sm:max-w-[625px]">
+ <DialogContent className="sm:max-w-[725px]">
<DialogHeader>
<DialogTitle>Add New Activity</DialogTitle>
</DialogHeader>
@@ -42,7 +54,7 @@ function ActivitiesContainer() {
</Dialog>
</CardHeader>
<CardContent>
- <ActivitiesTable />
+ <ActivitiesTable activities={activitiesList} />
</CardContent>
</Card>
);
diff --git a/src/components/activities/ActivitiesTable.tsx b/src/components/activities/ActivitiesTable.tsx
index b032363..b6ba245 100644
--- a/src/components/activities/ActivitiesTable.tsx
+++ b/src/components/activities/ActivitiesTable.tsx
@@ -16,19 +16,17 @@ import {
DropdownMenuTrigger,
} from "../ui/dropdown-menu";
import { Button } from "../ui/button";
-import { activitiesData } from "@/lib/data/activitiesData";
-import { differenceInMinutes, format, fromUnixTime } from "date-fns";
+import { differenceInMinutes, format } from "date-fns";
+import { Activity, ActivityType } from "@/models/activity.model";
-function ActivitiesTable() {
- const activities: any = activitiesData;
- const calculateDuration = (start: number, end: number) => {
- // Convert Unix timestamps to JavaScript Date objects
- const startDate = fromUnixTime(start);
- const endDate = fromUnixTime(end);
- // Calculate the difference in minutes
- const totalMinutes = differenceInMinutes(endDate, startDate);
+interface ActivitiesTableProps {
+ activities: Activity[];
+}
+
+function ActivitiesTable({ activities }: ActivitiesTableProps) {
+ const calculateDuration = (start: Date, end: Date) => {
+ const totalMinutes = differenceInMinutes(end, start);
- // Convert total minutes to hours and remaining minutes
const hours = Math.floor(totalMinutes / 60);
const minutes = totalMinutes % 60;
return `${hours}h ${minutes}min`;
@@ -49,31 +47,28 @@ function ActivitiesTable() {
</TableRow>
</TableHeader>
<TableBody>
- {activities.map((activity: any) => {
+ {activities.map((activity: Activity) => {
return (
<TableRow key={activity.id} className="cursor-pointer">
<TableCell className="hidden md:table-cell w-[120px]">
- {activity.startDateTime
- ? format(fromUnixTime(activity.startDateTime), "PP")
- : "N/A"}
+ {activity.startTime ? format(activity.startTime, "PP") : "N/A"}
</TableCell>
<TableCell className="font-medium">
{activity.activityName}
</TableCell>
<TableCell className="font-medium">
- {activity.activityType}
+ {(activity.activityType as ActivityType)?.label}
</TableCell>
<TableCell className="hidden md:table-cell">
- {format(fromUnixTime(activity.startDateTime), "p")}
+ {format(activity.startTime, "p")}
</TableCell>
<TableCell className="hidden md:table-cell">
- {format(fromUnixTime(activity.endDateTime), "p")}
+ {format(activity.endTime!, "p")}
</TableCell>
<TableCell className="hidden md:table-cell">
- {calculateDuration(
- activity.startDateTime,
- activity.endDateTime
- )}
+ {activity.startTime &&
+ activity.endTime &&
+ calculateDuration(activity.startTime, activity.endTime!)}
</TableCell>
<TableCell>
<DropdownMenu>
diff --git a/src/components/activities/ActivityForm.tsx b/src/components/activities/ActivityForm.tsx
index 4e9b158..aa60562 100644
--- a/src/components/activities/ActivityForm.tsx
+++ b/src/components/activities/ActivityForm.tsx
@@ -15,54 +15,126 @@ import {
FormMessage,
} from "../ui/form";
import { Input } from "../ui/input";
-import { format } from "date-fns";
+import {
+ addMinutes,
+ differenceInHours,
+ differenceInMinutes,
+ format,
+} from "date-fns";
import { DatePicker } from "../DatePicker";
import TiptapEditor from "../TiptapEditor";
import { Combobox } from "../ComboBox";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
import { ActivityType } from "@/models/activity.model";
-import { getAllActivityTypes } from "@/actions/activity.actions";
+import {
+ createActivity,
+ getAllActivityTypes,
+} from "@/actions/activity.actions";
+import { combineDateAndTime } from "@/lib/utils";
interface ActivityFormProps {
onClose: () => void;
}
+type Duration = {
+ hours: number;
+ minutes: number;
+};
+
export function ActivityForm({ onClose }: ActivityFormProps) {
const [activityTypes, setActivityTypes] = useState<ActivityType[]>([]);
- const now = new Date();
- const currentDate = now;
- const currentTime = format(now, "hh:mm a");
- const form = useForm<z.infer<typeof AddActivityFormSchema>>({
- resolver: zodResolver(AddActivityFormSchema),
- defaultValues: {
+ const [duration, setDuration] = useState<Duration | null>(null);
+ const defaultValues = useMemo(() => {
+ const now = new Date();
+ const currentTime = format(now, "hh:mm a");
+ const nowPlus5mins = addMinutes(now, 5);
+ const estimatedEndTime = format(nowPlus5mins, "hh:mm a");
+
+ return {
activityName: "",
activityType: "",
- startDate: currentDate,
+ startDate: now,
startTime: currentTime,
- endDate: currentDate,
- endTime: "",
- },
+ endDate: now,
+ endTime: estimatedEndTime,
+ };
+ }, []);
+ const form = useForm<z.infer<typeof AddActivityFormSchema>>({
+ resolver: zodResolver(AddActivityFormSchema),
+ defaultValues,
});
const {
reset,
+ getValues,
+ watch,
formState: { errors, isValid },
} = form;
- const loadActivityTypes = async () => {
- try {
- const activityTypes = await getAllActivityTypes();
- setActivityTypes(activityTypes);
- } catch (error) {
- console.error("Error loading activity types");
+ const loadActivityTypes = useCallback(async () => {
+ const activityTypes = await getAllActivityTypes();
+ setActivityTypes(activityTypes);
+ }, []);
+
+ const calculateDuration = useCallback(() => {
+ const startDateTime =
+ getValues("startDate") && getValues("startTime")
+ ? combineDateAndTime(getValues("startDate"), getValues("startTime"))
+ : null;
+
+ const endDateTime =
+ getValues("endDate") && getValues("endTime")
+ ? combineDateAndTime(getValues("endDate")!, getValues("endTime")!)
+ : null;
+
+ if (startDateTime && endDateTime) {
+ const hours = differenceInHours(endDateTime, startDateTime);
+ const totalMinutes = differenceInMinutes(endDateTime, startDateTime);
+ const minutes = totalMinutes % 60;
+
+ setDuration({ hours, minutes });
+ } else {
+ setDuration(null);
}
- };
+ }, [getValues]);
useEffect(() => {
loadActivityTypes();
- }, []);
+ }, [loadActivityTypes]);
+
+ useEffect(() => {
+ const subscription = watch((value, { name }) => {
+ if (
+ ["startDate", "startTime", "endDate", "endTime"].includes(name || "")
+ ) {
+ calculateDuration();
+ }
+ });
+
+ return () => subscription.unsubscribe();
+ }, [calculateDuration, watch]);
- const onSubmit = (data: z.infer<typeof AddActivityFormSchema>) => {};
+ const onSubmit = async (data: z.infer<typeof AddActivityFormSchema>) => {
+ const { startDate, startTime, endDate, endTime, ...rest } = data;
+ try {
+ const startDateTime = combineDateAndTime(startDate, startTime);
+ const endDateTime =
+ endDate && endTime ? combineDateAndTime(endDate, endTime) : null;
+ const totalMinutes = endDateTime
+ ? differenceInMinutes(endDateTime, startDateTime)
+ : undefined;
+ const payload = {
+ ...rest,
+ startTime: startDateTime,
+ endTime: endDateTime ?? undefined,
+ duration: totalMinutes,
+ };
+ const response = await createActivity(payload);
+ onClose();
+ } catch (error) {
+ console.error("Error parsing date and time:", error);
+ }
+ };
return (
<Form {...form}>
<form
@@ -172,7 +244,23 @@ export function ActivityForm({ onClose }: ActivityFormProps) {
name="endTime"
render={({ field }) => (
<FormItem>
- <FormLabel>End Time</FormLabel>
+ <FormLabel>
+ End Time
+ <span className="text-sm">
+ {duration && (
+ <span>
+ {" "}
+ ({duration.hours > 0 ? `${duration.hours} h` : ""}
+ {duration.minutes > 0
+ ? `${duration.hours > 0 ? " " : ""}${
+ duration.minutes
+ } min`
+ : ""}
+ {!duration.hours && !duration.minutes ? "0 mins" : ""})
+ </span>
+ )}
+ </span>
+ </FormLabel>
<FormControl>
<Input {...field} placeholder="hh:mm AM/PM" />
</FormControl>
diff --git a/src/lib/data/activitiesData.ts b/src/lib/data/activitiesData.ts
index 7fa756e..dba01e1 100644
--- a/src/lib/data/activitiesData.ts
+++ b/src/lib/data/activitiesData.ts
@@ -1,36 +1,38 @@
-export const activitiesData = [
+import { Activity } from "@/models/activity.model";
+
+export const activitiesData: Activity[] = [
{
id: "1",
- startDateTime: 1717849899,
- endDateTime: 1717851339,
+ startTime: new Date(1717849899 * 1000),
+ endTime: new Date(1717851339 * 1000),
activityName: "Deep Learning",
activityType: "Learning",
},
{
id: "2",
- startDateTime: 1717386692,
- endDateTime: 1717397492,
+ startTime: new Date(1717386692 * 1000),
+ endTime: new Date(1717397492 * 1000),
activityName: "Job Search",
activityType: "Job Search",
},
{
id: "3",
- startDateTime: 1718864409,
- endDateTime: 1718878809,
+ startTime: new Date(1718864409 * 1000),
+ endTime: new Date(1718878809 * 1000),
activityName: "Web Project",
activityType: "Coding",
},
{
id: "4",
- startDateTime: 1719189923,
- endDateTime: 1719204323,
+ startTime: new Date(1719189923 * 1000),
+ endTime: new Date(1719204323 * 1000),
activityName: "Puppeteer",
activityType: "Learning",
},
{
id: "5",
- startDateTime: 1718394188,
- endDateTime: 1718397788,
+ startTime: new Date(1718394188 * 1000),
+ endTime: new Date(1718397788 * 1000),
activityName: "Job Search",
activityType: "Job Search",
},
diff --git a/src/models/activity.model.ts b/src/models/activity.model.ts
index 505b98a..63de0e1 100644
--- a/src/models/activity.model.ts
+++ b/src/models/activity.model.ts
@@ -6,3 +6,17 @@ export interface ActivityType {
createdAt: Date;
updatedAt: Date;
}
+
+export interface Activity {
+ id?: string;
+ activityTypeId?: string;
+ activityType: ActivityType | string;
+ userId?: string;
+ createdAt?: Date;
+ updatedAt?: Date;
+ activityName: string;
+ startTime: Date;
+ endTime?: Date;
+ duration?: number;
+ description?: string;
+}