kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2577 from rejas/prettier

Browse Source
This commit is contained in:
Michael Teeuw 2021-05-29 16:22:52 +02:00 committed by GitHub
commit 32df76bdff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 68 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.prettierignore
View File

@ -1,5 +1,8 @@
package-lock.json /config
/config/**/* /coverage
/vendor/**/* /vendor
!/vendor/vendor.js !/vendor/vendor.js
.github/**/* .github
.nyc_output
package-lock.json
*.ts

1
CHANGELOG.md
View File

@ -48,6 +48,7 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel,
- Fix module updatenotification which did not work for repos with many refs (#1907) - Fix module updatenotification which did not work for repos with many refs (#1907)
- Fix config check failing when encountering let syntax ("Parsing error: Unexpected token config") - Fix config check failing when encountering let syntax ("Parsing error: Unexpected token config")
- Fix calendar debug check - Fix calendar debug check
- Really run prettier over all files
## [2.15.0] - 2021-04-01 ## [2.15.0] - 2021-04-01

100
index.html
View File

@ -1,55 +1,57 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>MagicMirror²</title> <title>MagicMirror²</title>
<meta name="google" content="notranslate" /> <meta name="google" content="notranslate" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no" />
<meta name="mobile-web-app-capable" content="yes"> <meta name="mobile-web-app-capable" content="yes" />
<link rel="icon" href="data:;base64,iVBORw0KGgo="> <link rel="icon" href="data:;base64,iVBORw0KGgo=" />
<link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/main.css" />
<link rel="stylesheet" type="text/css" href="fonts/roboto.css"> <link rel="stylesheet" type="text/css" href="fonts/roboto.css" />
<!-- custom.css is loaded by the loader.js to make sure it's loaded after the module css files. --> <!-- custom.css is loaded by the loader.js to make sure it's loaded after the module css files. -->
<script type="text/javascript"> <script type="text/javascript">
var version = "#VERSION#"; var version = "#VERSION#";
</script> </script>
</head> </head>
<body> <body>
<div class="region fullscreen below"><div class="container"></div></div> <div class="region fullscreen below"><div class="container"></div></div>
<div class="region top bar"> <div class="region top bar">
<div class="container"></div> <div class="container"></div>
<div class="region top left"><div class="container"></div></div> <div class="region top left"><div class="container"></div></div>
<div class="region top center"><div class="container"></div></div> <div class="region top center"><div class="container"></div></div>
<div class="region top right"><div class="container"></div></div> <div class="region top right"><div class="container"></div></div>
</div> </div>
<div class="region upper third"><div class="container"></div></div> <div class="region upper third"><div class="container"></div></div>
<div class="region middle center"><div class="container"></div></div> <div class="region middle center"><div class="container"></div></div>
<div class="region lower third"><div class="container"><br/></div></div> <div class="region lower third">
<div class="region bottom bar"> <div class="container"><br /></div>
<div class="container"></div> </div>
<div class="region bottom left"><div class="container"></div></div> <div class="region bottom bar">
<div class="region bottom center"><div class="container"></div></div> <div class="container"></div>
<div class="region bottom right"><div class="container"></div></div> <div class="region bottom left"><div class="container"></div></div>
</div> <div class="region bottom center"><div class="container"></div></div>
<div class="region fullscreen above"><div class="container"></div></div> <div class="region bottom right"><div class="container"></div></div>
<script type="text/javascript" src="socket.io/socket.io.js"></script> </div>
<script type="text/javascript" src="vendor/node_modules/nunjucks/browser/nunjucks.min.js"></script> <div class="region fullscreen above"><div class="container"></div></div>
<script type="text/javascript" src="js/defaults.js"></script> <script type="text/javascript" src="socket.io/socket.io.js"></script>
<script type="text/javascript" src="#CONFIG_FILE#"></script> <script type="text/javascript" src="vendor/node_modules/nunjucks/browser/nunjucks.min.js"></script>
<script type="text/javascript" src="vendor/vendor.js"></script> <script type="text/javascript" src="js/defaults.js"></script>
<script type="text/javascript" src="modules/default/defaultmodules.js"></script> <script type="text/javascript" src="#CONFIG_FILE#"></script>
<script type="text/javascript" src="js/logger.js"></script> <script type="text/javascript" src="vendor/vendor.js"></script>
<script type="text/javascript" src="translations/translations.js"></script> <script type="text/javascript" src="modules/default/defaultmodules.js"></script>
<script type="text/javascript" src="js/translator.js"></script> <script type="text/javascript" src="js/logger.js"></script>
<script type="text/javascript" src="js/class.js"></script> <script type="text/javascript" src="translations/translations.js"></script>
<script type="text/javascript" src="js/module.js"></script> <script type="text/javascript" src="js/translator.js"></script>
<script type="text/javascript" src="js/loader.js"></script> <script type="text/javascript" src="js/class.js"></script>
<script type="text/javascript" src="js/socketclient.js"></script> <script type="text/javascript" src="js/module.js"></script>
<script type="text/javascript" src="js/main.js"></script> <script type="text/javascript" src="js/loader.js"></script>
</body> <script type="text/javascript" src="js/socketclient.js"></script>
<script type="text/javascript" src="js/main.js"></script>
</body>
</html> </html>

14
modules/default/weather/weather.js
View File

@ -33,7 +33,7 @@ Module.register("weather", {
showIndoorHumidity: false, showIndoorHumidity: false,
maxNumberOfDays: 5, maxNumberOfDays: 5,
maxEntries: 5, maxEntries: 5,
ignoreToday: false, ignoreToday: false,
fade: true, fade: true,
fadePoint: 0.25, // Start on 1/4th of the list. fadePoint: 0.25, // Start on 1/4th of the list.
initialLoadDelay: 0, // 0 seconds delay initialLoadDelay: 0, // 0 seconds delay
@ -130,12 +130,12 @@ Module.register("weather", {
// Add all the data to the template. // Add all the data to the template.
getTemplateData: function () { getTemplateData: function () {
const forecast = this.weatherProvider.weatherForecast() const forecast = this.weatherProvider.weatherForecast();
if (this.config.ignoreToday) {
forecast.splice(0, 1);
}
if (this.config.ignoreToday) {
forecast.splice(0, 1)
}
return { return {
config: this.config, config: this.config,
current: this.weatherProvider.currentWeather(), current: this.weatherProvider.currentWeather(),
@ -268,7 +268,7 @@ Module.register("weather", {
this.nunjucksEnvironment().addFilter( this.nunjucksEnvironment().addFilter(
"calcNumEntries", "calcNumEntries",
function (dataArray) { function (dataArray) {
return Math.min(dataArray.length, this.config.maxEntries); return Math.min(dataArray.length, this.config.maxEntries);
}.bind(this) }.bind(this)
); );

4
package.json
View File

@ -14,12 +14,12 @@
"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text mocha tests --recursive --timeout=3000", "test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text mocha tests --recursive --timeout=3000",
"test:e2e": "NODE_ENV=test mocha tests/e2e --recursive", "test:e2e": "NODE_ENV=test mocha tests/e2e --recursive",
"test:unit": "NODE_ENV=test mocha tests/unit --recursive", "test:unit": "NODE_ENV=test mocha tests/unit --recursive",
"test:prettier": "prettier --check **/*.{js,css,json,md,yml}", "test:prettier": "prettier . --check",
"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet", "test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
"test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json", "test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
"test:calendar": "node ./modules/default/calendar/debug.js", "test:calendar": "node ./modules/default/calendar/debug.js",
"config:check": "node js/check_config.js", "config:check": "node js/check_config.js",
"lint:prettier": "prettier --write **/*.{js,css,json,md,yml}", "lint:prettier": "prettier . --write",
"lint:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix", "lint:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix",
"lint:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix", "lint:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix",
"lint:staged": "pretty-quick --staged", "lint:staged": "pretty-quick --staged",