Merge pull request #141 from harshitap1305/fix-bugs-and-redesign

Fix bugs and redesign

Author: harshitap1305

backend/routes/skillsRoutes.js

@@ -94,8 +94,14 @@ router.get("/user-skills/:userId",isAuthenticated, async (req, res) => {
   const userId = req.params.userId;
   try {
     const userSkills = await UserSkill.find({ user_id: userId })
-      .populate("skill_id", "name")
-      .populate("position_id", "title");
+      .populate("skill_id")
+      .populate({
+        path: "position_id",
+        populate: {
+          path: "unit_id",
+          select: "name",
+        },
+      });
     res.json(userSkills);
   } catch (err) {
     console.error("Failed to get user skills:", err);

frontend/src/Components/Events/EventList.jsx

@@ -28,7 +28,7 @@ const EventList = () => {
 
   useEffect(() => {
     const fetchEvents = async () => {
-      if (!userRole) return;
+      if (!userRole) {return;}
 
       try {
         setLoading(true);
@@ -330,8 +330,8 @@ const EventList = () => {
 
       {/* EventForm modal for editing */}
       {editingEvent && (
-        <div className="fixed inset-0 bg-black bg-opacity-50 flex justify-center items-start pt-10 z-50">
-          <div className="bg-white rounded-xl w-full max-w-4xl p-4 relative">
+        <div className="fixed inset-0 bg-black bg-opacity-50 flex justify-center items-start pt-10 z-50 overflow-y-auto">
+          <div className="bg-white rounded-xl w-full max-w-4xl p-4 relative my-8">
             <button
               className="absolute top-2 right-2 text-gray-700 font-bold"
               onClick={() => setEditingEvent(null)}

frontend/src/Components/Events/RoomRequest.jsx

@@ -142,7 +142,7 @@ const RoomRequestModal = ({ eventId, onClose, onSubmit }) => {
             <button
               type="submit"
               disabled={submitting}
-              className="px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 transition-colors disabled:bg-blue-300 disabled:cursor-not-allowed"
+              className="px-4 py-2 bg-stone-700 text-white rounded-md hover:bg-stone-800 transition-colors disabled:bg-blue-300 disabled:cursor-not-allowed"
             >
               {submitting ? "Submitting..." : "Submit Request"}
             </button>