From a50824eeee587ff6c07e0720dae38c4392cd13f7 Mon Sep 17 00:00:00 2001 From: buxxi Date: Mon, 28 Dec 2020 11:50:01 +0100 Subject: [PATCH 01/13] Merging config/.gitignore with .gitignore --- .gitignore | 4 ++++ CHANGELOG.md | 2 +- config/.gitignore | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 config/.gitignore diff --git a/.gitignore b/.gitignore index 08c2df0c..a0177025 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,10 @@ Temporary Items # Ignore changes to the custom css files. /css/custom.css +# Ignore users config file but keep the sample. +/config/* +!/config/config.js.sample + # Vim ## swap [._]*.s[a-w][a-z] diff --git a/CHANGELOG.md b/CHANGELOG.md index 7228c8b6..53d096ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ _This release is scheduled to be released on 2021-01-01._ - Added GitHub workflows for automated testing and changelog enforcement. ### Updated - +- Merging .gitignore in the config-folder with the .gitignore in the root-folder. - Weather module - forecast now show TODAY and TOMORROW instead of weekday, to make it easier to understand. - Update dependencies to latest versions. - Update dependencies eslint, feedme, simple-git and socket.io to latest versions. diff --git a/config/.gitignore b/config/.gitignore deleted file mode 100644 index d85e3bd4..00000000 --- a/config/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!config.js.sample From e5ff320591e5ca3585c48ef885b8d94df94f3f13 Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Mon, 28 Dec 2020 08:15:40 -0600 Subject: [PATCH 02/13] fix package.json for optional dependency --- CHANGELOG.md | 1 + package.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7228c8b6..3831093a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ _This release is scheduled to be released on 2021-01-01._ - Fix Default Alert Module does not hide black overlay when alert is dismissed manually. (#2228) - Weather module - Always displays night icons when local is other then English. (#2221) - update Node-ical 0.12.4 , fix invalid RRULE format in cal entries +- fix package.json for optional electron dependency (2378) ## [2.13.0] - 2020-10-01 diff --git a/package.json b/package.json index 6da3538c..2298f95c 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,6 @@ "dependencies": { "colors": "^1.4.0", "console-stamp": "^3.0.0-rc4.2", - "electron": "^8.5.3", "eslint": "^7.15.0", "express": "^4.17.1", "express-ipfilter": "^1.1.2", From 0975826457c3f1e36fc4dbc1b7cc77586199fd19 Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Mon, 28 Dec 2020 08:24:19 -0600 Subject: [PATCH 03/13] update node-ical version --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3831093a..152b7a7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ _This release is scheduled to be released on 2021-01-01._ - Weather module - Always displays night icons when local is other then English. (#2221) - update Node-ical 0.12.4 , fix invalid RRULE format in cal entries - fix package.json for optional electron dependency (2378) +- update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379) ## [2.13.0] - 2020-10-01 diff --git a/package.json b/package.json index 2298f95c..551a00b1 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "iconv-lite": "^0.6.2", "module-alias": "^2.2.2", "moment": "^2.29.1", - "node-ical": "^0.12.4", + "node-ical": "^0.12.5", "request": "^2.88.2", "rrule": "^2.6.6", "rrule-alt": "^2.2.8", From 07e75b85505ad6cfd7707d719eb04e6aeeeb0c8d Mon Sep 17 00:00:00 2001 From: rejas Date: Tue, 29 Dec 2020 10:21:50 +0100 Subject: [PATCH 04/13] Adjust log level in sample --- config/config.js.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.js.sample b/config/config.js.sample index 55e84cb4..eb79b9d6 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -28,7 +28,7 @@ var config = { httpsCertificate: "", // HTTPS Certificate path, only require when useHttps is true language: "en", - logLevel: ["DEBUG", "INFO", "LOG", "WARN", "ERROR"], + logLevel: ["INFO", "LOG", "WARN", "ERROR"], // Add "DEBUG" for even more logging timeFormat: 24, units: "metric", // serverOnly: true/false/"local" , From 7802e0bb88fa4c36a71962fba7da9a82e7f0b674 Mon Sep 17 00:00:00 2001 From: rejas Date: Tue, 29 Dec 2020 10:23:12 +0100 Subject: [PATCH 05/13] Set locationID everywhere on config sample --- config/config.js.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.js.sample b/config/config.js.sample index eb79b9d6..648a8ef6 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -70,7 +70,7 @@ var config = { position: "top_right", config: { location: "New York", - locationID: "", //ID from http://bulk.openweathermap.org/sample/city.list.json.gz; unzip the gz file and find your city + locationID: "5128581", //ID from http://bulk.openweathermap.org/sample/city.list.json.gz; unzip the gz file and find your city appid: "YOUR_OPENWEATHER_API_KEY" } }, From 30cf7f8afeb1d9da0aafa9942d8b9561e1e644e5 Mon Sep 17 00:00:00 2001 From: rejas Date: Tue, 29 Dec 2020 10:23:57 +0100 Subject: [PATCH 06/13] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7228c8b6..d4768f45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ _This release is scheduled to be released on 2021-01-01._ - Update dependencies to latest versions. - Update dependencies eslint, feedme, simple-git and socket.io to latest versions. - Update lithuanian translation. +- Update config sample. ### Deleted From dd23db0ad87adcb46cadaeb667e8dec82aacf1e9 Mon Sep 17 00:00:00 2001 From: buxxi Date: Tue, 29 Dec 2020 12:43:40 +0100 Subject: [PATCH 07/13] Running prettier for CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53d096ae..d3c070e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ _This release is scheduled to be released on 2021-01-01._ - Added GitHub workflows for automated testing and changelog enforcement. ### Updated + - Merging .gitignore in the config-folder with the .gitignore in the root-folder. - Weather module - forecast now show TODAY and TOMORROW instead of weekday, to make it easier to understand. - Update dependencies to latest versions. From 67bedf864808958d92cb0f0dc702c0418126caa2 Mon Sep 17 00:00:00 2001 From: rejas Date: Thu, 23 Apr 2020 07:24:20 +0200 Subject: [PATCH 08/13] Add missing function () --- js/module.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/js/module.js b/js/module.js index 40f9b311..28291a84 100644 --- a/js/module.js +++ b/js/module.js @@ -429,15 +429,10 @@ var Module = Class.extend({ options = options || {}; var self = this; - MM.showModule( - this, - speed, - function () { - self.resume(); - callback; - }, - options - ); + MM.showModule(this, speed, function () { + self.resume(); + callback(); + }, options); } }); From efafb1c28a8cebe4fc480a429f051c83f8f68882 Mon Sep 17 00:00:00 2001 From: rejas Date: Tue, 29 Dec 2020 18:48:45 +0100 Subject: [PATCH 09/13] Cleanup jsdoc --- js/module.js | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/js/module.js b/js/module.js index 28291a84..d52eb02b 100644 --- a/js/module.js +++ b/js/module.js @@ -228,7 +228,7 @@ var Module = Class.extend({ * Set the module config and combine it with the module defaults. * * @param {object} config The combined module config. - * @param {boolean} config Merge module config in deep. + * @param {boolean} deep Merge module config in deep. */ setConfig: function (config, deep) { this.config = deep ? configMerge({}, this.defaults, config) : Object.assign({}, this.defaults, config); @@ -429,20 +429,27 @@ var Module = Class.extend({ options = options || {}; var self = this; - MM.showModule(this, speed, function () { - self.resume(); - callback(); - }, options); + MM.showModule( + this, + speed, + function () { + self.resume(); + callback(); + }, + options + ); } }); -/** Merging MagicMirror (or other) default/config script - * merge 2 objects or/with array - * using: +/** + * Merging MagicMirror (or other) default/config script by @bugsounet + * Merge 2 objects or/with array + * + * Usage: * ------- * this.config = configMerge({}, this.defaults, this.config) * ------- - * arg1: initial objet + * arg1: initial object * arg2: config model * arg3: config to merge * ------- @@ -451,10 +458,12 @@ var Module = Class.extend({ * it don't merge all thing in deep * -> object in object and array is not merging * ------- - * @bugsounet - * @Todo: idea of Mich determinate what do you want to merge or not + * + * Todo: idea of Mich determinate what do you want to merge or not + * + * @param {object} result the initial object + * @returns {object} the merged config */ - function configMerge(result) { var stack = Array.prototype.slice.call(arguments, 1); var item; From 3fcbf159155c233450e11c7bbea2ffb8a9fa915f Mon Sep 17 00:00:00 2001 From: rejas Date: Tue, 29 Dec 2020 18:50:10 +0100 Subject: [PATCH 10/13] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09d887bb..d950b549 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ _This release is scheduled to be released on 2021-01-01._ - update Node-ical 0.12.4 , fix invalid RRULE format in cal entries - fix package.json for optional electron dependency (2378) - update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379) +- Added missing function call in module.show() ## [2.13.0] - 2020-10-01 From 7a4eddc592615361768b1d6e3ab8884502640ecf Mon Sep 17 00:00:00 2001 From: rejas Date: Sat, 20 Jun 2020 12:07:04 +0200 Subject: [PATCH 11/13] Adjust some log levels --- js/check_config.js | 2 +- js/server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/check_config.js b/js/check_config.js index 2bab5220..c9bfe442 100644 --- a/js/check_config.js +++ b/js/check_config.js @@ -46,7 +46,7 @@ function checkConfigFile() { try { fs.accessSync(configFileName, fs.F_OK); } catch (e) { - Log.log(Utils.colors.error(e)); + Log.error(Utils.colors.error(e)); throw new Error("No permission to access config file!"); } diff --git a/js/server.js b/js/server.js index b0ae9528..cd26190b 100644 --- a/js/server.js +++ b/js/server.js @@ -37,7 +37,7 @@ var Server = function (config, callback) { server.listen(port, config.address ? config.address : "localhost"); if (config.ipWhitelist instanceof Array && config.ipWhitelist.length === 0) { - Log.info(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs")); + Log.warn(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs")); } app.use(function (req, res, next) { From 61cf92c67a72d30aa46fd01645411b6866465003 Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Tue, 29 Dec 2020 21:10:50 +0100 Subject: [PATCH 12/13] removes undefined objects from modules array, see issue #2382 --- CHANGELOG.md | 1 + js/main.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09d887bb..a35867fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ _This release is scheduled to be released on 2021-01-01._ - update Node-ical 0.12.4 , fix invalid RRULE format in cal entries - fix package.json for optional electron dependency (2378) - update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379) +- remove undefined objects from modules array (#2382) ## [2.13.0] - 2020-10-01 diff --git a/js/main.js b/js/main.js index 9d241a07..dfcf3e04 100644 --- a/js/main.js +++ b/js/main.js @@ -502,7 +502,7 @@ var MM = (function () { modules = []; for (var m in moduleObjects) { var module = moduleObjects[m]; - modules[module.data.index] = module; + modules[m] = module; } Log.info("All modules started!"); From e507f95b2a8e6eea4b03bf8d13ef2e1248e3b8dc Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Tue, 29 Dec 2020 21:45:35 +0100 Subject: [PATCH 13/13] added suggestion from @rejas --- js/main.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/js/main.js b/js/main.js index dfcf3e04..b7138d99 100644 --- a/js/main.js +++ b/js/main.js @@ -500,10 +500,7 @@ var MM = (function () { */ modulesStarted: function (moduleObjects) { modules = []; - for (var m in moduleObjects) { - var module = moduleObjects[m]; - modules[m] = module; - } + moduleObjects.forEach((module) => modules.push(module)); Log.info("All modules started!"); sendNotification("ALL_MODULES_STARTED");