mirror of https://github.com/Lissy93/dashy.git
🔀 Merge pull request #1369 from sachahjkl/fix/weather
fix(weather forecast): updated widget Fixes #1321
This commit is contained in:
commit
56bd835ccc
|
@ -99,7 +99,7 @@ export default {
|
||||||
icon: day.weather[0].icon,
|
icon: day.weather[0].icon,
|
||||||
main: day.weather[0].main,
|
main: day.weather[0].main,
|
||||||
description: day.weather[0].description,
|
description: day.weather[0].description,
|
||||||
temp: this.processTemp(day.temp.day),
|
temp: this.processTemp(day.main.temp),
|
||||||
info: this.makeWeatherData(day),
|
info: this.makeWeatherData(day),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -109,15 +109,15 @@ export default {
|
||||||
makeWeatherData(data) {
|
makeWeatherData(data) {
|
||||||
return [
|
return [
|
||||||
[
|
[
|
||||||
{ label: 'Min Temp', value: this.processTemp(data.temp.min) },
|
{ label: 'Min Temp', value: this.processTemp(data.main.temp_min) },
|
||||||
{ label: 'Max Temp', value: this.processTemp(data.temp.max) },
|
{ label: 'Max Temp', value: this.processTemp(data.main.temp_max) },
|
||||||
{ label: 'Feels Like', value: this.processTemp(data.feels_like.day) },
|
{ label: 'Feels Like', value: this.processTemp(data.main.feels_like) },
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
{ label: 'Pressure', value: `${data.pressure}hPa` },
|
{ label: 'Pressure', value: `${data.main.pressure}hPa` },
|
||||||
{ label: 'Humidity', value: `${data.humidity}%` },
|
{ label: 'Humidity', value: `${data.main.humidity}%` },
|
||||||
{ label: 'wind', value: `${data.speed}${this.speedDisplayUnits}` },
|
{ label: 'wind', value: `${data.wind.speed}${this.speedDisplayUnits}` },
|
||||||
{ label: 'clouds', value: `${data.clouds}%` },
|
{ label: 'clouds', value: `${data.clouds.all}%` },
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
},
|
},
|
||||||
|
|
|
@ -247,7 +247,7 @@ module.exports = {
|
||||||
walletBalance: 'https://api.blockcypher.com/v1',
|
walletBalance: 'https://api.blockcypher.com/v1',
|
||||||
walletQrCode: 'https://www.bitcoinqrcodemaker.com/api',
|
walletQrCode: 'https://www.bitcoinqrcodemaker.com/api',
|
||||||
weather: 'https://api.openweathermap.org/data/2.5/weather',
|
weather: 'https://api.openweathermap.org/data/2.5/weather',
|
||||||
weatherForecast: 'https://api.openweathermap.org/data/2.5/forecast/daily',
|
weatherForecast: 'https://api.openweathermap.org/data/2.5/forecast',
|
||||||
xkcdComic: 'https://xkcd.vercel.app/',
|
xkcdComic: 'https://xkcd.vercel.app/',
|
||||||
},
|
},
|
||||||
/* URLs for web search engines */
|
/* URLs for web search engines */
|
||||||
|
|
Loading…
Reference in New Issue