Skip to content

A self-hosted media server and file management system

Merge branch 'main' into feat/chromium-audio-track-selector

Amin Nausin37fdbdf75a28
diff --cc resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
index 11647a22,3c8ab42c..b9e96d8e
--- a/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
+++ b/resources/js/components/cedar-ui/context-menu/ContextMenuItem.vue
@@@ -54,7 -55,8 +54,7 @@@ useMutationObserver(subMenu, () => (isF
"
>
<slot name="icon" v-if="showLeftIcon">
- <component :is="icon ?? 'span'" :class="cn('shrink-0', icon ? 'h-4 w-auto' : 'size-4', { [selectedStyle]: selected })" />
- <component v-if="icon" :is="icon" class="size-4 shrink-0" />
- <span v-else class="size-4 shrink-0" />
++ <component :is="icon ?? 'span'" :class="cn('shrink-0 siza-4', { [selectedStyle]: selected })" />
</slot>
<span class="mr-auto truncate text-nowrap">
<slot>
diff --cc resources/js/views/FolderView.vue
index 5471f33f,56a25127..e481c24d
--- a/resources/js/views/FolderView.vue
+++ b/resources/js/views/FolderView.vue
@@@ -28,10 -27,10 +27,10 @@@ import LayoutBase from '@/layouts/Layou
import ProiconsMoreVertical from '~icons/proicons/more-vertical';
import ProiconsArrowSync from '~icons/proicons/arrow-sync';
import ProiconsPhoto from '~icons/proicons/photo';
- import CircumMonitor from '~icons/circum/monitor';
+ import ProiconsPlay from '~icons/proicons/play';
import ProiconsMenu from '~icons/proicons/menu';
-import CircumShare1 from '~icons/circum/share-1';
-import CircumEdit from '~icons/circum/edit';
+import IconShare from '@/components/icons/IconShare.vue';
+import IconEdit from '@/components/icons/IconEdit.vue';
const VALID_TABS = new Set(['overview', 'files', 'images', 'metadata', 'stats']);
@@@ -78,11 -77,10 +77,10 @@@ const popoverItems = computed<PopoverIt
hidden: !isAuthenticated.value || activeFolderTab.value?.name === 'metadata',
},
{
- icon: CircumShare1,
+ icon: IconShare,
text: 'Share',
- action: () => modal.open(ShareModal, { title: 'Share Folder', shareLink: window.location.href }),
+ action: () => modal.open(ShareModal, { title: 'Share Folder', shareLink: globalThis.location.href }),
},
-
{
icon: ProiconsArrowSync,
text: 'Scan Library',
@@@ -227,12 -225,12 +225,12 @@@ provide
</ButtonBase>
</div>
<div class="mb-auto flex h-8 flex-wrap gap-2 py-0.5 *:h-7 *:min-w-7 *:p-0">
- <ButtonText class="gap-1 sm:px-2" title="Watch" :to="baseUrl">
- <CircumMonitor class="size-4" />
- <span class="hidden leading-none sm:block">Watch</span>
+ <ButtonText class="gap-1 sm:px-2" title="Play" :to="baseUrl">
+ <ProiconsPlay class="size-4" />
+ <span class="hidden leading-none sm:block">Play</span>
</ButtonText>
<ButtonIcon v-if="activeFolderTab?.name === 'images' && isAuthenticated" title="Edit Folder Images" @click="handleEditFolderImages(stateFolder)">
- <CircumEdit class="size-4" />
+ <IconEdit class="size-4" />
</ButtonIcon>
<ButtonIcon
v-if="activeFolderTab?.name === 'metadata' && isAuthenticated"