Feat: Setting as pages (#3813)

specklesystems · Jan 20, 2025 · d77af22 · d77af22
1 parent a75b89d
commit d77af22
Show file tree

Hide file tree

Showing 55 changed files with 1,228 additions and 1,319 deletions.
diff --git a/packages/frontend-2/components/header/NavUserMenu.vue b/packages/frontend-2/components/header/NavUserMenu.vue
@@ -36,22 +36,22 @@
           </div>
           <MenuItem v-if="activeUser" v-slot="{ active }">
             <NuxtLink
+              :to="settingsUserRoutes.profile"
               :class="[
                 active ? 'bg-highlight-1' : '',
                 'text-body-xs flex px-2 py-1 text-foreground cursor-pointer transition mx-1 rounded'
               ]"
-              @click="toggleSettingsDialog(SettingMenuKeys.User.Profile)"
             >
               Settings
             </NuxtLink>
           </MenuItem>
           <MenuItem v-if="isAdmin" v-slot="{ active }">
             <NuxtLink
+              :to="settingsServerRoutes.general"
               :class="[
                 active ? 'bg-highlight-1' : '',
                 'text-body-xs flex px-2 py-1 text-foreground cursor-pointer transition mx-1 rounded'
               ]"
-              @click="toggleSettingsDialog(SettingMenuKeys.Server.General)"
             >
               Server settings
             </NuxtLink>
@@ -125,52 +125,35 @@
       </Transition>
     </Menu>
     <InviteDialogServer v-model:open="showInviteDialog" />
-    <SettingsDialog
-      v-model:open="showSettingsDialog"
-      v-model:target-menu-item="settingsDialogTarget"
-      v-model:target-workspace-id="workspaceSettingsDialogTarget"
-    />
     <FeedbackDialog v-model:open="showFeedbackDialog" />
   </div>
 </template>
 <script setup lang="ts">
-import { isString } from 'lodash'
-import { useBreakpoints } from '@vueuse/core'
 import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
 import { ChevronDownIcon } from '@heroicons/vue/24/outline'
 import { Roles } from '@speckle/shared'
-import { TailwindBreakpoints } from '~~/lib/common/helpers/tailwind'
 import { useActiveUser } from '~~/lib/auth/composables/activeUser'
 import { useAuthManager } from '~~/lib/auth/composables/auth'
 import { useTheme } from '~~/lib/core/composables/theme'
-import { downloadManagerUrl } from '~/lib/common/helpers/route'
+import {
+  downloadManagerUrl,
+  settingsUserRoutes,
+  settingsServerRoutes
+} from '~/lib/common/helpers/route'
 import type { RouteLocationRaw } from 'vue-router'
-import { ToastNotificationType, useGlobalToast } from '~~/lib/common/composables/toast'
 import { useServerInfo } from '~/lib/core/composables/server'
-import {
-  SettingMenuKeys,
-  type AvailableSettingsMenuKeys
-} from '~/lib/settings/helpers/types'
 
 defineProps<{
   loginUrl?: RouteLocationRaw
 }>()
 
-const route = useRoute()
 const { logout } = useAuthManager()
 const { activeUser, isGuest } = useActiveUser()
 const { isDarkTheme, toggleTheme } = useTheme()
-const router = useRouter()
-const { triggerNotification } = useGlobalToast()
 const { serverInfo } = useServerInfo()
-const breakpoints = useBreakpoints(TailwindBreakpoints)
+const menuButtonId = useId()
 
 const showInviteDialog = ref(false)
-const showSettingsDialog = ref(false)
-const settingsDialogTarget = ref<string | null>(null)
-const workspaceSettingsDialogTarget = ref<string | null>(null)
-const menuButtonId = useId()
-const isMobile = breakpoints.smaller('md')
 const showFeedbackDialog = ref(false)
 
 const version = computed(() => serverInfo.value?.version)
@@ -180,39 +163,7 @@ const toggleInviteDialog = () => {
   showInviteDialog.value = true
 }
 
-const toggleSettingsDialog = (target: AvailableSettingsMenuKeys) => {
-  showSettingsDialog.value = true
-
-  // On mobile open the modal but dont set the target
-  settingsDialogTarget.value = !isMobile.value ? target : null
-}
-
-const deleteSettingsQuery = (): void => {
-  const currentQueryParams = { ...route.query }
-  delete currentQueryParams.settings
-  router.push({ query: currentQueryParams })
-}
-
 const openFeedbackDialog = () => {
   showFeedbackDialog.value = true
 }
-
-onMounted(() => {
-  const settingsQuery = route.query?.settings
-
-  if (settingsQuery && isString(settingsQuery)) {
-    if (settingsQuery.includes('server') && !isAdmin.value) {
-      triggerNotification({
-        type: ToastNotificationType.Danger,
-        title: "You don't have access to server settings"
-      })
-
-      return
-    }
-
-    showSettingsDialog.value = true
-    settingsDialogTarget.value = settingsQuery
-    deleteSettingsQuery()
-  }
-})
 </script>
diff --git a/packages/frontend-2/components/project/page/settings/general/block/ProjectInfo.vue b/packages/frontend-2/components/project/page/settings/general/block/ProjectInfo.vue
@@ -38,7 +38,7 @@
       max-width="md"
       :buttons="dialogButtons"
     >
-      <template #header>Unsaved Changes</template>
+      <template #header>Unsaved changes</template>
       <div class="space-y-4">
         <p>You have unsaved changes. Do you want to save them before leaving?</p>
       </div>
@@ -113,12 +113,12 @@ const resetLocalState = () => {
 
 const dialogButtons = computed<LayoutDialogButton[]>(() => [
   {
-    text: 'Discard Changes',
+    text: 'Discard changes',
     props: { color: 'outline' },
     onClick: handleRedirection
   },
   {
-    text: 'Save Changes',
+    text: 'Save changes',
     props: {
       submit: true
     },