diff --git a/client/src/App.js b/client/src/App.js
index 14ff072..e5244c2 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -3,7 +3,7 @@ import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
import { Home, Board, Sponsors, Resources, Test, ResumeBook } from "./pages";
import { Footer, Navigation } from "./molecules";
import ProgressBar from "react-scroll-progress-bar";
-import Calendar from "./atoms/CalendarSlots/Calendar";
+import Calendar from "./molecules/Calendar/Calendar";
function App() {
return (
diff --git a/client/src/atoms/CalendarSlots/Calendar.css b/client/src/atoms/CalendarSlots/Calendar.css
index ea9934c..33b6075 100644
--- a/client/src/atoms/CalendarSlots/Calendar.css
+++ b/client/src/atoms/CalendarSlots/Calendar.css
@@ -1,20 +1,7 @@
-.slot_container{
- width: 450px;
- display: flex;
- flex-direction: column;
- gap: 5px;
- align-items: center;
- justify-content: center;
-}
.slot{
+ width: 450px;
display: flex;
gap: 40px;
+ padding-left: 10%;
}
-
-.line{
- display: block;
- width: 100%;
- height: 1px;
- background-color: black;
-}
\ No newline at end of file
diff --git a/client/src/atoms/CalendarSlots/Calendar.jsx b/client/src/atoms/CalendarSlots/Calendar.jsx
index 7c4baed..aabe66e 100644
--- a/client/src/atoms/CalendarSlots/Calendar.jsx
+++ b/client/src/atoms/CalendarSlots/Calendar.jsx
@@ -5,12 +5,9 @@ const Calendar = ({ date, event }) => {
let dummyDate = "3/20/2024";
let dummyEvent = "Research Night @ Gates G01";
return (
-
-
-
{date? date: dummyDate}
-
{event? event: dummyEvent}
-
-
+
+
{date ? date : dummyDate}
+
{event ? event : dummyEvent}
)
}
diff --git a/client/src/molecules/Calendar/Calendar.css b/client/src/molecules/Calendar/Calendar.css
new file mode 100644
index 0000000..3a71981
--- /dev/null
+++ b/client/src/molecules/Calendar/Calendar.css
@@ -0,0 +1,24 @@
+.calendar_container{
+ width: 450px;
+ display: flex;
+ flex-direction: column;
+ gap: 5px;
+ align-items: center;
+ justify-content: center;
+}
+
+.line{
+ display: block;
+ width: 100%;
+ height: 1.2px;
+ background-color: grey;
+}
+
+.title{
+ padding-bottom: 32px;
+ width: 65%;
+}
+
+.title h2{
+ padding-bottom: 0;
+}
diff --git a/client/src/molecules/Calendar/Calendar.jsx b/client/src/molecules/Calendar/Calendar.jsx
new file mode 100644
index 0000000..99d8e91
--- /dev/null
+++ b/client/src/molecules/Calendar/Calendar.jsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import CalendarAtom from '../../atoms/CalendarSlots/Calendar'
+import './Calendar.css'
+
+const Calendar = () => {
+
+ const line =
+ return (
+
+
+
Upcoming Events
+ {line}
+
+
+ {line}
+
+
+ )
+}
+
+export default Calendar
\ No newline at end of file