diff --git a/assets/css/style.css b/assets/css/style.css index 1979564..beedd67 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -24,14 +24,8 @@ body { .btn.btn-primary { background-color: rgb(87, 80, 117); color: white; -} - -/* set the search history button color -#searchHistory.list-group { - background-color: rgb(87, 80, 117); - color: white; border: none; -} */ +} /* set the 5-day forecast card color */ .card-0, diff --git a/assets/img/5-day.png b/assets/img/5-day.png index dfbce26..2aff4df 100644 Binary files a/assets/img/5-day.png and b/assets/img/5-day.png differ diff --git a/assets/img/information.png b/assets/img/information.png index c65ef47..5cb9c25 100644 Binary files a/assets/img/information.png and b/assets/img/information.png differ diff --git a/assets/img/search.png b/assets/img/search.png index 0734344..34da209 100644 Binary files a/assets/img/search.png and b/assets/img/search.png differ diff --git a/assets/img/weather.png b/assets/img/weather.png index 1f78c9e..94ca1b2 100644 Binary files a/assets/img/weather.png and b/assets/img/weather.png differ diff --git a/assets/scripts/script.js b/assets/scripts/script.js index 7a7095b..d4768dc 100644 --- a/assets/scripts/script.js +++ b/assets/scripts/script.js @@ -181,27 +181,33 @@ function viewCurrentWeather(city,legibleDate,weatherIcon,temp,windSpeed,humidity const extractedStringDate = partDate[0]; // display name of location, date and weather icon - cityDisplayandDate = `${extractedStringCity} (${extractedStringDate}) ${weatherIcon}`; + cityDisplayandDate = `${extractedStringCity} (${extractedStringDate})`; - // set current weather display to html card + // set current weather display to html container $('.current-card h5').text(cityDisplayandDate); + // display current weather icon + cityDisplayandWeatherIcon = `${weatherIcon}`; + + // set weather icon display to html container + $('.current-card #weather-icon').text(cityDisplayandWeatherIcon); + // display current temperature cityDisplayandTemp = `Temp: ${temp} °C`; - // set temperature display to html card + // set temperature display to html container $('.current-card #temp').text(cityDisplayandTemp); - // display wind speed + // display current wind speed cityDisplayandWind = `Wind: ${windSpeed} m/s`; - // set wind speed display to html card + // set wind speed display to html container $('.current-card #wind').text(cityDisplayandWind); - // display humidity + // display current humidity cityDisplayandHumidity = `Humidity: ${humidity} %`; - // set humidity display to html card + // set humidity display to html container $('.current-card #humidity').text(cityDisplayandHumidity); } diff --git a/index.html b/index.html index a5dac03..492651d 100644 --- a/index.html +++ b/index.html @@ -1,10 +1,13 @@ + + + Weather Dashboard @@ -43,6 +46,7 @@

Current Weather

City Name (Date) Weather-icon
+

Weather-icon

Temp: 0°C

Wind: 0 m/s

Humidity: 0%