From 610349f24b9f5977efc444e653a9fc2ddaeda97c Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Tue, 18 Feb 2020 22:20:11 +0300 Subject: [PATCH] Add button for rebooting the instance in desktop, tablet and mobile interface --- src/lang/en.js | 3 ++- src/store/modules/settings.js | 10 ++++---- src/views/settings/index.vue | 37 ++++++++++++++++++++++------- src/views/settings/styles/main.scss | 33 ++++++++++++++++++------- 4 files changed, 61 insertions(+), 22 deletions(-) diff --git a/src/lang/en.js b/src/lang/en.js index 3fa42e8c..df122612 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -363,7 +363,8 @@ export default { assets: 'Assets', emoji: 'Emoji', markup: 'Markup settings', - corsPlug: 'CORS plug config' + corsPlug: 'CORS plug config', + instanceReboot: 'Instance Reboot' }, invites: { inviteTokens: 'Invite tokens', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 0ecbc9a2..84c4a9dd 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -6,11 +6,13 @@ const settings = { state: { activeTab: 'instance', configDisabled: true, - description: [], - settings: {}, - updatedSettings: {}, db: {}, - loading: true + description: [], + loading: true, + needReboot: true, + settings: {}, + updatedSettings: {} + }, mutations: { CLEAR_UPDATED_SETTINGS: (state) => { diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue index bc2099ad..cca7959f 100644 --- a/src/views/settings/index.vue +++ b/src/views/settings/index.vue @@ -3,17 +3,25 @@

{{ $t('settings.settings') }}

- - +
+ - - {{ $t('settings.seeDocs') }} + + {{ $t('settings.instanceReboot') }} - + + + + + {{ $t('settings.seeDocs') }} + + + +
@@ -79,8 +87,16 @@
-

{{ $t('settings.settings') }}

+

{{ $t('settings.settings') }}

+ + + + {{ $t('settings.instanceReboot') }} + + +
+