Skip to content

A self-hosted media server and file management system

feat: use cedar base modal

aminnausin796d8718318e
diff --git a/resources/js/components/cedar-ui/modal/BaseModal.vue b/resources/js/components/cedar-ui/modal/BaseModal.vue
index 049da11f..099aa5ba 100644
--- a/resources/js/components/cedar-ui/modal/BaseModal.vue
+++ b/resources/js/components/cedar-ui/modal/BaseModal.vue
@@ -1,22 +1,19 @@
<script setup lang="ts">
-import type { useModalCore } from './useModalCore';
+import { useModalStore } from '@/stores/ModalStore';
+import { ButtonCorner } from '@/components/cedar-ui/button';
-import { ButtonCorner } from '../button';
-
-defineProps<{
- modal: ReturnType<typeof useModalCore>;
-}>();
+const modalStore = useModalStore();
</script>
<template>
- <section v-if="!modal.props?.hideHeader" class="flex flex-wrap items-center gap-2">
+ <section v-if="!modalStore.props?.hideHeader" class="flex flex-wrap items-center gap-2">
<h3 ref="modalTitle" id="modalTitle" class="flex-1 scroll-mt-16 text-xl font-semibold sm:scroll-mt-12">
<slot name="title">
- {{ modal.props?.title ?? 'Modal Title' }}
+ {{ modalStore.props?.title ?? 'Modal Title' }}
</slot>
</h3>
- <ButtonCorner @click="modal.close" class="static! m-0!" />
- <p class="w-full text-sm text-foreground-2" v-if="$slots.description" id="modalDescription">
+ <ButtonCorner @click="modalStore.close" class="static! m-0!" />
+ <p class="text-foreground-2 w-full text-sm" v-if="$slots.description" id="modalDescription">
<slot name="description"> </slot>
</p>
</section>
diff --git a/resources/js/components/modals/BaseModal.vue b/resources/js/components/modals/BaseModal.vue
deleted file mode 100644
index 3973d32c..00000000
--- a/resources/js/components/modals/BaseModal.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<script setup lang="ts">
-import { useModalStore } from '@/stores/ModalStore';
-import { ButtonCorner } from '@/components/cedar-ui/button';
-
-const modalStore = useModalStore();
-</script>
-
-<template>
- <section class="flex flex-wrap items-center gap-2">
- <h3 ref="modalTitle" id="modalTitle" class="flex-1 scroll-mt-16 text-xl font-semibold sm:scroll-mt-12">
- <slot name="title">
- {{ modalStore.props?.title ?? 'Modal Title' }}
- </slot>
- </h3>
- <ButtonCorner @click="modalStore.close" class="static! m-0!" />
- <p class="text-foreground-2 w-full text-sm" 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.vue
index 36177097..7e967794 100644
--- a/resources/js/components/modals/DeleteAccountModal.vue
+++ b/resources/js/components/modals/DeleteAccountModal.vue
@@ -1,10 +1,10 @@
<script setup lang="ts">
import { deleteAccount } from '@/service/authAPI';
import { useModalStore } from '@/stores/ModalStore';
+import { BaseModal } from '@/components/cedar-ui/modal';
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();
diff --git a/resources/js/components/modals/LogoutSessionsModal.vue b/resources/js/components/modals/LogoutSessionsModal.vue
index 3b00dbe2..ebcf8918 100644
--- a/resources/js/components/modals/LogoutSessionsModal.vue
+++ b/resources/js/components/modals/LogoutSessionsModal.vue
@@ -1,9 +1,9 @@
<script setup lang="ts">
import { signOutOtherSessions } from '@/service/authAPI';
import { useModalStore } from '@/stores/ModalStore';
+import { BaseModal } from '@/components/cedar-ui/modal';
import PasswordConfirm from '@/components/forms/PasswordConfirm.vue';
-import BaseModal from '@/components/modals/BaseModal.vue';
const props = defineProps<{ onSuccess?: () => void }>();
const modalStore = useModalStore();