Skip to content

A self-hosted media server and file management system

fix: dashboard/overview is a fake url but is used all over the app

aminnausin7577c077645d
diff --git a/resources/js/components/dashboard/DashboardAnalytics.vue b/resources/js/components/dashboard/DashboardAnalytics.vue
index d5d74823..de893df6 100644
--- a/resources/js/components/dashboard/DashboardAnalytics.vue
+++ b/resources/js/components/dashboard/DashboardAnalytics.vue
@@ -28,6 +28,7 @@ import PulseCache from '@/components/cards/pulse/PulseCache.vue';
import ProiconsArrowSync from '~icons/proicons/arrow-sync';
import ProiconsHome2 from '~icons/proicons/home-2';
+import ProiconsGraph from '~icons/proicons/graph';
import ProiconsBolt from '~icons/proicons/bolt';
import ProiconsAdd from '~icons/proicons/add';
@@ -53,9 +54,14 @@ const breadCrumbs = computed(() => {
const items: BreadCrumbItem[] = [
{
name: 'Dashboard',
- url: '/dashboard/analytics',
+ url: '/dashboard',
icon: ProiconsHome2,
},
+ {
+ name: 'Dashboard',
+ url: '/dashboard/analytics',
+ icon: ProiconsGraph,
+ },
];
return items;
diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vue
index 622f9abc..45206afc 100644
--- a/resources/js/components/dashboard/DashboardLibraries.vue
+++ b/resources/js/components/dashboard/DashboardLibraries.vue
@@ -45,7 +45,7 @@ const breadCrumbs = computed(() => {
const items: BreadCrumbItem[] = [
{
name: 'Dashboard',
- url: '/dashboard/analytics',
+ url: '/dashboard',
icon: ProiconsHome2,
},
{
diff --git a/resources/js/components/dashboard/DashboardTabs.ts b/resources/js/components/dashboard/DashboardTabs.ts
index 7800bf37..0f4186ca 100644
--- a/resources/js/components/dashboard/DashboardTabs.ts
+++ b/resources/js/components/dashboard/DashboardTabs.ts
@@ -18,7 +18,7 @@ export function useDashboardTabs() {
const { userData } = useAuth();
return [
{
- name: 'overview',
+ name: 'analytics',
title: 'Analytics',
description: 'Website Overview',
icon: ProiconsGraph,
diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vue
index 4fcef2ca..b4fb2a24 100644
--- a/resources/js/components/dashboard/DashboardTasks.vue
+++ b/resources/js/components/dashboard/DashboardTasks.vue
@@ -71,7 +71,7 @@ const breadCrumbs = computed(() => {
const items: BreadCrumbItem[] = [
{
name: 'Dashboard',
- url: '/dashboard/analytics',
+ url: '/dashboard',
icon: ProiconsHome2,
},
{
diff --git a/resources/js/components/dashboard/DashboardUsers.vue b/resources/js/components/dashboard/DashboardUsers.vue
index 5552665b..5d4db4f0 100644
--- a/resources/js/components/dashboard/DashboardUsers.vue
+++ b/resources/js/components/dashboard/DashboardUsers.vue
@@ -50,7 +50,7 @@ const breadCrumbs = computed(() => {
const items: BreadCrumbItem[] = [
{
name: 'Dashboard',
- url: '/dashboard/analytics',
+ url: '/dashboard',
icon: ProiconsHome2,
},
{
diff --git a/resources/js/components/panels/DropdownMenuItems.ts b/resources/js/components/panels/DropdownMenuItems.ts
index ee286e78..c185a9b4 100644
--- a/resources/js/components/panels/DropdownMenuItems.ts
+++ b/resources/js/components/panels/DropdownMenuItems.ts
@@ -83,16 +83,16 @@ export function useDropdownMenuItems() {
[
{
...defaults,
- name: 'overview',
- url: '/dashboard/overview',
+ name: 'analytics',
+ url: '/dashboard/analytics',
text: 'Analytics',
icon: ProiconsGraph,
hidden: FLAGS.USE_SHORT_NAV_FOR_USERS && !isAdmin.value,
},
{
...defaults,
- name: 'overview',
- url: '/dashboard/overview',
+ name: 'dashboard',
+ url: '/dashboard',
text: 'Dashboard',
icon: LucideLayoutDashboard,
hidden: FLAGS.USE_SHORT_NAV_FOR_USERS && isAdmin.value,
diff --git a/resources/js/router/index.ts b/resources/js/router/index.ts
index 25e481b0..762d9667 100644
--- a/resources/js/router/index.ts
+++ b/resources/js/router/index.ts
@@ -142,7 +142,7 @@ export const router = createRouter({
{
path: '/dashboard',
meta: { protected: true },
- redirect: '/dashboard/overview',
+ redirect: '/dashboard/analytics',
},
{
path: '/:category/:folder?',
diff --git a/resources/js/views/DashboardView.vue b/resources/js/views/DashboardView.vue
index bb42f23c..e5608edb 100644
--- a/resources/js/views/DashboardView.vue
+++ b/resources/js/views/DashboardView.vue
@@ -1,18 +1,23 @@
<script setup lang="ts">
import { computed, defineAsyncComponent, onMounted, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
import { useDashboardTabs } from '@/components/dashboard/DashboardTabs';
import { getScreenSize } from '@/service/util';
import { useAppStore } from '@/stores/AppStore';
-import { useRoute } from 'vue-router';
+import { useAuth } from '@/composables/auth/useAuth';
import DashboardSkeleton from '@/components/dashboard/DashboardSkeleton.vue';
import DashboardSidebar from '@/components/panels/DashboardSidebar.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
+const VALID_TABS = ['analytics', 'libraries', 'users', 'tasks'];
+
const { activeDashboardTab, setTab } = useDashboardTabs();
const { cycleSideBar } = useAppStore();
+const { isAdmin } = useAuth();
const route = useRoute();
+const router = useRouter();
const DashboardAnalytics = defineAsyncComponent(() => import('@/components/dashboard/DashboardAnalytics.vue'));
const DashboardLibraries = defineAsyncComponent(() => import('@/components/dashboard/DashboardLibraries.vue'));
@@ -22,7 +27,7 @@ const DashboardTasks = defineAsyncComponent(() => import('@/components/dashboard
const activeComponent = computed(() => {
switch (activeDashboardTab.value?.name) {
- case 'overview':
+ case 'analytics':
return DashboardAnalytics;
case 'libraries':
return DashboardLibraries;
@@ -45,7 +50,19 @@ onMounted(async () => {
cycleSideBar('dashboard', 'left-card', false);
});
-watch(() => route.params.tab, setTab, { immediate: true });
+watch(
+ () => route.params.tab,
+ (tab) => {
+ const parsedTab = tab as string;
+ if (!VALID_TABS.includes(parsedTab) || (tab === 'tasks' && !isAdmin.value)) {
+ router.replace('/dashboard');
+ return;
+ }
+
+ setTab(parsedTab);
+ },
+ { immediate: true },
+);
</script>
<template>