diff --git a/backend/uploads/image-1727718908224 b/backend/uploads/image-1727718908224 new file mode 100644 index 00000000..c0d45170 Binary files /dev/null and b/backend/uploads/image-1727718908224 differ diff --git a/backend/uploads/image-1727718925076 b/backend/uploads/image-1727718925076 new file mode 100644 index 00000000..c0d45170 Binary files /dev/null and b/backend/uploads/image-1727718925076 differ diff --git a/client/src/views/managers/GameManager.vue b/client/src/views/managers/GameManager.vue index 5c6600c4..7c7de59f 100644 --- a/client/src/views/managers/GameManager.vue +++ b/client/src/views/managers/GameManager.vue @@ -57,10 +57,8 @@ function OpenDatabaseWindow(){ CreateWindow('database'); } -watch(game, () => { - if(game.value && in_game.value){ - AddSound(game.value); - +watch(in_game, () => { + if(in_game.value){ // Check if we are dm is_dm.value = GetClient().is_dm; } diff --git a/client/src/views/partials/FixedBottomButtons.vue b/client/src/views/partials/FixedBottomButtons.vue new file mode 100644 index 00000000..c2e7fd9a --- /dev/null +++ b/client/src/views/partials/FixedBottomButtons.vue @@ -0,0 +1,29 @@ + + + + + \ No newline at end of file diff --git a/client/src/views/partials/MarkdownEditor.vue b/client/src/views/partials/MarkdownEditor.vue index 7530e649..0f306a34 100644 --- a/client/src/views/partials/MarkdownEditor.vue +++ b/client/src/views/partials/MarkdownEditor.vue @@ -3,8 +3,7 @@ import { onMounted, ref, watch } from 'vue'; import { marked } from "https://cdn.jsdelivr.net/npm/marked/lib/marked.esm.js"; const props = defineProps(['done', 'editable']); - -import IconButton from '../partials/game/IconButton.vue'; +import FixedBottomButtons from './FixedBottomButtons.vue'; const editing = ref(false); const isEditable = ref(true); @@ -62,17 +61,11 @@ defineExpose({
- -
- -
+
- -
- -
+
@@ -116,11 +109,4 @@ defineExpose({ flex-direction: column; background-color: var(--color-background); } -.fixed-bottom-buttons { - position: absolute; - bottom: 10px; - right: 10px; - z-index: 2; - display: flex; -} \ No newline at end of file diff --git a/client/src/views/windows/EditProfileWindow.vue b/client/src/views/windows/EditProfileWindow.vue index 62498380..05a5cc03 100644 --- a/client/src/views/windows/EditProfileWindow.vue +++ b/client/src/views/windows/EditProfileWindow.vue @@ -9,6 +9,7 @@ import BigIconTemplate from '@/views/partials/BigIconTemplate.vue'; import { SetMinSize, SetResizable } from '@/services/Windows'; import { backendUrl } from '@/services/BackendURL'; import { GetUser } from '@/services/User'; +import FixedBottomButtons from '../partials/FixedBottomButtons.vue'; const props = defineProps(['data']); const data = props.data; @@ -35,6 +36,10 @@ onMounted(() => { else userIcon.value = "public/img/def-avatar.jpg"; }).catch((err) => console.log("Internal error")); }); + +function RemoveUser(){ + alert("Remove") +} @@ -43,10 +48,15 @@ onMounted(() => { -
- Admin -
+
+ +
+
+ +
+ + diff --git a/client/src/views/windows/game/DatabaseWindow.vue b/client/src/views/windows/game/DatabaseWindow.vue index 33b6fae7..11f55673 100644 --- a/client/src/views/windows/game/DatabaseWindow.vue +++ b/client/src/views/windows/game/DatabaseWindow.vue @@ -3,11 +3,11 @@ import WindowHandle from '@/views/partials/WindowHandle.vue'; import { onMounted, ref, shallowRef, watch } from 'vue'; import { ClearWindow, CreateWindow, ResetPosition, SetMinSize, SetResizable, SetSize, SetupHandle } from '@/services/Windows'; -import IconButton from '@/views/partials/game/IconButton.vue' import ConceptList from '@/views/partials/ConceptList.vue'; import { FetchConcepts, GetConcepts } from '@/services/Data'; import Tabs from '@/views/partials/Tabs.vue'; import { GetCampaignModuleName } from '@/services/Campaign'; +import FixedBottomButtons from '@/views/partials/FixedBottomButtons.vue'; const handle = ref(null); @@ -90,10 +90,7 @@ function ElementIcon(element){ - -
- -
+ diff --git a/client/src/views/windows/settings/AccountManagementWindow.vue b/client/src/views/windows/settings/AccountManagementWindow.vue index 14f9546e..e1df5f5d 100644 --- a/client/src/views/windows/settings/AccountManagementWindow.vue +++ b/client/src/views/windows/settings/AccountManagementWindow.vue @@ -7,12 +7,11 @@ import { onMounted, ref, shallowRef, toRaw } from 'vue'; import { SetupHandle, SetSize, ResetPosition } from '@/services/Windows'; import Api from '@/services/Api' -import IconButton from '@/views/partials/game/IconButton.vue' - import WindowHandle from '@/views/partials/WindowHandle.vue'; -import ConceptList from '../../partials/ConceptList.vue'; -import { backendUrl } from '../../../services/BackendURL'; -import { ClearWindow, CreateChildWindow, CreateWindow } from '../../../services/Windows'; +import ConceptList from '@/views/partials/ConceptList.vue'; +import { backendUrl } from '@/services/BackendURL'; +import { ClearWindow, CreateChildWindow } from '@/services/Windows'; +import FixedBottomButtons from '@/views/partials/FixedBottomButtons.vue'; const handle = ref(null); @@ -104,9 +103,7 @@ function OpenCreateAccount(){ :open="OpenAccount" > -
- -
+ @@ -116,14 +113,6 @@ function OpenCreateAccount(){ display: flex; align-items: center; } - -.fixed-bottom-buttons { - position: absolute; - bottom: 10px; - right: 10px; - z-index: 2; - display: flex; -}