From 5b5f4c43c159e852433d5aa854a19fee7c79c050 Mon Sep 17 00:00:00 2001 From: PCBZ Date: Tue, 22 Apr 2025 18:42:05 -0700 Subject: [PATCH 1/3] delete progress localStorage token --- client/src/utils/ProgressPoller.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/client/src/utils/ProgressPoller.js b/client/src/utils/ProgressPoller.js index 86058cfc..41d4ae33 100644 --- a/client/src/utils/ProgressPoller.js +++ b/client/src/utils/ProgressPoller.js @@ -18,11 +18,6 @@ export class ProgressPoller { if (this.isStopped) return; try { - const token = localStorage.getItem('token'); - if (!token) { - throw new Error('No authentication token found'); - } - const data = await fetchWithAuth(`/api/progress/${this.operationId}`) // Ensure we have valid progress data From da6382e79cc9ce104feebdecc9bc5325f090a9ad Mon Sep 17 00:00:00 2001 From: PCBZ Date: Tue, 22 Apr 2025 19:08:14 -0700 Subject: [PATCH 2/3] fix getEventID --- client/src/services/eventService.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/client/src/services/eventService.js b/client/src/services/eventService.js index a978c5b0..791140dc 100644 --- a/client/src/services/eventService.js +++ b/client/src/services/eventService.js @@ -60,14 +60,7 @@ export const getEvents = async (params = {}) => { */ export const getEventById = async (eventId) => { try { - const response = await fetchWithAuth(`${API_URL}/api/events/${eventId}`); - - if (!response.ok) { - throw new Error(`Failed to get event info: ${response.status}`); - } - - const data = await response.json(); - return data; + return await fetchWithAuth(`${API_URL}/api/events/${eventId}`); } catch (error) { console.error('Error fetching event:', error); throw error; From ea2a6b581ceb65a5d998153d880b579658be833f Mon Sep 17 00:00:00 2001 From: PCBZ Date: Tue, 22 Apr 2025 19:12:25 -0700 Subject: [PATCH 3/3] delete useless fetch --- client/src/components/donors/Donors.jsx | 26 ++----------------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/client/src/components/donors/Donors.jsx b/client/src/components/donors/Donors.jsx index 8aff7295..0a941309 100644 --- a/client/src/components/donors/Donors.jsx +++ b/client/src/components/donors/Donors.jsx @@ -287,31 +287,9 @@ const Donors = () => { /** * Open the add donor modal */ - const handleOpenAddDonorModal = async () => { + const handleOpenAddDonorModal = () => { if (!selectedEvent) return; - - try { - // 先显示模态框 - setShowAddDonorModal(true); - - setLoading(prev => ({ ...prev, availableDonors: true })); - setError(prev => ({ ...prev, availableDonors: null })); - - // 获取第一页可用捐赠者 - const result = await getAvailableDonors(selectedEvent.id, { - page: 1, - limit: modalItemsPerPage, - search: '' - }); - - setModalTotalPages(result.total_pages || 1); - setModalTotalDonors(result.total_count || 0); - } catch (error) { - console.error('Error fetching available donors:', error); - setError(prev => ({ ...prev, availableDonors: error.message })); - } finally { - setLoading(prev => ({ ...prev, availableDonors: false })); - } + setShowAddDonorModal(true); }; // Handle search