Merge branch 'main' into issue_71

Yash-Ainapure · Oct 16, 2024 · 4e33343 · 4e33343
2 parents 5437423 + 4ea4508
commit 4e33343
Show file tree

Hide file tree

Showing 18 changed files with 485 additions and 278 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Yash Ainapure
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -130,6 +130,13 @@ We are grateful to all the contributors who have helped improve this project. Yo
                     <sub><b>Yash Kumar Saini</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/Gauravtb2253">
+                    <img src="https://avatars.githubusercontent.com/u/114927759?v=4" width="100;" alt="Gauravtb2253"/>
+                    <br />
+                    <sub><b>Gaurav Bomble</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/Hh440">
                     <img src="https://avatars.githubusercontent.com/u/91595810?v=4" width="100;" alt="Hh440"/>
@@ -144,6 +151,15 @@ We are grateful to all the contributors who have helped improve this project. Yo
                     <sub><b>RISHIRAJ MUKHERJEE</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/varma-101">
+                    <img src="https://avatars.githubusercontent.com/u/138625491?v=4" width="100;" alt="varma-101"/>
+                    <br />
+                    <sub><b>SAGI VENKATA NAGA GOPAL VARMA</b></sub>
+                </a>
+            </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/prateek2102">
                     <img src="https://avatars.githubusercontent.com/u/130992856?v=4" width="100;" alt="prateek2102"/>
@@ -152,40 +168,47 @@ We are grateful to all the contributors who have helped improve this project. Yo
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/jainaryan04">
-                    <img src="https://avatars.githubusercontent.com/u/138214350?v=4" width="100;" alt="jainaryan04"/>
+                <a href="https://github.com/radheypatil6630">
+                    <img src="https://avatars.githubusercontent.com/u/85211195?v=4" width="100;" alt="radheypatil6630"/>
                     <br />
-                    <sub><b>Aryan Ramesh Jain</b></sub>
+                    <sub><b>Radhey patil</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
-                <a href="https://github.com/Gauravtb2253">
-                    <img src="https://avatars.githubusercontent.com/u/114927759?v=4" width="100;" alt="Gauravtb2253"/>
+                <a href="https://github.com/im-amanjai">
+                    <img src="https://avatars.githubusercontent.com/u/145966547?v=4" width="100;" alt="im-amanjai"/>
                     <br />
-                    <sub><b>Gaurav Bomble</b></sub>
+                    <sub><b>im-amanjai</b></sub>
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/KrishChothani">
-                    <img src="https://avatars.githubusercontent.com/u/143370415?v=4" width="100;" alt="KrishChothani"/>
+                <a href="https://github.com/ZayedShahcode">
+                    <img src="https://avatars.githubusercontent.com/u/115407231?v=4" width="100;" alt="ZayedShahcode"/>
                     <br />
-                    <sub><b>Krish Chothani</b></sub>
+                    <sub><b>Zayed</b></sub>
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/devxMani">
-                    <img src="https://avatars.githubusercontent.com/u/122438942?v=4" width="100;" alt="devxMani"/>
+                <a href="https://github.com/vivekrawat21">
+                    <img src="https://avatars.githubusercontent.com/u/116631005?v=4" width="100;" alt="vivekrawat21"/>
                     <br />
-                    <sub><b>MANI </b></sub>
+                    <sub><b>Vivek Rawat</b></sub>
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/Sourabh782">
-                    <img src="https://avatars.githubusercontent.com/u/103349890?v=4" width="100;" alt="Sourabh782"/>
+                <a href="https://github.com/vedhcet-07">
+                    <img src="https://avatars.githubusercontent.com/u/176995332?v=4" width="100;" alt="vedhcet-07"/>
                     <br />
-                    <sub><b>Sourabh Singh Rawat</b></sub>
+                    <sub><b>Vishwas M D</b></sub>
+                </a>
+            </td>
+		</tr>
+		<tr>
+            <td align="center">
+                <a href="https://github.com/VinayLodhi1712">
+                    <img src="https://avatars.githubusercontent.com/u/135756009?v=4" width="100;" alt="VinayLodhi1712"/>
+                    <br />
+                    <sub><b>Vinay Anand Lodhi</b></sub>
                 </a>
             </td>
             <td align="center">
@@ -196,33 +219,61 @@ We are grateful to all the contributors who have helped improve this project. Yo
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/vedhcet-07">
-                    <img src="https://avatars.githubusercontent.com/u/176995332?v=4" width="100;" alt="vedhcet-07"/>
+                <a href="https://github.com/Sourabh782">
+                    <img src="https://avatars.githubusercontent.com/u/103349890?v=4" width="100;" alt="Sourabh782"/>
                     <br />
-                    <sub><b>Vishwas M D</b></sub>
+                    <sub><b>Sourabh Singh Rawat</b></sub>
+                </a>
+            </td>
+            <td align="center">
+                <a href="https://github.com/devxMani">
+                    <img src="https://avatars.githubusercontent.com/u/122438942?v=4" width="100;" alt="devxMani"/>
+                    <br />
+                    <sub><b>MANI </b></sub>
+                </a>
+            </td>
+            <td align="center">
+                <a href="https://github.com/Laxmi01345">
+                    <img src="https://avatars.githubusercontent.com/u/122423386?v=4" width="100;" alt="Laxmi01345"/>
+                    <br />
+                    <sub><b>Laxmi Ray</b></sub>
+                </a>
+            </td>
+            <td align="center">
+                <a href="https://github.com/KrishChothani">
+                    <img src="https://avatars.githubusercontent.com/u/143370415?v=4" width="100;" alt="KrishChothani"/>
+                    <br />
+                    <sub><b>Krish Chothani</b></sub>
                 </a>
             </td>
 		</tr>
 		<tr>
             <td align="center">
-                <a href="https://github.com/ZayedShahcode">
-                    <img src="https://avatars.githubusercontent.com/u/115407231?v=4" width="100;" alt="ZayedShahcode"/>
+                <a href="https://github.com/hetvipopat">
+                    <img src="https://avatars.githubusercontent.com/u/157787846?v=4" width="100;" alt="hetvipopat"/>
                     <br />
-                    <sub><b>Zayed</b></sub>
+                    <sub><b>Hetvi_26</b></sub>
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/im-amanjai">
-                    <img src="https://avatars.githubusercontent.com/u/145966547?v=4" width="100;" alt="im-amanjai"/>
+                <a href="https://github.com/jainaryan04">
+                    <img src="https://avatars.githubusercontent.com/u/138214350?v=4" width="100;" alt="jainaryan04"/>
                     <br />
-                    <sub><b>im-amanjai</b></sub>
+                    <sub><b>Aryan Ramesh Jain</b></sub>
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/radheypatil6630">
-                    <img src="https://avatars.githubusercontent.com/u/85211195?v=4" width="100;" alt="radheypatil6630"/>
+                <a href="https://github.com/NK-Works">
+                    <img src="https://avatars.githubusercontent.com/u/132702983?v=4" width="100;" alt="NK-Works"/>
                     <br />
-                    <sub><b>Radhey patil</b></sub>
+                    <sub><b>Anneshu Nag</b></sub>
+                </a>
+            </td>
+            <td align="center">
+                <a href="https://github.com/AasthaSingh28">
+                    <img src="https://avatars.githubusercontent.com/u/138100998?v=4" width="100;" alt="AasthaSingh28"/>
+                    <br />
+                    <sub><b>Aastha Singh</b></sub>
                 </a>
             </td>
 		</tr>

diff --git a/backend/.env_sample b/backend/.env_sample
@@ -0,0 +1,2 @@
+TURSO_AUTH_TOKEN="YOUR_TURSO_AUTH_TOKEN"
+TURSO_DATABASE_URL="YOUR_TURSO_DATABASE_URL"
diff --git a/backend/dist/config/const.js b/backend/dist/config/const.js
@@ -23,6 +23,7 @@ exports.MESSAGES = {
         ERROR_CREATING_EVENT: "An error occurred while creating the event.",
         FETCH_EVENTS_SUCCESS: "Events fetched successfully.",
         UPDATE_EVENT_SUCCESS: "Event updated successfully.",
+        ERROR_FETCHING_EVENT: "An error occurred while fetching the single event.",
     },
     GENERIC: {
         INTERNAL_SERVER_ERROR: "Internal Server Error",

diff --git a/backend/dist/controllers/event.controller.js b/backend/dist/controllers/event.controller.js
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createQuiz = exports.getAllEventData = exports.createEvent = exports.updateEvent = exports.getClubEventData = exports.deleteEvent = void 0;
+exports.getSingleEventData = exports.createQuiz = exports.getAllEventData = exports.createEvent = exports.updateEvent = exports.getClubEventData = exports.deleteEvent = void 0;
 const database_config_1 = require("../config/database.config");
 const const_1 = require("../config/const");
 const logger_1 = __importDefault(require("../config/logger"));
@@ -154,3 +154,22 @@ const createQuiz = (req, res) => __awaiter(void 0, void 0, void 0, function* ()
     }
 });
 exports.createQuiz = createQuiz;
+const getSingleEventData = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    const eventId = Number(req.query.EventID);
+    try {
+        const event = yield database_config_1.prisma.event.findUnique({
+            where: { EventID: eventId },
+        });
+        if (!event) {
+            logger_1.default.warn(`Event not found for EventID: ${eventId}`);
+            return res.status(404).json({ error: const_1.MESSAGES.EVENT.EVENT_NOT_FOUND });
+        }
+        logger_1.default.info(`Fetched event data for EventID: ${eventId}`);
+        res.json(event);
+    }
+    catch (error) {
+        logger_1.default.error(`${const_1.MESSAGES.EVENT.ERROR_FETCHING_EVENT}: ${error}`);
+        res.status(500).json({ error: const_1.MESSAGES.EVENT.ERROR_FETCHING_EVENT });
+    }
+});
+exports.getSingleEventData = getSingleEventData;
diff --git a/backend/dist/routes/event.routes.js b/backend/dist/routes/event.routes.js
@@ -6,6 +6,7 @@ const router = (0, express_1.Router)();
 router.delete("/deleteEvent", event_controller_1.deleteEvent);
 //get all events
 router.get("/getAllEventData", event_controller_1.getAllEventData);
+router.get("/getSingleEventData", event_controller_1.getSingleEventData);
 //get all events for a club
 router.get("/getClubEventData", event_controller_1.getClubEventData);
 router.put("/update-event", event_controller_1.updateEvent);

diff --git a/frontend/index.html b/frontend/index.html
@@ -4,6 +4,8 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="icon" href="../frontend/src/assets/dypLogo.png">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
     <title>dypcetclubs.live</title>
   </head>
   <body>

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -15,6 +15,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@prisma/client": "^5.19.0",
+    "@radix-ui/react-accordion": "^1.2.1",
     "@radix-ui/react-slot": "^1.1.0",
     "@tabler/icons-react": "^3.13.0",
     "@tanstack/react-form": "^0.29.2",
@@ -32,6 +33,7 @@
     "react-icons": "^5.3.0",
     "react-router-dom": "^6.26.1",
     "react-spinners": "^0.14.1",
+    "styled-components": "^6.1.13",
     "tailwind-merge": "^2.5.2",
     "tailwindcss-animate": "^1.0.7"
   },

diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -21,5 +21,30 @@
  }
 
 
+html {
+  overflow-y: scroll;
+  scrollbar-width: none; 
+}
 
-
+body {
+  overflow-y: scroll; 
+  height: 100vh; 
+  margin: 0;
+  scrollbar-width: none; 
+  -ms-overflow-style: none;
+}
+
+html::-webkit-scrollbar, 
+body::-webkit-scrollbar {
+  width: 0;
+  display: none; 
+}
+
+.scrollable-element {
+  overflow-y: scroll;
+  scrollbar-width: none; 
+}
+
+.scrollable-element::-webkit-scrollbar {
+  width: 0; 
+}
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { Route, Routes, BrowserRouter as Router, Outlet } from "react-router-dom";
-import { Navbar } from "./appComponents/Navbar.tsx";
+import { Navbar } from "./appComponents/Navbar"; // Clean import
 import Hero from "./appComponents/Herosection";
 import Clubs from "./appComponents/Clubs";
 import Particles from "@/components/magicui/particles";
@@ -13,10 +13,10 @@ import { ClubAdmin } from "./appComponents/ClubAdmin";
 import "./App.css";
 import QuizPage from "./appComponents/QuizPage";
 import About from "./appComponents/About";
-import Footer from "./appComponents/Footer.tsx"
-import ClubsPage from "./appComponents/ClubsPage.tsx"
+import Footer from "./appComponents/Footer.tsx";
+import ClubsPage from "./appComponents/ClubsPage.tsx";
 import EventsPage from "./appComponents/EventsPage.tsx";
-import Features from "./appComponents/Features.js"
+import Features from "./appComponents/Features.js";
 import HiringPage from "./appComponents/HiringPage.tsx";
 import PrivacyPolicy from "./appComponents/PrivacyPolicy.tsx";
 import Terms from "./appComponents/Terms.tsx";
@@ -33,7 +33,6 @@ function App() {
 
   return (
     <Router>
-
       <Routes>
         <Route
           path="/"
@@ -52,10 +51,10 @@ function App() {
                 <Navbar setShowLoginPage={setShowLoginPage} />
                 <Hero />
               </div>
-              <Features/>
+              <Features />
               <Clubs />
               <Events />
-              <Footer/>
+              <Footer />
               {showPopup && <Popup onClose={handleClose} />}
               {showLoginPage && <ClubLogin onClose={setShowLoginPage} />}
             </div>
@@ -65,12 +64,12 @@ function App() {
         </Route>
         <Route path="/clubAdmin/*" element={<ClubAdmin />} />
         <Route path="/quiz/:id" element={<QuizPage />} />
-        <Route path="/about"  element={<About />} />
-        <Route path="/clubboard" element={<ClubsPage/>}/>
-        <Route path="/events" element={<EventsPage/>}/>
-        <Route path="/hirimaineng" element={<HiringPage/>}/>
-        <Route path="/privacy-policy" element={<PrivacyPolicy/>}/>
-        <Route path="/terms" element={<Terms/>}/>
+        <Route path="/about" element={<About />} />
+        <Route path="/clubboard" element={<ClubsPage />} />
+        <Route path="/events" element={<EventsPage />} />
+        <Route path="/hirimaineng" element={<HiringPage />} />
+        <Route path="/privacy-policy" element={<PrivacyPolicy />} />
+        <Route path="/terms" element={<Terms />} />
       </Routes>
     </Router>
   );

diff --git a/frontend/src/appComponents/EventCard.tsx b/frontend/src/appComponents/EventCard.tsx
@@ -10,7 +10,7 @@ type EventCardProps = {
 
 const EventCard: React.FC<EventCardProps> = ({ name, description, time }) => {
   return (
-    <div className="hover:scale-[101%] bg-white transform transition-all duration-500  text-gray-900 rounded-lg shadow-md p-6 flex flex-col justify-between">
+    <div className="hover:scale-[101%] bg-white transform transition-all duration-500  text-gray-900 rounded-lg shadow-md p-1 flex flex-col justify-between">
       <h2 className="mb-2 text-xl font-bold">{name}</h2>
       <p className="mb-4 text-gray-600">{description}</p>
       <div className="flex items-center justify-between">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		TURSO_AUTH_TOKEN="YOUR_TURSO_AUTH_TOKEN"
		TURSO_DATABASE_URL="YOUR_TURSO_DATABASE_URL"