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.

refactor: improve activities table layout, stay on tasks after activity start

Khuram Niazad5a300c5d8d
diff --git a/src/components/activities/ActivitiesTable.tsx b/src/components/activities/ActivitiesTable.tsx
index fd3914b..b938d75 100644
--- a/src/components/activities/ActivitiesTable.tsx
+++ b/src/components/activities/ActivitiesTable.tsx
@@ -74,9 +74,17 @@ function ActivitiesTable({
<TableRow>
<TableHead className="hidden md:table-cell">Date</TableHead>
<TableHead>Activity</TableHead>
- <TableHead>Project(Activity Type)</TableHead>
- <TableHead className="hidden md:table-cell">Start Time</TableHead>
- <TableHead className="hidden md:table-cell">End Time</TableHead>
+ <TableHead className="whitespace-nowrap">
+ Project
+ <br />
+ (Activity Type)
+ </TableHead>
+ <TableHead className="hidden md:table-cell whitespace-nowrap">
+ Start Time
+ </TableHead>
+ <TableHead className="hidden md:table-cell whitespace-nowrap">
+ End Time
+ </TableHead>
<TableHead>Duration</TableHead>
<TableHead>
<span>Actions</span>
@@ -101,10 +109,10 @@ function ActivitiesTable({
<TableCell className="font-medium">
{(activity.activityType as ActivityType)?.label}
</TableCell>
- <TableCell className="hidden md:table-cell">
+ <TableCell className="hidden md:table-cell whitespace-nowrap">
{format(activity.startTime, "p")}
</TableCell>
- <TableCell className="hidden md:table-cell">
+ <TableCell className="hidden md:table-cell whitespace-nowrap">
{format(activity.endTime!, "p")}
</TableCell>
<TableCell>
@@ -113,45 +121,51 @@ function ActivitiesTable({
calculateDuration(activity.duration ?? 0)}
</TableCell>
<TableCell>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button aria-haspopup="true" size="icon" variant="ghost">
- <MoreVertical className="h-4 w-4" />
- <span className="sr-only">Toggle menu</span>
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end" className="w-[200px]">
- <DropdownMenuLabel>Actions</DropdownMenuLabel>
- <DropdownMenuGroup>
- <DropdownMenuItem
- className="cursor-pointer text-green-600"
- onClick={() => onStartActivity(activity.id!)}
- >
- <CirclePlay className="mr-2 h-4 w-4" />
- Start Activity
- </DropdownMenuItem>
- <DropdownMenuItem
- className="text-red-600 cursor-pointer"
- onClick={() => onDeleteActivity(activity.id!)}
+ <div className="flex items-center flex-nowrap">
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ aria-haspopup="true"
+ size="icon"
+ variant="ghost"
>
- <Trash className="mr-2 h-4 w-4" />
- Delete
- </DropdownMenuItem>
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
- <Button
- title="Start Activity"
- aria-haspopup="true"
- size="icon"
- variant="ghost"
- onClick={() => onStartActivity(activity.id!)}
- className="opacity-0 group-hover:opacity-100 group-hover:pointer-events-auto transition-opacity duration-300"
- >
- <span>
- <CirclePlay className="text-green-600" />
- </span>
- </Button>
+ <MoreVertical className="h-4 w-4" />
+ <span className="sr-only">Toggle menu</span>
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end" className="w-[200px]">
+ <DropdownMenuLabel>Actions</DropdownMenuLabel>
+ <DropdownMenuGroup>
+ <DropdownMenuItem
+ className="cursor-pointer text-green-600"
+ onClick={() => onStartActivity(activity.id!)}
+ >
+ <CirclePlay className="mr-2 h-4 w-4" />
+ Start Activity
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ className="text-red-600 cursor-pointer"
+ onClick={() => onDeleteActivity(activity.id!)}
+ >
+ <Trash className="mr-2 h-4 w-4" />
+ Delete
+ </DropdownMenuItem>
+ </DropdownMenuGroup>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ <Button
+ title="Start Activity"
+ aria-haspopup="true"
+ size="icon"
+ variant="ghost"
+ onClick={() => onStartActivity(activity.id!)}
+ className="opacity-0 group-hover:opacity-100 group-hover:pointer-events-auto transition-opacity duration-300"
+ >
+ <span>
+ <CirclePlay className="text-green-600" />
+ </span>
+ </Button>
+ </div>
</TableCell>
</TableRow>
);
diff --git a/src/components/tasks/TasksContainer.tsx b/src/components/tasks/TasksContainer.tsx
index ee130fc..0d60d57 100644
--- a/src/components/tasks/TasksContainer.tsx
+++ b/src/components/tasks/TasksContainer.tsx
@@ -1,6 +1,5 @@
"use client";
import { useCallback, useEffect, useRef, useState } from "react";
-import { useRouter } from "next/navigation";
import {
Card,
CardContent,
@@ -62,7 +61,6 @@ function TasksContainer({
onFilterChange,
onTasksChanged,
}: TasksContainerProps) {
- const router = useRouter();
const { refreshCurrentActivity } = useActivity();
const { requestStart, confirmDialog } = useActivitySwitchConfirm();
const [tasks, setTasks] = useState<Task[]>([]);
@@ -196,7 +194,6 @@ function TasksContainer({
variant: "success",
description: "Activity started from task",
});
- router.push("/dashboard/activities");
} else {
toast({
variant: "destructive",