Skip to content

A self-hosted media server and file management system

refactor: move context menu

aminnausind7f29b115322
diff --git a/resources/js/App.vue b/resources/js/App.vue
index eb04039f..70e4a21e 100755
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -7,11 +7,11 @@ import { ToastController } from '@/components/cedar-ui/toast';
import { useFullscreen } from '@/composables/useFullscreen';
import { getScreenSize } from '@/service/util';
import { useAuthStore } from '@/stores/AuthStore';
+import { ContextMenu } from '@/components/cedar-ui/context-menu';
import { storeToRefs } from 'pinia';
import { useAppStore } from '@/stores/AppStore';
import { RouterView } from 'vue-router';
-import ContextMenu from '@/components/pinesUI/ContextMenu.vue';
import GlobalModal from '@/components/modals/GlobalModal.vue';
const toastPosition = ref<ToastPostion>();
diff --git a/resources/js/components/pinesUI/ContextMenu.vue b/resources/js/components/cedar-ui/context-menu/ContextMenu.vue
similarity index 98%
rename from resources/js/components/pinesUI/ContextMenu.vue
rename to resources/js/components/cedar-ui/context-menu/ContextMenu.vue
index b2c6ba24..2ab802fb 100644
--- a/resources/js/components/pinesUI/ContextMenu.vue
+++ b/resources/js/components/cedar-ui/context-menu/ContextMenu.vue
@@ -3,10 +3,9 @@ import type { ContextMenu } from '@/types/types';
import { nextTick, onMounted, onUnmounted, ref, Teleport, useTemplateRef } from 'vue';
import { useMouseInElement } from '@vueuse/core';
+import { ContextMenuItem } from '@/components/cedar-ui/context-menu';
import { OnClickOutside } from '@vueuse/components';
-import ContextMenuItem from '@/components/pinesUI/ContextMenuItem.vue';
-
const props = withDefaults(defineProps<ContextMenu>(), {
positionClasses: 'z-30 left-20 bottom-10',
style: '',
diff --git a/resources/js/components/pinesUI/ContextMenuItem.vue b/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
similarity index 100%
rename from resources/js/components/pinesUI/ContextMenuItem.vue
rename to resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
diff --git a/resources/js/components/cedar-ui/context-menu/index.ts b/resources/js/components/cedar-ui/context-menu/index.ts
new file mode 100644
index 00000000..04b62341
--- /dev/null
+++ b/resources/js/components/cedar-ui/context-menu/index.ts
@@ -0,0 +1,2 @@
+export { default as ContextMenuItem } from './ContextMenuItem.vue';
+export { default as ContextMenu } from './ContextMenu.vue';
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 43cd68ce..75c69121 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -3,6 +3,7 @@ import { computed, onMounted, ref, useTemplateRef, watch, nextTick } from 'vue';
import { handleStorageURL, toFormattedDate, toTimeSpan } from '@/service/util';
import { ButtonIcon, ButtonText } from '@/components/cedar-ui/button';
import { getUserViewCount } from '@/service/mediaAPI';
+import { ContextMenuItem } from '@/components/cedar-ui/context-menu';
import { CopyToClipboard } from '@/components/cedar-ui/clipboard';
import { useContentStore } from '@/stores/ContentStore';
import { useAuthStore } from '@/stores/AuthStore';
@@ -13,7 +14,6 @@ import { BadgeTag } from '@/components/cedar-ui/badge';
import { emitSeek } from '@/service/player/seekBus';
import { useRoute } from 'vue-router';
-import ContextMenuItem from '@/components/pinesUI/ContextMenuItem.vue';
import useMetaData from '@/composables/useMetaData';
import EditFolder from '@/components/forms/EditFolder.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index b9a114db..0b2751f9 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -15,6 +15,7 @@ import { useContentStore } from '@/stores/ContentStore';
import { debounce, round } from 'lodash-es';
import { ButtonCorner } from '@/components/cedar-ui/button';
import { useAuthStore } from '@/stores/AuthStore';
+import { ContextMenu } from '@/components/cedar-ui/context-menu';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { getMediaUrl } from '@/service/api';
@@ -34,7 +35,6 @@ import VideoPopover from '@/components/video/VideoPopover.vue';
import VideoButton from '@/components/video/VideoButton.vue';
import VideoSlider from '@/components/video/VideoSlider.vue';
import VideoLyrics from '@/components/video/VideoLyrics.vue';
-import ContextMenu from '@/components/pinesUI/ContextMenu.vue';
import ProiconsPictureInPictureEnter from '~icons/proicons/picture-in-picture-enter';
import ProiconsFullScreenMaximize from '~icons/proicons/full-screen-maximize';
diff --git a/resources/js/stores/AppStore.ts b/resources/js/stores/AppStore.ts
index 65162594..b3066b6c 100644
--- a/resources/js/stores/AppStore.ts
+++ b/resources/js/stores/AppStore.ts
@@ -2,10 +2,10 @@ import type { ContextMenu as ContextMenuType, ContextMenuItem, Broadcaster, AppM
import { nextTick, ref, useTemplateRef, watch } from 'vue';
import { useGetManifest, useGetTaskWaitTimes } from '@/service/queries';
+import { ContextMenu } from '@/components/cedar-ui/context-menu';
import { defineStore } from 'pinia';
import { EchoConfig } from '@/echo.ts';
-import ContextMenu from '@/components/pinesUI/ContextMenu.vue';
import Echo from 'laravel-echo';
function booleanToString(val: undefined | boolean) {