diff --git a/frontend/src/Rating.jsx b/frontend/src/Rating.jsx
index 36b42c3..7f9576e 100644
--- a/frontend/src/Rating.jsx
+++ b/frontend/src/Rating.jsx
@@ -2,8 +2,10 @@ import { useState, useEffect } from 'react';
 import Axios from 'axios';
 
 const Rating = () => {
-  const [TeamName, setTeamname] = useState('');
-  const [UserName, setUsername] = useState('');
+  const [teams, setTeams] = useState([]);
+  const [users, setUsers] = useState([]);
+  const [selectedTeam, setSelectedTeam] = useState('');
+  const [selectedUser, setSelectedUser] = useState('');
   const [RatingValue, setRatingValue] = useState('');
   const [Comment, setComment] = useState('');
   const [errorMessage, setErrorMessage] = useState('');
@@ -16,8 +18,35 @@ const Rating = () => {
     } else {
       console.warn('UserID not found in localStorage');
     }
+
+    const fetchTeams = async () => {
+      try {
+        const response = await Axios.get('http://localhost:3000/team');
+        setTeams(response.data);
+      } catch (error) {
+        console.error('Error fetching teams:', error);
+      }
+    };
+
+    fetchTeams();
   }, []);
 
+  useEffect(() => {
+    const fetchUsers = async () => {
+      if (selectedTeam) {
+        try {
+          const response = await Axios.get(`http://localhost:3000/team/users/${selectedTeam}`);
+          setUsers(response.data);
+        } catch (error) {
+          console.error('Error fetching users:', error);
+        }
+      }
+      console.log(selectedTeam)
+    };
+
+    fetchUsers();
+  }, [selectedTeam]);
+
   const addrating = async () => {
     try {
       if (!UserID) {
@@ -30,22 +59,40 @@ const Rating = () => {
         return;
       }
 
-      // ดึง UserID จาก Username ที่กรอก
-      const userResponse = await Axios.get(`http://localhost:3000/user/UserID`, {
-        params: { username: UserName },
+      // Fetch TeamID from TeamName
+      const teamResponse = await Axios.get(`http://localhost:3000/team/getTeam`, {
+        params: { TeamID: selectedTeam },
       });
 
-      const ratedUserID = userResponse.data.userID;
+      const TeamID = teamResponse.data.TeamID;
+
+      if (!TeamID) {
+        setErrorMessage('ไม่พบ TeamID ของทีมนี้');
+        return;
+      }
+
+      // // Store TeamID in local storage
+      // localStorage.setItem('TeamID', TeamID);
+
+      // Fetch UserID from Username
+      const userResponse = await Axios.get(`http://localhost:3000/user/getUserID/${selectedUser}`);
+
+      console.log(userResponse.data);
 
+      
+      const ratedUserID = userResponse.data.UserID;
+      
       if (!ratedUserID) {
         setErrorMessage('ไม่พบ UserID ของ Username นี้');
         return;
       }
 
-      // ตรวจสอบว่า UserID ของ Username ที่กรอกอยู่ในทีมมั้ย
-      const checkTeam = await Axios.post(`http://localhost:3000/team`, {
-        teamname: TeamName,
-        userid: ratedUserID, // ตรวจสอบ UserID นี้ในทีม
+      // Check if the user is part of the team
+      const checkTeam = await Axios.get(`http://localhost:3000/team/checkteam`, {
+        params: {
+          TeamID: TeamID,
+          UserID: ratedUserID,
+        },
       });
 
       if (!checkTeam.data.valid) {
@@ -53,50 +100,37 @@ const Rating = () => {
         return;
       }
 
-      // เพิ่ม ratedUserID ลงในตาราง userteam
-      await Axios.post(
-        `http://localhost:3000/userteam`,
-        {
-          teamname: TeamName,
-          ratedUserID, // UserID ของผู้ที่ได้รับคะแนน
-          rateByID: UserID, // UserID ของผู้ให้คะแนน
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${localStorage.getItem('token')}`,
+      console.log(UserID)
+      console.log(ratedUserID)
+      console.log(RatingValue)
+      console.log(Comment)
+
+      // Add rating
+           // Add rating
+           await Axios.post(`http://localhost:3000/rating/rateuser`, {
+            ratedByID: UserID,
+            ratedUserID: ratedUserID,
+            ratingValue: RatingValue,
+            comment: Comment,
           },
-        }
-      );
-
-      // add คะแนนลง userrating
-      await Axios.post(
-        `http://localhost:3000/userrating`,
-        {
-          TeamName,
-          UserName,
-          RatingValue: parseInt(RatingValue),
-          Comment,
-          ratedUserID,
-          rateByID: UserID,
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${localStorage.getItem('token')}`,
-          },
-        }
-      );
-
-      // รีเซ็ตฟอร์ม
-      setTeamname('');
-      setUsername('');
-      setRatingValue('');
-      setComment('');
-      setErrorMessage('');
-      alert('บันทึกคะแนนสำเร็จ');
-    } catch (error) {
-      console.error('Error:', error);
-      setErrorMessage('เกิดข้อผิดพลาดในการบันทึกข้อมูล');
-    }
+          {
+            headers: {
+              Authorization: `Bearer ${localStorage.getItem('token')}`,
+            },
+          }
+        );
+  
+        // Reset form
+        setSelectedTeam('');
+        setSelectedUser('');
+        setRatingValue('');
+        setComment('');
+        setErrorMessage('');
+        alert('บันทึกคะแนนสำเร็จ');
+      } catch (error) {
+        console.error('Error:', error);
+        setErrorMessage('เกิดข้อผิดพลาดในการบันทึกข้อมูล');
+      }
   };
 
   return (
@@ -108,20 +142,30 @@ const Rating = () => {
 
         <div className="p-6 space-y-6">
           <div className="space-y-4">
-            <input
-              type="text"
-              placeholder="Enter Team Name"
-              value={TeamName}
-              onChange={(event) => setTeamname(event.target.value)}
+            <select
+              value={selectedTeam}
+              onChange={(event) => setSelectedTeam(event.target.value)}
               className="w-full px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
-            />
-            <input
-              type="text"
-              placeholder="Enter Username"
-              value={UserName}
-              onChange={(event) => setUsername(event.target.value)}
+            >
+              <option value="" disabled>Select Team</option>
+              {teams.map((team) => (
+                <option key={team.TeamID} value={team.TeamID}>
+                  {team.TeamName}
+                </option>
+              ))}
+            </select>
+            <select
+              value={selectedUser}
+              onChange={(event) => setSelectedUser(event.target.value)}
               className="w-full px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
-            />
+            >
+              <option value="" disabled>Select User</option>
+              {users.map((user) => (
+                <option key={user.UserID} value={user.UserID}>
+                  {user.UserName}
+                </option>
+              ))}
+            </select>
             <input
               type="number"
               placeholder="Enter a score as an integer from 1 to 5"
@@ -152,4 +196,4 @@ const Rating = () => {
   );
 };
 
-export default Rating;
+export default Rating;
\ No newline at end of file
diff --git a/frontend/src/Swipe.jsx b/frontend/src/Swipe.jsx
index 4a45441..6229c15 100644
--- a/frontend/src/Swipe.jsx
+++ b/frontend/src/Swipe.jsx
@@ -113,7 +113,7 @@ const Swipe = () => {
   const rotation = dragDelta.x / 20;
 
   return (
-    <div className="min-h-screen bg-gray-100">
+    <div className="min-h-screen bg-blue-200 bg-opacity-75">
       {/* Header */}
       <div className="bg-blue-900 text-white p-4">
         <div className="max-w-4xl mx-auto flex justify-between items-center">
diff --git a/frontend/src/components/ChatBox.jsx b/frontend/src/components/ChatBox.jsx
index 73c006b..5af88f7 100644
--- a/frontend/src/components/ChatBox.jsx
+++ b/frontend/src/components/ChatBox.jsx
@@ -3,7 +3,6 @@ import { useState, useEffect } from 'react';
 import axios from 'axios';
 
 const ChatBox = ({ activeUser, messages, handleSendMessage }) => {
-
   const UserID = localStorage.getItem('UserID');
   const [senderImage, setSenderImage] = useState(null);
   const [newMessage, setNewMessage] = useState('');
@@ -34,69 +33,84 @@ const ChatBox = ({ activeUser, messages, handleSendMessage }) => {
 
   if (!activeUser) {
     return (
-      <div className="flex-1 flex items-center justify-center bg-gray-50">
-        <p className="text-gray-500">Select a chat to start messaging</p>
+      <div className="flex-1 flex items-center justify-center bg-gradient-to-br from-gray-50 to-gray-100 min-h-screen">
+        <div className="bg-white p-8 rounded-xl shadow-lg transform hover:scale-105 transition-transform duration-300 ease-in-out">
+          <p className="text-gray-500 text-lg font-medium text-center">
+            Select a chat to start messaging
+          </p>
+        </div>
       </div>
     );
   }
 
   return (
-    <div className="flex-1 flex flex-col bg-gray-50 pt-16">
+    <div className="flex-1 flex flex-col bg-gradient-to-br from-gray-50 to-gray-100 min-h-screen mt-16">
       {/* Chat Header */}
-      <div className="p-4 border-b bg-white">
-        <h2 className="text-lg font-bold text-black">{activeUser.UserName}</h2>
+      <div className="p-4 border-b bg-white shadow-sm sticky top-0 z-10 transform transition-all duration-300 hover:shadow-md">
+        <div className="flex items-center">
+          <img 
+            src={activeUser.ProfileImage} 
+            alt={activeUser.UserName} 
+            className="w-10 h-10 rounded-full mr-4 border-2 border-blue-500 transform transition-transform duration-300 hover:scale-110"
+          />
+          <h2 className="text-lg font-bold text-black hover:text-blue-600 transition-colors duration-300">
+            {activeUser.UserName}
+          </h2>
+        </div>
       </div>
 
       {/* Chat Messages */}
-        <div className="flex-1 p-4 overflow-y-auto">
-          <div className="flex flex-col">
-            {messages.map((msg) => (
-              <div key={msg.MessageID} className="flex items-start mb-2">
-          {msg.SenderID === activeUser.UserID ? (
-            <>
-              <div className="flex-1 flex justify-start">
-                <img 
-            src={activeUser.ProfileImage} 
-            alt={activeUser.UserName} 
-            className="w-8 h-8 rounded-full mr-2"
-                />
-                <div className="p-2 rounded-md bg-gray-200 text-black max-w-xs">
-            {msg.MessageContent}
+      <div className="flex-1 p-4 overflow-y-auto">
+        <div className="flex flex-col space-y-4">
+          {messages.map((msg) => (
+            <div 
+              key={msg.MessageID} 
+              className="flex items-start transition-all duration-300 hover:bg-gray-100 p-2 rounded-lg"
+            >
+              {msg.SenderID === activeUser.UserID ? (
+                <div className="flex-1 flex justify-start items-center">
+                  <img 
+                    src={activeUser.ProfileImage} 
+                    alt={activeUser.UserName} 
+                    className="w-10 h-10 rounded-full mr-3 transform transition-transform duration-300 hover:scale-110"
+                  />
+                  <div className="p-3 rounded-xl bg-gray-200 text-black max-w-xs shadow-sm transition-all duration-300 hover:shadow-md">
+                    {msg.MessageContent}
+                  </div>
                 </div>
-              </div>
-            </>
-          ) : (
-            <>
-              <div className="flex-1 flex justify-end">
-                <div className="p-2 rounded-md bg-blue-100 text-black max-w-xs">
-            {msg.MessageContent}
+              ) : (
+                <div className="flex-1 flex justify-end items-center">
+                  <div className="p-3 rounded-xl bg-blue-100 text-black max-w-xs mr-3 shadow-sm transition-all duration-300 hover:shadow-md">
+                    {msg.MessageContent}
+                  </div>
+                  <img 
+                    src={senderImage} 
+                    alt="Sender" 
+                    className="w-10 h-10 rounded-full transform transition-transform duration-300 hover:scale-110"
+                  />
                 </div>
-                <img 
-            src={senderImage} 
-            alt={senderImage} 
-            className="w-8 h-8 rounded-full ml-2"
-                />
-              </div>
-            </>
-          )}
-              </div>
-            ))}
-          </div>
+              )}
+            </div>
+          ))}
         </div>
+      </div>
 
-        {/* Message Input */}
-      <div className="p-4 bg-white border-t">
-        <form onSubmit={handleSubmit} className="p-4 bg-white border-t flex gap-2">
+      {/* Message Input */}
+      <div className="p-4 bg-white border-t shadow-inner">
+        <form 
+          onSubmit={handleSubmit} 
+          className="flex items-center space-x-2"
+        >
           <input
             type="text"
             value={newMessage}
             onChange={(e) => setNewMessage(e.target.value)}
             placeholder="Type a message..."
-            className="w-full border rounded-md p-2 focus:outline-none focus:ring-2 focus:ring-blue-500"
+            className="w-full border rounded-full p-3 focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all duration-300 hover:shadow-md"
           />
           <button 
             type="submit"
-            className="bg-blue-500 text-white px-4 py-2 rounded-md hover:bg-blue-600"
+            className="bg-blue-500 text-white px-6 py-3 rounded-full hover:bg-blue-600 transition-all duration-300 transform hover:scale-105 hover:shadow-lg"
           >
             Send
           </button>
@@ -111,7 +125,6 @@ ChatBox.propTypes = {
     UserID: PropTypes.string.isRequired,
     UserName: PropTypes.string.isRequired,
     ProfileImage: PropTypes.string.isRequired,
-    MessageContent: PropTypes.string.isRequired,
   }),
   messages: PropTypes.arrayOf(
     PropTypes.shape({
diff --git a/frontend/src/components/ChatList.jsx b/frontend/src/components/ChatList.jsx
index ea1544d..afe10f8 100644
--- a/frontend/src/components/ChatList.jsx
+++ b/frontend/src/components/ChatList.jsx
@@ -2,32 +2,156 @@ import PropTypes from 'prop-types';
 
 const ChatList = ({ chats, onSelectChat }) => {
   return (
-    <div className="w-1/3 bg-white border-r overflow-y-auto">
-      <h2 className="text-lg font-bold p-4 border-b">Chats</h2>
-      <ul>
+    <div className="min-h-screen w-1/3 bg-gradient-to-br from-gray-50 to-gray-100 border-r shadow-lg mt-16">
+      {/* Header with Gradient and Animated Title */}
+      <h2 className="text-lg font-bold p-4 border-b bg-gradient-to-r from-purple-700 to-blue-700 text-white 
+        flex items-center justify-between
+        transform transition-all duration-300 hover:scale-[1.02] hover:shadow-xl">
+        <span className="flex items-center">
+          <svg xmlns="http://www.w3.org/2000/svg" className="h-6 w-6 mr-3 animate-pulse" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M8 10h.01M12 10h.01M16 10h.01M9 16H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-5l-5 5v-5z" />
+          </svg>
+          Chats
+        </span>
+        <span className="text-sm opacity-75">({chats.length})</span>
+      </h2>
+
+      {/* Chat List with Enhanced Interactions */}
+      <ul className="divide-y divide-gray-200">
         {chats.map((chat) => (
           <li
             key={chat.UserID}
             onClick={() => onSelectChat(chat)}
-            className="p-4 border-b hover:bg-gray-200 cursor-pointer flex items-center"
+            className="
+              p-4 
+              flex items-center 
+              cursor-pointer 
+              group 
+              transition-all 
+              duration-300 
+              ease-in-out
+              hover:bg-gradient-to-r 
+              hover:from-blue-50 
+              hover:to-purple-50
+              transform 
+              hover:-translate-y-1 
+              hover:shadow-lg
+              relative
+              overflow-hidden
+            "
           >
-            <img
-              src={chat.ProfileImage}
-              alt={`${chat.UserName}'s profile`}
-              className="w-10 h-10 rounded-full mr-4"
-            />
-            <div className="flex-grow">
-              <p className="font-semibold">{chat.UserName}</p>
-              <p className="text-sm text-gray-500 truncate">{chat.MessageContent}</p>
+            {/* Subtle Background Hover Effect */}
+            <div className="absolute inset-0 bg-gradient-to-r from-blue-100 to-purple-100 opacity-0 group-hover:opacity-30 transition-opacity duration-300"></div>
+
+            {/* Profile Image with Hover Effect */}
+            <div className="relative mr-4">
+              <img
+                src={chat.ProfileImage}
+                alt={`${chat.UserName}'s profile`}
+                className="
+                  w-12 h-12 
+                  rounded-full 
+                  border-2 
+                  border-transparent 
+                  group-hover:border-blue-300 
+                  transition-all 
+                  duration-300 
+                  transform 
+                  group-hover:scale-110
+                  shadow-sm
+                  group-hover:shadow-md
+                "
+              />
+              {/* Online Status Indicator */}
+              <span className="
+                absolute 
+                bottom-0 
+                right-0 
+                block 
+                w-3 h-3 
+                bg-green-500 
+                rounded-full 
+                ring-2 
+                ring-white
+                animate-pulse
+              "></span>
+            </div>
+
+            {/* Chat Info */}
+            <div className="flex-grow overflow-hidden">
+              <div className="flex justify-between items-center">
+                <p className="
+                  font-semibold 
+                  text-gray-800 
+                  group-hover:text-blue-600 
+                  transition-colors 
+                  duration-300
+                ">
+                  {chat.UserName}
+                </p>
+                <p className="
+                  text-xs 
+                  text-gray-500 
+                  group-hover:text-purple-600
+                  transition-colors 
+                  duration-300
+                ">
+                  {/* You could add timestamp here */}
+                  Just now
+                </p>
+              </div>
+              <p className="
+                text-sm 
+                text-gray-500 
+                truncate 
+                group-hover:text-gray-700 
+                transition-colors 
+                duration-300
+              ">
+                {chat.MessageContent}
+              </p>
             </div>
+
+            {/* Unread Messages Badge with Animated Pulse */}
             {chat.UnreadMessages > 0 && (
-              <span className="bg-blue-500 text-white rounded-full px-2 py-1 text-xs">
+              <span className="
+                bg-blue-500 
+                text-white 
+                rounded-full 
+                px-2 
+                py-1 
+                text-xs 
+                ml-2
+                animate-bounce 
+                hover:animate-none
+                transition-all 
+                duration-300
+              ">
                 {chat.UnreadMessages}
               </span>
             )}
           </li>
         ))}
       </ul>
+
+      {/* Empty State */}
+      {chats.length === 0 && (
+        <div className="
+          text-center 
+          p-8 
+          text-gray-500 
+          opacity-70 
+          transform 
+          transition-all 
+          duration-300 
+          hover:scale-105
+        ">
+          <svg xmlns="http://www.w3.org/2000/svg" className="h-16 w-16 mx-auto mb-4 text-gray-300" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={1} d="M8 10h.01M12 10h.01M16 10h.01M9 16H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-5l-5 5v-5z" />
+          </svg>
+          No chats yet
+        </div>
+      )}
     </div>
   );
 };
diff --git a/frontend/src/profile.jsx b/frontend/src/profile.jsx
index 660f8b8..5249ff8 100644
--- a/frontend/src/profile.jsx
+++ b/frontend/src/profile.jsx
@@ -4,7 +4,7 @@ import { MdEmail } from "react-icons/md";
 import Axios from 'axios';
 import PropTypes from 'prop-types';
 import Swal from 'sweetalert2'
-import image from '../../public/uploads/profiles/5psgeommk-b1715b66-2c24-49ee-b16e-37ab0ba43ea0.jpeg' 
+// import image from '../../public/uploads/profiles/5psgeommk-b1715b66-2c24-49ee-b16e-37ab0ba43ea0.jpeg' 
 
 // EditProfileModal component
 const EditProfileModal = ({ isOpen, onClose, onSave, user }) => {
@@ -566,7 +566,7 @@ const Profile = () => {
                             flex items-center justify-center overflow-hidden">
                 {user.ProfileImage ? (
                   <img 
-                    src={image}
+                    src={user.ProfileImage}
                     alt="Profile" 
                     className="w-full h-full object-cover rounded-lg 
                               transform transition-all duration-500 group-hover:scale-110 group-hover:rotate-3"
diff --git a/public/uploads/profiles/vxsm1sh01-eac79345-b4ab-4232-b7eb-bcd8829be22f.png b/public/uploads/profiles/vxsm1sh01-eac79345-b4ab-4232-b7eb-bcd8829be22f.png
new file mode 100644
index 0000000..a3b38a4
Binary files /dev/null and b/public/uploads/profiles/vxsm1sh01-eac79345-b4ab-4232-b7eb-bcd8829be22f.png differ
diff --git a/src/controllers/ratingController.ts b/src/controllers/ratingController.ts
index b145698..6451882 100644
--- a/src/controllers/ratingController.ts
+++ b/src/controllers/ratingController.ts
@@ -28,8 +28,9 @@ export const ratingController = new Elysia({ prefix: "/rating" })
     }),
 })
 
-// Rating to someone
-ratingController.post("/", async ({ body, error }) => {
+
+// Rate someone
+.post("/rateuser", async ({ body, error }) => {
     const { ratedByID, ratedUserID, ratingValue, comment } = body;
 
     // Check if the user exists
@@ -71,6 +72,8 @@ ratingController.post("/", async ({ body, error }) => {
     }),
 })
 
+// Other endpoints...
+
 // Update rating
 .put("/:userRatingID", async ({ params, body, error }) => {
     const { userRatingID } = params;
diff --git a/src/controllers/teamController.ts b/src/controllers/teamController.ts
index cd94c5b..7800cab 100644
--- a/src/controllers/teamController.ts
+++ b/src/controllers/teamController.ts
@@ -8,12 +8,33 @@ export const teamController = new Elysia({ prefix: "/team" })
     return teams;
 })
 
-// Get TeamID from name and hackathon
-.get("/find", async ({ query: { teamName, hackathonID }, error }) => {
+// Get users in a team
+.get("/users/:teamID", async ({ params: { teamID }, error }) => {
+    const users = await prisma.userTeam.findMany({
+        where: {
+            TeamID: parseInt(teamID, 10),
+        },
+        include: {
+            User: true,
+        },
+    });
+
+    if (!users || users.length === 0) {
+        return error(404, "Users not found");
+    }
+
+    return users.map(userTeam => userTeam.User);
+}, {
+    params: t.Object({
+        teamID: t.String(),
+    }),
+})
+
+// Get Team by TeamID
+.get("/getTeam", async ({ query: { TeamID }, error }) => {
     const team = await prisma.team.findFirst({
         where: {
-            TeamName: teamName,
-            HackathonID: hackathonID,
+          TeamID: TeamID,
         },
     });
 
@@ -24,11 +45,11 @@ export const teamController = new Elysia({ prefix: "/team" })
     return team;
 }, {
     query: t.Object({
-        teamName: t.String(),
-        hackathonID: t.Number(),
+        TeamID: t.Number(),
     }),
 })
 
+<<<<<<< HEAD
 .get("/findteambyuser/:userID", async ({ params, error }) => {
 
     const team = await prisma.userTeam.findMany({
@@ -49,6 +70,52 @@ export const teamController = new Elysia({ prefix: "/team" })
 })
 
 
+=======
+// Check if a user is part of a team
+.get("/checkteam", async ({ query: { TeamID, UserID }, error }) => {
+    if (!TeamID || !UserID) {
+        return error(400, "TeamID and UserID are required");
+    }
+
+    const teamMember = await prisma.userTeam.findFirst({
+        where: {
+            TeamID: TeamID,
+            UserID: UserID,
+        },
+    });
+
+    if (!teamMember) {
+        return error(404, "User is not part of the team");
+    }
+
+    return { valid: true };
+}, {
+    query: t.Object({
+        TeamID: t.Number(),
+        UserID: t.String(),
+    }),
+})
+
+// Other endpoints...
+// Get TeamID from TeamName
+.get("/getTeamID", async ({ query: { TeamName }, error }) => {
+    const team = await prisma.team.findFirst({
+        where: {
+            TeamName: TeamName,
+        },
+    });
+
+    if (!team) {
+        return error(404, "Team not found");
+    }
+
+    return {TeamID: team.TeamID};
+  }, {
+    query: t.Object({
+        TeamName: t.String(),
+    }),
+  })
+>>>>>>> 0c457d5157841e83fd2b56984d6e5332b4c37aeb
 .get("/finduserteam/:teamID", async ({ params, error }) => {
     const teamID = parseInt(params.teamID, 10); // Ensure teamID is a number
     if (isNaN(teamID)) {
diff --git a/src/controllers/userController.ts b/src/controllers/userController.ts
index 00f0188..39a795e 100644
--- a/src/controllers/userController.ts
+++ b/src/controllers/userController.ts
@@ -255,6 +255,27 @@ export const userController = new Elysia({ prefix: "/user" })
       return users; // Return all users with related skills and notifications
     })
 
+    
+    // Get user details from Username
+    .get("/getUserID/:UserID", async ({params,  error }) => {
+      const user = await prisma.user.findFirst({
+          where: {
+            UserID: params.UserID,
+          },
+      });
+    
+      if (!user) {
+          return error(404, "User not found");
+      }
+    
+      return { UserID : user.UserID , UserName : user.UserName};
+    }, {
+      params: t.Object({
+          UserID: t.String(),
+      }),
+    })
+    
+
   // Delete user profile
   .delete(
     "/:userID",
@@ -280,4 +301,10 @@ export const userController = new Elysia({ prefix: "/user" })
         userID: t.String(),
       }),
     }
-  );
\ No newline at end of file
+  );
+
+
+
+  // .get (
+  //   "/GetId", 
+  // )
\ No newline at end of file