Skip to content

A self-hosted media server and file management system

refactor: move some buttons, clipboard and table to archive

aminnausincda73d02f701
diff --git a/resources/js/components/inputs/ButtonIcon.vue b/resources/js/components-archive/buttons/ButtonIcon.vue
old mode 100755
new mode 100644
similarity index 100%
rename from resources/js/components/inputs/ButtonIcon.vue
rename to resources/js/components-archive/buttons/ButtonIcon.vue
diff --git a/resources/js/components/inputs/ButtonText.vue b/resources/js/components-archive/buttons/ButtonText.vue
old mode 100755
new mode 100644
similarity index 100%
rename from resources/js/components/inputs/ButtonText.vue
rename to resources/js/components-archive/buttons/ButtonText.vue
diff --git a/resources/js/components/pinesUI/ButtonClipboard.vue b/resources/js/components-archive/pinesUI/ButtonClipboard.vue
old mode 100755
new mode 100644
similarity index 72%
rename from resources/js/components/pinesUI/ButtonClipboard.vue
rename to resources/js/components-archive/pinesUI/ButtonClipboard.vue
index 2392fa79..f2a02354
--- a/resources/js/components/pinesUI/ButtonClipboard.vue
+++ b/resources/js/components-archive/pinesUI/ButtonClipboard.vue
@@ -2,7 +2,7 @@
import { toRef } from 'vue';
import useClipboard from '@/composables/useClipboard';
-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
+import ButtonIcon from '@/components-archive/buttons/ButtonIcon.vue';
const props = defineProps<{ text: string; tabindex?: number }>();
@@ -14,7 +14,7 @@ const clipboard = useClipboard(toRef(props.text));
<input
:value="props.text"
disabled
- class="cursor-text h-8 w-full rounded-md shadow-xs block p-2 border-none outline-hidden 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="block h-8 w-full cursor-text rounded-md border-none bg-white p-2 text-gray-900 shadow-xs ring-1 ring-neutral-200 outline-hidden ring-inset placeholder:text-neutral-400 dark:bg-neutral-700 dark:text-gray-300 dark:ring-neutral-700"
/>
<div class="relative z-20 flex items-center">
<Transition
@@ -26,22 +26,22 @@ const clipboard = useClipboard(toRef(props.text));
leave-to-class="opacity-0 translate-x-2"
>
<div v-if="clipboard.copyNotification.value" 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-sm">
+ <div class="-ml-1.5 flex h-7 -translate-x-full items-center rounded-sm border-r border-green-500 bg-green-500 px-3 text-xs text-white">
<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>
+ <div class="absolute top-1/2 right-0 -mt-px inline-block h-full translate-x-3 -translate-y-2 overflow-hidden">
+ <div class="h-3 w-3 origin-top-left rotate-45 transform border border-transparent bg-green-500"></div>
</div>
</div>
</div>
</Transition>
<ButtonIcon
@click="clipboard.copyToClipboard()"
- 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!"
+ class="group flex h-8 w-9 items-center justify-center text-xs text-neutral-600 hover:bg-neutral-100 hover:text-gray-900 focus:ring-green-600/50! dark:text-gray-300 dark:hover:text-gray-400"
>
<template #icon>
<svg
v-if="clipboard.copyNotification.value"
- class="w-4 h-4 text-green-500 stroke-current"
+ class="h-4 w-4 stroke-current text-green-500"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
@@ -51,7 +51,7 @@ const clipboard = useClipboard(toRef(props.text));
>
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5" />
</svg>
- <svg v-if="!clipboard.copyNotification.value" class="w-4 h-4 stroke-current" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <svg v-if="!clipboard.copyNotification.value" class="h-4 w-4 stroke-current" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<g fill="none" stroke="none">
<path
d="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/table/TableBase.vue b/resources/js/components-archive/table/TableBase.vue
old mode 100755
new mode 100644
similarity index 95%
rename from resources/js/components/table/TableBase.vue
rename to resources/js/components-archive/table/TableBase.vue
index 0318f20b..f6f97988
--- a/resources/js/components/table/TableBase.vue
+++ b/resources/js/components-archive/table/TableBase.vue
@@ -4,11 +4,11 @@ import type { SortOption, TableProps, TableRow } from '@/types/types';
import { onMounted, ref, toRef } from 'vue';
import { cn } from '@aminnausin/cedar-ui';
-import TableLoadingSpinner from '@/components/table/TableLoadingSpinner.vue';
+import TableLoadingSpinner from '@/components-archive/table/TableLoadingSpinner.vue';
import TextInputLabelled from '@/components/inputs/TextInputLabelled.vue';
-import TablePagination from '@/components/table/TablePagination.vue';
+import TablePagination from '@/components-archive/table/TablePagination.vue';
import InputSelect from '@/components/pinesUI/InputSelect.vue';
-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
+import ButtonIcon from '@/components-archive/buttons/ButtonIcon.vue';
import useTable from '@/composables/useTable.ts';
import PhSortDescendingLight from '~icons/ph/sort-descending-light';
diff --git a/resources/js/components/table/TableLoadingSpinner.vue b/resources/js/components-archive/table/TableLoadingSpinner.vue
similarity index 100%
rename from resources/js/components/table/TableLoadingSpinner.vue
rename to resources/js/components-archive/table/TableLoadingSpinner.vue
diff --git a/resources/js/components/table/TablePagination.vue b/resources/js/components-archive/table/TablePagination.vue
old mode 100755
new mode 100644
similarity index 87%
rename from resources/js/components/table/TablePagination.vue
rename to resources/js/components-archive/table/TablePagination.vue
index 9c19735d..35f044f9
--- a/resources/js/components/table/TablePagination.vue
+++ b/resources/js/components-archive/table/TablePagination.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { computed, nextTick, ref } from 'vue';
-import TablePaginationButton from '@/components/table/TablePaginationButton.vue';
+import TablePaginationButton from '@/components-archive/table/TablePaginationButton.vue';
import ProiconsChevronRight from '~icons/proicons/chevron-right';
import ProiconsChevronLeft from '~icons/proicons/chevron-left';
@@ -59,8 +59,8 @@ const handleSetPage = async (page: number) => {
</script>
<template>
- <div :class="`flex items-center flex-col sm:flex-row sm:justify-between flex-wrap gap-2 scroll-mb-12`" ref="$element">
- <p class="dark:text-neutral-300 line-clamp-1 text-sm">
+ <div :class="`flex scroll-mb-12 flex-col flex-wrap items-center gap-2 sm:flex-row sm:justify-between`" ref="$element">
+ <p class="line-clamp-1 text-sm dark:text-neutral-300">
Showing
<span class="font-medium dark:text-white">{{ props.listLength ? props.itemsPerPage * (currentPage - 1) + 1 : 0 }}</span>
to
@@ -70,7 +70,7 @@ const handleSetPage = async (page: number) => {
<!-- Results -->
</p>
<ul
- class="flex items-center text-sm leading-tight bg-white dark:bg-primary-dark-800/70 border divide-x rounded-sm h-9 text-neutral-500 dark:text-neutral-300 divide-neutral-200 dark:divide-neutral-700 border-neutral-200 dark:border-neutral-700"
+ class="dark:bg-primary-dark-800/70 flex h-9 items-center divide-x divide-neutral-200 rounded-sm border border-neutral-200 bg-white text-sm leading-tight text-neutral-500 dark:divide-neutral-700 dark:border-neutral-700 dark:text-neutral-300"
>
<TablePaginationButton
:pageNumber="-1"
@@ -80,13 +80,13 @@ const handleSetPage = async (page: number) => {
title="Previous Page"
>
<template #content v-if="useIcons">
- <ProiconsChevronLeft class="w-4 h-4" title="Previous" />
+ <ProiconsChevronLeft class="h-4 w-4" title="Previous" />
</template>
<template #content v-else>
<span class="hidden sm:block">
{{ 'Previous' }}
</span>
- <ProiconsChevronLeft class="w-4 h-4 sm:hidden" title="Previous" />
+ <ProiconsChevronLeft class="h-4 w-4 sm:hidden" title="Previous" />
</template>
</TablePaginationButton>
@@ -123,13 +123,13 @@ const handleSetPage = async (page: number) => {
title="Next Page"
>
<template #content v-if="useIcons">
- <ProiconsChevronRight class="w-4 h-4" title="Next" />
+ <ProiconsChevronRight class="h-4 w-4" title="Next" />
</template>
<template #content v-else>
<span class="hidden sm:block">
{{ 'Next' }}
</span>
- <ProiconsChevronRight class="w-4 h-4 sm:hidden" title="Next" />
+ <ProiconsChevronRight class="h-4 w-4 sm:hidden" title="Next" />
</template>
</TablePaginationButton>
</ul>
diff --git a/resources/js/components/table/TablePaginationButton.vue b/resources/js/components-archive/table/TablePaginationButton.vue
old mode 100755
new mode 100644
similarity index 100%
rename from resources/js/components/table/TablePaginationButton.vue
rename to resources/js/components-archive/table/TablePaginationButton.vue
diff --git a/resources/js/components/cards/data/LibraryFolderCard.vue b/resources/js/components/cards/data/LibraryFolderCard.vue
index 5c96a942..72eee610 100644
--- a/resources/js/components/cards/data/LibraryFolderCard.vue
+++ b/resources/js/components/cards/data/LibraryFolderCard.vue
@@ -3,10 +3,10 @@ import { type FolderResource } from '@/types/resources';
import { formatFileSize, handleStorageURL, toFormattedDate } from '@/service/util';
import { useTemplateRef } from 'vue';
+import { ButtonIcon } from '@/components/cedar-ui/button';
import LibraryFolderCardMenu from '@/components/menus/LibraryFolderCardMenu.vue';
import BasePopover from '@/components/pinesUI/BasePopover.vue';
-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
import ProiconsMoreVertical from '~icons/proicons/more-vertical';
import CircumShare1 from '~icons/circum/share-1';
@@ -32,12 +32,12 @@ const popover = useTemplateRef('popover');
{{ data?.title ?? data?.name }}
</h3>
<span class="flex gap-2 text-sm *:h-6">
- <ButtonIcon :title="'Open Folder In New Tab'" :to="`/${encodeURI(data.path)}`" :class="`aspect-auto!`">
- <template #icon><CircumShare1 class="h-4 w-4" /></template>
+ <ButtonIcon :title="'Open Folder In New Tab'" :to="`/${encodeURI(data.path)}`" class="size-6 p-0">
+ <template #icon><CircumShare1 class="size-4" /></template>
</ButtonIcon>
<BasePopover popoverClass="max-w-56! rounded-lg mt-8" :buttonClass="'p-1! ml-auto'" ref="popover">
<template #buttonIcon>
- <ProiconsMoreVertical class="h-4 w-4" />
+ <ProiconsMoreVertical class="size-4" />
</template>
<template #content>
<LibraryFolderCardMenu :data="data" :handle-close-popover="popover?.handleClose" @clickAction="$emit('clickAction', data?.id)" />
diff --git a/resources/js/components/cards/data/TaskCard.vue b/resources/js/components/cards/data/TaskCard.vue
index 857e1a11..9af2ffdc 100644
--- a/resources/js/components/cards/data/TaskCard.vue
+++ b/resources/js/components/cards/data/TaskCard.vue
@@ -5,6 +5,7 @@ import { toFormattedDate, toFormattedDuration, toTimeSpan, within24Hrs } from '@
import { computed, ref, useTemplateRef, watch } from 'vue';
import { ButtonIcon, ButtonText } from '@/components/cedar-ui/button';
import { getSubTasks } from '@/service/siteAPI';
+import { HoverCard } from '@/components/cedar-ui/hover-card';
import { TableBase } from '@/components/cedar-ui/table';
import { BadgeTag } from '@/components/cedar-ui/badge';
import { cn } from '@aminnausin/cedar-ui';
@@ -12,7 +13,6 @@ import { cn } from '@aminnausin/cedar-ui';
import PulseDoughnutChart from '@/components/charts/PulseDoughnutChart.vue';
import BasePopover from '@/components/pinesUI/BasePopover.vue';
import SubTaskCard from '@/components/cards/data/SubTaskCard.vue';
-import HoverCard from '@/components/cards/HoverCard.vue';
import ProiconsMoreVertical from '~icons/proicons/more-vertical';
import ProiconsChevronDown from '~icons/proicons/chevron-down';
diff --git a/resources/js/components/cards/data/VideoCard.vue b/resources/js/components/cards/data/VideoCard.vue
index cc8afeac..4c5c9550 100644
--- a/resources/js/components/cards/data/VideoCard.vue
+++ b/resources/js/components/cards/data/VideoCard.vue
@@ -9,10 +9,10 @@ import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
import { useAppStore } from '@/stores/AppStore';
import { RouterLink } from 'vue-router';
+import { HoverCard } from '@/components/cedar-ui/hover-card';
import { MediaType } from '@/types/types';
import useMetaData from '@/composables/useMetaData';
-import HoverCard from '@/components/cards/HoverCard.vue';
import MediaTag from '@/components/labels/MediaTag.vue';
import TablerMicrophone2 from '~icons/tabler/microphone-2';
diff --git a/resources/js/components/dashboard/DashboardActivity.vue b/resources/js/components/dashboard/DashboardActivity.vue
index efee6d15..44d77a89 100644
--- a/resources/js/components/dashboard/DashboardActivity.vue
+++ b/resources/js/components/dashboard/DashboardActivity.vue
@@ -3,12 +3,12 @@
import type { CategoryResource } from '@/types/resources';
import { computed, ref } from 'vue';
+import { ButtonText } from '@/components/cedar-ui/button';
import { sortObject } from '@/service/sort/baseSort';
import { TableBase } from '@/components/cedar-ui/table';
import { toast } from '@aminnausin/cedar-ui';
import LibraryCard from '@/components/cards/data/LibraryCard.vue';
-import ButtonText from '@/components/inputs/ButtonText.vue';
import ProiconsArrowSync from '~icons/proicons/arrow-sync';
import ProiconsAdd from '~icons/proicons/add';
@@ -55,11 +55,11 @@ const handleSort = async (column: keyof CategoryResource = 'created_at', dir: -1
<p class="uppercase">Running: {{ categories?.length }}</p>
<div class="flex flex-wrap items-center gap-2 *:h-8">
<ButtonText title="Start New Task" @click="toast.add('Success', { type: 'success', description: 'Submitted Scan Request!', life: 3000 })" disabled>
- <template #text>New Task</template>
+ New Task
<template #icon><ProiconsAdd /></template>
</ButtonText>
<ButtonText @click="toast.add('Success', { type: 'success', description: 'Submitted File Indexing Request!', life: 3000 })" disabled>
- <template #text>Run File Scan</template>
+ Run File Scan
<template #icon><ProiconsArrowSync /></template>
</ButtonText>
</div>
diff --git a/resources/js/components/pinesUI/BasePopover.vue b/resources/js/components/pinesUI/BasePopover.vue
index 56b1e337..6c6c66c1 100644
--- a/resources/js/components/pinesUI/BasePopover.vue
+++ b/resources/js/components/pinesUI/BasePopover.vue
@@ -2,8 +2,7 @@
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 ButtonText from '@/components/inputs/ButtonText.vue';
+import { ButtonText } from '@/components/cedar-ui/button';
const props = withDefaults(
defineProps<{
@@ -121,9 +120,7 @@ onUnmounted(() => {
<template>
<div class="relative flex">
<component :is="buttonComponent" ref="popoverButton" :class="buttonClass" @click="popoverOpen = true" v-bind="mergedButtonAttributes" :disabled="disabled">
- <template #text>
- <slot name="buttonText"> </slot>
- </template>
+ <slot name="buttonText"> </slot>
<template #icon>
<slot name="buttonIcon">
<svg class="h-4 w-4" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg" v-if="!hideDefaultIcon">
diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vue
index 9b0761e3..7c3da548 100644
--- a/resources/js/components/pinesUI/InputMultiChip.vue
+++ b/resources/js/components/pinesUI/InputMultiChip.vue
@@ -6,7 +6,7 @@ import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component.mjs';
import { toast } from '@aminnausin/cedar-ui';
import useMultiSelect from '@/composables/useMultiSelect';
-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
+import ButtonIcon from '@/components-archive/buttons/ButtonIcon.vue';
import TextInput from '@/components/inputs/TextInput.vue';
import ChipTag from '@/components/labels/ChipTag.vue';
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 58190e3b..5883449b 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -7,6 +7,7 @@ import { CopyToClipboard } from '@/components/cedar-ui/clipboard';
import { useContentStore } from '@/stores/ContentStore';
import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
+import { HoverCard } from '@/components/cedar-ui/hover-card';
import { BadgeTag } from '@/components/cedar-ui/badge';
import { emitSeek } from '@/service/player/seekBus';
import { useRoute } from 'vue-router';
@@ -17,7 +18,6 @@ import useMetaData from '@/composables/useMetaData';
import EditFolder from '@/components/forms/EditFolder.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
import EditVideo from '@/components/forms/EditVideo.vue';
-import HoverCard from '@/components/cards/HoverCard.vue';
import useModal from '@/composables/useModal';
import ProiconsArrowDownload from '~icons/proicons/arrow-download';
diff --git a/resources/js/components/video/VideoLyrics.vue b/resources/js/components/video/VideoLyrics.vue
index 2755183c..15bc513c 100644
--- a/resources/js/components/video/VideoLyrics.vue
+++ b/resources/js/components/video/VideoLyrics.vue
@@ -1,18 +1,17 @@
<script setup lang="ts">
import type { VideoResource } from '@/types/resources';
import type { LyricItem } from '@/types/types';
-import type { Ref } from 'vue';
import { computed, onMounted, onUnmounted, ref, useTemplateRef, watch, nextTick } from 'vue';
import { toFormattedDuration } from '@/service/util';
import { useContentStore } from '@/stores/ContentStore';
import { useLyricStore } from '@/stores/LyricStore';
import { storeToRefs } from 'pinia';
+import { ButtonIcon } from '@/components/cedar-ui/button';
import { onSeek } from '@/service/player/seekBus';
import VideoLyricItem from '@/components/video/VideoLyricItem.vue';
import EditLyrics from '@/components/forms/EditLyrics.vue';
-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
let unsubscribe: () => boolean;
@@ -263,7 +262,10 @@ defineExpose({ scrollToCurrent });
<div class="absolute top-4 right-4 flex gap-1" style="z-index: 7" v-show="!isFullscreen">
<ButtonIcon
variant="ghost"
- :class="`${dirtyLyric ? 'rounded-full opacity-90' : 'rounded-md bg-transparent opacity-70'} pointer-events-auto bg-neutral-900/10 p-1 px-2 transition hover:bg-neutral-900/30 hover:text-yellow-500 hover:opacity-100`"
+ :class="[
+ dirtyLyric ? 'opacity-90' : 'bg-transparent opacity-70',
+ 'hocus:bg-neutral-900/30 hocus:text-yellow-500 hocus:opacity-100 pointer-events-auto h-6 rounded-full bg-neutral-900/10 py-1!',
+ ]"
@click="handleOpenLyricsModal"
title="Edit Lyrics"
>
diff --git a/resources/js/views/ProfileView.vue b/resources/js/views/ProfileView.vue
index 65b43156..10511bfc 100755
--- a/resources/js/views/ProfileView.vue
+++ b/resources/js/views/ProfileView.vue
@@ -2,10 +2,10 @@
import { onMounted, ref } from 'vue';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
+import { ButtonText } from '@/components/cedar-ui/button';
import { toast } from '@aminnausin/cedar-ui';
import ProfileHeader from '@/components/profile/ProfileHeader.vue';
-import ButtonText from '@/components/inputs/ButtonText.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());
@@ -23,7 +23,24 @@ onMounted(() => {
<template #content>
<section id="content-profile" class="flex flex-col gap-3">
<ProfileHeader />
- <section id="user-info" class="dark:bg-primary-dark-800/70 bg-primary-800 text-foreground-1 z-3 flex w-full justify-between gap-4 rounded-xl p-3 shadow-lg">
+ <div id="user-info" class="dark:bg-primary-dark-800/70 bg-primary-800 text-foreground-1 z-3 flex w-full flex-col justify-between gap-4 rounded-xl p-3 shadow-lg">
+ <div class="flex flex-wrap gap-2">
+ <p class="flex-1">Who?</p>
+ <div class="flex flex-wrap gap-2 text-sm *:py-0 *:*:text-center">
+ <ButtonText text="Add Friend" @click="toast.error('Friend not added...', { description: 'You do not know why...' })" class="h-6 flex-10" />
+ <ButtonText
+ text="Block"
+ class="h-6 flex-1"
+ @click="
+ () => {
+ blockedFriends += 1;
+ toast.info('Friend Blocked', { description: `You have blocked ${blockedFriends} friend(s). How nice of you.` });
+ }
+ "
+ />
+ </div>
+ </div>
+
<div class="flex flex-col gap-1">
<p class="whitespace-pre">
{{
@@ -44,19 +61,7 @@ Stats: 12 items watched | 9 hours total`
</p>
<p class="mt-16 text-xs">This page is a work in progress if it wasn't obvious</p>
</div>
- <div class="flex h-6 gap-2 text-sm">
- <ButtonText text="Add Friend" @click="toast.error('Friend not added...', { description: 'You do not know why...' })" />
- <ButtonText
- text="Block"
- @click="
- () => {
- blockedFriends += 1;
- toast.info('Friend Blocked', { description: `You have blocked ${blockedFriends} friends. How nice of you.` });
- }
- "
- />
- </div>
- </section>
+ </div>
</section>
</template>
</LayoutBase>