A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: use drawer for folder details navigation on small screens
aminnausindaddfc73901f
diff --git a/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue b/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vueindex cd95b618..99ca93e1 100644--- a/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue+++ b/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue@@ -8,8 +8,9 @@ import { cn } from '@aminnausin/cedar-ui';import ProiconsChevronRight from '~icons/proicons/chevron-right';-const props = withDefaults(defineProps<ContextMenuItem & { divider?: boolean; children?: ContextMenuItem[]; submenuStyle?: string }>(), {+const props = withDefaults(defineProps<ContextMenuItem & { divider?: boolean; children?: ContextMenuItem[]; submenuStyle?: string; showLeftIcon?: boolean }>(), {selectedStyle: 'text-primary font-bold',+ showLeftIcon: true,});const isSubMenuOpen = ref(false);@@ -53,11 +54,15 @@ useMutationObserver(subMenu, () => (isFloating.value = subMenu.value?.dataset.fl}">- <slot name="icon">- <component v-if="icon" :is="icon" class="size-4 shrink-0" />+ <slot name="icon" v-if="showLeftIcon">+ <component v-if="icon" :is="icon" class="h-5 w-auto shrink-0" /><span v-else class="size-4 shrink-0" /></slot>- <span class="mr-auto truncate text-nowrap">{{ text }}</span>+ <span class="mr-auto truncate text-nowrap">+ <slot>+ {{ text }}+ </slot>+ </span><ProiconsChevronRight v-if="hasChildren" class="size-3 opacity-60" /><span v-else-if="shortcut" class="tracking-widest opacity-60">{{ shortcut }}</span></ButtonBase>diff --git a/resources/js/components/drawers/FolderDetailsNavDrawer.vue b/resources/js/components/drawers/FolderDetailsNavDrawer.vuenew file mode 100644index 00000000..5b4d58cc--- /dev/null+++ b/resources/js/components/drawers/FolderDetailsNavDrawer.vue@@ -0,0 +1,53 @@+<script setup lang="ts">+import { useContentStore } from '@/stores/ContentStore';+import { useFolderTabs } from '@/components/folders/FolderTabs';+import { storeToRefs } from 'pinia';+import { BaseDrawer } from '@/components/cedar-ui/drawer';+import { useDrawer } from '@aminnausin/cedar-ui';+import { useRoute } from 'vue-router';+import { watch } from 'vue';++import DashboardSidebarCard from '@/components/cards/sidebar/DashboardSidebarCard.vue';+import SidebarHeader from '@/components/headers/SidebarHeader.vue';++const drawer = useDrawer();+const route = useRoute();++const { stateFolder, isStateFolderAudio: isAudio } = storeToRefs(useContentStore());+const { activeFolderTab, tabs } = useFolderTabs(stateFolder, isAudio);++const { baseUrl } = drawer.props.value.payload as { baseUrl: string };++watch(+ () => route.fullPath,+ () => drawer.close('programmatic'),+);+</script>++<template>+ <BaseDrawer>+ <SidebarHeader :text="'Folder Details'" />+ <div class="full-height-sidebar flex h-full flex-1 flex-col gap-2">+ <DashboardSidebarCard+ v-for="(tab, index) in tabs"+ :key="index"+ :to="`${baseUrl}/details/${tab.name}`"+ :disabled="tab.disabled"+ :is-active="activeFolderTab?.name === tab.name"+ >+ <template #header>+ <h3 class="w-full flex-1 truncate" :title="tab.title ?? tab.name">{{ tab.title ?? tab.name }}</h3>+ <component v-if="tab.icon" :is="tab.icon" class="ml-auto size-5" />+ </template>+ <template #body>+ <h4 v-if="tab.description" title="Description" class="w-full flex-1 truncate text-wrap sm:text-nowrap">+ {{ tab.description }}+ </h4>+ <h4 v-if="tab.info" title="Information" class="w-fit truncate text-nowrap sm:text-right">+ {{ tab.info.value }}+ </h4>+ </template>+ </DashboardSidebarCard>+ </div>+ </BaseDrawer>+</template>diff --git a/resources/js/components/folders/FolderTabs.ts b/resources/js/components/folders/FolderTabs.tsindex 88bed3c3..88d954ea 100644--- a/resources/js/components/folders/FolderTabs.ts+++ b/resources/js/components/folders/FolderTabs.ts@@ -1,8 +1,33 @@+import type { ComputedRef, Ref } from 'vue';+import type { FolderResource } from '@/contracts/media';++import { formatFileSize, toPlural, toTimeSpan } from '@/service/util';import { createTabStore } from '@/stores/TabStore';import { storeToRefs } from 'pinia';-export function useFolderTabs() {- const tabsStore = createTabStore(`folder-info`, () => [{ name: 'overview' }, { name: 'files' }, { name: 'images' }, { name: 'metadata' }, { name: 'stats' }])();+import LucideLayoutDashboard from '~icons/lucide/layout-dashboard';+import ProiconsInfoSquare from '~icons/proicons/info-square';+import ProiconsVideoClip from '~icons/proicons/video-clip';+import ProiconsMusicNote from '~icons/proicons/music-note';+import ProiconsGraph from '~icons/proicons/graph';+import ProiconsPhoto from '~icons/proicons/photo';++export function useFolderTabs(stateFolder: Ref<FolderResource>, isAudio: ComputedRef<boolean>) {+ const tabsStore = createTabStore(`folder-info`, () => [+ { name: 'overview', icon: LucideLayoutDashboard, description: `${stateFolder.value.title}` },+ {+ name: 'files',+ icon: isAudio ? ProiconsMusicNote : ProiconsVideoClip,+ description: `${stateFolder.value.file_count} ${isAudio.value ? 'Track' : 'Video'}${toPlural(stateFolder.value.file_count)}`,+ },+ { name: 'images', icon: ProiconsPhoto, description: `${stateFolder.value.series?.images?.length ?? 0} Image${toPlural(stateFolder.value.series?.images?.length ?? 0)}` },+ {+ name: 'metadata',+ icon: ProiconsInfoSquare,+ description: stateFolder.value.edited_at ? `Edited ${toTimeSpan(stateFolder.value.edited_at, '')}` : 'Never Edited',+ },+ { name: 'stats', icon: ProiconsGraph, description: `Total Size ${formatFileSize(stateFolder.value.total_size ?? 0)}` },+ ])();const { activeTab: activeFolderTab, tabs } = storeToRefs(tabsStore);diff --git a/resources/js/stores/ContentStore.ts b/resources/js/stores/ContentStore.tsindex 30e57554..74e3ec50 100644--- a/resources/js/stores/ContentStore.ts+++ b/resources/js/stores/ContentStore.ts@@ -9,6 +9,7 @@ import { sortObjectNew } from '@/service/sort/baseSort';import { toParamNumber } from '@/util/route';import { queryClient } from '@/service/vue-query';import { defineStore } from 'pinia';+import { MediaType } from '@/types/types';import { toast } from '@aminnausin/cedar-ui';import mediaAPI from '@/service/mediaAPI.ts';@@ -53,6 +54,9 @@ export const useContentStore = defineStore('Content', () => {const stateFolder = ref<FolderResource>(emptyFolder);const stateVideo = ref<VideoResource>(emptyMedia);+ const isStateFolderAudio = computed(() => stateFolder.value.is_majority_audio);+ const isStateVideoAudio = computed(() => stateVideo.value.metadata?.media_type === MediaType.AUDIO);+const isLoadingContent = ref(false);// Video search and sort and results@@ -399,6 +403,8 @@ export const useContentStore = defineStore('Content', () => {stateDirectory,stateFolder,stateVideo,+ isStateFolderAudio,+ isStateVideoAudio,searchQuery,stateFilteredPlaylist,videoSort,diff --git a/resources/js/views/FolderView.vue b/resources/js/views/FolderView.vueindex d0a088f2..8046f0c2 100644--- a/resources/js/views/FolderView.vue+++ b/resources/js/views/FolderView.vue@@ -16,7 +16,9 @@ import { storeToRefs } from 'pinia';import { cn, toast } from '@aminnausin/cedar-ui';import { useRoute } from 'vue-router';import { useAuth } from '@/composables/auth/useAuth';+import { drawer } from '@aminnausin/cedar-ui';+import FolderDetailsNavDrawer from '@/components/drawers/FolderDetailsNavDrawer.vue';import FolderDetailsSidebar from '@/components/panels/FolderDetailsSidebar.vue';import FolderTabSkeleton from '@/components/folders/FolderTabSkeleton.vue';import EditFolderModal from '@/components/modals/EditFolderModal.vue';@@ -27,21 +29,47 @@ import ProiconsMoreVertical from '~icons/proicons/more-vertical';import ProiconsArrowSync from '~icons/proicons/arrow-sync';import ProiconsPhoto from '~icons/proicons/photo';import CircumMonitor from '~icons/circum/monitor';+import ProiconsMenu from '~icons/proicons/menu';import CircumShare1 from '~icons/circum/share-1';import CircumEdit from '~icons/circum/edit';const VALID_TABS = new Set(['overview', 'files', 'images', 'metadata', 'stats']);-const { stateDirectory, stateFolder, isLoadingContent } = storeToRefs(useContentStore());-const { activeFolderTab, tabs, setTab } = useFolderTabs();+const { stateDirectory, stateFolder, isLoadingContent, isStateFolderAudio: isAudio } = storeToRefs(useContentStore());+const { activeFolderTab, tabs, setTab } = useFolderTabs(stateFolder, isAudio);const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());const { getCategory, getFolder } = useContentStore();const { isAuthenticated } = useAuth();-const baseUrl = computed(() => (stateDirectory.value.name && stateFolder.value.name ? `/${stateDirectory.value.name}/${stateFolder.value.title}` : undefined));+const modal = useModalStore();+const route = useRoute();const popover = useTemplateRef('popover');+const FolderOverview = defineAsyncComponent(() => import('@/components/folders/FolderOverview.vue'));+const FolderMetadata = defineAsyncComponent(() => import('@/components/folders/FolderMetadata.vue'));+const FolderImages = defineAsyncComponent(() => import('@/components/folders/FolderImages.vue'));+const FolderHeader = defineAsyncComponent(() => import('@/components/folders/FolderHeader.vue'));+const FolderStats = defineAsyncComponent(() => import('@/components/folders/FolderStats.vue'));+const FolderMedia = defineAsyncComponent(() => import('@/components/folders/FolderMedia.vue'));++const activeComponent = computed(() => {+ switch (activeFolderTab.value?.name) {+ case 'overview':+ return FolderOverview;+ case 'files':+ return FolderMedia;+ case 'images':+ return FolderImages;+ case 'metadata':+ return FolderMetadata;+ case 'stats':+ return FolderStats;+ default:+ return null;+ }+});+const popoverItems = computed<PopoverItem[]>(() => [{icon: CircumEdit,@@ -70,33 +98,7 @@ const popoverItems = computed<PopoverItem[]>(() => [},]);-const modal = useModalStore();--const FolderOverview = defineAsyncComponent(() => import('@/components/folders/FolderOverview.vue'));-const FolderMetadata = defineAsyncComponent(() => import('@/components/folders/FolderMetadata.vue'));-const FolderImages = defineAsyncComponent(() => import('@/components/folders/FolderImages.vue'));-const FolderHeader = defineAsyncComponent(() => import('@/components/folders/FolderHeader.vue'));-const FolderStats = defineAsyncComponent(() => import('@/components/folders/FolderStats.vue'));-const FolderMedia = defineAsyncComponent(() => import('@/components/folders/FolderMedia.vue'));--const activeComponent = computed(() => {- switch (activeFolderTab.value?.name) {- case 'overview':- return FolderOverview;- case 'files':- return FolderMedia;- case 'images':- return FolderImages;- case 'metadata':- return FolderMetadata;- case 'stats':- return FolderStats;- default:- return null;- }-});--const route = useRoute();+const baseUrl = computed(() => (stateDirectory.value.name && stateFolder.value.name ? `/${stateDirectory.value.name}/${stateFolder.value.title}` : undefined));async function reload() {if (isLoadingContent.value) return;@@ -179,10 +181,7 @@ provide('series',computed(() => stateFolder.value.series),);-provide(- 'isAudio',- computed(() => stateFolder.value.is_majority_audio),-);+provide('isAudio', isAudio);provide('primaryImageIds',computed(() => ({ poster: stateFolder.value.series?.poster_image?.id, banner: stateFolder.value.series?.primary_banner_id })),@@ -195,14 +194,31 @@ provide(<div id="content-folder" class="page-height @container flex flex-col gap-3 text-sm"><FolderHeader><div class="z-3 flex w-full flex-col justify-between gap-4 p-3">- <div class="flex flex-wrap items-center gap-2" v-if="baseUrl && !isLoadingContent">- <div class="scrollbar-minimal flex w-full flex-1 flex-wrap overflow-x-auto">+ <div class="@container flex flex-wrap justify-between gap-2" v-if="baseUrl && !isLoadingContent">+ <ButtonBase+ :class="cn('h-8 gap-1 ps-0 @md:hidden')"+ @click="+ drawer.open(FolderDetailsNavDrawer, {+ showHeader: false,+ showFooter: false,+ payload: {+ tabs,+ baseUrl,+ },+ })+ "+ >+ <ProiconsMenu class="size-4" />+ <span class="capitalize">{{ activeFolderTab?.name ?? 'Overview' }}</span>+ </ButtonBase>+ <div class="bg-surface-3/50 dark:bg-surface-3 scrollbar-minimal mr-auto hidden h-fit w-fit flex-wrap gap-0.5 overflow-x-auto rounded-lg p-0.5 @md:flex"><ButtonBasev-for="tab in tabs":key="tab.name":class="- cn('hover:text-primary dark:hover:text-primary-muted capitalize', {- 'text-primary-active dark:text-primary-muted': activeFolderTab?.name === tab.name,+ cn('h-7 rounded-md px-3 py-1 capitalize transition-colors', {+ 'bg-surface-1 dark:bg-surface-4 text-primary-active dark:text-primary-muted shadow-sm': activeFolderTab?.name === tab.name,+ 'text-foreground-2 hover:text-foreground-0 hover:bg-surface-1/50': activeFolderTab?.name !== tab.name,})":to="`${baseUrl}/details/${tab.name}`"