Skip to content

A self-hosted media server and file management system

refactor: move base modal

aminnausinf6560b8707aa
diff --git a/resources/js/components/pinesUI/ModalBase.vue b/resources/js/components/cedar-ui/modal/BaseModal.vue
old mode 100755
new mode 100644
similarity index 100%
rename from resources/js/components/pinesUI/ModalBase.vue
rename to resources/js/components/cedar-ui/modal/BaseModal.vue
diff --git a/resources/js/components/cedar-ui/modal/index.ts b/resources/js/components/cedar-ui/modal/index.ts
new file mode 100644
index 00000000..5126256d
--- /dev/null
+++ b/resources/js/components/cedar-ui/modal/index.ts
@@ -0,0 +1,5 @@
+export { default as BaseModal } from './BaseModal.vue';
+// export { default as GlobalModal } from './GlobalModal.vue';
+// export { default as DeleteAccountModal } from './DeleteAccountModal.vue';
+// export { default as LogoutSessionsModal } from './LogoutSessionsModal.vue';
+// export * from './useModalCore';
diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vue
index 0fb8c72b..9f205757 100644
--- a/resources/js/components/dashboard/DashboardLibraries.vue
+++ b/resources/js/components/dashboard/DashboardLibraries.vue
@@ -14,12 +14,12 @@ import { storeToRefs } from 'pinia';
import { sortObject } from '@/service/sort/baseSort';
import { ButtonText } from '@/components/cedar-ui/button';
import { TableBase } from '@/components/cedar-ui/table';
+import { BaseModal } from '@/components/cedar-ui/modal';
import { toast } from '@aminnausin/cedar-ui';
import LibraryFolderCard from '@/components/cards/data/LibraryFolderCard.vue';
import LibraryCard from '@/components/cards/data/LibraryCard.vue';
import EditFolder from '@/components/forms/EditFolder.vue';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
import useModal from '@/composables/useModal';
import ProiconsLibrary from '~icons/proicons/library';
@@ -258,10 +258,10 @@ watchEffect(() => {
:sorting-options="sortingOptions"
v-model="searchQuery"
/>
- <ModalBase :modalData="confirmModal" :action="submitDelete">
+ <BaseModal :modalData="confirmModal" :action="submitDelete">
<template #description> Are you sure you want to delete this Library? </template>
- </ModalBase>
- <ModalBase :modalData="editFolderModal" :useControls="false">
+ </BaseModal>
+ <BaseModal :modalData="editFolderModal" :useControls="false">
<template #description v-if="cachedFolder && cachedFolder.series?.editor_id && cachedFolder.series.date_updated">
Last edited by
<a title="Editor profile" target="_blank" :href="`/profile/${cachedFolder.series.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted"
@@ -273,5 +273,5 @@ watchEffect(() => {
<template #content>
<EditFolder v-if="cachedFolder" :folder="cachedFolder" @handleFinish="handleSeriesUpdate" />
</template>
- </ModalBase>
+ </BaseModal>
</template>
diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vue
index 29d42905..da280202 100644
--- a/resources/js/components/dashboard/DashboardTasks.vue
+++ b/resources/js/components/dashboard/DashboardTasks.vue
@@ -15,11 +15,11 @@ import { storeToRefs } from 'pinia';
import { sortObject } from '@/service/sort/baseSort';
import { ButtonText } from '@/components/cedar-ui/button';
import { TableBase } from '@/components/cedar-ui/table';
+import { BaseModal } from '@/components/cedar-ui/modal';
import { toast } from '@aminnausin/cedar-ui';
import DashboardTaskMenu from '@/components/menus/DashboardTaskMenu.vue';
import IconHorizon from '@/components/icons/IconHorizon.vue';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
import TaskCard from '@/components/cards/data/TaskCard.vue';
import useModal from '@/composables/useModal';
@@ -249,10 +249,10 @@ onUnmounted(async () => {
:table-styles="'gap-4 xs:gap-2'"
v-model="searchQuery"
/>
- <ModalBase :modalData="cancelModal" :action="submitCancel">
+ <BaseModal :modalData="cancelModal" :action="submitCancel">
<template #description> Are you sure you want to cancel this task and all of its sub tasks? </template>
- </ModalBase>
- <ModalBase :modalData="deleteModal" :action="submitDelete">
+ </BaseModal>
+ <BaseModal :modalData="deleteModal" :action="submitDelete">
<template #description>Are you sure you want to delete this task and all of its sub tasks? </template>
- </ModalBase>
+ </BaseModal>
</template>
diff --git a/resources/js/components/dashboard/DashboardUsers.vue b/resources/js/components/dashboard/DashboardUsers.vue
index d76c4cea..8d7c0c67 100644
--- a/resources/js/components/dashboard/DashboardUsers.vue
+++ b/resources/js/components/dashboard/DashboardUsers.vue
@@ -11,9 +11,9 @@ import { deleteUser } from '@/service/siteAPI';
import { sortObject } from '@/service/sort/baseSort';
import { ButtonText } from '@/components/cedar-ui/button';
import { TableBase } from '@/components/cedar-ui/table';
+import { BaseModal } from '@/components/cedar-ui/modal';
import { toast } from '@aminnausin/cedar-ui';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
import UserCard from '@/components/cards/data/UserCard.vue';
import useModal from '@/composables/useModal';
@@ -149,7 +149,7 @@ const loadData = async (refresh: boolean = false) => {
:table-styles="'gap-4 xs:gap-2'"
v-model="searchQuery"
/>
- <ModalBase :modalData="confirmModal" :action="submitDelete">
+ <BaseModal :modalData="confirmModal" :action="submitDelete">
<template #description> Are you sure you want to remove this user? </template>
- </ModalBase>
+ </BaseModal>
</template>
diff --git a/resources/js/components/panels/FolderSidebar.vue b/resources/js/components/panels/FolderSidebar.vue
index 3de94c0f..ceeab155 100644
--- a/resources/js/components/panels/FolderSidebar.vue
+++ b/resources/js/components/panels/FolderSidebar.vue
@@ -10,11 +10,11 @@ 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 { BaseModal } from '@/components/cedar-ui/modal';
import SidebarHeader from '@/components/headers/SidebarHeader.vue';
import FolderCard from '@/components/cards/data/FolderCard.vue';
import EditFolder from '@/components/forms/EditFolder.vue';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
import useModal from '@/composables/useModal';
import ProiconsFilterCancel from '~icons/proicons/filter-cancel';
@@ -115,13 +115,13 @@ const handleSeriesUpdate = async (res: any) => {
:sorting-options="folderSortingOptions"
/>
- <ModalBase :modalData="shareModal">
+ <BaseModal :modalData="shareModal">
<template #description> Copy link to clipboard to share it.</template>
<template #controls>
<CopyToClipboard :text="shareLink" />
</template>
- </ModalBase>
- <ModalBase :modalData="editFolderModal" :useControls="false">
+ </BaseModal>
+ <BaseModal :modalData="editFolderModal" :useControls="false">
<template #description v-if="cachedFolder && cachedFolder.series?.editor_id && cachedFolder.series.date_updated">
Last edited by
<a title="Editor profile" target="_blank" :href="`/profile/${cachedFolder.series.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted"
@@ -133,5 +133,5 @@ const handleSeriesUpdate = async (res: any) => {
<template #content>
<EditFolder v-if="cachedFolder" :folder="cachedFolder" @handleFinish="handleSeriesUpdate" />
</template>
- </ModalBase>
+ </BaseModal>
</template>
diff --git a/resources/js/components/panels/HistorySidebar.vue b/resources/js/components/panels/HistorySidebar.vue
index c280d2f8..cf22d2f5 100644
--- a/resources/js/components/panels/HistorySidebar.vue
+++ b/resources/js/components/panels/HistorySidebar.vue
@@ -3,11 +3,11 @@ 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 { BaseModal } from '@/components/cedar-ui/modal';
import { ref } from 'vue';
import SidebarHeader from '@/components/headers/SidebarHeader.vue';
import RecordCard from '@/components/cards/data/RecordCard.vue';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
import useModal from '@/composables/useModal';
const shareModal = useModal({ title: 'Share Video' });
@@ -46,10 +46,10 @@ const handleShare = (link: string) => {
</template>
</section>
- <ModalBase :modalData="shareModal">
+ <BaseModal :modalData="shareModal">
<template #description> Copy link to clipboard to share it.</template>
<template #controls>
<CopyToClipboard :text="shareLink" />
</template>
- </ModalBase>
+ </BaseModal>
</template>
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 75c69121..3dc1d5df 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -10,13 +10,13 @@ import { useAuthStore } from '@/stores/AuthStore';
import { BasePopover } from '@/components/cedar-ui/popover';
import { storeToRefs } from 'pinia';
import { HoverCard } from '@/components/cedar-ui/hover-card';
+import { BaseModal } from '@/components/cedar-ui/modal';
import { BadgeTag } from '@/components/cedar-ui/badge';
import { emitSeek } from '@/service/player/seekBus';
import { useRoute } from 'vue-router';
import useMetaData from '@/composables/useMetaData';
import EditFolder from '@/components/forms/EditFolder.vue';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
import EditVideo from '@/components/forms/EditVideo.vue';
import useModal from '@/composables/useModal';
@@ -318,7 +318,7 @@ onMounted(() => {
</article>
</div>
</section>
- <ModalBase :modalData="editFolderModal" :useControls="false">
+ <BaseModal :modalData="editFolderModal" :useControls="false">
<template #description v-if="stateFolder.series?.editor_id && stateFolder.series.date_updated">
Last edited by
<a title="Editor profile" target="_blank" :href="`/profile/${stateFolder.series.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted"
@@ -330,8 +330,8 @@ onMounted(() => {
<template #content>
<EditFolder :folder="stateFolder" @handleFinish="handleSeriesUpdate" />
</template>
- </ModalBase>
- <ModalBase :modalData="editVideoModal" :useControls="false">
+ </BaseModal>
+ <BaseModal :modalData="editVideoModal" :useControls="false">
<template #description v-if="stateVideo.metadata?.editor_id && stateVideo.metadata.updated_at">
Last edited by
<a title="Editor profile" target="_blank" :href="`/profile/${stateVideo.metadata.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted">
@@ -343,14 +343,14 @@ onMounted(() => {
<template #content>
<EditVideo :video="stateVideo" @handleFinish="handleVideoDetailsUpdate" />
</template>
- </ModalBase>
- <ModalBase :modalData="shareVideoModal">
+ </BaseModal>
+ <BaseModal :modalData="shareVideoModal">
<template #description> Copy link to clipboard to share it.</template>
<template #controls>
<CopyToClipboard :text="videoURL" />
</template>
- </ModalBase>
+ </BaseModal>
</template>
<style lang="css">
diff --git a/resources/js/components/video/VideoLyrics.vue b/resources/js/components/video/VideoLyrics.vue
index 15bc513c..87019c23 100644
--- a/resources/js/components/video/VideoLyrics.vue
+++ b/resources/js/components/video/VideoLyrics.vue
@@ -8,11 +8,11 @@ import { useContentStore } from '@/stores/ContentStore';
import { useLyricStore } from '@/stores/LyricStore';
import { storeToRefs } from 'pinia';
import { ButtonIcon } from '@/components/cedar-ui/button';
+import { BaseModal } from '@/components/cedar-ui/modal';
import { onSeek } from '@/service/player/seekBus';
import VideoLyricItem from '@/components/video/VideoLyricItem.vue';
import EditLyrics from '@/components/forms/EditLyrics.vue';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
let unsubscribe: () => boolean;
@@ -274,11 +274,11 @@ defineExpose({ scrollToCurrent });
</template>
</ButtonIcon>
</div>
- <ModalBase :modalData="editLyricsModal" :useControls="false">
+ <BaseModal :modalData="editLyricsModal" :useControls="false">
<template #content>
<EditLyrics :video="stateVideo" @handleFinish="handleLyricsUpdated" />
</template>
- </ModalBase>
+ </BaseModal>
</template>
<style lang="css" scoped>
diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vue
index cd1e2f23..f690ff06 100755
--- a/resources/js/views/HistoryView.vue
+++ b/resources/js/views/HistoryView.vue
@@ -9,11 +9,11 @@ import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { sortObject } from '@/service/sort/baseSort';
import { TableBase } from '@/components/cedar-ui/table';
+import { BaseModal } from '@/components/cedar-ui/modal';
import { toast } from '@aminnausin/cedar-ui';
import RecordCardDetails from '@/components/cards/data/RecordCardDetails.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
import useModal from '@/composables/useModal';
const recordSortingOptions: GenericSortOption<RecordResource>[] = [
@@ -105,9 +105,9 @@ onMounted(() => {
v-model="searchQuery"
/>
</section>
- <ModalBase :modalData="confirmModal" :action="submitDelete">
+ <BaseModal :modalData="confirmModal" :action="submitDelete">
<template #description> Are you sure you want to delete this record? </template>
- </ModalBase>
+ </BaseModal>
</template>
<template v-slot:sidebar> </template>
</LayoutBase>
diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vue
index 1b1c5b67..458dbc85 100755
--- a/resources/js/views/VideoView.vue
+++ b/resources/js/views/VideoView.vue
@@ -11,6 +11,7 @@ import { queryClient } from '@/service/vue-query';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { TableBase } from '@/components/cedar-ui/table';
+import { BaseModal } from '@/components/cedar-ui/modal';
import { useRoute } from 'vue-router';
import VideoAmbientPlayer from '@/components/video/VideoAmbientPlayer.vue';
@@ -18,8 +19,6 @@ import VideoInfoPanel from '@/components/video/VideoInfoPanel.vue';
import VideoSidebar from '@/components/panels/VideoSidebar.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
import VideoCard from '@/components/cards/data/VideoCard.vue';
-import ModalBase from '@/components/pinesUI/ModalBase.vue';
-
import EditVideo from '@/components/forms/EditVideo.vue';
import useModal from '@/composables/useModal';
@@ -224,7 +223,7 @@ watch(() => stateVideo.value, setVideoAsDocumentTitle, { immediate: true });
v-model="searchQuery"
/>
- <ModalBase :modalData="editVideoModal" :useControls="false">
+ <BaseModal :modalData="editVideoModal" :useControls="false">
<template #description>
<template v-if="cachedVideo && cachedVideo.metadata?.editor_id && cachedVideo.metadata.updated_at">
<span>
@@ -246,13 +245,13 @@ watch(() => stateVideo.value, setVideoAsDocumentTitle, { immediate: true });
<template #content>
<EditVideo v-if="cachedVideo" :video="cachedVideo" @handleFinish="handleVideoDetailsUpdate" />
</template>
- </ModalBase>
- <ModalBase :modalData="shareVideoModal">
+ </BaseModal>
+ <BaseModal :modalData="shareVideoModal">
<template #description> Copy link to clipboard to share it.</template>
<template #controls>
<CopyToClipboard :text="cachedVideoUrl" />
</template>
- </ModalBase>
+ </BaseModal>
</section>
</template>
<template v-slot:sidebar>