Merge branch 'dev' into 'eventDetail'

# Conflicts:
#   src/components/homePage/calendar.jsx
#   src/components/homePage/eventList.jsx

src/pages/Home/HomePage.jsx

@@ -1,15 +1,26 @@
 import styles from "./HomePage.module.css";
 import Calendar from "../../components/homePage/calendar.jsx";
 import EventList from "../../components/homePage/eventList.jsx";
+import { useState, useEffect } from "react";
+import getAllEvents from "../../utils/event/getAllEvents.js";
 
 function HomePage() {
+
+    const [events, setEvents] = useState([]);
+
+    useEffect(() => {
+        (async () => {
+            const data = await getAllEvents();
+            setEvents(data.data);
+        }) ()
+    }, [])
+
     return (
         <div className={styles.allContent}>
-            <Calendar />
-
-            <EventList />
+            <Calendar events={events} />
+            <EventList events={events} />
         </div>
     );
 }
 
-export default HomePage;
+export default HomePage;