Merge pull request #529 from realgolf/527-bug-archive-and-games-do-no…

…t-load-anymore 527 bug archive and games do not load anymore
realgolf · May 6, 2024 · 3a15ea5 · 3a15ea5
2 parents 31ec9b5 + 50c72ca
commit 3a15ea5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/src/lib/components/Archive/Game.svelte b/src/lib/components/Archive/Game.svelte
@@ -14,19 +14,22 @@
 	export let is_over: boolean;
 
 	const dataObj = JSON.parse(data);
+	let interleavedData: { color: string; value: string }[] = [];
 
-	// Separate data arrays for each color
-	const redData = dataObj.find((obj: { color: string }) => obj.color === 'red')?.data || [];
-	const blueData = dataObj.find((obj: { color: string }) => obj.color === 'blue')?.data || [];
+	// Check if "4winning" is not included in teams
+	if (teams.includes('4winning')) {
+		// Separate data arrays for each color
+		const redData = dataObj.find((obj: { color: string }) => obj.color === 'red')?.data || [];
+		const blueData = dataObj.find((obj: { color: string }) => obj.color === 'blue')?.data || [];
 
-	// Interleave the data arrays
-	let interleavedData: { color: string; value: string }[] = [];
-	for (let i = 0; i < Math.max(redData.length, blueData.length); i++) {
-		if (i < redData.length) interleavedData.push({ color: 'red', value: redData[i] });
-		if (i < blueData.length) interleavedData.push({ color: 'blue', value: blueData[i] });
-	}
+		// Interleave the data arrays
+		for (let i = 0; i < Math.max(redData.length, blueData.length); i++) {
+			if (i < redData.length) interleavedData.push({ color: 'red', value: redData[i] });
+			if (i < blueData.length) interleavedData.push({ color: 'blue', value: blueData[i] });
+		}
 
-	console.log(interleavedData);
+		console.log(interleavedData);
+	}
 </script>
 
 <div class="game">

diff --git a/src/lib/components/Public/Games/Game.svelte b/src/lib/components/Public/Games/Game.svelte
@@ -10,20 +10,23 @@
 	export let show_confirmation: boolean;
 	export let user_username: string | null | undefined;
 
-	// Interleave the data arrays
-	let interleavedData: { color: string; value: string }[] = [];
 	const dataObj = JSON.parse(data);
+	let interleavedData: { color: string; value: string }[] = [];
 
-	// Separate data arrays for each color
-	const redData = dataObj.find((obj: { color: string }) => obj.color === 'red')?.data || [];
-	const blueData = dataObj.find((obj: { color: string }) => obj.color === 'blue')?.data || [];
+	// Check if "4winning" is not included in teams
+	if (teams.includes('4winning')) {
+		// Separate data arrays for each color
+		const redData = dataObj.find((obj: { color: string }) => obj.color === 'red')?.data || [];
+		const blueData = dataObj.find((obj: { color: string }) => obj.color === 'blue')?.data || [];
 
-	for (let i = 0; i < Math.max(redData.length, blueData.length); i++) {
-		if (i < redData.length) interleavedData.push({ color: 'red', value: redData[i] });
-		if (i < blueData.length) interleavedData.push({ color: 'blue', value: blueData[i] });
-	}
+		// Interleave the data arrays
+		for (let i = 0; i < Math.max(redData.length, blueData.length); i++) {
+			if (i < redData.length) interleavedData.push({ color: 'red', value: redData[i] });
+			if (i < blueData.length) interleavedData.push({ color: 'blue', value: blueData[i] });
+		}
 
-	console.log(interleavedData);
+		console.log(interleavedData);
+	}
 
 	function extractDomain(url: string): string | null {
 		try {