mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-05-09 14:18:33 +00:00
## Release Notes Thanks to: @cgillinger, @khassel, @KristjanESPERANTO, @sonnyb9 > ⚠️ This release needs nodejs version >=22.21.1 <23 || >=24 (no change to previous release) [Compare to previous Release v2.35.0](https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.35.0...v2.36.0) This release falls outside the quarterly schedule. We opted for an early release due to: - Security fix for the internal cors proxy - API change of the weather provider smi - Several bug fixes ### Breaking Changes The cors proxy is now disabled by default. If required, it must be explicitly enabled in the `config.js` file. See the [documentation](https://docs.magicmirror.builders/configuration/cors.html). ### ⚠️ Security You can find several publicly accessible MagicMirror² instances. This should never be done. Doing so makes your entire configuration, including secrets and API keys, publicly visible. Furthermore, it allows attackers to target the host; this is only prevented beginning with this release. Public MagicMirror² instances should always run behind a reverse proxy with authentication. ### [core] - Prepare Release 2.36.0 (#4126) - Allow HTTPFetcher to pass through 304 responses (#4120) - fix(http-fetcher): fall back to reloadInterval after retries exhausted (#4113) - config endpoint must handle functions in module configs (#4106) - fix replaceSecretPlaceholder (#4104) - restrict replaceSecretPlaceholder to cors with allowWhitelist (#4102) - fix: prevent crash when config is undefined in socket handler (#4096) - fix cors function for alpine linux (#4091) - fix(cors): prevent SSRF via DNS rebinding (#4090) - add option to disable or restrict cors endpoint (#4087) - fix: prevent SSRF via /cors endpoint by blocking private/reserved IPs (#4084) - chore: add permissions section to enforce pull-request rules workflow (#4079) - update version for develop ### [dependencies] - update dependencies (#4124) - chore: update dependencies (#4088) - refactor: enable ESLint rule "no-unused-vars" and handle related issues (#4080) ### [modules/newsfeed] - fix(newsfeed): prevent duplicate parse error callback when using pipeline (#4083) ### [modules/updatenotification] - fix(updatenotification): harden git command execution + simplify checkUpdates (#4115) - fix(tests): correct import path for git_helper module in updatenotification tests (#4078) ### [modules/weather] - fix(weather): use nearest openmeteo hourly data (#4123) - fix(weather): avoid loading state after reconnect (#4121) - weather: fix UV index display and add WeatherFlow precipitation (#4108) - fix(weather): restore OpenWeatherMap v2.5 support (#4101) - fix(weather): use stable instanceId to prevent duplicate fetchers (#4092) - SMHI: migrate to SNOW1gv1 API (replace deprecated PMP3gv2) (#4082) ### [testing] - ci(actions): set explicit token permissions (#4114) - fix(http_fetcher): use undici.fetch when dispatcher is present (#4097) - ci(codeql): also scan develop branch on push and PR (#4086) - refactor: replace implicit global config with explicit global.config (#4085) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <gitkraken@veeck.de> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: DevIncomin <56730075+Developer-Incoming@users.noreply.github.com> Co-authored-by: Nathan <n8nyoung@gmail.com> Co-authored-by: mixasgr <mixasgr@users.noreply.github.com> Co-authored-by: Savvas Adamtziloglou <savvas-gr@greeklug.gr> Co-authored-by: Konstantinos <geraki@gmail.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: BugHaver <43462320+bughaver@users.noreply.github.com> Co-authored-by: BugHaver <43462320+lsaadeh@users.noreply.github.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: Koen Konst <koenspero@gmail.com> Co-authored-by: Koen Konst <c.h.konst@avisi.nl> Co-authored-by: dathbe <github@beffa.us> Co-authored-by: Marcel <m-idler@users.noreply.github.com> Co-authored-by: Kevin G. <crazylegstoo@gmail.com> Co-authored-by: Jboucly <33218155+jboucly@users.noreply.github.com> Co-authored-by: Jboucly <contact@jboucly.fr> Co-authored-by: Jarno <54169345+jarnoml@users.noreply.github.com> Co-authored-by: Jordan Welch <JordanHWelch@gmail.com> Co-authored-by: Blackspirits <blackspirits@gmail.com> Co-authored-by: Samed Ozdemir <samed@xsor.io> Co-authored-by: in-voker <58696565+in-voker@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com> Co-authored-by: cgillinger <christian.gillinger@gmail.com> Co-authored-by: Sonny B <43247590+sonnyb9@users.noreply.github.com> Co-authored-by: sonnyb9 <sonnyb9@users.noreply.github.com>
98 lines
4.2 KiB
Plaintext
98 lines
4.2 KiB
Plaintext
{% macro humidity() %}
|
|
{% if current.humidity %}
|
|
<span class="humidity"
|
|
><span>{{ current.humidity | decimalSymbol }}</span><sup> <i class="wi wi-humidity humidity-icon"></i></sup
|
|
></span>
|
|
{% endif %}
|
|
{% endmacro %}
|
|
{% if current %}
|
|
{% if not config.onlyTemp %}
|
|
<div class="normal medium">
|
|
<span class="wi wi-strong-wind dimmed"></span>
|
|
<span>
|
|
{{ current.windSpeed | unit("wind") | round }}
|
|
{% if config.showWindDirection %}
|
|
<sup>
|
|
{% if config.showWindDirectionAsArrow %}
|
|
<i class="fas fa-long-arrow-alt-down" style="transform:rotate({{ current.windFromDirection }}deg)"></i>
|
|
{% else %}
|
|
{{ current.cardinalWindDirection() | translate }}
|
|
{% endif %}
|
|
|
|
</sup>
|
|
{% endif %}
|
|
</span>
|
|
{% if config.showHumidity === "wind" %}
|
|
{{ humidity() }}
|
|
{% endif %}
|
|
{% if config.showSun and current.nextSunAction() %}
|
|
<span class="wi dimmed wi-{{ current.nextSunAction() }}"></span>
|
|
<span>
|
|
{% if current.nextSunAction() === "sunset" %}
|
|
{{ current.sunset | formatTime }}
|
|
{% else %}
|
|
{{ current.sunrise | formatTime }}
|
|
{% endif %}
|
|
</span>
|
|
{% endif %}
|
|
{% if config.showUVIndex %}
|
|
<td class="align-right bright uv-index">
|
|
<div class="wi dimmed wi-hot"></div>
|
|
{{ current.uvIndex }}
|
|
</td>
|
|
{% endif %}
|
|
</div>
|
|
{% endif %}
|
|
<div class="flex large type-temp">
|
|
{% if config.showIndoorTemperature and indoor.temperature or config.showIndoorHumidity and indoor.humidity %}
|
|
<span class="medium fas fa-home"></span>
|
|
<span style="display: inline-block">
|
|
{% if config.showIndoorTemperature and indoor.temperature %}
|
|
<sup class="small" style="position: relative; display: block; text-align: left;">
|
|
<span> {{ indoor.temperature | roundValue | unit("temperature") | decimalSymbol }} </span>
|
|
</sup>
|
|
{% endif %}
|
|
{% if config.showIndoorHumidity and indoor.humidity %}
|
|
<sub class="small" style="position: relative; display: block; text-align: left;">
|
|
<span> {{ indoor.humidity | roundValue | unit("humidity") | decimalSymbol }} </span>
|
|
</sub>
|
|
{% endif %}
|
|
</span>
|
|
{% endif %}
|
|
{% if current.weatherType %}
|
|
<span class="light wi weathericon wi-{{ current.weatherType }}"></span>
|
|
{% endif %}
|
|
<span class="light bright">{{ current.temperature | roundValue | unit("temperature") | decimalSymbol }}</span>
|
|
{% if config.showHumidity === "temp" %}
|
|
<span class="medium bright">{{ humidity() }}</span>
|
|
{% endif %}
|
|
</div>
|
|
{% if (config.showFeelsLike or config.showPrecipitationAmount or config.showPrecipitationProbability) and not config.onlyTemp %}
|
|
<div class="normal medium feelslike">
|
|
{% if config.showFeelsLike %}
|
|
<span class="dimmed">
|
|
{% if config.showHumidity === "feelslike" %}
|
|
{{ humidity() }}
|
|
{% endif %}
|
|
{{ "FEELS" | translate({DEGREE: current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }) }}
|
|
</span>
|
|
<br />
|
|
{% endif %}
|
|
{% if config.showPrecipitationAmount and current.precipitationAmount is defined and current.precipitationAmount is not none %}
|
|
<span class="dimmed"> <span class="precipitationLeadText">{{ "PRECIP_AMOUNT" | translate }}</span> {{ current.precipitationAmount | unit("precip", current.precipitationUnits) }} </span>
|
|
<br />
|
|
{% endif %}
|
|
{% if config.showPrecipitationProbability and current.precipitationProbability is defined and current.precipitationProbability is not none %}
|
|
<span class="dimmed"> <span class="precipitationLeadText">{{ "PRECIP_POP" | translate }}</span> {{ current.precipitationProbability }}% </span>
|
|
{% endif %}
|
|
</div>
|
|
{% endif %}
|
|
{% if config.showHumidity === "below" %}
|
|
<span class="medium dimmed">{{ humidity() }}</span>
|
|
{% endif %}
|
|
{% else %}
|
|
<div class="dimmed light small">{{ "LOADING" | translate }}</div>
|
|
{% endif %}
|
|
<!-- Uncomment the line below to see the contents of the `current` object. -->
|
|
<!-- <div style="word-wrap:break-word" class="xsmall dimmed">{{ current | dump }}</div> -->
|