Skip to content

A self-hosted media server and file management system

fix: old sidebar shows at md screen size

aminnausinf6dbd54c6ef8
diff --git a/resources/js/components/dashboard/DashboardAnalytics.vue b/resources/js/components/dashboard/DashboardAnalytics.vue
index 665e0e4e..47622711 100644
--- a/resources/js/components/dashboard/DashboardAnalytics.vue
+++ b/resources/js/components/dashboard/DashboardAnalytics.vue
@@ -4,11 +4,11 @@ import type { PulseResponse } from '@/types/pulseTypes';
import { computed, ref, useTemplateRef, watch } from 'vue';
import { useGetPulse, useGetSiteAnalytics } from '@/service/queries';
+import { ButtonText, ButtonBase } from '@/components/cedar-ui/button';
import { handleStartTask } from '@/service/taskService';
import { periodForHumans } from '@/service/pulseUtil';
import { BreadCrumbs } from '@/components/cedar-ui/breadcrumbs';
import { BasePopover } from '@/components/cedar-ui/popover';
-import { ButtonText } from '@/components/cedar-ui/button';
import PulseSlowOutgoingRequests from '@/components/cards/pulse/PulseSlowOutgoingRequests.vue';
import LucideChartNoAxesCombined from '~icons/lucide/chart-no-axes-combined';
@@ -69,16 +69,20 @@ watch(
<div class="flex flex-wrap items-center justify-between gap-2">
<BreadCrumbs :bread-crumbs="breadCrumbs" />
- <div class="ml-auto flex flex-wrap items-center gap-2 text-sm font-medium">
+ <div class="ml-auto flex flex-wrap items-center gap-2 text-sm font-medium *:leading-4">
<h5>Time Period</h5>
- <button
+ <ButtonBase
v-for="(validPeriod, index) in validPeriods"
- :key="index"
@click="period = validPeriod.value"
- :class="`font-semibold ${period === validPeriod.value ? 'text-gray-700 dark:text-gray-300' : 'text-gray-300 dark:text-gray-600'} hover:text-gray-400 dark:hover:text-gray-500`"
+ :key="index"
+ :title="`Set analytics period to ${validPeriod.key}`"
+ :class="[
+ 'p-0 font-semibold hover:text-gray-400 dark:hover:text-gray-500',
+ period === validPeriod.value ? 'text-gray-700 dark:text-gray-300' : 'text-gray-300 dark:text-gray-600',
+ ]"
>
{{ validPeriod.key }}
- </button>
+ </ButtonBase>
</div>
<div class="xs:*:h-8 flex w-full flex-wrap items-center gap-2 *:h-fit">
<ButtonText @click.stop.prevent="handleStartTask('scan')" text="Run Full Scan" title="Scan All Files" class="xs:flex-initial flex-1">
diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vue
index 27238690..59e03b7f 100755
--- a/resources/js/components/panels/NavBar.vue
+++ b/resources/js/components/panels/NavBar.vue
@@ -36,7 +36,7 @@ const toggleVideoSidebar = (sidebar: 'folders' | 'history') => {
if (selectedSideBar.value !== sidebar) return;
const screenSize = getScreenSize();
- if (screenSize === 'default' || screenSize === 'sm') {
+ if (screenSize === 'default' || screenSize === 'sm' || screenSize === 'md') {
drawer.open(VideoSidebarDrawer, {
showHeader: false,
showFooter: false,
@@ -55,7 +55,7 @@ const toggleLeftSidebar = (sidebar: 'dashboard' | 'settings') => {
const screenSize = getScreenSize();
const SidebarComponent = sidebar === 'dashboard' ? DashboardSidebarDrawer : SettingsSidebarDrawer;
- if (screenSize === 'default' || screenSize === 'sm') {
+ if (screenSize === 'default' || screenSize === 'sm' || screenSize === 'md') {
drawer.open(SidebarComponent, {
showHeader: false,
showFooter: false,
diff --git a/resources/js/layouts/LayoutBase.vue b/resources/js/layouts/LayoutBase.vue
index c4a7d528..e9b1dc83 100755
--- a/resources/js/layouts/LayoutBase.vue
+++ b/resources/js/layouts/LayoutBase.vue
@@ -16,7 +16,7 @@ const { selectedSideBar, sideBarTarget } = storeToRefs(useAppStore());
cn(
'card order-2 col-span-1 sm:scroll-mt-6 lg:order-1 lg:col-span-2 2xl:col-span-1',
'hidden flex-col gap-3 sm:p-3',
- selectedSideBar && sideBarTarget === 'left-card' ? 'visible hidden sm:ring-1 md:flex' : 'lg:invisible lg:block',
+ selectedSideBar && sideBarTarget === 'left-card' ? 'sm:ring-1 lg:flex' : 'lg:invisible lg:block',
)
"
>
@@ -30,7 +30,7 @@ const { selectedSideBar, sideBarTarget } = storeToRefs(useAppStore());
id="list-card"
:class="
cn('card order-3 col-span-1 sm:scroll-mt-6 lg:col-span-2 2xl:col-span-1', 'hidden flex-col gap-3 sm:p-3', {
- 'hidden md:flex': selectedSideBar && sideBarTarget === 'list-card',
+ 'hidden lg:flex': selectedSideBar && sideBarTarget === 'list-card',
})
"
>