diff --git a/docs/showcase.md b/docs/showcase.md index 176b8a18..5f946545 100644 --- a/docs/showcase.md +++ b/docs/showcase.md @@ -23,13 +23,11 @@ --- -### HomeLAb 3.0 +### EVO Dashboard -> By [@skoogee](https://github.com/skoogee) (http://zhrn.cc) +> By [@EVOTk](https://github.com/EVOTk) -> Dashy, is the most complete dashboard I ever tried, has all the features, and it sets itself apart from the rest. It is my default homepage now. I am thankful to the developer @Lissy93 for sharing such a wonderful creation. - -[![screenshot-12-skoogee-homelab-3](https://i.ibb.co/Sv7cxcg/12-skoogee-homelab-3.png)](https://ibb.co/album/ynSwzm) +![screenshot-evo-dashboard](https://raw.githubusercontent.com/Lissy93/dashy/master/docs/showcase/12-evo-dashboard.png) --- @@ -80,6 +78,16 @@ --- +### HomeLAb 3.0 + +> By [@skoogee](https://github.com/skoogee) (http://zhrn.cc) + +> Dashy, is the most complete dashboard I ever tried, has all the features, and it sets itself apart from the rest. It is my default homepage now. I am thankful to the developer @Lissy93 for sharing such a wonderful creation. + +[![screenshot-12-skoogee-homelab-3](https://i.ibb.co/F5yBTsT/12-skoogee-homelab-3.png)](https://ibb.co/album/ynSwzm) + +--- + ### Ground Control > By [@dtctek](https://github.com/dtctek) @@ -93,14 +101,6 @@ --- -### EVO Dashboard - -> By [@EVOTk](https://github.com/EVOTk) - -![screenshot-evo-dashboard](https://raw.githubusercontent.com/Lissy93/dashy/master/docs/showcase/12-evo-dashboard.png) - ---- - ## Submitting your Dashboard #### How to Submit diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json index 21916858..817b3088 100644 --- a/src/assets/locales/en.json +++ b/src/assets/locales/en.json @@ -210,6 +210,10 @@ "save-disk-tooltip": "Save config to the conf.yml file on disk. This will backup, and then over-write your existing config", "export-config-btn": "Export Config", "export-config-tooltip": "View and export new config, either to a file, or to clipboard", + "cloud-backup-btn": "Backup to Cloud", + "cloud-backup-tooltip": "Save encrypted backup of configuration to cloud", + "edit-raw-config-btn": "Edit Raw Config", + "edit-raw-config-tooltip": "View and modify raw config via JSON editor", "cancel-changes-btn": "Cancel Edit", "cancel-changes-tooltip": "Reset current modifications, and exit Edit Mode. This will not affect your saved config", "edit-mode-name": "Edit Mode", diff --git a/src/components/Configuration/AppInfoModal.vue b/src/components/Configuration/AppInfoModal.vue index d8c4c98f..9d78a059 100644 --- a/src/components/Configuration/AppInfoModal.vue +++ b/src/components/Configuration/AppInfoModal.vue @@ -10,20 +10,18 @@

Help & Support

For getting support with running or configuring Dashy, see the Discussions -

Report a Bug

- If you think you've found a bug, then please raise it on GitHub. -
Include version you are running, environment info, output of the console (press F12), - and any suppoting scerenshots.

Supporting Dashy

For ways that you can get involved, check out the Contributing page. +

Report a Bug

+ If you think you've found a bug, then please raise an Issue.

More Info

Source: github.com/lissy93/dashy
Documentation: dashy.to/docs

License

Licensed under MIT X11. Copyright Alicia Sykes © 2021.
- For licenses for third-party modules, please see Legal. - For a list of contributors, and application thank-you's, see Credits + For licenses for third-party modules, please see Legal.
+ For the full list of contributors and thanks, see Credits.

Version

@@ -80,8 +78,8 @@ div.about-modal { } } h3 { - font-size: 1rem; - margin: 0.5rem 0 0.2rem 0; + font-size: 1.2rem; + margin: 0.75rem 0 0.2rem 0; color: var(--about-page-accent); } a { @@ -108,3 +106,14 @@ div.about-modal { } + + diff --git a/src/components/Configuration/CloudBackupRestore.vue b/src/components/Configuration/CloudBackupRestore.vue index 7430229d..b2bd5db0 100644 --- a/src/components/Configuration/CloudBackupRestore.vue +++ b/src/components/Configuration/CloudBackupRestore.vue @@ -68,7 +68,7 @@ import Input from '@/components/FormElements/Input'; import StoreKeys from '@/utils/StoreMutations'; import { backup, update, restore } from '@/utils/CloudBackup'; import { localStorageKeys } from '@/utils/defaults'; -import { InfoHandler, WarningInfoHandler } from '@/utils/ErrorHandler'; +import { InfoHandler, WarningInfoHandler, InfoKeys } from '@/utils/ErrorHandler'; // Import Icons import IconBackup from '@/assets/interface-icons/config-backup.svg'; import IconRestore from '@/assets/interface-icons/config-restore.svg'; @@ -179,12 +179,12 @@ export default { }, /* If the server returns a warning, then show to user and log it */ showErrorMsg(errorMsg) { - WarningInfoHandler(errorMsg, 'Cloud Backup'); + WarningInfoHandler(errorMsg, InfoKeys.CLOUD_BACKUP); this.$toasted.show(errorMsg, { className: 'toast-error' }); }, /* When server returns success message, then show to user and log it */ showSuccessMsg(msg) { - InfoHandler(msg, 'Cloud Backup'); + InfoHandler(msg, InfoKeys.CLOUD_BACKUP); this.$toasted.show(msg, { className: 'toast-success' }); }, /* Call to hash function, to hash the users chosen/ entered password */ diff --git a/src/components/Configuration/ConfigContainer.vue b/src/components/Configuration/ConfigContainer.vue index aa535031..c797ff90 100644 --- a/src/components/Configuration/ConfigContainer.vue +++ b/src/components/Configuration/ConfigContainer.vue @@ -14,6 +14,10 @@ {{ $t('config.edit-config-button') }} + -