From e0da9588d2ac31a01dd09fdd872bbf879b270cc2 Mon Sep 17 00:00:00 2001 From: thepaperpilot Date: Sat, 9 Mar 2024 20:36:41 -0600 Subject: [PATCH] Move board to src/game --- src/data/projEntry.tsx | 10 +++++----- src/{features => game}/boards/Board.vue | 1 + src/{features => game}/boards/CircleProgress.vue | 0 src/{features => game}/boards/Draggable.vue | 0 src/{features => game}/boards/SVGNode.vue | 0 src/{features => game}/boards/SquareProgress.vue | 0 src/{features => game}/boards/board.tsx | 4 ++-- tests/features/board.test.ts | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) rename src/{features => game}/boards/Board.vue (99%) rename src/{features => game}/boards/CircleProgress.vue (100%) rename src/{features => game}/boards/Draggable.vue (100%) rename src/{features => game}/boards/SVGNode.vue (100%) rename src/{features => game}/boards/SquareProgress.vue (100%) rename src/{features => game}/boards/board.tsx (99%) diff --git a/src/data/projEntry.tsx b/src/data/projEntry.tsx index 96499b7..a52dcc3 100644 --- a/src/data/projEntry.tsx +++ b/src/data/projEntry.tsx @@ -1,7 +1,7 @@ -import Board from "features/boards/Board.vue"; -import CircleProgress from "features/boards/CircleProgress.vue"; -import SVGNode from "features/boards/SVGNode.vue"; -import SquareProgress from "features/boards/SquareProgress.vue"; +import Board from "game/boards/Board.vue"; +import CircleProgress from "game/boards/CircleProgress.vue"; +import SVGNode from "game/boards/SVGNode.vue"; +import SquareProgress from "game/boards/SquareProgress.vue"; import { NodePosition, makeDraggable, @@ -9,7 +9,7 @@ import { setupActions, setupDraggableNode, setupUniqueIds -} from "features/boards/board"; +} from "game/boards/board"; import { jsx } from "features/feature"; import { createResource } from "features/resources/resource"; import { createUpgrade } from "features/upgrades/upgrade"; diff --git a/src/features/boards/Board.vue b/src/game/boards/Board.vue similarity index 99% rename from src/features/boards/Board.vue rename to src/game/boards/Board.vue index 0ded9a1..8d33818 100644 --- a/src/features/boards/Board.vue +++ b/src/game/boards/Board.vue @@ -91,3 +91,4 @@ function onInit(panzoomInstance: PanZoom) { margin: -50px -10px; } +game/boards/board \ No newline at end of file diff --git a/src/features/boards/CircleProgress.vue b/src/game/boards/CircleProgress.vue similarity index 100% rename from src/features/boards/CircleProgress.vue rename to src/game/boards/CircleProgress.vue diff --git a/src/features/boards/Draggable.vue b/src/game/boards/Draggable.vue similarity index 100% rename from src/features/boards/Draggable.vue rename to src/game/boards/Draggable.vue diff --git a/src/features/boards/SVGNode.vue b/src/game/boards/SVGNode.vue similarity index 100% rename from src/features/boards/SVGNode.vue rename to src/game/boards/SVGNode.vue diff --git a/src/features/boards/SquareProgress.vue b/src/game/boards/SquareProgress.vue similarity index 100% rename from src/features/boards/SquareProgress.vue rename to src/game/boards/SquareProgress.vue diff --git a/src/features/boards/board.tsx b/src/game/boards/board.tsx similarity index 99% rename from src/features/boards/board.tsx rename to src/game/boards/board.tsx index 9912c2f..5b27d02 100644 --- a/src/features/boards/board.tsx +++ b/src/game/boards/board.tsx @@ -1,5 +1,5 @@ -import Board from "features/boards/Board.vue"; -import Draggable from "features/boards/Draggable.vue"; +import Board from "./Board.vue"; +import Draggable from "./Draggable.vue"; import { Component, GatherProps, GenericComponent, jsx } from "features/feature"; import { globalBus } from "game/events"; import { Persistent, persistent } from "game/persistence"; diff --git a/tests/features/board.test.ts b/tests/features/board.test.ts index 6aa0cad..c9e4859 100644 --- a/tests/features/board.test.ts +++ b/tests/features/board.test.ts @@ -3,7 +3,7 @@ import { placeInAvailableSpace, setupUniqueIds, unwrapNodeRef -} from "features/boards/board"; +} from "game/boards/board"; import { beforeEach, describe, expect, test } from "vitest"; import { Ref, ref } from "vue"; import "../utils";