Skip to content

A self-hosted media server and file management system

chore: re-organise files and home feed order

aminnausin1d652e1661fa
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/Api/V1/Feed/HomeController.php
similarity index 98%
rename from app/Http/Controllers/HomeController.php
rename to app/Http/Controllers/Api/V1/Feed/HomeController.php
index 9f7e872f..b5d207b2 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/Api/V1/Feed/HomeController.php
@@ -1,8 +1,9 @@
<?php
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api\V1\Feed;
use App\Enums\MediaType;
+use App\Http\Controllers\Controller;
use App\Http\Resources\FolderResource;
use App\Http\Resources\VideoResource;
use App\Models\Category;
diff --git a/resources/js/views/HomeView.vue b/resources/js/views/HomeView.vue
index cde8dd36..d426088e 100644
--- a/resources/js/views/HomeView.vue
+++ b/resources/js/views/HomeView.vue
@@ -42,15 +42,13 @@ onMounted(() => {
</HomeShelf>
<HomeShelf
- title="Recently Updated Folders"
- skeleton-class="w-40 aspect-2-3"
- :item-count="recentlyUpdated?.length"
- :is-loading="isLoadingRecentlyUpdated"
- :no-data-message="'Nothing released yet'"
+ v-if="isLoadingRecentlyUploaded || !!recentlyUploaded?.length"
+ title="Recently Uploaded Videos"
+ skeleton-class="w-56 3xl:w-76 aspect-video"
+ :item-count="recentlyUploaded?.length"
+ :is-loading="isLoadingRecentlyUploaded"
>
- <BrowseFolderCard v-for="folder in recentlyUpdated" :key="folder.id" :folder="folder">
- <span v-if="folder.series?.updated_at" class="text-foreground-1 truncate"> Updated {{ toTimeSpan(folder.series?.updated_at, '') }} </span>
- </BrowseFolderCard>
+ <RecentlyUploadedCard class="3xl:w-76" v-for="video in recentlyUploaded" :key="video.id" :video="video" />
</HomeShelf>
<HomeShelf
@@ -67,6 +65,18 @@ onMounted(() => {
</BrowseFolderCard>
</HomeShelf>
+ <HomeShelf
+ title="Recently Updated Folders"
+ skeleton-class="w-40 aspect-2-3"
+ :item-count="recentlyUpdated?.length"
+ :is-loading="isLoadingRecentlyUpdated"
+ :no-data-message="'Nothing released yet'"
+ >
+ <BrowseFolderCard v-for="folder in recentlyUpdated" :key="folder.id" :folder="folder">
+ <span v-if="folder.series?.updated_at" class="text-foreground-1 truncate"> Updated {{ toTimeSpan(folder.series?.updated_at, '') }} </span>
+ </BrowseFolderCard>
+ </HomeShelf>
+
<HomeShelf
title="Recently Added Folders"
skeleton-class="w-40 aspect-2-3"
@@ -79,16 +89,6 @@ onMounted(() => {
</BrowseFolderCard>
</HomeShelf>
- <HomeShelf
- v-if="isLoadingRecentlyUploaded || !!recentlyUploaded?.length"
- title="Recently Uploaded Videos"
- skeleton-class="w-56 3xl:w-76 aspect-video"
- :item-count="recentlyUploaded?.length"
- :is-loading="isLoadingRecentlyUploaded"
- >
- <RecentlyUploadedCard class="3xl:w-76" v-for="video in recentlyUploaded" :key="video.id" :video="video" />
- </HomeShelf>
-
<HomeShelf
v-if="isLoadingRecentlyUploadedMusic || !!recentlyUploadedMusic?.length"
title="Recently Uploaded Music"
diff --git a/routes/api.php b/routes/api.php
index 0ac59e81..3ec43124 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -7,6 +7,7 @@ use App\Http\Controllers\Api\V1\AuthController;
use App\Http\Controllers\Api\V1\CategoryController;
use App\Http\Controllers\Api\V1\EmailController;
use App\Http\Controllers\Api\V1\ExternalMetadataController;
+use App\Http\Controllers\Api\V1\Feed\HomeController;
use App\Http\Controllers\Api\V1\FolderController;
use App\Http\Controllers\Api\V1\JobController;
use App\Http\Controllers\Api\V1\Media\MediaController;
@@ -28,7 +29,6 @@ use App\Http\Controllers\Api\V1\TaskController;
use App\Http\Controllers\Api\V1\UserController;
use App\Http\Controllers\Api\V1\VideoController;
use App\Http\Controllers\DirectoryController;
-use App\Http\Controllers\HomeController;
use App\Http\Controllers\Proxy\PlausibleProxyController;
use App\Support\AppManifest;
use Illuminate\Http\Request;
@@ -50,7 +50,7 @@ Route::prefix('pulse')->group(function () {
Route::group(['middleware' => ['auth:sanctum']], function () {
// Auth
- Route::get('/user', fn (Request $request) => $request->user());
+ Route::get('/user', fn(Request $request) => $request->user());
Route::delete('/logout', [AuthController::class, 'destroy']);
// Settings
@@ -151,8 +151,8 @@ Route::post('/reset-password/{token}', [PasswordController::class, 'store'])->na
Route::post('/guest-token', [GuestTokenController::class, 'issue'])->middleware('throttle:guest-token');
// App Info
-Route::get('/manifest', fn () => response()->json(AppManifest::info()));
-Route::get('/health', fn () => response()->json(['health' => 1]));
+Route::get('/manifest', fn() => response()->json(AppManifest::info()));
+Route::get('/health', fn() => response()->json(['health' => 1]));
Route::get('/setup-status', [SetupController::class, 'setupStatus']);
// Analytics