Skip to content

A self-hosted media server and file management system

fix: #159 empty categories list error and update setup page

aminnausinb905162aa62e
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.php
index 474229f3..b543e8f7 100755
--- a/app/Http/Controllers/Api/V1/CategoryController.php
+++ b/app/Http/Controllers/Api/V1/CategoryController.php
@@ -27,6 +27,10 @@ class CategoryController extends Controller {
$categories->where('is_private', false);
}
+ if ($categories->count() == 0) {
+ return $this->success([]);
+ }
+
$categories = $categories->with(['folders.series']);
return $this->success(
@@ -64,7 +68,7 @@ class CategoryController extends Controller {
$folder = Folder::findOrFail($validated['default_folder_id']);
if ($this->conflictsWithAnother('category_id', $folder, $category->id)) {
- return $this->error($category, 'Folder cannot be assigned to category!', 500);
+ return $this->error($category, 'Folder cannot be assigned to library!', 500);
}
$validated['editor_id'] = Auth::id();
diff --git a/resources/js/service/mediaAPI.ts b/resources/js/service/mediaAPI.ts
index 46a5268c..dee7b59e 100644
--- a/resources/js/service/mediaAPI.ts
+++ b/resources/js/service/mediaAPI.ts
@@ -5,6 +5,8 @@
Run and commit to database (store) -> ?? What does that mean?
*/
import type { MetadataStoreRequest, MetadataUpdateRequest, SeriesStoreRequest, SeriesUpdateRequest } from '@/types/requests';
+import type { CategoryResource } from '@/types/resources';
+import type { AxiosResponse } from 'axios';
import { API } from '@/service/api';
@@ -47,7 +49,7 @@ export default {
},
};
-export function getCategories() {
+export function getCategories(): Promise<AxiosResponse<{ data: CategoryResource[]; message?: string }>> {
return API.get(`/categories`);
}
diff --git a/resources/js/views/RootView.vue b/resources/js/views/RootView.vue
index 0023c757..382af3ca 100644
--- a/resources/js/views/RootView.vue
+++ b/resources/js/views/RootView.vue
@@ -2,13 +2,17 @@
import { onBeforeMount } from 'vue';
import { getCategories } from '@/service/mediaAPI';
import { useRouter } from 'vue-router';
+import { toast } from '@/service/toaster/toastService';
const router = useRouter();
onBeforeMount(async () => {
try {
const { data } = await getCategories();
- const defaultPath = data?.data?.[0]?.name ?? '/setup';
+
+ if (data?.data?.length == 0) toast.error('Error', { description: 'No libraries exist yet.' });
+
+ const defaultPath = data?.data?.[0]?.name ?? 'setup';
router.replace(`/${defaultPath}`);
} catch {
router.replace('/setup');
diff --git a/resources/js/views/SetupView.vue b/resources/js/views/SetupView.vue
index 55db864b..07b674f9 100644
--- a/resources/js/views/SetupView.vue
+++ b/resources/js/views/SetupView.vue
@@ -1,17 +1,26 @@
<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+import { getCategories } from '@/service/mediaAPI';
import { useAuthStore } from '@/stores/AuthStore';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { onMounted } from 'vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
+import ProiconsLibrary from '~icons/proicons/library';
+import LucideFolder from '~icons/lucide/folder';
+
const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());
const { userData } = storeToRefs(useAuthStore());
-onMounted(() => {
+const librariesAdded = ref(false);
+
+onMounted(async () => {
pageTitle.value = 'MediaServer Setup';
selectedSideBar.value = '';
+ const { data } = await getCategories();
+
+ if (data?.data?.length !== 0) librariesAdded.value = true;
});
</script>
@@ -22,53 +31,56 @@ onMounted(() => {
<h2>Before you can start watching your media, you must complete these setup steps</h2>
<ul class="text-sm flex flex-col gap-2">
<li class="flex flex-wrap gap-1 items-center">
- <p class="mr-auto">
- 1. <RouterLink to="/register" :class="`text-purple-500 underline decoration-1`">Register</RouterLink> for an account. This will be your administrator
- account.
+ <p>
+ 1. <RouterLink to="/register" :class="`text-purple-500 underline decoration-1`">Register</RouterLink> for an account. The first one will be your
+ administrator account.
</p>
- <p v-show="userData" class="text-xs text-green-700">Done!</p>
+ <p v-show="userData" class="ms-auto text-xs font-bold text-green-600 dark:text-green-700">Done!</p>
</li>
<li>
<span class="flex gap-1 items-start">
- <p>2. Put your files in the data/media folder. You must follow this folder structure. An example url would be /category1/folder2</p>
- <p v-show="false" class="text-xs text-green-700">Done!</p>
+ <p>2. Put your files in the data/media folder. You must follow this folder structure. An example url would be /library1/folder2</p>
+ <p v-show="librariesAdded" class="ms-auto text-xs font-bold text-green-600 dark:text-green-700">Done!</p>
</span>
- <div class="p-2 font-mono w-full">
+ <div class="p-2 w-full font-mono">
<ul>
- <li class="font-bold">data</li>
+ <li class="font-bold">/data</li>
<ul class="ml-4">
- <li class="font-bold">media</li>
+ <li class="font-bold gap-1 flex"><LucideFolder />/media</li>
<ul class="ml-4">
- <li class="font-bold flex gap-1 items-center">
- category1
- <p class="font-normal text-xs">- Each category will show all of it's folders on the same page</p>
+ <li class="font-bold flex gap-1 items-center flex-wrap">
+ <ProiconsLibrary />
+ /library1
+ <p class="font-normal text-xs leading-none dark:text-neutral-400">-</p>
+ <p class="font-normal text-xs leading-none dark:text-neutral-400">Each library will show all of it's folders on the same page</p>
</li>
<ul class="ml-4">
- <li class="font-bold">folder1</li>
+ <li class="font-bold gap-1 flex"><LucideFolder /> /folder1</li>
<ul class="ml-4">
<li class="flex gap-1 items-center">
video1.mp4
- <p class="text-xs">- Each video will have it's own link by category/folder/?video=id</p>
+ <p class="text-xs leading-none dark:text-neutral-400">-</p>
+ <p class="text-xs leading-none dark:text-neutral-400">Each video will have it's own link by library/folder/?video=id</p>
</li>
<li>video2.mp4</li>
</ul>
- <li class="font-bold">folder2</li>
+ <li class="font-bold gap-1 flex"><LucideFolder /> /folder2</li>
<ul class="ml-4">
- <li>video1.mp4</li>
+ <li>video1.mkv</li>
<li>video2.mp4</li>
</ul>
</ul>
- <li class="font-bold flex gap-1">category2</li>
+ <li class="font-bold flex gap-1"><ProiconsLibrary />/library2</li>
<ul class="ml-4">
- <li class="font-bold">folder1</li>
+ <li class="font-bold gap-1 flex"><LucideFolder /> /folder1</li>
<ul class="ml-4">
- <li>video1.mp4</li>
- <li>video2.mp4</li>
+ <li>song1.wav</li>
+ <li>song2.ogg</li>
</ul>
- <li class="font-bold">folder2</li>
+ <li class="font-bold gap-1 flex"><LucideFolder />/folder2</li>
<ul class="ml-4">
- <li>video1.mp4</li>
- <li>video2.mp4</li>
+ <li>song1.mp3</li>
+ <li>song2.mp3</li>
</ul>
</ul>
</ul>
@@ -81,14 +93,14 @@ onMounted(() => {
3. <RouterLink :class="`text-purple-500 underline decoration-1`" to="/dashboard/tasks">Start an "Index Files Task"</RouterLink> to discover all the
videos you have organised.
</p>
- <p v-show="false" class="text-xs text-green-700">Done!</p>
+ <p v-show="librariesAdded" class="ms-auto text-xs font-bold text-green-600 dark:text-green-700">Done!</p>
</li>
<li class="flex flex-wrap gap-1 items-center">
<p>
4. <RouterLink :class="`text-purple-500 underline decoration-1`" to="/dashboard/tasks">Start a "Verify Files Task"</RouterLink> to generate metadata for
all of your videos.
</p>
- <p v-show="false" class="text-xs text-green-700">Done!</p>
+ <p v-show="false" class="ms-auto text-xs font-bold text-green-600 dark:text-green-700">Done!</p>
</li>
<li>5. <RouterLink to="/">Enjoy</RouterLink> your media library!</li>
</ul>