rushilwiz/wheelshare-frontend
1
0
Fork 0
mirror of https://github.com/myfatemi04/wheelshare-frontend.git synced 2025-05-02 07:59:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:myfatemi04/wheelshare-frontend into main

Browse Source
This commit is contained in:
Joshua Hsueh 2021-07-06 22:55:51 -04:00
commit f28024c49b
2 changed files with 18 additions and 16 deletions

18
src/components/Notification.tsx
View File

@ -8,21 +8,23 @@ export default function Notification({
}: {
notification: INotification;
}) {
const carpoolId = notification.carpool.id;
const acceptReq = useCallback(() => {
acceptRequest(notification.user.id);
}, [notification.user.id]);
acceptRequest(carpoolId, notification.user.id);
}, [carpoolId, notification.user.id]);
const rejectReq = useCallback(() => {
denyRequest(notification.user.id);
}, [notification.user.id]);
denyRequest(carpoolId, notification.user.id);
}, [carpoolId, notification.user.id]);
const acceptInv = useCallback(() => {
acceptInvite(notification.user.id);
}, [notification.user.id]);
acceptInvite(carpoolId, notification.user.id);
}, [carpoolId, notification.user.id]);
const rejectInv = useCallback(() => {
denyInvite(notification.user.id);
}, [notification.user.id]);
denyInvite(carpoolId, notification.user.id);
}, [carpoolId, notification.user.id]);
return (
<div className="notification">

16
src/components/api.ts
View File

@ -132,20 +132,20 @@ export async function getNotifications() {
return await get('/users/@me/received_requests_and_invites');
}
export async function acceptRequest(userId: number) {
return await post('/carpools/:id/accept_request', { userId });
export async function acceptRequest(carpoolId: number, userId: number) {
return await post(`/carpools/${carpoolId}/accept_request`, { userId });
}
export async function acceptInvite(userId: number) {
return await post('/carpools/:id/accept_invite', { userId });
export async function acceptInvite(carpoolId: number, userId: number) {
return await post(`/carpools/${carpoolId}/accept_invite`, { userId });
}
export async function denyRequest(userId: number) {
return await post('/carpools/:id/deny_request', { userId });
export async function denyRequest(carpoolId: number, userId: number) {
return await post(`/carpools/${carpoolId}/deny_request`, { userId });
}
export async function denyInvite(userId: number) {
return await post('/carpools/:id/deny_invite', { userId });
export async function denyInvite(carpoolId: number, userId: number) {
return await post(`/carpools/${carpoolId}/deny_invite`, { userId });
}
export async function getMe() {