A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix toasts in pinia
aminnausin10c1d31b83b8
diff --git a/resources/js/components/layout/NavBar.vue b/resources/js/components/layout/NavBar.vueindex 140e5115..77ccdf43 100644--- a/resources/js/components/layout/NavBar.vue+++ b/resources/js/components/layout/NavBar.vue@@ -2,6 +2,7 @@import LightModeToggle from '../inputs/LightModeToggle.vue';import NavButton from '../inputs/NavButton.vue';import NavLink from '../inputs/NavLink.vue';+import DropdownMenu from '../pinesUI/DropdownMenu.vue';import CircumFolderOn from '~icons/circum/folder-on';import MaterialSymbolsLightHistory from '~icons/material-symbols-light/history';@@ -12,7 +13,6 @@ import { ref, onMounted, watch } from 'vue';import { storeToRefs } from 'pinia';import { useAuthStore } from '../../stores/AuthStore'import { useAppStore } from '../../stores/AppStore';-import DropdownMenu from '../pinesUI/DropdownMenu.vue';const appStore = useAppStore();diff --git a/resources/js/components/pinesUI/CopyToClipboardSmall.vue b/resources/js/components/pinesUI/CopyToClipboardSmall.vueindex 08316492..4181bdde 100644--- a/resources/js/components/pinesUI/CopyToClipboardSmall.vue+++ b/resources/js/components/pinesUI/CopyToClipboardSmall.vue@@ -23,15 +23,15 @@ const clipboard = useClipboard(props.text)leave-to-class="opacity-0 translate-x-2"><div v-if="clipboard.copyNotification"class="absolute left-0" v-cloak>- <div class="px-3 h-7 -ml-1.5 items-center flex text-xs bg-indigo-500 border-r border-indigo-500 -translate-x-full text-white rounded">+ <div class="px-3 h-7 -ml-1.5 items-center flex text-xs bg-green-500 border-r border-green-500 -translate-x-full text-white rounded"><span>Copied!</span><div class="absolute right-0 inline-block h-full -mt-px overflow-hidden translate-x-3 -translate-y-2 top-1/2">- <div class="w-3 h-3 origin-top-left transform rotate-45 bg-indigo-500 border border-transparent"></div>+ <div class="w-3 h-3 origin-top-left transform rotate-45 bg-green-500 border border-transparent"></div></div></div></div></Transition>- <ButtonIcon @click="clipboard.copyToClipboard();" class="flex items-center justify-center h-8 w-9 text-xs group text-neutral-500 hover:text-neutral-600 dark:text-gray-300 dark:hover:text-gray-400 hover:bg-neutral-100">+ <ButtonIcon @click="clipboard.copyToClipboard();" class="flex items-center justify-center h-8 w-9 text-xs group text-neutral-500 hover:text-neutral-600 dark:text-gray-300 dark:hover:text-gray-400 hover:bg-neutral-100 focus:!ring-green-600/50"><template #icon><svg v-if="clipboard.copyNotification" class="w-4 h-4 text-green-500 stroke-current"xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"diff --git a/resources/js/router/index.js b/resources/js/router/index.jsindex 718a95c9..6477fef9 100644--- a/resources/js/router/index.js+++ b/resources/js/router/index.js@@ -11,7 +11,6 @@ import { logout } from "../service/authAPI";import { toTitleCase } from '../service/util';import { useToast } from '../composables/useToast';-const toast = useToast();const router = createRouter({history: createWebHistory(),routes: [@@ -51,7 +50,8 @@ const router = createRouter({document.title = nextTitle;next(nextPath)} catch (error) {- toast({ type: 'danger', title:'Error', description: `Unable to logout.`})+ const toast = useToast();+ toast.add({ type: 'danger', title:'Error', description: `Unable to logout.`})console.log(error);next('/');diff --git a/resources/js/stores/AuthStore.js b/resources/js/stores/AuthStore.jsindex a2bd8448..c37168c9 100644--- a/resources/js/stores/AuthStore.js+++ b/resources/js/stores/AuthStore.js@@ -36,7 +36,7 @@ export const useAuthStore = defineStore('Auth', () => {return true;} catch (error) {console.log(error);- toast({ type: 'warning', title:'Session Expired', description: `Please log in again.`})+ toast.add({ type: 'warning', title:'Session Expired', description: `Please log in again.`})clearAuthState();return false;}diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.jsindex c80b2be7..59afc123 100644--- a/resources/js/stores/ContentStore.js+++ b/resources/js/stores/ContentStore.js@@ -112,7 +112,7 @@ export const useContentStore = defineStore('Content', () => {async function getCategory(URL_CATEGORY, URL_FOLDER) {const { data, error } = await mediaAPI.getCategory(`${URL_CATEGORY}${URL_FOLDER ? '/' + URL_FOLDER : ''}`)if(error || !data?.success){- toast({ type: 'danger', title:'Error', description: data?.message ?? 'Unable to load data.'})+ toast.add({ type: 'danger', title:'Error', description: data?.message ?? 'Unable to load data.'})pageTitle.value = 'Folder not Found';console.log(error ?? data?.message);return false;@@ -132,14 +132,14 @@ export const useContentStore = defineStore('Content', () => {const nextFolder = stateDirectory.value.folders?.find((folder) => {return folder.attributes.name === nextFolderName});if(!nextFolder?.id){- toast({ type: 'danger', title:'Invalid folder', description: `The folder '${nextFolderName}' does not exist.`})+ toast.add({ type: 'danger', title:'Invalid folder', description: `The folder '${nextFolderName}' does not exist.`})return;}const { data, error } = await mediaAPI.getVideos({ folder_id: nextFolder.id}); // get videos with given folder id (list of videos organised by folder id)if(error || !data?.success){- toast({ type: 'danger', title:'Invalid folder', description: `The folder '${nextFolderName}' does not exist.`})+ toast.add({ type: 'danger', title:'Invalid folder', description: `The folder '${nextFolderName}' does not exist.`})pageTitle.value = 'Folder not Found';console.log(error ?? data?.message);return Promise.reject(false);@@ -171,7 +171,7 @@ export const useContentStore = defineStore('Content', () => {return video.id === id});}- if(!result) toast({ type: 'danger', title:'Invalid Video', description: 'Selected video cannot be found...'})+ if(!result) toast.add({ type: 'danger', title:'Invalid Video', description: 'Selected video cannot be found...'})else stateVideo.value = result;}@@ -179,7 +179,7 @@ export const useContentStore = defineStore('Content', () => {async function InitPlaylist(){filterQuery.value = {search: '', season: -1, tag: ''};if(!stateFolder.value.id){- toast({ type: 'danger', title:'Invalid folder', description: `The folder '${stateFolder.value.name}' does not exist.`})+ toast.add({ type: 'danger', title:'Invalid folder', description: `The folder '${stateFolder.value.name}' does not exist.`})return;}diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vueindex 4bd1c5b4..fd577151 100644--- a/resources/js/views/VideoView.vue+++ b/resources/js/views/VideoView.vue@@ -4,13 +4,13 @@ import LayoutBase from '../components/layout/LayoutBase.vue';import VideoPlayer from '../components/video/VideoPlayer.vue';import VideoInfoPanel from '../components/video/VideoInfoPanel.vue';import VideoCard from '../components/cards/VideoCard.vue';+import TableBase from '../components/table/TableBase.vue';import { nextTick, onMounted, ref, watch } from 'vue';import { useContentStore } from '../stores/ContentStore';import { useAppStore } from '../stores/AppStore';import { storeToRefs } from 'pinia';import { useRoute } from 'vue-router'-import TableBase from '../components/table/TableBase.vue';const route = useRoute();diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.phpindex fa186f56..20096bb9 100644--- a/resources/views/layouts/app.blade.php+++ b/resources/views/layouts/app.blade.php@@ -11,23 +11,6 @@<!-- local -->@vite('resources/css/app.css')<script>- toastr.options = {- "closeButton": true,- "debug": false,- "newestOnTop": false,- "progressBar": true,- "positionClass": "toast-bottom-left",- "preventDuplicates": false,- "onclick": null,- "showDuration": "300",- "hideDuration": "1000",- "timeOut": "5000",- "extendedTimeOut": "1000",- "showEasing": "swing",- "hideEasing": "linear",- "showMethod": "fadeIn",- "hideMethod": "fadeOut"- }</script></head>