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.

Add activities bar chart on dashboard

Khuram Niazeafa12a37b28
diff --git a/src/actions/dashboard.actions.ts b/src/actions/dashboard.actions.ts
index 9173214..f3eb7b6 100644
--- a/src/actions/dashboard.actions.ts
+++ b/src/actions/dashboard.actions.ts
@@ -99,6 +99,65 @@ const getLast7Days = (dateType = "PP") => {
return dates;
};
+export const getActivityDataForPeriod = async (): Promise<any | undefined> => {
+ try {
+ const user = await getCurrentUser();
+
+ if (!user) {
+ throw new Error("Not authenticated");
+ }
+ const today = new Date();
+ const sevenDaysAgo = subDays(today, 6);
+ const activities = await prisma.activity.findMany({
+ where: {
+ userId: user.id,
+ endTime: {
+ gte: sevenDaysAgo,
+ lte: today,
+ },
+ },
+ select: {
+ endTime: true,
+ duration: true,
+ activityType: {
+ select: {
+ label: true,
+ },
+ },
+ },
+ orderBy: {
+ endTime: "asc",
+ },
+ });
+ const groupedData = activities.reduce((acc: any, activity: any) => {
+ const day = format(new Date(activity.endTime), "PP");
+ const activityTypeLabel = activity.activityType?.label || "Unknown";
+
+ if (!acc[day]) {
+ acc[day] = { day: day.split(",")[0] };
+ }
+
+ const durationInHours = (activity.duration || 0) / 60;
+ acc[day][activityTypeLabel] = (
+ (parseFloat(acc[day][activityTypeLabel]) || 0) + durationInHours
+ ).toFixed(2);
+
+ return acc;
+ }, {});
+ const last7Days = getLast7Days();
+ const result = last7Days.map((date) => ({
+ day: date.split(",")[0],
+ ...groupedData[date],
+ }));
+
+ return result;
+ } catch (error) {
+ const msg = "Failed to fetch activities data.";
+ console.error(msg, error);
+ throw new Error(msg);
+ }
+};
+
export const getJobsActivityForPeriod = async (): Promise<any | undefined> => {
try {
const user = await getCurrentUser();
diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index 68f1469..04158d7 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -1,5 +1,6 @@
import {
getActivityCalendarData,
+ getActivityDataForPeriod,
getJobsActivityForPeriod,
getJobsAppliedForPeriod,
getRecentJobs,
@@ -9,6 +10,7 @@ import JobsApplied from "@/components/dashboard/JobsAppliedCard";
import NumberCard from "@/components/dashboard/NumberCard";
import RecentJobsCard from "@/components/dashboard/RecentJobsCard";
import WeeklyBarChart from "@/components/dashboard/WeeklyBarChart";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { Metadata } from "next";
@@ -22,14 +24,24 @@ export default async function Dashboard() {
{ count: jobsAppliedLast30Days, trend: trendFor30Days },
recentJobs,
weeklyData,
+ activitiesData,
activityCalendarData,
] = await Promise.all([
getJobsAppliedForPeriod(7),
getJobsAppliedForPeriod(30),
getRecentJobs(),
getJobsActivityForPeriod(),
+ getActivityDataForPeriod(),
getActivityCalendarData(),
]);
+ const activitiesDataKeys = (data: string[]) =>
+ Array.from(
+ new Set(
+ data.flatMap((entry) =>
+ Object.keys(entry).filter((key) => key !== "day")
+ )
+ )
+ );
return (
<>
<div className="grid auto-rows-max items-start gap-2 md:gap-2 lg:col-span-2">
@@ -46,9 +58,27 @@ export default async function Dashboard() {
trend={trendFor30Days}
/>
</div>
- <div className="flex flex-col justify-center">
- <WeeklyBarChart data={weeklyData} />
- </div>
+ <Tabs defaultValue="jobs">
+ <TabsList>
+ <TabsTrigger value="jobs">Weekly Jobs</TabsTrigger>
+ <TabsTrigger value="activities">Activities</TabsTrigger>
+ </TabsList>
+ <TabsContent value="jobs">
+ <WeeklyBarChart
+ data={weeklyData}
+ keys={["value"]}
+ axisLeftLegend="NUMBER OF JOBS APPLIED"
+ />
+ </TabsContent>
+ <TabsContent value="activities">
+ <WeeklyBarChart
+ data={activitiesData}
+ keys={activitiesDataKeys(activitiesData)}
+ groupMode="stacked"
+ axisLeftLegend="TIME SPENT (Hours)"
+ />
+ </TabsContent>
+ </Tabs>
</div>
<div>
<RecentJobsCard jobs={recentJobs} />
diff --git a/src/components/dashboard/WeeklyBarChart.tsx b/src/components/dashboard/WeeklyBarChart.tsx
index 3937968..f3f16bd 100644
--- a/src/components/dashboard/WeeklyBarChart.tsx
+++ b/src/components/dashboard/WeeklyBarChart.tsx
@@ -1,18 +1,27 @@
"use client";
import { barChartData } from "@/lib/data/barChartData";
import { ResponsiveBar } from "@nivo/bar";
-import { Card, CardContent, CardHeader, CardTitle } from "../ui/card";
+import { Card, CardContent } from "../ui/card";
-export default function WeeklyBarChart({ data }: { data: any[] }) {
+type WeeklyBarChartProps = {
+ data: any[];
+ keys: string[];
+ groupMode?: "grouped" | "stacked";
+ axisLeftLegend: string;
+};
+
+export default function WeeklyBarChart({
+ data,
+ keys,
+ groupMode,
+ axisLeftLegend,
+}: WeeklyBarChartProps) {
return (
<Card className="mb-2 lg:mb-0">
- <CardHeader className="pb-2">
- <CardTitle>Weekly Activity</CardTitle>
- </CardHeader>
<CardContent className="h-[240px] p-3">
<ResponsiveBar
data={data}
- keys={["value"]}
+ keys={keys}
indexBy="day"
margin={{
top: 10,
@@ -21,8 +30,8 @@ export default function WeeklyBarChart({ data }: { data: any[] }) {
left: 45,
}}
padding={0.6}
- groupMode="grouped"
- colors="#2a7ef0"
+ groupMode={groupMode}
+ colors={groupMode === "stacked" ? { scheme: "nivo" } : "#2a7ef0"}
theme={{
text: {
fill: "#9ca3af",
@@ -56,7 +65,7 @@ export default function WeeklyBarChart({ data }: { data: any[] }) {
tickSize: 5,
tickPadding: 5,
tickRotation: 0,
- legend: "NUMBER OF JOBS APPLIED",
+ legend: axisLeftLegend,
legendPosition: "middle",
legendOffset: -40,
truncateTickAt: 0,