Merge branch 'master' of github.com:Lissy93/dashy into FEATURE/minimal-view

src/components/Configuration/CloudBackupRestore.vue

@@ -96,7 +96,9 @@ export default {
     },
     checkPass() {
       const savedHash = localStorage[localStorageKeys.BACKUP_HASH] || undefined;
-      if (!savedHash) {
+      if (!this.backupPassword) {
+        this.showErrorMsg(this.$t('cloud-sync.backup-missing-password'));
+      } else if (!savedHash) {
         this.makeBackup();
       } else if (savedHash === this.makeHash(this.backupPassword)) {
         this.makeUpdate();

src/components/Configuration/ConfigContainer.vue

@@ -10,15 +10,15 @@
               {{ $t('config.download-config-button') }}
             </button>
           </a>
-          <button class="config-button center" @click="() => navigateToTab(2)">
+          <button class="config-button center" @click="() => navigateToTab(1)">
             <EditIcon class="button-icon"/>
             {{ $t('config.edit-config-button') }}
           </button>
-          <button class="config-button center" @click="() => navigateToTab(4)">
+          <button class="config-button center" @click="() => navigateToTab(3)">
             <CustomCssIcon class="button-icon"/>
             {{ $t('config.edit-css-button') }}
           </button>
-          <button class="config-button center" @click="() => navigateToTab(3)">
+          <button class="config-button center" @click="() => navigateToTab(2)">
             <CloudIcon class="button-icon"/>
             {{backupId ? $t('config.edit-cloud-sync-button') : $t('config.cloud-sync-button') }}
           </button>
@@ -51,21 +51,6 @@
       <!-- Rebuild App Modal -->
       <RebuildApp />
     </TabItem>
-    <TabItem :name="$t('config.view-config-tab')" class="code-container">
-      <pre id="conf-yaml">{{yaml}}</pre>
-      <div class="yaml-action-buttons">
-        <h2>{{ $t('config.actions-label') }}</h2>
-        <a class="yaml-button download" @click="downloadConfigFile('conf.yml', yaml)">
-           {{ $t('config.download-config-button') }}
-        </a>
-        <a class="yaml-button copy" @click="copyConfigToClipboard()">
-          {{ $t('config.copy-config-label') }}
-        </a>
-        <a class="yaml-button reset" @click="resetLocalSettings()">
-          {{ $t('config.reset-config-label') }}
-        </a>
-      </div>
-    </TabItem>
     <TabItem :name="$t('config.edit-config-tab')">
       <JsonEditor :config="config" />
     </TabItem>

src/components/Configuration/CustomCss.vue

@@ -11,14 +11,15 @@
 </template>
 
 <script>
-import CustomThemeMaker from '@/components/Settings/CustomThemeMaker';
-import { getTheme } from '@/utils/ConfigHelpers';
+
 import { PrismEditor } from 'vue-prism-editor';
 import { highlight, languages } from 'prismjs/components/prism-core';
 import 'prismjs/components/prism-css';
 import 'prismjs/themes/prism-funky.css';
 import 'vue-prism-editor/dist/prismeditor.min.css';
 
+import CustomThemeMaker from '@/components/Settings/CustomThemeMaker';
+import { getTheme } from '@/utils/ConfigHelpers';
 import { localStorageKeys } from '@/utils/defaults';
 
 export default {

src/components/Configuration/JsonEditor.vue

@@ -55,12 +55,12 @@
 
 <script>
 
+import axios from 'axios';
 import VJsoneditor from 'v-jsoneditor';
 import { localStorageKeys } from '@/utils/defaults';
 import configSchema from '@/utils/ConfigSchema.json';
 import JsonToYaml from '@/utils/JsonToYaml';
 import { isUserAdmin } from '@/utils/Auth';
-import axios from 'axios';
 
 export default {
   name: 'JsonEditor',

src/components/Settings/ConfigLauncher.vue

@@ -15,7 +15,7 @@
 
     <!-- Modal for manually changing locale -->
     <modal :name="modalNames.LANG_SWITCHER" classes="dashy-modal"
-      :resizable="true" width="30%" height="25%">
+      :resizable="true" width="35%" height="35%">
       <LanguageSwitcher />
     </modal>