Skip to content

A self-hosted media server and file management system

feat: add history and drawer to explore page

aminnausine2606b94ca90
diff --git a/resources/js/components/drawers/HomeRightSidebarDrawer.vue b/resources/js/components/drawers/HomeRightSidebarDrawer.vue
new file mode 100644
index 00000000..0a7d1b74
--- /dev/null
+++ b/resources/js/components/drawers/HomeRightSidebarDrawer.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import { BaseDrawer } from '@/components/cedar-ui/drawer';
+import { useDrawer } from '@aminnausin/cedar-ui';
+import { useRoute } from 'vue-router';
+import { watch } from 'vue';
+
+import HomeRightSidebar from '@/components/panels/HomeRightSidebar.vue';
+
+const drawer = useDrawer();
+const route = useRoute();
+
+watch(
+ () => route.fullPath,
+ () => drawer.close('programmatic'),
+);
+</script>
+
+<template>
+ <BaseDrawer>
+ <HomeRightSidebar />
+ </BaseDrawer>
+</template>
diff --git a/resources/js/components/home/HomeActivityFeed.vue b/resources/js/components/home/HomeActivityFeed.vue
index 499952cf..202f19d2 100644
--- a/resources/js/components/home/HomeActivityFeed.vue
+++ b/resources/js/components/home/HomeActivityFeed.vue
@@ -61,9 +61,9 @@ const typeIcon = (type: string) => (type === 'audio' ? ProiconsMusicNote2 : type
v-for="item in group.items"
:key="item.id"
:to="item.url"
- :class="cn('group flex items-center', 'hover:bg-surface-1 dark:hover:bg-surface-2 duration-input data-card h-16 rounded shadow-sm transition-colors')"
+ :class="cn('group flex items-center', 'hover:bg-surface-1 dark:hover:bg-surface-2 duration-input data-card h-20 rounded shadow-sm transition-colors lg:h-16')"
>
- <div class="relative flex h-full w-22 shrink-0 items-center overflow-hidden rounded-l-sm">
+ <div class="relative flex aspect-video h-full shrink-0 items-center overflow-hidden rounded-l-sm lg:w-22">
<template v-if="item.thumbnail">
<div
class="absolute inset-0 scale-120 blur-sm"
@@ -93,12 +93,15 @@ const typeIcon = (type: string) => (type === 'audio' ? ProiconsMusicNote2 : type
NEW
</span>
</div>
- <div class="flex h-full w-full items-center gap-3 overflow-hidden p-2 pe-3">
+ <div class="flex h-full w-full items-center gap-3 overflow-hidden p-3 lg:p-2">
<div class="flex h-full min-w-0 flex-1 flex-col justify-between">
<p class="truncate text-sm">{{ item.title }}</p>
<p class="text-foreground-2 mt-0.5 truncate text-xs">{{ item.subtitle }}</p>
</div>
- <component :is="typeIcon(item.type)" class="text-foreground-2 group-hover:text-foreground-0 size-3.5 shrink-0 transition-colors" />
+ <component
+ :is="typeIcon(item.type)"
+ class="text-foreground-2 group-hover:text-foreground-0 mb-auto size-4.5 shrink-0 stroke-current stroke-1 transition-colors lg:my-auto lg:size-3.5"
+ />
</div>
</RouterLink>
</div>
diff --git a/resources/js/components/panels/HomeFeedSidebar.vue b/resources/js/components/panels/HomeFeedSidebar.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/js/components/panels/HomeRightSidebar.vue b/resources/js/components/panels/HomeRightSidebar.vue
new file mode 100644
index 00000000..c97bec5c
--- /dev/null
+++ b/resources/js/components/panels/HomeRightSidebar.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import { useRecentlyUpdated, useRecentlyUploaded } from '@/service/home/useHomeQueries';
+import { defineAsyncComponent } from 'vue';
+import { useAppStore } from '@/stores/AppStore';
+import { computed } from 'vue';
+
+import SidebarSkeleton from '@/components/skeleton/composites/SidebarSkeleton.vue';
+
+const { data: recentlyUploadedMusic, isLoading: isLoadingMusic } = useRecentlyUploaded('audio');
+const { data: recentlyUploaded, isLoading: isLoadingVideo } = useRecentlyUploaded('video');
+const { data: recentlyUpdated, isLoading: isLoadingUpdated } = useRecentlyUpdated();
+
+const AppStore = useAppStore();
+const HomeActivityFeedAsync = defineAsyncComponent(async () => await import('@/components/home/HomeActivityFeed.vue'));
+const HistorySidebarAsync = defineAsyncComponent(async () => await import('@/components/panels/HistorySidebar.vue'));
+
+const isLoading = computed(() => isLoadingVideo.value || isLoadingMusic.value || isLoadingUpdated.value);
+</script>
+
+<template>
+ <Suspense v-if="AppStore.selectedSideBar === 'feed'">
+ <HomeActivityFeedAsync :videos="recentlyUploaded" :music="recentlyUploadedMusic" :updated-folders="recentlyUpdated" :is-loading="isLoading" />
+
+ <template #fallback>
+ <SidebarSkeleton />
+ </template>
+ </Suspense>
+ <Suspense v-if="AppStore.selectedSideBar === 'history'">
+ <HistorySidebarAsync />
+ <template #fallback>
+ <SidebarSkeleton />
+ </template>
+ </Suspense>
+</template>
diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vue
index 876a0d30..989f9beb 100755
--- a/resources/js/components/panels/NavBar.vue
+++ b/resources/js/components/panels/NavBar.vue
@@ -14,6 +14,7 @@ import { ref, watch } from 'vue';
import { drawer } from '@aminnausin/cedar-ui';
import FolderDetailsSidebarDrawer from '@/components/drawers/FolderDetailsSidebarDrawer.vue';
+import HomeRightSidebarDrawer from '@/components/drawers/HomeRightSidebarDrawer.vue';
import VideoSidebarDrawer from '@/components/drawers/VideoSidebarDrawer.vue';
import ToggleLightMode from '@/components/inputs/ToggleLightMode.vue';
import SidebarDrawer from '@/components/drawers/SidebarDrawer.vue';
@@ -89,7 +90,7 @@ watch(isDesktop, (now) => {
toggleRightSidebar(currentSidebar === 'history' ? 'history' : 'folders', VideoSidebarDrawer);
break;
case 'explore':
- toggleRightSidebar('feed');
+ toggleRightSidebar(currentSidebar === 'history' ? 'history' : 'feed', HomeRightSidebarDrawer);
break;
case 'folder':
toggleRightSidebar('folders', FolderDetailsSidebarDrawer);
@@ -113,7 +114,7 @@ watch(isDesktop, (now) => {
<template>
<nav id="page-navbar" class="z-20 flex flex-wrap justify-between gap-2 py-1">
- <RouterLink to="/" title="Return to home library" class="group my-auto flex shrink-0 items-center rounded-md">
+ <RouterLink to="/home" title="Return to home library" class="group my-auto flex shrink-0 items-center rounded-md">
<img src="/logo.svg" alt="Logo" class="ease size-5 transition-transform duration-200 group-hover:scale-120 sm:size-5.5" />
</RouterLink>
@@ -160,43 +161,35 @@ watch(isDesktop, (now) => {
<div class="ml-auto flex flex-wrap items-center justify-end gap-1 sm:w-auto sm:max-w-sm sm:shrink-0 sm:flex-nowrap sm:justify-normal">
<span id="video-navbar" class="flex items-center gap-1 antialiased">
- <template v-if="$route.name === 'home' || $route.name === 'folder-details'">
- <NavButton
- @click="toggleRightSidebar('folders', $route.name === 'home' ? VideoSidebarDrawer : FolderDetailsSidebarDrawer)"
- :label="'folders'"
- :active="selectedSideBar == 'folders'"
- title="Toggle folder browser"
- class="p-0"
- >
- <IconFolder class="size-6" stroke-width="0.0" />
- </NavButton>
- <NavButton
- v-if="userData"
- @click="toggleRightSidebar('history', VideoSidebarDrawer)"
- :label="'history'"
- :active="selectedSideBar === 'history'"
- title="Toggle recent watch history"
- class="p-0"
- >
- <MaterialSymbolsLightHistory class="size-6" stroke-width="0.25" stroke="currentColor" />
- </NavButton>
- </template>
+ <NavButton
+ v-if="$route.name === 'home' || $route.name === 'folder-details'"
+ @click="toggleRightSidebar('folders', $route.name === 'home' ? VideoSidebarDrawer : FolderDetailsSidebarDrawer)"
+ :label="'folders'"
+ :active="selectedSideBar == 'folders'"
+ title="Toggle folder browser"
+ class="p-0"
+ >
+ <IconFolder class="size-6" stroke-width="0.0" />
+ </NavButton>
<NavButton
v-if="$route.name === 'explore'"
- @click="toggleRightSidebar('feed')"
+ @click="toggleRightSidebar('feed', HomeRightSidebarDrawer)"
:label="'activity feed'"
:active="selectedSideBar == 'feed'"
title="Toggle activity feed"
class="p-0"
>
<ProiconsSparkle2 class="size-6" />
- <!-- <svg class="size-6" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
- <path d="M0 0h24v24H0z" fill="none" />
- <path
- fill="currentColor"
- d="M6.528 7.75a.75.75 0 1 1-1.5 0a.75.75 0 0 1 1.5 0M5.781 15a.75.75 0 0 0 0 1.5h5a.75.75 0 1 0 0-1.5zm-.75-3.25a.75.75 0 0 1 .75-.75h5a.75.75 0 1 1 0 1.5h-5a.75.75 0 0 1-.75-.75M15 21a1.986 1.986 0 0 0 1.934-1.597l.48-2.403h2.836A1.75 1.75 0 0 0 22 15.25V9.261A2.26 2.26 0 0 0 19.75 7v-.004H14.5V5.25A2.25 2.25 0 0 0 12.25 3h-8A2.25 2.25 0 0 0 2 5.25v12.5A3.25 3.25 0 0 0 5.25 21zM3.5 5.25a.75.75 0 0 1 .75-.75h8a.75.75 0 0 1 .75.75v13.764q0 .251.06.486H5.25a1.75 1.75 0 0 1-1.75-1.75zm11 3.246h3.11a2 2 0 0 0-.088.322l-2.059 10.291a.486.486 0 0 1-.963-.095zm4.493.616a.761.761 0 0 1 1.507.15v5.988a.25.25 0 0 1-.25.25h-2.535z"
- />
- </svg> -->
+ </NavButton>
+ <NavButton
+ v-if="($route.name === 'home' || $route.name === 'explore') && userData"
+ @click="toggleRightSidebar('history', $route.name === 'home' ? VideoSidebarDrawer : HomeRightSidebarDrawer)"
+ :label="'history'"
+ :active="selectedSideBar === 'history'"
+ title="Toggle recent watch history"
+ class="p-0"
+ >
+ <MaterialSymbolsLightHistory class="size-6" stroke-width="0.25" stroke="currentColor" />
</NavButton>
<NavButton
v-if="$route.name === 'dashboard'"
diff --git a/resources/js/views/HomeView.vue b/resources/js/views/HomeView.vue
index cd2ce0b0..8eb6c4c6 100644
--- a/resources/js/views/HomeView.vue
+++ b/resources/js/views/HomeView.vue
@@ -12,7 +12,7 @@ import LayoutBase from '@/layouts/LayoutBase.vue';
import RecentlyUploadedCard from '@/components/cards/data/RecentlyUploadedCard.vue';
import RecentlyWatchedCard from '@/components/cards/data/RecentlyWatchedCard.vue';
import BrowseFolderCard from '@/components/cards/data/BrowseFolderCard.vue';
-import HomeActivityFeed from '@/components/home/HomeActivityFeed.vue';
+import HomeRightSidebar from '@/components/panels/HomeRightSidebar.vue';
import HomeSpotlight from '@/components/home/HomeSpotlight.vue';
import HomeShelf from '@/components/home/HomeShelf.vue';
@@ -25,8 +25,6 @@ const { data: recentlyReleased, isLoading: isLoadingRecentlyReleased } = useRece
const { data: recentlyUpdated, isLoading: isLoadingRecentlyUpdated } = useRecentlyUpdated();
const { data: recentlyAdded, isLoading: isLoadingRecentlyAdded } = useRecentlyAdded();
-const isLoadingActivity = computed(() => isLoadingRecentlyUploaded.value || isLoadingRecentlyUploadedMusic.value || isLoadingRecentlyUpdated.value);
-
const breakpoints = useBreakpoints({ ...breakpointsTailwind, '3xl': 2000 });
const gridFolderCount = computed(() => {
@@ -133,7 +131,7 @@ onMounted(() => {
</div>
</template>
<template v-slot:sidebar>
- <HomeActivityFeed :videos="recentlyUploaded" :music="recentlyUploadedMusic" :updated-folders="recentlyUpdated" :is-loading="isLoadingActivity" />
+ <HomeRightSidebar />
</template>
</LayoutBase>
</template>