Fix: Updated URLs

hoangsonww · Feb 23, 2024 · dddf555 · dddf555
1 parent 2dbebe5
commit dddf555
Show file tree

Hide file tree

Showing 27 changed files with 20 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 ./node_modules/
 
-./backend_django/myenv/lib/
+backend/myenv/lib/
 node_modules
-backend_django/myenv/lib/
+backend/myenv/lib/
diff --git a/404.html b/404.html
@@ -55,7 +55,7 @@
         <h1 id="my-heading">The WeatherMate App</h1>
         <div class="error-container">
             <h1>404</h1>
-            <p style="color: white">Oops! The page you're looking for can't be found.</p>
+            <p>Oops! The page you're looking for can't be found.</p>
             <a href="index.html" class="back-link">Back to Home</a>
         </div>
     </header>

diff --git a/backend_django/app.py → backend/app.py b/backend_django/app.py → backend/app.py
diff --git a/backend_django/backend_django/__init__.py → backend/backend_django/__init__.py b/backend_django/backend_django/__init__.py → backend/backend_django/__init__.py
diff --git a/backend_django/backend_django/asgi.py → backend/backend_django/asgi.py b/backend_django/backend_django/asgi.py → backend/backend_django/asgi.py
diff --git a/backend_django/backend_django/settings.py → backend/backend_django/settings.py b/backend_django/backend_django/settings.py → backend/backend_django/settings.py
diff --git a/backend_django/backend_django/urls.py → backend/backend_django/urls.py b/backend_django/backend_django/urls.py → backend/backend_django/urls.py
diff --git a/backend_django/backend_django/wsgi.py → backend/backend_django/wsgi.py b/backend_django/backend_django/wsgi.py → backend/backend_django/wsgi.py
diff --git a/databases/database.py → backend/databases/database.py b/databases/database.py → backend/databases/database.py
diff --git a/databases/database.sql → backend/databases/database.sql b/databases/database.sql → backend/databases/database.sql
diff --git a/backend_django/db.sqlite3 → backend/db.sqlite3 b/backend_django/db.sqlite3 → backend/db.sqlite3
diff --git a/flask/app.py → backend/flask/app.py b/flask/app.py → backend/flask/app.py
diff --git a/flask/back-end.py → backend/flask/back-end.py b/flask/back-end.py → backend/flask/back-end.py
diff --git a/flask/urls.py → backend/flask/urls.py b/flask/urls.py → backend/flask/urls.py
diff --git a/backend_django/manage.py → backend/manage.py b/backend_django/manage.py → backend/manage.py
diff --git a/backend_django/models.py → backend/models.py b/backend_django/models.py → backend/models.py
diff --git a/php/UserRegistration.php → backend/php/UserRegistration.php b/php/UserRegistration.php → backend/php/UserRegistration.php
diff --git a/php/UserUpdateProfile.php → backend/php/UserUpdateProfile.php b/php/UserUpdateProfile.php → backend/php/UserUpdateProfile.php
diff --git a/php/WeatherForecasts.php → backend/php/WeatherForecasts.php b/php/WeatherForecasts.php → backend/php/WeatherForecasts.php
diff --git a/php/config.php → backend/php/config.php b/php/config.php → backend/php/config.php
diff --git a/php/db_config.php → backend/php/db_config.php b/php/db_config.php → backend/php/db_config.php
diff --git a/php/userAuth.php → backend/php/userAuth.php b/php/userAuth.php → backend/php/userAuth.php
diff --git a/php/weatherDataFetch.php → backend/php/weatherDataFetch.php b/php/weatherDataFetch.php → backend/php/weatherDataFetch.php
diff --git a/backend_django/serializers.py → backend/serializers.py b/backend_django/serializers.py → backend/serializers.py
diff --git a/backend_django/urls.py → backend/urls.py b/backend_django/urls.py → backend/urls.py
diff --git a/backend_django/views.py → backend/views.py b/backend_django/views.py → backend/views.py
diff --git a/src/js/script.js b/src/js/script.js
@@ -65,6 +65,7 @@ async function displayAirQuality(lat, lon, visibility) {
     aqiElement.style.display = 'block';
 
     const aqiUrl = `https://api.openweathermap.org/data/2.5/air_pollution?lat=${lat}&lon=${lon}&appid=${weatherpath}`;
+
     try {
         const response = await fetch(aqiUrl, { origin: "cors" });
         const aqiData = await response.json();
@@ -75,11 +76,22 @@ async function displayAirQuality(lat, lon, visibility) {
         aqiElement.innerHTML = `
             <h3 class="aqi-text aqi-${aqi}">Air Quality Index: ${aqi} (${airQuality})</h3>
             <h3 style="color: black">Visibility: ${visibilityKm} km</h3>`;
-    } catch (error) {
+    }
+    catch (error) {
         aqiElement.innerHTML = 'Error loading data.';
     }
 }
 
+function updateBrowserURL(name) {
+    const nameSlug = createNameSlug(name);
+    const newURL = window.location.protocol + "//" + window.location.host + window.location.pathname + '?query=' + nameSlug;
+    window.history.replaceState({ path: newURL }, '', newURL);
+}
+
+function createNameSlug(name) {
+    return name.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '');
+}
+
 function createAQIDisplayElement() {
     const aqiElement = document.createElement("div");
     aqiElement.id = "aqi-display";
@@ -379,6 +391,8 @@ form.addEventListener("submit", (e) => {
         const subhead = document.getElementById("subhead");
         subhead.style.display = 'none';
     }
+
+    updateBrowserURL(city);
 });
 
 form.addEventListener("click", (e) => {
@@ -396,6 +410,8 @@ buttonSearch.addEventListener("click", (e) => {
         const subhead = document.getElementById("subhead");
         subhead.style.display = 'none';
     }
+
+    updateBrowserURL(city);
 });
 
 function closeAllPopups() {