Skip to content

A self-hosted media server and file management system

feat: fix dashboard styling on library cards and breadcrumbs

aminnausinf0ecef953bfc
diff --git a/linted b/linted
deleted file mode 100644
index e69de29b..00000000
diff --git a/resources/js/components/cards/CategoryCard.vue b/resources/js/components/cards/LibraryCard.vue
similarity index 63%
rename from resources/js/components/cards/CategoryCard.vue
rename to resources/js/components/cards/LibraryCard.vue
index 06857e7c..c6415281 100644
--- a/resources/js/components/cards/CategoryCard.vue
+++ b/resources/js/components/cards/LibraryCard.vue
@@ -10,7 +10,6 @@ import { toast } from '@/service/toaster/toastService';
import FormInputLabel from '@/components/labels/FormInputLabel.vue';
import InputSelect from '@/components/pinesUI/InputSelect.vue';
-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
import Popover from '@/components/pinesUI/Popover.vue';
@@ -20,7 +19,7 @@ import ProiconsLockOpen from '~icons/proicons/lock-open';
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';
+import LibraryCardMenu from './LibraryCardMenu.vue';
const props = defineProps<{ data?: CategoryResource }>();
const defaultFolder = ref<FolderResource>();
@@ -131,64 +130,15 @@ watch(
<ProiconsMoreVertical class="h-4 w-4" />
</template>
<template #content>
- <div class="space-y-4" v-if="data">
- <div class="space-y-2">
- <h4 class="font-medium leading-none">Manage Library</h4>
- <p class="text-sm text-muted-foreground">Set Library Properties.</p>
- </div>
-
- <div class="space-y-2 [&>*]:w-full">
- <div class="flex flex-col gap-1">
- <FormInputLabel :field="{ text: 'Default Folder', name: 'Default Folder' }" class="font-normal" />
- <InputSelect
- id="default-folder"
- root-class="flex-1 rounded-l-none capitalize !w-full !whitespace-nowrap col-span-2"
- class="h-8"
- :placeholder="'Select Default Folder'"
- :default-item="folders.findIndex((folder) => folder.id == defaultFolder?.id) ?? 0"
- :disabled="processing || !folders.length"
- :title="'Select Default Folder'"
- @selectItem="handleSetDefaultFolder"
- :options="
- folders.map((folder) => {
- return { title: folder.name, value: folder.id };
- })
- "
- />
- </div>
-
- <ButtonText class="h-8 dark:!bg-neutral-950" :title="'Scan for Changes'" @click="handleStartScan(false)">
- <template #text> Scan Files </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(true)">
- <template #text> Verify Files </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="'Toggle Privacy'"
- @click="handleTogglePrivacy(data.id, data.is_private ?? false)"
- :disabled="processing"
- >
- <template #text> {{ data.is_private ? 'Set to Public' : 'Set to Private' }} </template>
- <template #icon> <ProiconsLock v-if="data.is_private" class="h-4 w-4" /> <ProiconsLockOpen v-else 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'"
- @click.stop.prevent="$emit('clickAction')"
- disabled
- >
- <template #text> Remove Library </template>
- <template #icon> <ProiconsDelete class="h-4 w-4" /></template>
- </ButtonText>
- </div>
- </div>
+ <LibraryCardMenu
+ v-bind:data="data"
+ v-bind:folders="folders"
+ v-bind:default-folder="defaultFolder"
+ :processing="processing"
+ :handle-set-default-folder="handleSetDefaultFolder"
+ :handle-start-scan="handleStartScan"
+ v-bind:handle-toggle-privacy="handleTogglePrivacy"
+ />
</template>
</Popover>
</span>
diff --git a/resources/js/components/cards/LibraryCardMenu.vue b/resources/js/components/cards/LibraryCardMenu.vue
new file mode 100644
index 00000000..fa6cda96
--- /dev/null
+++ b/resources/js/components/cards/LibraryCardMenu.vue
@@ -0,0 +1,78 @@
+<script setup lang="ts">
+import type { CategoryResource, FolderResource } from '@/types/resources';
+
+import FormInputLabel from '@/components/labels/FormInputLabel.vue';
+import InputSelect from '@/components/pinesUI/InputSelect.vue';
+import ButtonText from '@/components/inputs/ButtonText.vue';
+
+import ProiconsArrowSync from '~icons/proicons/arrow-sync';
+import ProiconsLockOpen from '~icons/proicons/lock-open';
+import CircumFolderOn from '~icons/circum/folder-on';
+import ProiconsDelete from '~icons/proicons/delete';
+import ProiconsLock from '~icons/proicons/lock';
+
+const props = withDefaults(
+ defineProps<{
+ data?: CategoryResource;
+ folders: FolderResource[];
+ defaultFolder?: FolderResource;
+ processing: boolean;
+ handleSetDefaultFolder: (newFolder: { value: number }) => Promise<void>;
+ handleStartScan: (verifyOnly?: boolean) => Promise<void>;
+ handleTogglePrivacy: (id: number, currentValue: boolean) => Promise<void>;
+ }>(),
+ {},
+);
+</script>
+
+<template>
+ <div class="space-y-4" v-if="data">
+ <div class="space-y-2">
+ <h4 class="font-medium leading-none">Manage Library</h4>
+ <p class="text-sm text-muted-foreground">Set Library Properties.</p>
+ </div>
+ <div class="[&>*]:w-full grid gap-2 [&>*]:dark:bg-neutral-900 [&>*]:h-8 [&>*]:disabled:opacity-60">
+ <div class="flex flex-col gap-1 !h-auto !bg-transparent">
+ <FormInputLabel :field="{ text: 'Default Folder', name: 'Default Folder' }" class="font-normal" />
+ <InputSelect
+ id="default-folder"
+ root-class="flex-1 rounded-l-none capitalize !w-full !whitespace-nowrap col-span-2 "
+ :class="'h-8 dark:!bg-neutral-900'"
+ :placeholder="'Select Default Folder'"
+ :default-item="folders.findIndex((folder) => folder.id == defaultFolder?.id) ?? 0"
+ :disabled="processing || !folders.length"
+ :title="'Select Default Folder'"
+ :menu-margin="{ top: 'mt-10', bottom: 'mb-10' }"
+ @selectItem="handleSetDefaultFolder"
+ :options="
+ folders.map((folder) => {
+ return { title: folder.name, value: folder.id };
+ })
+ "
+ />
+ </div>
+
+ <ButtonText :title="'Scan for Changes'" @click="handleStartScan(false)">
+ <template #text> <p class="flex-1 text-start">Scan Files</p> </template>
+ <template #icon> <ProiconsArrowSync class="h-4 w-4" /></template>
+ </ButtonText>
+ <ButtonText :title="'Verify File Metadata'" @click="handleStartScan(true)">
+ <template #text> <p class="flex-1 text-start">Verify Files</p> </template>
+ <template #icon> <ProiconsArrowSync class="h-4 w-4" /></template>
+ </ButtonText>
+ <ButtonText :title="'Manage all Folders in Library'" :to="`/dashboard/libraries/${data?.id}`" target="">
+ <template #text> <p class="flex-1 text-start">Manage Folders</p> </template>
+ <template #icon> <CircumFolderOn class="order-1 h-4 w-4" /></template>
+ </ButtonText>
+ <ButtonText :title="'Toggle Privacy'" @click="handleTogglePrivacy(data.id, data.is_private ?? false)" :disabled="processing">
+ <template #text>
+ <p class="flex-1 text-start">{{ data.is_private ? 'Set to Public' : 'Set to Private' }}</p>
+ </template>
+ <template #icon> <ProiconsLock v-if="data.is_private" class="h-4 w-4" /> <ProiconsLockOpen v-else class="h-4 w-4" /></template>
+ </ButtonText>
+ <ButtonText class="text-rose-600 dark:!bg-rose-700" :title="'Remove From Server'" text="Remove Library" @click.stop.prevent="$emit('clickAction')" disabled>
+ <template #icon> <ProiconsDelete class="h-4 w-4" /></template>
+ </ButtonText>
+ </div>
+ </div>
+</template>
diff --git a/resources/js/components/cards/CategoryFolderCard.vue b/resources/js/components/cards/LibraryFolderCard.vue
similarity index 60%
rename from resources/js/components/cards/CategoryFolderCard.vue
rename to resources/js/components/cards/LibraryFolderCard.vue
index cf0d04c2..f67819f2 100644
--- a/resources/js/components/cards/CategoryFolderCard.vue
+++ b/resources/js/components/cards/LibraryFolderCard.vue
@@ -4,15 +4,12 @@ import { type FolderResource } from '@/types/resources';
import { formatFileSize, handleStorageURL, toFormattedDate } from '@/service/util';
import { useTemplateRef } from 'vue';
+import LibraryFolderCardMenu from '@/components/cards/LibraryFolderCardMenu.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');
@@ -42,36 +39,7 @@ const popover = useTemplateRef('popover');
<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>
+ <LibraryFolderCardMenu v-bind:data="data" :handle-close-popover="popover?.handleClose" @clickAction="$emit('clickAction', data?.id)" />
</template>
</Popover>
</span>
diff --git a/resources/js/components/cards/LibraryFolderCardMenu.vue b/resources/js/components/cards/LibraryFolderCardMenu.vue
new file mode 100644
index 00000000..b271d1aa
--- /dev/null
+++ b/resources/js/components/cards/LibraryFolderCardMenu.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import type { FolderResource } from '@/types/resources';
+
+import ButtonText from '@/components/inputs/ButtonText.vue';
+
+import ProiconsDelete from '~icons/proicons/delete';
+import ProiconsLock from '~icons/proicons/lock';
+import CircumEdit from '~icons/circum/edit';
+
+const props = withDefaults(defineProps<{ handleClosePopover?: () => void }>(), {});
+</script>
+
+<template>
+ <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="[&>*]:w-full grid gap-2 [&>*]:dark:bg-neutral-900 [&>*]:h-8 [&>*]:disabled:opacity-60">
+ <ButtonText
+ class="h-8 dark:!bg-neutral-950 disabled:opacity-60"
+ :title="'Edit Folder'"
+ @click.stop.prevent="
+ () => {
+ if (handleClosePopover) handleClosePopover();
+ $emit('clickAction');
+ }
+ "
+ >
+ <template #text> <p class="flex-1 text-start">Edit Folder</p></template>
+ <template #icon> <CircumEdit class="h-4 w-4" /></template>
+ </ButtonText>
+ <ButtonText :title="'Manage Metadata Settings'" disabled>
+ <template #text> <p class="flex-1 text-start">Manage Metadata</p> </template>
+ <template #icon> <ProiconsLock class="h-4 w-4" /></template>
+ </ButtonText>
+ <ButtonText class="text-rose-600 dark:!bg-rose-700" :title="'Remove From Server'" disabled>
+ <template #text> <p class="flex-1 text-start">Remove Folder</p> </template>
+ <template #icon> <ProiconsDelete class="h-4 w-4" /></template>
+ </ButtonText>
+ </div>
+ </div>
+</template>
diff --git a/resources/js/components/dashboard/DashboardActivity.vue b/resources/js/components/dashboard/DashboardActivity.vue
index b3e54957..b1238f5e 100644
--- a/resources/js/components/dashboard/DashboardActivity.vue
+++ b/resources/js/components/dashboard/DashboardActivity.vue
@@ -5,7 +5,7 @@ import type { CategoryResource } from '@/types/resources';
import { computed, ref } from 'vue';
import { toast } from '@/service/toaster/toastService';
-import CategoryCard from '@/components/cards/CategoryCard.vue';
+import LibraryCard from '@/components/cards/LibraryCard.vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
import TableBase from '@/components/table/TableBase.vue';
@@ -82,7 +82,7 @@ const handleSearch = (query: string) => {
: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-pagination="true"
:data="[...filteredCategories]"
- :row="CategoryCard"
+ :row="LibraryCard"
:click-action="() => {}"
:loading="false"
:sort-action="handleSort"
diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vue
index 630fdb5f..02811a8f 100644
--- a/resources/js/components/dashboard/DashboardLibraries.vue
+++ b/resources/js/components/dashboard/DashboardLibraries.vue
@@ -12,8 +12,8 @@ import { storeToRefs } from 'pinia';
import { sortObject } from '@/service/sort/baseSort';
import { toast } from '@/service/toaster/toastService';
-import CategoryFolderCard from '@/components/cards/CategoryFolderCard.vue';
-import CategoryCard from '@/components/cards/CategoryCard.vue';
+import LibraryFolderCard from '@/components/cards/LibraryFolderCard.vue';
+import LibraryCard from '@/components/cards/LibraryCard.vue';
import BreadCrumbs from '@/components/pinesUI/BreadCrumbs.vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
import EditFolder from '@/components/forms/EditFolder.vue';
@@ -241,7 +241,7 @@ onMounted(() => {});
: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"
+ :row="LibraryFolderCard"
:loading="isLoadingLibraryFolders"
:sort-action="handleFolderSort"
:click-action="handleFolderAction"
@@ -258,7 +258,7 @@ onMounted(() => {});
: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="filteredLibraries"
- :row="CategoryCard"
+ :row="LibraryCard"
:click-action="handleDelete"
:loading="isLoadingLibraries"
:sort-action="handleSort"
diff --git a/resources/js/components/dashboard/DashboardLibraryFolders.vue b/resources/js/components/dashboard/DashboardLibraryFolders.vue
index fc1c09ee..9e669b88 100644
--- a/resources/js/components/dashboard/DashboardLibraryFolders.vue
+++ b/resources/js/components/dashboard/DashboardLibraryFolders.vue
@@ -9,7 +9,7 @@ import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { sortObject } from '@/service/sort/baseSort';
-import CategoryFolderCard from '@/components/cards/CategoryFolderCard.vue';
+import LibraryFolderCard from '@/components/cards/LibraryFolderCard.vue';
import EditFolder from '@/components/forms/EditFolder.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
import TableBase from '@/components/table/TableBase.vue';
@@ -99,7 +99,7 @@ onMounted(() => {
: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"
+ :row="LibraryFolderCard"
:loading="isLoadingLibraryFolders"
:sort-action="handleSort"
:click-action="handleFolderAction"
diff --git a/resources/js/components/inputs/ButtonIcon.vue b/resources/js/components/inputs/ButtonIcon.vue
index efca63c1..2487d542 100755
--- a/resources/js/components/inputs/ButtonIcon.vue
+++ b/resources/js/components/inputs/ButtonIcon.vue
@@ -60,6 +60,7 @@ const props = withDefaults(
:disabled="props.disabled"
:title="props.title ?? 'Icon'"
>
+ <slot name="text"> </slot>
<slot name="icon"> </slot>
</button>
</template>
diff --git a/resources/js/components/pinesUI/BreadCrumbs.vue b/resources/js/components/pinesUI/BreadCrumbs.vue
index 9ecbc4ff..5e7e062e 100644
--- a/resources/js/components/pinesUI/BreadCrumbs.vue
+++ b/resources/js/components/pinesUI/BreadCrumbs.vue
@@ -12,7 +12,7 @@ withDefaults(defineProps<{ breadCrumbs: BreadCrumbItem[] }>(), { breadCrumbs: ()
<li class="flex items-center h-full">
<RouterLink
:to="breadCrumb.url"
- class="inline-flex items-center p-2 py-1.5 space-x-1.5 rounded-md hover:!text-neutral-900 hover:ring-[0.125rem] ring-inset hover:ring-violet-400 hover:dark:ring-violet-700 dark:hover:ring-0 dark:hover:bg-neutral-100"
+ class="inline-flex items-center p-2 py-1.5 space-x-1.5 rounded-md hover:!text-neutral-900 dark:hover:!text-white hover:ring-[0.125rem] ring-inset hover:ring-violet-400 hover:dark:ring-violet-700 dark:hover:bg-primary-dark-800"
:class="{ 'cursor-default active-breadcrumb ': index === breadCrumbs.length - 1 }"
:title="breadCrumb.name"
>
diff --git a/resources/js/components/pinesUI/InputSelect.vue b/resources/js/components/pinesUI/InputSelect.vue
index 02ac4e4a..ecf2de1d 100755
--- a/resources/js/components/pinesUI/InputSelect.vue
+++ b/resources/js/components/pinesUI/InputSelect.vue
@@ -22,6 +22,7 @@ const props = withDefaults(
disabled?: boolean;
title?: string;
prefix?: string;
+ menuMargin?: { top: string; bottom: string };
}>(),
{
class: '',
@@ -168,10 +169,7 @@ watch(
<OnClickOutside
v-cloak
v-if="select.selectOpen"
- :class="{
- 'bottom-0 mb-11': select.selectDropdownPosition == 'top',
- 'top-0 mt-11': select.selectDropdownPosition == 'bottom',
- }"
+ :class="[select.selectDropdownPosition == 'top' ? `bottom-0 ${menuMargin?.bottom ?? 'mb-11'}` : `top-0 ${menuMargin?.top ?? 'mt-11'}`]"
class="z-30 absolute w-full mt-1 overflow-clip text-sm rounded-md shadow-md max-h-56 ring-1 ring-opacity-5 ring-black dark:ring-neutral-700 bg-white dark:bg-neutral-800/70 backdrop-blur-lg"
@trigger="select.toggleSelect(false)"
@keydown.esc.stop="
diff --git a/resources/js/components/pinesUI/ModalBase.vue b/resources/js/components/pinesUI/ModalBase.vue
index 2aa556b8..cdb43d91 100755
--- a/resources/js/components/pinesUI/ModalBase.vue
+++ b/resources/js/components/pinesUI/ModalBase.vue
@@ -70,7 +70,7 @@ watch(
<OnClickOutside
@trigger="modalData.toggleModal(false)"
@keydown.esc="modalData.toggleModal(false)"
- class="drop-shadow-md m-auto w-full p-6 bg-white dark:bg-neutral-800/90 backdrop-blur-lg border shadow-lg border-neutral-200 dark:border-neutral-700 sm:max-w-lg rounded-md sm:rounded-lg"
+ class="drop-shadow-md m-auto w-full p-6 bg-white dark:bg-neutral-800/90 backdrop-blur-lg border shadow-lg border-neutral-200 dark:border-neutral-700 sm:max-w-lg xl:max-w-xl 3xl:max-w-2xl rounded-md sm:rounded-lg"
tabindex="-1"
>
<div class="flex items-center justify-between pb-3">
diff --git a/resources/js/components/pinesUI/Popover.vue b/resources/js/components/pinesUI/Popover.vue
index 1460d69e..488a3b78 100644
--- a/resources/js/components/pinesUI/Popover.vue
+++ b/resources/js/components/pinesUI/Popover.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
+import { computed, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch, type Component, type ComponentPublicInstance } from 'vue';
import { OnClickOutside } from '@vueuse/components';
import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
-import { nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch, type Component, type ComponentPublicInstance } from 'vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
@@ -36,6 +36,11 @@ const popoverArrowRef = useTemplateRef('popoverArrowRef');
const resizeTimeout = ref<null | number>(null);
+const mergedButtonAttributes = computed(() => ({
+ title: 'Open Menu',
+ ...props.buttonAttributes,
+}));
+
async function popoverHeightCalculate() {
if (!popover.value) return;
popover.value.$el.classList.add('invisible');
@@ -119,7 +124,7 @@ onUnmounted(() => {
</script>
<template>
<div class="relative flex">
- <component :is="buttonComponent" ref="popoverButton" :class="buttonClass" @click="popoverOpen = true" v-bind="buttonAttributes" :disabled="disabled">
+ <component :is="buttonComponent" ref="popoverButton" :class="buttonClass" @click="popoverOpen = true" v-bind="mergedButtonAttributes" :disabled="disabled">
<template #text>
<slot name="buttonText"> </slot>
</template>