aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBastien Wirtz <bastien.wirtz@gmail.com>2021-10-25 13:17:30 -0700
committerGitHub <noreply@github.com>2021-10-25 13:17:30 -0700
commitb7480f632e65b0434c2acc63a171db7a99c7abc4 (patch)
treee5260c6c8ff7d15886be6cdb2ca1244ceec637e7
parentcf33747f4272baf124b99af9ed8efcca07d1d6b9 (diff)
parent9fce0ce5a5a2cce2d99c60cbd59def14156ebeef (diff)
downloadhomer-b7480f632e65b0434c2acc63a171db7a99c7abc4.tar.gz
homer-b7480f632e65b0434c2acc63a171db7a99c7abc4.tar.zst
homer-b7480f632e65b0434c2acc63a171db7a99c7abc4.zip
Merge pull request #316 from robinschneider/apikey
Fixes apikey inconsistency
-rw-r--r--docs/customservices.md2
-rw-r--r--src/components/services/OpenWeather.vue3
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/customservices.md b/docs/customservices.md
index 6d5f39b..3b3320d 100644
--- a/docs/customservices.md
+++ b/docs/customservices.md
@@ -43,7 +43,7 @@ The following configuration is available for the OpenWeatherMap service:
43- name: "Weather" 43- name: "Weather"
44 location: "Amsterdam" # your location. 44 location: "Amsterdam" # your location.
45 locationId: "2759794" # Optional: Specify OpenWeatherMap city ID for better accuracy 45 locationId: "2759794" # Optional: Specify OpenWeatherMap city ID for better accuracy
46 apiKey: "<---insert-api-key-here--->" # insert your own API key here. Request one from https://openweathermap.org/api. 46 apikey: "<---insert-api-key-here--->" # insert your own API key here. Request one from https://openweathermap.org/api.
47 units: "metric" # units to display temperature. Can be one of: metric, imperial, kelvin. Defaults to kelvin. 47 units: "metric" # units to display temperature. Can be one of: metric, imperial, kelvin. Defaults to kelvin.
48 background: "square" # choose which type of background you want behind the image. Can be one of: square, cicle, none. Defaults to none. 48 background: "square" # choose which type of background you want behind the image. Can be one of: square, cicle, none. Defaults to none.
49 type: "OpenWeather" 49 type: "OpenWeather"
diff --git a/src/components/services/OpenWeather.vue b/src/components/services/OpenWeather.vue
index 09ff76a..79d5e37 100644
--- a/src/components/services/OpenWeather.vue
+++ b/src/components/services/OpenWeather.vue
@@ -64,7 +64,8 @@ export default {
64 locationQuery = `q=${this.item.location}`; 64 locationQuery = `q=${this.item.location}`;
65 } 65 }
66 66
67 const url = `https://api.openweathermap.org/data/2.5/weather?${locationQuery}&appid=${this.item.apiKey}&units=${this.item.units}`; 67 const apiKey = this.item.apikey || this.item.apiKey;
68 const url = `https://api.openweathermap.org/data/2.5/weather?${locationQuery}&appid=${apiKey}&units=${this.item.units}`;
68 fetch(url) 69 fetch(url)
69 .then((response) => { 70 .then((response) => {
70 if (!response.ok) { 71 if (!response.ok) {