Skip to content

Commit 40d6cd1

Browse files
Squashed commit of the following:
commit 5d94ac6 Author: Theo Siemens-Rhodes <112789743+theosiemensrhodes@users.noreply.github.com> Date: Mon Mar 17 22:48:28 2025 -0700 fix (#93) commit edfb228 Author: Alec Situ <aasitu@gmail.com> Date: Mon Mar 17 16:32:43 2025 -0700 linked view request button (#92) commit 9266193 Author: theosiemensrhodes <theo.siemensrhodes@gmail.com> Date: Mon Mar 17 16:23:26 2025 -0700 optimize deploy for small container commit d08468c Author: Alec Situ <aasitu@gmail.com> Date: Mon Mar 17 16:22:01 2025 -0700 coverage requests frontend (#90) * coverage reqeusts frontend * added volunteers to shift api * text change * fixed text * api edits cors * temporary request name * cleanup
1 parent bd4c94b commit 40d6cd1

File tree

31 files changed

+2693
-681
lines changed

31 files changed

+2693
-681
lines changed

.github/workflows/deploy.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,18 @@ jobs:
113113
host: ${{ vars.CONTAINER_URL }}
114114
user: deploy
115115
ssh_key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
116-
env_file: ./envfile
116+
env_file: ./envfile
117+
118+
prune-docker:
119+
runs-on: ubuntu-latest
120+
needs: deploy
121+
steps:
122+
- name: Prune unused Docker images
123+
uses: appleboy/ssh-action@v0.1.4
124+
with:
125+
host: ${{ vars.CONTAINER_URL }}
126+
username: deploy
127+
key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
128+
script: |
129+
# Prune unused Docker objects
130+
docker system prune -af

backend/src/controllers/coverageController.ts

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,28 @@ async function rejectAbsenceRequest(req: AuthenticatedRequest, res: Response) {
8383
res.sendStatus(200);
8484
}
8585

86+
async function getAbsenceRequests(req: AuthenticatedRequest, res: Response) {
87+
const absenceRequests = await coverageModel.getAbsenceRequests();
88+
89+
res.json(absenceRequests);
90+
}
91+
92+
async function getCoverageRequests(req: AuthenticatedRequest, res: Response) {
93+
const coverageRequests = await coverageModel.getCoverageRequests();
94+
95+
res.json(coverageRequests);
96+
}
97+
8698
export {
87-
approveAbsenceRequest, approveCoverShift, rejectAbsenceRequest, rejectCoverShift, requestAbsence, requestCoverShift, withdrawAbsenceRequest, withdrawCoverShift
99+
approveAbsenceRequest,
100+
approveCoverShift,
101+
rejectAbsenceRequest,
102+
rejectCoverShift,
103+
requestAbsence,
104+
requestCoverShift,
105+
withdrawAbsenceRequest,
106+
withdrawCoverShift,
107+
getAbsenceRequests,
108+
getCoverageRequests,
88109
};
89110

backend/src/controllers/shiftController.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Response } from 'express';
22
import { ShiftDB } from '../common/databaseModels.js';
3-
import { ShiftQueryType, ShiftStatus } from '../common/interfaces.js';
3+
import { Role, ShiftQueryType, ShiftStatus } from '../common/interfaces.js';
44
import { AuthenticatedRequest } from '../common/types.js';
55
import { shiftModel, volunteerModel } from '../config/models.js';
66

@@ -17,7 +17,7 @@ async function getShifts(req: AuthenticatedRequest, res: Response) {
1717
const { volunteer, before, after, type, status } = req.query as Record<string, string>;
1818
const volunteer_id = volunteer;
1919

20-
if (req.user.role === 'volunteer') {
20+
if (req.user.role === Role.volunteer) {
2121
const volunteer = await volunteerModel.getVolunteerByUserId(req.user.user_id);
2222

2323
/* Cannot get shifts for other volunteer */

0 commit comments

Comments
 (0)