From 7ec46dda56c488370f25ec51fb292cee3f310ecd Mon Sep 17 00:00:00 2001
From: MIGHTY1o1 <shubhagarwalcse@gmail.com>
Date: Tue, 5 Nov 2024 05:53:43 +0530
Subject: [PATCH] resolve conflicts

---
 frontend/src/components/Contributors.jsx  | 152 ++++++++++++++++++++++
 frontend/src/components/Shared/Navbar.jsx |  57 ++++----
 frontend/src/router/index.jsx             |  21 +--
 3 files changed, 193 insertions(+), 37 deletions(-)
 create mode 100644 frontend/src/components/Contributors.jsx

diff --git a/frontend/src/components/Contributors.jsx b/frontend/src/components/Contributors.jsx
new file mode 100644
index 0000000..c6a1c86
--- /dev/null
+++ b/frontend/src/components/Contributors.jsx
@@ -0,0 +1,152 @@
+import React, { useState, useEffect } from 'react';
+import { Github, Loader2 } from 'lucide-react';
+
+const Contributors = () => {
+  const [contributors, setContributors] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+
+  useEffect(() => {
+    const fetchContributors = async () => {
+      try {
+        setLoading(true);
+        const response = await fetch('https://api.github.com/repos/RamakrushnaBiswal/PlayCafe/contributors');
+        if (!response.ok) {
+          throw new Error('Failed to fetch contributors');
+        }
+        const data = await response.json();
+        
+        // Fetch additional user details for each contributor
+        const contributorsWithDetails = await Promise.all(
+          data.map(async (contributor) => {
+            const userResponse = await fetch(contributor.url);
+            const userData = await userResponse.json();
+            return {
+              ...contributor,
+              name: userData.name || userData.login,
+              bio: userData.bio,
+              location: userData.location,
+              company: userData.company
+            };
+          })
+        );
+        
+        setContributors(contributorsWithDetails);
+        setError(null);
+      } catch (err) {
+        setError(err.message);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchContributors();
+  }, []);
+
+  if (error) {
+    return (
+      <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12 px-4">
+        <div className="max-w-3xl mx-auto text-center">
+          <div className="bg-red-50 dark:bg-red-900/20 text-red-600 dark:text-red-400 p-4 rounded-lg">
+            Error loading contributors: {error}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="min-h-screen bg-gray-50 dark:bg-gray-900 py-12 px-4">
+      {/* Header Section */}
+      <div className="max-w-3xl mx-auto">
+        <div className="text-center mb-8">
+          <h1 className="text-4xl font-bold text-gray-900 dark:text-white mb-4 flex items-center justify-center gap-2">
+            <Github className="w-8 h-8" />
+            GitHub Contributors
+          </h1>
+          
+          {/* Gradient Bar */}
+          <div className="h-1 w-full bg-gradient-to-r from-red-500 via-yellow-500 via-green-500 to-blue-500 mb-6"></div>
+          
+          <p className="text-gray-600 dark:text-gray-300 text-lg mb-8">
+            Thanks to our amazing contributors who help build and improve this project! 🎉
+          </p>
+        </div>
+
+        {/* Loading State */}
+        {loading ? (
+          <div className="flex justify-center items-center py-12">
+            <Loader2 className="w-8 h-8 animate-spin text-blue-500" />
+          </div>
+        ) : (
+          /* Contributors List */
+          <div className="space-y-3">
+            {contributors.map((contributor) => (
+              <div
+                key={contributor.id}
+                className="flex items-center bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm hover:shadow-md transition-shadow duration-200"
+              >
+                <img
+                  src={contributor.avatar_url}
+                  alt={contributor.login}
+                  className="w-12 h-12 rounded-full"
+                />
+                <div className="ml-4 flex-1">
+                  <div className="flex items-center justify-between">
+                    <div>
+                      <a
+                        href={contributor.html_url}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="text-blue-600 dark:text-blue-400 hover:underline font-medium"
+                      >
+                        {contributor.name || contributor.login}
+                      </a>
+                      <p className="text-sm text-gray-500 dark:text-gray-400">
+                        @{contributor.login}
+                      </p>
+                    </div>
+                    <span className="text-green-600 dark:text-green-400 font-semibold">
+                      {contributor.contributions} contributions
+                    </span>
+                  </div>
+                  {(contributor.bio || contributor.location) && (
+                    <div className="mt-2 text-sm text-gray-600 dark:text-gray-300">
+                      {contributor.bio && <p>{contributor.bio}</p>}
+                      {contributor.location && (
+                        <p className="text-gray-500 dark:text-gray-400 mt-1">
+                          📍 {contributor.location}
+                        </p>
+                      )}
+                    </div>
+                  )}
+                </div>
+              </div>
+            ))}
+          </div>
+        )}
+
+        {/* Repository Link */}
+        <div className="mt-12 text-center">
+          <div className="text-gray-700 dark:text-gray-300 font-medium mb-4">
+            Explore more on our GitHub repository:
+          </div>
+          <a
+            href="https://github.com/RamakrushnaBiswal/PlayCafe"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="inline-flex items-center justify-center gap-2 bg-gray-800 dark:bg-gray-700 text-white px-6 py-3 rounded-lg hover:bg-gray-700 dark:hover:bg-gray-600 transition-colors duration-200"
+          >
+            <Github className="w-5 h-5" />
+            Visit Repository
+          </a>
+        </div>
+
+        {/* Bottom Gradient Bar */}
+        <div className="h-1 w-full bg-gradient-to-r from-red-500 via-yellow-500 via-green-500 to-blue-500 mt-12"></div>
+      </div>
+    </div>
+  );
+};
+
+export default Contributors;
\ No newline at end of file
diff --git a/frontend/src/components/Shared/Navbar.jsx b/frontend/src/components/Shared/Navbar.jsx
index 1b115ca..efda6ae 100644
--- a/frontend/src/components/Shared/Navbar.jsx
+++ b/frontend/src/components/Shared/Navbar.jsx
@@ -23,6 +23,7 @@ const Navbar = () => {
     { name: 'BOARDGAMES', path: '/boardgame' },
     { name: 'MEMBERSHIP', path: '/membership' }, // Add Membership here
     { name: 'PROFILE', path: '/dashboard' }, // Add Membership here
+    { name: 'CONTRIBUTORS', path: '/contributors' },
   ];
 
   useEffect(() => {
@@ -83,16 +84,15 @@ const Navbar = () => {
 
   return (
     <nav
-  className={`w-full fixed top-0 z-50 transition duration-300 ${
-    isScrolled 
-      ? 'bg-background-light dark:bg-background-dark shadow-lg text-black dark:text-white' 
-      : 'bg-transparent text-black dark:text-white'
-  }`}
->
+      className={`w-full fixed top-0 z-50 transition duration-300 ${isScrolled
+        ? 'bg-background-light dark:bg-background-dark shadow-lg text-black dark:text-white'
+        : 'bg-transparent text-black dark:text-white'
+        }`}
+    >
 
       <div className="mx-auto px-6">
         <div className="flex justify-between items-center lg:h-16">
-        
+
           <Link to="/">
             <div className="flex-shrink-0">
               <img
@@ -120,11 +120,11 @@ const Navbar = () => {
                 </li>
               ))}
             </ul>
-            
+
           </div>
 
           <div className="hidden md:flex font-semibold Poppins text-lg space-x-4 ">
-          <ThemeToggle />
+            <ThemeToggle />
             {token ? (
               <button
                 className={`${baseTextColorClass} ${hoverTextColorClass} px-4 py-1 rounded-md border-2 border-black bg-beige shadow-[4px_4px_0px_0px_black] font-semibold`}
@@ -141,7 +141,7 @@ const Navbar = () => {
               >
                 LOGIN
               </button>
-              
+
             )}
           </div>
 
@@ -151,7 +151,7 @@ const Navbar = () => {
               onClick={toggleMenu}
               className={`${buttonTextClass} focus:outline-none`}
             >
-              
+
               {isMenuOpen ? (
                 <svg
                   className="h-6 w-6 stroke-black dark:stroke-white"
@@ -168,32 +168,31 @@ const Navbar = () => {
                 </svg>
               ) : (
                 <svg
-                className="h-6 w-6 stroke-black dark:stroke-white"
-                fill="none"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth="2"
-                  d="M4 6h16M4 12h16M4 18h16"
-                />
-              </svg>
-              
+                  className="h-6 w-6 stroke-black dark:stroke-white"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M4 6h16M4 12h16M4 18h16"
+                  />
+                </svg>
+
               )}
             </button>
           </div>
-          
+
         </div>
       </div>
 
       {/* Mobile Menu */}
       {isMenuOpen && (
         <div
-          className={`md:hidden ${
-            isScrolled ? 'bg-amber-100 shadow-lg' : 'bg-[#E0F0B1] shadow-lg'
-          } dark:bg-black `}
+          className={`md:hidden ${isScrolled ? 'bg-amber-100 shadow-lg' : 'bg-[#E0F0B1] shadow-lg'
+            } dark:bg-black `}
         >
           <div className="px-4 pt-4 pb-4 space-y-2">
             {menuItems.map((item) => (
@@ -224,7 +223,7 @@ const Navbar = () => {
                 Log In
               </button>
             )}
-          <ThemeToggle />
+            <ThemeToggle />
           </div>
         </div>
       )}
diff --git a/frontend/src/router/index.jsx b/frontend/src/router/index.jsx
index f9d16c9..cd2a710 100644
--- a/frontend/src/router/index.jsx
+++ b/frontend/src/router/index.jsx
@@ -26,9 +26,12 @@ import AdminLogin from '../components/Pages/Admin/AdminLogin';
 import AdminSignup from '../components/Pages/Admin/AdminSignup';
 import ProtectedRoute from './ProtectedRoute';
 import Profile from '../components/Pages/Dashboard';
+import HelpAndSupport from '../components/Pages/HelpAndSupport';
+import Contributors from '../components/Contributors';
+
 const router = createBrowserRouter(
   createRoutesFromElements(
-      <Route path="/" element={<App />}>
+    <Route path="/" element={<App />}>
       <Route index={true} path="/" element={<Home />} />
       <Route path="/about" element={<About />} />
       <Route path="/menu" element={<Menu />} />
@@ -41,12 +44,12 @@ const router = createBrowserRouter(
       <Route path="/login" element={<Login />} />
       <Route path="/reset-password/:id" element={<ResetPassword />} />
       <Route
-          path="/admin"
-          element={
-            <ProtectedRoute>
-              <Admin />
-            </ProtectedRoute>
-          }
+        path="/admin"
+        element={
+          <ProtectedRoute>
+            <Admin />
+          </ProtectedRoute>
+        }
       />
       <Route path="/admin-login" element={<AdminLogin />} />
       <Route path="/admin-signup" element={<AdminSignup />} />
@@ -55,7 +58,9 @@ const router = createBrowserRouter(
       <Route path="/otp-verify" element={<OtpRegisterVerify />} />
       <Route path="/membership" element={<Membership />} />
       <Route path="/dashboard" element={<Profile />} />
-      
+
+      <Route path="/help" element={<HelpAndSupport />} />
+      <Route path="/contributors" element={<Contributors />} />
     </Route>
   )
 );