sdfdsfs

longmetal7127 · Feb 29, 2024 · 3a6864e · 3a6864e
1 parent 7a4d476
commit 3a6864e
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 111 deletions.
diff --git a/index.html b/index.html
@@ -10,39 +10,21 @@
 	<link rel="stylesheet" href="css/index.css" />
 	<script src="js/dexie.js"></script>
 
-	<!-- <script>
+	<script>
 		// Check that service workers are supported
 		if ("serviceWorker" in navigator) {
 		// Use the window load event to keep the page load performant
 		window.addEventListener("load", () => {
 			navigator.serviceWorker.register("./sw.js");
 		});
 		}
-		</script>
-	<script href="manifest.json"></script> -->
+	</script>
+
+	<script href="manifest.json"></script>
 
 </head>
 
 <body>
-	<!-- <script>
-		async function registerServiceWorker() {
-		  if ("serviceWorker" in navigator) {
-			try {
-			  const registration = await navigator.serviceWorker.register(
-				"sw.js"
-			  );
-			  console.log(
-				"Service Worker registered with scope:",
-				registration.scope
-			  );
-			} catch (error) {
-			  console.error("Service Worker registration failed:", error);
-			}
-		  }
-		}
-  
-		registerServiceWorker();
-	  </script> -->
 	<nav>
 		<div class = "heading">
 			<h1>Longmetal 7127 test</h1>

diff --git a/pages/teamdetails.html b/pages/teamdetails.html
@@ -10,13 +10,13 @@
     <link rel="stylesheet" href="../css/teams.css" />
     <script src="../js/dexie.js"></script>
 
-    <!-- <script>
-        // Check that service workers are supported
-        if ("serviceWorker" in navigator) {
-          // Use the window load event to keep the page load performant
-          window.addEventListener("load", () => {
-            navigator.serviceWorker.register("../sw2.js");
-          });
+	<!-- <script>
+		// Check that service workers are supported
+		if ("serviceWorker" in navigator) {
+		// Use the window load event to keep the page load performant
+		window.addEventListener("load", () => {
+			navigator.serviceWorker.register("./sw.js");
+		});
 		}
 		</script> -->
 
@@ -42,7 +42,6 @@ <h1> Team Details v1</h1>
     </header>
     <br>
 
-    <div id="test">dsgfghdghjfhj sfgdgfshgdhgfh</div>
     <div class="team-details-container">
         <div class="inner-container">
             <!-- <form id="dataForm" class="teaminfo"> --> 

diff --git a/pages/teamdetails.js b/pages/teamdetails.js
@@ -1,22 +1,19 @@
 document.addEventListener('DOMContentLoaded', async () => {
-    // Initialize Dexie and retrieve data based on the team ID from the URL parameter
-    const urlParams = new URLSearchParams(window.location.search);
-    const teamId = parseInt(urlParams.get('globalid'));
-    console.log(`${teamId}`);
+    try {
+        const urlParams = new URLSearchParams(window.location.search);
+        const globalid = parseInt(urlParams.get('globalid'));
+
+        const db = new Dexie("Team Tracking App");
+        db.version(1).stores({ teams: "++id, teamname, globalid" });
 
-    const db = new Dexie("Team Tracking App");
-    db.version(1).stores({
-        teams: "++id, teamname, globalid"
-    });
-
-    // Retrieve data for the specified team ID
-    const team = await db.teams.get(teamId);
-    if (team) {
-        // Display the team details on the page
-        const teamDetailsDiv = document.getElementById('test');
-        teamDetailsDiv.innerHTML = `${team.teamname}`;
-    } else {
-        console.log(`Team with ID ${teamId} not found.`);
+        const team = await db.teams.where('globalid').equals(globalid).first();
+        if (team) {
+            const teamDetailsDiv = document.getElementById('teamname');
+            teamDetailsDiv.value = `${team.teamname}`;
+        } else {
+            console.log(`Team with ID ${globalid} not found.`);
+        }
+    } catch (error) {
+        console.error("Error accessing database:", error);
     }
-});
-
+});
diff --git a/sw.js b/sw.js
@@ -12,29 +12,52 @@ self.addEventListener("install", async (event) => {
 });
 
 // Fetching resources
-self.addEventListener("fetch", (event) => {
+self.addEventListener('fetch', event => {
   event.respondWith(
-    (async () => {
-      const cache = await caches.open(cacheName);
-
-      try {
-        const cachedResponse = await cache.match(event.request);
-        if (cachedResponse) {
-          console.log("cachedResponse: ", event.request.url);
-          return cachedResponse;
-        }
-
-        const fetchResponse = await fetch(event.request);
-        if (fetchResponse) {
-          console.log("fetchResponse: ", event.request.url);
-          await cache.put(event.request, fetchResponse.clone());
-          return fetchResponse;
+    // Try fetching from the network first
+    fetch(event.request)
+      .then(response => {
+        // If request succeeds, clone the response to cache and return the response
+        if (response && response.status === 200) {
+          const responseToCache = response.clone();
+          caches.open(CACHE_NAME)
+            .then(cache => {
+              cache.put(event.request, responseToCache);
+            });
+          return response;
         }
-      } catch (error) {
-        console.log("Fetch failed: ", error);
-        const cachedResponse = await cache.match("index.html");
-        return cachedResponse;
-      }
-    })()
+        // If request fails (e.g., network error), fall back to the cache
+        return caches.match(event.request);
+      })
+      .catch(error => {
+        // If fetch from network fails, try serving from cache
+        return caches.match(event.request);
+      })
   );
 });
+
+
+// self.addEventListener("fetch", (event) => {
+//   event.respondWith(
+//     (async () => {
+//       const cache = await caches.open(cacheName);
+//       try {
+//         const cachedResponse = await cache.match(event.request);
+//         if (cachedResponse) {
+//           console.log("cachedResponse: ", event.request.url);
+//           return cachedResponse;
+//         }
+//         const fetchResponse = await fetch(event.request);
+//         if (fetchResponse) {
+//           console.log("fetchResponse: ", event.request.url);
+//           await cache.put(event.request, fetchResponse.clone());
+//           return fetchResponse;
+//         }
+//       } catch (error) {
+//         console.log("Fetch failed: ", error);
+//         const cachedResponse = await cache.match("index.html");
+//         return cachedResponse;
+//       }
+//     })()
+//   );
+// });
diff --git a/sw2.js b/sw2.js