Skip to content

Commit 4024b55

Browse files
Ndevu12Ndevu12
committed
fx<invitation table> fixing invitation table by improving its loading state
fx<invitation table> fixing invitation table by improving its loading state advancing calender functionality (#480)
1 parent 73792fb commit 4024b55

24 files changed

+1449
-350
lines changed

‎jest.config.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
export default {
44
preset: 'ts-jest',
55
testEnvironment: 'jsdom',
6+
testEnvironmentOptions: {
7+
customExportConditions: [] // don't load "browser" field
8+
},
69
verbose: true,
710
collectCoverage: true,
811
coverageReporters: ['lcov', 'text'],

‎package-lock.json‎

Lines changed: 44 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
"@babel/preset-react": "^7.22.5",
3535
"@emotion/react": "^11.11.1",
3636
"@emotion/styled": "^11.11.0",
37-
"@fullcalendar/core": "^5.11.5",
38-
"@fullcalendar/daygrid": "^5.11.5",
39-
"@fullcalendar/interaction": "^5.11.5",
40-
"@fullcalendar/list": "^5.11.5",
41-
"@fullcalendar/react": "^5.11.5",
42-
"@fullcalendar/timegrid": "^5.11.5",
37+
"@fullcalendar/core": "^6.1.15",
38+
"@fullcalendar/daygrid": "^6.1.15",
39+
"@fullcalendar/interaction": "^6.1.15",
40+
"@fullcalendar/list": "^6.1.15",
41+
"@fullcalendar/react": "^6.1.15",
42+
"@fullcalendar/timegrid": "^6.1.15",
4343
"@headlessui/react": "^1.7.15",
4444
"@heroicons/react": "^1.0.6",
4545
"@iconify/react": "^3.2.2",

‎src/Mutations/User.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ export const GET_ALL_TTL_USERS = gql`
5353
getAllTTLUsers(orgToken: $orgToken) {
5454
profile {
5555
name
56+
id
5657
}
5758
email
59+
role
5860
team {
5961
name
6062
cohort {

‎src/Mutations/event.tsx‎

Lines changed: 107 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,96 @@ import { gql } from '@apollo/client';
33
export const GET_EVENTS = gql`
44
query GetEvents($authToken: String) {
55
getEvents(authToken: $authToken) {
6+
id
7+
user
68
end
79
hostName
810
start
911
timeToEnd
1012
timeToStart
1113
title
14+
invitees {
15+
email
16+
}
1217
}
1318
}
1419
`;
1520

21+
export const GET_EVENT = gql`
22+
query GetEvent($eventId: String!, $authToken: String!) {
23+
getEvent(eventId: $eventId,authToken: $authToken) {
24+
id
25+
user
26+
end
27+
hostName
28+
start
29+
timeToEnd
30+
timeToStart
31+
title
32+
invitees {
33+
email
34+
}
35+
}
36+
}
37+
`
38+
1639
export const ADD_EVENT = gql`
1740
mutation CreateEvent(
1841
$title: String!
1942
$end: String!
2043
$timeToStart: String!
21-
$timeToFinish: String!
44+
$timeToEnd: String!
2245
$hostName: String!
2346
$start: String!
24-
$authToken: String
47+
$authToken: String!
48+
$orgToken: String!
49+
$invitees: [String]!
2550
) {
2651
createEvent(
2752
title: $title
2853
end: $end
2954
timeToStart: $timeToStart
30-
timeToEnd: $timeToFinish
55+
timeToEnd: $timeToEnd
56+
hostName: $hostName
57+
start: $start
58+
authToken: $authToken
59+
orgToken: $orgToken
60+
invitees: $invitees
61+
) {
62+
end
63+
hostName
64+
start
65+
timeToEnd
66+
title
67+
timeToStart
68+
}
69+
}
70+
`;
71+
72+
export const EDIT_EVENT = gql`
73+
mutation EditEvent(
74+
$eventId: String!
75+
$title: String!
76+
$end: String!
77+
$timeToStart: String!
78+
$timeToEnd: String!
79+
$hostName: String!
80+
$start: String!
81+
$authToken: String!
82+
$orgToken: String!
83+
$invitees: [String]!
84+
) {
85+
editEvent(
86+
eventId: $eventId
87+
title: $title
88+
end: $end
89+
timeToStart: $timeToStart
90+
timeToEnd: $timeToEnd
3191
hostName: $hostName
3292
start: $start
3393
authToken: $authToken
94+
orgToken: $orgToken
95+
invitees: $invitees
3496
) {
3597
end
3698
hostName
@@ -41,3 +103,45 @@ export const ADD_EVENT = gql`
41103
}
42104
}
43105
`;
106+
107+
export const CANCEL_EVENT = gql`
108+
mutation CancelEvent(
109+
$eventId: String!
110+
$authToken: String!
111+
) {
112+
cancelEvent(
113+
eventId: $eventId
114+
authToken: $authToken
115+
) {
116+
end
117+
hostName
118+
start
119+
timeToEnd
120+
title
121+
timeToStart
122+
}
123+
}
124+
`
125+
126+
export const RESPOND_TO_EVENT_INVITATION = gql`
127+
mutation RespondToEventInvitation(
128+
$eventToken: String!
129+
$authToken: String!
130+
) {
131+
respondToEventInvitation(
132+
eventToken: $eventToken,
133+
authToken: $authToken
134+
) {
135+
end
136+
hostName
137+
start
138+
timeToEnd
139+
title
140+
timeToStart
141+
invitees {
142+
email,
143+
status
144+
}
145+
}
146+
}
147+
`

‎src/Mutations/manageStudentMutations.tsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,20 @@ export const GET_USERS_QUERY = gql`
1212
}
1313
`;
1414

15+
export const GET_ALL_USERS_QUERY = gql`
16+
query GetUsers($orgToken: String) {
17+
getAllUsers(orgToken: $orgToken) {
18+
id
19+
email
20+
role
21+
profile{
22+
firstName
23+
lastName
24+
}
25+
}
26+
}
27+
`;
28+
1529
export const DROP_TRAINEE = gql`
1630
mutation DropTrainee(
1731
$traineeId: String!
@@ -36,6 +50,7 @@ export const GET_TRAINEES_QUERY = gql`
3650
id
3751
user {
3852
id
53+
role
3954
status {
4055
status
4156
date

0 commit comments

Comments
 (0)