Merge branch 'owen' of https://github.com/Celesca/hacka-backend-elysia …

…into owen
Celesca · Nov 27, 2024 · f02fd61 · f02fd61
2 parents f66e3b7 + db10c23
commit f02fd61
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 13 deletions.
diff --git a/frontend/src/eventdetail.jsx b/frontend/src/eventdetail.jsx
@@ -8,6 +8,7 @@ const EventDetail = () => {
   const [isCreateTeamModalOpen, setIsCreateTeamModalOpen] = useState(false);
   const [isjoinTeamModalOpen, setIsjoinTeamModalOpen] = useState([false,'']);
   const [isleaveTeamModalOpen, setleaveTeamModalOpen] = useState([false,'']);
+  const [isshowTeamModalOpen, setshowTeamModalOpen] = useState([false,'']);
   const [Teamlist, setTeamlist] = useState([]);
   const [userTeamlist, setuserTeamlist] = useState([]);
   const [member, setmember] = useState([]);
@@ -332,14 +333,19 @@ const addteam = async () => {
       ))}
 
       {/* Teams Section */}
-      <div id="teamlist" className="px-8 py-16 lg:px-24 bg-white">
+      <div id="teamlist" className="px-8 py-16 lg:px-24 bg-white ">
         <h2 className="text-3xl font-bold text-gray-800 mb-6">
           ทีมที่เปิดรับสมาชิก
         </h2>
         <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-8">
 
           {Teamlist.map((val, key) => (
-            <div key={key} className="relative bg-gray-100 rounded-lg p-6 shadow-md hover:shadow-lg transition">
+            <div key={key} className="relative bg-gray-100 rounded-lg p-6 shadow-md hover:shadow-lg transition"          
+                onClick={async () => {
+                await setshowTeamModalOpen([true, val.TeamID])
+                showmember(val.TeamID)
+              }}
+            >
               <div className="absolute top-4 left-4  text-gray-700 text-sm font-semibold py-1 px-3 rounded-full shadow-md">
                 <span>👥 {val.CurrentMember}/{val.MaxMember}</span>
               </div>
@@ -381,20 +387,51 @@ const addteam = async () => {
 
             </div>
           ))}
+
+          {isshowTeamModalOpen[0] == true && (
+            <div className="fixed inset-0 flex items-center justify-center bg-black bg-opacity-50 z-50">
+              <div className="w-full max-w-lg bg-gradient-to-b from-blue-500 to-sky-500 text-white rounded-lg p-6 shadow-lg">
+                <h1 className="text-3xl font-bold text-center mb-6 ">member</h1>
+
+                {member.map((val,key) => (
+                  <div key={key} className="flex justify-between items-center">
+
+                      <p className="font-semibold text-lg">Username: {val.userName}</p>
+                      <p className="text-lg">Role: {val.role}</p>
+
+
+
+
+                  </div>
+                ))}
+
+              {/* Buttons */}
+
+                <div className="flex justify-between mt-6">
+                  <button
+                    onClick={() => setshowTeamModalOpen(false)}
+                    className="w-1/3 h-12 bg-gray-300 text-black font-bold rounded-full shadow-md hover:bg-gray-400 transition duration-300"
+                  >
+                    Close
+                  </button>
+
+                </div>
+              </div>
+            </div>
+        )} 
 
         {/* leave team popup */}
         {isleaveTeamModalOpen[0] == true && (
           <div className="fixed inset-0 flex items-center justify-center bg-black bg-opacity-50 z-50">
             <div className="w-full max-w-lg bg-gradient-to-b from-blue-500 to-sky-500 text-white rounded-lg p-6 shadow-lg">
-              <h1 className="text-3xl font-bold text-center mb-6 ">Show member</h1>
+              <h1 className="text-3xl font-bold text-center mb-6 ">member</h1>
 
               {member.filter(val => val.userID !== UserID).map((val,key) => (
                 <div key={key} className="flex justify-between items-center">
-                <div>
-                  <h3>{val.teamID}</h3>
-                  <p>UserID: {val.userID}</p>
-                  <p>Username: {val.userName}</p>
-                </div>
+
+                    <p className="font-semibold text-lg">Username: {val.userName}</p>
+                    <p className="text-lg">Role: {val.role}</p>
+
 
                 {currentUserRole === 'head' && (
                   <button

diff --git a/src/controllers/teamController.ts b/src/controllers/teamController.ts
@@ -8,7 +8,25 @@ export const teamController = new Elysia({ prefix: "/team" })
     return teams;
 })
 
-// Get users in a team
+
+.get("/getTeam", async ({ query: { TeamID }, error }) => {
+    const team = await prisma.team.findFirst({
+        where: {
+          TeamID: TeamID,
+        },
+    });
+
+    if (!team) {
+        return error(404, "Team not found");
+    }
+
+    return team;
+}, {
+    query: t.Object({
+        TeamID: t.Number(),
+    }),
+})
+
 .get("/users/:teamID", async ({ params: { teamID }, error }) => {
     const users = await prisma.userTeam.findMany({
         where: {
@@ -30,11 +48,12 @@ export const teamController = new Elysia({ prefix: "/team" })
     }),
 })
 
-// Get Team by TeamID
-.get("/getTeam", async ({ query: { TeamID }, error }) => {
+// Get TeamID from name and hackathon
+.get("/find", async ({ query: { teamName, hackathonID }, error }) => {
     const team = await prisma.team.findFirst({
         where: {
-          TeamID: TeamID,
+            TeamName: teamName,
+            HackathonID: hackathonID,
         },
     });
 
@@ -45,7 +64,8 @@ export const teamController = new Elysia({ prefix: "/team" })
     return team;
 }, {
     query: t.Object({
-        TeamID: t.Number(),
+        teamName: t.String(),
+        hackathonID: t.Number(),
     }),
 })