Skip to content

A self-hosted media server and file management system

fix: dashboard and settings sidebar height and navigation with flags

aminnausina3064f21e215
diff --git a/resources/css/theme.css b/resources/css/theme.css
index e116b049..e4e74375 100644
--- a/resources/css/theme.css
+++ b/resources/css/theme.css
@@ -246,4 +246,14 @@
.suspense-rounded {
@apply bg-foreground-2/50 my-auto animate-pulse rounded-full;
}
+
+ .full-height-sidebar {
+ @media (width >= 125rem /* 2000px */) {
+ min-height: calc(60vh + 0.75rem);
+ }
+
+ @media (width >= 64rem /* 1024px */) {
+ min-height: calc(80vh + 0.75rem);
+ }
+ }
}
diff --git a/resources/js/components/panels/DashboardSidebar.vue b/resources/js/components/panels/DashboardSidebar.vue
index 55e2885a..e0360b13 100644
--- a/resources/js/components/panels/DashboardSidebar.vue
+++ b/resources/js/components/panels/DashboardSidebar.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { useDashboardTabs } from '@/components/panels/DashboardTabs';
+import { FLAGS } from '@/config/featureFlags';
import DashboardSidebarCard from '@/components/cards/sidebar/DashboardSidebarCard.vue';
import AppManifestCard from '@/components/cards/data/AppManifestCard.vue';
@@ -13,7 +14,7 @@ const { dashboardTabs, activeDashboardTab } = useDashboardTabs();
<template>
<SidebarHeader />
- <div class="flex flex-1 flex-col gap-2">
+ <div class="full-height-sidebar flex flex-1 flex-col gap-2">
<DashboardSidebarCard
v-for="(tab, index) in dashboardTabs.filter((tab) => !tab.disabled)"
:key="index"
@@ -36,7 +37,7 @@ const { dashboardTabs, activeDashboardTab } = useDashboardTabs();
</template>
</DashboardSidebarCard>
- <DashboardSidebarCard :to="`/settings`">
+ <DashboardSidebarCard v-if="FLAGS.USE_NAV_IN_SIDEBAR" :to="`/settings`">
<template #header>
<h3 :title="'Settings'">Settings</h3>
<ProiconsSettings class="ml-auto size-6" />
@@ -45,6 +46,6 @@ const { dashboardTabs, activeDashboardTab } = useDashboardTabs();
<h4 title="Description" class="w-full flex-1 truncate text-wrap sm:text-nowrap">Configurable Options</h4>
</template>
</DashboardSidebarCard>
- <AppManifestCard />
+ <AppManifestCard class="mt-auto" />
</div>
</template>
diff --git a/resources/js/components/panels/SettingsSidebar.vue b/resources/js/components/panels/SettingsSidebar.vue
index 8c29c230..da353de5 100644
--- a/resources/js/components/panels/SettingsSidebar.vue
+++ b/resources/js/components/panels/SettingsSidebar.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { useSettingsTabs } from '@/components/panels/SettingsTabs';
+import { FLAGS } from '@/config/featureFlags';
import DashboardSidebarCard from '@/components/cards/sidebar/DashboardSidebarCard.vue';
import AppManifestCard from '@/components/cards/data/AppManifestCard.vue';
@@ -12,7 +13,7 @@ const { settingsTabs, activeSettingsTab } = useSettingsTabs();
<template>
<SidebarHeader />
- <div class="flex flex-1 flex-col gap-2">
+ <div class="full-height-sidebar flex h-full flex-1 flex-col gap-2">
<DashboardSidebarCard
v-for="(tab, index) in settingsTabs.filter((tab) => !tab.disabled)"
:key="index"
@@ -34,7 +35,7 @@ const { settingsTabs, activeSettingsTab } = useSettingsTabs();
</h4>
</template>
</DashboardSidebarCard>
- <DashboardSidebarCard :to="`/dashboard`">
+ <DashboardSidebarCard v-if="FLAGS.USE_NAV_IN_SIDEBAR" :to="`/dashboard`">
<template #header>
<h3 :title="'Dashboard'">Dashboard</h3>
<CircumGrid31 class="ml-auto size-6" />
@@ -43,6 +44,6 @@ const { settingsTabs, activeSettingsTab } = useSettingsTabs();
<h4 title="App Dashboard" class="w-full flex-1 truncate text-wrap sm:text-nowrap">Server Analytics</h4>
</template>
</DashboardSidebarCard>
- <AppManifestCard />
+ <AppManifestCard :class="'mt-auto'" />
</div>
</template>
diff --git a/resources/js/config/featureFlags.ts b/resources/js/config/featureFlags.ts
index a2668caa..2af0da99 100644
--- a/resources/js/config/featureFlags.ts
+++ b/resources/js/config/featureFlags.ts
@@ -6,4 +6,6 @@ export const FLAGS = {
USE_FRIENDS_UI: false,
USE_INSIGHTS_UI: false,
USE_SHORT_NAV_FOR_USERS: true, // consolidate dashboard navigation for non-admin users
+ USE_NAV_IN_SIDEBAR: false, // show settings or dashboard nav buttons in each sidebar
+ USE_APP_VERSION_CARD: true, // show app manifest/version card in sidebars (settings and dashboard)
};