diff --git a/xroom-dashboard/src/App.vue b/xroom-dashboard/src/App.vue index 1b6d633..051a313 100644 --- a/xroom-dashboard/src/App.vue +++ b/xroom-dashboard/src/App.vue @@ -8,15 +8,17 @@ + + - + @@ -48,15 +50,6 @@ export default { this.isSidebarOpen = !this.isSidebarOpen; } }, - mounted() { - const content = document.querySelector('.content'); - if (content) { - content.addEventListener('scroll', () => { - document.body.scrollTop = content.scrollTop; - document.documentElement.scrollTop = content.scrollTop; - }); - } - } }; @@ -122,16 +115,20 @@ router-view { flex-direction: column; gap: 32px; padding: 35px 80px; + +} + +.dashboard-page::-webkit-scrollbar { + width: 0; + display: none; +} + +.dashboard-page { height: 100vh; overflow-y: scroll; box-sizing: border-box; } -.content::-webkit-scrollbar { - width: 0; - display: none; -} - /* Responsive Styles */ @media (max-width: 520px) { .dashboard-page { @@ -187,7 +184,9 @@ router-view { @media (min-width: 1280px) and (max-width : 1440px){ .dashboard-page { - margin-right: 20rem; + position: fixed; + width: 80%; + right: 20%; padding: 20px; direction: rtl; } @@ -197,9 +196,11 @@ router-view { } } -@media (min-width: 1440px){ +@media (min-width: 1440px) and (max-width : 1500px){ .dashboard-page { - margin-right: 20rem; + position: fixed; + width: 80%; + right: 20%; padding: 20px; direction: rtl; } @@ -208,4 +209,15 @@ router-view { padding: 35px 80px !important; } } + +@media (min-width: 1500px){ + .dashboard-page { + position: fixed; + width: 80%; + right: 20%; + padding: 20px; + direction: rtl; + } +} + \ No newline at end of file diff --git a/xroom-dashboard/src/components/TeamUser.vue b/xroom-dashboard/src/components/TeamUser.vue index 8b932d5..c8f8f51 100644 --- a/xroom-dashboard/src/components/TeamUser.vue +++ b/xroom-dashboard/src/components/TeamUser.vue @@ -1,5 +1,5 @@ - + لایسنسهای قابل استفاده: {{ remainingCapacity }} @@ -34,113 +34,245 @@ - + - - - - - - {{ user.name }} - {{ user.email }} + + + + + + + + {{ user.name }} + {{ user.email }} + + + + + {{ user.role }} + {{ user.version }} + + - - {{ user.role }} - {{ user.version }} + + + + + + + + + + + + {{ user.name }} + {{ user.email }} + + + {{ user.role }} + {{ user.version }} + + + + - - + + اضافه کردن کاربر جدید @@ -148,6 +280,8 @@ + + + + \ No newline at end of file diff --git a/xroom-dashboard/src/pages/dashboard/Spaces.vue b/xroom-dashboard/src/pages/dashboard/Spaces.vue index ec2ecdc..ee555b9 100644 --- a/xroom-dashboard/src/pages/dashboard/Spaces.vue +++ b/xroom-dashboard/src/pages/dashboard/Spaces.vue @@ -169,7 +169,7 @@ export default { -