Skip to content

A self-hosted media server and file management system

refactor: replace clipboard code

aminnausin48c9717ded35
diff --git a/resources/js/components/cedar-ui/button/ButtonText.vue b/resources/js/components/cedar-ui/button/ButtonText.vue
index 169c7118..f09b098e 100644
--- a/resources/js/components/cedar-ui/button/ButtonText.vue
+++ b/resources/js/components/cedar-ui/button/ButtonText.vue
@@ -47,7 +47,7 @@ const variantClass = computed(() => {
</script>
<template>
- <button-base :class="[cn('ring-offset-surface-0 hocus:bg-surface-3', ...variantClass)]" v-bind="wrapperProps">
+ <button-base :class="cn('ring-offset-surface-0 hocus:bg-surface-3', ...variantClass)" v-bind="wrapperProps">
<slot>
<p class="line-clamp-1 flex-1 text-left" v-if="text">{{ text }}</p>
</slot>
diff --git a/resources/js/components/cedar-ui/clipboard/CopyToClipboard.vue b/resources/js/components/cedar-ui/clipboard/CopyToClipboard.vue
index 364bb44d..92995020 100644
--- a/resources/js/components/cedar-ui/clipboard/CopyToClipboard.vue
+++ b/resources/js/components/cedar-ui/clipboard/CopyToClipboard.vue
@@ -35,7 +35,7 @@ const clipboard = useClipboard(text);
<ButtonIcon
@click="clipboard.copyToClipboard()"
:class="
- cn('group bg-surface-3 hover:text-foreground-0 text-foreground-1 focus:ring-green-600/50', {
+ cn('group hover:text-foreground-0 text-foreground-1 focus:ring-green-600/50', {
'ring-green-600/50': clipboard.copyNotification.value,
})
"
diff --git a/resources/js/components/panels/FolderSidebar.vue b/resources/js/components/panels/FolderSidebar.vue
index 93f6a09f..a3e0331d 100644
--- a/resources/js/components/panels/FolderSidebar.vue
+++ b/resources/js/components/panels/FolderSidebar.vue
@@ -2,17 +2,16 @@
import type { FolderResource, SeriesResource } from '@/types/resources';
import type { GenericSortOption, SortDir } from '@/types/types';
+import { CopyToClipboard } from '@/components/cedar-ui/clipboard';
import { useContentStore } from '@/stores/ContentStore';
import { toFormattedDate } from '@/service/util';
import { computed, ref } from 'vue';
import { storeToRefs } from 'pinia';
+import { ButtonIcon } from '@/components/cedar-ui/button';
import { sortObject } from '@/service/sort/baseSort';
import { TableBase } from '@/components/cedar-ui/table';
-import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';
-
import SidebarHeader from '@/components/headers/SidebarHeader.vue';
-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
import FolderCard from '@/components/cards/data/FolderCard.vue';
import EditFolder from '@/components/forms/EditFolder.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
@@ -83,7 +82,7 @@ const handleSeriesUpdate = async (res: any) => {
<SidebarHeader>
<ButtonIcon
v-if="stateDirectory.folders.length > 10"
- class="dark:hover:bg-primary-active! size-8! p-0! *:size-6 dark:ring-transparent!"
+ class="dark:hover:bg-primary-active size-8 p-0 *:size-6 dark:ring-transparent"
@click="showFilters = !showFilters"
title="Toggle Filters"
>
@@ -119,7 +118,7 @@ const handleSeriesUpdate = async (res: any) => {
<ModalBase :modalData="shareModal">
<template #description> Copy link to clipboard to share it.</template>
<template #controls>
- <ButtonClipboard :text="shareLink" />
+ <CopyToClipboard :text="shareLink" />
</template>
</ModalBase>
<ModalBase :modalData="editFolderModal" :useControls="false">
diff --git a/resources/js/components/panels/HistorySidebar.vue b/resources/js/components/panels/HistorySidebar.vue
index 35ba20c3..c280d2f8 100644
--- a/resources/js/components/panels/HistorySidebar.vue
+++ b/resources/js/components/panels/HistorySidebar.vue
@@ -1,10 +1,10 @@
<script setup lang="ts">
+import { TableLoadingSpinner } from '@/components/cedar-ui/table';
import { useRecordsLimited } from '@/service/records/useRecords';
+import { CopyToClipboard } from '@/components/cedar-ui/clipboard';
import { ButtonText } from '@/components/cedar-ui/button';
import { ref } from 'vue';
-import TableLoadingSpinner from '@/components/table/TableLoadingSpinner.vue';
-import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';
import SidebarHeader from '@/components/headers/SidebarHeader.vue';
import RecordCard from '@/components/cards/data/RecordCard.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
@@ -39,7 +39,7 @@ const handleShare = (link: string) => {
v-if="stateRecords.length > 0"
:to="'/history'"
:title="'View All Watch History'"
- :class="'data-card mt-2 flex h-fit w-full items-center rounded-lg text-sm ring-transparent ring-inset'"
+ :class="'data-card mt-2 flex h-fit w-full items-center rounded-lg text-sm shadow-sm ring-transparent ring-inset'"
>
View More
</ButtonText>
@@ -49,7 +49,7 @@ const handleShare = (link: string) => {
<ModalBase :modalData="shareModal">
<template #description> Copy link to clipboard to share it.</template>
<template #controls>
- <ButtonClipboard :text="shareLink" />
+ <CopyToClipboard :text="shareLink" />
</template>
</ModalBase>
</template>
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index b4796ce2..58190e3b 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -3,6 +3,7 @@ import { computed, onMounted, ref, useTemplateRef, watch, nextTick } from 'vue';
import { handleStorageURL, toFormattedDate, toTimeSpan } from '@/service/util';
import { ButtonIcon, ButtonText } from '@/components/cedar-ui/button';
import { getUserViewCount } from '@/service/mediaAPI';
+import { CopyToClipboard } from '@/components/cedar-ui/clipboard';
import { useContentStore } from '@/stores/ContentStore';
import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
@@ -10,7 +11,6 @@ import { BadgeTag } from '@/components/cedar-ui/badge';
import { emitSeek } from '@/service/player/seekBus';
import { useRoute } from 'vue-router';
-import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';
import ContextMenuItem from '@/components/pinesUI/ContextMenuItem.vue';
import BasePopover from '@/components/pinesUI/BasePopover.vue';
import useMetaData from '@/composables/useMetaData';
@@ -348,7 +348,7 @@ onMounted(() => {
<template #description> Copy link to clipboard to share it.</template>
<template #controls>
- <ButtonClipboard :text="videoURL" />
+ <CopyToClipboard :text="videoURL" />
</template>
</ModalBase>
</template>