diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json index 125b8f51..6a932df3 100644 --- a/src/config/locales/en/translation.json +++ b/src/config/locales/en/translation.json @@ -72,8 +72,8 @@ "new_toot": "Toot", "reload": "Reload" }, - "preferences": { - "title": "Preferences", + "settings": { + "title": "Settings", "general": { "title": "General", "toot": { @@ -86,7 +86,13 @@ "private": "Private", "direct": "Direct" } - }, + } + } + }, + "preferences": { + "title": "Preferences", + "general": { + "title": "General", "sounds": { "title": "Sounds", "description": "Please set feedback sounds.", diff --git a/src/constants/visibility.js b/src/constants/visibility.js index d73fd460..ba977f18 100644 --- a/src/constants/visibility.js +++ b/src/constants/visibility.js @@ -1,21 +1,21 @@ export default { Public: { - name: 'preferences.general.toot.visibility.public', + name: 'settings.general.toot.visibility.public', value: 0, key: 'public' }, Unlisted: { - name: 'preferences.general.toot.visibility.unlisted', + name: 'settings.general.toot.visibility.unlisted', value: 1, key: 'unlisted' }, Private: { - name: 'preferences.general.toot.visibility.private', + name: 'settings.general.toot.visibility.private', value: 2, key: 'private' }, Direct: { - name: 'preferences.general.toot.visibility.direct', + name: 'settings.general.toot.visibility.direct', value: 3, key: 'direct' } diff --git a/src/renderer/components/GlobalHeader.vue b/src/renderer/components/GlobalHeader.vue index 400c0c69..3b9d86b5 100644 --- a/src/renderer/components/GlobalHeader.vue +++ b/src/renderer/components/GlobalHeader.vue @@ -74,6 +74,7 @@ export default { left: 0; width: 65px; padding-top: 24px; + border: 0; .el-tooltip { outline: 0; diff --git a/src/renderer/components/Settings.vue b/src/renderer/components/Settings.vue index 75f68c1e..18673dfb 100644 --- a/src/renderer/components/Settings.vue +++ b/src/renderer/components/Settings.vue @@ -1,14 +1,120 @@ diff --git a/src/renderer/components/Settings/General.vue b/src/renderer/components/Settings/General.vue new file mode 100644 index 00000000..aea79d57 --- /dev/null +++ b/src/renderer/components/Settings/General.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js index 1f2282b5..35681f9e 100644 --- a/src/renderer/router/index.js +++ b/src/renderer/router/index.js @@ -54,8 +54,14 @@ export default new Router({ component: require('@/components/GlobalHeader').default, children: [ { - path: ':id/settings', - component: require('@/components/Settings').default + path: ':id/settings/', + component: require('@/components/Settings').default, + children: [ + { + path: 'general', + component: require('@/components/Settings/General').default + } + ] }, { path: ':id/',