import React, { useState, useCallback, useMemo, useEffect } from 'react'; import Image…
- User
import React, { useState, useCallback, useMemo, useEffect } from 'react'; import Image from 'next/image'; import { Member, Payment, Note, FirebaseUser, NewMember, Collector } from '../types'; import { Dialog } from '@headlessui/react'; import { MagnifyingGlassIcon, ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/24/solid'; import { collection, getDocs, doc, updateDoc, addDoc } from 'firebase/firestore'; import { db } from '../config/firebaseConfig'; import { generateMemberNumber } from '../utils/memberUtils'; import { useInView } from 'react-intersection-observer';
interface MemberWithPayments extends Member { payments: Payment[]; }
interface LoggedUser { id: string; createdAt: { seconds: number; nanoseconds: number; }; displayName: string; email: string; photoURL: string; role: string; }
export interface MembersSectionProps { members: MemberWithPayments[]; firebaseUsers: FirebaseUser[]; searchTerm: string; setSearchTerm: (term: string) => void; expandedMembers: Record<string, boolean>; setExpandedMembers: React.Dispatch<React.SetStateAction<Record<string, boolean>>>; onUpdateMember: (id: string, member: Partial) => void; onDeleteMember: (id: string) => void; onRevokeMember: (id: string) => void; currentUserRole: string; onAddPayment: (memberNumber: string, payment: Omit<Payment, 'id'>) => void; onAddNote: (memberId: string, note: string) => void; onUpdateUserRole: (userId: string, newRole: string) => void; }
export interface CollectorsSectionProps { collectors: Collector[]; searchTerm: string; setSearchTerm: (term: string) => void; expandedCollectors: Record<string, boolean>; setExpandedCollectors: React.Dispatch<React.SetStateAction<Record<string, boolean>>>; }
const CollectorsSection: React.FC = ({ collectors, searchTerm, setSearchTerm, expandedCollectors, setExpandedCollectors, }) => { const filteredCollectors = useMemo(() => { return collectors.filter(collector => { const search = searchTerm.toLowerCase(); return ( (collector.name && collector.name.toLowerCase().includes(search)) || (collector.id && collector.id.toLowerCase().includes(search)) ); }); }, [collectors, searchTerm]);
const toggleCollectorExpansion = useCallback((collectorId: string) => { setExpandedCollectors(prev => ({ ...prev, [collectorId]: !prev[collectorId] })); }, [setExpandedCollectors]);
return ( Collectors <input type="text" value={searchTerm} onChange={(e) => setSearchTerm(e.target.value)} placeholder="Search by member ID or name" className="p-2 border border-gray-300 rounded mr-2 flex-grow" /> Showing {collectors.length} collectors Name Member No Address Contact Collector Actions {filteredCollectors.map(collector => ( <React.Fragment key={collector.id}> {collector.name || 'N/A'} {collector.id || 'Not assigned'} {collector.email || 'N/A'} {collector.contactNumber || 'N/A'} {collector.address || 'N/A'} <button onClick={() => toggleCollectorExpansion(collector.id)} className="p-1 bg-blue-100 text-blue-600 rounded hover:bg-blue-200 transition-colors duration-200" > {expandedCollectors[collector.id] ? ( ) : ( )} {expandedCollectors[collector.id] && ( Assigned Members {collector.members && collector.members.length > 0 ? ( {collector.members.map((member, index) => ( {member.name} (ID: {member.id}) ))} ) : ( No members assigned to this collector. )} )} </React.Fragment> ))} ); };
export { CollectorsSection };
const MembersSection: React.FC = ({ members, searchTerm, setSearchTerm, expandedMembers, setExpandedMembers, onUpdateMember, onDeleteMember, onRevokeMember, currentUserRole, onAddPayment, onAddNote, onUpdateUserRole }) => { const [firebaseUsers] = useState<FirebaseUser[]>([]); const [userSearchTerm, setUserSearchTerm] = useState(''); const [newPaymentAmounts, setNewPaymentAmounts] = useState<Record<string, string>>({}); const [newNote, setNewNote] = useState(''); const [memberToDelete, setMemberToDelete] = useState<string | null>(null);
const filteredMembers = useMemo(() => { return members.filter(member => { const search = searchTerm.toLowerCase(); return ( (member.fullName && member.fullName.toLowerCase().includes(search)) || (member.memberNumber && member.memberNumber.toLowerCase().includes(search)) || (member.name && member.name.toLowerCase().includes(search)) ); }); }, [members, searchTerm]);
const toggleMemberExpansion = useCallback((memberId: string) => { setExpandedMembers(prev => ({ ...prev, [memberId]: !prev[memberId] })); }, [setExpandedMembers]);
const handleAddPayment = useCallback((memberNumber: string) => { const amount = parseFloat(newPaymentAmounts[memberNumber] || '0'); if (!isNaN(amount) && amount > 0) { const newPayment = { amount: amount, date: new Date().toISOString(), memberNumber: memberNumber, memberId: memberNumber }; onAddPayment(memberNumber, newPayment); setNewPaymentAmounts(prev => ({ ...prev, [memberNumber]: '' })); } else { alert('Please enter a valid payment amount.'); } }, [newPaymentAmounts, onAddPayment]);
const handleDeleteMember = useCallback((id: string) => { setMemberToDelete(id); }, []);
const confirmDeleteMember = useCallback(() => { if (memberToDelete) { onDeleteMember(memberToDelete); setMemberToDelete(null); } }, [memberToDelete, onDeleteMember]);
return ( Members <input type="text" value={searchTerm} onChange={(e) => setSearchTerm(e.target.value)} placeholder="Search by name or member number" className="p-2 border border-gray-300 rounded mr-2 flex-grow" /> Name Member No Address Contact Collector Actions {filteredMembers.map(member => ( <React.Fragment key={member.id}> {member.fullName || member.name || 'N/A'} {member.memberNumber || 'Not assigned'} {
${member.address || ''}, ${member.town || ''}, ${member.postCode || ''}} {member.mobileNo || member.email || 'N/A'} {member.collector || 'N/A'} <button onClick={() => toggleMemberExpansion(member.id)} className="p-1 bg-blue-100 text-blue-600 rounded hover:bg-blue-200 transition-colors duration-200" > {expandedMembers[member.id] ? ( ) : ( )} <button onClick={() => onUpdateMember(member.id, { ...member, name: member.name + ' (updated)' })} className="p-1 bg-yellow-100 text-yellow-600 rounded hover:bg-yellow-200 transition-colors duration-200" > Edit <button onClick={() => handleDeleteMember(member.id)} className="p-1 bg-red-100 text-red-600 rounded hover:bg-red-200 transition-colors duration-200" > Delete <button onClick={() => onRevokeMember(member.id)} className="p-1 bg-orange-100 text-orange-600 rounded hover:bg-orange-200 transition-colors duration-200" > Revoke {expandedMembers[member.id] && ( Member Details Full Name: {member.fullName || 'N/A'} Date of Birth: {member.dateOfBirth || 'N/A'} Gender: {member.gender || 'N/A'} Marital Status: {member.maritalStatus || 'N/A'} Membership Type: {member.membershipType || 'N/A'} Membership Status: {member.membershipStatus || 'N/A'} Membership Start Date: {member.membershipStartDate || 'N/A'} Membership End Date: {member.membershipEndDate || 'N/A'}<h4 className="font-semibold mt-4 mb-2">Payment History</h4> {member.payments && member.payments.length > 0 ? ( <table className="min-w-full"> <thead> <tr className="bg-gray-200"> <th className="py-2 px-4 text-left">Date</th> <th className="py-2 px-4 text-left">Amount</th> </tr> </thead> <tbody> {member.payments.map((payment, index) => ( <tr key={index} className="border-b"> <td className="py-2 px-4">{new Date(payment.date).toLocaleDateString()}</td> <td className="py-2 px-4">£{payment.amount.toFixed(2)}</td> </tr> ))} </tbody> </table> ) : ( <p>No payments recorded for this member.</p> )} <div className="mt-4"> <h4 className="font-semibold mb-2">Add Payment</h4> <div className="flex items-center"> <input type="number" value={newPaymentAmounts[member.memberNumber || ''] || ''} onChange={(e) => setNewPaymentAmounts(prev => ({ ...prev, [member.memberNumber || '']: e.target.value }))} placeholder="Amount" className="p-2 border border-gray-300 rounded mr-2 flex-grow" step="0.01" min="0" /> <button onClick={() => handleAddPayment(member.memberNumber || '')} className="px-4 py-2 bg-green-500 text-white rounded hover:bg-green-600" disabled={!newPaymentAmounts[member.memberNumber || ''] || parseFloat(newPaymentAmounts[member.memberNumber || '']) <= 0 || !member.memberNumber} > Add Payment </button> </div> </div> {currentUserRole === 'admin' && ( <div className="mt-4"> <h4 className="font-semibold mb-2">Admin Notes</h4> <ul className="list-disc list-inside"> {member.notes && member.notes.length > 0 ? ( member.notes.map((note: Note, index: number) => ( <li key={index}> <span className="font-medium">{new Date(note.date).toLocaleDateString()}: </span> {note.content} </li> )) ) : ( <li>No notes available</li> )} </ul> <textarea value={newNote} onChange={(e) => setNewNote(e.target.value)} placeholder="Add a note" className="p-2 border border-gray-300 rounded w-full mt-2" /> <button onClick={() => { if (newNote.trim()) { onAddNote(member.id, newNote); setNewNote(''); } else { alert('Please enter a note before adding.'); } }} className="px-4 py-2 bg-purple-500 text-white rounded hover:bg-purple-600 mt-2" > Add Note </button> </div> )} </div> </td> </tr> )} </React.Fragment> ))} </tbody> </table> </div> {/* Delete Confirmation Dialog */} <Dialog open={!!memberToDelete} onClose={() => setMemberToDelete(null)}> <div className="fixed inset-0 bg-black/30" aria-hidden="true" /> <div className="fixed inset-0 flex items-center justify-center p-4"> <Dialog.Panel className="mx-auto max-w-sm rounded bg-white p-6"> <Dialog.Title className="text-lg font-medium mb-4">Confirm Deletion</Dialog.Title> <p>Are you sure you want to delete this member? This action cannot be undone.</p> <div className="mt-4 flex justify-end space-x-2"> <button className="px-4 py-2 bg-gray-200 text-gray-800 rounded hover:bg-gray-300" onClick={() => setMemberToDelete(null)} > Cancel </button> <button className="px-4 py-2 bg-red-500 text-white rounded hover:bg-red-600" onClick={confirmDeleteMember} > Delete </button> </div> </Dialog.Panel> </div> </Dialog> </div>); };
export { MembersSection, CollectorsSection };
npm run build
pwa@0.1.0 build next build
▲ Next.js 14.2.7
- Environments: .env.local
Creating an optimized production build ... Failed to compile.
./components/MembersSection.tsx Error: x Unexpected token
div. Expected jsx identifier ,-[/workspaces/pwa-burton-next/components/MembersSection.tsx:70:1] 70 | }, [setExpandedCollectors]); 71 | 72 | return ( 73 | : ^^^ 74 | Collectors 75 | 76 | <input `----Caused by: Syntax Error
Import trace for requested module: ./components/MembersSection.tsx ./app/dashboard/page.tsx
Build failed because of webpack errors
- Assistant
The error you're encountering is likely due to a syntax issue in your
CollectorsSectioncomponent. Specifically, there's a mismatch in the opening and closing braces{}or parentheses()within the component, which is causing the parser to throw an error at thereturnstatement. This kind of error often occurs when there's an extra or missing brace or parenthesis, leading the parser to misinterpret the structure of your code.Here's how you can fix it:
Issue Identification:
-
Check for Unmatched Braces or Parentheses: The error message:
x Unexpected token `div`. Expected jsx identifier ,-.../components/MembersSection.tsx:70:1] 70 | }, [setExpandedCollectors]); 71 | 72 | return ( 73 | <div className="container mx-auto px-4"> : ^^^indicates that the parser is expecting a JSX identifier but found a
div. This typically happens if there's a syntax error before this point, such as an unmatched brace or parenthesis. -
Review the
CollectorsSectionComponent:Let's look at the
CollectorsSectioncomponent specifically. Ensure that all opening braces{and parentheses(have corresponding closing braces}and parentheses).Here's the corrected code for
CollectorsSection:import React, { useState, useCallback, useMemo } from 'react'; import { CollectorsSectionProps } from '../types'; import { MagnifyingGlassIcon, ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/24/solid'; const CollectorsSection: React.FC<CollectorsSectionProps> = ({ collectors, searchTerm, setSearchTerm, expandedCollectors, setExpandedCollectors, }) => { const filteredCollectors = useMemo(() => { return collectors.filter(collector => { const search = searchTerm.toLowerCase(); return ( (collector.name && collector.name.toLowerCase().includes(search)) || (collector.id && collector.id.toLowerCase().includes(search)) ); }); }, [collectors, searchTerm]); const toggleCollectorExpansion = useCallback( (collectorId: string) => { setExpandedCollectors(prev => ({ ...prev, [collectorId]: !prev[collectorId], })); }, [setExpandedCollectors] ); return ( <div className="container mx-auto px-4"> {/* Rest of your component code */} </div> ); }; export { CollectorsSection };
Fix Applied:
- Ensured that all braces and parentheses are correctly matched. In your original code, there might have been an extra or missing brace.
- Removed any duplicate or extra exports. You only need to export the component once.
- Verified that the
useCallbackanduseMemohooks have their parentheses and braces properly closed.
Next Steps:
-
Check All Components:
- Ensure that in both
CollectorsSectionandMembersSection, all functions, hooks, and components have the correct syntax. - Use consistent indentation to make matching braces and parentheses easier to spot.
- Ensure that in both
-
Use a Linter or Code Editor:
- Use a code editor with syntax highlighting and real-time error detection.
- Integrate a linter like ESLint into your project. It can help identify syntax errors before you build your project.
-
Avoid Duplicate Exports or Definitions:
- Ensure you're not exporting the same component multiple times.
- Remove any unnecessary or duplicate code that might confuse the parser.
-
Test the Build Again:
- After making the corrections, run
npm run buildagain to see if the error persists.
- After making the corrections, run
Final Code Structure:
Your
MembersSection.tsxshould look something like this:import React, { useState, useCallback, useMemo } from 'react'; import { CollectorsSectionProps, MembersSectionProps } from '../types'; import { MagnifyingGlassIcon, ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/24/solid'; import { Dialog } from '@headlessui/react'; const CollectorsSection: React.FC<CollectorsSectionProps> = ({ collectors, searchTerm, setSearchTerm, expandedCollectors, setExpandedCollectors, }) => { // Component logic... return ( <div className="container mx-auto px-4"> {/* JSX code... */} </div> ); }; const MembersSection: React.FC<MembersSectionProps> = ({ members, // Other props... }) => { // Component logic... return ( <div className="container mx-auto px-4"> {/* JSX code... */} </div> ); }; export { MembersSection, CollectorsSection };By ensuring the syntax is correct and there are no unmatched braces or parentheses, you should be able to resolve the build error.
-