A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
manage folders
aminnausin5c506b1031a4
diff --git a/app/Http/Controllers/Api/V1/FolderController.php b/app/Http/Controllers/Api/V1/FolderController.phpindex 51e16db1..9a064a49 100755--- a/app/Http/Controllers/Api/V1/FolderController.php+++ b/app/Http/Controllers/Api/V1/FolderController.php@@ -5,8 +5,10 @@ namespace App\Http\Controllers\Api\V1;use App\Http\Controllers\Controller;use App\Http\Requests\FolderCollectionRequest;use App\Http\Resources\FolderResource;+use App\Models\Category;use App\Models\Folder;use App\Traits\HttpResponses;+use Illuminate\Support\Facades\Auth;class FolderController extends Controller {use HttpResponses;@@ -18,10 +20,16 @@ class FolderController extends Controller {public function getFrom(FolderCollectionRequest $request) {$validated = $request->validated();+ $category = Category::find($validated['category_id']);++ if (! $category || ($category->is_private && (! $request->user('sanctum') || (Auth::user() && Auth::user()->id !== 1)))) {+ return $this->error(null, 'Access to this folder is forbidden', 403);+ }+try {return $this->success(FolderResource::collection(- Folder::where('category_id', $validated['category_id'])->get()+ Folder::where('category_id', $validated['category_id'])->orderBy('id')->get()));} catch (\Throwable $th) {diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex 0543db86..c0b9c488 100755--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -46,16 +46,16 @@ class DirectoryController extends Controller {$dirRaw = Category::select('id', 'default_folder_id')->firstWhere('name', 'ilike', '%' . $dir . '%');- if ((isset($privateCategories[$dir]) || $dirRaw->is_private) && (! $request->user('sanctum') || (Auth::user() && Auth::user()->id !== 1))) {+ if (! isset($dirRaw->id)) { // Cannot find category so return default nulls+ return $this->error(['categoryName' => $dir], 'Cannot find specified category', 404);+ }++ if ((isset($privateCategories[$dir]) || $dirRaw?->is_private) && (! $request->user('sanctum') || (Auth::user() && Auth::user()->id !== 1))) {return $this->error(null, 'Access to this folder is forbidden', 403);}$data = ['dir' => ['id' => null, 'name' => $dir, 'folders' => null], 'folder' => ['id' => null, 'name' => $folderName ?? null, 'videos' => null]]; // Default null values- if (! isset($dirRaw->id)) { // Cannot find category so return default nulls- return $this->error(['categoryName' => $dir], 'Cannot find specified category', 404);- }-$folderList = Folder::where('category_id', $dirRaw->id)->withCount(['videos']); // Folders in category$data['dir'] = ['id' => $dirRaw->id, 'name' => $dir, 'folders' => FolderResource::collection($folderList->get())]; // Full category data$folderRaw = isset($request->folderName) ? $folderList->firstWhere('name', 'ilike', '%' . $folderName . '%') : (isset($dirRaw->default_folder_id) ? $folderList->firstWhere('id', $dirRaw->default_folder_id) : $folderList->first()); // Folder in request ? search by name else select first in categorydiff --git a/app/Http/Resources/FolderResource.php b/app/Http/Resources/FolderResource.phpindex ad1cd20a..27f1054e 100755--- a/app/Http/Resources/FolderResource.php+++ b/app/Http/Resources/FolderResource.php@@ -17,12 +17,13 @@ class FolderResource extends JsonResource {'name' => $this->name,'path' => $this->path,'file_count' => $this->videos_count ?? 0, // $videos->count(),- 'total_size' => $this->total_size,+ 'total_size' => (int) $this->total_size,'category_id' => $this->category_id,'videos' => $this->when($request->videos, function () {return VideoResource::collection($this->videos);}),'series' => new SeriesResource($this->series),+ 'created_at' => $this->created_at,];}}diff --git a/resources/js/components/cards/CategoryCard.vue b/resources/js/components/cards/CategoryCard.vueindex eaed0efd..84c3145b 100644--- a/resources/js/components/cards/CategoryCard.vue+++ b/resources/js/components/cards/CategoryCard.vue@@ -16,6 +16,7 @@ import Popover from '@/components/pinesUI/Popover.vue';import ProiconsMoreVertical from '~icons/proicons/more-vertical';import ProiconsArrowSync from '~icons/proicons/arrow-sync';+import CircumFolderOn from '~icons/circum/folder-on';import ProiconsDelete from '~icons/proicons/delete';import ProiconsLock from '~icons/proicons/lock';import CircumShare1 from '~icons/circum/share-1';@@ -28,7 +29,8 @@ const processing = ref(false);const popover = useTemplateRef('popover');const folders = computed(() => {- return props.data?.folders ? props.data.folders.sort((itemA, itemB) => itemA.name.localeCompare(itemB.name)) : [];+ let foldersCopy = props.data?.folders ? [...props.data?.folders] : [];+ return foldersCopy.sort((itemA, itemB) => itemA.name.localeCompare(itemB.name));});const handleSetDefaultFolder = async (newFolder: { value: number }) => {@@ -37,9 +39,12 @@ const handleSetDefaultFolder = async (newFolder: { value: number }) => {try {processing.value = true;- await updateCategory(props.data.id, { default_folder_id: newFolder.value });- toast('Default Folder Updated', { type: 'success' });+ const res = await updateCategory(props.data.id, { default_folder_id: newFolder.value });+ if (res?.status !== 403) toast('Default Folder Updated', { type: 'success' });+ else {+ toast('Unable to set Default Folder', { type: 'danger' });+ }await queryClient.invalidateQueries({queryKey: ['categories'],});@@ -48,6 +53,7 @@ const handleSetDefaultFolder = async (newFolder: { value: number }) => {} catch (error) {console.log(error);toast('Update Failed', { type: 'danger' });+ processing.value = false;}};@@ -134,14 +140,19 @@ watch("/></div>+<ButtonText class="h-8 dark:!bg-neutral-950" :title="'Scan for Folder Changes'" @click="handleStartScan"><template #text> Scan Folders </template><template #icon> <ProiconsArrowSync class="h-4 w-4" /></template></ButtonText>- <ButtonText class="h-8 dark:!bg-neutral-950" :title="'Verify file metadata'" @click="handleStartScan">+ <ButtonText class="h-8 dark:!bg-neutral-950" :title="'Verify File Metadata'" @click="handleStartScan"><template #text> Verify Folders </template><template #icon> <ProiconsArrowSync class="h-4 w-4" /></template></ButtonText>+ <ButtonText class="h-8 dark:!bg-neutral-950" :title="'Manage all Folders in Library'" :to="`/dashboard/libraries/${data?.id}`" target="">+ <template #text> Manage Folders </template>+ <template #icon> <CircumFolderOn class="h-4 w-4" /></template>+ </ButtonText><ButtonText class="h-8 dark:!bg-neutral-950 disabled:opacity-60" :title="'Set User Access Permissions'" disabled><template #text> Manage Access </template><template #icon> <ProiconsLock class="h-4 w-4" /></template>@@ -161,9 +172,9 @@ watch(</Popover></span></div>- <span class="w-full text-sm text-neutral-500 dark:text-neutral-400 flex flex-col gap-1 h-full" v-if="data">+ <span class="w-full text-sm text-neutral-500 dark:text-neutral-400 flex flex-col sm:gap-1 h-full mt-auto" v-if="data"><span class="flex items-start justify-between flex-wrap">- <span>+ <span class="flex flex-col gap-1 sm:gap-0"><p class="">Videos: {{ data?.videos_count ?? '?' }}</p><p class="">Folders: {{ data?.folders_count }}</p>@@ -171,14 +182,15 @@ watch(<p class="hidden sm:block" :title="`Total Size ${formatFileSize(data.folders.reduce((total, folder) => total + Number(folder.total_size), 0))}`">{{ formatFileSize(data.folders.reduce((total, folder) => total + Number(folder.total_size), 0)) }}</p>+ <p class="sm:hidden">{{ defaultFolder ? `Default Folder: ${defaultFolder.name}` : 'No Default Folder' }}</p></span>- <span class="flex items-center justify-between gap-x-2 mt-auto truncate">+ <span class="hidden sm:flex items-center justify-between gap-x-2 mt-auto truncate"><p class="">{{ defaultFolder ? `Default: ${defaultFolder.name}` : 'No Default Folder' }}</p>- <p class="hidden sm:block truncate" :title="`Date Added ${data?.created_at ? toFormattedDate(new Date(data?.created_at + ' EST')) : 'N/A'}`">+ <p class="truncate" :title="`Date Added ${data?.created_at ? toFormattedDate(new Date(data?.created_at + ' EST')) : 'N/A'}`">{{ data?.created_at ? toFormattedDate(new Date(data?.created_at + ' EST')) : 'N/A' }}</p></span>- <span class="sm:hidden flex items-center justify-between gap-x-2 flex-wrap mt-auto pt-2">+ <span class="sm:hidden flex items-center justify-between gap-x-2 flex-wrap pt-1 sm:pt-0"><p class="" :title="`Date Added ${data?.created_at ? toFormattedDate(new Date(data?.created_at + ' EST')) : 'N/A'}`">{{ data?.created_at ? toFormattedDate(new Date(data?.created_at + ' EST')) : 'N/A' }}</p>diff --git a/resources/js/components/cards/CategoryFolderCard.vue b/resources/js/components/cards/CategoryFolderCard.vuenew file mode 100644index 00000000..908ff880--- /dev/null+++ b/resources/js/components/cards/CategoryFolderCard.vue@@ -0,0 +1,107 @@+<script setup lang="ts">+import { type FolderResource } from '@/types/resources';++import { formatFileSize, toFormattedDate } from '@/service/util';+import { useTemplateRef } from 'vue';++import ButtonIcon from '@/components/inputs/ButtonIcon.vue';+import ButtonText from '@/components/inputs/ButtonText.vue';+import Popover from '@/components/pinesUI/Popover.vue';++import ProiconsMoreVertical from '~icons/proicons/more-vertical';+import ProiconsDelete from '~icons/proicons/delete';+import ProiconsLock from '~icons/proicons/lock';+import CircumShare1 from '~icons/circum/share-1';+import CircumEdit from '~icons/circum/edit';++const props = defineProps<{ data?: FolderResource }>();+const popover = useTemplateRef('popover');+</script>++<template>+ <div class="flex flex-col rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white dark:hover:bg-primary-dark-600 hover:bg-primary-800 ring-1 ring-gray-900/5 w-full group">+ <RouterLink :to="`/${data?.name}`" class="w-full h-40">+ <img+ class="w-full h-full object-cover rounded-t-md shadow-sm mb-auto ring-1 ring-gray-900/5"+ :src="+ data?.series?.thumbnail_url ?? 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'+ "+ alt="Folder Cover Art"+ />+ </RouterLink>+ <section class="flex flex-1 h-full flex-col p-3 gap-2">+ <div class="flex items-start justify-between gap-1 flex-wrap xs:flex-nowrap">+ <h3 class="capitalize group-hover:text-purple-600">+ {{ data?.series?.title ?? data?.name }}+ </h3>+ <span class="flex gap-2 [&>*]:h-6 text-sm">+ <ButtonIcon :title="'Open Folder In New Tab'" :to="`/${data?.path}`">+ <template #icon><CircumShare1 class="h-4 w-4" /></template>+ </ButtonIcon>+ <Popover popoverClass="!max-w-56 rounded-lg" :buttonClass="'!p-1 ml-auto'" ref="popover">+ <template #buttonIcon>+ <ProiconsMoreVertical class="h-4 w-4" />+ </template>+ <template #content>+ <div class="space-y-4">+ <div class="space-y-2">+ <h4 class="font-medium leading-none">Manage Folder</h4>+ <p class="text-sm text-muted-foreground">Set Folder Properties.</p>+ </div>++ <div class="space-y-2 [&>*]:w-full">+ <ButtonText+ class="h-8 dark:!bg-neutral-950 disabled:opacity-60"+ :title="'Edit Folder'"+ @click.stop.prevent="+ () => {+ popover?.handleClose();+ $emit('clickAction', data?.id);+ }+ "+ >+ <template #text> Edit Folder</template>+ <template #icon> <CircumEdit class="h-4 w-4" /></template>+ </ButtonText>+ <ButtonText class="h-8 dark:!bg-neutral-950 disabled:opacity-60" :title="'Manage Metadata Settings'" disabled>+ <template #text> Manage Metadata </template>+ <template #icon> <ProiconsLock class="h-4 w-4" /></template>+ </ButtonText>+ <ButtonText class="h-8 text-rose-600 dark:!bg-rose-700 disabled:opacity-60" :title="'Remove From Server'" disabled>+ <template #text> Remove Folder </template>+ <template #icon> <ProiconsDelete class="h-4 w-4" /></template>+ </ButtonText>+ </div>+ </div>+ </template>+ </Popover>+ </span>+ </div>+ <span class="w-full text-sm text-neutral-500 dark:text-neutral-400 flex flex-col gap-1 h-full mt-auto" v-if="data">+ <span class="flex items-start justify-between flex-wrap mt-auto">+ <p class="">Videos: {{ data?.file_count ?? '?' }}</p>+ </span>++ <span class="flex items-center justify-between gap-x-2 flex-wrap">+ <p class="" :title="`Date Added ${data?.created_at ? toFormattedDate(new Date(data?.created_at + ' EST')) : 'N/A'}`">+ {{ data?.created_at ? toFormattedDate(new Date(data?.created_at + ' EST')) : 'N/A' }}+ </p>+ <p class="" :title="`Total Size ${formatFileSize(data.total_size)}`">+ {{ formatFileSize(data.total_size) }}+ </p>+ </span>+ </span>+ </section>+ </div>+</template>++<style lang="css" scoped>+img {+ image-rendering: auto;+ image-rendering: crisp-edges;+ image-rendering: pixelated;++ /* Safari seems to support, but seems deprecated and does the same thing as the others. */+ image-rendering: -webkit-optimize-contrast;+}+</style>diff --git a/resources/js/components/cards/FolderCard.vue b/resources/js/components/cards/FolderCard.vueindex 75c7fafb..c4f2f4bd 100755--- a/resources/js/components/cards/FolderCard.vue+++ b/resources/js/components/cards/FolderCard.vue@@ -1,22 +1,42 @@<script setup lang="ts">+import type { ContextMenuItem } from '@/types/types';import type { FolderResource } from '@/types/resources';import { formatFileSize } from '@/service/util';+import { computed, ref } from 'vue';+import { useAppStore } from '@/stores/AppStore';import { RouterLink } from 'vue-router';-import { ref } from 'vue';import RelativeHoverCard from '@/components/cards/RelativeHoverCard.vue';import ButtonCorner from '@/components/inputs/ButtonCorner.vue';import CircumFolderOn from '~icons/circum/folder-on';import CircumShare1 from '~icons/circum/share-1';+import CircumEdit from '~icons/circum/edit';+const emit = defineEmits(['clickAction', 'otherAction']);const props = defineProps<{folder: FolderResource;categoryName: string;stateFolderName: string;}>();+const { setContextMenu } = useAppStore();++const contextMenuItems = computed(() => {+ let items: ContextMenuItem[] = [+ {+ text: 'Edit',+ icon: CircumEdit,+ action: () => {+ if (!props.folder?.id) return;+ emit('otherAction', props.folder.id);+ },+ },+ ];+ return items;+});+const folderLink = ref(`/${props.categoryName}/${props.folder.name}`);</script>@@ -34,47 +54,62 @@ const folderLink = ref(`/${props.categoryName}/${props.folder.name}`);<template #trigger><RouterLink:to="folderLink"- class="text-left relative flex flex-col gap-4 lg:gap-2 sm:flex-row flex-wrap rounded-lg dark:bg-primary-dark-800/70 bg-primary-800 dark:hover:bg-primary-dark-600 hover:bg-gray-200 dark:text-white shadow p-3 w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"+ class="text-left relative flex flex-col sm:gap-4 sm:flex-row flex-wrap rounded-lg sm:p-3 dark:bg-primary-dark-800/70 bg-primary-800 dark:hover:bg-primary-dark-600 hover:bg-gray-200 dark:text-white shadow w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"+ @contextmenu="+ (e: any) => {+ setContextMenu(e, { items: contextMenuItems });+ }+ ">- <section class="flex justify-between gap-4 w-full items-center">- <h2 class="w-full truncate" :title="props.folder.name">{{ props.folder.name }}</h2>- <div class="flex justify-end gap-1">- <ButtonCorner- :positionClasses="'w-7 h-7'"- :textClasses="'hover:text-violet-600 dark:hover:text-violet-500'"- :colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"- :label="'Share Folder'"- @click.stop.prevent="$emit('clickAction', folderLink)"- >- <template #icon>- <CircumShare1 width="20" height="20" />- </template>- </ButtonCorner>- <ButtonCorner- :positionClasses="'w-7 h-7'"- :textClasses="`${props.folder.name === props.stateFolderName ? 'text-violet-600' : 'hover:text-violet-600'} dark:hover:text-violet-500`"- :colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"- :to="''"- :label="'Open Folder'"+ <img+ :src="+ folder.series?.thumbnail_url ??+ 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'+ "+ alt="Folder Thumbnail"+ class="lg:hidden max-h-16 sm:w-12 aspect-square object-cover shadow-md rounded-t-sm sm:rounded-sm"+ />+ <span class="w-full flex-1 text-left relative flex flex-col gap-4 lg:gap-2 sm:flex-row flex-wrap">+ <section class="flex justify-between gap-4 w-full items-center">+ <h2 class="w-full truncate" :title="props.folder.series?.title ?? props.folder.name">{{ props.folder.series?.title ?? props.folder.name }}</h2>+ <div class="flex justify-end gap-1">+ <ButtonCorner+ :positionClasses="'w-7 h-7'"+ :textClasses="'hover:text-violet-600 dark:hover:text-violet-500'"+ :colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"+ :label="'Share Folder'"+ @click.stop.prevent="$emit('clickAction', folderLink)"+ >+ <template #icon>+ <CircumShare1 width="20" height="20" />+ </template>+ </ButtonCorner>+ <ButtonCorner+ :positionClasses="'w-7 h-7'"+ :textClasses="`${props.folder.name === props.stateFolderName ? 'text-violet-600' : 'hover:text-violet-600'} dark:hover:text-violet-500`"+ :colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"+ :to="''"+ :label="'Open Folder'"+ >+ <template #icon>+ <CircumFolderOn width="20" height="20" />+ </template>+ </ButtonCorner>+ </div>+ </section>+ <section class="flex flex-col sm:flex-row sm:justify-between w-full flex-wrap gap-2 text-sm">+ <h3+ class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap flex-1"+ :title="`${props.folder.file_count} Episode${props.folder.file_count !== 1 ? 's' : ''}`">- <template #icon>- <CircumFolderOn width="20" height="20" />- </template>- </ButtonCorner>- </div>- </section>- <section class="flex flex-col sm:flex-row sm:justify-between w-full flex-wrap gap-2 text-sm">- <h3- class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap flex-1"- :title="`${props.folder.file_count} Episode${props.folder.file_count !== 1 ? 's' : ''}`"- >- {{ props.folder.file_count }} Episode{{ props.folder.file_count !== 1 ? 's' : '' }}- </h3>- <h3 class="truncate text-nowrap sm:text-right text-neutral-500 w-fit lg:hidden xl:block">- <!-- some other folder statistic or data like number of seasons or if its popular or something -->- {{ props.folder.total_size ? formatFileSize(props.folder.total_size) : '' }}- </h3>- </section>+ {{ props.folder.file_count }} Episode{{ props.folder.file_count !== 1 ? 's' : '' }}+ </h3>+ <h3 class="truncate text-nowrap sm:text-right text-neutral-500 w-fit lg:hidden xl:block">+ <!-- some other folder statistic or data like number of seasons or if its popular or something -->+ {{ props.folder.total_size ? formatFileSize(props.folder.total_size) : '' }}+ </h3>+ </section>+ </span></RouterLink></template></RelativeHoverCard>diff --git a/resources/js/components/cards/RecordCard.vue b/resources/js/components/cards/RecordCard.vueindex 5f35b454..498caa2f 100755--- a/resources/js/components/cards/RecordCard.vue+++ b/resources/js/components/cards/RecordCard.vue@@ -1,10 +1,11 @@<script setup lang="ts">-import { toFormattedDate, toTimeSpan } from '../../service/util';import { type RecordResource } from '@/types/resources';-import { formatFileSize } from '@/service/util';++import { toFormattedDate, toTimeSpan } from '@/service/util';import { computed } from 'vue';-import ButtonCorner from '../inputs/ButtonCorner.vue';+import ButtonCorner from '@/components/inputs/ButtonCorner.vue';+import CircumShare1 from '~icons/circum/share-1';import CircumPlay1 from '~icons/circum/play-1';@@ -66,18 +67,13 @@ const videoLink = computed(() => {</div></section><section class="flex flex-wrap sm:flex-nowrap sm:justify-between w-full gap-x-2 text-sm">- <h3- class="hidden lg:block text-neutral-500 w-full text-wrap truncate sm:text-nowrap shrink-0 sm:shrink"- :title="props.record.relationships.folder?.name"- >+ <h3 class="hidden lg:block text-neutral-500 w-full text-wrap truncate sm:text-nowrap shrink-0 sm:shrink" :title="props.record.relationships.folder?.name">{{ props.record.relationships.folder?.name }}</h3><h3 class="hidden lg:block truncate text-right text-neutral-500 w-full line-clamp-2" :title="toFormattedDate(rawDate)">{{ timeSpan }}</h3>- <h3 class="lg:hidden text-neutral-500 text-wrap truncate sm:text-nowrap mr-auto">- {{ props.record.relationships.folder?.name }} · {{ timeSpan }}- </h3>+ <h3 class="lg:hidden text-neutral-500 text-wrap truncate sm:text-nowrap mr-auto">{{ props.record.relationships.folder?.name }} · {{ timeSpan }}</h3><h3 class="lg:hidden truncate sm:text-right text-neutral-500 line-clamp-2 text-wrap sm:text-nowrap">{{`${rawDate.toLocaleDateString('en-ca', {diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex 22ecf8e3..26d32050 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -2,8 +2,8 @@import type { ContextMenuItem } from '@/types/types';import type { VideoResource } from '@/types/resources';-import { useContentStore } from '@/stores/ContentStore';import { formatFileSize, toFormattedDate } from '@/service/util';+import { useContentStore } from '@/stores/ContentStore';import { computed, watch } from 'vue';import { storeToRefs } from 'pinia';import { useAppStore } from '@/stores/AppStore';@@ -23,10 +23,6 @@ const metaData = useMetaData({ ...props.data, id: props.data.id, skipBaseURL: trconst { stateFolder, stateDirectory } = storeToRefs(useContentStore());const { setContextMenu } = useAppStore();-const handlePlay = () => {- emit('clickAction', props.data?.id);-};-const handlePropsUpdate = () => {metaData.updateData({ ...props.data, id: props.data.id, skipBaseURL: true });};@@ -52,7 +48,6 @@ const contextMenuItems = computed(() => {});watch(props, handlePropsUpdate, { immediate: true, deep: true });-// @click.left.stop.prevent.capture="handlePlay"</script><template>diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vueindex cd5c1471..d41975ef 100644--- a/resources/js/components/dashboard/DashboardLibraries.vue+++ b/resources/js/components/dashboard/DashboardLibraries.vue@@ -1,13 +1,15 @@<script setup lang="ts">import type { CategoryResource } from '@/types/resources';-import { computed, onMounted, ref, watch, type Ref } from 'vue';+import { computed, onMounted, ref, watch } from 'vue';import { startIndexFilesTask } from '@/service/siteAPI';import { useDashboardStore } from '@/stores/DashboardStore';-import { useGetCategories } from '@/service/queries';+import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';+import { useRoute } from 'vue-router';import { toast } from '@/service/toaster/toastService';+import DashboardLibraryFolders from '@/components/dashboard/DashboardLibraryFolders.vue';import CategoryCard from '@/components/cards/CategoryCard.vue';import ButtonText from '@/components/inputs/ButtonText.vue';import ModalBase from '@/components/pinesUI/ModalBase.vue';@@ -35,7 +37,8 @@ const sortingOptions = ref([},]);-const { stateLibraries, isLoadingLibraries } = storeToRefs(useDashboardStore());+const { stateLibraries, isLoadingLibraries, stateLibraryId } = storeToRefs(useDashboardStore());+const { pageTitle } = storeToRefs(useAppStore());const cachedID = ref<null | number>(null);const searchQuery = ref('');@@ -92,12 +95,13 @@ const handleStartScan = async () => {}};-// onMounted(() => {-// if (rawCategories.value?.data) stateLibraries.value = rawCategories.value.data;-// });+onMounted(() => {+ pageTitle.value = 'Libraries';+});</script><template>- <section id="content-libraries" class="flex gap-8 flex-col">+ <DashboardLibraryFolders v-if="stateLibraryId > 0" />+ <section v-else id="content-libraries" class="flex gap-8 flex-col"><div class="flex items-center gap-2 justify-between flex-wrap"><div class="flex flex-wrap items-center gap-2 [&>*]:h-fit [&>*]:xs:h-8"><ButtonText title="Add New Library" @click="toast.add('Success', { type: 'success', description: 'Submitted Scan Request!', life: 3000 })" disabled>@@ -112,7 +116,7 @@ const handleStartScan = async () => {<p class="capitalize text-sm font-medium">Count: {{ stateLibraries?.length }}</p></div><TableBase- :use-grid="'grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 gap-3'"+ :use-grid="'grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 gap-3'":use-pagination="true":data="filteredCategories":row="CategoryCard"diff --git a/resources/js/components/dashboard/DashboardLibraryFolders.vue b/resources/js/components/dashboard/DashboardLibraryFolders.vuenew file mode 100644index 00000000..1f4c8127--- /dev/null+++ b/resources/js/components/dashboard/DashboardLibraryFolders.vue@@ -0,0 +1,171 @@+<script setup lang="ts">+import type { FolderResource } from '@/types/resources';++import { computed, onMounted, ref } from 'vue';+import { startIndexFilesTask } from '@/service/siteAPI';+import { useDashboardStore } from '@/stores/DashboardStore';+import { useContentStore } from '@/stores/ContentStore';+import { useQueryClient } from '@tanstack/vue-query';+import { useAppStore } from '@/stores/AppStore';+import { storeToRefs } from 'pinia';+import { toast } from '@/service/toaster/toastService';++import CategoryFolderCard from '@/components/cards/CategoryFolderCard.vue';+import ButtonText from '@/components/inputs/ButtonText.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 ProiconsArrowSync from '~icons/proicons/arrow-sync';++const sortingOptions = ref([+ {+ title: 'ID',+ value: 'id',+ },+ {+ title: 'Title',+ value: 'name',+ disabled: false,+ },+ {+ title: 'Date',+ value: 'created_at',+ disabled: false,+ },+ {+ title: 'Videos',+ value: 'file_count',+ disabled: false,+ },+ {+ title: 'Total Size',+ value: 'total_size',+ },+]);++const { stateLibraryFolders, isLoadingLibraryFolders } = storeToRefs(useDashboardStore());+const { updateFolderData } = useContentStore();+const { pageTitle } = storeToRefs(useAppStore());++const editFolderModal = useModal({ title: 'Edit Folder Details', submitText: 'Submit Details' });+const queryClient = useQueryClient();+const cachedID = ref<null | number>(null);+const cachedFolder = ref<FolderResource>();+const searchQuery = ref('');++const filteredFolders = computed(() => {+ let tempList = searchQuery.value+ ? stateLibraryFolders.value.filter((folder: FolderResource) => {+ {+ try {+ let strRepresentation = [folder.name, folder.series?.title, folder.series?.description, folder.series?.studio, folder.created_at].join(' ').toLowerCase();+ return strRepresentation.includes(searchQuery.value.toLowerCase());+ } catch (error) {+ console.log(error);+ return false;+ }+ }+ })+ : stateLibraryFolders.value;+ return tempList;+});++const handleSort = async (column = 'name', dir = 1) => {+ let tempList = [...stateLibraryFolders.value];+ tempList.sort((folderA: FolderResource, folderB: FolderResource) => {+ if (column === 'created_at') {+ let dateA = new Date(folderA?.created_at ?? '');+ let dateB = new Date(folderB?.created_at ?? '');+ return (dateB.getTime() - dateA.getTime()) * dir;+ }+ if (column === 'name' && folderA.series?.title && folderB.series?.title) {+ return `${folderA.series?.title}`?.localeCompare(`${folderB.series?.title}`) * dir;+ }+ let valueA = folderA[column as keyof FolderResource];+ let valueB = folderB[column as keyof FolderResource];+ if (valueA && valueB && typeof valueA === 'number' && typeof valueB === 'number') return (valueA - valueB) * dir;+ return `${valueA}`?.localeCompare(`${valueB}`) * dir;+ });+ stateLibraryFolders.value = tempList;+ return tempList;+};++const handleStartScan = async () => {+ try {+ await startIndexFilesTask();++ toast.add('Success', { type: 'success', description: `Submitted scan Request!` });+ } catch (error) {+ toast('Failure', { type: 'danger', description: `Unable to submit scan request.` });+ }+};++const handleFolderAction = (e: Event, id: number, action: 'edit' | 'share' = 'edit') => {+ let folder = stateLibraryFolders.value?.find((folder: FolderResource) => folder.id === id);++ if (folder) cachedFolder.value = folder;++ if (action === 'edit') editFolderModal.toggleModal();+ // else shareFolderModal.toggleModal();+};++const handleSeriesUpdate = async (res: any) => {+ if (res?.data?.id) updateFolderData(res.data as FolderResource);+ editFolderModal.toggleModal(false);++ await queryClient.invalidateQueries({+ queryKey: ['libraryFolders'],+ });+};++onMounted(() => {+ pageTitle.value = 'Library Folders';+});+</script>+<template>+ <section id="content-libraries" class="flex gap-8 flex-col">+ <div class="flex items-center gap-2 justify-between flex-wrap">+ <div class="flex flex-wrap items-center gap-2 [&>*]:h-fit [&>*]:xs:h-8">+ <ButtonText title="Return to Libraries" to="/dashboard/libraries" target="">+ <template #text>Return to Libraries</template>+ </ButtonText>+ <ButtonText @click="handleStartScan">+ <template #text>Scan For Changes</template>+ <template #icon>+ <ProiconsArrowSync />+ </template>+ </ButtonText>+ </div>+ <span>+ <p class="capitalize text-sm font-medium">Folders: {{ stateLibraryFolders?.length }}</p>+ <p class="capitalize text-sm font-medium">+ Videos: {{ stateLibraryFolders?.reduce((total: number, folder: FolderResource) => total + Number(folder.file_count), 0) }}+ </p>+ </span>+ </div>+ <TableBase+ :use-grid="'grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 gap-3'"+ :use-pagination="true"+ :data="filteredFolders"+ :row="CategoryFolderCard"+ :loading="isLoadingLibraryFolders"+ :sort-action="handleSort"+ :click-action="handleFolderAction"+ :sorting-options="sortingOptions"+ @search="+ (query: string) => {+ searchQuery = query;+ }+ "+ />+ </section>+ <ModalBase :modalData="editFolderModal" :useControls="false">+ <template #content>+ <div class="pt-2">+ <EditFolder :folder="cachedFolder" @handleFinish="handleSeriesUpdate" />+ </div>+ </template>+ </ModalBase>+</template>diff --git a/resources/js/components/labels/ChipTag.vue b/resources/js/components/labels/ChipTag.vueindex 00905fd7..f6e5ef5f 100644--- a/resources/js/components/labels/ChipTag.vue+++ b/resources/js/components/labels/ChipTag.vue@@ -1,7 +1,7 @@-<script setup>+<script setup lang="ts">import { RouterLink } from 'vue-router';-import ButtonCorner from '../inputs/ButtonCorner.vue';+import ButtonCorner from '@/components/inputs/ButtonCorner.vue';const props = defineProps(['label', 'colour', 'textClass', 'URL', 'removeable']);</script>diff --git a/resources/js/components/panels/VideoSidebar.vue b/resources/js/components/panels/VideoSidebar.vueindex f6443eee..a42a96bf 100755--- a/resources/js/components/panels/VideoSidebar.vue+++ b/resources/js/components/panels/VideoSidebar.vue@@ -1,31 +1,49 @@-<script setup>-import { useContentStore } from '../../stores/ContentStore';-import { useAppStore } from '../../stores/AppStore';+<script setup lang="ts">+import type { FolderResource } from '@/types/resources';++import { useContentStore } from '@/stores/ContentStore';+import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';import { RouterLink } from 'vue-router';import { ref, watch } from 'vue';-import ButtonClipboard from '../pinesUI/ButtonClipboard.vue';-import FolderCard from '../cards/FolderCard.vue';-import RecordCard from '../cards/RecordCard.vue';-import ModalBase from '../pinesUI/ModalBase.vue';-import useModal from '../../composables/useModal';+import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.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 useModal from '@/composables/useModal';-const appStore = useAppStore();-const contentStore = useContentStore();+const editFolderModal = useModal({ title: 'Edit Folder Details', submitText: 'Submit Details' });const shareModal = useModal({ title: 'Share Video' });+const cachedFolder = ref<FolderResource>();const shareLink = ref('');-const { stateRecords, stateDirectory, stateFolder } = storeToRefs(contentStore);-const { selectedSideBar } = storeToRefs(appStore);+const { stateRecords, stateDirectory, stateFolder } = storeToRefs(useContentStore());+const { updateFolderData } = useContentStore();+const { selectedSideBar } = storeToRefs(useAppStore());-const handleShare = (link) => {+const handleShare = (link: string) => {if (!link || link[0] !== '/') return;shareLink.value = window.location.origin + link;shareModal.toggleModal(true);};+const handleFolderAction = (id: number, action: 'edit' = 'edit') => {+ let folder = stateDirectory.value?.folders?.find((folder: FolderResource) => folder.id === id);+ if (!folder?.id) return;++ cachedFolder.value = folder;+ editFolderModal.toggleModal();+ // else shareFolderModal.toggleModal();+};++const handleSeriesUpdate = async (res: any) => {+ if (res?.data?.id) updateFolderData(res.data as FolderResource);+ editFolderModal.toggleModal(false);+};+watch(selectedSideBar, () => {shareModal.setTitle(`${selectedSideBar === 'folders' ? 'Share Folder' : 'Share Video'}`);});@@ -46,16 +64,12 @@ watch(selectedSideBar, () => {:categoryName="stateDirectory.name":stateFolderName="stateFolder?.name"@clickAction="handleShare"+ @otherAction="handleFolderAction"/></section><section v-if="selectedSideBar === 'history'" id="list-content-history" class="flex gap-2 flex-wrap"><RecordCard v-for="record in stateRecords.slice(0, 10)" :key="record.id" :record="record" @clickAction="handleShare" />- <RouterLink- v-if="stateRecords.length != 0"- to="/history"- class="text-center text-sm dark:text-neutral-400 mx-auto p-3 hover:underline"- >View More</RouterLink- >+ <RouterLink v-if="stateRecords.length != 0" to="/history" class="text-center text-sm dark:text-neutral-400 mx-auto p-3 hover:underline">View More</RouterLink><h2 v-else class="text-gray-500 dark:text-gray-400 tracking-wider w-full py-2">Nothing Yet...</h2></section><ModalBase :modalData="shareModal">@@ -66,5 +80,12 @@ watch(selectedSideBar, () => {<ButtonClipboard :text="shareLink" /></template></ModalBase>+ <ModalBase :modalData="editFolderModal" :useControls="false">+ <template #content>+ <div class="pt-2">+ <EditFolder :folder="cachedFolder" @handleFinish="handleSeriesUpdate" />+ </div>+ </template>+ </ModalBase></div></template>diff --git a/resources/js/components/pinesUI/ButtonClipboard.vue b/resources/js/components/pinesUI/ButtonClipboard.vueindex 88c14471..aad95e7f 100755--- a/resources/js/components/pinesUI/ButtonClipboard.vue+++ b/resources/js/components/pinesUI/ButtonClipboard.vue@@ -1,5 +1,5 @@<script setup>-import useClipboard from '../../composables/useClipboard';+import useClipboard from '@/composables/useClipboard';import ButtonIcon from '../inputs/ButtonIcon.vue';const props = defineProps(['text', 'tabindex']);const clipboard = useClipboard(props.text);@@ -22,9 +22,7 @@ const clipboard = useClipboard(props.text);leave-to-class="opacity-0 translate-x-2"><div v-if="clipboard.copyNotification" class="absolute left-0" v-cloak>- <div- class="px-3 h-7 -ml-1.5 items-center flex text-xs bg-green-500 border-r border-green-500 -translate-x-full text-white rounded"- >+ <div class="px-3 h-7 -ml-1.5 items-center flex text-xs bg-green-500 border-r border-green-500 -translate-x-full text-white rounded"><span>Copied!</span><div class="absolute right-0 inline-block h-full -mt-px overflow-hidden translate-x-3 -translate-y-2 top-1/2"><div class="w-3 h-3 origin-top-left transform rotate-45 bg-green-500 border border-transparent"></div>@@ -50,12 +48,7 @@ const clipboard = useClipboard(props.text);><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5" /></svg>- <svg- v-if="!clipboard.copyNotification"- class="w-4 h-4 stroke-current"- viewBox="0 0 24 24"- xmlns="http://www.w3.org/2000/svg"- >+ <svg v-if="!clipboard.copyNotification" class="w-4 h-4 stroke-current" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="none"><pathd="M7.75 7.757V6.75a3 3 0 0 1 3-3h6.5a3 3 0 0 1 3 3v6.5a3 3 0 0 1-3 3h-.992"diff --git a/resources/js/components/pinesUI/DatePicker.vue b/resources/js/components/pinesUI/DatePicker.vueindex def7f97c..88ac4cd3 100644--- a/resources/js/components/pinesUI/DatePicker.vue+++ b/resources/js/components/pinesUI/DatePicker.vue@@ -1,5 +1,5 @@<script setup>-import useDatePicker from '../../composables/useDatePicker';+import useDatePicker from '@/composables/useDatePicker';import { ref, watch } from 'vue';import { OnClickOutside } from '@vueuse/components';@@ -61,12 +61,7 @@ watch(class="absolute top-0 right-0 px-3 py-2 cursor-pointer text-neutral-400 hover:text-neutral-500"><svg class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">- <path- stroke-linecap="round"- stroke-linejoin="round"- stroke-width="2"- d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"- />+ <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" /></svg></div><Transition@@ -106,12 +101,7 @@ watch(type="button"class="inline-flex p-1 transition duration-100 ease-in-out rounded-full cursor-pointer focus:outline-none focus:shadow-outline hover:bg-gray-100 dark:hover:bg-neutral-900">- <svg- class="inline-flex w-6 h-6 text-gray-400 dark:text-neutral-200"- fill="none"- viewBox="0 0 24 24"- stroke="currentColor"- >+ <svg class="inline-flex w-6 h-6 text-gray-400 dark:text-neutral-200" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" /></svg></button>@@ -120,12 +110,7 @@ watch(type="button"class="inline-flex p-1 transition duration-100 ease-in-out rounded-full cursor-pointer focus:outline-none focus:shadow-outline hover:bg-gray-100 dark:hover:bg-neutral-900">- <svg- class="inline-flex w-6 h-6 text-gray-400 dark:text-neutral-200"- fill="none"- viewBox="0 0 24 24"- stroke="currentColor"- >+ <svg class="inline-flex w-6 h-6 text-gray-400 dark:text-neutral-200" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" /></svg></button>@@ -137,21 +122,15 @@ watch(</div></div><div class="grid grid-cols-7">- <div- v-for="(blankDay, index) in datePicker.datePickerBlankDaysInMonth"- :key="index"- class="p-1 text-sm text-center border border-transparent"- ></div>+ <div v-for="(blankDay, index) in datePicker.datePickerBlankDaysInMonth" :key="index" class="p-1 text-sm text-center border border-transparent"></div><div v-for="(day, dayIndex) in datePicker.datePickerDaysInMonth" :key="dayIndex" class="px-0.5 mb-1 aspect-square"><div@click="datePicker.datePickerDayClicked(day)":class="{- 'bg-neutral-200 dark:bg-neutral-800/70 dark:hover:bg-neutral-900':- datePicker.datePickerIsToday(day) == true,+ 'bg-neutral-200 dark:bg-neutral-800/70 dark:hover:bg-neutral-900': datePicker.datePickerIsToday(day) == true,'text-gray-600 dark:text-neutral-400 hover:bg-neutral-200 dark:hover:text-neutral-100 dark:hover:bg-neutral-900':datePicker.datePickerIsToday(day) == false && datePicker.datePickerIsSelectedDate(day) == false,- 'bg-neutral-800 dark:bg-violet-700 text-white hover:bg-opacity-75 dark:bg-opacity-60':- datePicker.datePickerIsSelectedDate(day) == true,+ 'bg-neutral-800 dark:bg-violet-700 text-white hover:bg-opacity-75 dark:bg-opacity-60': datePicker.datePickerIsSelectedDate(day) == true,}"class="flex items-center justify-center text-sm leading-none text-center rounded-full cursor-pointer h-7 w-7">diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vueindex 904ac676..999963a9 100644--- a/resources/js/components/pinesUI/InputMultiChip.vue+++ b/resources/js/components/pinesUI/InputMultiChip.vue@@ -3,7 +3,7 @@ import { computed, onMounted, onUnmounted, ref, useTemplateRef, watch } from 'vuimport { OnClickOutside } from '@vueuse/components';import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component.mjs';-import useMultiSelect from '../../composables/useMultiSelect';+import useMultiSelect from '@/composables/useMultiSelect';import ButtonIcon from '../inputs/ButtonIcon.vue';import TextInput from '../inputs/TextInput.vue';import ChipTag from '../labels/ChipTag.vue';diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vueindex 408c911b..23011084 100755--- a/resources/js/components/table/TableBase.vue+++ b/resources/js/components/table/TableBase.vue@@ -27,7 +27,7 @@ const props = withDefaults(sortingOptions?: {title: string;value: string;- disabled: boolean;+ disabled?: boolean;}[];itemsPerPage?: number;searchQuery?: any;diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 78e15e31..7101e93d 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -18,9 +18,9 @@ import ChipTag from '@/components/labels/ChipTag.vue';import CircumShare1 from '~icons/circum/share-1';import CircumEdit from '~icons/circum/edit';+const { updateVideoData, updateFolderData } = useContentStore();const { stateVideo, stateFolder } = storeToRefs(useContentStore());const { userData } = storeToRefs(useAuthStore());-const { updateVideoData, updateFolderData } = useContentStore();const defaultDescription = `After defeating theDemon Lord, Himmel the Hero, priest Heiter, dwarf warrior Eisen, and elf magediff --git a/resources/js/router/index.js b/resources/js/router/index.jsindex 06a413a1..057b479b 100755--- a/resources/js/router/index.js+++ b/resources/js/router/index.js@@ -2,6 +2,7 @@ import { createRouter, createWebHistory } from 'vue-router';import { useAuthStore } from '@/stores/AuthStore';import { toTitleCase } from '@/service/util';import { logout } from '@/service/authAPI';+import { toast } from '@/service/toaster/toastService';import DashboardView from '@/views/DashboardView.vue';import RegisterView from '@/views/RegisterView.vue';@@ -11,7 +12,6 @@ import ProfileView from '@/views/ProfileView.vue';import LoginView from '@/views/LoginView.vue';import VideoView from '@/views/VideoView.vue';import ErrorView from '@/views/ErrorView.vue';-import { toast } from '@/service/toaster/toastService';const router = createRouter({history: createWebHistory(),@@ -79,13 +79,14 @@ const router = createRouter({name: 'settings',component: SettingsView,},+{path: '/dashboard',meta: { protected: true },redirect: '/dashboard/overview',},{- path: '/dashboard/:tab?',+ path: '/dashboard/:tab?/:id?',name: 'dashboard',meta: { protected: true },component: DashboardView,@@ -113,6 +114,12 @@ const router = createRouter({component: ErrorView,meta: { code: 500, message: 'Server Error' },},+ {+ path: '/:pathMatch(.*)*',+ name: '404',+ component: ErrorView,+ meta: { code: 404, message: 'Not Found' },+ },],});diff --git a/resources/js/service/mediaAPI.ts b/resources/js/service/mediaAPI.tsindex 2fa58c48..a2d4d651 100644--- a/resources/js/service/mediaAPI.ts+++ b/resources/js/service/mediaAPI.ts@@ -53,6 +53,10 @@ export function getCategories() {return API.get(`/categories`);}+export function getFolders(category_id: number) {+ return API.get(`/folders/?category_id=${category_id}`);+}+export function updateCategory(id: number, data: { default_folder_id: number }) {return API.patch(`/categories/${id}`, data);}diff --git a/resources/js/service/queries.ts b/resources/js/service/queries.tsindex cff276dd..dbae769c 100644--- a/resources/js/service/queries.ts+++ b/resources/js/service/queries.ts@@ -1,13 +1,13 @@-import type { PulseResponse, SiteAnalyticsResponse, TaskStatsResponse } from '@/types/types.ts';+import type { CategoryResource, FolderResource, TaskResource, UserResource } from '@/types/resources';+import type { PulseResponse, TaskStatsResponse } from '@/types/types.ts';import type { Ref } from 'vue';import { getSiteAnalytics, getPulse, getUsers, getTasks, getTaskStats } from '@/service/siteAPI.ts';+import { useAuthStore } from '@/stores/AuthStore';+import { storeToRefs } from 'pinia';import { useQuery } from '@tanstack/vue-query';-import mediaAPI, { getCategories } from '@/service/mediaAPI.ts';-import type { CategoryResource, TaskResource, UserResource } from '@/types/resources';-import { storeToRefs } from 'pinia';-import { useAuthStore } from '@/stores/AuthStore';+import mediaAPI, { getCategories, getFolders } from '@/service/mediaAPI.ts';export const useGetVideoTags = () => {return useQuery({@@ -60,6 +60,17 @@ export const useGetCategories = () => {});};+export const useGetLibraryFolders = (id: Ref<number, number>) => {+ return useQuery<{ data: FolderResource[] }>({+ queryKey: ['libraryFolders', id],+ queryFn: async () => {+ if (id.value < 1) return { data: [] };+ const { data: response } = await getFolders(id.value);+ return response;+ },+ });+};+export const useGetUsers = () => {return useQuery<{ data: UserResource[] }>({queryKey: ['users'],diff --git a/resources/js/service/toaster/toastServiceOld.ts b/resources/js/service/toaster/toastServiceOld.tsindex a389d259..e3ead314 100644--- a/resources/js/service/toaster/toastServiceOld.ts+++ b/resources/js/service/toaster/toastServiceOld.ts@@ -1,5 +1,5 @@import type { Plugin } from 'vue';-import { ToastSymbol } from '../../composables/useToast';+import { ToastSymbol } from '@/composables/useToast';import ToastEventBus from '../toastEventBus';import type { ToastOptions } from '@/types/pinesTypes';// import { toast } from './state';diff --git a/resources/js/service/util.ts b/resources/js/service/util.tsindex d340a92f..c611c104 100644--- a/resources/js/service/util.ts+++ b/resources/js/service/util.ts@@ -1,5 +1,5 @@export function toTitleCase(str: string) {- return str.toLowerCase().replace(/(?:^|\s)\w/g, function (match) {+ return str?.toLowerCase().replace(/(?:^|\s)\w/g, function (match) {return match.toUpperCase();});}diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.jsindex f17426d1..ec1dd7dd 100755--- a/resources/js/stores/ContentStore.js+++ b/resources/js/stores/ContentStore.js@@ -258,7 +258,7 @@ export const useContentStore = defineStore('Content', () => {async function updateFolderData(data) {if (!data) return;- stateFolder.value = { ...stateFolder.value, series: { ...data } };+ if (data.id === stateFolder.value.id) stateFolder.value = { ...stateFolder.value, series: { ...data } };stateDirectory.value = {...stateDirectory.value,diff --git a/resources/js/stores/DashboardStore.ts b/resources/js/stores/DashboardStore.tsindex c1dda424..52e47ddd 100644--- a/resources/js/stores/DashboardStore.ts+++ b/resources/js/stores/DashboardStore.ts@@ -1,18 +1,25 @@import { type CategoryResource, type FolderResource, type TaskResource, type UserResource } from '@/types/resources';import type { TaskStatsResponse } from '@/types/types';-import { useGetCategories, useGetTasks, useGetTaskStats, useGetUsers } from '@/service/queries';+import { useGetCategories, useGetLibraryFolders, useGetTasks, useGetTaskStats, useGetUsers } from '@/service/queries';import { ref, watch, type Ref } from 'vue';import { formatFileSize } from '@/service/util';import { defineStore } from 'pinia';+import { useRoute } from 'vue-router';export const useDashboardStore = defineStore('Dashboard', () => {+ const route = useRoute();++ const stateLibraryId = ref<number>(-1);+const { data: rawCategories, isLoading: isLoadingLibraries } = useGetCategories();+ const { data: rawLibraryFolders, isLoading: isLoadingLibraryFolders } = useGetLibraryFolders(stateLibraryId);const { data: rawUsers, isLoading: isLoadingUsers } = useGetUsers();const { data: rawTasks, isLoading: isLoadingTasks } = useGetTasks();const { data: rawTaskStats, isLoading: isLoadingTaskStats } = useGetTaskStats();const stateLibraries = ref<CategoryResource[]>([]);+ const stateLibraryFolders = ref<FolderResource[]>([]);const stateTasks = ref<TaskResource[]>([]);const stateUsers = ref<UserResource[]>([]);@@ -44,6 +51,19 @@ export const useDashboardStore = defineStore('Dashboard', () => {stateTaskStats.value = v;});+ watch(rawLibraryFolders, (v: any) => {+ if (!v?.data) return;+ stateLibraryFolders.value = v.data ?? [];+ });++ watch(+ () => route?.params?.id,+ (URL_ID) => {+ stateLibraryId.value = parseInt(`${URL_ID}`) && parseInt(`${URL_ID}`) > 0 ? parseInt(`${URL_ID}`) : -1;+ },+ { immediate: true },+ );+const updateSingleTask = (data: TaskResource) => {if (stateTasks.value.findIndex((task) => task.id === data.id) === -1) {stateTasks.value = [data, ...stateTasks.value];@@ -62,22 +82,28 @@ export const useDashboardStore = defineStore('Dashboard', () => {return {stateLibraries,+ stateLibraryFolders,stateTasks,stateUsers,stateTaskStats,stateTotalLibrariesSize,isLoadingLibraries,+ isLoadingLibraryFolders,+ stateLibraryId,isLoadingUsers,isLoadingTasks,updateSingleTask,updateSingleLibrary,} as {stateLibraries: Ref<CategoryResource[]>;+ stateLibraryFolders: Ref<FolderResource[]>;stateTasks: Ref<TaskResource[]>;stateUsers: Ref<UserResource[]>;stateTaskStats: Ref<TaskStatsResponse>;stateTotalLibrariesSize: Ref<string>;isLoadingLibraries: Ref<boolean>;+ isLoadingLibraryFolders: Ref<boolean>;+ stateLibraryId: Ref<number>;isLoadingUsers: Ref<boolean>;isLoadingTasks: Ref<boolean>;updateSingleTask: (data: TaskResource) => void;diff --git a/resources/js/views/DashboardView.vue b/resources/js/views/DashboardView.vueindex 6e373d36..54524480 100644--- a/resources/js/views/DashboardView.vue+++ b/resources/js/views/DashboardView.vue@@ -3,12 +3,16 @@ import type { TaskStatsResponse } from '@/types/types';import { computed, onMounted, ref, watch, type Component, type Ref } from 'vue';import { useDashboardStore } from '@/stores/DashboardStore';+import { useAuthStore } from '@/stores/AuthStore';import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';import { useRoute } from 'vue-router';import DashboardAnalytics from '@/components/dashboard/DashboardAnalytics.vue';import DashboardLibraries from '@/components/dashboard/DashboardLibraries.vue';+import DashboardActivity from '@/components/dashboard/DashboardActivity.vue';+import DashboardUsers from '@/components/dashboard/DashboardUsers.vue';+import DashboardTasks from '@/components/dashboard/DashboardTasks.vue';import SidebarCard from '@/components/cards/SidebarCard.vue';import LayoutBase from '@/layouts/LayoutBase.vue';@@ -22,16 +26,15 @@ import ProiconsGraph from '~icons/proicons/graph';import LucideImages from '~icons/lucide/images';import CircumServer from '~icons/circum/server';import LucideUsers from '~icons/lucide/users';-import DashboardActivity from '@/components/dashboard/DashboardActivity.vue';-import DashboardUsers from '@/components/dashboard/DashboardUsers.vue';-import DashboardTasks from '@/components/dashboard/DashboardTasks.vue';-import { useAuthStore } from '@/stores/AuthStore';-const { stateTaskStats, stateTotalLibrariesSize } = storeToRefs(useDashboardStore()) as { stateTaskStats: Ref<TaskStatsResponse>; stateTotalLibrariesSize: Ref<string> };+const { stateTaskStats, stateTotalLibrariesSize, stateLibraryId } = storeToRefs(useDashboardStore()) as {+ stateTaskStats: Ref<TaskStatsResponse>;+ stateTotalLibrariesSize: Ref<string>;+ stateLibraryId: Ref<number>;+};const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());const { cycleSideBar } = useAppStore();const { userData } = storeToRefs(useAuthStore());-const route = useRoute();const dashboardTab = ref<{ name: string; title?: string; icon?: any }>();@@ -80,6 +83,8 @@ const dashboardTabs = computed<];});+const route = useRoute();+onMounted(async () => {cycleSideBar('dashboard', 'left-card');});@@ -99,6 +104,7 @@ watch(watch(() => dashboardTab.value,() => {+ stateLibraryId.value = -1;if (!dashboardTab.value) return;pageTitle.value = dashboardTab.value.title ?? dashboardTab.value.name;},diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vueindex 7a6d3c9b..3b054831 100755--- a/resources/js/views/VideoView.vue+++ b/resources/js/views/VideoView.vue@@ -9,16 +9,15 @@ import { storeToRefs } from 'pinia';import { useRoute } from 'vue-router';import VideoAmbientPlayer from '@/components/video/VideoAmbientPlayer.vue';+import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';import VideoInfoPanel from '@/components/video/VideoInfoPanel.vue';import VideoSidebar from '@/components/panels/VideoSidebar.vue';import LayoutBase from '@/layouts/LayoutBase.vue';import VideoCard from '@/components/cards/VideoCard.vue';-import TableBase from '@/components/table/TableBase.vue';-import useModal from '@/composables/useModal';import ModalBase from '@/components/pinesUI/ModalBase.vue';+import TableBase from '@/components/table/TableBase.vue';import EditVideo from '@/components/forms/EditVideo.vue';-import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';-import useMetaData from '@/composables/useMetaData';+import useModal from '@/composables/useModal';const route = useRoute();const loading = ref(true);