From 632dfd450f0b04b359c17057af91a23b353cf66d Mon Sep 17 00:00:00 2001 From: Pranshul Date: Sat, 24 Aug 2024 13:27:57 +0530 Subject: [PATCH 1/7] Update app.js --- app/src/main/assets/app/app.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/assets/app/app.js b/app/src/main/assets/app/app.js index ebadd1a26..2f633e1d8 100644 --- a/app/src/main/assets/app/app.js +++ b/app/src/main/assets/app/app.js @@ -404,7 +404,7 @@ function loadSavedLocations() { const savedLocationItemLon = savedLocationItem.getAttribute('lon'); - const apiKeySaved = '120d979ba5b2d0780f51872890f5ad0b'; + const apiKeySaved = 'Keys here'; const apiUrlSaved = `https://api.openweathermap.org/data/2.5/weather?lat=${savedLocationItemLat}&lon=${savedLocationItemLon}&appid=${apiKeySaved}&units=metric`; @@ -626,7 +626,7 @@ function getCountryName(code) { function getWeather(city, latitude, longitude) { showLoader(); - const apiKey = '120d979ba5b2d0780f51872890f5ad0b'; + const apiKey = 'Keys here'; const apiUrl = `https://api.openweathermap.org/data/2.5/weather?lat=${latitude}&lon=${longitude}&appid=${apiKey}&units=metric`; setTimeout(() => { @@ -1117,7 +1117,7 @@ function getCurrentLocationWeather() { function getWeatherByCoordinates(latitude, longitude) { showLoader(); - const apiKey = '120d979ba5b2d0780f51872890f5ad0b'; + const apiKey = 'Keys here'; const apiUrl = `https://api.openweathermap.org/data/2.5/weather?lat=${latitude}&lon=${longitude}&appid=${apiKey}&units=metric`; @@ -1633,7 +1633,7 @@ function getColor(value, type) { function updateSunTrackProgress(latitude, longitude) { - const apiKey = '120d979ba5b2d0780f51872890f5ad0b'; + const apiKey = 'Keys here'; const apiUrl = `https://api.openweathermap.org/data/2.5/weather?lat=${latitude}&lon=${longitude}&appid=${apiKey}&units=metric`; fetch(apiUrl) From 431a8c85aa8754b360e28f70f759191e0c26dc87 Mon Sep 17 00:00:00 2001 From: Pranshul Date: Sat, 24 Aug 2024 13:29:46 +0530 Subject: [PATCH 2/7] Update alertPage.html --- app/src/main/assets/pages/alertPage.html | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/app/src/main/assets/pages/alertPage.html b/app/src/main/assets/pages/alertPage.html index 8bd4c6c7d..faf7ecded 100644 --- a/app/src/main/assets/pages/alertPage.html +++ b/app/src/main/assets/pages/alertPage.html @@ -235,22 +235,11 @@ const latAlerts = latDif; const lonAlerts = longDif; const apiKeysAlerts = [ - 'd94bcd435b62a031771c35633f9f310a', - '3b833dcd6aac36124a8a30e182224427', - 'dd1571a8ad3fd44555e8a5d66db01929', - '82005d27a116c2880c8f0fcb866998a0', - '279b4be6d54c8bf6ea9b12275a567156', - '7a02a834570055b013f9a14fd1b712ed', - '20f7632ffc2c022654e4093c6947b4f4', - '6557810176c36fac5f0db536711a6c52', - 'b190a0605344cc4f3af08d0dd473dd25', - 'b02af426a3fad0d92d3e0b32f9324cf0' +KEYS_ACCESS ]; const apiKeysCityName = [ - '7147cfac7299479da122684c73d9b80a', - '09713ffe266c4dfa99b98157dfd148f9', - '66f9ad95f6704259a376949eaa659e62' +KEYS_ACCESS ]; let alertApiKeyIndex = 0; @@ -437,4 +426,4 @@ handleAlerts(); - \ No newline at end of file + From bc209605e60ff23c1eac940fd615a0cd9ff6db48 Mon Sep 17 00:00:00 2001 From: Pranshul Date: Sat, 24 Aug 2024 16:04:24 +0530 Subject: [PATCH 3/7] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 5623c13d8..40d38f62d 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ WeatherMaster is developed with pure HTML, CSS, JavaScript, and Java. Designed t # 👁️ Preview > [!CAUTION] -> **Screenshots may differ from the current version.**
-> **Issue: The app may not load the weather if the API request limit is exceeded; you will have to wait until it resets. The app switches APIs up to 5 times, one for each request 🫠.** +> **Screenshots may differ from the current version.** | Current & 48hrs | Hourly prec & 8-days forecast| Radar & moon/sun| Current Conditions| From 07fb35e555573db67162b9d28903b95ee4240aef Mon Sep 17 00:00:00 2001 From: Pranshul Date: Sat, 24 Aug 2024 16:04:42 +0530 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 40d38f62d..7ef4bc98a 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ WeatherMaster is developed with pure HTML, CSS, JavaScript, and Java. Designed t # 👁️ Preview -> [!CAUTION] +> [!NOTE] > **Screenshots may differ from the current version.** From d6bafdd15654779e01893b14754200928bdd0033 Mon Sep 17 00:00:00 2001 From: Pranshul Date: Sat, 24 Aug 2024 19:57:29 +0530 Subject: [PATCH 5/7] Update README.md --- README.md | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7ef4bc98a..513c17460 100644 --- a/README.md +++ b/README.md @@ -12,17 +12,41 @@ WeatherMaster is developed with pure HTML, CSS, JavaScript, and Java. Designed t > **Screenshots may differ from the current version.** -| Current & 48hrs | Hourly prec & 8-days forecast| Radar & moon/sun| Current Conditions| -| :---: | :---: | :---: | :---: | -| | | | | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Current & 48hrsHourly Precipitation & 8-Day ForecastRadar & Moon/Sun
Current ConditionsAir and UV IndexGovernment Alerts
Moon PhasesSettingsForecast Page
+ -| Air and UV index | Government alerts| Moon phases | Settings| -| :---: | :---: | :---: | :---: | -| | | | | -| Forecast page | -| :---: | -| |
From dbb7d7e338adcb50e9d01a2edcdafcf64553d0d5 Mon Sep 17 00:00:00 2001 From: Pranshul Date: Sun, 25 Aug 2024 12:40:36 +0530 Subject: [PATCH 6/7] Update scroll.js --- app/src/main/assets/modules/scroll.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/assets/modules/scroll.js b/app/src/main/assets/modules/scroll.js index c8d7f9b59..c69560945 100644 --- a/app/src/main/assets/modules/scroll.js +++ b/app/src/main/assets/modules/scroll.js @@ -18,13 +18,13 @@ weatherWrap.addEventListener('scroll', function() { mainWeat.style.opacity = newOpacity; document.querySelector('.froggie').style.opacity = newOpacity; - if(scrollPosition > 100){ - document.querySelector('.header-top').classList.add('use'); + if(scrollPosition > 100){ + document.querySelector('.header-top').classList.add('use'); - } else{ - document.querySelector('.header-top').classList.remove('use'); + } else{ + document.querySelector('.header-top').classList.remove('use'); - } + } ticking = false; }); ticking = true; From af58d1647830824785a692eca5688cdf1edd0a1d Mon Sep 17 00:00:00 2001 From: Pranshul Date: Mon, 26 Aug 2024 14:02:37 +0530 Subject: [PATCH 7/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 513c17460..54379d852 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ WeatherMaster is developed with pure HTML, CSS, JavaScript, and Java. Designed to mimic the look and feel of a native Android app. -`(Last updated on 08-24-2024 at 7:38 AM UTC)` +`(Last updated on 08-26-2024 at 8:32 AM UTC)` # 👁️ Preview