Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

🚚 Updates util imports

Alicia Sykesba0c967c01f2
diff --git a/docs/developing.md b/docs/developing.md
index 5626fa33..2e6e9a6a 100644
--- a/docs/developing.md
+++ b/docs/developing.md
@@ -51,7 +51,7 @@ Dashy should now be being served on <http://localhost:8080/>. Hot reload is enab
#### Utils and Checks
-- **`yarn validate-config`** - If you have quite a long configuration file, you may wish to check that it's all good to go, before deploying the app. This can be done with `yarn validate-config` or `docker exec -it [container-id] yarn validate-config`. Your config file needs to be in `/user-data/conf.yml` (or within your Docker container at `/app/user-data/conf.yml`). This will first check that your YAML is valid, and then validates it against Dashy's [schema](https://github.com/Lissy93/dashy/blob/master/src/utils/ConfigSchema.json).
+- **`yarn validate-config`** - If you have quite a long configuration file, you may wish to check that it's all good to go, before deploying the app. This can be done with `yarn validate-config` or `docker exec -it [container-id] yarn validate-config`. Your config file needs to be in `/user-data/conf.yml` (or within your Docker container at `/app/user-data/conf.yml`). This will first check that your YAML is valid, and then validates it against Dashy's [schema](https://github.com/Lissy93/dashy/blob/master/src/utils/config/ConfigSchema.json).
- **`yarn health-check`** - Checks that the application is up and running on it's specified port, and outputs current status and response times. Useful for integrating into your monitoring service, if you need to maintain high system availability
#### Alternate Start Commands
diff --git a/docs/development-guides.md b/docs/development-guides.md
index 1d54e2b6..7aa7f3be 100644
--- a/docs/development-guides.md
+++ b/docs/development-guides.md
@@ -20,7 +20,7 @@ Adding a new theme is really easy. There're two things you need to do: Pass the
### 1. Add Theme Name
-Choose a snappy name for your theme, and add it to the `builtInThemes` array inside [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/defaults.js#L27).
+Choose a snappy name for your theme, and add it to the `builtInThemes` array inside [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/config/defaults.js#L27).
### 2. Write some Styles
@@ -127,9 +127,9 @@ computed: {
Then, where you want to get the users value within your component, use something like: `this.appConfig.myProperty`. If the user hasn't specified the value, Don't forget to have a fallback or default for it.
-If you have a default fallback value, then this would typically be specified in the [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/defaults.js) file.
+If you have a default fallback value, then this would typically be specified in the [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/config/defaults.js) file.
-You will now need to add the definition of your new attribute into the [ConfigSchema](https://github.com/Lissy93/dashy/blob/master/src/utils/ConfigSchema.json). This will make it available in the UI config editor, and also ensure that the config validation check doesn't fail.
+You will now need to add the definition of your new attribute into the [ConfigSchema](https://github.com/Lissy93/dashy/blob/master/src/utils/config/ConfigSchema.json). This will make it available in the UI config editor, and also ensure that the config validation check doesn't fail.
For example:
```json
@@ -156,8 +156,8 @@ Finally, add your new property to the [`configuring.md`](./configuring.md) API d
Checklist:
- [ ] Ensure the new attribute is actually necessary, and nothing similar already exists
-- [ ] Update the [Schema](https://github.com/Lissy93/dashy/blob/master/src/utils/ConfigSchema.json) with the parameters for your new option
-- [ ] If required, set a default or fallback value (usually in [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/defaults.js))
+- [ ] Update the [Schema](https://github.com/Lissy93/dashy/blob/master/src/utils/config/ConfigSchema.json) with the parameters for your new option
+- [ ] If required, set a default or fallback value (usually in [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/config/defaults.js))
- [ ] Document the new value in [`configuring.md`](./configuring.md), and if required under the relevant section in the docs
- [ ] Ensure your changes are backwards compatible, and that nothing breaks if the attribute isn't specified
@@ -210,14 +210,14 @@ For some pages (such as the login page, the minimal start page, etc) the basic p
### 1. Add the route name to the should hide array
-In [`./src/utils/defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/defaults.js), there's an array called `hideFurnitureOn`. Append the name of the route (the same as it appears in [`router.js`](https://github.com/Lissy93/dashy/blob/master/src/router.js)) here.
+In [`./src/utils/config/defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/config/defaults.js), there's an array called `hideFurnitureOn`. Append the name of the route (the same as it appears in [`router.js`](https://github.com/Lissy93/dashy/blob/master/src/router.js)) here.
### 2. Add the conditional to the structural component to hide
First, import the helper function:
```javascript
-import { shouldBeVisible } from '@/utils/SectionHelpers';
+import { shouldBeVisible } from '@/utils/config/SectionHelpers';
```
Then you can create a computed value, that calls this function, passing in the route name:
@@ -252,7 +252,7 @@ You can set variables either in your environment, or using the [`.env`](https://
Any environmental variables used by the frontend are preceded with `VITE_APP_`. Vite will merge the contents of your `.env` file into the app in a similar way to the ['dotenv'](https://github.com/motdotla/dotenv) package, where any variables that you set on your system will always take preference over the contents of any `.env` file.
-If add any new variables, ensure that there is always a fallback (define it in [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/defaults.js)), so as to not cause breaking changes. Don't commit the contents of your `.env` file to git, but instead take a few moments to document what you've added under the appropriate section. Try and follow the concepts outlined in the [12 factor app](https://12factor.net/config).
+If add any new variables, ensure that there is always a fallback (define it in [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/config/defaults.js)), so as to not cause breaking changes. Don't commit the contents of your `.env` file to git, but instead take a few moments to document what you've added under the appropriate section. Try and follow the concepts outlined in the [12 factor app](https://12factor.net/config).
---
@@ -280,7 +280,7 @@ Firstly, create a new `.vue` file under [`./src/components/Widgets`](https://git
import axios from 'axios';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
@@ -341,7 +341,7 @@ computed: {
#### **Adding an API Endpoint**
-If your widget makes a data request, then add the URL for the API endpoint to the `widgetApiEndpoints` array in [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/defaults.js#L207)
+If your widget makes a data request, then add the URL for the API endpoint to the `widgetApiEndpoints` array in [`defaults.js`](https://github.com/Lissy93/dashy/blob/master/src/utils/config/defaults.js#L207)
```javascript
widgetApiEndpoints: {
@@ -353,7 +353,7 @@ widgetApiEndpoints: {
Then in your widget file:
```javascript
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
```
For GET requests, you may need to add some parameters onto the end of the URL. We can use another computed property for this, for example:
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 61eca5eb..ebc07ba4 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -454,9 +454,9 @@ You can [check your rate limit status](https://www.docker.com/blog/checking-your
## Config Validation Errors
-The configuration file is validated against [Dashy's Schema](https://github.com/Lissy93/dashy/blob/master/src/utils/ConfigSchema.json) using AJV.
+The configuration file is validated against [Dashy's Schema](https://github.com/Lissy93/dashy/blob/master/src/utils/config/ConfigSchema.json) using AJV.
-First, check that your syntax is valid, using [YAML Validator](https://codebeautify.org/yaml-validator/) or [JSON Validator](https://codebeautify.org/jsonvalidator). If the issue persists, then take a look at the [schema](https://github.com/Lissy93/dashy/blob/master/src/utils/ConfigSchema.json), and verify that the field you are trying to add/ modify matches the required format. You can also use [this tool](https://www.jsonschemavalidator.net/s/JFUj7X9J) to validate your JSON config against the schema, or run `yarn validate-config`.
+First, check that your syntax is valid, using [YAML Validator](https://codebeautify.org/yaml-validator/) or [JSON Validator](https://codebeautify.org/jsonvalidator). If the issue persists, then take a look at the [schema](https://github.com/Lissy93/dashy/blob/master/src/utils/config/ConfigSchema.json), and verify that the field you are trying to add/ modify matches the required format. You can also use [this tool](https://www.jsonschemavalidator.net/s/JFUj7X9J) to validate your JSON config against the schema, or run `yarn validate-config`.
If you're trying to use a recently released feature, and are getting a warning, this is likely because you've not yet updated the the current latest version of Dashy.
diff --git a/services/app.js b/services/app.js
index ccd99cc4..90bc0b3c 100644
--- a/services/app.js
+++ b/services/app.js
@@ -33,7 +33,7 @@ const sslServer = require('./ssl-server'); // TLS-enabled web server
const corsProxy = require('./cors-proxy'); // Enables API requests to CORS-blocked services
const getUser = require('./get-user'); // Enables server side user lookup
-/* Service endpoint URL paths (see also serviceEndpoints in src/utils/defaults.js) */
+/* Service endpoint URL paths (see also serviceEndpoints in src/utils/config/defaults.js) */
const ENDPOINTS = {
statusPing: '/status-ping',
statusCheck: '/status-check',
diff --git a/services/config-validator.js b/services/config-validator.js
index 372f432a..6dabe63b 100644
--- a/services/config-validator.js
+++ b/services/config-validator.js
@@ -7,7 +7,7 @@ const fs = require('fs'); // For opening + reading files
const yaml = require('js-yaml'); // For parsing YAML
const Ajv = require('ajv'); // For validating with schema
-const schema = require('../src/utils/ConfigSchema.json');
+const schema = require('../src/utils/config/ConfigSchema.json');
/* Tell AJV to use strict mode, and report all errors */
const validatorOptions = {
diff --git a/src/App.vue b/src/App.vue
index 9ed5f0be..fc53fb43 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,14 +15,14 @@ import Footer from '@/components/PageStrcture/Footer.vue';
import EditModeTopBanner from '@/components/InteractiveEditor/EditModeTopBanner.vue';
import CriticalError from '@/components/PageStrcture/CriticalError.vue';
import LoadingScreen from '@/components/PageStrcture/LoadingScreen.vue';
-import { welcomeMsg } from '@/utils/CoolConsole';
-import ErrorHandler from '@/utils/ErrorHandler';
+import { welcomeMsg } from '@/utils/logging/CoolConsole';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
import Keys from '@/utils/StoreMutations';
import {
localStorageKeys,
splashScreenTime,
language as defaultLanguage,
-} from '@/utils/defaults';
+} from '@/utils/config/defaults';
export default {
name: 'app',
diff --git a/src/components/Charts/Gauge.vue b/src/components/Charts/Gauge.vue
index d4edc5cb..5fa5f56c 100644
--- a/src/components/Charts/Gauge.vue
+++ b/src/components/Charts/Gauge.vue
@@ -89,7 +89,7 @@
* Heavily inspired by vue-svg-gauge by @hellocomet
* See: https://github.com/hellocomet/vue-svg-gauge
*/
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
// Main radius of the gauge
const RADIUS = 100;
diff --git a/src/components/Configuration/AccessError.vue b/src/components/Configuration/AccessError.vue
index 4b928b3d..35590efa 100644
--- a/src/components/Configuration/AccessError.vue
+++ b/src/components/Configuration/AccessError.vue
@@ -9,7 +9,7 @@
<script>
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
export default {
name: 'AccessError',
diff --git a/src/components/Configuration/AppInfo.vue b/src/components/Configuration/AppInfo.vue
index 8f6da887..dbbe448f 100644
--- a/src/components/Configuration/AppInfo.vue
+++ b/src/components/Configuration/AppInfo.vue
@@ -40,7 +40,7 @@
<script>
import AppVersion from '@/components/Configuration/AppVersion';
-import { sessionStorageKeys } from '@/utils/defaults';
+import { sessionStorageKeys } from '@/utils/config/defaults';
export default {
name: 'AppInfo',
diff --git a/src/components/Configuration/AppInfoModal.vue b/src/components/Configuration/AppInfoModal.vue
index 98374ccb..534a6866 100644
--- a/src/components/Configuration/AppInfoModal.vue
+++ b/src/components/Configuration/AppInfoModal.vue
@@ -6,7 +6,7 @@
<script>
import AppInfo from '@/components/Configuration/AppInfo';
-import { modalNames } from '@/utils/defaults';
+import { modalNames } from '@/utils/config/defaults';
export default {
name: 'AppInfoModal',
diff --git a/src/components/Configuration/AppVersion.vue b/src/components/Configuration/AppVersion.vue
index 7e104bc1..fd250500 100644
--- a/src/components/Configuration/AppVersion.vue
+++ b/src/components/Configuration/AppVersion.vue
@@ -32,7 +32,7 @@
<script>
import { Progress } from 'rsup-progress';
import request from '@/utils/request';
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
export default {
name: 'AppInfoModal',
diff --git a/src/components/Configuration/CloudBackupRestore.vue b/src/components/Configuration/CloudBackupRestore.vue
index 07afb26a..6863fdd3 100644
--- a/src/components/Configuration/CloudBackupRestore.vue
+++ b/src/components/Configuration/CloudBackupRestore.vue
@@ -67,8 +67,8 @@ import Input from '@/components/FormElements/Input';
// Import utils and constants
import StoreKeys from '@/utils/StoreMutations';
import { backup, update, restore } from '@/utils/CloudBackup';
-import { localStorageKeys } from '@/utils/defaults';
-import { InfoHandler, WarningInfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import { localStorageKeys } from '@/utils/config/defaults';
+import { InfoHandler, WarningInfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
// Import Icons
import IconBackup from '@/assets/interface-icons/config-backup.svg';
import IconRestore from '@/assets/interface-icons/config-restore.svg';
diff --git a/src/components/Configuration/ConfigContainer.vue b/src/components/Configuration/ConfigContainer.vue
index 38e7cb0b..4eac7229 100644
--- a/src/components/Configuration/ConfigContainer.vue
+++ b/src/components/Configuration/ConfigContainer.vue
@@ -82,9 +82,9 @@
<script>
-import { localStorageKeys, modalNames } from '@/utils/defaults';
-import { getUsersLanguage } from '@/utils/ConfigHelpers';
-import ErrorHandler from '@/utils/ErrorHandler';
+import { localStorageKeys, modalNames } from '@/utils/config/defaults';
+import { getUsersLanguage } from '@/utils/config/ConfigHelpers';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
import StoreKeys from '@/utils/StoreMutations';
import JsonEditor from '@/components/Configuration/JsonEditor';
import CustomCssEditor from '@/components/Configuration/CustomCss';
diff --git a/src/components/Configuration/CustomCss.vue b/src/components/Configuration/CustomCss.vue
index 393015b8..f88cfc1a 100644
--- a/src/components/Configuration/CustomCss.vue
+++ b/src/components/Configuration/CustomCss.vue
@@ -28,7 +28,7 @@ import CustomThemeMaker from '@/components/Settings/CustomThemeMaker';
import ThemeSelector from '@/components/Settings/ThemeSelector';
import Button from '@/components/FormElements/Button';
import StoreKeys from '@/utils/StoreMutations';
-import { localStorageKeys, theme as defaultTheme } from '@/utils/defaults';
+import { localStorageKeys, theme as defaultTheme } from '@/utils/config/defaults';
export default {
name: 'StyleEditor',
diff --git a/src/components/Configuration/EditSiteMeta.vue b/src/components/Configuration/EditSiteMeta.vue
index 8c110fc6..02753e2b 100644
--- a/src/components/Configuration/EditSiteMeta.vue
+++ b/src/components/Configuration/EditSiteMeta.vue
@@ -41,7 +41,7 @@
<script>
-import { localStorageKeys } from '@/utils/defaults';
+import { localStorageKeys } from '@/utils/config/defaults';
import AddNewIcon from '@/assets/interface-icons/add-new.svg';
import SaveConfigIcon from '@/assets/interface-icons/save-config.svg';
diff --git a/src/components/Configuration/JsonEditor.vue b/src/components/Configuration/JsonEditor.vue
index 1de89e5c..4a15952a 100644
--- a/src/components/Configuration/JsonEditor.vue
+++ b/src/components/Configuration/JsonEditor.vue
@@ -58,9 +58,9 @@
<script>
import ConfigSavingMixin from '@/mixins/ConfigSaving';
-import { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import { InfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
+import { modalNames } from '@/utils/config/defaults';
import Button from '@/components/FormElements/Button';
import Radio from '@/components/FormElements/Radio';
import AccessError from '@/components/Configuration/AccessError';
diff --git a/src/components/Configuration/RebuildApp.vue b/src/components/Configuration/RebuildApp.vue
index 0850f9e4..740022c8 100644
--- a/src/components/Configuration/RebuildApp.vue
+++ b/src/components/Configuration/RebuildApp.vue
@@ -49,9 +49,9 @@ import Button from '@/components/FormElements/Button';
import RebuildIcon from '@/assets/interface-icons/application-rebuild.svg';
import ReloadIcon from '@/assets/interface-icons/application-reload.svg';
import LoadingAnimation from '@/assets/interface-icons/loader.svg';
-import ErrorHandler from '@/utils/ErrorHandler';
-import { serviceEndpoints } from '@/utils/defaults';
-import { isUserAdmin } from '@/utils/Auth';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
+import { serviceEndpoints } from '@/utils/config/defaults';
+import { isUserAdmin } from '@/utils/auth/Auth';
export default {
name: 'RebuildApp',
diff --git a/src/components/FormElements/SchemaForm.vue b/src/components/FormElements/SchemaForm.vue
index ad79101a..2a8fe15e 100644
--- a/src/components/FormElements/SchemaForm.vue
+++ b/src/components/FormElements/SchemaForm.vue
@@ -27,7 +27,7 @@ import { JsonForms } from '@jsonforms/vue';
import { vanillaRenderers, defaultStyles } from '@jsonforms/vue-vanilla';
import Ajv from 'ajv';
import addFormats from 'ajv-formats';
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
import safeClone from '@/utils/safeClone';
const ajv = new Ajv({
diff --git a/src/components/InteractiveEditor/AddNewSectionLauncher.vue b/src/components/InteractiveEditor/AddNewSectionLauncher.vue
index 26db0445..88d752ea 100644
--- a/src/components/InteractiveEditor/AddNewSectionLauncher.vue
+++ b/src/components/InteractiveEditor/AddNewSectionLauncher.vue
@@ -18,7 +18,7 @@
import EditSectionMenu from '@/components/InteractiveEditor/EditSection.vue';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
+import { modalNames } from '@/utils/config/defaults';
export default {
name: 'add-section-container',
diff --git a/src/components/InteractiveEditor/EditAppConfig.vue b/src/components/InteractiveEditor/EditAppConfig.vue
index 2311fdae..085125c4 100644
--- a/src/components/InteractiveEditor/EditAppConfig.vue
+++ b/src/components/InteractiveEditor/EditAppConfig.vue
@@ -26,10 +26,10 @@
</template>
<script>
-import DashySchema from '@/utils/ConfigSchema.json';
+import DashySchema from '@/utils/config/ConfigSchema.json';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
-import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import { modalNames } from '@/utils/config/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
import safeClone from '@/utils/safeClone';
import AccessError from '@/components/Configuration/AccessError';
import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons';
diff --git a/src/components/InteractiveEditor/EditItem.vue b/src/components/InteractiveEditor/EditItem.vue
index 81c1fd0f..a187bf99 100644
--- a/src/components/InteractiveEditor/EditItem.vue
+++ b/src/components/InteractiveEditor/EditItem.vue
@@ -80,9 +80,9 @@ import Input from '@/components/FormElements/Input';
import Radio from '@/components/FormElements/Radio';
import Select from '@/components/FormElements/Select';
import StoreKeys from '@/utils/StoreMutations';
-import DashySchema from '@/utils/ConfigSchema';
-import { modalNames } from '@/utils/defaults';
-import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import DashySchema from '@/utils/config/ConfigSchema.json';
+import { modalNames } from '@/utils/config/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
export default {
name: 'EditItem',
diff --git a/src/components/InteractiveEditor/EditMultiPages.vue b/src/components/InteractiveEditor/EditMultiPages.vue
index dbd2ce0a..1b6ee5eb 100644
--- a/src/components/InteractiveEditor/EditMultiPages.vue
+++ b/src/components/InteractiveEditor/EditMultiPages.vue
@@ -15,10 +15,10 @@
</template>
<script>
-import DashySchema from '@/utils/ConfigSchema.json';
+import DashySchema from '@/utils/config/ConfigSchema.json';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
-import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import { modalNames } from '@/utils/config/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
import safeClone from '@/utils/safeClone';
import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons';
import AccessError from '@/components/Configuration/AccessError';
diff --git a/src/components/InteractiveEditor/EditPageInfo.vue b/src/components/InteractiveEditor/EditPageInfo.vue
index 69799783..8f12a65a 100644
--- a/src/components/InteractiveEditor/EditPageInfo.vue
+++ b/src/components/InteractiveEditor/EditPageInfo.vue
@@ -15,10 +15,10 @@
</template>
<script>
-import DashySchema from '@/utils/ConfigSchema.json';
+import DashySchema from '@/utils/config/ConfigSchema.json';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
-import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import { modalNames } from '@/utils/config/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
import safeClone from '@/utils/safeClone';
import AccessError from '@/components/Configuration/AccessError';
import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons';
diff --git a/src/components/InteractiveEditor/EditSection.vue b/src/components/InteractiveEditor/EditSection.vue
index ff85c9bd..b8611c0e 100644
--- a/src/components/InteractiveEditor/EditSection.vue
+++ b/src/components/InteractiveEditor/EditSection.vue
@@ -16,10 +16,10 @@
</template>
<script>
-import DashySchema from '@/utils/ConfigSchema.json';
+import DashySchema from '@/utils/config/ConfigSchema.json';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
-import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import { modalNames } from '@/utils/config/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
import safeClone from '@/utils/safeClone';
import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons';
import AccessError from '@/components/Configuration/AccessError';
diff --git a/src/components/InteractiveEditor/ExportConfigMenu.vue b/src/components/InteractiveEditor/ExportConfigMenu.vue
index 84f2ac62..e25f7c79 100644
--- a/src/components/InteractiveEditor/ExportConfigMenu.vue
+++ b/src/components/InteractiveEditor/ExportConfigMenu.vue
@@ -42,11 +42,11 @@
import JsYaml from 'js-yaml';
import Button from '@/components/FormElements/Button';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
+import { modalNames } from '@/utils/config/defaults';
import AccessError from '@/components/Configuration/AccessError';
import DownloadConfigIcon from '@/assets/interface-icons/config-download-file.svg';
import CopyConfigIcon from '@/assets/interface-icons/interactive-editor-copy-clipboard.svg';
-import { ErrorHandler, InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import { ErrorHandler, InfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
export default {
name: 'ExportConfigMenu',
diff --git a/src/components/InteractiveEditor/MoveItemTo.vue b/src/components/InteractiveEditor/MoveItemTo.vue
index 026a598c..b5425dcb 100644
--- a/src/components/InteractiveEditor/MoveItemTo.vue
+++ b/src/components/InteractiveEditor/MoveItemTo.vue
@@ -40,8 +40,8 @@ import Radio from '@/components/FormElements/Radio';
import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons';
import AccessError from '@/components/Configuration/AccessError';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
-import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import { modalNames } from '@/utils/config/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
export default {
name: 'MoveItemTo',
diff --git a/src/components/LinkItems/Collapsable.vue b/src/components/LinkItems/Collapsable.vue
index 9e93dca9..94cb3f6b 100644
--- a/src/components/LinkItems/Collapsable.vue
+++ b/src/components/LinkItems/Collapsable.vue
@@ -37,7 +37,7 @@
<script>
import longPress from '@/directives/LongPress';
-import { localStorageKeys } from '@/utils/defaults';
+import { localStorageKeys } from '@/utils/config/defaults';
import Icon from '@/components/LinkItems/ItemIcon.vue';
import EditModeIcon from '@/assets/interface-icons/interactive-editor-edit-mode.svg';
import OpenIcon from '@/assets/interface-icons/config-open-settings.svg';
diff --git a/src/components/LinkItems/Item.vue b/src/components/LinkItems/Item.vue
index 0b553bd9..7d5232cf 100644
--- a/src/components/LinkItems/Item.vue
+++ b/src/components/LinkItems/Item.vue
@@ -69,7 +69,7 @@ import ContextMenu from '@/components/LinkItems/ItemContextMenu';
import StoreKeys from '@/utils/StoreMutations';
import ItemMixin from '@/mixins/ItemMixin';
import EditModeIcon from '@/assets/interface-icons/interactive-editor-edit-mode.svg';
-import { modalNames } from '@/utils/defaults';
+import { modalNames } from '@/utils/config/defaults';
export default {
name: 'Item',
diff --git a/src/components/LinkItems/ItemIcon.vue b/src/components/LinkItems/ItemIcon.vue
index f47d4cfa..30bd6deb 100644
--- a/src/components/LinkItems/ItemIcon.vue
+++ b/src/components/LinkItems/ItemIcon.vue
@@ -22,11 +22,11 @@
<script>
import BrokenImage from '@/assets/interface-icons/broken-icon.svg';
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
import EmojiUnicodeRegex from '@/utils/EmojiUnicodeRegex';
import emojiLookup from '@/utils/emojis.json';
import { asciiHash } from '@/utils/MiscHelpers';
-import { faviconApi as defaultFaviconApi, faviconApiEndpoints, iconCdns } from '@/utils/defaults';
+import { faviconApi as defaultFaviconApi, faviconApiEndpoints, iconCdns } from '@/utils/config/defaults';
import * as simpleicons from 'simple-icons';
diff --git a/src/components/LinkItems/Section.vue b/src/components/LinkItems/Section.vue
index 8cf1e38e..220631ae 100644
--- a/src/components/LinkItems/Section.vue
+++ b/src/components/LinkItems/Section.vue
@@ -109,14 +109,14 @@ import Collapsable from '@/components/LinkItems/Collapsable.vue';
import IframeModal from '@/components/LinkItems/IframeModal.vue';
import EditSection from '@/components/InteractiveEditor/EditSection.vue';
import ContextMenu from '@/components/LinkItems/SectionContextMenu.vue';
-import ErrorHandler from '@/utils/ErrorHandler';
-import { makePageSlug } from '@/utils/ConfigHelpers';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
+import { makePageSlug } from '@/utils/config/ConfigHelpers';
import StoreKeys from '@/utils/StoreMutations';
import {
sortOrder as defaultSortOrder,
localStorageKeys,
modalNames,
-} from '@/utils/defaults';
+} from '@/utils/config/defaults';
export default {
name: 'Section',
diff --git a/src/components/MinimalView/MinimalSection.vue b/src/components/MinimalView/MinimalSection.vue
index 5db0330a..4c0c0746 100644
--- a/src/components/MinimalView/MinimalSection.vue
+++ b/src/components/MinimalView/MinimalSection.vue
@@ -49,7 +49,7 @@ import Item from '@/components/LinkItems/Item.vue';
import WidgetBase from '@/components/Widgets/WidgetBase';
import SubItemGroup from '@/components/LinkItems/SubItemGroup.vue';
import IframeModal from '@/components/LinkItems/IframeModal.vue';
-import { makePageSlug } from '@/utils/ConfigHelpers';
+import { makePageSlug } from '@/utils/config/ConfigHelpers';
export default {
name: 'ItemGroup',
diff --git a/src/components/PageStrcture/CriticalError.vue b/src/components/PageStrcture/CriticalError.vue
index 0a0448cc..b827be71 100644
--- a/src/components/PageStrcture/CriticalError.vue
+++ b/src/components/PageStrcture/CriticalError.vue
@@ -34,7 +34,7 @@
</template>
<script>
-import { localStorageKeys } from '@/utils/defaults';
+import { localStorageKeys } from '@/utils/config/defaults';
import Keys from '@/utils/StoreMutations';
export default {
diff --git a/src/components/PageStrcture/Footer.vue b/src/components/PageStrcture/Footer.vue
index 03e61a7e..7b0a926c 100644
--- a/src/components/PageStrcture/Footer.vue
+++ b/src/components/PageStrcture/Footer.vue
@@ -14,7 +14,7 @@
<script>
-import { shouldBeVisible } from '@/utils/SectionHelpers';
+import { shouldBeVisible } from '@/utils/config/SectionHelpers';
import { sanitizeHtml } from '@/utils/Sanitizer';
export default {
diff --git a/src/components/PageStrcture/Header.vue b/src/components/PageStrcture/Header.vue
index f0d3f96f..0fb06631 100644
--- a/src/components/PageStrcture/Header.vue
+++ b/src/components/PageStrcture/Header.vue
@@ -13,7 +13,7 @@
<script>
import PageTitle from '@/components/PageStrcture/PageTitle.vue';
import Nav from '@/components/PageStrcture/Nav.vue';
-import { shouldBeVisible } from '@/utils/SectionHelpers';
+import { shouldBeVisible } from '@/utils/config/SectionHelpers';
export default {
name: 'Header',
diff --git a/src/components/PageStrcture/Nav.vue b/src/components/PageStrcture/Nav.vue
index 9e9cba05..fa922e21 100644
--- a/src/components/PageStrcture/Nav.vue
+++ b/src/components/PageStrcture/Nav.vue
@@ -26,7 +26,7 @@
<script>
import IconBurger from '@/assets/interface-icons/burger-menu.svg';
-import { makePageSlug } from '@/utils/ConfigHelpers';
+import { makePageSlug } from '@/utils/config/ConfigHelpers';
import { checkPageVisibility } from '@/utils/CheckPageVisibility';
export default {
diff --git a/src/components/PageStrcture/PageTitle.vue b/src/components/PageStrcture/PageTitle.vue
index de20710d..dba63d5e 100644
--- a/src/components/PageStrcture/PageTitle.vue
+++ b/src/components/PageStrcture/PageTitle.vue
@@ -16,7 +16,7 @@
<script>
import EditModeIcon from '@/assets/interface-icons/interactive-editor-edit-mode.svg';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
+import { modalNames } from '@/utils/config/defaults';
export default {
name: 'PageTitle',
diff --git a/src/components/Settings/AuthButtons.vue b/src/components/Settings/AuthButtons.vue
index ef22a2ca..73079086 100644
--- a/src/components/Settings/AuthButtons.vue
+++ b/src/components/Settings/AuthButtons.vue
@@ -37,10 +37,10 @@
<script>
import router from '@/router';
-import { logout as registerLogout } from '@/utils/Auth';
-import { getKeycloakAuth, isKeycloakEnabled } from '@/utils/KeycloakAuth';
-import { getOidcAuth, isOidcEnabled } from '@/utils/OidcAuth';
-import { localStorageKeys, userStateEnum } from '@/utils/defaults';
+import { logout as registerLogout } from '@/utils/auth/Auth';
+import { getKeycloakAuth, isKeycloakEnabled } from '@/utils/auth/KeycloakAuth';
+import { getOidcAuth, isOidcEnabled } from '@/utils/auth/OidcAuth';
+import { localStorageKeys, userStateEnum } from '@/utils/config/defaults';
import IconLogout from '@/assets/interface-icons/user-logout.svg';
export default {
diff --git a/src/components/Settings/ConfigLauncher.vue b/src/components/Settings/ConfigLauncher.vue
index 7db56657..bb1f6402 100644
--- a/src/components/Settings/ConfigLauncher.vue
+++ b/src/components/Settings/ConfigLauncher.vue
@@ -34,7 +34,7 @@
import ConfigContainer from '@/components/Configuration/ConfigContainer';
import LanguageSwitcher from '@/components/Settings/LanguageSwitcher';
import Keys from '@/utils/StoreMutations';
-import { topLevelConfKeys, localStorageKeys, modalNames } from '@/utils/defaults';
+import { topLevelConfKeys, localStorageKeys, modalNames } from '@/utils/config/defaults';
import ViewSwitcher from '@/components/Settings/ViewSwitcher';
// Import icons for config launcher buttons
import IconSpanner from '@/assets/interface-icons/config-editor.svg';
diff --git a/src/components/Settings/CustomThemeMaker.vue b/src/components/Settings/CustomThemeMaker.vue
index ac7cdf33..229b053d 100644
--- a/src/components/Settings/CustomThemeMaker.vue
+++ b/src/components/Settings/CustomThemeMaker.vue
@@ -52,7 +52,7 @@
<script>
import StoreKeys from '@/utils/StoreMutations';
-import { localStorageKeys, mainCssVars } from '@/utils/defaults';
+import { localStorageKeys, mainCssVars } from '@/utils/config/defaults';
import Button from '@/components/FormElements/Button';
import SaveIcon from '@/assets/interface-icons/save-config.svg';
import CancelIcon from '@/assets/interface-icons/config-cancel.svg';
diff --git a/src/components/Settings/LanguageSwitcher.vue b/src/components/Settings/LanguageSwitcher.vue
index 8a243fe5..63648c74 100644
--- a/src/components/Settings/LanguageSwitcher.vue
+++ b/src/components/Settings/LanguageSwitcher.vue
@@ -27,11 +27,11 @@
<script>
import Button from '@/components/FormElements/Button';
import SaveConfigIcon from '@/assets/interface-icons/save-config.svg';
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
import Keys from '@/utils/StoreMutations';
import { languages } from '@/utils/languages';
-import { getUsersLanguage } from '@/utils/ConfigHelpers';
-import { localStorageKeys, modalNames } from '@/utils/defaults';
+import { getUsersLanguage } from '@/utils/config/ConfigHelpers';
+import { localStorageKeys, modalNames } from '@/utils/config/defaults';
export default {
name: 'LanguageSwitcher',
diff --git a/src/components/Settings/LocalConfigWarning.vue b/src/components/Settings/LocalConfigWarning.vue
index e3cef3b5..436590d9 100644
--- a/src/components/Settings/LocalConfigWarning.vue
+++ b/src/components/Settings/LocalConfigWarning.vue
@@ -17,7 +17,7 @@
<script>
-import { localStorageKeys, modalNames } from '@/utils/defaults';
+import { localStorageKeys, modalNames } from '@/utils/config/defaults';
import StoreKeys from '@/utils/StoreMutations';
import configSavingMixin from '@/mixins/ConfigSaving';
diff --git a/src/components/Settings/SearchBar.vue b/src/components/Settings/SearchBar.vue
index 15381418..1411b46a 100644
--- a/src/components/Settings/SearchBar.vue
+++ b/src/components/Settings/SearchBar.vue
@@ -23,15 +23,15 @@
<script>
import router from '@/router';
import ArrowKeyNavigation from '@/utils/ArrowKeyNavigation';
-import ErrorHandler from '@/utils/ErrorHandler';
-import { getCustomKeyShortcuts } from '@/utils/ConfigHelpers';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
+import { getCustomKeyShortcuts } from '@/utils/config/ConfigHelpers';
import { getSearchEngineFromBang, findUrlForSearchEngine, stripBangs } from '@/utils/Search';
import {
searchEngineUrls,
defaultSearchEngine,
defaultSearchOpeningMethod,
searchBangs as defaultSearchBangs,
-} from '@/utils/defaults';
+} from '@/utils/config/defaults';
export default {
name: 'FilterTile',
diff --git a/src/components/Settings/SettingsContainer.vue b/src/components/Settings/SettingsContainer.vue
index de4ed918..a08ca8e4 100644
--- a/src/components/Settings/SettingsContainer.vue
+++ b/src/components/Settings/SettingsContainer.vue
@@ -37,9 +37,9 @@ import IconClose from '@/assets/interface-icons/config-close.svg';
import {
localStorageKeys,
visibleComponents as defaultVisibleComponents,
-} from '@/utils/defaults';
+} from '@/utils/config/defaults';
-import { getUserState } from '@/utils/Auth';
+import { getUserState } from '@/utils/auth/Auth';
export default {
name: 'SettingsContainer',
diff --git a/src/components/Widgets/AnonAddy.vue b/src/components/Widgets/AnonAddy.vue
index 2c0ab82a..333ca0c2 100644
--- a/src/components/Widgets/AnonAddy.vue
+++ b/src/components/Widgets/AnonAddy.vue
@@ -92,7 +92,7 @@
import Toggle from '@/components/FormElements/Toggle';
import PercentageChart from '@/components/Charts/PercentageChart';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { timestampToDate, getTimeAgo, convertBytes } from '@/utils/MiscHelpers';
import ClipboardIcon from '@/assets/interface-icons/open-clipboard.svg';
diff --git a/src/components/Widgets/Apod.vue b/src/components/Widgets/Apod.vue
index eb3529cb..ddacc443 100644
--- a/src/components/Widgets/Apod.vue
+++ b/src/components/Widgets/Apod.vue
@@ -17,7 +17,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/BlacklistCheck.vue b/src/components/Widgets/BlacklistCheck.vue
index 56cd1837..c67ec215 100644
--- a/src/components/Widgets/BlacklistCheck.vue
+++ b/src/components/Widgets/BlacklistCheck.vue
@@ -20,7 +20,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/ChuckNorris.vue b/src/components/Widgets/ChuckNorris.vue
index 69785739..e7172bbc 100644
--- a/src/components/Widgets/ChuckNorris.vue
+++ b/src/components/Widgets/ChuckNorris.vue
@@ -7,7 +7,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/CodeStats.vue b/src/components/Widgets/CodeStats.vue
index 7165fee5..fb39f7dd 100644
--- a/src/components/Widgets/CodeStats.vue
+++ b/src/components/Widgets/CodeStats.vue
@@ -24,7 +24,7 @@
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
import ChartingMixin from '@/mixins/ChartingMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { putCommasInBigNum, showNumAsThousand } from '@/utils/MiscHelpers';
export default {
diff --git a/src/components/Widgets/CovidStats.vue b/src/components/Widgets/CovidStats.vue
index afb15235..e3f3c547 100644
--- a/src/components/Widgets/CovidStats.vue
+++ b/src/components/Widgets/CovidStats.vue
@@ -52,7 +52,7 @@
import WidgetMixin from '@/mixins/WidgetMixin';
import ChartingMixin from '@/mixins/ChartingMixin';
import { putCommasInBigNum, showNumAsThousand, timestampToDate } from '@/utils/MiscHelpers';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin, ChartingMixin],
diff --git a/src/components/Widgets/CryptoPriceChart.vue b/src/components/Widgets/CryptoPriceChart.vue
index 95967464..c997a430 100644
--- a/src/components/Widgets/CryptoPriceChart.vue
+++ b/src/components/Widgets/CryptoPriceChart.vue
@@ -7,7 +7,7 @@ import { Chart } from 'frappe-charts/dist/frappe-charts.min.esm';
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
import ChartingMixin from '@/mixins/ChartingMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin, ChartingMixin],
diff --git a/src/components/Widgets/CryptoWatchList.vue b/src/components/Widgets/CryptoWatchList.vue
index fc975298..cfb55eae 100644
--- a/src/components/Widgets/CryptoWatchList.vue
+++ b/src/components/Widgets/CryptoWatchList.vue
@@ -21,7 +21,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import {
findCurrencySymbol, timestampToDate, roundPrice, putCommasInBigNum,
} from '@/utils/MiscHelpers';
diff --git a/src/components/Widgets/CustomSearch.vue b/src/components/Widgets/CustomSearch.vue
index 68de9a75..3ad9d192 100644
--- a/src/components/Widgets/CustomSearch.vue
+++ b/src/components/Widgets/CustomSearch.vue
@@ -17,7 +17,7 @@
<script>
import router from '@/router';
import WidgetMixin from '@/mixins/WidgetMixin';
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/CveVulnerabilities.vue b/src/components/Widgets/CveVulnerabilities.vue
index 14578e11..35df4541 100644
--- a/src/components/Widgets/CveVulnerabilities.vue
+++ b/src/components/Widgets/CveVulnerabilities.vue
@@ -25,7 +25,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
import { timestampToDate, truncateStr } from '@/utils/MiscHelpers';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/DomainMonitor.vue b/src/components/Widgets/DomainMonitor.vue
index 7d7412c5..adc9474f 100644
--- a/src/components/Widgets/DomainMonitor.vue
+++ b/src/components/Widgets/DomainMonitor.vue
@@ -56,7 +56,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
import { timestampToDate, getTimeAgo } from '@/utils/MiscHelpers';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/EthGasPrices.vue b/src/components/Widgets/EthGasPrices.vue
index 3ce6d455..af6da1ae 100644
--- a/src/components/Widgets/EthGasPrices.vue
+++ b/src/components/Widgets/EthGasPrices.vue
@@ -46,7 +46,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
import ChartingMixin from '@/mixins/ChartingMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { timestampToTime, roundPrice, putCommasInBigNum } from '@/utils/MiscHelpers';
export default {
diff --git a/src/components/Widgets/ExchangeRates.vue b/src/components/Widgets/ExchangeRates.vue
index 743c2343..11cc68ff 100644
--- a/src/components/Widgets/ExchangeRates.vue
+++ b/src/components/Widgets/ExchangeRates.vue
@@ -29,7 +29,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { findCurrencySymbol, getCurrencyFlag, timestampToDate } from '@/utils/MiscHelpers';
export default {
diff --git a/src/components/Widgets/Flights.vue b/src/components/Widgets/Flights.vue
index b00e2abc..e1a81c28 100644
--- a/src/components/Widgets/Flights.vue
+++ b/src/components/Widgets/Flights.vue
@@ -32,7 +32,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/GitHubProfile.vue b/src/components/Widgets/GitHubProfile.vue
index a8e78640..494816bc 100644
--- a/src/components/Widgets/GitHubProfile.vue
+++ b/src/components/Widgets/GitHubProfile.vue
@@ -16,7 +16,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/GitHubTrending.vue b/src/components/Widgets/GitHubTrending.vue
index bc9f404b..6de7a92e 100644
--- a/src/components/Widgets/GitHubTrending.vue
+++ b/src/components/Widgets/GitHubTrending.vue
@@ -18,7 +18,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { capitalize, showNumAsThousand } from '@/utils/MiscHelpers';
export default {
diff --git a/src/components/Widgets/HackernewsTrending.vue b/src/components/Widgets/HackernewsTrending.vue
index 553972a9..3996418a 100644
--- a/src/components/Widgets/HackernewsTrending.vue
+++ b/src/components/Widgets/HackernewsTrending.vue
@@ -19,7 +19,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/HealthChecks.vue b/src/components/Widgets/HealthChecks.vue
index cc1aa62a..2201b11a 100644
--- a/src/components/Widgets/HealthChecks.vue
+++ b/src/components/Widgets/HealthChecks.vue
@@ -20,7 +20,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { capitalize, timestampToDateTime } from '@/utils/MiscHelpers';
export default {
diff --git a/src/components/Widgets/Jokes.vue b/src/components/Widgets/Jokes.vue
index d23b78b4..c6493dd3 100644
--- a/src/components/Widgets/Jokes.vue
+++ b/src/components/Widgets/Jokes.vue
@@ -8,7 +8,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/MinecraftStatus.vue b/src/components/Widgets/MinecraftStatus.vue
index fc20f96d..0cdbd008 100644
--- a/src/components/Widgets/MinecraftStatus.vue
+++ b/src/components/Widgets/MinecraftStatus.vue
@@ -49,7 +49,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import StatusIndicator from '@/components/LinkItems/StatusIndicator.vue';
export default {
diff --git a/src/components/Widgets/MullvadStatus.vue b/src/components/Widgets/MullvadStatus.vue
index 9246e2a1..286d858c 100644
--- a/src/components/Widgets/MullvadStatus.vue
+++ b/src/components/Widgets/MullvadStatus.vue
@@ -22,7 +22,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/Mvg.vue b/src/components/Widgets/Mvg.vue
index 5123a0e2..9410f4ff 100644
--- a/src/components/Widgets/Mvg.vue
+++ b/src/components/Widgets/Mvg.vue
@@ -37,7 +37,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { timestampToTime } from '@/utils/MiscHelpers';
export default {
diff --git a/src/components/Widgets/MvgConnection.vue b/src/components/Widgets/MvgConnection.vue
index 663583f6..8d25b561 100644
--- a/src/components/Widgets/MvgConnection.vue
+++ b/src/components/Widgets/MvgConnection.vue
@@ -56,7 +56,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/NewsHeadlines.vue b/src/components/Widgets/NewsHeadlines.vue
index 902225a6..a5207a1e 100644
--- a/src/components/Widgets/NewsHeadlines.vue
+++ b/src/components/Widgets/NewsHeadlines.vue
@@ -15,7 +15,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { timestampToDate } from '@/utils/MiscHelpers';
export default {
diff --git a/src/components/Widgets/PublicHolidays.vue b/src/components/Widgets/PublicHolidays.vue
index 009f728a..28ca2440 100644
--- a/src/components/Widgets/PublicHolidays.vue
+++ b/src/components/Widgets/PublicHolidays.vue
@@ -15,7 +15,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { timestampToDate, capitalize } from '@/utils/MiscHelpers';
export default {
diff --git a/src/components/Widgets/PublicIp.vue b/src/components/Widgets/PublicIp.vue
index e35d502f..230dfaeb 100644
--- a/src/components/Widgets/PublicIp.vue
+++ b/src/components/Widgets/PublicIp.vue
@@ -15,7 +15,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints as urls } from '@/utils/defaults';
+import { widgetApiEndpoints as urls } from '@/utils/config/defaults';
import { getCountryFlag, getMapUrl } from '@/utils/MiscHelpers';
/* List of providers, with their API endpoint and response structure/parser */
diff --git a/src/components/Widgets/RescueTime.vue b/src/components/Widgets/RescueTime.vue
index 6144bc76..edcb4cbd 100644
--- a/src/components/Widgets/RescueTime.vue
+++ b/src/components/Widgets/RescueTime.vue
@@ -19,7 +19,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/RssFeed.vue b/src/components/Widgets/RssFeed.vue
index 2f0baf13..0923c463 100644
--- a/src/components/Widgets/RssFeed.vue
+++ b/src/components/Widgets/RssFeed.vue
@@ -53,7 +53,7 @@
<script>
import * as Parser from 'rss-parser';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { sanitizeRssItem, sanitizeRssMeta } from '@/utils/Sanitizer';
export default {
diff --git a/src/components/Widgets/SportsScores.vue b/src/components/Widgets/SportsScores.vue
index 2b2a63f3..17005eff 100644
--- a/src/components/Widgets/SportsScores.vue
+++ b/src/components/Widgets/SportsScores.vue
@@ -71,7 +71,7 @@
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
import { timestampToDate, getPlaceUrl } from '@/utils/MiscHelpers';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/StockPriceChart.vue b/src/components/Widgets/StockPriceChart.vue
index e271d46f..029c8960 100644
--- a/src/components/Widgets/StockPriceChart.vue
+++ b/src/components/Widgets/StockPriceChart.vue
@@ -7,7 +7,7 @@ import { Chart } from 'frappe-charts/dist/frappe-charts.min.esm';
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
import ChartingMixin from '@/mixins/ChartingMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin, ChartingMixin],
diff --git a/src/components/Widgets/SystemInfo.vue b/src/components/Widgets/SystemInfo.vue
index ed784355..ea84060a 100644
--- a/src/components/Widgets/SystemInfo.vue
+++ b/src/components/Widgets/SystemInfo.vue
@@ -20,7 +20,7 @@
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
import ChartingMixin from '@/mixins/ChartingMixin';
-import { serviceEndpoints } from '@/utils/defaults';
+import { serviceEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin, ChartingMixin],
diff --git a/src/components/Widgets/TflStatus.vue b/src/components/Widgets/TflStatus.vue
index d671ca59..24da3ea2 100644
--- a/src/components/Widgets/TflStatus.vue
+++ b/src/components/Widgets/TflStatus.vue
@@ -25,7 +25,7 @@
<script>
import request from '@/utils/request';
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/WalletBalance.vue b/src/components/Widgets/WalletBalance.vue
index c2d6dc74..a7b01541 100644
--- a/src/components/Widgets/WalletBalance.vue
+++ b/src/components/Widgets/WalletBalance.vue
@@ -41,7 +41,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
import { timestampToDate, timestampToTime, getTimeAgo } from '@/utils/MiscHelpers';
export default {
diff --git a/src/components/Widgets/Weather.vue b/src/components/Widgets/Weather.vue
index 11b164dd..cde8d01d 100644
--- a/src/components/Widgets/Weather.vue
+++ b/src/components/Widgets/Weather.vue
@@ -24,7 +24,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/WeatherForecast.vue b/src/components/Widgets/WeatherForecast.vue
index d5699c5c..87071288 100644
--- a/src/components/Widgets/WeatherForecast.vue
+++ b/src/components/Widgets/WeatherForecast.vue
@@ -33,7 +33,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
import { capitalize } from '@/utils/MiscHelpers';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/components/Widgets/WidgetBase.vue b/src/components/Widgets/WidgetBase.vue
index a40e12a2..5d83b453 100644
--- a/src/components/Widgets/WidgetBase.vue
+++ b/src/components/Widgets/WidgetBase.vue
@@ -36,7 +36,7 @@
<script>
import { defineAsyncComponent } from 'vue';
// Import form elements, icons and utils
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
import Button from '@/components/FormElements/Button';
import UpdateIcon from '@/assets/interface-icons/widget-update.svg';
import OpenIcon from '@/assets/interface-icons/open-new-tab.svg';
diff --git a/src/components/Widgets/XkcdComic.vue b/src/components/Widgets/XkcdComic.vue
index 91a0d215..1ea0037b 100644
--- a/src/components/Widgets/XkcdComic.vue
+++ b/src/components/Widgets/XkcdComic.vue
@@ -9,7 +9,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { widgetApiEndpoints } from '@/utils/defaults';
+import { widgetApiEndpoints } from '@/utils/config/defaults';
export default {
mixins: [WidgetMixin],
diff --git a/src/main.js b/src/main.js
index 4cc17bcb..a1026961 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,15 +14,15 @@ import store from '@/store'; // Store, for local state management
import router from '@/router'; // Router, for navigation
import serviceWorker from '@/utils/InitServiceWorker'; // Service worker initialization
import { messages } from '@/utils/languages'; // Language texts
-import ErrorReporting from '@/utils/ErrorReporting'; // Error reporting initializer (off)
+import ErrorReporting from '@/utils/logging/ErrorReporting'; // Error reporting initializer (off)
import clickOutside from '@/directives/ClickOutside'; // Directive for closing popups, modals, etc
import tooltip from '@/directives/Tooltip'; // Custom tooltip directive
-import { language as defaultLanguage } from '@/utils/defaults';
-import { initKeycloakAuth, isKeycloakEnabled } from '@/utils/KeycloakAuth';
-import { initHeaderAuth, isHeaderAuthEnabled } from '@/utils/HeaderAuth';
-import { initOidcAuth, isOidcEnabled } from '@/utils/OidcAuth';
+import { language as defaultLanguage } from '@/utils/config/defaults';
+import { initKeycloakAuth, isKeycloakEnabled } from '@/utils/auth/KeycloakAuth';
+import { initHeaderAuth, isHeaderAuthEnabled } from '@/utils/auth/HeaderAuth';
+import { initOidcAuth, isOidcEnabled } from '@/utils/auth/OidcAuth';
import Keys from '@/utils/StoreMutations';
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
import Toast from '@/utils/Toast';
import '@/utils/patchResizeObserver';
diff --git a/src/mixins/ConfigSaving.js b/src/mixins/ConfigSaving.js
index 15105d39..fc91b646 100644
--- a/src/mixins/ConfigSaving.js
+++ b/src/mixins/ConfigSaving.js
@@ -2,9 +2,9 @@ import jsYaml from 'js-yaml';
import { Progress } from 'rsup-progress';
import request from '@/utils/request';
-import ErrorHandler, { InfoHandler } from '@/utils/ErrorHandler';
-import { localStorageKeys, serviceEndpoints } from '@/utils/defaults';
-import { makePageName } from '@/utils/ConfigHelpers';
+import ErrorHandler, { InfoHandler } from '@/utils/logging/ErrorHandler';
+import { localStorageKeys, serviceEndpoints } from '@/utils/config/defaults';
+import { makePageName } from '@/utils/config/ConfigHelpers';
import StoreKeys from '@/utils/StoreMutations';
export default {
diff --git a/src/mixins/HomeMixin.js b/src/mixins/HomeMixin.js
index bff53dc3..660e668f 100644
--- a/src/mixins/HomeMixin.js
+++ b/src/mixins/HomeMixin.js
@@ -2,7 +2,7 @@
* Mixin for all homepages (default home, minimal home, workspace, etc)
*/
-import Defaults, { localStorageKeys, iconCdns } from '@/utils/defaults';
+import Defaults, { localStorageKeys, iconCdns } from '@/utils/config/defaults';
import Keys from '@/utils/StoreMutations';
import { searchTiles } from '@/utils/Search';
import { checkItemVisibility } from '@/utils/CheckItemVisibility';
diff --git a/src/mixins/ItemMixin.js b/src/mixins/ItemMixin.js
index deb418b4..29ec80f3 100644
--- a/src/mixins/ItemMixin.js
+++ b/src/mixins/ItemMixin.js
@@ -2,13 +2,13 @@
import request from '@/utils/request';
import router from '@/router';
import longPress from '@/directives/LongPress';
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
import {
openingMethod as defaultOpeningMethod,
serviceEndpoints,
localStorageKeys,
iconSize as defaultSize,
-} from '@/utils/defaults';
+} from '@/utils/config/defaults';
export default {
directives: {
diff --git a/src/mixins/ThemingMixin.js b/src/mixins/ThemingMixin.js
index 7659f351..9a241def 100644
--- a/src/mixins/ThemingMixin.js
+++ b/src/mixins/ThemingMixin.js
@@ -5,8 +5,8 @@
* */
import Keys from '@/utils/StoreMutations';
-import ErrorHandler from '@/utils/ErrorHandler';
-import { builtInThemes, localStorageKeys, mainCssVars } from '@/utils/defaults';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
+import { builtInThemes, localStorageKeys, mainCssVars } from '@/utils/config/defaults';
const ThemingMixin = {
data: () => ({
diff --git a/src/mixins/WidgetMixin.js b/src/mixins/WidgetMixin.js
index 3c099dfe..0eb4f786 100644
--- a/src/mixins/WidgetMixin.js
+++ b/src/mixins/WidgetMixin.js
@@ -4,8 +4,8 @@
*/
import { Progress } from 'rsup-progress';
import request from '@/utils/request';
-import ErrorHandler from '@/utils/ErrorHandler';
-import { serviceEndpoints } from '@/utils/defaults';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
+import { serviceEndpoints } from '@/utils/config/defaults';
const WidgetMixin = {
props: {
diff --git a/src/router.js b/src/router.js
index 768aac06..8eb360a5 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,7 +1,7 @@
/**
* This is the router config, which defined the location for
* each page within the app, and how they should be loaded
- * Note that the page paths are defined in @/utils/defaults.js
+ * Note that the page paths are defined in @/utils/config/defaults.js
*/
// Import vue router
@@ -13,9 +13,9 @@ import { Progress } from 'rsup-progress';
import Home from '@/views/Home.vue';
// Import helper functions, config data and defaults
-import { isAuthEnabled, isLoggedIn, isGuestAccessEnabled } from '@/utils/Auth';
-import { metaTagData, startingView as defaultStartingView, routePaths } from '@/utils/defaults';
-import ErrorHandler from '@/utils/ErrorHandler';
+import { isAuthEnabled, isLoggedIn, isGuestAccessEnabled } from '@/utils/auth/Auth';
+import { metaTagData, startingView as defaultStartingView, routePaths } from '@/utils/config/defaults';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
const progress = new Progress({ color: 'var(--progress-bar)' });
diff --git a/src/store.js b/src/store.js
index 68ae2316..2b1bf481 100644
--- a/src/store.js
+++ b/src/store.js
@@ -3,12 +3,12 @@ import { createStore } from 'vuex';
import yaml from 'js-yaml';
import request from '@/utils/request';
import Keys from '@/utils/StoreMutations';
-import { makePageName, formatConfigPath, componentVisibility } from '@/utils/ConfigHelpers';
-import { applyItemId } from '@/utils/SectionHelpers';
+import { makePageName, formatConfigPath, componentVisibility } from '@/utils/config/ConfigHelpers';
+import { applyItemId } from '@/utils/config/SectionHelpers';
import filterUserSections from '@/utils/CheckSectionVisibility';
-import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
-import { isUserAdmin, makeBasicAuthHeaders, isLoggedInAsGuest } from '@/utils/Auth';
-import { localStorageKeys, theme as defaultTheme } from '@/utils/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
+import { isUserAdmin, makeBasicAuthHeaders, isLoggedInAsGuest } from '@/utils/auth/Auth';
+import { localStorageKeys, theme as defaultTheme } from '@/utils/config/defaults';
const {
INITIALIZE_CONFIG,
diff --git a/src/utils/CheckItemVisibility.js b/src/utils/CheckItemVisibility.js
index c467fbaf..bd234b8a 100644
--- a/src/utils/CheckItemVisibility.js
+++ b/src/utils/CheckItemVisibility.js
@@ -5,7 +5,7 @@
*/
// Import helper functions from auth, to get current user, and check if guest
-import { getCurrentUser } from '@/utils/Auth';
+import { getCurrentUser } from '@/utils/auth/Auth';
import { isVisibleToUser } from '@/utils/IsVisibleToUser';
/* Putting it all together, the function to export */
diff --git a/src/utils/CheckPageVisibility.js b/src/utils/CheckPageVisibility.js
index e9ca8cd1..e9e605ca 100644
--- a/src/utils/CheckPageVisibility.js
+++ b/src/utils/CheckPageVisibility.js
@@ -5,7 +5,7 @@
*/
// Import helper functions from auth, to get current user, and check if guest
-import { getCurrentUser } from '@/utils/Auth';
+import { getCurrentUser } from '@/utils/auth/Auth';
import { isVisibleToUser } from '@/utils/IsVisibleToUser';
/* Putting it all together, the function to export */
diff --git a/src/utils/CheckSectionVisibility.js b/src/utils/CheckSectionVisibility.js
index 30e4dca7..3b4f09ef 100644
--- a/src/utils/CheckSectionVisibility.js
+++ b/src/utils/CheckSectionVisibility.js
@@ -5,7 +5,7 @@
*/
// Import helper functions from auth, to get current user, and check if guest
-import { getCurrentUser } from '@/utils/Auth';
+import { getCurrentUser } from '@/utils/auth/Auth';
import { isVisibleToUser } from '@/utils/IsVisibleToUser';
/* Putting it all together, the function to export */
diff --git a/src/utils/CloudBackup.js b/src/utils/CloudBackup.js
index f0008dcf..580bfc51 100644
--- a/src/utils/CloudBackup.js
+++ b/src/utils/CloudBackup.js
@@ -2,7 +2,7 @@ import sha256 from 'crypto-js/sha256';
import aes from 'crypto-js/aes';
import Utf8 from 'crypto-js/enc-utf8';
import request from '@/utils/request';
-import { backupEndpoint } from '@/utils/defaults';
+import { backupEndpoint } from '@/utils/config/defaults';
const ENDPOINT = backupEndpoint; // 'https://dashy-sync-service.as93.net';
diff --git a/src/utils/InitServiceWorker.js b/src/utils/InitServiceWorker.js
index 4abaa412..72c31e3c 100644
--- a/src/utils/InitServiceWorker.js
+++ b/src/utils/InitServiceWorker.js
@@ -1,8 +1,8 @@
import yaml from 'js-yaml';
import { register } from 'register-service-worker';
import request from '@/utils/request';
-import { sessionStorageKeys } from '@/utils/defaults';
-import { statusMsg, statusErrorMsg } from '@/utils/CoolConsole';
+import { sessionStorageKeys } from '@/utils/config/defaults';
+import { statusMsg, statusErrorMsg } from '@/utils/logging/CoolConsole';
/* Sets a local storage item with the state from the SW lifecycle */
const setSwStatus = (swStateToSet) => {
diff --git a/src/utils/IsVisibleToUser.js b/src/utils/IsVisibleToUser.js
index 21f5ac86..616d60be 100644
--- a/src/utils/IsVisibleToUser.js
+++ b/src/utils/IsVisibleToUser.js
@@ -5,8 +5,8 @@
*/
// Import helper functions from auth, to get current user, and check if guest
-import { localStorageKeys } from '@/utils/defaults';
-import { isLoggedInAsGuest } from '@/utils/Auth';
+import { localStorageKeys } from '@/utils/config/defaults';
+import { isLoggedInAsGuest } from '@/utils/auth/Auth';
/* Helper function, checks if a given testValue is found in the visibility list */
const determineVisibility = (visibilityList, testValue) => {
diff --git a/src/utils/Sanitizer.js b/src/utils/Sanitizer.js
index 73a3c089..36490e44 100644
--- a/src/utils/Sanitizer.js
+++ b/src/utils/Sanitizer.js
@@ -4,7 +4,7 @@
*/
import DOMPurify from 'dompurify';
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
// DOMPurify settings
const HTML_SANITIZE_CONFIG = {
diff --git a/src/utils/Search.js b/src/utils/Search.js
index 99f32484..d2f61001 100644
--- a/src/utils/Search.js
+++ b/src/utils/Search.js
@@ -1,7 +1,7 @@
/* Dashy: Licensed under MIT, (C) Alicia Sykes 2024 <https://aliciasykes.com> */
/* Tile filtering utility */
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
/**
* Extracts the site name from domain
diff --git a/src/utils/auth/Auth.js b/src/utils/auth/Auth.js
index 46c436e4..9ab9a348 100644
--- a/src/utils/auth/Auth.js
+++ b/src/utils/auth/Auth.js
@@ -1,9 +1,9 @@
import sha256 from 'crypto-js/sha256';
-import ConfigAccumulator from '@/utils/ConfigAccumalator';
-import ErrorHandler from '@/utils/ErrorHandler';
-import { cookieKeys, localStorageKeys, userStateEnum } from '@/utils/defaults';
-import { isKeycloakEnabled } from '@/utils/KeycloakAuth';
-import { isOidcEnabled } from '@/utils/OidcAuth';
+import ConfigAccumulator from '@/utils/config/ConfigAccumalator';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
+import { cookieKeys, localStorageKeys, userStateEnum } from '@/utils/config/defaults';
+import { isKeycloakEnabled } from '@/utils/auth/KeycloakAuth';
+import { isOidcEnabled } from '@/utils/auth/OidcAuth';
/* Uses config accumulator to get and return app config */
const getAppConfig = () => {
diff --git a/src/utils/auth/HeaderAuth.js b/src/utils/auth/HeaderAuth.js
index 67bfd17e..758fb344 100644
--- a/src/utils/auth/HeaderAuth.js
+++ b/src/utils/auth/HeaderAuth.js
@@ -1,9 +1,9 @@
import sha256 from 'crypto-js/sha256';
import request from '@/utils/request';
-import ConfigAccumulator from '@/utils/ConfigAccumalator';
-import { cookieKeys, localStorageKeys, serviceEndpoints } from '@/utils/defaults';
-import { InfoHandler, ErrorHandler, InfoKeys } from '@/utils/ErrorHandler';
-import { logout as authLogout } from '@/utils/Auth';
+import ConfigAccumulator from '@/utils/config/ConfigAccumalator';
+import { cookieKeys, localStorageKeys, serviceEndpoints } from '@/utils/config/defaults';
+import { InfoHandler, ErrorHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
+import { logout as authLogout } from '@/utils/auth/Auth';
const getAppConfig = () => {
const Accumulator = new ConfigAccumulator();
diff --git a/src/utils/auth/KeycloakAuth.js b/src/utils/auth/KeycloakAuth.js
index 16fb2f44..fb5320bc 100644
--- a/src/utils/auth/KeycloakAuth.js
+++ b/src/utils/auth/KeycloakAuth.js
@@ -1,7 +1,7 @@
import Keycloak from 'keycloak-js';
-import ConfigAccumulator from '@/utils/ConfigAccumalator';
-import { localStorageKeys } from '@/utils/defaults';
-import ErrorHandler from '@/utils/ErrorHandler';
+import ConfigAccumulator from '@/utils/config/ConfigAccumalator';
+import { localStorageKeys } from '@/utils/config/defaults';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
const getAppConfig = () => {
const Accumulator = new ConfigAccumulator();
diff --git a/src/utils/auth/OidcAuth.js b/src/utils/auth/OidcAuth.js
index 029ba773..656c95cb 100644
--- a/src/utils/auth/OidcAuth.js
+++ b/src/utils/auth/OidcAuth.js
@@ -1,8 +1,8 @@
import { UserManager, WebStorageStateStore } from 'oidc-client-ts';
-import ConfigAccumulator from '@/utils/ConfigAccumalator';
-import { localStorageKeys } from '@/utils/defaults';
-import ErrorHandler from '@/utils/ErrorHandler';
-import { statusMsg, statusErrorMsg } from '@/utils/CoolConsole';
+import ConfigAccumulator from '@/utils/config/ConfigAccumalator';
+import { localStorageKeys } from '@/utils/config/defaults';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
+import { statusMsg, statusErrorMsg } from '@/utils/logging/CoolConsole';
const getAppConfig = () => {
const Accumulator = new ConfigAccumulator();
diff --git a/src/utils/config/ConfigAccumalator.js b/src/utils/config/ConfigAccumalator.js
index 502be23d..ae6d939e 100644
--- a/src/utils/config/ConfigAccumalator.js
+++ b/src/utils/config/ConfigAccumalator.js
@@ -11,9 +11,9 @@ import {
pageInfo as defaultPageInfo,
iconSize as defaultIconSize,
layout as defaultLayout,
-} from '@/utils/defaults';
-import ErrorHandler from '@/utils/ErrorHandler';
-import { applyItemId } from '@/utils/SectionHelpers';
+} from '@/utils/config/defaults';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
+import { applyItemId } from '@/utils/config/SectionHelpers';
import $store from '@/store';
export default class ConfigAccumulator {
diff --git a/src/utils/config/ConfigHelpers.js b/src/utils/config/ConfigHelpers.js
index e83126e5..ba48a73a 100644
--- a/src/utils/config/ConfigHelpers.js
+++ b/src/utils/config/ConfigHelpers.js
@@ -1,4 +1,4 @@
-import ConfigAccumulator from '@/utils/ConfigAccumalator';
+import ConfigAccumulator from '@/utils/config/ConfigAccumalator';
// import $store from '@/store';
import filterUserSections from '@/utils/CheckSectionVisibility';
import { languages } from '@/utils/languages';
@@ -6,7 +6,7 @@ import {
visibleComponents,
localStorageKeys,
language as defaultLanguage,
-} from '@/utils/defaults';
+} from '@/utils/config/defaults';
/* Given a page name, converts to lowercase, removes special characters and extension */
export const makePageName = (pageName) => {
diff --git a/src/utils/config/SectionHelpers.js b/src/utils/config/SectionHelpers.js
index dfad7e67..873fc2f6 100644
--- a/src/utils/config/SectionHelpers.js
+++ b/src/utils/config/SectionHelpers.js
@@ -1,6 +1,6 @@
/* Helper functions for Sections and Items */
-import { hideFurnitureOn } from '@/utils/defaults';
+import { hideFurnitureOn } from '@/utils/config/defaults';
/* Returns false if page furniture should be hidden on said route */
export const shouldBeVisible = (routeName) => {
diff --git a/src/utils/logging/ErrorHandler.js b/src/utils/logging/ErrorHandler.js
index aeaeb4e7..19eca54a 100644
--- a/src/utils/logging/ErrorHandler.js
+++ b/src/utils/logging/ErrorHandler.js
@@ -1,6 +1,6 @@
import * as Sentry from '@sentry/vue';
-import { warningMsg, statusMsg, statusErrorMsg } from '@/utils/CoolConsole';
-import { sessionStorageKeys } from '@/utils/defaults';
+import { warningMsg, statusMsg, statusErrorMsg } from '@/utils/logging/CoolConsole';
+import { sessionStorageKeys } from '@/utils/config/defaults';
/* Makes the current time, like hh:mm:ss */
const makeTime = () => {
diff --git a/src/utils/logging/ErrorReporting.js b/src/utils/logging/ErrorReporting.js
index c72fb3b0..0c034272 100644
--- a/src/utils/logging/ErrorReporting.js
+++ b/src/utils/logging/ErrorReporting.js
@@ -8,7 +8,7 @@
*/
import $store from '@/store';
-import { sentryDsn } from '@/utils/defaults';
+import { sentryDsn } from '@/utils/config/defaults';
const ErrorReporting = async (app, router) => {
// Fetch users config
diff --git a/src/utils/request.js b/src/utils/request.js
index 314e835e..cab42e42 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -63,7 +63,7 @@ async function makeRequest(config) {
// For local API requests, include basic auth headers when configured
if (isLocalRequest(fullUrl) && !fetchOptions.headers.Authorization) {
- const { makeBasicAuthHeaders } = await import('@/utils/Auth');
+ const { makeBasicAuthHeaders } = await import('@/utils/auth/Auth');
const authConfig = makeBasicAuthHeaders();
if (authConfig.headers) {
Object.assign(fetchOptions.headers, authConfig.headers);
diff --git a/src/utils/safeClone.js b/src/utils/safeClone.js
index 71e7cf60..2e8b2395 100644
--- a/src/utils/safeClone.js
+++ b/src/utils/safeClone.js
@@ -1,7 +1,7 @@
/* Deep-clone that tolerates reactive proxies. `structuredClone` throws
* `DataCloneError` on Vue's proxies in some browsers (Firefox); JSON
* round-trip is a safe fallback for plain JSON-shaped data. */
-import ErrorHandler from '@/utils/ErrorHandler';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
export default function safeClone(val, fallback = null) {
if (val == null) return fallback;
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 460fbc40..efbbb5f9 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -64,9 +64,9 @@ import ExportConfigMenu from '@/components/InteractiveEditor/ExportConfigMenu.vu
import AddNewSection from '@/components/InteractiveEditor/AddNewSectionLauncher.vue';
import NotificationThing from '@/components/Settings/LocalConfigWarning.vue';
import StoreKeys from '@/utils/StoreMutations';
-import { modalNames } from '@/utils/defaults';
-import { makePageName } from '@/utils/ConfigHelpers';
-import ErrorHandler from '@/utils/ErrorHandler';
+import { modalNames } from '@/utils/config/defaults';
+import { makePageName } from '@/utils/config/ConfigHelpers';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
import BackIcon from '@/assets/interface-icons/back-arrow.svg';
export default {
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 29b6541f..944acc2e 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -75,15 +75,15 @@
import router from '@/router';
import Button from '@/components/FormElements/Button';
import Input from '@/components/FormElements/Input';
-import Defaults, { localStorageKeys } from '@/utils/defaults';
-import { InfoHandler, WarningInfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import Defaults, { localStorageKeys } from '@/utils/config/defaults';
+import { InfoHandler, WarningInfoHandler, InfoKeys } from '@/utils/logging/ErrorHandler';
import {
checkCredentials,
login,
isLoggedIn,
logout,
isGuestAccessEnabled,
-} from '@/utils/Auth';
+} from '@/utils/auth/Auth';
export default {
name: 'login',
diff --git a/src/views/Workspace.vue b/src/views/Workspace.vue
index 48049d4a..06e43adc 100644
--- a/src/views/Workspace.vue
+++ b/src/views/Workspace.vue
@@ -18,8 +18,8 @@ import SideBar from '@/components/Workspace/SideBar';
import WebContent from '@/components/Workspace/WebContent';
import WidgetView from '@/components/Workspace/WidgetView';
import MultiTaskingWebComtent from '@/components/Workspace/MultiTaskingWebComtent';
-import Defaults from '@/utils/defaults';
-import ErrorHandler from '@/utils/ErrorHandler';
+import Defaults from '@/utils/config/defaults';
+import ErrorHandler from '@/utils/logging/ErrorHandler';
export default {
name: 'Workspace',
diff --git a/tests/components/item.test.js b/tests/components/item.test.js
index 8166b3d1..0c68e364 100644
--- a/tests/components/item.test.js
+++ b/tests/components/item.test.js
@@ -14,7 +14,7 @@ vi.mock('@/utils/request', () => {
return { default: fn };
});
vi.mock('@/router', () => ({ default: { push: vi.fn() } }));
-vi.mock('@/utils/ErrorHandler', () => ({ default: vi.fn() }));
+vi.mock('@/utils/logging/ErrorHandler', () => ({ default: vi.fn() }));
vi.mock('@/assets/interface-icons/interactive-editor-edit-mode.svg', () => ({
default: { template: '<span />' },
}));
@@ -598,7 +598,7 @@ describe('Methods: copyToClipboard', () => {
});
it('shows error when clipboard unavailable', async () => {
- const ErrorHandler = (await import('@/utils/ErrorHandler')).default;
+ const ErrorHandler = (await import('@/utils/logging/ErrorHandler')).default;
Object.defineProperty(navigator, 'clipboard', {
value: undefined, writable: true, configurable: true,
});
diff --git a/tests/server/save-config.test.js b/tests/server/save-config.test.js
index f545545a..6b037b56 100644
--- a/tests/server/save-config.test.js
+++ b/tests/server/save-config.test.js
@@ -1,6 +1,14 @@
// @vitest-environment node
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, afterAll } from 'vitest';
import request from 'supertest';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+
+// Isolate writes to a temp dir so the real user-data/conf.yml is never touched
+const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'dashy-save-config-'));
+process.env.USER_DATA_DIR = tmpDir;
+afterAll(() => fs.rmSync(tmpDir, { recursive: true, force: true }));
const app = require('../../services/app');
const save = (body) => request(app).post('/config-manager/save').send(body);
diff --git a/tests/unit/config-helpers.test.js b/tests/unit/config-helpers.test.js
index fb75874b..c2b6f4d0 100644
--- a/tests/unit/config-helpers.test.js
+++ b/tests/unit/config-helpers.test.js
@@ -5,7 +5,7 @@ import {
formatConfigPath,
componentVisibility,
getCustomKeyShortcuts,
-} from '@/utils/ConfigHelpers';
+} from '@/utils/config/ConfigHelpers';
describe('ConfigHelpers - makePageName', () => {
it('converts page name to lowercase', () => {
diff --git a/tests/unit/config-validator.test.js b/tests/unit/config-validator.test.js
index f12a95af..6cc71261 100644
--- a/tests/unit/config-validator.test.js
+++ b/tests/unit/config-validator.test.js
@@ -12,7 +12,7 @@ describe('Config Validator', () => {
it('validates a correct config file', () => {
const Ajv = require('ajv');
- const schema = require('../../src/utils/ConfigSchema.json');
+ const schema = require('../../src/utils/config/ConfigSchema.json');
const validConfig = {
pageInfo: { title: 'Test' },
@@ -27,7 +27,7 @@ describe('Config Validator', () => {
it('rejects config with invalid structure', () => {
const Ajv = require('ajv');
- const schema = require('../../src/utils/ConfigSchema.json');
+ const schema = require('../../src/utils/config/ConfigSchema.json');
const invalidConfig = {
pageInfo: { title: 'Test' },
@@ -42,7 +42,7 @@ describe('Config Validator', () => {
it('requires sections to be an array', () => {
const Ajv = require('ajv');
- const schema = require('../../src/utils/ConfigSchema.json');
+ const schema = require('../../src/utils/config/ConfigSchema.json');
const config = {
pageInfo: { title: 'Test' },
@@ -56,7 +56,7 @@ describe('Config Validator', () => {
it('allows items with just title', () => {
const Ajv = require('ajv');
- const schema = require('../../src/utils/ConfigSchema.json');
+ const schema = require('../../src/utils/config/ConfigSchema.json');
const config = {
pageInfo: { title: 'Test' },
diff --git a/tests/unit/error-handler.test.js b/tests/unit/error-handler.test.js
index 4e854910..32d36465 100644
--- a/tests/unit/error-handler.test.js
+++ b/tests/unit/error-handler.test.js
@@ -2,7 +2,7 @@ import { describe, it, expect } from 'vitest';
describe('ErrorHandler', () => {
it('exports InfoKeys constants', async () => {
- const { InfoKeys } = await import('@/utils/ErrorHandler');
+ const { InfoKeys } = await import('@/utils/logging/ErrorHandler');
expect(InfoKeys.AUTH).toBe('Authentication');
expect(InfoKeys.CLOUD_BACKUP).toBe('Cloud Backup & Restore');
expect(InfoKeys.EDITOR).toBe('Interactive Editor');
@@ -11,14 +11,14 @@ describe('ErrorHandler', () => {
});
it('exports handler functions', async () => {
- const handlers = await import('@/utils/ErrorHandler');
+ const handlers = await import('@/utils/logging/ErrorHandler');
expect(typeof handlers.ErrorHandler).toBe('function');
expect(typeof handlers.InfoHandler).toBe('function');
expect(typeof handlers.WarningInfoHandler).toBe('function');
});
it('ErrorHandler can be called without throwing', async () => {
- const { ErrorHandler } = await import('@/utils/ErrorHandler');
+ const { ErrorHandler } = await import('@/utils/logging/ErrorHandler');
expect(() => ErrorHandler('Test error')).not.toThrow();
});
});
diff --git a/tests/unit/smoke.test.js b/tests/unit/smoke.test.js
index 672958f7..7cd6d847 100644
--- a/tests/unit/smoke.test.js
+++ b/tests/unit/smoke.test.js
@@ -109,7 +109,7 @@ describe('Smoke Tests - Core Dependencies', () => {
});
it('should have config schema file', () => {
- const schemaPath = path.resolve(__dirname, '../../src/utils/ConfigSchema.json');
+ const schemaPath = path.resolve(__dirname, '../../src/utils/config/ConfigSchema.json');
expect(fs.existsSync(schemaPath)).toBe(true);
});
});