Lissy93/dashy
1
1
Fork 0
mirror of https://github.com/Lissy93/dashy.git synced 2024-12-24 01:12:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix issue being thrown when appConfig is undefined

Browse Source
This commit is contained in:
Alicia Sykes 2021-06-22 23:05:51 +01:00
parent 5d42d83c63
commit 23e14662e5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/utils/ConfigAccumalator.js
View File

@ -11,16 +11,17 @@ import conf from '../../public/conf.yml';
* Returns the appConfig section, as JSON
*/
export const appConfig = (() => {
const appConfigFile = conf.appConfig || {};
let usersAppConfig = Defaults.appConfig;
if (localStorage[localStorageKeys.APP_CONFIG]) {
usersAppConfig = JSON.parse(localStorage[localStorageKeys.APP_CONFIG]);
} else if (conf.appConfig) {
usersAppConfig = conf.appConfig;
} else if (appConfigFile !== {}) {
usersAppConfig = appConfigFile;
}
usersAppConfig.layout = localStorage[localStorageKeys.LAYOUT_ORIENTATION]
|| conf.appConfig.layout || Defaults.layout;
|| appConfigFile.layout || Defaults.layout;
usersAppConfig.iconSize = localStorage[localStorageKeys.ICON_SIZE]
|| conf.appConfig.iconSize || Defaults.iconSize;
|| appConfigFile.iconSize || Defaults.iconSize;
return usersAppConfig;
})();