Skip to content

A self-hosted media server and file management system

chore: reorganise player files

aminnausinc74ab369a921
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 0e48b53b..cddea873 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -26,20 +26,20 @@ import { FLAGS } from '@/config/featureFlags';
import AudioSpectrographPanel from '@/components/video/audio/AudioSpectrographPanel.vue';
import VideoControlWrapper from '@/components/video/VideoControlWrapper.vue';
-import VideoPopoverSlider from '@/components/video/VideoPopoverSlider.vue';
+import VideoPopoverSlider from '@/components/video/popover/VideoPopoverSlider.vue';
import AudioSpectrograph from '@/components/video/audio/AudioSpectrograph.vue';
-import VideoPopoverItem from '@/components/video/VideoPopoverItem.vue';
+import VideoPopoverItem from '@/components/video/popover/VideoPopoverItem.vue';
import PlayerSubtitles from '@/components/video/subtitles/PlayerSubtitles.vue';
-import VideoPartyPanel from '@/components/video/VideoPartyPanel.vue';
-import PlayerSkipIntro from '@/components/video/PlayerSkipIntro.vue';
+import VideoPartyPanel from '@/components/video/plugins/party/VideoPartyPanel.vue';
+import PlayerSkipIntro from '@/components/video/plugins/skip-intro/PlayerSkipIntro.vue';
import PlayerBackdrop from '@/components/video/PlayerBackdrop.vue';
import VideoTimeline from '@/components/video/VideoTimeline.vue';
import VideoHeatmap from '@/components/video/VideoHeatmap.vue';
-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 PlayerStats from '@/components/video/PlayerStats.vue';
+import VideoPopover from '@/components/video/popover/VideoPopover.vue';
+import VideoButton from '@/components/video/button/VideoButton.vue';
+import VideoSlider from '@/components/video/slider/VideoSlider.vue';
+import VideoLyrics from '@/components/video/plugins/lyrics/VideoLyrics.vue';
+import PlayerStats from '@/components/video/plugins/stats/PlayerStats.vue';
import ProiconsPictureInPictureEnter from '~icons/proicons/picture-in-picture-enter';
import ProiconsPictureInPictureExit from '~icons/proicons/picture-in-picture-exit';
diff --git a/resources/js/components/video/VideoTimeline.vue b/resources/js/components/video/VideoTimeline.vue
index a4c5f7e3..9134d041 100644
--- a/resources/js/components/video/VideoTimeline.vue
+++ b/resources/js/components/video/VideoTimeline.vue
@@ -3,7 +3,7 @@ import { computed, onMounted, onUnmounted, ref, useTemplateRef } from 'vue';
import { getClientX, toFormattedDuration } from '@/service/util';
import { throttle } from 'lodash-es';
-import VideoTooltipSlider from '@/components/video/VideoTooltipSlider.vue';
+import VideoTooltipSlider from '@/components/video/tooltip/VideoTooltipSlider.vue';
const sliderStep = 0.01;
const thumbWidth = 8;
diff --git a/resources/js/components/video/PlayerOverlayButton.vue b/resources/js/components/video/button/PlayerOverlayButton.vue
similarity index 100%
rename from resources/js/components/video/PlayerOverlayButton.vue
rename to resources/js/components/video/button/PlayerOverlayButton.vue
diff --git a/resources/js/components/video/VideoButton.vue b/resources/js/components/video/button/VideoButton.vue
similarity index 96%
rename from resources/js/components/video/VideoButton.vue
rename to resources/js/components/video/button/VideoButton.vue
index 06f60408..3679117e 100644
--- a/resources/js/components/video/VideoButton.vue
+++ b/resources/js/components/video/button/VideoButton.vue
@@ -5,7 +5,7 @@ import { computed, useTemplateRef, watch } from 'vue';
import { RouterLink } from 'vue-router';
import { cn } from '@aminnausin/cedar-ui';
-import VideoTooltipBase from '@/components/video/VideoTooltipBase.vue';
+import VideoTooltipBase from '@/components/video/tooltip/VideoTooltipBase.vue';
import ProiconsFullScreenMaximize from '~icons/proicons/full-screen-maximize';
diff --git a/resources/js/components/video/VideoLyricItem.vue b/resources/js/components/video/plugins/lyrics/VideoLyricItem.vue
similarity index 100%
rename from resources/js/components/video/VideoLyricItem.vue
rename to resources/js/components/video/plugins/lyrics/VideoLyricItem.vue
diff --git a/resources/js/components/video/VideoLyrics.vue b/resources/js/components/video/plugins/lyrics/VideoLyrics.vue
similarity index 99%
rename from resources/js/components/video/VideoLyrics.vue
rename to resources/js/components/video/plugins/lyrics/VideoLyrics.vue
index d8d5395c..17a055e7 100644
--- a/resources/js/components/video/VideoLyrics.vue
+++ b/resources/js/components/video/plugins/lyrics/VideoLyrics.vue
@@ -10,7 +10,7 @@ import { storeToRefs } from 'pinia';
import { onSeek } from '@/service/player/seekBus';
import PlayerToolbarButton from '@/components/video/button/PlayerToolbarButton.vue';
-import VideoLyricItem from '@/components/video/VideoLyricItem.vue';
+import VideoLyricItem from '@/components/video/plugins/lyrics/VideoLyricItem.vue';
let unsubscribe: () => boolean;
diff --git a/resources/js/components/video/VideoPartyItem.vue b/resources/js/components/video/plugins/party/VideoPartyItem.vue
similarity index 100%
rename from resources/js/components/video/VideoPartyItem.vue
rename to resources/js/components/video/plugins/party/VideoPartyItem.vue
diff --git a/resources/js/components/video/VideoPartyPanel.vue b/resources/js/components/video/plugins/party/VideoPartyPanel.vue
similarity index 94%
rename from resources/js/components/video/VideoPartyPanel.vue
rename to resources/js/components/video/plugins/party/VideoPartyPanel.vue
index 6b4e4e45..4628c981 100644
--- a/resources/js/components/video/VideoPartyPanel.vue
+++ b/resources/js/components/video/plugins/party/VideoPartyPanel.vue
@@ -7,8 +7,8 @@ import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
import PlayerToolbarButton from '@/components/video/button/PlayerToolbarButton.vue';
-import VideoPartyItem from '@/components/video/VideoPartyItem.vue';
-import VideoButton from '@/components/video/VideoButton.vue';
+import VideoPartyItem from '@/components/video/plugins/party/VideoPartyItem.vue';
+import VideoButton from '@/components/video/button/VideoButton.vue';
import LucideLogOut from '~icons/lucide/log-out';
import ProiconsEye from '~icons/proicons/eye';
diff --git a/resources/js/components/video/PlayerSkipIntro.vue b/resources/js/components/video/plugins/skip-intro/PlayerSkipIntro.vue
similarity index 95%
rename from resources/js/components/video/PlayerSkipIntro.vue
rename to resources/js/components/video/plugins/skip-intro/PlayerSkipIntro.vue
index 4f602f3e..2ac082ad 100644
--- a/resources/js/components/video/PlayerSkipIntro.vue
+++ b/resources/js/components/video/plugins/skip-intro/PlayerSkipIntro.vue
@@ -3,7 +3,7 @@ import { useContentStore } from '@/stores/ContentStore';
import { storeToRefs } from 'pinia';
import { computed } from 'vue';
-import PlayerOverlayButton from '@/components/video/PlayerOverlayButton.vue';
+import PlayerOverlayButton from '@/components/video/button/PlayerOverlayButton.vue';
import ProiconsFastForward from '~icons/proicons/fast-forward';
diff --git a/resources/js/components/video/PlayerStats.vue b/resources/js/components/video/plugins/stats/PlayerStats.vue
similarity index 100%
rename from resources/js/components/video/PlayerStats.vue
rename to resources/js/components/video/plugins/stats/PlayerStats.vue
diff --git a/resources/js/components/video/VideoPopover.vue b/resources/js/components/video/popover/VideoPopover.vue
similarity index 99%
rename from resources/js/components/video/VideoPopover.vue
rename to resources/js/components/video/popover/VideoPopover.vue
index 39fbe8ce..0c03f8ae 100644
--- a/resources/js/components/video/VideoPopover.vue
+++ b/resources/js/components/video/popover/VideoPopover.vue
@@ -4,7 +4,7 @@ import { OnClickOutside } from '@vueuse/components';
import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
import { cn } from '@aminnausin/cedar-ui';
-import VideoButton from './VideoButton.vue';
+import VideoButton from '@/components/video/button/VideoButton.vue';
const props = withDefaults(
defineProps<{
diff --git a/resources/js/components/video/VideoPopoverItem.vue b/resources/js/components/video/popover/VideoPopoverItem.vue
similarity index 100%
rename from resources/js/components/video/VideoPopoverItem.vue
rename to resources/js/components/video/popover/VideoPopoverItem.vue
diff --git a/resources/js/components/video/VideoPopoverSlider.vue b/resources/js/components/video/popover/VideoPopoverSlider.vue
similarity index 100%
rename from resources/js/components/video/VideoPopoverSlider.vue
rename to resources/js/components/video/popover/VideoPopoverSlider.vue
diff --git a/resources/js/components/video/VideoSlider.vue b/resources/js/components/video/slider/VideoSlider.vue
similarity index 96%
rename from resources/js/components/video/VideoSlider.vue
rename to resources/js/components/video/slider/VideoSlider.vue
index 2b5d4a92..fa94809c 100644
--- a/resources/js/components/video/VideoSlider.vue
+++ b/resources/js/components/video/slider/VideoSlider.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { useTemplateRef, watch, type Component } from 'vue';
-import VideoTooltipBase from '@/components/video/VideoTooltipBase.vue';
+import VideoTooltipBase from '@/components/video/tooltip/VideoTooltipBase.vue';
import ProiconsFullScreenMaximize from '~icons/proicons/full-screen-maximize';
diff --git a/resources/js/components/video/subtitles/PlayerSubtitles.vue b/resources/js/components/video/subtitles/PlayerSubtitles.vue
index 1096e3b7..1810505e 100644
--- a/resources/js/components/video/subtitles/PlayerSubtitles.vue
+++ b/resources/js/components/video/subtitles/PlayerSubtitles.vue
@@ -10,9 +10,9 @@ import { cn, toast } from '@aminnausin/cedar-ui';
import { round } from 'lodash-es';
import useOctopusRenderer from '@/components/video/subtitles/OctopusRenderer';
-import VideoPopoverSlider from '@/components/video/VideoPopoverSlider.vue';
-import VideoPopoverItem from '@/components/video/VideoPopoverItem.vue';
-import VideoPopover from '@/components/video/VideoPopover.vue';
+import VideoPopoverSlider from '@/components/video/popover/VideoPopoverSlider.vue';
+import VideoPopoverItem from '@/components/video/popover/VideoPopoverItem.vue';
+import VideoPopover from '@/components/video/popover/VideoPopover.vue';
import ProiconsTextFontSize from '~icons/proicons/text-font-size';
import ProiconsCheckmark from '~icons/proicons/checkmark';
@@ -263,7 +263,7 @@ defineExpose({
</template>
<style lang="css">
.libassjs-canvas-parent {
- z-index: 3;
+ z-index: 5;
position: static !important;
}
</style>
diff --git a/resources/js/components/video/VideoTooltipBase.vue b/resources/js/components/video/tooltip/VideoTooltipBase.vue
similarity index 100%
rename from resources/js/components/video/VideoTooltipBase.vue
rename to resources/js/components/video/tooltip/VideoTooltipBase.vue
diff --git a/resources/js/components/video/VideoTooltipSlider.vue b/resources/js/components/video/tooltip/VideoTooltipSlider.vue
similarity index 100%
rename from resources/js/components/video/VideoTooltipSlider.vue
rename to resources/js/components/video/tooltip/VideoTooltipSlider.vue