Skip to content

Commit 4c491e8

Browse files
mjaydenkimmjaydenkim
committed
lint
1 parent 5c0cd5b commit 4c491e8

24 files changed

Lines changed: 297 additions & 101 deletions

‎frontend/src/components/AuthManager/AuthManager.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,10 @@ const AuthManager = () => {
215215
}
216216
} catch (error) {
217217
console.error('Error decrypting JWT:', error);
218-
showError(`Error decrypting JWT: ${formatErrorMessage(error)}`, 'Authentication Error');
218+
showError(
219+
`Error decrypting JWT: ${formatErrorMessage(error)}`,
220+
'Authentication Error'
221+
);
219222
}
220223
return '';
221224
}

‎frontend/src/components/EmployeeModal/EmployeeModal.tsx‎

Lines changed: 59 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,10 @@ const EmployeeModal = ({
160160
});
161161
} catch (error) {
162162
console.error('Error uploading photo:', error);
163-
showError(`Error uploading photo: ${formatErrorMessage(error)}`, 'Employees Error');
163+
showError(
164+
`Error uploading photo: ${formatErrorMessage(error)}`,
165+
'Employees Error'
166+
);
164167
throw new Error('Failed to upload employee photo. Please try again.');
165168
}
166169
}
@@ -187,7 +190,10 @@ const EmployeeModal = ({
187190
case '/api/admins':
188191
// Use optimistic create from context
189192
await createAdmin(extractAdminData(employeeData)).catch((error) => {
190-
showError(`Failed to create admin: ${formatErrorMessage(error)}`, 'Employees Error');
193+
showError(
194+
`Failed to create admin: ${formatErrorMessage(error)}`,
195+
'Employees Error'
196+
);
191197
});
192198
res = employeeData; // The context will handle server response and ID assignment
193199
break;
@@ -240,11 +246,17 @@ const EmployeeModal = ({
240246
// Use optimistic delete from context
241247
if (endpoint === '/api/admins') {
242248
await deleteAdmin(id).catch((error) => {
243-
showError(`Failed to delete admin: ${formatErrorMessage(error)}`, 'Employees Error');
249+
showError(
250+
`Failed to delete admin: ${formatErrorMessage(error)}`,
251+
'Employees Error'
252+
);
244253
});
245254
} else if (endpoint === '/api/drivers') {
246255
await deleteDriver(id).catch((error) => {
247-
showError(`Failed to delete driver: ${formatErrorMessage(error)}`, 'Employees Error');
256+
showError(
257+
`Failed to delete driver: ${formatErrorMessage(error)}`,
258+
'Employees Error'
259+
);
248260
});
249261
}
250262
}
@@ -281,7 +293,10 @@ const EmployeeModal = ({
281293
ToastStatus.SUCCESS
282294
);
283295
} catch (error) {
284-
showError(`Failed to create admin: ${formatErrorMessage(error)}`, 'Employees Error');
296+
showError(
297+
`Failed to create admin: ${formatErrorMessage(error)}`,
298+
'Employees Error'
299+
);
285300
}
286301
}
287302
if (hasDriver) {
@@ -294,7 +309,10 @@ const EmployeeModal = ({
294309
ToastStatus.SUCCESS
295310
);
296311
} catch (error) {
297-
showError(`Failed to create driver: ${formatErrorMessage(error)}`, 'Employees Error');
312+
showError(
313+
`Failed to create driver: ${formatErrorMessage(error)}`,
314+
'Employees Error'
315+
);
298316
}
299317
}
300318
} else {
@@ -303,20 +321,29 @@ const EmployeeModal = ({
303321
try {
304322
await updateEmployee(employeeData, '/api/admins');
305323
} catch (error) {
306-
showError(`Failed to update admin: ${formatErrorMessage(error)}`, 'Employees Error');
324+
showError(
325+
`Failed to update admin: ${formatErrorMessage(error)}`,
326+
'Employees Error'
327+
);
307328
}
308329
} else {
309330
try {
310331
await createEmployee(employeeData, '/api/admins');
311332
} catch (error) {
312-
showError(`Failed to create admin: ${formatErrorMessage(error)}`, 'Employees Error');
333+
showError(
334+
`Failed to create admin: ${formatErrorMessage(error)}`,
335+
'Employees Error'
336+
);
313337
}
314338
}
315339
} else if (employeeData.admin) {
316340
try {
317341
await deleteEmployee(employeeData.id, '/api/admins');
318342
} catch (error) {
319-
showError(`Failed to delete admin: ${formatErrorMessage(error)}`, 'Employees Error');
343+
showError(
344+
`Failed to delete admin: ${formatErrorMessage(error)}`,
345+
'Employees Error'
346+
);
320347
}
321348
}
322349

@@ -325,20 +352,29 @@ const EmployeeModal = ({
325352
try {
326353
await updateEmployee(employeeData, '/api/drivers');
327354
} catch (error) {
328-
showError(`Failed to update driver: ${formatErrorMessage(error)}`, 'Employees Error');
355+
showError(
356+
`Failed to update driver: ${formatErrorMessage(error)}`,
357+
'Employees Error'
358+
);
329359
}
330360
} else {
331361
try {
332362
await createEmployee(employeeData, '/api/drivers');
333363
} catch (error) {
334-
showError(`Failed to create driver: ${formatErrorMessage(error)}`, 'Employees Error');
364+
showError(
365+
`Failed to create driver: ${formatErrorMessage(error)}`,
366+
'Employees Error'
367+
);
335368
}
336369
}
337370
} else if (employeeData.driver) {
338371
try {
339372
await deleteEmployee(employeeData.id, '/api/drivers');
340373
} catch (error) {
341-
showError(`Failed to delete driver: ${formatErrorMessage(error)}`, 'Employees Error');
374+
showError(
375+
`Failed to delete driver: ${formatErrorMessage(error)}`,
376+
'Employees Error'
377+
);
342378
}
343379
}
344380
}
@@ -406,12 +442,19 @@ const EmployeeModal = ({
406442
: 'Drivers';
407443
try {
408444
setIsUploadingImage(true);
409-
await uploadEmployeePhoto(id, targetTable, imageBase64).catch((error) => {
410-
showError(`Failed to upload photo: ${formatErrorMessage(error)}`, 'Employees Error');
411-
});
445+
await uploadEmployeePhoto(id, targetTable, imageBase64).catch(
446+
(error) => {
447+
showError(
448+
`Failed to upload photo: ${formatErrorMessage(error)}`,
449+
'Employees Error'
450+
);
451+
}
452+
);
412453
} catch (uploadError) {
413454
showError(
414-
`Employee created but photo upload failed: ${formatErrorMessage(uploadError)}. You can try uploading the photo again later.`,
455+
`Employee created but photo upload failed: ${formatErrorMessage(
456+
uploadError
457+
)}. You can try uploading the photo again later.`,
415458
'Employees Error'
416459
);
417460
// Don't throw here - we want the employee creation to succeed even if photo upload fails

‎frontend/src/components/ExportButton/ExportButton.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ const ExportButton = ({
4747
})
4848
.then(() => showToast(toastMsg, ToastStatus.SUCCESS))
4949
.catch((error) => {
50-
showError(`Failed to download data: ${formatErrorMessage(error)}`, 'Export Error');
50+
showError(
51+
`Failed to download data: ${formatErrorMessage(error)}`,
52+
'Export Error'
53+
);
5154
});
5255
};
5356

‎frontend/src/components/Locations/LocationFormModal.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const LocationFormModal: React.FC<Props> = ({
7272
const [locationImages, setLocationImages] = useState<LocationImage[]>([]);
7373
const { showError } = useErrorModal();
7474
const { showToast } = useToast();
75-
75+
7676
useEffect(() => {
7777
if (!open) return;
7878

‎frontend/src/components/Locations/PlacesSearch.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ const PlacesSearch = ({
5656
setIsLoading(false);
5757
setError('Error searching for address');
5858
setResults([]);
59-
showError(`Error searching for address: ${formatErrorMessage(error)}`, 'Address Search Error');
59+
showError(
60+
`Error searching for address: ${formatErrorMessage(error)}`,
61+
'Address Search Error'
62+
);
6063
}
6164
},
6265
[map]

‎frontend/src/components/Modal/RiderModal.tsx‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,23 @@ const RiderModal = ({
4545
useEffect(() => {
4646
if (isSubmitted) {
4747
const method = existingRider ? axios.put : axios.post;
48-
method(
49-
`/api/riders/${!existingRider ? '' : existingRider.id}`,
50-
formData
51-
).then(() => {
52-
refreshRiders();
53-
showToast(
54-
`The student has been ${!existingRider ? 'added' : 'edited'}`,
55-
ToastStatus.SUCCESS
56-
);
57-
if (isRiderWeb) {
58-
refreshUser();
59-
}
60-
}).catch((error) => {
61-
showError(`Failed to save student: ${formatErrorMessage(error)}`, 'Students Error');
62-
});
48+
method(`/api/riders/${!existingRider ? '' : existingRider.id}`, formData)
49+
.then(() => {
50+
refreshRiders();
51+
showToast(
52+
`The student has been ${!existingRider ? 'added' : 'edited'}`,
53+
ToastStatus.SUCCESS
54+
);
55+
if (isRiderWeb) {
56+
refreshUser();
57+
}
58+
})
59+
.catch((error) => {
60+
showError(
61+
`Failed to save student: ${formatErrorMessage(error)}`,
62+
'Students Error'
63+
);
64+
});
6365
setIsSubmitted(false);
6466
}
6567
}, [

‎frontend/src/components/RideDetails/RideActions.tsx‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,10 @@ const RideActions: React.FC<RideActionsProps> = ({
8686
await refreshRides();
8787
} catch (error) {
8888
console.error('Failed to update status:', error);
89-
showError(`Failed to update status: ${formatErrorMessage(error)}`, 'Rides Error');
89+
showError(
90+
`Failed to update status: ${formatErrorMessage(error)}`,
91+
'Rides Error'
92+
);
9093
} finally {
9194
setUpdating(false);
9295
}
@@ -122,7 +125,10 @@ const RideActions: React.FC<RideActionsProps> = ({
122125
showToast('Ride Cancelled', ToastStatus.SUCCESS);
123126
} catch (error) {
124127
console.error('Failed to cancel ride:', error);
125-
showError(`Failed to cancel ride: ${formatErrorMessage(error)}`, 'Rides Error');
128+
showError(
129+
`Failed to cancel ride: ${formatErrorMessage(error)}`,
130+
'Rides Error'
131+
);
126132
}
127133
};
128134

@@ -158,8 +164,12 @@ const RideActions: React.FC<RideActionsProps> = ({
158164
}
159165
} else {
160166
const message = isNewRide(ride)
161-
? 'Failed to create ride due to the following errors: ' + errMessage + '.'
162-
: 'Failed to save ride due to the following errors: ' + errMessage + '.';
167+
? 'Failed to create ride due to the following errors: ' +
168+
errMessage +
169+
'.'
170+
: 'Failed to save ride due to the following errors: ' +
171+
errMessage +
172+
'.';
163173
showError(message, 'Rides Error');
164174
}
165175
} catch (error) {

‎frontend/src/components/RideDetails/RideEditContext.tsx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import { SchedulingState } from '../../types';
1010
import { RideType } from '@carriage-web/shared/types/ride';
1111
import axios from '../../util/axios';
1212
import { canEditRide, UserRole } from '../../util/rideValidation';
13-
import {
14-
isNewRide,
15-
hasRideChanges,
16-
} from '../../util/modelFixtures';
13+
import { isNewRide, hasRideChanges } from '../../util/modelFixtures';
1714
import { validateRideTimes } from './TimeValidation';
1815
import { useRides } from '../../context/RidesContext';
1916
import { useToast } from '../../context/toastContext';
@@ -165,7 +162,9 @@ export const RideEditProvider: React.FC<RideEditProviderProps> = ({
165162

166163
if (!timeValidation.isValid) {
167164
console.error('Time validation failed:', timeValidation.errors);
168-
const errMessages = timeValidation.errors.map((err) => err.message).join(', ');
165+
const errMessages = timeValidation.errors
166+
.map((err) => err.message)
167+
.join(', ');
169168
const firstErr =
170169
timeValidation.errors[0]?.message || 'Invalid time values';
171170
showError(errMessages || firstErr, 'Ride Edit Error');
@@ -183,7 +182,10 @@ export const RideEditProvider: React.FC<RideEditProviderProps> = ({
183182
!editedRide.endTime
184183
) {
185184
console.error('Missing required fields for new ride');
186-
showError('Please select pickup, dropoff, start time, and end time.', 'Ride Edit Error');
185+
showError(
186+
'Please select pickup, dropoff, start time, and end time.',
187+
'Ride Edit Error'
188+
);
187189
return [false, 'Missing required fields for new ride'];
188190
}
189191

‎frontend/src/components/RideDetails/RideLocations.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,10 @@ const RideMap: React.FC<RideMapProps> = ({
311311
}
312312
} catch (error) {
313313
console.error('Error fetching route:', error);
314-
showError(`Error fetching route: ${formatErrorMessage(error)}`, 'Maps Error');
314+
showError(
315+
`Error fetching route: ${formatErrorMessage(error)}`,
316+
'Maps Error'
317+
);
315318
if (polylineRef.current) {
316319
polylineRef.current.setMap(null);
317320
polylineRef.current = null;

‎frontend/src/components/RideDetails/RideOverview.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,10 @@ const RideOverview: React.FC<RideOverviewProps> = ({ userRole }) => {
251251
updateRideField('startTime', updatedStartTime.toISOString());
252252
} catch (error) {
253253
console.error('Failed to update ride time:', error);
254-
showError(`Error updating ride time: ${formatErrorMessage(error)}`, 'Ride Edit Error');
254+
showError(
255+
`Error updating ride time: ${formatErrorMessage(error)}`,
256+
'Ride Edit Error'
257+
);
255258
}
256259
};
257260

@@ -420,7 +423,7 @@ const RideOverview: React.FC<RideOverviewProps> = ({ userRole }) => {
420423
const hasEndTimeError =
421424
endTimeBeforeStartError !== undefined ||
422425
durationError !== undefined;
423-
426+
424427
return (
425428
<>
426429
<div className={styles.dateTimeRow}>

0 commit comments

Comments
 (0)