fixed a bit

This commit is contained in:
bobbert committed 2025-03-11 20:19:03 +00:00
1 parent 3f75f64cce
commit 22119dbf6f
2 files changed
+44 -6

No files matched your search

+31
View File
@@ -0,0 +1,31 @@
// app/api/teams/[teamId]/members/route.js
import { query } from '../../../../../lib/db';
import { getServerSession } from 'next-auth/next';
import { authOptions } from '../../../auth/[...nextauth]/route';
export async function GET(request, { params }) {
const session = await getServerSession(authOptions);
if (!session) {
return Response.json({ error: 'Unauthorised' }, { status: 401 });
}
try {
const { teamId } = params;
// Ensure the user is requesting their own team or is an admin
if (session.user.teamId != teamId && session.user.role !== 'admin') {
return Response.json({ error: 'Not authorized to view this team' }, { status: 403 });
}
const members = await query(
'SELECT id, username FROM users WHERE team_id = ?',
[teamId]
);
return Response.json(members);
} catch (error) {
console.error('Team members fetch error:', error);
return Response.json({ error: 'Failed to fetch team members' }, { status: 500 });
}
}
+13 -6
View File
@@ -17,10 +17,15 @@ export default function TeamPage({ params }) {
useEffect(() => { useEffect(() => {
async function fetchTeamData() { async function fetchTeamData() {
try { try {
if (!teamId) {
throw new Error('No team ID provided');
}
// Fetch team details // Fetch team details
const teamResponse = await fetch(`/api/teams/${teamId}`); const teamResponse = await fetch(`/api/teams/${teamId}`);
if (!teamResponse.ok) { if (!teamResponse.ok) {
throw new Error('Failed to fetch team data'); const errorData = await teamResponse.json();
throw new Error(errorData.error || 'Failed to fetch team data');
} }
const teamData = await teamResponse.json(); const teamData = await teamResponse.json();
setTeam(teamData); setTeam(teamData);
@@ -28,19 +33,21 @@ export default function TeamPage({ params }) {
// Fetch team members // Fetch team members
const membersResponse = await fetch(`/api/teams/${teamId}/members`); const membersResponse = await fetch(`/api/teams/${teamId}/members`);
if (!membersResponse.ok) { if (!membersResponse.ok) {
throw new Error('Failed to fetch team members'); // Don't throw here, just log the error
console.error('Failed to fetch team members');
} else {
const membersData = await membersResponse.json();
setTeamMembers(membersData);
} }
const membersData = await membersResponse.json();
setTeamMembers(membersData);
} catch (err) { } catch (err) {
console.error(err); console.error('Team page error:', err);
setError(err.message); setError(err.message);
} finally { } finally {
setLoading(false); setLoading(false);
} }
} }
if (status === 'authenticated') { if (status === 'authenticated' && teamId) {
fetchTeamData(); fetchTeamData();
} }
}, [teamId, status]); }, [teamId, status]);