A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: isDesktop breakpoint check is duplicated across codebase
aminnausin065b0f22e1fc
diff --git a/resources/css/app.css b/resources/css/app.cssindex 730024c8..16450802 100755--- a/resources/css/app.css+++ b/resources/css/app.css@@ -90,12 +90,12 @@--aspect-3-4: 3 / 4;/* Breakpoints */- --breakpoint-xxs: 18rem; /* 320px */- --breakpoint-xs: 21.5rem; /* 336px */+ --breakpoint-xxs: 18rem; /* 288px */+ --breakpoint-xs: 21.5rem; /* 344px */--breakpoint-xms: 22.5rem; /* 360px */- --breakpoint-xm: 25rem; /* 432px */+ --breakpoint-xm: 25rem; /* 400px */--breakpoint-xsm: 27rem; /* 432px */- --breakpoint-3xl: 125rem;+ --breakpoint-3xl: 125rem; /* 2000px *//* Drawer */--max-drawer-height: 70vh;diff --git a/resources/js/components/panels/FolderSidebar.vue b/resources/js/components/panels/FolderSidebar.vueindex 3cc4fdfb..52d8b23b 100644--- a/resources/js/components/panels/FolderSidebar.vue+++ b/resources/js/components/panels/FolderSidebar.vue@@ -2,8 +2,8 @@import type { FolderResource } from '@/types/resources';import type { SortDir } from '@/types/types';-import { useBreakpoints, breakpointsTailwind } from '@vueuse/core';import { formatFileSize, toTitleCase } from '@/service/util';+import { useReactiveBreakpoints } from '@/service/breakpoints/useReactiveBreakpoints';import { folderSortingOptions } from '@/constants/sortingOptions';import { useContentStore } from '@/stores/ContentStore';import { useModalStore } from '@/stores/ModalStore';@@ -36,12 +36,10 @@ const showFilters = ref(true);const { stateDirectory, stateFolder, isLoadingContent } = storeToRefs(useContentStore());const { isAuthenticated } = useAuth();+const { isDesktop } = useReactiveBreakpoints();const modal = useModalStore();-const breakpoints = useBreakpoints({ ...breakpointsTailwind, xs: 320, xms: 400, '3xl': 2000 });-const isDesktop = breakpoints.greaterOrEqual('lg');-const sortedFolders = computed<FolderResource[]>(() => {return [...stateDirectory.value.folders].sort(sortObject<FolderResource>(folderSortKey.value, folderSortDir.value, ['created_at', 'updated_at']));});diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vueindex cd9bcbe3..07b2c622 100755--- a/resources/js/components/panels/NavBar.vue+++ b/resources/js/components/panels/NavBar.vue@@ -1,7 +1,7 @@<script setup lang="ts">import type { Component } from 'vue';-import { breakpointsTailwind, useBreakpoints } from '@vueuse/core';+import { useReactiveBreakpoints } from '@/service/breakpoints/useReactiveBreakpoints';import { useDropdownMenuItems } from '@/components/panels/DropdownMenuItems';import { RouterLink, useRoute } from 'vue-router';import { NavButton, NavLink } from '@/components/cedar-ui/button-nav';@@ -31,8 +31,7 @@ const { userData, isLoadingUserData } = storeToRefs(useAuthStore());const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());const { cycleSideBar } = useAppStore();-const breakpoints = useBreakpoints(breakpointsTailwind);-const isDesktop = breakpoints.greaterOrEqual('lg');+const { isDesktop } = useReactiveBreakpoints();const route = useRoute();diff --git a/resources/js/components/video/transcript/PlayerTranscript.vue b/resources/js/components/video/transcript/PlayerTranscript.vueindex 84856f82..976baf5a 100644--- a/resources/js/components/video/transcript/PlayerTranscript.vue+++ b/resources/js/components/video/transcript/PlayerTranscript.vue@@ -3,8 +3,8 @@ import type { ComponentPublicInstance } from 'vue';import type { SubtitleResource } from '@/contracts/media';import { computed, nextTick, onBeforeUnmount, ref, useTemplateRef, watch } from 'vue';-import { breakpointsTailwind, useBreakpoints } from '@vueuse/core';import { ButtonBase, ButtonCorner } from '@/components/cedar-ui/button';+import { useReactiveBreakpoints } from '@/service/breakpoints/useReactiveBreakpoints';import { useTranscript } from '@/components/video/transcript/useTranscript';import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';@@ -18,8 +18,7 @@ import ProiconsCancel from '~icons/proicons/cancel';const props = defineProps<{ isVisible?: boolean }>();const emit = defineEmits<{ seek: [value: number]; close: []; generated: [track: SubtitleResource] }>();-const breakpoints = useBreakpoints(breakpointsTailwind);-const isDesktop = breakpoints.greaterOrEqual('lg');+const { isDesktop } = useReactiveBreakpoints();const { selectedSideBar } = storeToRefs(useAppStore());const { cycleSideBar } = useAppStore();diff --git a/resources/js/service/breakpoints/useReactiveBreakpoints.ts b/resources/js/service/breakpoints/useReactiveBreakpoints.tsnew file mode 100644index 00000000..347d685b--- /dev/null+++ b/resources/js/service/breakpoints/useReactiveBreakpoints.ts@@ -0,0 +1,23 @@+import { useBreakpoints } from '@vueuse/core';++export const CUSTOM_BREAKPOINTS = {+ xxs: 288,+ xs: 344,+ xms: 360,+ xm: 400,+ xsm: 432,+ sm: 640,+ md: 768,+ lg: 1024,+ xl: 1280,+ '2xl': 1536,+ '3xl': 2000,+};++export function useReactiveBreakpoints(breakpointsMap: Record<string, number> = CUSTOM_BREAKPOINTS) {+ const breakpoints = useBreakpoints(breakpointsMap);+ return {+ breakpoints,+ isDesktop: breakpoints.greaterOrEqual('lg'),+ };+}