🔥 Removed cloud sync button from home, moved to config menu

This commit is contained in:
Alicia Sykes 2021-07-31 18:40:16 +01:00
parent 38516d6dd2
commit 3434bfacba
2 changed files with 7 additions and 21 deletions

View File

@ -13,11 +13,11 @@
<EditIcon class="button-icon"/> <EditIcon class="button-icon"/>
{{ $t('config.edit-config-button') }} {{ $t('config.edit-config-button') }}
</button> </button>
<button class="config-button center" @click="() => navigateToTab(3)"> <button class="config-button center" @click="() => navigateToTab(4)">
<CustomCssIcon class="button-icon"/> <CustomCssIcon class="button-icon"/>
{{ $t('config.edit-css-button') }} {{ $t('config.edit-css-button') }}
</button> </button>
<button class="config-button center" @click="openCloudSync()"> <button class="config-button center" @click="() => navigateToTab(3)">
<CloudIcon class="button-icon"/> <CloudIcon class="button-icon"/>
{{backupId ? $t('config.edit-cloud-sync-button') : $t('config.cloud-sync-button') }} {{backupId ? $t('config.edit-cloud-sync-button') : $t('config.cloud-sync-button') }}
</button> </button>
@ -67,6 +67,9 @@
<TabItem :name="$t('config.edit-config-tab')"> <TabItem :name="$t('config.edit-config-tab')">
<JsonEditor :config="config" /> <JsonEditor :config="config" />
</TabItem> </TabItem>
<TabItem :name="$t('cloud-sync.title')">
<CloudBackupRestore :config="config" />
</TabItem>
<TabItem :name="$t('config.custom-css-tab')"> <TabItem :name="$t('config.custom-css-tab')">
<CustomCssEditor :config="config" /> <CustomCssEditor :config="config" />
</TabItem> </TabItem>
@ -83,6 +86,7 @@ import { localStorageKeys, modalNames } from '@/utils/defaults';
import { getUsersLanguage } from '@/utils/ConfigHelpers'; import { getUsersLanguage } from '@/utils/ConfigHelpers';
import JsonEditor from '@/components/Configuration/JsonEditor'; import JsonEditor from '@/components/Configuration/JsonEditor';
import CustomCssEditor from '@/components/Configuration/CustomCss'; import CustomCssEditor from '@/components/Configuration/CustomCss';
import CloudBackupRestore from '@/components/Configuration/CloudBackupRestore';
import RebuildApp from '@/components/Configuration/RebuildApp'; import RebuildApp from '@/components/Configuration/RebuildApp';
import AppVersion from '@/components/Configuration/AppVersion'; import AppVersion from '@/components/Configuration/AppVersion';
@ -119,6 +123,7 @@ export default {
components: { components: {
JsonEditor, JsonEditor,
CustomCssEditor, CustomCssEditor,
CloudBackupRestore,
RebuildApp, RebuildApp,
AppVersion, AppVersion,
DownloadIcon, DownloadIcon,
@ -142,9 +147,6 @@ export default {
openAboutModal() { openAboutModal() {
this.$modal.show(modalNames.ABOUT_APP); this.$modal.show(modalNames.ABOUT_APP);
}, },
openCloudSync() {
this.$modal.show(modalNames.CLOUD_BACKUP);
},
openLanguageSwitchModal() { openLanguageSwitchModal() {
this.$modal.show(modalNames.LANG_SWITCHER); this.$modal.show(modalNames.LANG_SWITCHER);
}, },

View File

@ -5,8 +5,6 @@
<div class="config-buttons"> <div class="config-buttons">
<IconSpanner @click="showEditor()" tabindex="-2" <IconSpanner @click="showEditor()" tabindex="-2"
v-tooltip="tooltip('Update configuration')" /> v-tooltip="tooltip('Update configuration')" />
<IconCloud @click="showCloudModal()" tabindex="-2"
v-tooltip="tooltip('Backup / restore cloud config')" />
</div> </div>
<!-- Modal containing all the configuration options --> <!-- Modal containing all the configuration options -->
@ -15,12 +13,6 @@
<ConfigContainer :config="combineConfig()" /> <ConfigContainer :config="combineConfig()" />
</modal> </modal>
<!-- Modal for cloud backup and restore options -->
<modal :name="modalNames.CLOUD_BACKUP" :resizable="true" width="65%" height="60%"
@closed="$emit('modalChanged', false)" classes="dashy-modal">
<CloudBackupRestore :config="combineConfig()" />
</modal>
<!-- Modal for manually changing locale --> <!-- Modal for manually changing locale -->
<modal :name="modalNames.LANG_SWITCHER" classes="dashy-modal" <modal :name="modalNames.LANG_SWITCHER" classes="dashy-modal"
:resizable="true" width="30%" height="25%"> :resizable="true" width="30%" height="25%">
@ -33,9 +25,7 @@
<script> <script>
import IconSpanner from '@/assets/interface-icons/config-editor.svg'; import IconSpanner from '@/assets/interface-icons/config-editor.svg';
import IconCloud from '@/assets/interface-icons/cloud-backup-restore.svg';
import ConfigContainer from '@/components/Configuration/ConfigContainer'; import ConfigContainer from '@/components/Configuration/ConfigContainer';
import CloudBackupRestore from '@/components/Configuration/CloudBackupRestore';
import LanguageSwitcher from '@/components/Settings/LanguageSwitcher'; import LanguageSwitcher from '@/components/Settings/LanguageSwitcher';
import { topLevelConfKeys, localStorageKeys, modalNames } from '@/utils/defaults'; import { topLevelConfKeys, localStorageKeys, modalNames } from '@/utils/defaults';
@ -48,9 +38,7 @@ export default {
}, },
components: { components: {
IconSpanner, IconSpanner,
IconCloud,
ConfigContainer, ConfigContainer,
CloudBackupRestore,
LanguageSwitcher, LanguageSwitcher,
}, },
props: { props: {
@ -64,10 +52,6 @@ export default {
this.$modal.show(modalNames.CONF_EDITOR); this.$modal.show(modalNames.CONF_EDITOR);
this.$emit('modalChanged', true); this.$emit('modalChanged', true);
}, },
showCloudModal: function show() {
this.$modal.show(modalNames.CLOUD_BACKUP);
this.$emit('modalChanged', true);
},
combineConfig() { combineConfig() {
const conf = {}; const conf = {};
conf[topLevelConfKeys.APP_CONFIG] = this.appConfig; conf[topLevelConfKeys.APP_CONFIG] = this.appConfig;