From 5a5fa05667350366607c359c994da6daa1d50446 Mon Sep 17 00:00:00 2001 From: BinarySandia04 Date: Sat, 14 Sep 2024 02:10:05 +0200 Subject: [PATCH] Realtime sync --- client/index.html | 5 - client/src/assets/base.css | 1 + client/src/main.js | 2 - client/src/services/Dragonroll.js | 3 +- client/src/services/Windows.js | 1 - client/src/views/managers/WindowManager.vue | 4 - client/src/views/partials/ConceptList.vue | 66 +++++++ client/src/views/partials/IconSelector.vue | 11 +- .../src/views/windows/database/DbWindow.vue | 58 ------ .../src/views/windows/game/DatabaseWindow.vue | 35 +++- .../windows/game/dnd-5e/CreateItemPrompt.vue | 1 + .../views/windows/game/dnd-5e/ItemSheet.vue | 170 +++++++++++------- server/config/middleware.js | 21 +++ server/io/socket.js | 15 ++ server/models/Concept.js | 8 +- server/routes/campaign.js | 14 +- server/routes/character.js | 10 +- server/routes/concept.js | 72 ++++++++ server/routes/map.js | 146 ++++++--------- server/server.js | 57 +++--- 20 files changed, 424 insertions(+), 276 deletions(-) create mode 100644 client/src/views/partials/ConceptList.vue delete mode 100644 client/src/views/windows/database/DbWindow.vue create mode 100644 server/config/middleware.js create mode 100644 server/io/socket.js create mode 100644 server/routes/concept.js diff --git a/client/index.html b/client/index.html index b32ef146..52ec691d 100644 --- a/client/index.html +++ b/client/index.html @@ -5,11 +5,6 @@ - - - - - Dragonroll diff --git a/client/src/assets/base.css b/client/src/assets/base.css index c60b09ca..ebc1a21d 100644 --- a/client/src/assets/base.css +++ b/client/src/assets/base.css @@ -88,6 +88,7 @@ --chat-background: var(--c-white); --color-border: var(--c-white-border); + --color-border-soft: #a5a5a511; --section-gap: 160px; --separator-color: #2e2e2e; diff --git a/client/src/main.js b/client/src/main.js index 9f119bd9..bec050a6 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -12,7 +12,6 @@ import VueMarkdownEditor from '@kangc/v-md-editor'; import '@kangc/v-md-editor/lib/style/base-editor.css'; import vuepressTheme from '@kangc/v-md-editor/lib/theme/vuepress.js'; import '@kangc/v-md-editor/lib/theme/style/vuepress.css'; -import createKatexPlugin from '@kangc/v-md-editor/lib/plugins/katex/cdn'; import esEs from '@kangc/v-md-editor/lib/lang/es-ES' @@ -29,7 +28,6 @@ import 'prismjs/components/prism-bash'; VueMarkdownEditor.lang.use('es-Es', esEs); VueMarkdownEditor.use(vuepressTheme, { Prism }); -VueMarkdownEditor.use(createKatexPlugin()); const app = createApp(App).use(VueMarkdownEditor); app.config.globalProperties.emitter = emitter diff --git a/client/src/services/Dragonroll.js b/client/src/services/Dragonroll.js index 1183be35..16d8df08 100644 --- a/client/src/services/Dragonroll.js +++ b/client/src/services/Dragonroll.js @@ -20,7 +20,7 @@ function DisplayToast(color, text, duration = 1000){ emitter.emit("toast", {color, text, duration}); } -export const socket = io(backendUrl) +const socket = io(backendUrl) let currentCampaign = null; let currentPlayer = null; @@ -115,6 +115,7 @@ function GetSystem(){ } export { + socket, SetEmitter, GetEmitter, diff --git a/client/src/services/Windows.js b/client/src/services/Windows.js index b0ba578a..705a716c 100644 --- a/client/src/services/Windows.js +++ b/client/src/services/Windows.js @@ -243,7 +243,6 @@ function SetupHandle(id, handle){ function SetResizable(id, resizable){ let win = GetWindowWithId(id); - console.log(win); win.resizable = resizable; } diff --git a/client/src/views/managers/WindowManager.vue b/client/src/views/managers/WindowManager.vue index c6a156f3..582c6130 100644 --- a/client/src/views/managers/WindowManager.vue +++ b/client/src/views/managers/WindowManager.vue @@ -11,7 +11,6 @@ import EditProfileWindow from '@/views/windows/EditProfileWindow.vue' import AccountSettingsWindow from '../windows/AccountSettingsWindow.vue' import { Windows, ReloadRef } from '@/services/Windows'; -import DbWindow from '../windows/database/DbWindow.vue' import CampaignListWindow from '../windows/campaigns/CampaignListWindow.vue' import NewCampaignWindow from '../windows/campaigns/NewCampaignWindow.vue' import JoinCampaignWindow from '../windows/campaigns/JoinCampaignWindow.vue' @@ -73,12 +72,9 @@ async function InjectSystemWindows(system){ }; WindowMap = {...WindowMap, ...systemWidows}; - - console.log(WindowMap) } InjectSystemWindows('dnd-5e') -console.log(WindowMap);