From 5059098aca65677704ca28c16b851176ec6202b6 Mon Sep 17 00:00:00 2001 From: thepaperpilot Date: Sun, 9 Jul 2023 22:17:13 -0500 Subject: [PATCH] Removed a bunch of alkatest stuff, added hex grid --- src/alkatest-common | 1 - src/components/Nav.vue | 1 + src/data/HexGrid.vue | 136 +++ src/data/Room.vue | 9 +- src/data/RoomsDialog.vue | 16 +- src/data/contentPackLoader.ts | 1385 ----------------------------- src/data/contentPackResolver.ts | 818 ----------------- src/data/contentPackValidation.ts | 405 --------- src/data/contentPacks/core.json | 467 ---------- src/data/main.css | 26 + src/data/projEntry.tsx | 95 +- src/data/projInfo.json | 6 +- src/data/socket.tsx | 9 - src/features/tabs/tabFamily.ts | 6 +- 14 files changed, 203 insertions(+), 3177 deletions(-) delete mode 160000 src/alkatest-common create mode 100644 src/data/HexGrid.vue delete mode 100644 src/data/contentPackLoader.ts delete mode 100644 src/data/contentPackResolver.ts delete mode 100644 src/data/contentPackValidation.ts delete mode 100644 src/data/contentPacks/core.json create mode 100644 src/data/main.css diff --git a/src/alkatest-common b/src/alkatest-common deleted file mode 160000 index 8fd9cd1..0000000 --- a/src/alkatest-common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8fd9cd1ba44d624fd347aab1ce762512e84d259e diff --git a/src/components/Nav.vue b/src/components/Nav.vue index eefc1b0..48d1798 100644 --- a/src/components/Nav.vue +++ b/src/components/Nav.vue @@ -149,6 +149,7 @@ function openDiscord() { height: 46px; width: 100%; border-bottom: 4px solid var(--outline); + z-index: 2; } .nav > * { diff --git a/src/data/HexGrid.vue b/src/data/HexGrid.vue new file mode 100644 index 0000000..20e927c --- /dev/null +++ b/src/data/HexGrid.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/src/data/Room.vue b/src/data/Room.vue index 73eeb1c..13dc91b 100644 --- a/src/data/Room.vue +++ b/src/data/Room.vue @@ -19,7 +19,6 @@

{{ room.name }}

Hosted by {{ room.host }}
-
{{ room.numContentPacks }} active content packs
Password: @@ -39,7 +38,13 @@ import { ref, toRefs, watch } from "vue"; import Text from "components/fields/Text.vue"; import { Direction } from "util/common"; import Tooltip from "features/tooltips/Tooltip.vue"; -import { ClientRoomData } from "alkatest-common/types"; + +// For some reason it won't find the interface from chromatic-common +interface ClientRoomData { + name: string; + host: string; + hasPassword: boolean; +} const _props = defineProps<{ isPrivate: boolean; diff --git a/src/data/RoomsDialog.vue b/src/data/RoomsDialog.vue index b20bf26..08ed473 100644 --- a/src/data/RoomsDialog.vue +++ b/src/data/RoomsDialog.vue @@ -60,17 +60,16 @@