Skip to content

Commit afb13ac

Browse files
committed
Fix: Activity controller now fetches and passes activities array
1 parent 0535009 commit afb13ac

File tree

1 file changed

+29
-2
lines changed

1 file changed

+29
-2
lines changed

app/controllers/activity.ts

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,35 @@
11
import { Request, Response } from 'express';
2+
import mongoose from 'mongoose';
23

34
/**
45
* Show activities
56
*/
6-
export const index = (req: Request, res: Response) => {
7-
res.render('pages/activity', { title: 'Activities' });
7+
export const index = async (req: Request, res: Response) => {
8+
const Activity = mongoose.model('Activity');
9+
const page = parseInt((req as any).query.page) || 0;
10+
const perPage = 20;
11+
12+
try {
13+
const activities = await (Activity as any)
14+
.list({
15+
criteria: {},
16+
perPage: perPage,
17+
page: page
18+
})
19+
.exec();
20+
21+
res.render('pages/activity', {
22+
title: 'Activities',
23+
activities: activities || [],
24+
page: page,
25+
pages: Math.ceil(await Activity.countDocuments() / perPage) || 1
26+
});
27+
} catch (err) {
28+
res.render('pages/activity', {
29+
title: 'Activities',
30+
activities: [],
31+
page: 0,
32+
pages: 1
33+
});
34+
}
835
};

0 commit comments

Comments
 (0)