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 pagination with loadmore

Khuram Niaz7beacf037802
diff --git a/src/actions/activity.actions.ts b/src/actions/activity.actions.ts
index 31ed7ff..93e8dfc 100644
--- a/src/actions/activity.actions.ts
+++ b/src/actions/activity.actions.ts
@@ -52,7 +52,10 @@ export const createActivityType = async (
}
};
-export const getActivitiesList = async (): Promise<any | undefined> => {
+export const getActivitiesList = async (
+ page: number = 1,
+ limit: number = 10
+): Promise<any | undefined> => {
try {
const user = await getCurrentUser();
@@ -60,28 +63,47 @@ export const getActivitiesList = async (): Promise<any | undefined> => {
throw new Error("Not authenticated");
}
- const data = await prisma.activity.findMany({
- where: {
- userId: user.id,
- endTime: {
- not: null,
+ const offset = (page - 1) * limit;
+
+ const [data, total] = await Promise.all([
+ prisma.activity.findMany({
+ where: {
+ userId: user.id,
+ endTime: {
+ not: null,
+ },
},
- },
- select: {
- id: true,
- activityName: true,
- startTime: true,
- endTime: true,
- duration: true,
- description: true,
- createdAt: true,
- activityType: true,
- },
- orderBy: {
- createdAt: "desc",
- },
- });
- return { success: true, data };
+ select: {
+ id: true,
+ activityName: true,
+ startTime: true,
+ endTime: true,
+ duration: true,
+ description: true,
+ createdAt: true,
+ activityType: true,
+ },
+ orderBy: {
+ createdAt: "desc",
+ },
+ skip: offset,
+ take: limit,
+ }),
+ prisma.activity.count({
+ where: {
+ userId: user.id,
+ endTime: {
+ not: null,
+ },
+ },
+ }),
+ ]);
+
+ return {
+ success: true,
+ data,
+ total,
+ };
} catch (error) {
const msg = "Failed to fetch activities list. ";
return handleError(error, msg);
diff --git a/src/components/activities/ActivitiesContainer.tsx b/src/components/activities/ActivitiesContainer.tsx
index e17ba10..e965d3a 100644
--- a/src/components/activities/ActivitiesContainer.tsx
+++ b/src/components/activities/ActivitiesContainer.tsx
@@ -30,16 +30,20 @@ function ActivitiesContainer() {
const [currentActivity, setCurrentActivity] = useState<Activity>();
const [timeElapsed, setTimeElapsed] = useState<number>(0);
const timerRef = useRef<NodeJS.Timeout | null>(null);
+ const [page, setPage] = useState<number>(1);
+ const [totalActivities, setTotalActivities] = useState<number>(0);
const [loading, setLoading] = useState(false);
const closeActivityForm = () => setActivityFormOpen(false);
- const loadActivities = useCallback(async () => {
+ const loadActivities = useCallback(async (page: number) => {
setLoading(true);
try {
- const { data, success, message } = await getActivitiesList();
+ const { data, success, message, total } = await getActivitiesList(page);
if (success) {
- setActivitiesList(data);
+ setActivitiesList((prev) => (page === 1 ? data : [...prev, ...data]));
+ setTotalActivities(total);
+ setPage(page);
} else {
toast({
variant: "destructive",
@@ -58,7 +62,7 @@ function ActivitiesContainer() {
}
}, []);
const reloadActivities = useCallback(async () => {
- await loadActivities();
+ await loadActivities(1);
}, [loadActivities]);
const fetchActiveActivity = useCallback(async () => {
@@ -70,7 +74,7 @@ function ActivitiesContainer() {
}, []);
useEffect(() => {
- loadActivities();
+ loadActivities(1);
fetchActiveActivity();
return () => {
stopTimer(); // Cleanup the timer on unmount
@@ -193,6 +197,19 @@ function ActivitiesContainer() {
onStartActivity={startActivity}
activityExist={Boolean(currentActivity)}
/>
+ {activitiesList.length < totalActivities && (
+ <div className="flex justify-center p-4">
+ <Button
+ size="sm"
+ variant="outline"
+ onClick={() => loadActivities(page + 1)}
+ disabled={loading}
+ className="btn btn-primary"
+ >
+ {loading ? "Loading..." : "Load More"}
+ </Button>
+ </div>
+ )}
</CardContent>
</Card>
);
diff --git a/src/components/activities/ActivitiesTable.tsx b/src/components/activities/ActivitiesTable.tsx
index 571f567..c742441 100644
--- a/src/components/activities/ActivitiesTable.tsx
+++ b/src/components/activities/ActivitiesTable.tsx
@@ -90,7 +90,10 @@ function ActivitiesTable({
<TableBody>
{activities?.map((activity: Activity) => {
return (
- <TableRow key={activity.id} className="cursor-pointer group">
+ <TableRow
+ key={activity.id}
+ className="cursor-pointer group relative"
+ >
<TableCell className="hidden md:table-cell w-[120px]">
{activity.startTime
? format(activity.startTime, "PP")
@@ -149,8 +152,9 @@ function ActivitiesTable({
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 className="hidden group-hover:block">
+ <span>
<CirclePlay className="text-green-600" />
</span>
</Button>