From 1a8e02a74eb1a0ae4b8d8bf34e4e8dcc7da1a761 Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Mon, 8 Jun 2020 17:14:21 -0400 Subject: [PATCH] Rename global settings -> project settings (#686) --- src/lang/en-US/index.json | 3 +-- .../settings/components/navigation/navigation.vue | 4 ++-- src/modules/settings/index.ts | 10 +++++----- src/modules/settings/routes/global/index.ts | 4 ---- src/modules/settings/routes/project/index.ts | 4 ++++ .../routes/{global/global.vue => project/project.vue} | 6 +++--- 6 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 src/modules/settings/routes/global/index.ts create mode 100644 src/modules/settings/routes/project/index.ts rename src/modules/settings/routes/{global/global.vue => project/project.vue} (95%) diff --git a/src/lang/en-US/index.json b/src/lang/en-US/index.json index 4e5104d90a..2111b7b6bd 100644 --- a/src/lang/en-US/index.json +++ b/src/lang/en-US/index.json @@ -576,7 +576,6 @@ "settings_data_model": "Data Model", "settings_collections_fields": "Collections & Fields", "settings_extensions": "Extensions", - "settings_global": "Global Settings", "settings_permissions": "Roles & Permissions", "settings_project": "Project Settings", "settings_saved": "Settings Saved", @@ -604,7 +603,7 @@ "page_help_activity_detail": "**Activity Detail** — Shows accountability info, revision data, and the update message for this activity record.", "page_help_files_browse": "**File Library** — Lists all file assets uploaded to this project. Customize layout, filters, and sorting to tailor your view, and even save bookmarks of these different configurations for quick access.", "page_help_files_detail": "**File Detail** — A form for managing file metadata, editing the original asset, and updating access settings.", - "page_help_settings_global": "**Global Settings** — Your project's global configuration options.", + "page_help_settings_project": "**Project Settings** — Your project's global configuration options.", "page_help_settings_datamodel_collections": "**Data Model: Collections** — Lists all collections available. This includes visible, hidden, and system collections, as well as unmanaged database tables that can be added.", "page_help_settings_datamodel_fields": "**Data Model: Collection** — A form for managing this collection and its fields.", "page_help_settings_roles_browse": "**Browse Roles** — Lists the Admin, Public and custom User Roles.", diff --git a/src/modules/settings/components/navigation/navigation.vue b/src/modules/settings/components/navigation/navigation.vue index 6fee9dac06..033cb4e359 100644 --- a/src/modules/settings/components/navigation/navigation.vue +++ b/src/modules/settings/components/navigation/navigation.vue @@ -22,8 +22,8 @@ export default defineComponent({ const navItems = [ { icon: 'public', - name: i18n.t('settings_global'), - to: `/${currentProjectKey.value}/settings/global`, + name: i18n.t('settings_project'), + to: `/${currentProjectKey.value}/settings/project`, }, { icon: 'list_alt', diff --git a/src/modules/settings/index.ts b/src/modules/settings/index.ts index 893d5a4e89..e81f2f1dc0 100644 --- a/src/modules/settings/index.ts +++ b/src/modules/settings/index.ts @@ -1,5 +1,5 @@ import { defineModule } from '@/modules/define'; -import SettingsGlobal from './routes/global'; +import SettingsProject from './routes/project'; import { SettingsCollections, SettingsFields } from './routes/data-model/'; import { SettingsRolesBrowse, SettingsRolesDetail } from './routes/roles'; import { SettingsWebhooksBrowse, SettingsWebhooksDetail } from './routes/webhooks'; @@ -14,12 +14,12 @@ export default defineModule(({ i18n }) => ({ routes: [ { path: '/', - redirect: '/global', + redirect: '/project', }, { - name: 'settings-global', - path: '/global', - component: SettingsGlobal, + name: 'settings-project', + path: '/project', + component: SettingsProject, }, { name: 'settings-collections', diff --git a/src/modules/settings/routes/global/index.ts b/src/modules/settings/routes/global/index.ts deleted file mode 100644 index b016d6a58e..0000000000 --- a/src/modules/settings/routes/global/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import SettingsGlobal from './global.vue'; - -export { SettingsGlobal }; -export default SettingsGlobal; diff --git a/src/modules/settings/routes/project/index.ts b/src/modules/settings/routes/project/index.ts new file mode 100644 index 0000000000..bc8a7ecd87 --- /dev/null +++ b/src/modules/settings/routes/project/index.ts @@ -0,0 +1,4 @@ +import SettingsProject from './project.vue'; + +export { SettingsProject }; +export default SettingsProject; diff --git a/src/modules/settings/routes/global/global.vue b/src/modules/settings/routes/project/project.vue similarity index 95% rename from src/modules/settings/routes/global/global.vue rename to src/modules/settings/routes/project/project.vue index 107a53f3bd..1226def86a 100644 --- a/src/modules/settings/routes/global/global.vue +++ b/src/modules/settings/routes/project/project.vue @@ -1,5 +1,5 @@