From e2781bee559796821896fe751cf7f640e35b1b41 Mon Sep 17 00:00:00 2001
From: aryaramchander <aryaramchander7238@gmail.com>
Date: Fri, 26 May 2023 00:52:35 -0700
Subject: [PATCH 1/2] task #133 - calendar styling

---
 package.json                                      |  1 +
 src/components/pages/schedule/Schedule.jsx        |  2 +-
 .../pages/schedule/calendar/newCalendar.css       | 15 ++++++++++-----
 .../pages/schedule/calendar/newCalendar.jsx       |  2 ++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 825c2e2..0ebb79f 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "web-vitals": "^1.1.0"
   },
   "scripts": {
+    "dev": "nodemon index.js",
     "start": "react-scripts --openssl-legacy-provider start",
     "build": "react-scripts build",
     "test": "react-scripts test",
diff --git a/src/components/pages/schedule/Schedule.jsx b/src/components/pages/schedule/Schedule.jsx
index efea478..2403df4 100644
--- a/src/components/pages/schedule/Schedule.jsx
+++ b/src/components/pages/schedule/Schedule.jsx
@@ -23,7 +23,7 @@ export default function Schedule(props) {
         title: v.address,
         start: v.startTime,
         end: v.endTime,
-        backgroundColor: "#8FCBD4",
+        backgroundColor: "#108888",
         notes: v.notes,
         id: v.id,
       });
diff --git a/src/components/pages/schedule/calendar/newCalendar.css b/src/components/pages/schedule/calendar/newCalendar.css
index 4ee603b..ff341f9 100644
--- a/src/components/pages/schedule/calendar/newCalendar.css
+++ b/src/components/pages/schedule/calendar/newCalendar.css
@@ -1,6 +1,6 @@
 :root {
-    --fc-event-bg-color: #5DA6B1;
-    --fc-event-border-color: #8FCBD4;
+    --fc-event-bg-color: #43a4b3;
+    --fc-event-border-color: #80979a;
     --fc-event-text-color: #fff;
     --border-color: #4C4640;
 }
@@ -8,12 +8,13 @@
 #shift-calendar-box {
     display: flex;
     flex-direction: column;
+    align-content: center;
 }
 
 #extended-event-info {
     display: flex;
     flex-direction: column;
-    align-content: space-between;
+    align-content: center;
     justify-content: center;
     flex-wrap: wrap;
 }
@@ -29,6 +30,7 @@
     padding: 1vh;
     font-size: large;
     color: var(--fc-event-bg-color);
+    align-items: center;
 }
 
 #extended-info-container {
@@ -45,9 +47,9 @@
 
 #shift-calendar-box {
     display: flex;
-    flex-direction: row; 
+    flex-direction: column; 
     min-height: 100%;
-    font-family: Arial, Helvetica Neue, Helvetica, sans-serif;
+    font-family: sans-serif;
     font-size: 14px;
     margin: 1em 1em 1em 1em ;
 }
@@ -57,14 +59,17 @@
 }
 
 #shift-calendar {
+    font-family: sans-serif;
     width: 80%;
     padding: 3em 2em 3em 3em;
+    align-content: center;
 }
 
 .fc { /* the calendar root */
     max-width: 1100px;
     margin: 0 auto;
     font-size: 12px;
+    font-family: sans-serif;
 }
 
 h2 {
diff --git a/src/components/pages/schedule/calendar/newCalendar.jsx b/src/components/pages/schedule/calendar/newCalendar.jsx
index 1440492..936aeb0 100644
--- a/src/components/pages/schedule/calendar/newCalendar.jsx
+++ b/src/components/pages/schedule/calendar/newCalendar.jsx
@@ -77,6 +77,7 @@ export default function NewCalendar() {
   const expandedCalendar = (
     <FullCalendar
       id="expanded-shift-calendar"
+      className=".fc-agendaWeek-view"
       plugins={[timeGridPlugin, interactionPlugin]}
       headerToolbar={{
         left: "prev,next today",
@@ -92,6 +93,7 @@ export default function NewCalendar() {
       displayEventEnd
       eventMouseEnter={(info) => handleMouseEnter(info)}
       eventMouseLeave={(info) => handleMouseLeave(info)}
+      allDaySlot={false}
     />
   );
 

From 9a25c46c8339a7807df7241b6e3a94cb7e419b52 Mon Sep 17 00:00:00 2001
From: Ben McMann <bbmcmann@volosys.com>
Date: Wed, 31 May 2023 18:24:19 -0700
Subject: [PATCH 2/2] fix: minor style bug

---
 src/components/pages/schedule/calendar/newCalendar.css | 6 +++---
 src/components/pages/schedule/calendar/newCalendar.jsx | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/pages/schedule/calendar/newCalendar.css b/src/components/pages/schedule/calendar/newCalendar.css
index c091ccc..ddcf514 100644
--- a/src/components/pages/schedule/calendar/newCalendar.css
+++ b/src/components/pages/schedule/calendar/newCalendar.css
@@ -8,7 +8,7 @@
 #shift-calendar-box {
     display: flex;
     flex-direction: column;
-    align-content: center;
+    /* padding-left: 100px; */
 }
 
 #extended-event-info {
@@ -59,10 +59,10 @@
 }
 
 #shift-calendar {
+    width: 95%;
     font-family: sans-serif;
-    width: 80%;
     padding: 3em 2em 3em 3em;
-    align-content: center;
+    align-self: center;
 }
 
 .fc { /* the calendar root */
diff --git a/src/components/pages/schedule/calendar/newCalendar.jsx b/src/components/pages/schedule/calendar/newCalendar.jsx
index 21d1124..1f24bea 100644
--- a/src/components/pages/schedule/calendar/newCalendar.jsx
+++ b/src/components/pages/schedule/calendar/newCalendar.jsx
@@ -210,6 +210,7 @@ export default function NewCalendar() {
       events={eventData}
       eventMaxStack={3}
       displayEventEnd
+      allDaySlot={false}
       select={(info) => handleSelection(info)}
       eventClick={(info) => handleClick(info)}
     />