- {/* Header */}
-
SATTA-KING-FAST.com
- - {/* Advertisement Banner */} -
- 
+
+
+ {/* Header */}
+
-
- {/* Informational Text */}
- SATTA-KING-FAST.com
+ + {/* Advertisement Banner */} +
+ 
+
+
+ {/* Informational Text */}
+ + Delhi Diamond Satta Result And Monthly Satta Chart of March 2025 With Combined Chart of Gali, Desawar, Ghaziabad, Faridabad And Shri Ganesh from Satta King Fast, Satta King Result, Satta King Chart, Black Satta King and Satta King 786. +
+ + {/* Disclaimer */} ++ Satta-King-Fast.com is the most popular gaming discussion forum for players to use freely and we are not in partnership with any gaming company. +
+ + {/* Warning Message */} ++ कृपया ध्यान दें, लीक गेम के नाम पर किसी को कोई पैसा न दें, ना पहले ना बाद में - धन्यवाद +
+ + {/* Contact Link */} ++ हमसे संपर्क करने के लिए ➡ यहाँ क्लिक करें +
+ + {/* Timestamp */} ++ Updated: {currentTime} IST. +
- Delhi Diamond Satta Result And Monthly Satta Chart of March 2025 With Combined Chart of Gali, Desawar, Ghaziabad, Faridabad And Shri Ganesh from Satta King Fast, Satta King Result, Satta King Chart, Black Satta King and Satta King 786. -
- - {/* Disclaimer */} -- Satta-King-Fast.com is the most popular gaming discussion forum for players to use freely and we are not in partnership with any gaming company. -
- - {/* Warning Message */} -- कृपया ध्यान दें, लीक गेम के नाम पर किसी को कोई पैसा न दें, ना पहले ना बाद में - धन्यवाद -
- - {/* Contact Link */} -- हमसे संपर्क करने के लिए ➡ यहाँ क्लिक करें -
- - {/* Timestamp */} -- Updated: {currentTime} IST. -
-
+ {error && (
+
+ {/* Loading indicator */}
+ {loading && (
+
+
+ )}
+
{error}
+
- Bikaner Super Satta Result of March 12, 2025 & March 11, 2025
+ {teams.length > 0 && teams[0].name} Satta Result of {dates.length > 1 && new Date(dates[1]).toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' })} & {dates.length > 0 && new Date(dates[0]).toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' })}
{/* Controls */}
@@ -141,19 +288,35 @@ const Home = () => {
+
+
+ )}
+
{/* Chart View */}
- {showChartView && selectedTeam && (
+ {!loading && showChartView && selectedTeam && (
+
+ Monthly Chart: {selectedTeam.name}
@@ -165,12 +328,17 @@ const Home = () => {
- {generateChartData().map((item, index) => (
+ {selectedTeam.chartData && selectedTeam.chartData.map((item, index) => (
- {new Date(item.date).toLocaleDateString()}
+ {new Date(item.result_date).toLocaleDateString()}
{item.result}
))}
+ {(!selectedTeam.chartData || selectedTeam.chartData.length === 0) && (
+
+ No chart data available
+
+ )}
@@ -186,11 +354,27 @@ const Home = () => {
)}
{/* Calendar View */}
- {showCalendar && (
+ {!loading && showCalendar && (
-
- Calendar View: {new Date().toLocaleDateString('en-US', { month: 'long', year: 'numeric' })} -
+
+
+
+
+ {currentMonth.toLocaleDateString('en-US', { month: 'long', year: 'numeric' })} +
+ + +
{['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'].map(day => (
@@ -199,14 +383,18 @@ const Home = () => {
- {generateCalendarData().map((day, index) => (
+ {calendarData.map((day, index) => (
{day && (
<>
)}
diff --git a/src/pages/TeamResult.js b/src/pages/TeamResult.js
index fe3a833..9251708 100644
--- a/src/pages/TeamResult.js
+++ b/src/pages/TeamResult.js
@@ -1,34 +1,50 @@
import React, { useState, useEffect } from "react";
+// Function to sanitize potential XSS threats in strings
+const sanitizeString = (str) => {
+ const div = document.createElement("div");
+ div.textContent = str;
+ return div.innerHTML;
+};
+
const TeamResults = () => {
const [teams, setTeams] = useState([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState(null);
-
- const fetchData = async () => {
- try {
- const response = await fetch("http://localhost:5000/api/teams/");
-
- if (!response.ok) {
- throw new Error(`HTTP error! Status: ${response.status}`);
- }
-
- const data = await response.json(); // Parse JSON response
- setTeams(data); // Store the entire API response in state
- } catch (error) {
- console.error("Error fetching data:", error);
- setError(error.message);
- } finally {
- setLoading(false);
- }
- };
useEffect(() => {
+ const fetchData = async () => {
+ try {
+ const response = await fetch("http://localhost:5500/api/teams");
+
+ if (!response.ok) {
+ throw new Error(`HTTP error! Status: ${response.status}`);
+ }
+
+ const data = await response.json();
+
+ // Ensure safe rendering of team names
+ const sanitizedData = data.map((team) => ({
+ ...team,
+ name: sanitizeString(team.name),
+ announcement_time: team.announcement_time || "N/A", // Handle missing time
+ results: team.results || {} // Ensure results exist
+ }));
+
+ setTeams(sanitizedData);
+ } catch (error) {
+ console.error("Error fetching data:", error);
+ setError(error.message);
+ } finally {
+ setLoading(false);
+ }
+ };
+
fetchData();
}, []);
if (loading) return
{day.day}
{teams.map(team => (
- {team.name.split(' ')[0]}: {day.results[team.id]}
+ {day.results[team.name] && (
+ <>
+ {team.name.split(' ')[0]}: {day.results[team.name]}
+
+ )}
))}
@@ -227,17 +415,17 @@ const Home = () => {
)}
{/* Teams Table */}
- {!showCalendar && (
+ {!loading && !showCalendar && !showChartView && (
| Games List | - {new Date(dates[0]).toLocaleDateString('en-US', { weekday: 'short' })} {new Date(dates[0]).getDate()}th + {dates.length > 0 && new Date(dates[0]).toLocaleDateString('en-US', { weekday: 'short' })} {dates.length > 0 && new Date(dates[0]).getDate()}th | - {new Date(dates[1]).toLocaleDateString('en-US', { weekday: 'short' })} {new Date(dates[1]).getDate()}th + {dates.length > 1 && new Date(dates[1]).toLocaleDateString('en-US', { weekday: 'short' })} {dates.length > 1 && new Date(dates[1]).getDate()}th | Chart |
{team.name}
at {team.time}
- Record Chart
+ handleViewChart(team)}>Record Chart
|
- {team.results[dates[0]] || 'XX'} | -{team.results[dates[1]] || 'XX'} | +{dates.length > 0 && team.results[dates[0]] || 'XX'} | +{dates.length > 1 && team.results[dates[1]] || 'XX'} |
|
))}
+ {teams.length === 0 && (
+
|---|---|---|---|
| No teams found | +|||
-
+
Loading...
; - if (error) returnError: {error}
; + if (error) returnError: {error}
; return (
@@ -37,16 +53,21 @@ const TeamResults = () => {
{teams.map((team) => (
))}
diff --git a/src/services/DataService.js b/src/services/DataService.js
index 4133386..633d9a1 100644
--- a/src/services/DataService.js
+++ b/src/services/DataService.js
@@ -2,8 +2,8 @@
import axios from 'axios';
import { io } from 'socket.io-client';
-const API_URL = 'http://localhost:5000/api';
-const socket = io('http://localhost:5000');
+const API_URL = 'http://localhost:3000/api';
+const socket = io('http://localhost:3000');
export const DataService = {
// Get all teams
{team.name}
-Time: {team.time}
+Time: {team.announcement_time}
+Results:
--
- {Object.entries(team.results).map(([date, result]) => (
-
- - {date}: {result} - - ))} -
-
+ {Object.entries(team.results).map(([date, result]) => (
+
- + {date}: {result} + + ))} +
No results available
+ )}