A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: use cedar global modal
aminnausin43e2542c6d5e
diff --git a/resources/js/App.vue b/resources/js/App.vueindex 7bcc84f6..3b7a11f6 100755--- a/resources/js/App.vue+++ b/resources/js/App.vue@@ -8,12 +8,11 @@ import { useFullscreen } from '@/composables/useFullscreen';import { getScreenSize } from '@/service/util';import { useAuthStore } from '@/stores/AuthStore';import { ContextMenu } from '@/components/cedar-ui/context-menu';+import { GlobalModal } from '@/components/cedar-ui/modal';import { storeToRefs } from 'pinia';import { useAppStore } from '@/stores/AppStore';import { RouterView } from 'vue-router';-import GlobalModal from '@/components/modals/GlobalModal.vue';-const toastPosition = ref<ToastPostion>();const { contextMenuItems, contextMenuStyle, contextMenuItemStyle } = storeToRefs(useAppStore());diff --git a/resources/js/components/cedar-ui/modal/GlobalModal.vue b/resources/js/components/cedar-ui/modal/GlobalModal.vueindex dfd36955..d9ba934b 100644--- a/resources/js/components/cedar-ui/modal/GlobalModal.vue+++ b/resources/js/components/cedar-ui/modal/GlobalModal.vue@@ -1,15 +1,16 @@<script setup lang="ts">-import { useModalCore, cn } from '@aminnausin/cedar-ui';import { OnClickOutside } from '@vueuse/components';+import { useModalStore } from '@/stores/ModalStore';import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';+import { cn } from '@aminnausin/cedar-ui';-const modalStore = useModalCore();+const modalStore = useModalStore();</script><template><Teleport to="body"><dialog- v-show="modalStore.isOpen.value || modalStore.isAnimating.value"- class="modal fixed top-0 left-0 z-300 flex h-screen w-screen items-center justify-center bg-transparent text-gray-900 dark:text-neutral-200"+ v-show="modalStore.isOpen || modalStore.isAnimating"+ class="modal text-foreground-0 fixed top-0 left-0 z-300 flex h-screen w-screen items-center justify-center bg-transparent"v-cloakaria-modal="true"aria-labelledby="modalTitle"@@ -19,33 +20,33 @@ const modalStore = useModalCore();enter-active-class="ease-out duration-300"enter-from-class="opacity-0"enter-to-class="opacity-100"- leave-active-class="ease-in duration-300"+ leave-active-class="ease-in duration-(--duration-input)"leave-from-class="opacity-100"leave-to-class="opacity-0">- <div v-if="modalStore.isOpen.value" class="absolute inset-0 h-full w-full backdrop-blur-xs"></div>+ <div v-if="modalStore.isOpen" class="absolute inset-0 h-full w-full backdrop-blur-xs"></div></Transition><Transitionenter-active-class="ease-out duration-300"enter-from-class="opacity-0 sm:scale-95"enter-to-class="opacity-100 sm:scale-100"- leave-active-class="ease-in duration-200"+ leave-active-class="ease-in duration-(--duration-input)"leave-from-class="opacity-100 sm:scale-100"leave-to-class="opacity-0 sm:scale-95">- <UseFocusTrap v-if="modalStore.isOpen.value" class="scrollbar-hide relative flex h-full max-h-screen w-full items-center overflow-y-scroll px-6 py-10 sm:py-6">+ <UseFocusTrap v-if="modalStore.isOpen" class="scrollbar-hide relative flex h-full max-h-screen w-full items-center overflow-y-scroll px-4 py-10 sm:py-6"><OnClickOutside@trigger="modalStore.close"@keydown.esc="modalStore.close":class="cn(- '3xl:max-w-xl m-auto flex w-full flex-col gap-4 rounded-md border border-neutral-200 bg-white p-6 shadow-lg drop-shadow-md backdrop-blur-lg sm:max-w-lg sm:rounded-lg xl:max-w-xl dark:border-neutral-700 dark:bg-neutral-800/90',+ '3xl:max-w-xl bg-overlay-2-t border-overlay-border m-auto flex w-full flex-col gap-4 rounded-xl border p-6 shadow-lg drop-shadow-md backdrop-blur-lg sm:max-w-lg xl:max-w-xl',modalStore.props.rootClass,)"tabindex="-1">- <component :is="modalStore.component.value" v-bind="modalStore.props.value" />+ <component :is="modalStore.component" v-bind="modalStore.props.value" /></OnClickOutside></UseFocusTrap></Transition>diff --git a/resources/js/components/modals/GlobalModal.vue b/resources/js/components/modals/GlobalModal.vuedeleted file mode 100644index f1dbff46..00000000--- a/resources/js/components/modals/GlobalModal.vue+++ /dev/null@@ -1,49 +0,0 @@-<script setup lang="ts">-import { OnClickOutside } from '@vueuse/components';-import { useModalStore } from '@/stores/ModalStore';-import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';--const modalStore = useModalStore();-</script>-<template>- <Teleport to="body">- <dialog- v-show="modalStore.isOpen || modalStore.isAnimating"- class="modal fixed top-0 left-0 z-300 flex h-screen w-screen items-center justify-center bg-transparent text-gray-900 dark:text-neutral-200"- v-cloak- aria-modal="true"- aria-labelledby="modalTitle"- aria-describedby="modalDescription"- >- <Transition- enter-active-class="ease-out duration-300"- enter-from-class="opacity-0"- enter-to-class="opacity-100"- leave-active-class="ease-in duration-300"- leave-from-class="opacity-100"- leave-to-class="opacity-0"- >- <div v-if="modalStore.isOpen" class="bg-opacity-70 absolute inset-0 h-full w-full backdrop-blur-xs"></div>- </Transition>- <Transition- enter-active-class="ease-out duration-300"- enter-from-class="opacity-0 sm:scale-95"- enter-to-class="opacity-100 sm:scale-100"- leave-active-class="ease-in duration-(--duration-input)"- leave-from-class="opacity-100 sm:scale-100"- leave-to-class="opacity-0 sm:scale-95"- >- <UseFocusTrap v-if="modalStore.isOpen" class="scrollbar-hide relative flex h-full max-h-screen w-full items-center overflow-y-scroll px-6 py-10 sm:py-6">- <OnClickOutside- @trigger="modalStore.close"- @keydown.esc="modalStore.close"- class="3xl:max-w-xl m-auto flex w-full flex-col gap-4 rounded-md border border-neutral-200 bg-white p-6 shadow-lg drop-shadow-md backdrop-blur-lg sm:max-w-lg sm:rounded-lg xl:max-w-xl dark:border-neutral-700 dark:bg-neutral-800/90"- tabindex="-1"- >- <component :is="modalStore.component" v-bind="modalStore.props" />- </OnClickOutside>- </UseFocusTrap>- </Transition>- </dialog>- </Teleport>-</template>