From a6f9ac7e448ccc02bb001a82f57d573a019258f6 Mon Sep 17 00:00:00 2001 From: Diyar Akhgar Date: Sat, 31 May 2025 17:49:08 +0330 Subject: [PATCH] Now the sidebar, header, and footer are in the App.vue --- xroom-dashboard/src/App.vue | 71 ++++++++++++++----- .../src/components/NewFileDialog.vue | 5 ++ .../src/pages/dashboard/ChangeAvatar.vue | 53 +++++--------- .../src/pages/dashboard/Download.vue | 17 ++--- .../src/pages/dashboard/EditProfile.vue | 18 +---- .../src/pages/dashboard/Meeting.vue | 17 +---- .../src/pages/dashboard/Spaces.vue | 14 +--- xroom-dashboard/src/pages/dashboard/files.vue | 45 ++++++------ xroom-dashboard/src/pages/dashboard/index.vue | 51 ++++++++----- .../src/pages/dashboard/readyPlayer.vue | 21 ++---- xroom-dashboard/src/pages/dashboard/team.vue | 16 +---- xroom-dashboard/src/router/index.js | 18 ++--- 12 files changed, 158 insertions(+), 188 deletions(-) diff --git a/xroom-dashboard/src/App.vue b/xroom-dashboard/src/App.vue index 6ca61d9..609fac0 100644 --- a/xroom-dashboard/src/App.vue +++ b/xroom-dashboard/src/App.vue @@ -1,26 +1,43 @@ @@ -75,4 +92,22 @@ router-view { * { font-family: 'IRANSans', sans-serif !important; } + +.dashboard-page { + margin-right: 20rem; + padding: 20px; + direction: rtl; + font-family: IRANSansXFaNum, sans-serif; +} + +.content { + background-color: #f8f9fa; + border-radius: 20px; + padding: 35px 80px !important; + display: flex; + flex-direction: column; + gap: 32px; +} + + \ No newline at end of file diff --git a/xroom-dashboard/src/components/NewFileDialog.vue b/xroom-dashboard/src/components/NewFileDialog.vue index c5a3056..bbc5c3a 100644 --- a/xroom-dashboard/src/components/NewFileDialog.vue +++ b/xroom-dashboard/src/components/NewFileDialog.vue @@ -209,6 +209,11 @@ export default { this.$emit('upload-success'); this.$emit('close'); alert('فایل با موفقیت آپلود شد'); + + // بررسی مسیر فعلی و هدایت به /dashboard/files در صورت نیاز + if (this.$route.path !== '/dashboard/files') { + this.$router.push('/dashboard/files'); + } } catch (error) { console.error('Error uploading file:', error); alert('خطا در آپلود فایل'); diff --git a/xroom-dashboard/src/pages/dashboard/ChangeAvatar.vue b/xroom-dashboard/src/pages/dashboard/ChangeAvatar.vue index 63f2b19..168d158 100644 --- a/xroom-dashboard/src/pages/dashboard/ChangeAvatar.vue +++ b/xroom-dashboard/src/pages/dashboard/ChangeAvatar.vue @@ -1,25 +1,21 @@