A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: Styling and Contrast and Consistency Issues
aminnausindd8951205eb2
diff --git a/public/css/main.css b/public/css/main.cssindex a5bc5782..c1b66653 100755--- a/public/css/main.css+++ b/public/css/main.css@@ -33,8 +33,8 @@width: 60px;height: 30px;--light: #d8dbe0;- --dark: #28292c;- --accent: #28292c;+ --dark: #27272a;+ --accent: #27272a;--link: rgb(27, 129, 112);--link-hover: rgb(24, 94, 82);}diff --git a/resources/css/app.css b/resources/css/app.cssindex 3a634eef..565d72fc 100755--- a/resources/css/app.css+++ b/resources/css/app.css@@ -45,6 +45,14 @@}}+ /* PULSE */+ @keyframes detect-scroll {+ from,+ to {+ --can-scroll: ;+ }+ }+/* Custom scrollbar track width */@supports selector(::-webkit-scrollbar) {@@ -98,6 +106,14 @@.group:hover .scrollbar-minimal-x.scrollbar-hover::-webkit-scrollbar {height: 0.35rem;}++ /* PULSE */+ .supports-scrollbars {+ animation: detect-scroll linear;+ animation-timeline: scroll(self);++ padding-right: var(--can-scroll) theme('spacing.3');+ }}.slider {diff --git a/resources/js/components/cards/CategoryCard.vue b/resources/js/components/cards/CategoryCard.vueindex 9e6fb1cc..83998851 100644--- a/resources/js/components/cards/CategoryCard.vue+++ b/resources/js/components/cards/CategoryCard.vue@@ -195,7 +195,7 @@ watch(</Popover></span></div>- <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="w-full text-sm text-neutral-600 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 class="flex flex-col gap-1 sm:gap-0"><p class="">Videos: {{ data?.videos_count ?? '?' }}</p>diff --git a/resources/js/components/cards/CategoryFolderCard.vue b/resources/js/components/cards/CategoryFolderCard.vueindex 1ad1d02a..e228491e 100644--- a/resources/js/components/cards/CategoryFolderCard.vue+++ b/resources/js/components/cards/CategoryFolderCard.vue@@ -75,7 +75,7 @@ const popover = useTemplateRef('popover');</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="w-full text-sm text-neutral-600 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>diff --git a/resources/js/components/cards/FolderCard.vue b/resources/js/components/cards/FolderCard.vueindex 146b9916..a0e8fffb 100755--- a/resources/js/components/cards/FolderCard.vue+++ b/resources/js/components/cards/FolderCard.vue@@ -51,7 +51,7 @@ const contextMenuItems = computed(() => {<template #trigger><RouterLink:to="`/${data.path}`"- class="text-left relative flex flex-col 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 text-neutral-500 dark:text-neutral-400 shadow w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"+ class="text-left relative flex flex-col 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 text-neutral-600 dark:text-neutral-400 shadow w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"@contextmenu="(e: any) => {setContextMenu(e, { items: contextMenuItems });diff --git a/resources/js/components/cards/RecordCard.vue b/resources/js/components/cards/RecordCard.vueindex d7c968d5..9ff1a558 100755--- a/resources/js/components/cards/RecordCard.vue+++ b/resources/js/components/cards/RecordCard.vue@@ -37,7 +37,7 @@ watch(<template><RouterLink:to="videoLink ? videoLink : ''"- 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 text-neutral-500 dark:text-neutral-400 shadow p-3 w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"+ 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 text-neutral-600 dark:text-neutral-400 shadow p-3 w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"><section class="flex justify-between gap-4 w-full items-center"><h3 class="w-full truncate text-gray-900 dark:text-white" :title="props.record.relationships.video_name">diff --git a/resources/js/components/cards/RecordCardDetails.vue b/resources/js/components/cards/RecordCardDetails.vueindex 96214a97..fd255d24 100755--- a/resources/js/components/cards/RecordCardDetails.vue+++ b/resources/js/components/cards/RecordCardDetails.vue@@ -51,7 +51,7 @@ const videoLink = computed(() => {/></div></section>- <section class="flex flex-col sm:flex-row sm:justify-between w-full text-neutral-500 dark:text-neutral-400 text-sm">+ <section class="flex flex-col sm:flex-row sm:justify-between w-full text-neutral-600 dark:text-neutral-400 text-sm"><h3class="w-full text-wrap truncate sm:text-nowrap cursor-auto z-10"@click.stop.prevent=""diff --git a/resources/js/components/cards/SidebarCard.vue b/resources/js/components/cards/SidebarCard.vueindex 261e14c0..fe5fdd13 100644--- a/resources/js/components/cards/SidebarCard.vue+++ b/resources/js/components/cards/SidebarCard.vue@@ -24,7 +24,7 @@ const isCompleteElement = computed(() => !!slots.header && !!slots.body);:href="to":class="`flex flex-col sm:flex-row flex-wrap ${isCompleteElement ? 'gap-4 lg:gap-2 ' : ''}relativew-full group cursor-pointer rounded-lg shadow p-3- text-left text-neutral-500 dark:text-neutral-400+ text-left text-neutral-600 dark:text-neutral-400dark:bg-primary-dark-800/70 bg-primary-800dark:hover:bg-primary-dark-600 hover:bg-gray-200divide-gray-300 dark:divide-gray-400 ${props.class}`"@@ -73,7 +73,7 @@ const isCompleteElement = computed(() => !!slots.header && !!slots.body);:to="link":class="`flex flex-col sm:flex-row flex-wrap ${isCompleteElement ? 'gap-4 lg:gap-2 ' : ''}relativew-full group cursor-pointer rounded-lg shadow p-3- text-left text-neutral-500 dark:text-neutral-400+ text-left text-neutral-600 dark:text-neutral-400dark:bg-primary-dark-800/70 bg-primary-800dark:hover:bg-primary-dark-600 hover:bg-gray-200divide-gray-300 dark:divide-gray-400 ${props.class}`"diff --git a/resources/js/components/cards/SubTaskCard.vue b/resources/js/components/cards/SubTaskCard.vueindex a8fd0035..97b3c2d4 100644--- a/resources/js/components/cards/SubTaskCard.vue+++ b/resources/js/components/cards/SubTaskCard.vue@@ -26,14 +26,14 @@ const emit = defineEmits(['clickAction']);><template #trigger><h2 class="truncate capitalize group">{{ data.id }} - {{ data.name }}</h2>- <p v-if="data.summary" class="truncate text-neutral-500 dark:text-neutral-400 max-w-48 lg:max-w-20 xl:max-w-64 hidden md:block">+ <p v-if="data.summary" class="truncate text-neutral-600 dark:text-neutral-400 max-w-48 lg:max-w-20 xl:max-w-64 hidden md:block">{{ data.summary }}</p></template></HoverCard><div class="flex gap-x-8 gap-y-2 p"><h4- class="text-xs text-neutral-500 dark:text-neutral-400 truncate line-clamp-1 capitalize"+ class="text-xs text-neutral-600 dark:text-neutral-400 truncate line-clamp-1 capitalize":title="`Created: ${data.created_at}\n` +(data.started_at ? `Started: ${data.started_at} UTC\n` : '') +@@ -48,7 +48,7 @@ const emit = defineEmits(['clickAction']);: `Created: ${toFormattedDate(new Date(data.created_at), true, within24Hrs(data.created_at) ? { hour: '2-digit', minute: '2-digit' } : undefined)}`}}</h4>- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate line-clamp-1 capitalize w-20 lg:w-fit hidden sm:block" title="Duration">+ <h4 class="text-xs text-neutral-600 dark:text-neutral-400 truncate line-clamp-1 capitalize w-20 lg:w-fit hidden sm:block" title="Duration">{{ data.duration || data.ended_at ? 'Duration:' : data.started_at ? 'Started: ' : 'Scheduled: ' }}{{data.duration || data.ended_atdiff --git a/resources/js/components/cards/TaskCard.vue b/resources/js/components/cards/TaskCard.vueindex 3ddf0309..d428b9f2 100644--- a/resources/js/components/cards/TaskCard.vue+++ b/resources/js/components/cards/TaskCard.vue@@ -86,7 +86,7 @@ watch(<HoverCard :content="data.description ?? ''" :content-title="data.summary" class="flex gap-x-4 gap-y-2 items-center"><template #trigger><h2 class="truncate capitalize group">{{ data.id }} - {{ data.name }}</h2>- <p v-if="data.summary" class="truncate text-neutral-500 dark:text-neutral-400 max-w-64 hidden md:block">+ <p v-if="data.summary" class="truncate text-neutral-600 dark:text-neutral-400 max-w-64 hidden md:block">{{ data.summary }}</p></template>@@ -98,14 +98,14 @@ watch(:src="`https://ui-avatars.com/api/?name=${data.user[0]}&color=7F9CF5&background=random`"alt="username"/>- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate line-clamp-1 capitalize" title="">+ <h4 class="text-xs text-neutral-600 dark:text-neutral-400 truncate line-clamp-1 capitalize" title="">{{ data.user }}</h4></div><span class="flex gap-1 w-full flex-wrap md:flex-nowrap col-span-2"><h4- class="text-xs text-neutral-500 dark:text-neutral-400 xs:truncate capitalize flex-auto xs:flex-1 md:flex-auto break-words"+ class="text-xs text-neutral-600 dark:text-neutral-400 xs:truncate capitalize flex-auto xs:flex-1 md:flex-auto break-words":title="`Created: ${data.created_at}\n` +(data.started_at ? `Started: ${data.started_at} UTC\n` : '') +@@ -122,12 +122,12 @@ watch(</h4><h4v-if="within24Hrs(data.started_at ?? data.created_at) || data.duration"- class="text-xs text-neutral-500 dark:text-neutral-400 truncate capitalize md:ml-auto"+ class="text-xs text-neutral-600 dark:text-neutral-400 truncate capitalize md:ml-auto"title="Time">{{ data.duration ? 'Duration:' : data.started_at ? 'Started: ' : 'Scheduled: ' }}</h4>- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 capitalize md:me-auto line-clamp-1" title="Time">+ <h4 class="text-xs text-neutral-600 dark:text-neutral-400 capitalize md:me-auto line-clamp-1" title="Time">{{ data.duration ? toFormattedDuration(data.duration, false) : toTimeSpan(data.started_at ?? data.created_at, data.started_at ? ' UTC' : '') }}</h4></span>@@ -136,11 +136,11 @@ watch(:class="`grid xs:grid-cols-2 col-span-3 md:col-span-2 gap-x-4`":title="`Sub Tasks: ${data.sub_tasks_total}\n\nPending: ${data.sub_tasks_pending}\n\nCompleted: ${data.sub_tasks_complete}\n\nFailed: ${data.sub_tasks_failed}`">- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate line-clamp-1 capitalize w-24">Sub Tasks: {{ data.sub_tasks_total }}</h4>- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate line-clamp-1 capitalize" v-if="data.sub_tasks_failed">+ <h4 class="text-xs text-neutral-600 dark:text-neutral-400 truncate line-clamp-1 capitalize w-24">Sub Tasks: {{ data.sub_tasks_total }}</h4>+ <h4 class="text-xs text-neutral-600 dark:text-neutral-400 truncate line-clamp-1 capitalize" v-if="data.sub_tasks_failed">Failed: {{ data.sub_tasks_failed }}</h4>- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate line-clamp-1 capitalize" v-else>Pending: {{ data.sub_tasks_pending }}</h4>+ <h4 class="text-xs text-neutral-600 dark:text-neutral-400 truncate line-clamp-1 capitalize" v-else>Pending: {{ data.sub_tasks_pending }}</h4></span></div></div>@@ -216,7 +216,7 @@ watch(</span><Popoverref="popover"- popoverClass="!w-40 rounded-lg "+ popoverClass="!w-40 rounded-lg mt-8":buttonComponent="ButtonCorner":button-attributes="{positionClasses: 'w-7 h-7 !p-1 ml-auto',@@ -236,26 +236,25 @@ watch(</div><div class="grid gap-2">- <ButtonText class="h-8 dark:!bg-neutral-950" :title="'Run Again'" disabled>- <template #text> Run Again </template>+ <ButtonText class="h-8 dark:!bg-neutral-950" :title="'Run Again'" text="Run Again" disabled><template #icon> <ProiconsArrowSync class="h-4 w-4" /></template></ButtonText><ButtonTextv-if="data.status_key >= 0 && data.status_key <= 1"class="h-8 text-rose-600 dark:!bg-rose-700 disabled:opacity-60"+ text="Cancel Task"@click.stop.prevent="handleClick('cancel')":title="'Cancel Task'">- <template #text> Cancel </template><template #icon> <ProiconsDelete class="h-4 w-4" /></template></ButtonText><ButtonTextv-elseclass="h-8 text-rose-600 dark:!bg-rose-700 disabled:opacity-60"@click.stop.prevent="handleClick()"+ text="Remove":title="'Remove Task\'s Record From Server'">- <template #text> Remove </template><template #icon> <ProiconsDelete class="h-4 w-4" /></template></ButtonText></div>diff --git a/resources/js/components/cards/UserCard.vue b/resources/js/components/cards/UserCard.vueindex 0536d413..c15b58dc 100644--- a/resources/js/components/cards/UserCard.vue+++ b/resources/js/components/cards/UserCard.vue@@ -104,7 +104,7 @@ const props = defineProps<{ data: UserResource }>();/></div></section>- <section class="flex flex-col sm:flex-row sm:justify-between w-full text-sm text-neutral-500 dark:text-neutral-400">+ <section class="flex flex-col sm:flex-row sm:justify-between w-full text-sm text-neutral-600 dark:text-neutral-400"><h3 class="w-full text-wrap truncate sm:text-nowrap" :title="`Date joined`">Date Joined:{{ data.created_at ? toFormattedDate(new Date(data.created_at), false, { year: 'numeric', month: 'short', day: 'numeric' }) : 'Unknown' }}diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex a95c86d9..7c70054c 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -20,6 +20,7 @@ import CircumEdit from '~icons/circum/edit';const emit = defineEmits(['clickAction', 'otherAction']);const props = defineProps<{ data: VideoResource; index: number; currentID: any }>();const metaData = useMetaData({ ...props.data }, true);+const { stateFolder, stateDirectory } = storeToRefs(useContentStore());const { setContextMenu } = useAppStore();@@ -79,7 +80,7 @@ watch(<h3 v-else class="flex-1 truncate min-w-[30%]" :title="data.title">{{ data.title }}</h3>- <span class="flex gap-1 truncate text-neutral-500 dark:text-neutral-400 text-sm">+ <span class="flex gap-1 truncate text-neutral-600 dark:text-neutral-400 text-sm"><h4 class="text-nowrap text-start truncate" :title="`File Size: ${data.file_size ? formatFileSize(data.file_size) : ''}`">{{ data.file_size ? formatFileSize(data.file_size) : '' }}</h4>@@ -98,7 +99,7 @@ watch(</h4></span></section>- <section class="flex flex-wrap justify-between gap-x-4 gap-y-2 w-full items-start text-sm sm:w-auto text-neutral-500 dark:text-neutral-400 group">+ <section class="flex flex-wrap justify-between gap-x-4 gap-y-2 w-full items-start text-sm sm:w-auto text-neutral-600 dark:text-neutral-400 group"><span class="flex gap-2 items-center w-full flex-1"><span class="flex gap-1 truncate"><h4 class="text-nowrap text-start truncate" :title="`View Count: ${metaData?.fields?.views}`">diff --git a/resources/js/components/dashboard/DashboardAnalytics.vue b/resources/js/components/dashboard/DashboardAnalytics.vueindex 361c6456..b4b05cad 100644--- a/resources/js/components/dashboard/DashboardAnalytics.vue+++ b/resources/js/components/dashboard/DashboardAnalytics.vue@@ -6,6 +6,7 @@ import { ref, useTemplateRef, watch } from 'vue';import { handleStartTask } from '@/service/taskService';import { periodForHumans } from '@/service/pulseUtil';+import DashboardTaskMenu from '@/components/dashboard/DashboardTaskMenu.vue';import PulseRequests from '@/components/pulseCards/PulseRequests.vue';import DashboardCard from '@/components/cards/DashboardCard.vue';import PulseServers from '@/components/pulseCards/PulseServers.vue';@@ -15,13 +16,9 @@ import ButtonText from '@/components/inputs/ButtonText.vue';import Popover from '@/components/pinesUI/Popover.vue';import LucideChartNoAxesCombined from '~icons/lucide/chart-no-axes-combined';-import LucideFolderSearch from '~icons/lucide/folder-search';-import LucideFolderCheck from '~icons/lucide/folder-check';import ProiconsArrowSync from '~icons/proicons/arrow-sync';-import LucideFolderTree from '~icons/lucide/folder-tree';-import LucideFolderSync from '~icons/lucide/folder-sync';-import ProiconsAdd from '~icons/proicons/add';import ProiconsBolt from '~icons/proicons/bolt';+import ProiconsAdd from '~icons/proicons/add';const validPeriods: { key: string; value: string }[] = [{ key: '1h', value: '1_hour' },@@ -35,7 +32,7 @@ const period = ref<string>('1_hour');const pulseData = ref<PulseResponse>();const taskPopover = useTemplateRef('taskPopover');-const { data: stats, isLoading } = useGetSiteAnalytics(period);+const { data: stats } = useGetSiteAnalytics(period);const { data: rawPulseData, isLoading: pulseLoading } = useGetPulse({ period });watch(@@ -50,78 +47,24 @@ watch(<template><section class="flex flex-wrap gap-4 flex-col"><section class="flex justify-between flex-wrap gap-2">- <div class="flex items-center gap-2 flex-wrap [&>*]:h-8">- <ButtonText @click.stop.prevent="handleStartTask('scan')">- <template #text>Run Full Scan</template>+ <div class="flex items-center gap-2 flex-wrap [&>*]:h-8 w-full md:w-auto">+ <ButtonText @click.stop.prevent="handleStartTask('scan')" :text="'Run Full Scan'" class="flex-1"><template #icon><ProiconsArrowSync /></template></ButtonText>- <Popover popoverClass="!w-52 rounded-lg " :button-attributes="{ title: 'Start New Task' }" ref="taskPopover">- <template #buttonText>New Task</template>+ <Popover+ popoverClass="!w-52 rounded-lg mt-10 "+ :button-attributes="{ title: 'Start New Task', text: 'New Task', class: 'w-full sm:w-auto' }"+ ref="taskPopover"+ class="w-full sm:w-auto"+ ><template #buttonIcon><ProiconsAdd /></template><template #content>- <div class="grid gap-4">- <div class="space-y-2">- <h4 class="font-medium leading-none">Start Server Task</h4>- </div>-- <div class="grid gap-2">- <ButtonText- class="h-8 dark:!bg-neutral-950"- :title="'Scan for Folder Changes'"- @click="- handleStartTask('index').then(() => {- taskPopover?.handleClose();- })- "- >- <template #text> Index Files </template>- <template #icon> <LucideFolderSearch class="-order-1 h-4 w-4" /></template>- </ButtonText>- <ButtonText- class="h-8 dark:!bg-neutral-950"- :title="'Sync Folder With Database'"- @click="- handleStartTask('sync').then(() => {- taskPopover?.handleClose();- })- "- >- <template #text> Sync Files </template>- <template #icon> <LucideFolderSync class="-order-1 h-4 w-4" /></template>- </ButtonText>- <ButtonText- class="h-8 dark:!bg-neutral-950 disabled:opacity-60"- :title="'Scan for New Metadata'"- @click="- handleStartTask('verify').then(() => {- taskPopover?.handleClose();- })- "- >- <template #text> Verify Metadata </template>- <template #icon> <LucideFolderCheck class="-order-1 h-4 w-4" /></template>- </ButtonText>-- <ButtonText- class="h-8 text-rose-600 dark:!bg-rose-700 disabled:opacity-60"- :title="'Scan and Index All Files For Metadata'"- @click.stop.prevent="- handleStartTask('scan').then(() => {- taskPopover?.handleClose();- })- "- >- <template #text> Scan All Files </template>- <template #icon> <LucideFolderTree class="-order-1 h-4 w-4" /></template>- </ButtonText>- </div>- </div>+ <DashboardTaskMenu @handle-close="taskPopover?.handleClose" :show-scan-all="false" /></template></Popover>- <ButtonText :to="'/pulse'">- <template #text>Pulse</template>+ <ButtonText :to="'/pulse'" text="Pulse" class="w-full sm:w-auto"><template #icon><ProiconsBolt /></template></ButtonText></div>diff --git a/resources/js/components/dashboard/DashboardTaskMenu.vue b/resources/js/components/dashboard/DashboardTaskMenu.vuenew file mode 100644index 00000000..b10090c2--- /dev/null+++ b/resources/js/components/dashboard/DashboardTaskMenu.vue@@ -0,0 +1,46 @@+<script setup lang="ts">+import { handleStartTask } from '@/service/taskService';++import ButtonText from '@/components/inputs/ButtonText.vue';++import LucideFolderSearch from '~icons/lucide/folder-search';+import LucideFolderCheck from '~icons/lucide/folder-check';+import LucideFolderTree from '~icons/lucide/folder-tree';+import LucideFolderSync from '~icons/lucide/folder-sync';++const props = withDefaults(defineProps<{ showScanAll?: boolean }>(), { showScanAll: true });++const emit = defineEmits({ handleClose: () => {} });++const handleClose = (job: 'index' | 'sync' | 'verify' | 'scan' | 'verifyFolders') => {+ handleStartTask(job).then(() => emit('handleClose'));+};+</script>++<template>+ <div class="grid gap-4">+ <div class="space-y-2">+ <h4 class="font-medium leading-none">Start Server Task</h4>+ </div>++ <div class="grid gap-2 [&>*]:dark:bg-neutral-900 [&>*]:h-8 [&>*]:disabled:opacity-60">+ <ButtonText :title="'Scan for Folder Changes'" text="Index Files" @click="handleClose('index')">+ <template #icon> <LucideFolderSearch class="order-1 h-4 w-4" /></template>+ </ButtonText>+ <ButtonText :title="'Sync Folder With Database'" text="Sync Files" @click="handleClose('sync')">+ <template #icon> <LucideFolderSync class="order-1 h-4 w-4" /></template>+ </ButtonText>+ <ButtonText :title="'Scan for New Metadata'" text="Verify Metadata" @click="handleClose('verify')">+ <template #icon> <LucideFolderCheck class="order-1 h-4 w-4" /></template>+ </ButtonText>++ <ButtonText :title="'Scan for New Metadata'" text="Verify Folders" @click="handleClose('verifyFolders')">+ <template #icon> <LucideFolderCheck class="order-1 h-4 w-4" /></template>+ </ButtonText>++ <ButtonText v-if="showScanAll" class="dark:!bg-rose-700" title="Scan and Index All Files For Metadata" text="Scan All Files" @click="handleClose('scan')">+ <template #icon> <LucideFolderTree class="order-1 h-4 w-4" /></template>+ </ButtonText>+ </div>+ </div>+</template>diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vueindex 70730e3a..86dc8951 100644--- a/resources/js/components/dashboard/DashboardTasks.vue+++ b/resources/js/components/dashboard/DashboardTasks.vue@@ -13,6 +13,7 @@ import { storeToRefs } from 'pinia';import { sortObject } from '@/service/util';import { toast } from '@/service/toaster/toastService';+import DashboardTaskMenu from '@/components/dashboard/DashboardTaskMenu.vue';import ButtonText from '@/components/inputs/ButtonText.vue';import ModalBase from '@/components/pinesUI/ModalBase.vue';import TableBase from '@/components/table/TableBase.vue';@@ -20,11 +21,7 @@ import TaskCard from '@/components/cards/TaskCard.vue';import useModal from '@/composables/useModal';import Popover from '@/components/pinesUI/Popover.vue';-import LucideFolderSearch from '~icons/lucide/folder-search';-import LucideFolderCheck from '~icons/lucide/folder-check';import ProiconsArrowSync from '~icons/proicons/arrow-sync';-import LucideFolderTree from '~icons/lucide/folder-tree';-import LucideFolderSync from '~icons/lucide/folder-sync';import ProiconsAdd from '~icons/proicons/add';const sortingOptions = [@@ -196,82 +193,13 @@ onUnmounted(async () => {<section id="tasks" class="flex gap-8 flex-col"><div class="flex items-start gap-2 justify-between flex-wrap"><div class="flex flex-wrap items-center gap-2 [&>*]:h-fit [&>*]:xs:h-8">- <Popover popoverClass="!w-52 rounded-lg " :button-attributes="{ title: 'Start New Task' }" ref="taskPopover">+ <Popover popoverClass="!w-52 rounded-lg mt-10" :button-attributes="{ title: 'Start New Task' }" ref="taskPopover"><template #buttonText>New Task</template><template #buttonIcon><ProiconsAdd /></template><template #content>- <div class="grid gap-4">- <div class="space-y-2">- <h4 class="font-medium leading-none">Start Server Task</h4>- </div>-- <div class="grid gap-2">- <ButtonText- class="h-8 dark:!bg-neutral-950"- :title="'Scan for Folder Changes'"- @click="- handleStartTask('index').then(() => {- taskPopover?.handleClose();- })- "- >- <template #text> Index Files </template>- <template #icon> <LucideFolderSearch class="-order-1 h-4 w-4" /></template>- </ButtonText>- <ButtonText- class="h-8 dark:!bg-neutral-950"- :title="'Sync Folder With Database'"- @click="- handleStartTask('sync').then(() => {- taskPopover?.handleClose();- })- "- >- <template #text> Sync Files </template>- <template #icon> <LucideFolderSync class="-order-1 h-4 w-4" /></template>- </ButtonText>- <ButtonText- class="h-8 dark:!bg-neutral-950 disabled:opacity-60"- :title="'Scan for New Metadata'"- @click="- handleStartTask('verify').then(() => {- taskPopover?.handleClose();- })- "- >- <template #text> Verify Metadata </template>- <template #icon> <LucideFolderCheck class="-order-1 h-4 w-4" /></template>- </ButtonText>-- <ButtonText- class="h-8 dark:!bg-neutral-950 disabled:opacity-60"- :title="'Scan for New Metadata'"- @click="- handleStartTask('verifyFolders').then(() => {- taskPopover?.handleClose();- })- "- >- <template #text> Verify Folders </template>- <template #icon> <LucideFolderCheck class="-order-1 h-4 w-4" /></template>- </ButtonText>-- <ButtonText- class="h-8 text-rose-600 dark:!bg-rose-700 disabled:opacity-60"- :title="'Scan and Index All Files For Metadata'"- @click.stop.prevent="- handleStartTask('scan').then(() => {- taskPopover?.handleClose();- })- "- >- <template #text> Scan All Files </template>- <template #icon> <LucideFolderTree class="-order-1 h-4 w-4" /></template>- </ButtonText>- </div>- </div>+ <DashboardTaskMenu @handle-close="taskPopover?.handleClose" /></template></Popover><ButtonTextdiff --git a/resources/js/components/inputs/ButtonText.vue b/resources/js/components/inputs/ButtonText.vueindex a12cb76c..2288e6f6 100755--- a/resources/js/components/inputs/ButtonText.vue+++ b/resources/js/components/inputs/ButtonText.vue@@ -8,6 +8,7 @@ const props = withDefaults(variant?: 'default' | 'ghost';to?: string;target?: string;+ text?: string;}>(),{title: '',@@ -33,7 +34,9 @@ const props = withDefaults(:aria-disabled="disabled":target="target ?? '_blank'">- <slot name="text"> </slot>+ <slot name="text">+ <p class="line-clamp-1 flex-1 text-left">{{ text }}</p>+ </slot><slot name="icon"> </slot></router-link><button@@ -48,7 +51,9 @@ const props = withDefaults(:disabled="disabled":title="title ?? 'Button'">- <slot name="text"> </slot>+ <slot name="text">+ <p class="line-clamp-1 flex-1 text-left" v-if="text">{{ text }}</p>+ </slot><slot name="icon"> </slot></button></template>diff --git a/resources/js/components/inputs/ToggleBase.vue b/resources/js/components/inputs/ToggleBase.vueindex 832bfefc..9e4608ed 100755--- a/resources/js/components/inputs/ToggleBase.vue+++ b/resources/js/components/inputs/ToggleBase.vue@@ -7,7 +7,7 @@ const { name } = defineProps(['name']);<section class="toggle-switch shrink-0 flex flex-col"><label class="switch-label" :for="name"><input type="checkbox" class="checkbox peer invisible text-white" :name="name" v-model="model" v-bind:checked="model" />- <span class="sliderBase peer-checked:!bg-white peer-checked:dark:!bg-violet-700"></span>+ <span class="sliderBase peer-checked:!bg-white peer-checked:dark:!bg-neutral-50"></span></label></section></template>@@ -18,10 +18,10 @@ const { name } = defineProps(['name']);width: 60px;height: 30px;--light: #d8dbe0;- --dark: #28292c;+ --dark: #27272a;--disabled: #d8dbe0;- --enabled: #28292c;- --accent: #28292c;+ --enabled: #27272a;+ --accent: #27272a;--link: rgb(27, 129, 112);--link-hover: rgb(24, 94, 82);}diff --git a/resources/js/components/inputs/ToggleLightMode.vue b/resources/js/components/inputs/ToggleLightMode.vueindex 90273400..df036af5 100755--- a/resources/js/components/inputs/ToggleLightMode.vue+++ b/resources/js/components/inputs/ToggleLightMode.vue@@ -29,10 +29,10 @@ const { lightMode } = storeToRefs(appStore);width: 60px;height: 30px;--light: #ffffff;- --dark: #28292c;+ --dark: #27272a;--disabled: #d8dbe0;- --enabled: #28292c;- --accent: #28292c;+ --enabled: #27272a;+ --accent: #27272a;--link: rgb(27, 129, 112);--link-hover: rgb(24, 94, 82);}diff --git a/resources/js/components/pinesUI/ButtonClipboard.vue b/resources/js/components/pinesUI/ButtonClipboard.vueindex f143c95b..799b9c01 100755--- a/resources/js/components/pinesUI/ButtonClipboard.vue+++ b/resources/js/components/pinesUI/ButtonClipboard.vue@@ -34,7 +34,7 @@ const copyToClipboard = async () => {<input:value="props.text"disabled- class="h-8 w-full rounded-md shadow-sm block p-2 border-none outline-none text-gray-900 dark:text-gray-300 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700"+ class="cursor-text h-8 w-full rounded-md shadow-sm block p-2 border-none outline-none text-gray-900 dark:text-gray-300 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700"/><div class="relative z-20 flex items-center"><Transition@@ -56,7 +56,7 @@ const copyToClipboard = async () => {</Transition><ButtonIcon@click="copyToClipboard()"- class="flex items-center justify-center h-8 w-9 text-xs group text-neutral-500 hover:text-neutral-600 dark:text-gray-300 dark:hover:text-gray-400 hover:bg-neutral-100 focus:!ring-green-600/50"+ class="flex items-center justify-center h-8 w-9 text-xs group text-neutral-600 hover:text-gray-900 dark:text-gray-300 dark:hover:text-gray-400 hover:bg-neutral-100 focus:!ring-green-600/50"><template #icon><svgdiff --git a/resources/js/components/pulse/PulseNoResults.vue b/resources/js/components/pulse/PulseNoResults.vueindex 44273e14..75e47188 100644--- a/resources/js/components/pulse/PulseNoResults.vue+++ b/resources/js/components/pulse/PulseNoResults.vue@@ -4,7 +4,7 @@ import IconNoPulse from '@/components/icons/IconNoPulse.vue';<template><div class="h-full flex flex-col items-center justify-center p-4">- <IconNoPulse class="h-8 w-8 stroke-gray-300 dark:stroke-gray-700" />- <p class="mt-2 text-sm text-gray-400 dark:text-gray-600">No results</p>+ <IconNoPulse class="h-8 w-8 stroke-gray-300 dark:stroke-gray-600" />+ <p class="mt-2 text-sm text-gray-400 dark:text-gray-500">No results</p></div></template>diff --git a/resources/js/components/pulse/PulseScroll.vue b/resources/js/components/pulse/PulseScroll.vueindex e1b99ff3..c383e962 100644--- a/resources/js/components/pulse/PulseScroll.vue+++ b/resources/js/components/pulse/PulseScroll.vue@@ -1,10 +1,9 @@-@props(['expand' => false])<script setup lang="ts">import { nextTick, onMounted, ref } from 'vue';const props = withDefaults(defineProps<{ expand?: boolean; loading: boolean }>(), { expand: false });-const fade = ref<HTMLDivElement>();const content = ref<HTMLDivElement>();+const fade = ref<HTMLDivElement>();function scroll() {if (!fade.value) return;diff --git a/resources/js/components/pulseCards/PulseServers.vue b/resources/js/components/pulseCards/PulseServers.vueindex d084c92f..80dbc325 100644--- a/resources/js/components/pulseCards/PulseServers.vue+++ b/resources/js/components/pulseCards/PulseServers.vue@@ -252,7 +252,8 @@ watch(<template><section- :class="`overflow-x-auto overflow-y-hidden scrollbar-minimal-x max-w-full pb-2 default:col-span-full default:lg:col-span-${props.cols} default:row-span-${props.rows} ${isLoading ? 'opacity-25 animate-pulse ' : ''}${props.class ?? ''}`"+ :class="`overflow-x-auto overflow-y-hidden scrollbar-minimal-x scrollbar-thumb:bg-gray-300 dark:scrollbar-thumb:bg-gray-500/50 scrollbar-track:rounded scrollbar-track:bg-gray-100 dark:scrollbar-track:bg-gray-500/10 supports-scrollbars+ max-w-full pb-2 default:col-span-full default:lg:col-span-${props.cols} default:row-span-${props.rows} ${isLoading ? 'opacity-25 animate-pulse ' : ''}${props.class ?? ''}`"><divv-if="servers"diff --git a/resources/js/components/table/TablePaginationButton.vue b/resources/js/components/table/TablePaginationButton.vueindex 5b4f22e6..74506e1d 100755--- a/resources/js/components/table/TablePaginationButton.vue+++ b/resources/js/components/table/TablePaginationButton.vue@@ -19,7 +19,7 @@ const props = withDefaults(<template><li :class="{ hidden: props.currentPage !== props.pageNumber && !props.text && !props.sticky }" class="h-full md:block z-0"><button- class="relative inline-flex items-center h-full px-3 group hover:text-gray-900 hover:dark:text-white disabled:dark:text-neutral-500 disabled:text-neutral-300"+ class="relative inline-flex items-center h-full px-3 group hover:text-gray-900 hover:dark:text-white disabled:dark:text-neutral-500 disabled:text-neutral-400 disabled:cursor-not-allowed":class="{ 'text-gray-900 dark:text-white bg-gray-50 dark:bg-neutral-900': props.currentPage === props.pageNumber }":disabled="props.disabled ?? false">diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 057336cc..c88e1e92 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -87,7 +87,7 @@ watch(</script><template>- <section class="flex flex-wrap gap-4 p-3 w-full rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-primary-800 z-[3] text-neutral-500 dark:text-neutral-400">+ <section class="flex flex-wrap gap-4 p-3 w-full rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-primary-800 z-[3] text-neutral-600 dark:text-neutral-400"><section id="mp4-header-mobile" class="flex items-center w-full sm:hidden flex-wrap gap-x-2"><HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`" class="flex-1 min-w-10"><template #trigger>diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex 05971581..3c3751d2 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -896,9 +896,9 @@ defineExpose({<track kind="captions" />Your browser does not support the video tag.</video>- <section style="z-index: 4" :class="`player-controls text-white pointer-events-none ${controls ? 'cursor-auto' : 'cursor-none'}`">+ <section style="z-index: 4" :class="`player-controls text-white pointer-events-none font-mono text-xs ${controls ? 'cursor-auto' : 'cursor-none'}`"><!-- Video Stats (Z-6) -->- <section class="absolute p-1 sm:p-4 top-0 left-0 text-xs font-mono pointer-events-auto" v-show="isShowingStats" style="z-index: 6">+ <section class="absolute p-1 sm:p-4 top-0 left-0 pointer-events-auto" v-show="isShowingStats" style="z-index: 6"><div class="flex gap-2 bg-neutral-900/80 border-slate-700/20 border rounded-md p-2 w-fit sm:min-w-52"><span class="[&>*]:line-clamp-1 [&>*]:break-all text-right"><p title="Dropped Frames vs Total Frames" v-if="!isAudio">Dropped Frames:</p>@@ -925,7 +925,7 @@ defineExpose({</section><!-- Watch Party (Z-6) -->- <section class="absolute p-1 sm:p-4 top-0 right-0 text-xs font-mono pointer-events-auto" v-show="isShowingParty" style="z-index: 6">+ <section class="absolute p-1 sm:p-4 top-0 right-0 pointer-events-auto" v-show="isShowingParty" style="z-index: 6"><VideoPartyPanel :player="player ?? undefined" /></section>@@ -953,7 +953,7 @@ defineExpose({<divv-show="controls && isFullScreen"style="z-index: 4"- :class="`absolute top-0 left-0 w-full opacity-40 bg-gradient-to-b from-black to-transparent`"+ :class="`absolute top-0 left-0 w-full opacity-40 bg-gradient-to-b from-black to-transparent h-16`"v-cloak></div></Transition>@@ -1019,7 +1019,7 @@ defineExpose({</section><!-- Controls -->- <section class="w-full flex items-center gap-2 p-2 text-xs pointer-events-auto">+ <section class="w-full flex items-center gap-2 p-2 pointer-events-auto"><section class="flex gap-1 items-center"><VideoButtonv-if="previousVideoURL && isAudio"@@ -1068,14 +1068,14 @@ defineExpose({</section><section- class="hidden sm:flex gap-1 font-mono opacity-80 hover:opacity-100 line-clamp-1"+ class="hidden sm:flex gap-1 opacity-80 hover:opacity-100 line-clamp-1":title="`The ${isAudio ? 'audio' : 'video'} will finish at ${endsAtTime}`"v-show="endsAtTime !== '00:00' && endsAtTime !== ''"><p class="truncate">Ends at</p><time class="text-nowrap">{{ endsAtTime }}</time></section>- <section class="line-clamp-1 overflow-clip font-mono opacity-80 hover:opacity-100 ml-auto hidden xs:flex" :title="timeStrings.timeVerbose">+ <section class="line-clamp-1 overflow-clip opacity-80 hover:opacity-100 ml-auto hidden xs:flex" :title="timeStrings.timeVerbose"><time>{{ timeStrings.timeElapsed }}</time><span> / </span><time>{{ timeStrings.timeDuration }}</time>@@ -1105,7 +1105,7 @@ defineExpose({/></section><VideoPopover- popoverClass="!max-w-40 rounded-lg h-20 md:h-fit font-mono"+ popoverClass="!max-w-40 rounded-lg h-20 md:h-fit "ref="popover":margin="80":player="player ?? undefined"@@ -1115,7 +1115,7 @@ defineExpose({<ProiconsSettings class="w-4 h-4 hover:rotate-180 transition-transform ease-in-out duration-500" /></template><template #content>- <section class="flex flex-col text-xs h-16 md:h-fit overflow-y-auto scrollbar-minimal transition-transform">+ <section class="flex flex-col h-16 md:h-fit overflow-y-auto scrollbar-minimal transition-transform"><VideoPopoverItem v-for="(item, index) in videoPopoverItems" :key="index" v-bind="item" /><VideoPopoverSliderv-model="currentSpeed"@@ -1164,7 +1164,7 @@ defineExpose({</Transition><!-- Title (Z-5) -->- <section v-show="controls && isFullScreen" :class="`w-fit h-fit absolute top-0 left-0 flex flex-col px-4 p-2 font-mono text-base`" style="z-index: 5">+ <section v-show="controls && isFullScreen" :class="`w-fit h-fit absolute top-0 left-0 flex flex-col px-4 p-2 text-xl drop-shadow-md`" style="z-index: 5"><h2 class="line-clamp-1">{{ stateVideo.title }}</h2></section>@@ -1212,7 +1212,7 @@ defineExpose({</section><!-- Tap Controls (Z-4) -->- <section :class="`text-xs font-mono select-none pointer-events-auto${controls ? ' cursor-auto' : ' cursor-none'}`" style="z-index: 4">+ <section :class="`select-none pointer-events-auto${controls ? ' cursor-auto' : ' cursor-none'}`" style="z-index: 4"><span:class="`absolute ${isFullScreen ? 'w-1/4' : 'w-1/3 sm:w-1/4'} h-full top-0 left-0 flex flex-col gap-1 items-center justify-center`"style="z-index: 4"diff --git a/tailwind.config.js b/tailwind.config.jsindex 480184c0..7c55e626 100755--- a/tailwind.config.js+++ b/tailwind.config.js@@ -96,15 +96,17 @@ export default {},},plugins: [- plugin(function ({ addVariant }) {- addVariant('hocus', ['&:hover', '&:focus']);- }),-- require('@tailwindcss/forms'),-+ // require("@tailwindcss/container-queries"),require('@tailwindcss/aspect-ratio'),-require('tailwind-scrollbar-hide'),+ require('@tailwindcss/forms'),+ function ({ addVariant }) {+ addVariant('hocus', ['&:hover', '&:focus']);+ addVariant('default', 'html :where(&)');+ addVariant('scrollbar', '&::-webkit-scrollbar');+ addVariant('scrollbar-track', '&::-webkit-scrollbar-track');+ addVariant('scrollbar-thumb', '&::-webkit-scrollbar-thumb');+ },],jit: true,};