Skip to content

A self-hosted media server and file management system

fix: code consistency

aminnausind9fb110d43bd
diff --git a/resources/js/components/cards/data/UserCard.vue b/resources/js/components/cards/data/UserCard.vue
index ac8962bd..11acadae 100644
--- a/resources/js/components/cards/data/UserCard.vue
+++ b/resources/js/components/cards/data/UserCard.vue
@@ -3,9 +3,8 @@ import type { UserResource } from '@/types/resources';
import { toFormattedDate, toTimeSpan } from '@/service/util';
import { ButtonCorner, ButtonText } from '@/components/cedar-ui/button';
-import { useAuthStore } from '@/stores/AuthStore';
import { BasePopover } from '@/components/cedar-ui/popover';
-import { storeToRefs } from 'pinia';
+import { useAuth } from '@/composables/auth/useAuth';
import LazyImage from '@/components/lazy/LazyImage.vue';
@@ -14,7 +13,7 @@ import ProiconsPersonCircle from '~icons/proicons/person-circle';
import ProiconsLockOpen from '~icons/proicons/lock-open';
import ProiconsDelete from '~icons/proicons/delete';
-const { userData } = storeToRefs(useAuthStore());
+const { isAdmin } = useAuth();
const props = defineProps<{ data: UserResource }>();
</script>
@@ -83,7 +82,7 @@ const props = defineProps<{ data: UserResource }>();
</template>
</ButtonCorner>
- <template v-if="userData?.id === 1">
+ <template v-if="isAdmin">
<ButtonCorner
:useDefaultStyle="false"
:label="'Manage Permissions'"
diff --git a/resources/js/components/panels/DropdownMenuItems.ts b/resources/js/components/panels/DropdownMenuItems.ts
index a9b22ecd..7b34d5bd 100644
--- a/resources/js/components/panels/DropdownMenuItems.ts
+++ b/resources/js/components/panels/DropdownMenuItems.ts
@@ -3,10 +3,10 @@ import type { DropdownMenuItem } from '@aminnausin/cedar-ui';
import { toFormattedDuration } from '@/service/util';
import { useContentStore } from '@/stores/ContentStore';
import { handleStartTask } from '@/service/taskService';
-import { useAuthStore } from '@/stores/AuthStore';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { h, computed } from 'vue';
+import { useAuth } from '@/composables/auth/useAuth';
import { FLAGS } from '@/config/featureFlags';
import LucideLayoutDashboard from '~icons/lucide/layout-dashboard';
@@ -31,8 +31,8 @@ export function useDropdownMenuItems() {
const defaults = { external: false, disabled: false };
const { taskWaitTimes, isLoadingWaitTimes } = storeToRefs(useAppStore());
+ const { userData, isAdmin } = useAuth();
const { stateDirectory } = storeToRefs(useContentStore());
- const { userData } = storeToRefs(useAuthStore());
const taskIcons = computed(() => {
const loadingIcon = h(ProiconsSpinner, { class: 'animate-spin' });
@@ -85,7 +85,7 @@ export function useDropdownMenuItems() {
icon: ProiconsGraph,
hidden: FLAGS.USE_SHORT_NAV_FOR_USERS && userData.value?.id !== 1,
},
- { ...defaults, name: 'overview', url: '/dashboard/overview', text: 'Dashboard', icon: LucideLayoutDashboard, hidden: userData.value?.id === 1 },
+ { ...defaults, name: 'overview', url: '/dashboard/overview', text: 'Dashboard', icon: LucideLayoutDashboard, hidden: isAdmin.value },
{ ...defaults, name: 'libraries', url: '/dashboard/libraries', text: 'Libraries', icon: ProiconsLibrary },
{ ...defaults, name: 'users', url: '/dashboard/users', text: 'Users', icon: LucideUsers, hidden: FLAGS.USE_SHORT_NAV_FOR_USERS && userData.value?.id !== 1 },
{ ...defaults, name: 'tasks', url: '/dashboard/tasks', text: 'Tasks', icon: ProiconsTaskList, hidden: FLAGS.USE_SHORT_NAV_FOR_USERS && userData.value?.id !== 1 },
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 1c7e9492..5c1bce0f 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -38,7 +38,7 @@ const props = defineProps<{ getCurrentTime: () => number }>();
const { stateVideo, stateFolder, stateDirectory } = storeToRefs(useContentStore());
const { title, description: parsedDescription, views } = useMetaData(stateVideo);
-const { userData } = useAuth();
+const { userData, isAuthenticated } = useAuth();
const descriptionRef = useTemplateRef('description');
const mobilePopover = useTemplateRef('mobile-popover');
@@ -66,7 +66,7 @@ const popoverItems = computed(() => {
icon: TablerDownload,
text: 'Download',
action: () => {
- if (stateDirectory.value.downloads_require_auth && !userData.value?.id) {
+ if (stateDirectory.value.downloads_require_auth && !isAuthenticated) {
toast.error('Error', { description: 'This download requires you to login.' });
return;
}
@@ -147,7 +147,7 @@ watch(
isExpanded.value = false;
}
- if (!userData.value?.id || !stateVideo.value.metadata) {
+ if (!isAuthenticated || !stateVideo.value.metadata) {
personalViewCount.value = null;
return;
}
@@ -163,7 +163,7 @@ watch(
watch(
() => userData.value,
() => {
- if (!userData.value?.id) personalViewCount.value = null;
+ if (!isAuthenticated) personalViewCount.value = null;
},
);
@@ -283,10 +283,10 @@ onMounted(() => {
/>
<ButtonIcon
- v-if="userData"
+ v-if="isAuthenticated"
class="absolute right-1 bottom-1 size-7 p-0 opacity-0 shadow-md transition-opacity group-hover:opacity-100 focus:opacity-100"
title="Edit Folder Metadata"
- @click="if (userData) modal.open(EditFolderModal, { cachedFolder: stateFolder });"
+ @click="modal.open(EditFolderModal, { cachedFolder: stateFolder })"
>
<template #icon>
<CircumEdit height="16" width="16" />
@@ -303,7 +303,7 @@ onMounted(() => {
{{ stateVideo.id < 1 ? '' : (title ?? '[File Not Found]') }}
</h2>
<div class="flex h-8 w-fit justify-end gap-2 select-none *:ring-inset lg:min-w-32">
- <ButtonText v-if="userData" aria-label="edit details" title="Edit Metadata" @click="handleEdit">
+ <ButtonText v-if="isAuthenticated" aria-label="edit details" title="Edit Metadata" @click="handleEdit">
<p class="text-nowrap">Edit Metadata</p>
</ButtonText>