starred/WeatherMaster
1
0 Fork 0
mirror of https://github.com/PranshulGG/WeatherMaster.git synced 2026-10-22 02:52:37 -05:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	app/src/main/assets/app/app.js
#	app/src/main/assets/pages/alertPage.html
This commit is contained in:
PranshulGG committed 2024-08-26 14:10:14 +05:30
2 parents 97f63a5fec af58d16478
commit e5c8bb4b77
2 files changed
+41 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

README.md
+36 -13
View File
@@ -4,26 +4,49 @@
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
> [!CAUTION]
> **Screenshots may differ from the current version.** <br>
> **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 🫠.**
> [!NOTE]
> **Screenshots may differ from the current version.**
| Current & 48hrs | Hourly prec & 8-days forecast| Radar & moon/sun| Current Conditions|
| :---: | :---: | :---: | :---: |
| <img src="preview/current.jpeg" style="width: 250px;"> | <img src="preview/rain_8_days.jpeg" style="width: 250px;"> | <img src="preview/map_sun_moon.png" style="width: 250px;"> | <img src="preview/details.png" style="width: 250px;"> |
<table style="width: 100%; border-collapse: collapse;">
<tr>
<th style="text-align: center; padding: 10px;">Current & 48hrs</th>
<th style="text-align: center; padding: 10px;">Hourly Precipitation & 8-Day Forecast</th>
<th style="text-align: center; padding: 10px;">Radar & Moon/Sun</th>
</tr>
<tr>
<td style="text-align: center;"><img src="preview/current.jpeg" style="width: 100%; max-width: 250px;"></td>
<td style="text-align: center;"><img src="preview/rain_8_days.jpeg" style="width: 100%; max-width: 250px;"></td>
<td style="text-align: center;"><img src="preview/map_sun_moon.png" style="width: 100%; max-width: 250px;"></td>
</tr>
<tr>
<th style="text-align: center; padding: 10px;">Current Conditions</th>
<th style="text-align: center; padding: 10px;">Air and UV Index</th>
<th style="text-align: center; padding: 10px;">Government Alerts</th>
</tr>
<tr>
<td style="text-align: center;"><img src="preview/details.png" style="width: 100%; max-width: 250px;"></td>
<td style="text-align: center;"><img src="preview/air_uv.jpeg" style="width: 100%; max-width: 250px;"></td>
<td style="text-align: center;"><img src="preview/gov_alert.png" style="width: 100%; max-width: 250px;"></td>
</tr>
<tr>
<th style="text-align: center; padding: 10px;">Moon Phases</th>
<th style="text-align: center; padding: 10px;">Settings</th>
<th style="text-align: center; padding: 10px;">Forecast Page</th>
</tr>
<tr>
<td style="text-align: center;"><img src="preview/moonphases.png" style="width: 100%; max-width: 250px;"></td>
<td style="text-align: center;"><img src="preview/settings.jpeg" style="width: 100%; max-width: 250px;"></td>
<td style="text-align: center;"><img src="preview/forecast_page.jpeg" style="width: 100%; max-width: 250px;"></td>
</tr>
</table>
| Air and UV index | Government alerts| Moon phases | Settings|
| :---: | :---: | :---: | :---: |
| <img src="preview/air_uv.jpeg" style="width: 250px;"> | <img src="preview/gov_alert.png" style="width: 250px;"> | <img src="preview/moonphases.png" style="width: 250px;"> | <img src="preview/settings.jpeg" style="width: 250px;"> |
| Forecast page |
| :---: |
| <img src="preview/forecast_page.jpeg" style="width: 250px;"> |
<br>
app/src/main/assets/modules/scroll.js
+5 -5
View File
@@ -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;