-
Notifications
You must be signed in to change notification settings - Fork 180
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feat: Move settings from individual pages into one settings modal (#2502
- Loading branch information
Showing
47 changed files
with
1,979 additions
and
1,761 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
51 changes: 0 additions & 51 deletions
51
packages/frontend-2/components/server-management/CardRow.vue
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| <template> | ||
| <LayoutDialog | ||
| v-model:open="isOpen" | ||
| v-bind=" | ||
| isMobile ? { title: selectedMenuItem ? selectedMenuItem.title : 'Settings' } : {} | ||
| " | ||
| fullscreen | ||
| :show-back-button="isMobile && !!selectedMenuItem" | ||
| @back="targetMenuItem = null" | ||
| > | ||
| <div class="w-full h-full flex"> | ||
| <LayoutSidebar | ||
| v-if="!isMobile || !selectedMenuItem" | ||
| class="w-full md:w-56 lg:w-60 md:p-4 md:pt-6 md:bg-foundation-page md:border-r md:border-outline-3" | ||
| > | ||
| <LayoutSidebarMenu> | ||
| <LayoutSidebarMenuGroup title="Account settings"> | ||
| <template #title-icon> | ||
| <UserIcon class="h-5 w-5" /> | ||
| </template> | ||
| <LayoutSidebarMenuGroupItem | ||
| v-for="(sidebarMenuItem, key) in menuItemConfig.user" | ||
| :key="key" | ||
| :label="sidebarMenuItem.title" | ||
| :class="{ | ||
| 'bg-foundation-focus hover:!bg-foundation-focus': | ||
| selectedMenuItem?.title === sidebarMenuItem.title | ||
| }" | ||
| @click="targetMenuItem = `${key}`" | ||
| /> | ||
| </LayoutSidebarMenuGroup> | ||
| <LayoutSidebarMenuGroup v-if="isAdmin" title="Server settings"> | ||
| <template #title-icon> | ||
| <ServerStackIcon class="h-5 w-5" /> | ||
| </template> | ||
| <LayoutSidebarMenuGroupItem | ||
| v-for="(sidebarMenuItem, key) in menuItemConfig.server" | ||
| :key="key" | ||
| :label="sidebarMenuItem.title" | ||
| :class="{ | ||
| 'bg-foundation-focus hover:!bg-foundation-focus': | ||
| selectedMenuItem?.title === sidebarMenuItem.title | ||
| }" | ||
| @click="targetMenuItem = `${key}`" | ||
| /> | ||
| </LayoutSidebarMenuGroup> | ||
| </LayoutSidebarMenu> | ||
| </LayoutSidebar> | ||
| <component | ||
| :is="selectedMenuItem.component" | ||
| v-if="selectedMenuItem" | ||
| :class="[ | ||
| 'bg-foundation md:px-10 md:py-12 md:bg-foundation w-full', | ||
| !isMobile && 'simple-scrollbar overflow-y-auto flex-1' | ||
| ]" | ||
| :user="user" | ||
| /> | ||
| </div> | ||
| </LayoutDialog> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import type { defineComponent } from 'vue' | ||
| import SettingsUserProfile from '~/components/settings/user/Profile.vue' | ||
| import SettingsUserNotifications from '~/components/settings/user/Notifications.vue' | ||
| import SettingsUserDeveloper from '~/components/settings/user/Developer.vue' | ||
| import SettingsServerGeneral from '~/components/settings/server/General.vue' | ||
| import SettingsServerProjects from '~/components/settings/server/Projects.vue' | ||
| import SettingsServerActiveUsers from '~/components/settings/server/ActiveUsers.vue' | ||
| import SettingsServerPendingInvitations from '~/components/settings/server/PendingInvitations.vue' | ||
| import { useBreakpoints } from '@vueuse/core' | ||
| import { TailwindBreakpoints } from '~~/lib/common/helpers/tailwind' | ||
| import { UserIcon, ServerStackIcon } from '@heroicons/vue/24/outline' | ||
| import { settingsQueries } from '~/lib/common/helpers/route' | ||
| import { useActiveUser } from '~/lib/auth/composables/activeUser' | ||
| import { | ||
| LayoutSidebar, | ||
| LayoutSidebarMenu, | ||
| LayoutSidebarMenuGroup | ||
| } from '@speckle/ui-components' | ||
| import { Roles } from '@speckle/shared' | ||
| type MenuItem = { | ||
| title: string | ||
| component: ReturnType<typeof defineComponent> | ||
| } | ||
| const { activeUser: user } = useActiveUser() | ||
| const breakpoints = useBreakpoints(TailwindBreakpoints) | ||
| const isMobile = breakpoints.smaller('md') | ||
| const menuItemConfig = shallowRef<{ [key: string]: { [key: string]: MenuItem } }>({ | ||
| user: { | ||
| [settingsQueries.user.profile]: { | ||
| title: 'Profile', | ||
| component: SettingsUserProfile | ||
| }, | ||
| [settingsQueries.user.notifications]: { | ||
| title: 'Notifications', | ||
| component: SettingsUserNotifications | ||
| }, | ||
| [settingsQueries.user.developerSettings]: { | ||
| title: 'Developer settings', | ||
| component: SettingsUserDeveloper | ||
| } | ||
| }, | ||
| server: { | ||
| [settingsQueries.server.general]: { | ||
| title: 'General', | ||
| component: SettingsServerGeneral | ||
| }, | ||
| [settingsQueries.server.projects]: { | ||
| title: 'Projects', | ||
| component: SettingsServerProjects | ||
| }, | ||
| [settingsQueries.server.activeUsers]: { | ||
| title: 'Active users', | ||
| component: SettingsServerActiveUsers | ||
| }, | ||
| [settingsQueries.server.pendingInvitations]: { | ||
| title: 'Pending invitations', | ||
| component: SettingsServerPendingInvitations | ||
| } | ||
| } | ||
| }) | ||
| const isOpen = defineModel<boolean>('open', { required: true }) | ||
| const targetMenuItem = defineModel<string | null>('targetMenuItem', { required: true }) | ||
| const isAdmin = computed(() => user.value?.role === Roles.Server.Admin) | ||
| const selectedMenuItem = computed((): MenuItem | null => { | ||
| const categories = [menuItemConfig.value.user, menuItemConfig.value.server] | ||
| for (const category of categories) { | ||
| if (targetMenuItem.value && targetMenuItem.value in category) { | ||
| return category[targetMenuItem.value] | ||
| } | ||
| } | ||
| if (!isMobile.value && targetMenuItem.value) { | ||
| // Fallback for invalid queries/typos | ||
| return targetMenuItem.value.includes('server') && isAdmin.value | ||
| ? menuItemConfig.value.server.general | ||
| : menuItemConfig.value.user.profile | ||
| } | ||
| return null | ||
| }) | ||
| watch( | ||
| () => user.value, | ||
| (newVal) => { | ||
| if (!newVal) { | ||
| isOpen.value = false | ||
| } | ||
| }, | ||
| { immediate: true } | ||
| ) | ||
| </script> |
Oops, something went wrong.