Changed folder structure; all Calendar logic now in src/Calendar

src/Calendar/EventGrouping/DayGrouping.ts

@@ -1,5 +1,5 @@
 import EventGrouping from "./EventGrouping";
-import { Event, Groups } from "../types";
+import { Event, Groups } from "../../types";
 import {
   add,
   differenceInCalendarDays,

src/Calendar/EventGrouping/EventGrouping.ts

@@ -1,4 +1,4 @@
-import { Event, Groups } from "../types";
+import { Event, Groups } from "../../types";
 
 export default abstract class EventGrouping {
   protected readonly sortedEvents: Event[];

src/Calendar/EventGrouping/MonthGrouping.ts

@@ -1,5 +1,5 @@
 import EventGrouping from "./EventGrouping";
-import { Event, Groups } from "../types";
+import { Event, Groups } from "../../types";
 import {
   add,
   differenceInCalendarMonths,

src/Calendar/EventGrouping/WeekGrouping.ts

@@ -1,5 +1,5 @@
 import EventGrouping from "./EventGrouping";
-import { Event, Groups } from "../types";
+import { Event, Groups } from "../../types";
 import {
   add,
   differenceInCalendarWeeks,

src/Calendar/EventGrouping/YearGrouping.ts

@@ -1,5 +1,5 @@
 import EventGrouping from "./EventGrouping";
-import { Event, Groups } from "../types";
+import { Event, Groups } from "../../types";
 import {
   add,
   differenceInCalendarYears,

src/Calendar/Events/Event.ts

@@ -1,4 +1,4 @@
-import { Event as EventType } from "../types";
+import { Event as EventType } from "../../types";
 
 export default class Event implements EventType {
   date: Date;

src/Calendar/HtmlRenderer/Abstract/GroupRenderer.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
+import { Event } from "../../../types";
-import { generateRandomColor } from "../../utilities";
+import { generateRandomColor } from "../../../utilities";
 
 export default abstract class GroupRenderer {
   protected container: HTMLDivElement;

src/Calendar/HtmlRenderer/Abstract/Renderer.ts

@@ -1,5 +1,5 @@
 import EventGrouping from "../../EventGrouping/EventGrouping";
-import { Event } from "../../types";
+import { Event } from "../../../types";
 
 export default abstract class Renderer {
   protected abstract renderGroups(

src/Calendar/HtmlRenderer/Day/GroupDayRenderer.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
+import { Event } from "../../../types";
-import { DayGrouping } from "../../EventGrouping";
+import DayGrouping from "../../EventGrouping/DayGrouping";
 
 import GroupRenderer from "../Abstract/GroupRenderer";
 

src/Calendar/HtmlRenderer/Day/index.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
+import { Event } from "../../../types";
-import { DayGrouping } from "../../EventGrouping";
+import DayGrouping from "../../EventGrouping/DayGrouping";
 import Renderer from "../Abstract/Renderer";
 import GroupDayRenderer from "./GroupDayRenderer";
 

src/Calendar/HtmlRenderer/Month/GroupMonthRenderer.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
+import { Event } from "../../../types";
-import { MonthGrouping } from "../../EventGrouping";
+import MonthGrouping from "../../EventGrouping/MonthGrouping";
 
 import GroupRenderer from "../Abstract/GroupRenderer";
 

src/Calendar/HtmlRenderer/Month/index.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
+import { Event } from "../../../types";
-import { MonthGrouping } from "../../EventGrouping";
+import MonthGrouping from "../../EventGrouping/MonthGrouping";
 import Renderer from "../Abstract/Renderer";
 import GroupMonthRenderer from "./GroupMonthRenderer";
 

src/Calendar/HtmlRenderer/Week/GroupWeekRenderer.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
+import { Event } from "../../../types";
-import { WeekGrouping } from "../../EventGrouping";
+import WeekGrouping from "../../EventGrouping/WeekGrouping";
 
 import GroupRenderer from "../Abstract/GroupRenderer";
 

src/Calendar/HtmlRenderer/Week/index.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
+import { Event } from "../../../types";
-import { WeekGrouping } from "../../EventGrouping";
+import WeekGrouping from "../../EventGrouping/WeekGrouping";
 import Renderer from "../Abstract/Renderer";
 import GroupWeekRenderer from "./GroupWeekRenderer";
 

src/Calendar/HtmlRenderer/Year/GroupYearRenderer.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
+import { Event } from "../../../types";
-import { YearGrouping } from "../../EventGrouping";
+import YearGrouping from "../../EventGrouping/YearGrouping";
 
 import GroupRenderer from "../Abstract/GroupRenderer";
 

src/Calendar/HtmlRenderer/Year/index.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
+import { Event } from "../../../types";
-import { YearGrouping } from "../../EventGrouping";
+import YearGrouping from "../../EventGrouping/YearGrouping";
 import Renderer from "../Abstract/Renderer";
 import GroupYearRenderer from "./GroupYearRenderer";
 

src/Calendar/index.ts

@@ -1,17 +1,13 @@
 import { GroupTypes } from "../types";
-import Events from "../Events/";
+import Events from "./Events/";
-import {
+import DayGrouping from "./EventGrouping/DayGrouping";
-  DayGrouping,
+import MonthGrouping from "./EventGrouping/MonthGrouping";
-  MonthGrouping,
+import WeekGrouping from "./EventGrouping/MonthGrouping";
-  WeekGrouping,
+import YearGrouping from "./EventGrouping/YearGrouping";
-  YearGrouping,
+import DayRenderer from "./HtmlRenderer/Day";
-} from "../EventGrouping";
+import MonthRenderer from "./HtmlRenderer/Month";
-import {
+import WeekRenderer from "./HtmlRenderer/Week";
-  DayRenderer,
+import YearRenderer from "./HtmlRenderer/Year";
-  MonthRenderer,
-  WeekRenderer,
-  YearRenderer,
-} from "../HtmlRenderer";
 
 export default class Calendar {
   public readonly jsonContent: object;

src/Calendar/tests/EventGrouping/DayGrouping.test.ts

@@ -1,5 +1,5 @@
-const { GroupTypes } = require("../../types");
+const { GroupTypes } = require("../../../types");
-const DayGrouping = require("../DayGrouping").default;
+const DayGrouping = require("../../EventGrouping/DayGrouping").default;
 const mockSortedEvents = require("./mockSortedEvents").default;
 
 describe("groupEventsByDay should", () => {

src/Calendar/tests/EventGrouping/MonthGrouping.test.ts

@@ -1,5 +1,5 @@
-const { GroupTypes } = require("../../types");
+const { GroupTypes } = require("../../../types");
-const MonthGrouping = require("../MonthGrouping").default;
+const MonthGrouping = require("../../EventGrouping/MonthGrouping").default;
 const mockSortedEvents = require("./mockSortedEvents").default;
 
 describe("groupEventsByMonth should", () => {

src/Calendar/tests/EventGrouping/WeekGrouping.test.ts

@@ -1,5 +1,5 @@
-const { GroupTypes } = require("../../types");
+const { GroupTypes } = require("../../../types");
-const WeekGrouping = require("../WeekGrouping").default;
+const WeekGrouping = require("../../EventGrouping/WeekGrouping").default;
 const mockSortedEvents = require("./mockSortedEvents").default;
 
 describe("groupEventsByWeek should", () => {

src/Calendar/tests/Events/index.test.ts

@@ -1,4 +1,4 @@
-const Events = require("./index").default;
+const Events = require("../../Events").default;
 
 const mockEventsAllValid = [
   {

src/EventGrouping/index.ts

@@ -1,6 +0,0 @@
-import DayGrouping from "./DayGrouping";
-import WeekGrouping from "./WeekGrouping";
-import MonthGrouping from "./MonthGrouping";
-import YearGrouping from "./YearGrouping";
-
-export { DayGrouping, WeekGrouping, MonthGrouping, YearGrouping };

src/HtmlRenderer/index.ts

@@ -1,6 +0,0 @@
-import DayRenderer from "./Day";
-import WeekRenderer from "./Week";
-import MonthRenderer from "./Month";
-import YearRenderer from "./Year";
-
-export { DayRenderer, WeekRenderer, MonthRenderer, YearRenderer };