Skip to content

Commit 1cd5ff0

Browse files
khasselkhassel
committed
fix failing tests
1 parent 0ae8203 commit 1cd5ff0

File tree

5 files changed

+45
-32
lines changed

5 files changed

+45
-32
lines changed

‎cspell.config.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"myclass",
3737
"mycroft",
3838
"mymodule",
39+
"myweathertemplate",
3940
"newpos",
4041
"newsfeed",
4142
"nohup",
@@ -57,6 +58,7 @@
5758
"RGBA",
5859
"sdetweil",
5960
"serveronly",
61+
"Skycons",
6062
"Slutar",
6163
"SMHI",
6264
"stationid",
@@ -73,6 +75,7 @@
7375
"UKMO",
7476
"updatenotification",
7577
"verjaardag",
78+
"weatherapi",
7679
"Weatherbit",
7780
"Weatherflow",
7881
"weathergov",

‎index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ web server or browser installs necessary!
4343
**New to the concept?** A MagicMirror is a regular display placed behind a
4444
two-way mirror. The screen shines through the glass while everything else stays
4545
reflective – turning an ordinary mirror into a smart display. This documentation
46-
covers the **software** side only – for the **hardware** side (mirror, frame, mounting)
47-
things are highly individual and best explored through the
46+
covers the **software** side only – for the **hardware** side (mirror, frame,
47+
mounting) things are highly individual and best explored through the
4848
[community showcase](https://forum.magicmirror.builders/category/12/show-your-mirror)
4949
where others share their builds and setups. Have questions or ideas?
5050
[Join the forum](https://forum.magicmirror.builders/).

‎module-development/node-helper.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ this.expressApp.use("/" + this.name, express.static(this.path + "/public"));
5858
```
5959

6060
This means files in the `public` folder are only served if the module has a
61-
`node_helper.js`. See also the
62-
[module structure](introduction.md#files) documentation.
61+
`node_helper.js`. See also the [module structure](introduction.md#files)
62+
documentation.
6363

6464
### `this.io`
6565

‎modules/compliments.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ To use this module, add it to the modules array in the `config/config.js` file:
2828

2929
The following properties can be configured:
3030

31-
| Option | Description |
32-
| --------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
33-
| `updateInterval` | How often does the compliment have to change? (Milliseconds) <br><br> **Possible values:** `1000` - `86400000` <br> **Default value:** `30000` (30 seconds) |
34-
| `fadeSpeed` | Speed of the update animation. (Milliseconds) <br><br> **Possible values:**`0` - `5000` <br> **Default value:** `4000` (4 seconds) |
35-
| `compliments` | The list of compliments. <br><br> **Possible values:** An object with four arrays: `morning`, `afternoon`, `evening` and `anytime`. See _compliment configuration_ below. <br> **Default value:** See _compliment configuration_ below. |
31+
| Option | Description |
32+
| --------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
33+
| `updateInterval` | How often does the compliment have to change? (Milliseconds) <br><br> **Possible values:** `1000` - `86400000` <br> **Default value:** `30000` (30 seconds) |
34+
| `fadeSpeed` | Speed of the update animation. (Milliseconds) <br><br> **Possible values:**`0` - `5000` <br> **Default value:** `4000` (4 seconds) |
35+
| `compliments` | The list of compliments. <br><br> **Possible values:** An object with four arrays: `morning`, `afternoon`, `evening` and `anytime`. See _compliment configuration_ below. <br> **Default value:** See _compliment configuration_ below. |
3636
| `remoteFile` | External file from which to load the compliments <br><br> **Possible values:** URL (starting with `http://` or `https://`) or a **relative path** to a JSON file containing compliments. A relative path is resolved relative to the compliments module directory (`modules/default/compliments/`), so a file placed in the MagicMirror root would be referenced as `"../../compliments.json"`. Absolute filesystem paths are not supported. <br><br> The JSON file must contain an object with at least one of the arrays: `morning`, `afternoon`, `evening`, `anytime`, `datetype` and/or `crontype`. <br> **Default value:** `null` (Do not load from file) |
37-
| `remoteFileRefreshInterval` | How often to reload the remote file, if remoteFile is specified. in ms <br> **Default value:** 0 <br> **Minimum value:** 15 minutes (15\*60\*1000) |
38-
| `classes` | Override the CSS classes of the div showing the compliments <br><br> **Default value:** `thin xlarge bright` |
39-
| `morningStartTime` | Time in hours (in 24 format), after which the mode of "morning" will begin <br> **Possible values:** `0` - `24` <br><br> **Default value:** `3` |
40-
| `morningEndTime` | Time in hours (in 24 format), after which the mode of "morning" will end <br> **Possible values:** `0` - `24` <br><br> **Default value:** `12` |
41-
| `afternoonStartTime` | Time in hours (in 24 format), after which the mode "afternoon" will begin <br> **Possible values:** `0` - `24` <br><br> **Default value:** `12` |
42-
| `afternoonEndTime` | Time in hours (in 24 format), after which the mode "afternoon" will end <br> **Possible values:** `0` - `24` <br><br> **Default value:** `17` |
43-
| `specialDayUnique` | Compliments configured with a date are by default added to the existing compliments list. Setting this option to `true` will show only your special day compliments on that day. See _Example use with date_ below <br><br> **Default value:** `false` |
37+
| `remoteFileRefreshInterval` | How often to reload the remote file, if remoteFile is specified. in ms <br> **Default value:** 0 <br> **Minimum value:** 15 minutes (15\*60\*1000) |
38+
| `classes` | Override the CSS classes of the div showing the compliments <br><br> **Default value:** `thin xlarge bright` |
39+
| `morningStartTime` | Time in hours (in 24 format), after which the mode of "morning" will begin <br> **Possible values:** `0` - `24` <br><br> **Default value:** `3` |
40+
| `morningEndTime` | Time in hours (in 24 format), after which the mode of "morning" will end <br> **Possible values:** `0` - `24` <br><br> **Default value:** `12` |
41+
| `afternoonStartTime` | Time in hours (in 24 format), after which the mode "afternoon" will begin <br> **Possible values:** `0` - `24` <br><br> **Default value:** `12` |
42+
| `afternoonEndTime` | Time in hours (in 24 format), after which the mode "afternoon" will end <br> **Possible values:** `0` - `24` <br><br> **Default value:** `17` |
43+
| `specialDayUnique` | Compliments configured with a date are by default added to the existing compliments list. Setting this option to `true` will show only your special day compliments on that day. See _Example use with date_ below <br><br> **Default value:** `false` |
4444

4545
All the rest of the time that does not fall into the
4646
morningStartTime-morningEndTime and afternoonStartTime-afternoonEndTime ranges

‎modules/weather.md‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,38 +34,48 @@ To use this module, add it to the modules array in the `config/config.js` file:
3434

3535
## Themes
3636

37-
Beginning with MagicMirror² `v2.35.0` we offer the use of themes. With this enhancement
38-
users must not create an own module if they only want to change the design of the module.
37+
Beginning with MagicMirror² `v2.35.0` we offer the use of themes. With this
38+
enhancement users must not create an own module if they only want to change the
39+
design of the module.
3940

4041
### Motivation
4142

42-
The number of weather modules is probably the highest in the MagicMirror² universe.
43+
The number of weather modules is probably the highest in the MagicMirror²
44+
universe.
4345

44-
For most, the focus is likely less on integrating a missing weather provider and more on the design.
46+
For most, the focus is likely less on integrating a missing weather provider and
47+
more on the design.
4548

4649
Weather Themes are designed to fill this gap.
4750

48-
Simply rely on the existing weather module, which robustly takes care of retrieving the data,
49-
and just focus on customizing the design.
51+
Simply rely on the existing weather module, which robustly takes care of
52+
retrieving the data, and just focus on customizing the design.
5053

5154
### Usage:
5255

5356
- create a theme directory under `modules`, e.g. `modules/myweathertemplate`.
54-
- create own files `current.njk`, `forecast.njk`, `hourly.njk` and `weather.css` in the new directory.
55-
As starting point you can copy the existing files (located at `defaultmodules/weather`).
56-
- set the configuration option `themeDir` to your new theme directory (e.g. `../../../modules/myweathertemplate`).
57+
- create own files `current.njk`, `forecast.njk`, `hourly.njk` and `weather.css`
58+
in the new directory. As starting point you can copy the existing files
59+
(located at `defaultmodules/weather`).
60+
- set the configuration option `themeDir` to your new theme directory (e.g.
61+
`../../../modules/myweathertemplate`).
5762

5863
For advanced users there are more options to customize the template:
59-
- you can define a function `window.initWeatherTheme(this)` which is called when starting the module.
60-
Insert own code here if you need to do additional stuff before start.
61-
- you can define a function `window.updateWeatherTheme(this)` for updating the dom with own code.
62-
- you can use custom scripts located in your theme directory which contain e.g. the 2 methods
63-
mentioned above or other stuff. Use the configuration option `themeCustomScripts` to load these scripts.
64+
65+
- you can define a function `window.initWeatherTheme(this)` which is called when
66+
starting the module. Insert own code here if you need to do additional stuff
67+
before start.
68+
- you can define a function `window.updateWeatherTheme(this)` for updating the
69+
dom with own code.
70+
- you can use custom scripts located in your theme directory which contain e.g.
71+
the 2 methods mentioned above or other stuff. Use the configuration option
72+
`themeCustomScripts` to load these scripts.
6473

6574
### Example
6675

67-
[MMT-WeatherSkycons](https://gitlab.com/khassel/MMT-WeatherSkycons) is probably the first weather theme for MagicMirror².
68-
It serves here as an example project to demonstrate the possibilities of the themes.
76+
[MMT-WeatherSkycons](https://gitlab.com/khassel/MMT-WeatherSkycons) is probably
77+
the first weather theme for MagicMirror². It serves here as an example project
78+
to demonstrate the possibilities of the themes.
6979

7080
## Configuration options
7181

0 commit comments

Comments
 (0)