Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added api/.DS_Store
Binary file not shown.
21,536 changes: 21,536 additions & 0 deletions api/package-lock.json

Large diffs are not rendered by default.

Binary file added api/src/.DS_Store
Binary file not shown.
21 changes: 21 additions & 0 deletions api/src/api/members.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,25 @@ router.get(
}),
);

// Gets the new member count
router.get(
'/newCount/:chapter',
requireRegistered,
errorWrap(async (req, res) => {
if (!Object.keys(Member.chapterEnum).includes(req.params.chapter)) {
return res.status(404).json({
success: false,
message: req.params.chapter + ' is not a valid chapter.',
});
}
res.json({
success: true,
result: Member.find({
chapter: Member.chapterEnum[req.params.chapter],
creationDate: { $gt: 4 },
}),
});
}),
);

module.exports = router;
2 changes: 2 additions & 0 deletions api/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ app.use('/api', apiRoutes);
app.get('/', (req, res) => res.json('API working!'));
app.get('/favicon.ico', (req, res) => res.status(204));

// Test getNewMemberCount

app.use(function (req, res, next) {
next(createError(404));
});
Expand Down
20 changes: 20 additions & 0 deletions api/src/models/members.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,26 @@ const Member = new mongoose.Schema({
type: String,
default: null,
},
creationDate: {
type: Date,
default: null,
},
});

const gradYear = new mongoose.Schema({
time: {
enum: [
'Spring',
'Summer',
'Fall',
'Winter',
'Quarter 1',
'Quarter 2',
'Quarter 3',
'Quarter 4',
],
},
year: { type: Number, min: 2000, max: 2100 },
});

module.exports = mongoose.model('Member', Member);
Expand Down
11,240 changes: 5,710 additions & 5,530 deletions api/yarn.lock

Large diffs are not rendered by default.

Binary file added client/.DS_Store
Binary file not shown.
Binary file added client/src/.DS_Store
Binary file not shown.
Binary file added client/src/components/.DS_Store
Binary file not shown.