A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: modularise sidebars
aminnausin2a449ecddc7a
diff --git a/resources/js/components/headers/SidebarHeader.vue b/resources/js/components/headers/SidebarHeader.vuenew file mode 100644index 00000000..56bc64d6--- /dev/null+++ b/resources/js/components/headers/SidebarHeader.vue@@ -0,0 +1,19 @@+<script setup lang="ts">+import { useAppStore } from '@/stores/AppStore';+import { storeToRefs } from 'pinia';++const { selectedSideBar } = storeToRefs(useAppStore());+</script>++<template>+ <div class="flex flex-col gap-2 py-1">+ <div class="flex items-center justify-between">+ <h2 id="sidebar-title" class="h-8 w-full truncate text-2xl capitalize dark:text-white">+ <slot name="title">{{ selectedSideBar }}</slot>+ </h2>+ <slot></slot>+ </div>++ <hr class="" />+ </div>+</template>diff --git a/resources/js/components/panels/FolderSidebar.vue b/resources/js/components/panels/FolderSidebar.vuenew file mode 100644index 00000000..21a057ca--- /dev/null+++ b/resources/js/components/panels/FolderSidebar.vue@@ -0,0 +1,138 @@+<script setup lang="ts">+import type { FolderResource, SeriesResource } from '@/types/resources';+import type { GenericSortOption, SortDir } from '@/types/types';++import { useContentStore } from '@/stores/ContentStore';+import { toFormattedDate } from '@/service/util';+import { computed, ref } from 'vue';+import { storeToRefs } from 'pinia';+import { sortObject } from '@/service/sort/baseSort';++import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';++import SidebarHeader from '@/components/headers/SidebarHeader.vue';+import ButtonIcon from '@/components/inputs/ButtonIcon.vue';+import FolderCard from '@/components/cards/FolderCard.vue';+import EditFolder from '@/components/forms/EditFolder.vue';+import ModalBase from '@/components/pinesUI/ModalBase.vue';+import TableBase from '@/components/table/TableBase.vue';+import useModal from '@/composables/useModal';++import ProiconsFilterCancel from '~icons/proicons/filter-cancel';+import ProiconsFilter from '~icons/proicons/filter';++const folderSortingOptions: GenericSortOption<FolderResource>[] = [+ {+ title: 'Title',+ value: 'name',+ },+ {+ title: 'Date Created',+ value: 'created_at',+ },+ {+ title: 'Date Updated',+ value: 'updated_at',+ },+ {+ title: 'Size',+ value: 'total_size',+ },+ {+ title: 'File Count',+ value: 'file_count',+ },+];++const editFolderModal = useModal({ title: 'Edit Folder Details', submitText: 'Submit Details' });+const shareModal = useModal({ title: 'Share Video' });+const cachedFolder = ref<FolderResource>();+const shareLink = ref('');++const folderSortDir = ref<SortDir>(1);+const folderSortKey = ref<keyof FolderResource>(folderSortingOptions[0].value);+const showFilters = ref(false);++const { stateDirectory, stateFolder } = storeToRefs(useContentStore());++const { updateFolderData } = useContentStore();++const sortedFolders = computed<FolderResource[]>(() => {+ return [...stateDirectory.value.folders].sort(sortObject<FolderResource>(folderSortKey.value, folderSortDir.value, ['created_at', 'updated_at']));+});++const handleFolderAction = (e: Event, id: number, action: 'edit' | 'share' = 'edit') => {+ const folder = stateDirectory.value?.folders?.find((folder: FolderResource) => folder.id === id);+ if (!folder?.id) return;++ cachedFolder.value = folder;+ if (action === 'edit') editFolderModal.toggleModal();+ else {+ shareLink.value = encodeURI(window.location.origin + '/' + folder.path);+ shareModal.toggleModal(true);+ }+};++const handleSeriesUpdate = async (res: any) => {+ if (res?.data?.id) updateFolderData(res.data as SeriesResource);+ editFolderModal.toggleModal(false);+};+</script>++<template>+ <SidebarHeader>+ <ButtonIcon+ v-if="stateDirectory.folders.length > 10"+ class="size-8! p-0! *:size-6 dark:ring-transparent! dark:hover:bg-violet-700!"+ @click="showFilters = !showFilters"+ title="Toggle Filters"+ >+ <template #icon>+ <component :is="showFilters ? ProiconsFilterCancel : ProiconsFilter" />+ </template>+ </ButtonIcon>+ </SidebarHeader>+ <TableBase+ id="list-content-folders"+ :data="sortedFolders"+ :row="FolderCard"+ :otherAction="handleFolderAction"+ :useToolbar="stateDirectory.folders.length > 10 && showFilters"+ :startAscending="true"+ :row-attributes="{+ categoryName: stateDirectory.name,+ stateFolderName: stateFolder?.name,+ }"+ :items-per-page="10"+ :max-visible-pages="3"+ :pagination-class="'justify-center! flex-col-reverse!'"+ :use-pagination-icons="true"+ :sort-action="+ (sortKey: keyof FolderResource, sortDir: SortDir) => {+ folderSortDir = sortDir;+ folderSortKey = sortKey;+ }+ "+ :sorting-options="folderSortingOptions"+ />++ <ModalBase :modalData="shareModal">+ <template #description> Copy link to clipboard to share it.</template>+ <template #controls>+ <ButtonClipboard :text="shareLink" />+ </template>+ </ModalBase>+ <ModalBase :modalData="editFolderModal" :useControls="false">+ <template #description v-if="cachedFolder && cachedFolder.series?.editor_id && cachedFolder.series.date_updated">+ Last edited by+ <a title="Editor profile" target="_blank" :href="`/profile/${cachedFolder.series.editor_id}`" class="hover:text-purple-600 dark:hover:text-purple-500"+ >@{{ cachedFolder.series.editor_id }}</a+ >+ at+ {{ toFormattedDate(new Date(cachedFolder.series.date_updated)) }}+ </template>+ <template #content>+ <EditFolder v-if="cachedFolder" :folder="cachedFolder" @handleFinish="handleSeriesUpdate" />+ </template>+ </ModalBase>+</template>diff --git a/resources/js/components/panels/HistorySidebar.vue b/resources/js/components/panels/HistorySidebar.vuenew file mode 100644index 00000000..a434817c--- /dev/null+++ b/resources/js/components/panels/HistorySidebar.vue@@ -0,0 +1,57 @@+<script setup lang="ts">+import { useRecordsLimited } from '@/service/records/useRecords';+import { ref } from 'vue';++import TableLoadingSpinner from '@/components/table/TableLoadingSpinner.vue';+import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';+import SidebarHeader from '@/components/headers/SidebarHeader.vue';+import ButtonText from '@/components/inputs/ButtonText.vue';+import RecordCard from '@/components/cards/RecordCard.vue';+import ModalBase from '@/components/pinesUI/ModalBase.vue';+import useModal from '@/composables/useModal';++const shareModal = useModal({ title: 'Share Video' });+const shareLink = ref('');++const { stateRecords, isLoading: isLoadingRecords } = useRecordsLimited(10);++const handleShare = (link: string) => {+ if (!link || link[0] !== '/') return;++ shareLink.value = window.location.origin + link;+ shareModal.toggleModal(true);+};+</script>++<template>+ <SidebarHeader />++ <section id="list-content-history" class="flex flex-wrap gap-2">+ <TableLoadingSpinner+ v-if="isLoadingRecords || !stateRecords?.length"+ :is-loading="isLoadingRecords"+ :data-length="stateRecords?.length"+ no-results-message="Nothing Yet..."+ />+ <template v-else>+ <RecordCard v-for="(record, index) in stateRecords.slice(0, 10)" :key="record.id" :record="record" :index="index" @clickAction="handleShare" />+ <ButtonText+ v-if="stateRecords.length > 0"+ to="/history"+ :title="'View All Watch History'"+ :class="'bg-primary-800! dark:bg-primary-dark-800/70! dark:hover:bg-primary-dark-600! mx-auto mt-2 mb-2 line-clamp-1 h-8 truncate rounded-full! text-sm hover:bg-white! hover:ring-2 hover:ring-violet-400! dark:hover:ring-violet-700!'"+ :variant="'form'"+ target=""+ >+ <template #text>View More</template>+ </ButtonText>+ </template>+ </section>++ <ModalBase :modalData="shareModal">+ <template #description> Copy link to clipboard to share it.</template>+ <template #controls>+ <ButtonClipboard :text="shareLink" />+ </template>+ </ModalBase>+</template>diff --git a/resources/js/components/panels/VideoSidebar.vue b/resources/js/components/panels/VideoSidebar.vueindex 3e2a362e..eaeae84a 100755--- a/resources/js/components/panels/VideoSidebar.vue+++ b/resources/js/components/panels/VideoSidebar.vue@@ -1,187 +1,14 @@<script setup lang="ts">-import type { FolderResource, SeriesResource } from '@/types/resources';-import type { GenericSortOption, SortDir } from '@/types/types';--import { computed, ref, watch } from 'vue';-import { useRecordsLimited } from '@/service/records/useRecords';-import { useContentStore } from '@/stores/ContentStore';-import { toFormattedDate } from '@/service/util';import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';-import { sortObject } from '@/service/sort/baseSort';--import TableLoadingSpinner from '@/components/table/TableLoadingSpinner.vue';-import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';-import ButtonText from '@/components/inputs/ButtonText.vue';-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';-import FolderCard from '@/components/cards/FolderCard.vue';-import RecordCard from '@/components/cards/RecordCard.vue';-import EditFolder from '@/components/forms/EditFolder.vue';-import ModalBase from '@/components/pinesUI/ModalBase.vue';-import TableBase from '@/components/table/TableBase.vue';-import useModal from '@/composables/useModal';--import ProiconsFilterCancel from '~icons/proicons/filter-cancel';-import ProiconsFilter from '~icons/proicons/filter';--const folderSortingOptions: GenericSortOption<FolderResource>[] = [- {- title: 'Title',- value: 'name',- },- {- title: 'Date Created',- value: 'created_at',- },- {- title: 'Date Updated',- value: 'updated_at',- },- {- title: 'Size',- value: 'total_size',- },- {- title: 'File Count',- value: 'file_count',- },-];-const editFolderModal = useModal({ title: 'Edit Folder Details', submitText: 'Submit Details' });-const shareModal = useModal({ title: 'Share Video' });-const cachedFolder = ref<FolderResource>();-const shareLink = ref('');+import FolderSidebar from '@/components/panels/FolderSidebar.vue';+import HistorySidebar from '@/components/panels/HistorySidebar.vue';-const folderSortDir = ref<SortDir>(1);-const folderSortKey = ref<keyof FolderResource>(folderSortingOptions[0].value);-const showFilters = ref(false);--const { stateDirectory, stateFolder } = storeToRefs(useContentStore());--const { stateRecords, isLoading: isLoadingRecords } = useRecordsLimited(10);--const { updateFolderData } = useContentStore();const { selectedSideBar } = storeToRefs(useAppStore());--const sortedFolders = computed<FolderResource[]>(() => {- return [...stateDirectory.value.folders].sort(sortObject<FolderResource>(folderSortKey.value, folderSortDir.value, ['created_at', 'updated_at']));-});--const handleShare = (link: string) => {- if (!link || link[0] !== '/') return;-- shareLink.value = window.location.origin + link;- shareModal.toggleModal(true);-};--const handleFolderAction = (e: Event, id: number, action: 'edit' | 'share' = 'edit') => {- const folder = stateDirectory.value?.folders?.find((folder: FolderResource) => folder.id === id);- if (!folder?.id) return;-- cachedFolder.value = folder;- if (action === 'edit') editFolderModal.toggleModal();- else {- shareLink.value = encodeURI(window.location.origin + '/' + folder.path);- shareModal.toggleModal(true);- }-};--const handleSeriesUpdate = async (res: any) => {- if (res?.data?.id) updateFolderData(res.data as SeriesResource);- editFolderModal.toggleModal(false);-};--watch(- () => selectedSideBar.value,- () => {- shareModal.setTitle(`${selectedSideBar.value === 'folders' ? 'Share Folder' : 'Share Video'}`);- },-);</script><template>- <div class="flex flex-col gap-2 py-1">- <div class="flex items-center justify-between">- <h2 id="sidebar-title" class="h-8 w-full truncate text-2xl capitalize dark:text-white">- {{ selectedSideBar }}- </h2>- <ButtonIcon- v-if="stateDirectory.folders.length > 10 && selectedSideBar === 'folders'"- class="size-8! p-0! *:size-6 dark:ring-transparent! dark:hover:bg-violet-700!"- @click="showFilters = !showFilters"- title="Toggle Filters"- >- <template #icon>- <component :is="showFilters ? ProiconsFilterCancel : ProiconsFilter" />- </template>- </ButtonIcon>- </div>-- <hr class="" />- </div>- <TableBase- v-if="selectedSideBar === 'folders'"- id="list-content-folders"- :data="sortedFolders"- :row="FolderCard"- :otherAction="handleFolderAction"- :useToolbar="stateDirectory.folders.length > 10 && showFilters"- :startAscending="true"- :row-attributes="{- categoryName: stateDirectory.name,- stateFolderName: stateFolder?.name,- }"- :items-per-page="10"- :max-visible-pages="3"- :pagination-class="'justify-center! flex-col-reverse!'"- :use-pagination-icons="true"- :sort-action="- (sortKey: keyof FolderResource, sortDir: SortDir) => {- folderSortDir = sortDir;- folderSortKey = sortKey;- }- "- :sorting-options="folderSortingOptions"- />- <section v-if="selectedSideBar === 'history'" id="list-content-history" class="flex flex-wrap gap-2">- <TableLoadingSpinner- v-if="isLoadingRecords || !stateRecords?.length"- :is-loading="isLoadingRecords"- :data-length="stateRecords?.length"- no-results-message="Nothing Yet..."- />- <template v-else>- <RecordCard v-for="(record, index) in stateRecords.slice(0, 10)" :key="record.id" :record="record" :index="index" @clickAction="handleShare" />- <ButtonText- v-if="stateRecords.length > 0"- to="/history"- :title="'View All Watch History'"- :class="'bg-primary-800! dark:bg-primary-dark-800/70! dark:hover:bg-primary-dark-600! mx-auto mt-2 mb-2 line-clamp-1 h-8 truncate rounded-full! text-sm hover:bg-white! hover:ring-2 hover:ring-violet-400! dark:hover:ring-violet-700!'"- :variant="'form'"- target=""- >- <template #text>View More</template>- </ButtonText>- </template>- </section>-- <ModalBase :modalData="shareModal">- <template #description> Copy link to clipboard to share it.</template>- <template #controls>- <ButtonClipboard :text="shareLink" />- </template>- </ModalBase>- <ModalBase :modalData="editFolderModal" :useControls="false">- <template #description v-if="cachedFolder && cachedFolder.series?.editor_id && cachedFolder.series.date_updated">- Last edited by- <a title="Editor profile" target="_blank" :href="`/profile/${cachedFolder.series.editor_id}`" class="hover:text-purple-600 dark:hover:text-purple-500"- >@{{ cachedFolder.series.editor_id }}</a- >- at- {{ toFormattedDate(new Date(cachedFolder.series.date_updated)) }}- </template>- <template #content>- <EditFolder v-if="cachedFolder" :folder="cachedFolder" @handleFinish="handleSeriesUpdate" />- </template>- </ModalBase>+ <FolderSidebar v-if="selectedSideBar === 'folders'" />+ <HistorySidebar v-if="selectedSideBar === 'history'" /></template>diff --git a/resources/js/views/DashboardView.vue b/resources/js/views/DashboardView.vueindex 3b989193..c308d49f 100644--- a/resources/js/views/DashboardView.vue+++ b/resources/js/views/DashboardView.vue@@ -15,6 +15,7 @@ import DashboardActivity from '@/components/dashboard/DashboardActivity.vue';import AppManifestCard from '@/components/cards/AppManifestCard.vue';import DashboardUsers from '@/components/dashboard/DashboardUsers.vue';import DashboardTasks from '@/components/dashboard/DashboardTasks.vue';+import SidebarHeader from '@/components/headers/SidebarHeader.vue';import SidebarCard from '@/components/cards/SidebarCard.vue';import LayoutBase from '@/layouts/LayoutBase.vue';@@ -112,10 +113,8 @@ watch(</section></template><template v-slot:leftSidebar>- <div class="flex flex-col gap-2 py-1">- <h2 id="sidebar-title" class="h-8 w-full text-2xl capitalize dark:text-white">{{ selectedSideBar }}</h2>- <hr class="" />- </div>+ <SidebarHeader />+<section class="flex flex-1 flex-col gap-2"><SidebarCardv-for="(tab, index) in dashboardTabs.filter((tab) => !tab.disabled)"diff --git a/resources/js/views/SettingsView.vue b/resources/js/views/SettingsView.vueindex bae284e8..c55b93d7 100755--- a/resources/js/views/SettingsView.vue+++ b/resources/js/views/SettingsView.vue@@ -10,6 +10,7 @@ import { useRoute } from 'vue-router';import SettingsPreferences from '@/components/settings/SettingsPreferences.vue';import SettingsAccount from '@/components/settings/SettingsAccount.vue';import AppManifestCard from '@/components/cards/AppManifestCard.vue';+import SidebarHeader from '@/components/headers/SidebarHeader.vue';import SidebarCard from '@/components/cards/SidebarCard.vue';import LayoutBase from '@/layouts/LayoutBase.vue';@@ -91,10 +92,7 @@ watch(</section></template><template v-slot:leftSidebar>- <div class="flex flex-col gap-2 py-1">- <h2 id="sidebar-title" class="h-8 w-full text-2xl capitalize dark:text-white">{{ selectedSideBar }}</h2>- <hr class="" />- </div>+ <SidebarHeader /><section class="flex flex-1 flex-col gap-2"><SidebarCardv-for="(tab, index) in settingsTabs.filter((tab) => !tab.disabled)"