From f0f4418cf0d931d788d12cd280cc16c99f16fee0 Mon Sep 17 00:00:00 2001
From: Naveen Kumar <connect.naveenk@gmail.com>
Date: Tue, 22 Apr 2025 12:30:15 +0530
Subject: [PATCH] Refactor manifest.json paths, enhance teams fetching logic,
 and improve results display handling

---
 public/manifest.json |  6 +--
 src/index.js         |  2 +-
 src/pages/Results.js | 87 ++++++++++++++++++++++++--------------------
 src/pages/Teams.js   |  4 +-
 src/utils/http.js    |  4 +-
 5 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/public/manifest.json b/public/manifest.json
index c5fc123..aaf50b1 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -3,17 +3,17 @@
   "name": "Kings Admin Panel",
   "icons": [
     {
-      "src": "favicon.ico",
+      "src": "/favicon.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
     },
     {
-      "src": "logo192.png",
+      "src": "/logo192.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "logo512.png",
+      "src": "/logo512.png",
       "type": "image/png",
       "sizes": "512x512"
     }
diff --git a/src/index.js b/src/index.js
index 9429752..ef56ab4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -11,7 +11,7 @@ import 'react-toastify/dist/ReactToastify.css';
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(
   <React.StrictMode>
-    <BrowserRouter>
+    <BrowserRouter future={{ v7_relativeSplatPath: true }}>
       <AuthProvider>
         <App />
         <ToastContainer position="top-right" autoClose={3000} />
diff --git a/src/pages/Results.js b/src/pages/Results.js
index 4f1c492..ef52ba3 100644
--- a/src/pages/Results.js
+++ b/src/pages/Results.js
@@ -35,9 +35,10 @@ const Results = () => {
   const fetchTeams = async () => {
     try {
       const data = await teamsService.getAll();
-      setTeams(data);
+      setTeams(Array.isArray(data) ? data : []); // Ensure teams is always an array
     } catch (err) {
       console.error('Error fetching teams:', err);
+      setTeams([]); // Fallback to an empty array on error
     }
   };
   
@@ -236,46 +237,52 @@ const Results = () => {
                 </tr>
               </thead>
               <tbody>
-                {results.map((result, index) => (
-                  <tr key={result.id}>
-                    <td>{index + 1}</td>
-                    <td>{result.team || result.team_name}</td>
-                    <td>
-                      {(result.visible_result === '-1' || result.result === '-1') ? (
-                        <span className="text-muted">Pending</span>
-                      ) : (
-                        <span className="text-success fw-bold">
-                          {result.visible_result || result.result}
-                        </span>
-                      )}
-                    </td>
-                    <td>{formatDateTimeDisplay(result.result_time)}</td>
-                    <td>
-                      {new Date(result.result_time) > new Date() ? (
-                        <span className="badge bg-warning">Scheduled</span>
-                      ) : (
-                        <span className="badge bg-success">Published</span>
-                      )}
-                    </td>
-                    <td>
-                      <Button 
-                        variant="outline-primary" 
-                        size="sm" 
-                        className="me-2"
-                        onClick={() => handleOpenEditModal(result)}
-                      >
-                        <FiEdit />
-                      </Button>
-                      <Button 
-                        variant="outline-danger" 
-                        size="sm"
-                        onClick={() => handleOpenDeleteModal(result)}
-                      >
-                        <FiTrash2 />
-                      </Button>
-                    </td>
+                {results.length === 0 ? (
+                  <tr>
+                    <td colSpan="6" className="text-center">No results found with the current filter.</td>
                   </tr>
-                ))}
+                ) : (
+                  results.map((result, index) => (
+                    <tr key={result.id}>
+                      <td>{index + 1}</td>
+                      <td>{result.team || result.team_name}</td>
+                      <td>
+                        {(result.visible_result === '-1' || result.result === '-1') ? (
+                          <span className="text-muted">Pending</span>
+                        ) : (
+                          <span className="text-success fw-bold">
+                            {result.visible_result || result.result}
+                          </span>
+                        )}
+                      </td>
+                      <td>{formatDateTimeDisplay(result.result_time)}</td>
+                      <td>
+                        {new Date(result.result_time) > new Date() ? (
+                          <span className="badge bg-warning">Scheduled</span>
+                        ) : (
+                          <span className="badge bg-success">Published</span>
+                        )}
+                      </td>
+                      <td>
+                        <Button 
+                          variant="outline-primary" 
+                          size="sm" 
+                          className="me-2"
+                          onClick={() => handleOpenEditModal(result)}
+                        >
+                          <FiEdit />
+                        </Button>
+                        <Button 
+                          variant="outline-danger" 
+                          size="sm"
+                          onClick={() => handleOpenDeleteModal(result)}
+                        >
+                          <FiTrash2 />
+                        </Button>
+                      </td>
+                    </tr>
+                  ))
+                )}
               </tbody>
             </Table>
           )}
diff --git a/src/pages/Teams.js b/src/pages/Teams.js
index 8ec1087..08db554 100644
--- a/src/pages/Teams.js
+++ b/src/pages/Teams.js
@@ -142,11 +142,11 @@ const Teams = () => {
                 </tr>
               </thead>
               <tbody>
-                {teams.map((team, index) => (
+                {Array.isArray(teams) && teams.map((team, index) => (
                   <tr key={team.id}>
                     <td>{index + 1}</td>
                     <td>{team.name}</td>
-                    <td>{new Date(team.created_at).toLocaleString('en-IN', {timeZone: 'Asia/Kolkata'})}</td>
+                    <td>{new Date(team.created_at).toLocaleString('en-IN', { timeZone: 'Asia/Kolkata' })}</td>
                     <td>
                       <Button 
                         variant="outline-primary" 
diff --git a/src/utils/http.js b/src/utils/http.js
index 63ffe97..da461c7 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -1,8 +1,10 @@
 import axios from 'axios';
 
-const API_URL = process.env.REACT_APP_API_URL;
+// const API_URL = process.env.REACT_APP_API_URL;
 const TOKEN_KEY = process.env.REACT_APP_TOKEN_KEY;
 
+const API_URL = 'https://backend.matkasattadaily.com'
+
 const http = axios.create({
   baseURL: API_URL,
   headers: {