path corrections

divinsmathew · May 19, 2021 · 48cee58 · 48cee58
1 parent fe3b26f
commit 48cee58
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/index.html b/index.html
@@ -9,6 +9,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="stylesheet" type="text/css" href="./css/styles.css">
   <title>CoWatch</title>
+
+  <script src="./js/cowatch.js" defer></script>
+  <script src="./js/districts.js" defer></script>
+  <script src="./js/utils.js"></script>
+  <script>let relativePath = getUrlParts(window.location.href).pathname.replace('index.html', '')</script>
 </head>
 
 <body onload="onload()">
@@ -138,9 +143,6 @@
       </table>
     </div>
   </div>
-  <script src="./js/cowatch.js"></script>
-  <script src="./js/districts.js"></script>
-  <script src="./js/utils.js"></script>
 </body>
 
 </html>
diff --git a/js/cowatch.js b/js/cowatch.js
@@ -32,7 +32,7 @@ async function onload()
         resetFilter()
         fillDistricts()
 
-        window.history.pushState('', '', "/index.html?districtId=" + districtsSelect.value)
+        window.history.pushState('', '', relativePath + "?districtId=" + districtsSelect.value)
         previousDetailsHtml = ''
         previousSessionCountMap.clear()
         refreshTable(true)
@@ -41,7 +41,7 @@ async function onload()
     districtsSelect.addEventListener('change', () =>
     {
         resetFilter()
-        window.history.pushState('', '', "/index.html?districtId=" + districtsSelect.value)
+        window.history.pushState('', '', relativePath + "?districtId=" + districtsSelect.value)
         previousDetailsHtml = ''
         previousSessionCountMap.clear()
         refreshTable(true)
@@ -52,7 +52,7 @@ async function onload()
     {
         if(!isNumeric(qDistrictId) || !states.find(s => s.districts.some(d => d.districtId == qDistrictId)))
         {
-            window.location.replace('/index.html')
+            window.location.replace(relativePath)
             return
         }
 

diff --git a/js/districts.js b/js/districts.js
@@ -50,8 +50,7 @@ function cleanName(name)
 
 async function buildAllDistrictIdMapLocal()
 {
-    let path = getUrlParts(window.location.href).pathname.replace('index.html','');
-    let endpoint = path + 'assets/districts.json'
+    let endpoint = relativePath + 'assets/districts.json'
 
     let response = await fetch(endpoint)
     let responseAsJson = await response.json()