A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: global modal
aminnausin8ff79f68a4b2
diff --git a/resources/js/App.vue b/resources/js/App.vueindex 1e5525d1..acdab305 100755--- a/resources/js/App.vue+++ b/resources/js/App.vue@@ -9,6 +9,7 @@ import { RouterView } from 'vue-router';import ToastController from '@/components/pinesUI/ToastController.vue';import ContextMenu from '@/components/pinesUI/ContextMenu.vue';+import GlobalModal from '@/components/modals/GlobalModal.vue';const toastPosition = ref<ToastPostion>();@@ -38,5 +39,6 @@ watch(isPlaylist, setIsPlaylist, { immediate: false });<template><ToastController v-if="toastPosition" :position="toastPosition" /><RouterView />+ <GlobalModal /><ContextMenu ref="contextMenu" :items="contextMenuItems" :style="contextMenuStyle" :itemStyle="contextMenuItemStyle ?? 'hover:bg-purple-600 hover:text-white'" /></template>diff --git a/resources/js/components/modals/BaseModal.vue b/resources/js/components/modals/BaseModal.vuenew file mode 100644index 00000000..4ce5ff8e--- /dev/null+++ b/resources/js/components/modals/BaseModal.vue@@ -0,0 +1,22 @@+<script setup lang="ts">+import { useModalStore } from '@/stores/ModalStore';++import ButtonCorner from '@/components/inputs/ButtonCorner.vue';++const modalStore = useModalStore();+</script>++<template>+ <section class="flex flex-wrap gap-2 items-center">+ <h3 ref="modalTitle" id="modalTitle" class="text-xl font-semibold scroll-mt-16 sm:scroll-mt-12 flex-1">+ <slot name="title">+ {{ modalStore.props?.title ?? 'Modal Title' }}+ </slot>+ </h3>+ <ButtonCorner @click="modalStore.close" class="!m-0 !static" />+ <p class="text-neutral-500 dark:text-neutral-400 text-sm w-full" v-if="$slots.description" id="modalDescription">+ <slot name="description"> </slot>+ </p>+ </section>+ <slot> </slot>+</template>diff --git a/resources/js/components/modals/DeleteAccountModal.vue b/resources/js/components/modals/DeleteAccountModal.vuenew file mode 100644index 00000000..36177097--- /dev/null+++ b/resources/js/components/modals/DeleteAccountModal.vue@@ -0,0 +1,28 @@+<script setup lang="ts">+import { deleteAccount } from '@/service/authAPI';+import { useModalStore } from '@/stores/ModalStore';+import { useRouter } from 'vue-router';++import PasswordConfirm from '@/components/forms/PasswordConfirm.vue';+import BaseModal from '@/components/modals/BaseModal.vue';++const modalStore = useModalStore();+const router = useRouter();++function handleSuccess() {+ modalStore.close();+ router.push('/');+}+</script>++<template>+ <BaseModal>+ <template #title>Are you sure you want to delete your account?</template>+ <template #description>+ Once your account is deleted, all of its resources and data will also be permanently deleted. Please enter your password to confirm you would like to permanently delete+ your account.+ </template>++ <PasswordConfirm :action="deleteAccount" success-message="Account Deleted..." @confirm="handleSuccess" @cancel="modalStore.close" />+ </BaseModal>+</template>diff --git a/resources/js/components/modals/GlobalModal.vue b/resources/js/components/modals/GlobalModal.vuenew file mode 100644index 00000000..0e99a279--- /dev/null+++ b/resources/js/components/modals/GlobalModal.vue@@ -0,0 +1,49 @@+<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 items-center justify-center w-screen h-screen text-gray-900 dark:text-neutral-200 bg-transparent"+ 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="absolute inset-0 w-full h-full backdrop-blur-sm bg-opacity-70"></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-200"+ leave-from-class="opacity-100 sm:scale-100"+ leave-to-class="opacity-0 sm:scale-95"+ >+ <UseFocusTrap v-if="modalStore.isOpen" class="relative w-full px-6 py-10 sm:py-6 max-h-screen h-full overflow-y-scroll scrollbar-hide flex items-center">+ <OnClickOutside+ @trigger="modalStore.close"+ @keydown.esc="modalStore.close"+ class="gap-4 flex flex-col 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"+ >+ <component :is="modalStore.component" v-bind="modalStore.props" @close="modalStore.close" />+ </OnClickOutside>+ </UseFocusTrap>+ </Transition>+ </dialog>+ </Teleport>+</template>diff --git a/resources/js/components/modals/LogoutSessionsModal.vue b/resources/js/components/modals/LogoutSessionsModal.vuenew file mode 100644index 00000000..04e80a9e--- /dev/null+++ b/resources/js/components/modals/LogoutSessionsModal.vue@@ -0,0 +1,22 @@+<script setup lang="ts">+import { signOutOtherSessions } from '@/service/authAPI';+import { useModalStore } from '@/stores/ModalStore';++import PasswordConfirm from '@/components/forms/PasswordConfirm.vue';+import BaseModal from '@/components/modals/BaseModal.vue';++const props = defineProps<{ onSuccess?: () => void }>();+const modalStore = useModalStore();++function handleSuccess() {+ modalStore.close();+ props.onSuccess?.();+}+</script>++<template>+ <BaseModal>+ <template #description>Are you sure you want to sign out of other devices? You won't be able to undo this action.</template>+ <PasswordConfirm :action="signOutOtherSessions" success-message="Other Sessions Logged Out Successfully" @confirm="handleSuccess" @cancel="modalStore.close" />+ </BaseModal>+</template>diff --git a/resources/js/components/pinesUI/ModalBase.vue b/resources/js/components/pinesUI/ModalBase.vueindex 78eeca43..b221031b 100755--- a/resources/js/components/pinesUI/ModalBase.vue+++ b/resources/js/components/pinesUI/ModalBase.vue@@ -10,6 +10,7 @@ import ButtonForm from '@/components/inputs/ButtonForm.vue';const props = withDefaults(defineProps<{modalData: any;+ // Should not be part of the modalaction?: () => Promise<void>;useControls?: boolean;isProcessing?: boolean;@@ -22,8 +23,10 @@ const props = withDefaults(const { setScrollLock } = useAppStore();const title = useTemplateRef('modalTitle');+// Should not be part of the modalconst processing = ref(false);+// Should not be part of the modalconst submitModal = async () => {processing.value = true;await props.action?.();diff --git a/resources/js/components/settings/account/SettingsDeleteAccount.vue b/resources/js/components/settings/account/SettingsDeleteAccount.vueindex 5a724a02..7d196f93 100644--- a/resources/js/components/settings/account/SettingsDeleteAccount.vue+++ b/resources/js/components/settings/account/SettingsDeleteAccount.vue@@ -1,16 +1,12 @@<script setup lang="ts">-import { deleteAccount } from '@/service/authAPI';-import { useRouter } from 'vue-router';+import { useModalStore } from '@/stores/ModalStore';-import PasswordConfirm from '@/components/forms/PasswordConfirm.vue';+import DeleteAccountModal from '@/components/modals/DeleteAccountModal.vue';import SettingsHeader from '@/components/settings/SettingsHeader.vue';import SettingsCard from '@/components/cards/SettingsCard.vue';import ButtonForm from '@/components/inputs/ButtonForm.vue';-import ModalBase from '@/components/pinesUI/ModalBase.vue';-import useModal from '@/composables/useModal';-const confirmModal = useModal({ title: 'Are you sure you want to delete your account?', submitText: 'Confim' });-const router = useRouter();+const modal = useModalStore();</script><template>@@ -28,7 +24,7 @@ const router = useRouter();variant="submit"class="bg-rose-600 hover:bg-rose-700 dark:hover:bg-rose-500"title="Delete your account permanently"- @click="confirmModal.toggleModal()"+ @click="modal.open(DeleteAccountModal)">Delete Account</ButtonForm>@@ -36,24 +32,4 @@ const router = useRouter();</section></template></SettingsCard>-- <ModalBase :modalData="confirmModal" :useControls="false">- <template #description>- Once your account is deleted, all of its resources and data will also be permanently deleted. Please enter your password to confirm you would like to permanently delete- your account.- </template>- <template #content>- <PasswordConfirm- :action="deleteAccount"- @cancel="confirmModal.toggleModal()"- :success-action="- () => {- confirmModal.toggleModal();- router.push('/');- }- "- success-message="Account Deleted..."- />- </template>- </ModalBase></template>diff --git a/resources/js/components/settings/account/SettingsSessions.vue b/resources/js/components/settings/account/SettingsSessions.vueindex aff94368..d4d441f8 100644--- a/resources/js/components/settings/account/SettingsSessions.vue+++ b/resources/js/components/settings/account/SettingsSessions.vue@@ -1,8 +1,9 @@<script setup lang="ts">-import { signOutOtherSessions } from '@/service/authAPI';import { useSettingsStore } from '@/stores/SettingsStore';+import { useModalStore } from '@/stores/ModalStore';import { storeToRefs } from 'pinia';+import LogoutSessionsModal from '@/components/modals/LogoutSessionsModal.vue';import SettingsHeader from '@/components/settings/SettingsHeader.vue';import SettingsCard from '@/components/cards/SettingsCard.vue';import SessionCard from '@/components/cards/SessionCard.vue';@@ -10,13 +11,9 @@ import ButtonForm from '@/components/inputs/ButtonForm.vue';import SvgSpinners90RingWithBg from '~icons/svg-spinners/90-ring-with-bg';-import PasswordConfirm from '@/components/forms/PasswordConfirm.vue';-import ModalBase from '@/components/pinesUI/ModalBase.vue';-import useModal from '@/composables/useModal';--const confirmModal = useModal({ title: 'Sign Out of Other Devices', submitText: 'Confim' });-const { stateSessions, isLoadingSessions } = storeToRefs(useSettingsStore());++const modal = useModalStore();</script><template>@@ -43,21 +40,9 @@ const { stateSessions, isLoadingSessions } = storeToRefs(useSettingsStore());<SessionCard v-for="(session, index) in stateSessions" :key="index" :session="session" class="flex items-center" /></div><div class="relative flex flex-col-reverse sm:flex-row sm:justify-end gap-2 w-full">- <ButtonForm variant="submit" title="Not Implemented Yet" @click="confirmModal.toggleModal()">Log Out Other Sessions</ButtonForm>+ <ButtonForm variant="submit" @click="modal.open(LogoutSessionsModal, { title: 'Sign Out of Other Devices' })">Log Out Other Sessions</ButtonForm></div></section></template></SettingsCard>-- <ModalBase :modalData="confirmModal" :useControls="false">- <template #description>Are you sure you want to sign out of other devices? You won't be able to undo this action. </template>- <template #content>- <PasswordConfirm- :action="signOutOtherSessions"- success-message="Other Sessions Logged Out Successfully"- @cancel="confirmModal.toggleModal()"- @confirm="confirmModal.toggleModal()"- />- </template>- </ModalBase></template>diff --git a/resources/js/stores/ModalStore.ts b/resources/js/stores/ModalStore.tsnew file mode 100644index 00000000..3b98c9b7--- /dev/null+++ b/resources/js/stores/ModalStore.ts@@ -0,0 +1,45 @@+import { shallowRef, ref, reactive, type Component } from 'vue';+import { defineStore } from 'pinia';++export const useModalStore = defineStore('Modal', () => {+ const isAnimating = ref(false);+ const isOpen = ref(false);++ const props = reactive<Record<string, any>>({});+ const component = shallowRef<any>(null);++ const animationTime = ref(300);+ const timeoutId = ref<number | null>(null);++ function open(comp: Component, newProps: Record<string, any> = {}) {+ if (timeoutId.value) clearTimeout(timeoutId.value);+ component.value = comp;+ Object.assign(props, newProps);++ isOpen.value = true;+ isAnimating.value = true;++ timeoutId.value = window.setTimeout(() => {+ isAnimating.value = false;+ }, animationTime.value);+ }++ function close() {+ if (timeoutId.value) clearTimeout(timeoutId.value);+ isOpen.value = false;+ isAnimating.value = true;+ timeoutId.value = window.setTimeout(() => {+ isAnimating.value = false;+ }, animationTime.value);+ }++ return {+ props,+ isOpen,+ isAnimating,+ component,+ animationTime,+ open,+ close,+ };+});