From 842a3fdcca634978bc7a8c8d17c822b7181bdfd9 Mon Sep 17 00:00:00 2001 From: Franco Speziali Date: Mon, 25 Apr 2022 17:23:01 +0200 Subject: [PATCH] Refactored HtmlRenderer - re-organised folder structure --- .../{GroupRenderer => Abstract}/GroupRenderer.ts | 0 src/HtmlRenderer/{ => Abstract}/Renderer.ts | 4 ++-- .../{GroupRenderer => Day}/GroupDayRenderer.ts | 2 +- src/HtmlRenderer/{DayRenderer.ts => Day/index.ts} | 8 ++++---- .../{GroupRenderer => Month}/GroupMonthRenderer.ts | 2 +- .../{MonthRenderer.ts => Month/index.ts} | 12 +++++------- .../{GroupRenderer => Week}/GroupWeekRenderer.ts | 2 +- src/HtmlRenderer/{WeekRenderer.ts => Week/index.ts} | 8 ++++---- src/HtmlRenderer/index.ts | 6 +++--- 9 files changed, 21 insertions(+), 23 deletions(-) rename src/HtmlRenderer/{GroupRenderer => Abstract}/GroupRenderer.ts (100%) rename src/HtmlRenderer/{ => Abstract}/Renderer.ts (89%) rename src/HtmlRenderer/{GroupRenderer => Day}/GroupDayRenderer.ts (93%) rename src/HtmlRenderer/{DayRenderer.ts => Day/index.ts} (66%) rename src/HtmlRenderer/{GroupRenderer => Month}/GroupMonthRenderer.ts (94%) rename src/HtmlRenderer/{MonthRenderer.ts => Month/index.ts} (50%) rename src/HtmlRenderer/{GroupRenderer => Week}/GroupWeekRenderer.ts (94%) rename src/HtmlRenderer/{WeekRenderer.ts => Week/index.ts} (66%) diff --git a/src/HtmlRenderer/GroupRenderer/GroupRenderer.ts b/src/HtmlRenderer/Abstract/GroupRenderer.ts similarity index 100% rename from src/HtmlRenderer/GroupRenderer/GroupRenderer.ts rename to src/HtmlRenderer/Abstract/GroupRenderer.ts diff --git a/src/HtmlRenderer/Renderer.ts b/src/HtmlRenderer/Abstract/Renderer.ts similarity index 89% rename from src/HtmlRenderer/Renderer.ts rename to src/HtmlRenderer/Abstract/Renderer.ts index dfc6a69..5cbfc28 100644 --- a/src/HtmlRenderer/Renderer.ts +++ b/src/HtmlRenderer/Abstract/Renderer.ts @@ -1,5 +1,5 @@ -import EventGrouping from "../EventGrouping/EventGrouping"; -import { Event } from "../types"; +import EventGrouping from "../../EventGrouping/EventGrouping"; +import { Event } from "../../types"; export default abstract class Renderer { protected abstract renderGroups( diff --git a/src/HtmlRenderer/GroupRenderer/GroupDayRenderer.ts b/src/HtmlRenderer/Day/GroupDayRenderer.ts similarity index 93% rename from src/HtmlRenderer/GroupRenderer/GroupDayRenderer.ts rename to src/HtmlRenderer/Day/GroupDayRenderer.ts index 8ffe374..1044339 100644 --- a/src/HtmlRenderer/GroupRenderer/GroupDayRenderer.ts +++ b/src/HtmlRenderer/Day/GroupDayRenderer.ts @@ -1,7 +1,7 @@ import { Event } from "../../types"; import { DayGrouping } from "../../EventGrouping"; -import GroupRenderer from "./GroupRenderer"; +import GroupRenderer from "../Abstract/GroupRenderer"; export default class GroupDayRenderer extends GroupRenderer { constructor(group: Event[], groupDate: Date, groupIndex: number) { diff --git a/src/HtmlRenderer/DayRenderer.ts b/src/HtmlRenderer/Day/index.ts similarity index 66% rename from src/HtmlRenderer/DayRenderer.ts rename to src/HtmlRenderer/Day/index.ts index bf1e180..91b6069 100644 --- a/src/HtmlRenderer/DayRenderer.ts +++ b/src/HtmlRenderer/Day/index.ts @@ -1,7 +1,7 @@ -import { Event } from "../types"; -import { DayGrouping } from "../EventGrouping"; -import Renderer from "./Renderer"; -import GroupDayRenderer from "./GroupRenderer/GroupDayRenderer"; +import { Event } from "../../types"; +import { DayGrouping } from "../../EventGrouping"; +import Renderer from "../Abstract/Renderer"; +import GroupDayRenderer from "./GroupDayRenderer"; export default class DayRenderer extends Renderer { constructor(eventGrouping: DayGrouping) { diff --git a/src/HtmlRenderer/GroupRenderer/GroupMonthRenderer.ts b/src/HtmlRenderer/Month/GroupMonthRenderer.ts similarity index 94% rename from src/HtmlRenderer/GroupRenderer/GroupMonthRenderer.ts rename to src/HtmlRenderer/Month/GroupMonthRenderer.ts index 9167211..1aa0c5e 100644 --- a/src/HtmlRenderer/GroupRenderer/GroupMonthRenderer.ts +++ b/src/HtmlRenderer/Month/GroupMonthRenderer.ts @@ -1,7 +1,7 @@ import { Event } from "../../types"; import { MonthGrouping } from "../../EventGrouping"; -import GroupRenderer from "./GroupRenderer"; +import GroupRenderer from "../Abstract/GroupRenderer"; export default class GroupMonthRenderer extends GroupRenderer { constructor(group: Event[], groupDate: Date, groupIndex: number) { diff --git a/src/HtmlRenderer/MonthRenderer.ts b/src/HtmlRenderer/Month/index.ts similarity index 50% rename from src/HtmlRenderer/MonthRenderer.ts rename to src/HtmlRenderer/Month/index.ts index 6af3334..75d0006 100644 --- a/src/HtmlRenderer/MonthRenderer.ts +++ b/src/HtmlRenderer/Month/index.ts @@ -1,7 +1,7 @@ -import { Event } from "../types"; -import { MonthGrouping } from "../EventGrouping"; -import Renderer from "./Renderer"; -import GroupMonthRenderer from "./GroupRenderer/GroupMonthRenderer"; +import { Event } from "../../types"; +import { MonthGrouping } from "../../EventGrouping"; +import Renderer from "../Abstract/Renderer"; +import GroupMonthRenderer from "./GroupMonthRenderer"; export default class MonthRenderer extends Renderer { constructor(eventGrouping: MonthGrouping) { @@ -14,8 +14,6 @@ export default class MonthRenderer extends Renderer { groupDate: Date, groupIndex: number ): HTMLDivElement { - const monthGroup = new GroupMonthRenderer(group, groupDate, groupIndex); - - return monthGroup.render(); + return new GroupMonthRenderer(group, groupDate, groupIndex).render(); } } diff --git a/src/HtmlRenderer/GroupRenderer/GroupWeekRenderer.ts b/src/HtmlRenderer/Week/GroupWeekRenderer.ts similarity index 94% rename from src/HtmlRenderer/GroupRenderer/GroupWeekRenderer.ts rename to src/HtmlRenderer/Week/GroupWeekRenderer.ts index 523890f..51d5c24 100644 --- a/src/HtmlRenderer/GroupRenderer/GroupWeekRenderer.ts +++ b/src/HtmlRenderer/Week/GroupWeekRenderer.ts @@ -1,7 +1,7 @@ import { Event } from "../../types"; import { WeekGrouping } from "../../EventGrouping"; -import GroupRenderer from "./GroupRenderer"; +import GroupRenderer from "../Abstract/GroupRenderer"; export default class GroupWeekRenderer extends GroupRenderer { constructor(group: Event[], groupDate: Date, groupIndex: number) { diff --git a/src/HtmlRenderer/WeekRenderer.ts b/src/HtmlRenderer/Week/index.ts similarity index 66% rename from src/HtmlRenderer/WeekRenderer.ts rename to src/HtmlRenderer/Week/index.ts index ddae6c5..df56f1a 100644 --- a/src/HtmlRenderer/WeekRenderer.ts +++ b/src/HtmlRenderer/Week/index.ts @@ -1,7 +1,7 @@ -import { Event } from "../types"; -import { WeekGrouping } from "../EventGrouping"; -import Renderer from "./Renderer"; -import GroupWeekRenderer from "./GroupRenderer/GroupWeekRenderer"; +import { Event } from "../../types"; +import { WeekGrouping } from "../../EventGrouping"; +import Renderer from "../Abstract/Renderer"; +import GroupWeekRenderer from "./GroupWeekRenderer"; export default class WeekRenderer extends Renderer { constructor(eventGrouping: WeekGrouping) { diff --git a/src/HtmlRenderer/index.ts b/src/HtmlRenderer/index.ts index 7debdb0..ceff40f 100644 --- a/src/HtmlRenderer/index.ts +++ b/src/HtmlRenderer/index.ts @@ -1,5 +1,5 @@ -import DayRenderer from "./DayRenderer"; -import WeekRenderer from "./WeekRenderer"; -import MonthRenderer from "./MonthRenderer"; +import DayRenderer from "./Day/"; +import WeekRenderer from "./Week/"; +import MonthRenderer from "./Month/"; export { DayRenderer, WeekRenderer, MonthRenderer };