Skip to content

A self-hosted media server and file management system

Error handling fix

aminnausin0ebf7f8a272f
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index 6db50bc4..7b9c8385 100644
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -50,6 +50,7 @@ class DirectoryController extends Controller
public function showDirectoryAPI(Request $request) {
// All this does is convert url to ids and names
// IDEALLY it should also load data to prevent requiring more api requests
+ // It does exactly that now it feels fast
try {
$privateCategories = array("legacy"=>1);
$dir = trim(strtolower($request->dir));
@@ -57,7 +58,7 @@ class DirectoryController extends Controller
if(isset($privateCategories[$dir]) && !$request->user('sanctum')){
$data['message'] = 'Unauthorized';
- return view('error', $data);
+ return $this->error(null, 'Access to this folder is forbidden', 403);
}
$dirRaw = Category::select('id')->firstWhere('name', 'ilike', '%' . $dir . '%');
@@ -78,22 +79,6 @@ class DirectoryController extends Controller
$videoList = VideoResource::collection( Video::where('folder_id', $folderRaw->id)->get());
$data['folder'] = array('id'=>$folderRaw->id, 'name'=>$folderRaw->name, 'videos'=>$videoList);
-
- // if(isset($dirRaw->id)){
- // $data['dir'] = array('id'=>$dirRaw->id,'name'=>$dir); // Full category data
- // if(isset($request->folderName)){
- // $data['folder'] = array('id'=>null, 'name'=>$folderName);
- // }
- // else{
- // $folderRaw = Folder::select('id','name')->firstWhere('category_id', $data['dir']['id']);
- // $data['folder'] = array('id'=>$folderRaw->id, 'name'=>$folderRaw->name);
- // }
- // }
- // else{
- // $data['dir'] = array('id'=>null,'name'=>$dir);
- // $data['folder'] = array('id'=>null, 'name'=>null, 'videos'=>null);
- // }
-
return $this->success($data, '', 200);
} catch (\Throwable $th) {
diff --git a/resources/js/components/table/TablePagination.vue b/resources/js/components/table/TablePagination.vue
index 02d449a7..eb706c27 100644
--- a/resources/js/components/table/TablePagination.vue
+++ b/resources/js/components/table/TablePagination.vue
@@ -24,7 +24,7 @@ const pageRange = computed(() => {
<div class="flex items-center flex-col sm:flex-row sm:justify-between flex-wrap gap-2">
<p class="text-gray-700 dark:text-neutral-300 line-clamp-1">
Showing
- <span class="font-medium dark:text-neutral-100">{{ props.itemsPerPage * (currentPage - 1) + 1 }}</span>
+ <span class="font-medium dark:text-neutral-100">{{ props.listLength ? props.itemsPerPage * (currentPage - 1) + 1 : 0 }}</span>
to
<span class="font-medium dark:text-neutral-100">{{ Math.min(props.itemsPerPage * (currentPage), props.listLength) }}</span>
of
diff --git a/resources/js/router/index.js b/resources/js/router/index.js
index c580b58c..62f06a64 100644
--- a/resources/js/router/index.js
+++ b/resources/js/router/index.js
@@ -8,6 +8,7 @@ import { createRouter, createWebHistory} from "vue-router";
import { useAuthStore } from "../stores/AuthStore";
import { logout } from "../service/authAPI";
import { toTitleCase } from '../service/util';
+import ErrorView from '../views/ErrorView.vue';
const router = createRouter({
history: createWebHistory(),
@@ -65,6 +66,24 @@ const router = createRouter({
name:'home',
component: VideoView
},
+ {
+ path:'/403',
+ name:'403',
+ component: ErrorView,
+ meta: {code: 403, message: 'Access Forbidden'}
+ },
+ {
+ path:'/404',
+ name:'404',
+ component: ErrorView,
+ meta: {code: 404, message: 'Not Found'}
+ },
+ {
+ path:'/500',
+ name:'500',
+ component: ErrorView,
+ meta: {code: 500, message: 'Server Error'}
+ }
]
})
diff --git a/resources/js/service/api.js b/resources/js/service/api.js
index 65361709..4437802e 100644
--- a/resources/js/service/api.js
+++ b/resources/js/service/api.js
@@ -6,6 +6,11 @@ const handleResponse = (response) => {
const handleError = (error) => {
// if the server throws an error (404, 500 etc.)
+ console.log(error.response.status);
+ if(error.response.status === 403 | error.response.status === 500){
+ window.location.href = `/${error.response.status}`
+ return;
+ }
return error.response;
}
diff --git a/resources/js/views/ErrorView.vue b/resources/js/views/ErrorView.vue
new file mode 100644
index 00000000..fe43f1eb
--- /dev/null
+++ b/resources/js/views/ErrorView.vue
@@ -0,0 +1,16 @@
+
+<template>
+ <main class="relative flex items-top justify-center min-h-screen bg-gray-100 dark:bg-gray-900 sm:items-center sm:pt-0">
+ <div class="max-w-xl mx-auto sm:px-6 lg:px-8">
+ <div class="flex items-center pt-8 sm:justify-start sm:pt-0">
+ <div class="px-4 text-lg text-gray-400 border-r border-gray-400 tracking-wider">
+ {{ $route.name }}
+ </div>
+
+ <div class="ml-4 text-lg text-gray-500 uppercase tracking-wider">
+ {{ $route.meta.message }}
+ </div>
+ </div>
+ </div>
+ </main>
+</template>
\ No newline at end of file