Skip to content

Commit

Permalink
[Added] football (#85)
Browse files Browse the repository at this point in the history
* Contact info updated (#63)

* contact updated

* minor changes

* new sponsors added (#62)

* updated matches page (#59)

* updated footer (#64)

* changes in dashboard (#68)

* Spelling correction in Espardha page (#67)

* Spelling correction in Espardha page

* Insta svg correction

* rectified events page (#74)

* Footer correction (#73)

* Spelling correction in Espardha page

* Insta svg correction

* footer correction

* [updated gap]sign up and login (#72)

* [Updated] Sponsors (#65)

* Contact info updated (#63)

* contact updated

* minor changes

* new sponsors added (#62)

* updated matches page (#59)

---------

Co-authored-by: AnkitPathak05 <[email protected]>
Co-authored-by: Saksham Agrawal <[email protected]>

* [Updated] Footer (#66)

* Contact info updated (#63)

* contact updated

* minor changes

* new sponsors added (#62)

* updated matches page (#59)

* updated footer (#64)

---------

Co-authored-by: AnkitPathak05 <[email protected]>
Co-authored-by: Saksham Agrawal <[email protected]>
Co-authored-by: ROHIT KUMAR <[email protected]>

* adjust gap

---------

Co-authored-by: Atul Yadav <[email protected]>
Co-authored-by: AnkitPathak05 <[email protected]>
Co-authored-by: Saksham Agrawal <[email protected]>
Co-authored-by: ROHIT KUMAR <[email protected]>

* mobile navbar (#69)

* [Updated] Sponsors (#65)

* Contact info updated (#63)

* contact updated

* minor changes

* new sponsors added (#62)

* updated matches page (#59)

---------

Co-authored-by: AnkitPathak05 <[email protected]>
Co-authored-by: Saksham Agrawal <[email protected]>

* [Updated] Footer (#66)

* Contact info updated (#63)

* contact updated

* minor changes

* new sponsors added (#62)

* updated matches page (#59)

* updated footer (#64)

---------

Co-authored-by: AnkitPathak05 <[email protected]>
Co-authored-by: Saksham Agrawal <[email protected]>
Co-authored-by: ROHIT KUMAR <[email protected]>

* mobile navbar

* mobile nav image part

---------

Co-authored-by: Atul Yadav <[email protected]>
Co-authored-by: AnkitPathak05 <[email protected]>
Co-authored-by: Saksham Agrawal <[email protected]>
Co-authored-by: ROHIT KUMAR <[email protected]>

* Revert "[updated gap]sign up and login (#72)" (#75)

This reverts commit 9d29fa2.

* images compressed (#78)

* collaboration mail added (#77)

* dashboard updated (#71)

* dashboard final

* dashboard updated

* [updated]Register (#79)

* update register

* some changes

---------

Co-authored-by: vipul <[email protected]>

* double footer resolved (#81)

* double footer resolved

* build resolved

* build resolved

* [ADDED] football in frontend (#83)

* [ADDED] football in frontend

* aquatics removed

* Update Events.js

---------

Co-authored-by: Atul Yadav <[email protected]>

---------

Co-authored-by: AnkitPathak05 <[email protected]>
Co-authored-by: Saksham Agrawal <[email protected]>
Co-authored-by: ROHIT KUMAR <[email protected]>
Co-authored-by: subham-45 <[email protected]>
Co-authored-by: Ankit Raj <[email protected]>
Co-authored-by: vipul <[email protected]>
Co-authored-by: Vipul <[email protected]>
  • Loading branch information
8 people authored Sep 27, 2024
1 parent 11838bb commit 02fc67e
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 56 deletions.
11 changes: 7 additions & 4 deletions frontend/src/components/DashBoard/Registration/Events/Events.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const EventsDb = () => {
const [showModals, setShowModals] = useState({
Athletics_B: false,
Athletics_G: false,
Aquatics_B: false,
Aquatics_G: false,
// Aquatics_B: false,
// Aquatics_G: false,
Badminton_B: false,
Badminton_G: false,
Basketball_B: false,
Expand All @@ -28,6 +28,7 @@ const EventsDb = () => {
Cycling_M: false,
Cricket_B: false,
Football_B: false,
Football_G: false,
Handball_B: false,
Handball_G: false,
Hockey_B: false,
Expand All @@ -49,7 +50,7 @@ const EventsDb = () => {
Weightlifting_B: false,
});
const [Athletics_G, setAthletics_G] = useState({});
const [Aquatics_G, setAquatics_G] = useState({});
// const [Aquatics_G, setAquatics_G] = useState({});
const [Boxing_G, setBoxing_G] = useState({});
const [Taekwondo_G, setTaekwondo_G] = useState({});
const [Volleyball_B, setVolleyball_B] = useState({});
Expand All @@ -71,6 +72,7 @@ const EventsDb = () => {
const [Handball_B, setHandball_B] = useState({});
const [Handball_G, setHandball_G] = useState({});
const [Football_B, setFootball_B] = useState({});
const [Football_G, setFootball_G] = useState({});
const [Cricket_B, setCricket_B] = useState({});
const [Taekwondo_B, setTaekwondo_B] = useState({});
const [Boxing_B, setBoxing_B] = useState({});
Expand All @@ -86,7 +88,7 @@ const EventsDb = () => {

const inputFields = {
Athletics_G: [Athletics_G, setAthletics_G],
Aquatics_G: [Aquatics_G, setAquatics_G],
// Aquatics_G: [Aquatics_G, setAquatics_G],
Boxing_G: [Boxing_G, setBoxing_G],
Taekwondo_G: [Taekwondo_G, setTaekwondo_G],
Volleyball_B: [Volleyball_B, setVolleyball_B],
Expand All @@ -108,6 +110,7 @@ const EventsDb = () => {
Handball_B: [Handball_B, setHandball_B],
Handball_G: [Handball_G, setHandball_G],
Football_B: [Football_B, setFootball_B],
Football_G: [Football_G, setFootball_G],
Cricket_B: [Cricket_B, setCricket_B],
Taekwondo_B: [Taekwondo_B, setTaekwondo_B],
Boxing_B: [Boxing_B, setBoxing_B],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { EventContext } from '../../../../../contexts/EventContext';
const GAMES = {
boys: [
'Athletics',
'Aquatics',
// 'Aquatics',
'Badminton',
'Basketball',
'Boxing',
Expand All @@ -29,7 +29,7 @@ const GAMES = {
],
girls: [
'Athletics',
'Aquatics',
// 'Aquatics',
'Badminton',
'Basketball',
'Boxing',
Expand All @@ -41,6 +41,7 @@ const GAMES = {
'Table Tennis',
'Taekwondo',
'Volleyball',
'Football',
],
mixed: ['Chess', 'Cycling'],
};
Expand Down
75 changes: 38 additions & 37 deletions frontend/src/components/LandingPages/Events/Events.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import aquatics from './image/aquatics.png';
import aquaticshover from './image/aquaticshover.png';
// import aquatics from './image/aquatics.png';
// import aquaticshover from './image/aquaticshover.png';
import athletics from './image/athletics.png';
import athleticshover from './image/athleticshover.png';
import basketball from './image/basketball.png';
Expand Down Expand Up @@ -45,7 +45,7 @@ import styles from './Events.module.css';
import { Link } from 'react-router-dom';
// import Carousel from '../Home/Carousel/Carouselhp';
import {
Aquatics,
// Aquatics,
Athletics,
Badminton,
Basketball,
Expand Down Expand Up @@ -89,6 +89,7 @@ const Events = () => {
const [showResults17, setShowResults17] = useState(false);
const [showResults18, setShowResults18] = useState(false);
const [showResults19, setShowResults19] = useState(false);
console.log(showResults19);

const [athletics1, setathletics1] = useState(athletics);
const athleticsMouseEnter = () => {
Expand Down Expand Up @@ -223,14 +224,14 @@ const Events = () => {
const chessMouseLeave = () => {
setchess1(chess);
};
const [aquatics1, setaquatics1] = useState(aquatics);
const aquaticsMouseEnter = () => {
setaquatics1(aquaticshover);
console.log("entered");
};
const aquaticsMouseLeave = () => {
setaquatics1(aquatics);
};
// const [aquatics1, setaquatics1] = useState(aquatics);
// const aquaticsMouseEnter = () => {
// setaquatics1(aquaticshover);
// console.log("entered");
// };
// const aquaticsMouseLeave = () => {
// setaquatics1(aquatics);
// };


const onClick0 = () => {
Expand Down Expand Up @@ -651,28 +652,28 @@ const Events = () => {
setShowResults18(!showResults18);
setShowResults19(false);
};
const onClick19 = () => {
setShowResults0(false);
setShowResults1(false);
setShowResults2(false);
setShowResults3(false);
setShowResults4(false);
setShowResults5(false);
setShowResults6(false);
setShowResults7(false);
setShowResults8(false);
setShowResults9(false);
setShowResults10(false);
setShowResults11(false);
setShowResults12(false);
setShowResults13(false);
setShowResults14(false);
setShowResults15(false);
setShowResults16(false);
setShowResults17(false);
setShowResults18(false);
setShowResults19(!showResults18);
};
// const onClick19 = () => {
// setShowResults0(false);
// setShowResults1(false);
// setShowResults2(false);
// setShowResults3(false);
// setShowResults4(false);
// setShowResults5(false);
// setShowResults6(false);
// setShowResults7(false);
// setShowResults8(false);
// setShowResults9(false);
// setShowResults10(false);
// setShowResults11(false);
// setShowResults12(false);
// setShowResults13(false);
// setShowResults14(false);
// setShowResults15(false);
// setShowResults16(false);
// setShowResults17(false);
// setShowResults18(false);
// setShowResults19(!showResults18);
// };

return (
<div className='blk'>
Expand Down Expand Up @@ -1096,7 +1097,7 @@ const Events = () => {
/>
) : null}

<div
{/* <div
className={`${styles.col_2} ${styles.padding} `}
id="2"
onMouseEnter={aquaticsMouseEnter}
Expand All @@ -1111,13 +1112,13 @@ const Events = () => {
/>
<p>Aquatics</p>
</div>
</div> */}

{showResults19 ? (
{/* {showResults19 ? (
<Aquatics
changeState={(showResult19) => setShowResults19(false)}
/>
) : null}
) : null} */}
</div>
{/* </div> */}
</div>
Expand Down
26 changes: 13 additions & 13 deletions frontend/src/components/LandingPages/Events/Events_Components.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import taekwondo from './image/taekwondo.png';
import tennis from './image/tennis.png';
import volleyball from './image/volleyball.png';
import weightlifting from './image/weightlifting.png';
import aquatics from './image/aquatics.png';
// import aquatics from './image/aquatics.png';
import AthleticsPDF from './athletics.pdf';
import BadmintonPDF from './badminton.pdf';
import BasketballPDF from './basketball.pdf';
Expand Down Expand Up @@ -120,17 +120,17 @@ class Person {
}


const Aquatics = (props) => {
return (
<EventCard
captainsArray={[ new Person("Bisesh Agarwal (M)", "7001782556", )]}
imageSrc={aquatics}
eventName="Aquatics"
rulebookPDF={AthleticsPDF}
{...props}
/>
);
};
// const Aquatics = (props) => {
// return (
// <EventCard
// captainsArray={[ new Person("Bisesh Agarwal (M)", "7001782556", )]}
// imageSrc={aquatics}
// eventName="Aquatics"
// rulebookPDF={AthleticsPDF}
// {...props}
// />
// );
// };

const Athletics = (props) => {
return (
Expand Down Expand Up @@ -383,5 +383,5 @@ export {
Tennis,
Volleyball,
WeightLifting,
Aquatics,
// Aquatics,
};

0 comments on commit 02fc67e

Please sign in to comment.