From f603a9947c60692310b68e4bdeb438b3e58569bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <jmm@yavook.de>
Date: Thu, 7 Sep 2023 02:08:56 +0000
Subject: [PATCH] refactoring (moving stuff around)

---
 ui/src/App.vue                                |  3 --
 ui/src/components/Calendar.vue                |  8 +--
 ui/src/components/DoorMapEditor.vue           |  6 +--
 .../{ => calendar}/CalendarDoor.vue           |  4 +-
 .../components/{ => calendar}/MultiModal.vue  |  0
 .../{rects => calendar}/SVGRect.vue           |  2 +-
 .../{rects => calendar}/ThouCanvas.vue        |  2 +-
 .../editor}/DoorChooser.vue                   |  4 +-
 .../editor}/DoorPlacer.vue                    |  5 +-
 .../editor}/PreviewDoor.vue                   |  4 +-
 .../editor}/RectangleCanvas.vue               |  8 +--
 .../door_map/calendar.ts => lib/door.ts}      |  2 +-
 .../rects/rectangles.ts => lib/rectangle.ts}  | 26 +---------
 ui/src/lib/vector2d.ts                        | 25 +++++++++
 ui/tests/unit/rectangle.spec.ts               | 52 +++----------------
 ui/tests/unit/vector2d.spec.ts                | 41 +++++++++++++++
 16 files changed, 99 insertions(+), 93 deletions(-)
 rename ui/src/components/{ => calendar}/CalendarDoor.vue (91%)
 rename ui/src/components/{ => calendar}/MultiModal.vue (100%)
 rename ui/src/components/{rects => calendar}/SVGRect.vue (93%)
 rename ui/src/components/{rects => calendar}/ThouCanvas.vue (97%)
 rename ui/src/components/{door_map => calendar/editor}/DoorChooser.vue (92%)
 rename ui/src/components/{door_map => calendar/editor}/DoorPlacer.vue (95%)
 rename ui/src/components/{door_map => calendar/editor}/PreviewDoor.vue (97%)
 rename ui/src/components/{door_map => calendar/editor}/RectangleCanvas.vue (94%)
 rename ui/src/{components/door_map/calendar.ts => lib/door.ts} (90%)
 rename ui/src/{components/rects/rectangles.ts => lib/rectangle.ts} (74%)
 create mode 100644 ui/src/lib/vector2d.ts
 create mode 100644 ui/tests/unit/vector2d.spec.ts

diff --git a/ui/src/App.vue b/ui/src/App.vue
index aefb128..d1ba774 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -24,13 +24,11 @@ import { Options, Vue } from "vue-class-component";
 
 import DoorMapEditor from "./components/DoorMapEditor.vue";
 import LoginModal from "./components/LoginModal.vue";
-import MultiModal from "./components/MultiModal.vue";
 
 @Options({
   components: {
     DoorMapEditor,
     LoginModal,
-    MultiModal,
   },
 })
 export default class extends Vue {
@@ -39,7 +37,6 @@ export default class extends Vue {
 
   declare $refs: {
     login_modal: LoginModal;
-    multi_modal: MultiModal;
   };
 
   public mounted() {
diff --git a/ui/src/components/Calendar.vue b/ui/src/components/Calendar.vue
index 07a9b0a..ad96c3e 100644
--- a/ui/src/components/Calendar.vue
+++ b/ui/src/components/Calendar.vue
@@ -19,12 +19,12 @@
 </template>
 
 <script lang="ts">
+import { Door } from "@/lib/door";
 import { Options, Vue } from "vue-class-component";
-import { Door } from "./door_map/calendar";
 
-import CalendarDoor from "./CalendarDoor.vue";
-import MultiModal from "./MultiModal.vue";
-import ThouCanvas from "./rects/ThouCanvas.vue";
+import CalendarDoor from "./calendar/CalendarDoor.vue";
+import MultiModal from "./calendar/MultiModal.vue";
+import ThouCanvas from "./calendar/ThouCanvas.vue";
 
 @Options({
   components: {
diff --git a/ui/src/components/DoorMapEditor.vue b/ui/src/components/DoorMapEditor.vue
index 2f3c0f8..3b608e7 100644
--- a/ui/src/components/DoorMapEditor.vue
+++ b/ui/src/components/DoorMapEditor.vue
@@ -11,13 +11,13 @@
 </template>
 
 <script lang="ts">
+import { Door } from "@/lib/door";
 import { Options, Vue } from "vue-class-component";
-import { Door } from "./door_map/calendar";
 
 import BulmaBreadcrumbs, { Step } from "./BulmaBreadcrumbs.vue";
 import Calendar from "./Calendar.vue";
-import DoorChooser from "./door_map/DoorChooser.vue";
-import DoorPlacer from "./door_map/DoorPlacer.vue";
+import DoorChooser from "./calendar/editor/DoorChooser.vue";
+import DoorPlacer from "./calendar/editor/DoorPlacer.vue";
 
 @Options({
   components: {
diff --git a/ui/src/components/CalendarDoor.vue b/ui/src/components/calendar/CalendarDoor.vue
similarity index 91%
rename from ui/src/components/CalendarDoor.vue
rename to ui/src/components/calendar/CalendarDoor.vue
index 31e3001..26b9a4e 100644
--- a/ui/src/components/CalendarDoor.vue
+++ b/ui/src/components/calendar/CalendarDoor.vue
@@ -3,11 +3,11 @@
 </template>
 
 <script lang="ts">
+import { Door } from "@/lib/door";
 import { AxiosError } from "axios";
 import { Options, Vue } from "vue-class-component";
-import { Door } from "./door_map/calendar";
 
-import SVGRect from "./rects/SVGRect.vue";
+import SVGRect from "./SVGRect.vue";
 
 @Options({
   components: {
diff --git a/ui/src/components/MultiModal.vue b/ui/src/components/calendar/MultiModal.vue
similarity index 100%
rename from ui/src/components/MultiModal.vue
rename to ui/src/components/calendar/MultiModal.vue
diff --git a/ui/src/components/rects/SVGRect.vue b/ui/src/components/calendar/SVGRect.vue
similarity index 93%
rename from ui/src/components/rects/SVGRect.vue
rename to ui/src/components/calendar/SVGRect.vue
index 5180347..5326835 100644
--- a/ui/src/components/rects/SVGRect.vue
+++ b/ui/src/components/calendar/SVGRect.vue
@@ -9,8 +9,8 @@
 </template>
 
 <script lang="ts">
+import { Rectangle } from "@/lib/rectangle";
 import { Options, Vue } from "vue-class-component";
-import { Rectangle } from "./rectangles";
 
 @Options({
   props: {
diff --git a/ui/src/components/rects/ThouCanvas.vue b/ui/src/components/calendar/ThouCanvas.vue
similarity index 97%
rename from ui/src/components/rects/ThouCanvas.vue
rename to ui/src/components/calendar/ThouCanvas.vue
index 839bfbf..4a54b74 100644
--- a/ui/src/components/rects/ThouCanvas.vue
+++ b/ui/src/components/calendar/ThouCanvas.vue
@@ -16,8 +16,8 @@
 </template>
 
 <script lang="ts">
+import { Vector2D } from "@/lib/vector2d";
 import { Options, Vue } from "vue-class-component";
-import { Vector2D } from "./rectangles";
 
 function get_event_thous(event: MouseEvent): Vector2D {
   if (event.currentTarget === null) {
diff --git a/ui/src/components/door_map/DoorChooser.vue b/ui/src/components/calendar/editor/DoorChooser.vue
similarity index 92%
rename from ui/src/components/door_map/DoorChooser.vue
rename to ui/src/components/calendar/editor/DoorChooser.vue
index 03662ca..d9001e8 100644
--- a/ui/src/components/door_map/DoorChooser.vue
+++ b/ui/src/components/calendar/editor/DoorChooser.vue
@@ -24,10 +24,10 @@
 </template>
 
 <script lang="ts">
+import { Door } from "@/lib/door";
 import { Options, Vue } from "vue-class-component";
-import { Door } from "./calendar";
 
-import ThouCanvas from "../rects/ThouCanvas.vue";
+import ThouCanvas from "../ThouCanvas.vue";
 import PreviewDoor from "./PreviewDoor.vue";
 
 @Options({
diff --git a/ui/src/components/door_map/DoorPlacer.vue b/ui/src/components/calendar/editor/DoorPlacer.vue
similarity index 95%
rename from ui/src/components/door_map/DoorPlacer.vue
rename to ui/src/components/calendar/editor/DoorPlacer.vue
index 67745b0..281e00d 100644
--- a/ui/src/components/door_map/DoorPlacer.vue
+++ b/ui/src/components/calendar/editor/DoorPlacer.vue
@@ -21,10 +21,11 @@
 </template>
 
 <script lang="ts">
+import { Door } from "@/lib/door";
+import { Rectangle } from "@/lib/rectangle";
 import { Options, Vue } from "vue-class-component";
-import { Rectangle } from "../rects/rectangles";
+
 import RectangleCanvas from "./RectangleCanvas.vue";
-import { Door } from "./calendar";
 
 @Options({
   components: {
diff --git a/ui/src/components/door_map/PreviewDoor.vue b/ui/src/components/calendar/editor/PreviewDoor.vue
similarity index 97%
rename from ui/src/components/door_map/PreviewDoor.vue
rename to ui/src/components/calendar/editor/PreviewDoor.vue
index 15d62bc..0e06163 100644
--- a/ui/src/components/door_map/PreviewDoor.vue
+++ b/ui/src/components/calendar/editor/PreviewDoor.vue
@@ -30,10 +30,10 @@
 </template>
 
 <script lang="ts">
+import { Door } from "@/lib/door";
 import { Options, Vue } from "vue-class-component";
-import { Door } from "./calendar";
 
-import SVGRect from "../rects/SVGRect.vue";
+import SVGRect from "../SVGRect.vue";
 
 @Options({
   components: {
diff --git a/ui/src/components/door_map/RectangleCanvas.vue b/ui/src/components/calendar/editor/RectangleCanvas.vue
similarity index 94%
rename from ui/src/components/door_map/RectangleCanvas.vue
rename to ui/src/components/calendar/editor/RectangleCanvas.vue
index d8b4763..3e55538 100644
--- a/ui/src/components/door_map/RectangleCanvas.vue
+++ b/ui/src/components/calendar/editor/RectangleCanvas.vue
@@ -18,10 +18,12 @@
 </template>
 
 <script lang="ts">
+import { Rectangle } from "@/lib/rectangle";
+import { Vector2D } from "@/lib/vector2d";
 import { Options, Vue } from "vue-class-component";
-import SVGRect from "../rects/SVGRect.vue";
-import ThouCanvas from "../rects/ThouCanvas.vue";
-import { Rectangle, Vector2D } from "../rects/rectangles";
+
+import SVGRect from "../SVGRect.vue";
+import ThouCanvas from "../ThouCanvas.vue";
 
 enum CanvasState {
   Idle,
diff --git a/ui/src/components/door_map/calendar.ts b/ui/src/lib/door.ts
similarity index 90%
rename from ui/src/components/door_map/calendar.ts
rename to ui/src/lib/door.ts
index 0f40e44..a0b2b86 100644
--- a/ui/src/components/door_map/calendar.ts
+++ b/ui/src/lib/door.ts
@@ -1,4 +1,4 @@
-import { Rectangle } from "../rects/rectangles";
+import { Rectangle } from "./rectangle";
 
 export class Door {
   private _day = -1;
diff --git a/ui/src/components/rects/rectangles.ts b/ui/src/lib/rectangle.ts
similarity index 74%
rename from ui/src/components/rects/rectangles.ts
rename to ui/src/lib/rectangle.ts
index a316623..455fbcf 100644
--- a/ui/src/components/rects/rectangles.ts
+++ b/ui/src/lib/rectangle.ts
@@ -1,28 +1,4 @@
-export class Vector2D {
-  public readonly x: number;
-  public readonly y: number;
-
-  constructor(x = 0, y = 0) {
-    this.x = x;
-    this.y = y;
-  }
-
-  public plus(other: Vector2D): Vector2D {
-    return new Vector2D(this.x + other.x, this.y + other.y);
-  }
-
-  public minus(other: Vector2D): Vector2D {
-    return new Vector2D(this.x - other.x, this.y - other.y);
-  }
-
-  public scale(other: number): Vector2D {
-    return new Vector2D(this.x * other, this.y * other);
-  }
-
-  public equals(other: Vector2D): boolean {
-    return this.x === other.x && this.y === other.y;
-  }
-}
+import { Vector2D } from "./vector2d";
 
 export class Rectangle {
   private readonly corner_1: Vector2D;
diff --git a/ui/src/lib/vector2d.ts b/ui/src/lib/vector2d.ts
new file mode 100644
index 0000000..2d342a8
--- /dev/null
+++ b/ui/src/lib/vector2d.ts
@@ -0,0 +1,25 @@
+export class Vector2D {
+  public readonly x: number;
+  public readonly y: number;
+
+  constructor(x = 0, y = 0) {
+    this.x = x;
+    this.y = y;
+  }
+
+  public plus(other: Vector2D): Vector2D {
+    return new Vector2D(this.x + other.x, this.y + other.y);
+  }
+
+  public minus(other: Vector2D): Vector2D {
+    return new Vector2D(this.x - other.x, this.y - other.y);
+  }
+
+  public scale(other: number): Vector2D {
+    return new Vector2D(this.x * other, this.y * other);
+  }
+
+  public equals(other: Vector2D): boolean {
+    return this.x === other.x && this.y === other.y;
+  }
+}
diff --git a/ui/tests/unit/rectangle.spec.ts b/ui/tests/unit/rectangle.spec.ts
index abee785..4ad47a0 100644
--- a/ui/tests/unit/rectangle.spec.ts
+++ b/ui/tests/unit/rectangle.spec.ts
@@ -1,56 +1,21 @@
-import { Rectangle, Vector2D } from '@/components/rects/rectangles';
 import { expect } from "chai";
 
-describe("Vector2D Tests", () => {
-  const v = new Vector2D(1, 2);
-
-  it("should create a default vector", () => {
-    const v0 = new Vector2D();
-    expect(v0.x).to.equal(0);
-    expect(v0.y).to.equal(0);
-  });
-
-  it("should create a vector", () => {
-    expect(v.x).to.equal(1);
-    expect(v.y).to.equal(2);
-  });
-
-  it("should add vectors", () => {
-    const v2 = v.plus(new Vector2D(3, 4));
-    expect(v2.x).to.equal(4);
-    expect(v2.y).to.equal(6);
-  });
-
-  it("should subtract vectors", () => {
-    const v2 = v.minus(new Vector2D(3, 4));
-    expect(v2.x).to.equal(-2);
-    expect(v2.y).to.equal(-2);
-  });
-
-  it("should scale vectors", () => {
-    const v2 = v.scale(3);
-    expect(v2.x).to.equal(3);
-    expect(v2.y).to.equal(6);
-  });
-
-  it("should compare vectors", () => {
-    expect(v.equals(v.scale(1))).to.be.true;
-    expect(v.equals(v.scale(2))).to.be.false;
-  })
-});
+import { Rectangle } from "@/lib/rectangle";
+import { Vector2D } from "@/lib/vector2d";
 
 describe("Rectangle Tests", () => {
   const v1 = new Vector2D(1, 2);
   const v2 = new Vector2D(4, 6);
 
-
   const r1 = new Rectangle(v1, v2);
   const r2 = new Rectangle(v2, v1);
 
   function check_rectangle(
     r: Rectangle,
-    left: number, top: number,
-    width: number, height: number,
+    left: number,
+    top: number,
+    width: number,
+    height: number,
   ) {
     expect(r.left).to.equal(left);
     expect(r.top).to.equal(top);
@@ -61,7 +26,6 @@ describe("Rectangle Tests", () => {
 
     expect(r.middle.x).to.equal(left + 0.5 * width);
     expect(r.middle.y).to.equal(top + 0.5 * height);
-
   }
 
   it("should create a default rectangle", () => {
@@ -79,7 +43,7 @@ describe("Rectangle Tests", () => {
   it("should compare rectangles", () => {
     expect(r1.equals(r2)).to.be.true;
     expect(r1.equals(new Rectangle())).to.be.false;
-  })
+  });
 
   it("should create the same rectangle transposed", () => {
     const v1t = new Vector2D(v1.x, v2.y);
@@ -123,4 +87,4 @@ describe("Rectangle Tests", () => {
 
     check_rectangle(r1.move(v), 2, 3, 3, 4);
   });
-});
\ No newline at end of file
+});
diff --git a/ui/tests/unit/vector2d.spec.ts b/ui/tests/unit/vector2d.spec.ts
new file mode 100644
index 0000000..6331206
--- /dev/null
+++ b/ui/tests/unit/vector2d.spec.ts
@@ -0,0 +1,41 @@
+import { expect } from "chai";
+
+import { Vector2D } from "@/lib/vector2d";
+
+describe("Vector2D Tests", () => {
+  const v = new Vector2D(1, 2);
+
+  it("should create a default vector", () => {
+    const v0 = new Vector2D();
+    expect(v0.x).to.equal(0);
+    expect(v0.y).to.equal(0);
+  });
+
+  it("should create a vector", () => {
+    expect(v.x).to.equal(1);
+    expect(v.y).to.equal(2);
+  });
+
+  it("should add vectors", () => {
+    const v2 = v.plus(new Vector2D(3, 4));
+    expect(v2.x).to.equal(4);
+    expect(v2.y).to.equal(6);
+  });
+
+  it("should subtract vectors", () => {
+    const v2 = v.minus(new Vector2D(3, 4));
+    expect(v2.x).to.equal(-2);
+    expect(v2.y).to.equal(-2);
+  });
+
+  it("should scale vectors", () => {
+    const v2 = v.scale(3);
+    expect(v2.x).to.equal(3);
+    expect(v2.y).to.equal(6);
+  });
+
+  it("should compare vectors", () => {
+    expect(v.equals(v.scale(1))).to.be.true;
+    expect(v.equals(v.scale(2))).to.be.false;
+  });
+});