Move MonthEvent to types file

uwblueprint · Mar 24, 2022 · fe11518 · fe11518
1 parent acf4a64
commit fe11518
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/frontend/src/components/admin/ShiftCalendar/MonthlyViewReadOnlyShiftCalendar.tsx b/frontend/src/components/admin/ShiftCalendar/MonthlyViewReadOnlyShiftCalendar.tsx
@@ -7,7 +7,7 @@ import FullCalendar, {
 import dayGridPlugin from "@fullcalendar/daygrid";
 import { Box } from "@chakra-ui/react";
 
-import { Event } from "../../../types/CalendarTypes";
+import { Event, MonthEvent } from "../../../types/CalendarTypes";
 import colors from "../../../theme/colors";
 import "./Calendar.css";
 
@@ -68,17 +68,13 @@ export const ADMIN_SHIFT_CALENDAR_TEST_EVENTS: MonthEvent[] = [
   },
 ];
 
-export type MonthEvent = Event & {
-  groupId: string;
-};
-
 // Events can be passed in any order (does not have to be sorted).
 // AdminShiftCalendar assumes that all events are in the same month.
 type AdminShiftCalendarProps = {
   events: Event[];
 };
 
-const MonthlyViewReadOnlyShiftCalendar = ({
+const MonthlyViewShiftCalendar = ({
   events,
 }: AdminShiftCalendarProps): React.ReactElement => {
   const displayCustomEvent = (content: EventContentArg) => {
@@ -135,4 +131,4 @@ const MonthlyViewReadOnlyShiftCalendar = ({
   );
 };
 
-export default MonthlyViewReadOnlyShiftCalendar;
+export default MonthlyViewShiftCalendar;
diff --git a/frontend/src/components/admin/ShiftCalendar/WeekViewShiftCalendar.tsx b/frontend/src/components/admin/ShiftCalendar/WeekViewShiftCalendar.tsx
@@ -20,7 +20,7 @@ import {
 } from "@chakra-ui/react";
 import colors from "../../../theme/colors";
 import { Event } from "../../../types/CalendarTypes";
-import "./ShiftCalendar.css";
+import "./Calendar.css";
 import { getTime, getWeekday } from "../../../utils/DateTimeUtils";
 
 type ShiftCalendarProps = {

diff --git a/frontend/src/components/pages/Default.tsx b/frontend/src/components/pages/Default.tsx
@@ -16,9 +16,9 @@ import RefreshCredentials from "../auth/RefreshCredentials";
 
 import * as Routes from "../../constants/Routes";
 import SampleContext from "../../contexts/SampleContext";
-import AdminShiftCalendar, {
+import MonthlyViewShiftCalendar, {
   ADMIN_SHIFT_CALENDAR_TEST_EVENTS,
-} from "../admin/schedule/AdminShiftCalendar";
+} from "../admin/ShiftCalendar/MonthlyViewReadOnlyShiftCalendar";
 
 type ButtonProps = { text: string; path: string };
 
@@ -187,7 +187,7 @@ const Default = (): React.ReactElement => {
       </div>
       <div style={{ height: "2rem" }} />
       <Container maxW="container.xl">
-        <AdminShiftCalendar events={ADMIN_SHIFT_CALENDAR_TEST_EVENTS} />
+        <MonthlyViewShiftCalendar events={ADMIN_SHIFT_CALENDAR_TEST_EVENTS} />
       </Container>
       <TeamInfoDisplay />
       <DesignSystemDisplay />

diff --git a/frontend/src/types/CalendarTypes.ts b/frontend/src/types/CalendarTypes.ts
@@ -3,3 +3,7 @@ export type Event = {
   start: Date;
   end: Date;
 };
+
+export type MonthEvent = Event & {
+  groupId: string;
+};