Skip to content

A self-hosted media server and file management system

feat: add history sidebar to folder details page

aminnausinea307eff40cf
diff --git a/resources/js/components/cedar-ui/button-nav/NavButton.vue b/resources/js/components/cedar-ui/button-nav/NavButton.vue
index bce93335..2bb5802e 100644
--- a/resources/js/components/cedar-ui/button-nav/NavButton.vue
+++ b/resources/js/components/cedar-ui/button-nav/NavButton.vue
@@ -14,11 +14,12 @@ const props = defineProps<{
:variant="'ghost'"
:class="
cn(
+ 'ring-0 ring-transparent ring-inset',
{
- 'ring-primary dark:bg-primary-active hocus:ring-primary/70 outline-primary/70 ring-2 ring-inset dark:ring-0': active,
- 'hocus:bg-foreground-4-hover bg-surface-2 hover:ring-0': !active,
+ 'ring-primary-muted dark:bg-primary-active hocus:ring-primary outline-primary/70 ring-2 ring-inset dark:ring-0': active,
+ 'hover:bg-foreground-4-hover focus-visible:bg-foreground-4-hover bg-surface-2 hover:ring-0': !active,
},
- 'dark:hocus:bg-primary-dark focus:bg-surface-2 outline-primary size-8 shrink-0 rounded-lg shadow-sm',
+ 'dark:hover:bg-primary-dark dark:focus-visible:bg-primary-dark focus:bg-surface-2 outline-primary size-8 shrink-0 rounded-lg shadow-sm',
)
"
:title="label"
diff --git a/resources/js/components/drawers/FolderDetailsSidebarDrawer.vue b/resources/js/components/drawers/FolderDetailsSidebarDrawer.vue
index 27f2672a..7f8f576d 100644
--- a/resources/js/components/drawers/FolderDetailsSidebarDrawer.vue
+++ b/resources/js/components/drawers/FolderDetailsSidebarDrawer.vue
@@ -1,16 +1,10 @@
<script setup lang="ts">
-import { defineAsyncComponent, watch } from 'vue';
-import { useFolderTabs } from '@/components/folders/FolderTabs';
-import { useAppStore } from '@/stores/AppStore.ts';
-import { storeToRefs } from 'pinia';
import { BaseDrawer } from '@/components/cedar-ui/drawer';
import { useDrawer } from '@aminnausin/cedar-ui';
import { useRoute } from 'vue-router';
+import { watch } from 'vue';
-const { selectedSideBar } = storeToRefs(useAppStore());
-const { activeFolderTab } = useFolderTabs();
-
-const FolderSidebarAsync = defineAsyncComponent(async () => await import('@/components/panels/FolderSidebar.vue'));
+import FolderDetailsSidebar from '@/components/panels/FolderDetailsSidebar.vue';
const drawer = useDrawer();
const route = useRoute();
@@ -23,12 +17,6 @@ watch(
<template>
<BaseDrawer>
- <Suspense v-if="selectedSideBar === 'folders'">
- <FolderSidebarAsync :url-suffix="`${['details', activeFolderTab?.name].filter(Boolean).join('/')}`" />
-
- <template #fallback>
- <SidebarSkeleton />
- </template>
- </Suspense>
+ <FolderDetailsSidebar />
</BaseDrawer>
</template>
diff --git a/resources/js/components/panels/FolderDetailsSidebar.vue b/resources/js/components/panels/FolderDetailsSidebar.vue
new file mode 100644
index 00000000..924d6c99
--- /dev/null
+++ b/resources/js/components/panels/FolderDetailsSidebar.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { defineAsyncComponent } from 'vue';
+import { useFolderTabs } from '@/components/folders/FolderTabs';
+import { useAppStore } from '@/stores/AppStore';
+
+import SidebarSkeleton from '@/components/skeleton/composites/SidebarSkeleton.vue';
+
+const { activeFolderTab } = useFolderTabs();
+
+const AppStore = useAppStore();
+const FolderSidebarAsync = defineAsyncComponent(async () => await import('@/components/panels/FolderSidebar.vue'));
+const HistorySidebarAsync = defineAsyncComponent(async () => await import('@/components/panels/HistorySidebar.vue'));
+</script>
+
+<template>
+ <Suspense v-if="AppStore.selectedSideBar === 'folders'">
+ <FolderSidebarAsync :url-suffix="`${['details', activeFolderTab?.name].filter(Boolean).join('/')}`" />
+
+ <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 e17df47a..18e51945 100755
--- a/resources/js/components/panels/NavBar.vue
+++ b/resources/js/components/panels/NavBar.vue
@@ -158,26 +158,21 @@ watch(isDesktop, (now) => {
<NavButton v-if="userData" @click="cycleSideBar('notifications')" :label="'notifications'" class="hidden" active>
<CircumInboxIn height="24" width="24" />
</NavButton>
- <NavButton
- v-if="$route.name === 'home' || $route.name === 'folder-details'"
- @click="toggleVideoSidebar('folders')"
- :label="'folders'"
- :active="selectedSideBar == 'folders'"
- title="Toggle folder browser"
- class="p-0"
- >
- <CircumFolderOn height="24" width="24" />
- </NavButton>
- <NavButton
- v-if="userData && $route.name === 'home'"
- @click="toggleVideoSidebar('history')"
- :label="'history'"
- :active="selectedSideBar === 'history'"
- title="Toggle recent watch history"
- class="p-0"
- >
- <MaterialSymbolsLightHistory height="24" width="24" />
- </NavButton>
+ <template v-if="$route.name === 'home' || $route.name === 'folder-details'">
+ <NavButton @click="toggleVideoSidebar('folders')" :label="'folders'" :active="selectedSideBar == 'folders'" title="Toggle folder browser" class="p-0">
+ <CircumFolderOn height="24" width="24" />
+ </NavButton>
+ <NavButton
+ v-if="userData"
+ @click="toggleVideoSidebar('history')"
+ :label="'history'"
+ :active="selectedSideBar === 'history'"
+ title="Toggle recent watch history"
+ class="p-0"
+ >
+ <MaterialSymbolsLightHistory height="24" width="24" />
+ </NavButton>
+ </template>
<NavButton
v-if="$route.name === 'dashboard'"
@click="toggleLeftSidebar('dashboard')"
diff --git a/resources/js/views/FolderView.vue b/resources/js/views/FolderView.vue
index 481508d5..d0a088f2 100644
--- a/resources/js/views/FolderView.vue
+++ b/resources/js/views/FolderView.vue
@@ -17,7 +17,7 @@ import { cn, toast } from '@aminnausin/cedar-ui';
import { useRoute } from 'vue-router';
import { useAuth } from '@/composables/auth/useAuth';
-import SidebarSkeleton from '@/components/skeleton/composites/SidebarSkeleton.vue';
+import FolderDetailsSidebar from '@/components/panels/FolderDetailsSidebar.vue';
import FolderTabSkeleton from '@/components/folders/FolderTabSkeleton.vue';
import EditFolderModal from '@/components/modals/EditFolderModal.vue';
import ShareModal from '@/components/modals/ShareModal.vue';
@@ -79,8 +79,6 @@ const FolderHeader = defineAsyncComponent(() => import('@/components/folders/Fol
const FolderStats = defineAsyncComponent(() => import('@/components/folders/FolderStats.vue'));
const FolderMedia = defineAsyncComponent(() => import('@/components/folders/FolderMedia.vue'));
-const FolderSidebarAsync = defineAsyncComponent(async () => await import('@/components/panels/FolderSidebar.vue'));
-
const activeComponent = computed(() => {
switch (activeFolderTab.value?.name) {
case 'overview':
@@ -113,7 +111,7 @@ async function reload() {
document.body.scrollTo({ top: 0, behavior: 'instant' });
if (stateDirectory.value?.name && stateDirectory.value.name === URL_CATEGORY && URL_FOLDER) {
- await getFolder(URL_FOLDER, false);
+ await getFolder(URL_FOLDER, false, false);
} else {
isLoadingContent.value = true;
await getCategory(URL_CATEGORY, URL_FOLDER, false);
@@ -263,13 +261,7 @@ provide(
</div>
</template>
<template v-slot:sidebar>
- <Suspense v-if="selectedSideBar === 'folders'">
- <FolderSidebarAsync :url-suffix="`${['details', activeFolderTab?.name].filter(Boolean).join('/')}`" />
-
- <template #fallback>
- <SidebarSkeleton />
- </template>
- </Suspense>
+ <FolderDetailsSidebar />
</template>
</LayoutBase>
</template>