Merge pull request #197 from UtkarshUmap/main

Add calendar to DashBoard

Author: harshitap1305

frontend/package-lock.json

@@ -23,6 +23,7 @@
     "jwt-decode": "^3.1.2",
     "lucide-react": "^0.477.0",
     "react": "^18.2.0",
+    "react-calendar": "^6.0.0",
     "react-chartjs-2": "^5.3.0",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.5.2",

frontend/package.json

@@ -184,6 +184,12 @@ const initialFormState = {
   },
 };
 
+const getDateFromISO = (iso) =>
+  iso ? new Date(iso).toISOString().slice(0, 10) : "";
+
+const getTimeFromISO = (iso) =>
+  iso ? new Date(iso).toISOString().slice(11, 16) : "";
+
 const EventForm = ({ addEvent, setAddEvent, event = null, onClose }) => {
   const [units, setUnits] = useState([]);
   const [users, setUsers] = useState([]);
@@ -197,20 +203,12 @@ const EventForm = ({ addEvent, setAddEvent, event = null, onClose }) => {
     organizers: event?.organizers?.map((o) => o._id) || [],
     schedule: {
       date: {
-        start: event
-          ? new Date(event.schedule.start).toISOString().slice(0, 10)
-          : "",
-        end: event
-          ? new Date(event.schedule.end).toISOString().slice(0, 10)
-          : "",
+        start: event ? getDateFromISO(event.schedule.start) : "",
+        end: event ? getDateFromISO(event.schedule.end) : "",
       },
       time: {
-        start: event
-          ? new Date(event.schedule.start).toTimeString().slice(0, 5)
-          : "",
-        end: event
-          ? new Date(event.schedule.end).toTimeString().slice(0, 5)
-          : "",
+        start: event ? getTimeFromISO(event.schedule.start) : "",
+        end: event ? getTimeFromISO(event.schedule.end) : "",
       },
       venue: event?.schedule?.venue || "",
       mode: event?.schedule?.mode || "",
@@ -219,18 +217,18 @@ const EventForm = ({ addEvent, setAddEvent, event = null, onClose }) => {
       required: event?.registration?.required || false,
       date: {
         start: event?.registration?.start
-          ? new Date(event.registration.start).toISOString().slice(0, 10)
+          ? getDateFromISO(event.registration.start)
           : "",
         end: event?.registration?.end
-          ? new Date(event.registration.end).toISOString().slice(0, 10)
+          ? getDateFromISO(event.registration.end)
           : "",
       },
       time: {
         start: event?.registration?.start
-          ? new Date(event.registration.start).toTimeString().slice(0, 5)
+          ? getTimeFromISO(event.registration.start)
           : "",
         end: event?.registration?.end
-          ? new Date(event.registration.end).toTimeString().slice(0, 5)
+          ? getTimeFromISO(event.registration.end)
           : "",
       },
       fees: event?.registration?.fees || "",
@@ -322,10 +320,15 @@ const EventForm = ({ addEvent, setAddEvent, event = null, onClose }) => {
     }));
   };
 
+  const combineDateTime = (dateStr, timeStr, isEnd = false) => {
+    if (!dateStr) return null;
+    const defaultTime = isEnd ? "23:59" : "00:00";
+    const time = timeStr && timeStr !== "" ? timeStr : defaultTime;
+    return new Date(`${dateStr}T${time}:00`).toISOString();
+  };
+
   const handleSubmit = async (e) => {
     e.preventDefault();
-    const combineDateTime = (dateStr, timeStr) =>
-      new Date(`${dateStr}T${timeStr}`);
     const finalPayload = {
       ...formData,
       schedule: {
@@ -337,6 +340,7 @@ const EventForm = ({ addEvent, setAddEvent, event = null, onClose }) => {
         end: combineDateTime(
           formData.schedule.date.end,
           formData.schedule.time.end,
+          true,
         ),
       },
       registration: formData.registration.required
@@ -349,6 +353,7 @@ const EventForm = ({ addEvent, setAddEvent, event = null, onClose }) => {
             end: combineDateTime(
               formData.registration.date.end,
               formData.registration.time.end,
+              true,
             ),
           }
         : { required: false },
@@ -438,6 +443,7 @@ const EventForm = ({ addEvent, setAddEvent, event = null, onClose }) => {
             />
           </div>
 
+
           <div className="grid grid-cols-2 gap-4">
             <div>
               <label className={labelStyles}>Category</label>
@@ -460,6 +466,7 @@ const EventForm = ({ addEvent, setAddEvent, event = null, onClose }) => {
             </div>
             <div>
               <label className={labelStyles}>Type</label>
+
               <input
                 name="type"
                 value={formData.type}