diff --git a/public/data/media/files/Election 2025-26.pdf b/public/data/media/files/Election 2025-26.pdf new file mode 100644 index 00000000..74e621ad Binary files /dev/null and b/public/data/media/files/Election 2025-26.pdf differ diff --git a/public/data/media/files/Rules 2025-26.pdf b/public/data/media/files/Rules 2025-26.pdf new file mode 100644 index 00000000..a8af7e5a Binary files /dev/null and b/public/data/media/files/Rules 2025-26.pdf differ diff --git a/public/data/media/images/contacts/AssociatePresident.jpg b/public/data/media/images/contacts/AssociatePresident.jpg new file mode 100644 index 00000000..53dcf5ab Binary files /dev/null and b/public/data/media/images/contacts/AssociatePresident.jpg differ diff --git a/public/data/media/images/contacts/President.png b/public/data/media/images/contacts/President.png index 212d5147..e9dea5c6 100755 Binary files a/public/data/media/images/contacts/President.png and b/public/data/media/images/contacts/President.png differ diff --git a/src/App.js b/src/App.js index 8fd172bb..adbd01c1 100755 --- a/src/App.js +++ b/src/App.js @@ -75,8 +75,8 @@ function App() { {/* Election Routes */} - {/* - */} + + {/* */} {/* Nominations Route */} {/* */} diff --git a/src/components/Navbar/Navbar.js b/src/components/Navbar/Navbar.js index d0d7d678..39f40350 100755 --- a/src/components/Navbar/Navbar.js +++ b/src/components/Navbar/Navbar.js @@ -147,7 +147,7 @@ export default function Navbar() { {/* ELECTIONS */} - {/*
  • +
  • Elections -
  • */} + {/* NOMINATIONS */} {/*
  • diff --git a/src/components/Popup.js b/src/components/Popup.js index e530fbdf..a5f105d6 100644 --- a/src/components/Popup.js +++ b/src/components/Popup.js @@ -39,9 +39,9 @@ const Popup = (props) => {
    {props.content.dates}

    {props.content.description}

    -
    Registration Link : Link
    -
    Facebook Post Link : Link
    -
    Rules and Regulations : Link
    + + +
    diff --git a/src/data/contactsData.js b/src/data/contactsData.js index 423be02a..2900780f 100755 --- a/src/data/contactsData.js +++ b/src/data/contactsData.js @@ -3,14 +3,26 @@ export default { data: [ { RollNo: "President", - Name: "Prof. Ajay Kumar Singh", + Name: "Prof. Jitendra Mahakud", Post: "President", img: "President.png", - Facebook: "https://www.facebook.com/100001621282748", - LinkedIn: "https://www.linkedin.com/in/ajay-kumar-singh-7ab680112/", + Facebook: "", + LinkedIn: "https://www.linkedin.com/in/jitendra-mahakud-26463b109/", Contact: "", - Email: "singh@phy.iitkgp.ac.in", - "Institue ids": "http://www.iitkgp.ac.in/department/PH/faculty/ph-singh", + Email: "jmahakud@hss.iitkgp.ac.in", + "Institue ids": "https://www.iitkgp.ac.in/department/PH/faculty/ph-singh", + "Institute mail ids": "", + }, + { + RollNo: " Associate President", + Name: "Prof. Arijit De", + Post: "Associate President", + img: "AssociatePresident.jpg", + Facebook: "", + LinkedIn: "", + Contact: "", + Email: "arijit@ece.iitkgp.ac.in", + "Institue ids": "https://www.iitkgp.ac.in/department/EC/faculty/ec-arijit", "Institute mail ids": "", }, { diff --git a/src/pages/Contacts/CurrentOfficeBearers.js b/src/pages/Contacts/CurrentOfficeBearers.js index 61ecc3a4..d06e1a43 100755 --- a/src/pages/Contacts/CurrentOfficeBearers.js +++ b/src/pages/Contacts/CurrentOfficeBearers.js @@ -12,6 +12,9 @@ export default function CurrentOfficeBearers() { const President = contactsData.data.find( (contact) => contact.Post === "President" ); + const Associate_President = contactsData.data.find( + (contact) => contact.Post === "Associate President" + ); const HonoraryTreasurer = contactsData.data.find( (contact) => contact.Post === "Honorary Treasurer" ); @@ -58,6 +61,18 @@ export default function CurrentOfficeBearers() { /> +
    +
    + +
    +
    diff --git a/src/pages/Elections/Elections.js b/src/pages/Elections/Elections.js index 84fcfe55..f76bd064 100644 --- a/src/pages/Elections/Elections.js +++ b/src/pages/Elections/Elections.js @@ -21,7 +21,7 @@ export default function Elections() { align="center" > {" "} - TSG Elections 2024-2025 + TSG Elections 2025-2026 @@ -35,7 +35,7 @@ export default function Elections() { Election is as follows: - Date of Election: 13th April 2024 (Saturday)
    + Date of Election: 6th April 2025 (Saturday)
    Time of Election: 8:00 AM to 6:00 PM
    Venue: Computer & Informatics Center (CIC), Takshashila, IIT Kharagpur
    @@ -48,7 +48,7 @@ export default function Elections() { Notices: - + {/*
    View Votes of Candidates
    @@ -92,7 +92,7 @@ export default function Elections() { View Schedule -
    +
    */} {/*
    Final List of Candidates for TSG Election (2023-24) @@ -120,7 +120,7 @@ export default function Elections() { Complex, IIT Kharagpur
    */} - + {/*
    Proposals of Candidates
    @@ -144,14 +144,14 @@ export default function Elections() { View List   -
    +
    */}
    - TSG Election (2024-2025) Notification + TSG Election (2025-2026) Notification
    @@ -232,7 +232,7 @@ export default function Elections() {
    - + } ); diff --git a/src/pages/Results/RenderResults.js b/src/pages/Results/RenderResults.js index 9629132d..ca8ac6f8 100644 --- a/src/pages/Results/RenderResults.js +++ b/src/pages/Results/RenderResults.js @@ -4,6 +4,8 @@ import GC from "./data/GCdata"; import InterIITdata from "./data/InterIITdata"; const years = [ + "2024-25", + "2023-24", "2022-23", "2021-22", "2020-21", diff --git a/src/pages/Results/data/GCdata.js b/src/pages/Results/data/GCdata.js index 76f6e987..3ccd70de 100644 --- a/src/pages/Results/data/GCdata.js +++ b/src/pages/Results/data/GCdata.js @@ -1619,7 +1619,221 @@ const GCdata = { Bronze: "SN/IG", }, ] + }, + "2023-24": { + Sports: { + Male: [ + { + Sport: "Overall", + Gold: "", + Silver: "", + Bronze: "" + } + ], + Female: [ + { + Sport: "Overall", + Gold: "", + Silver: "", + Bronze: "" + } + ] + }, + Technology: [], + Socult: [ + { + Event: "Overall", + Gold: "", + Silver: "", + Bronze: "" + }, + { + Event: "Hindi Elocution", + Gold: "MMM", + Silver: "LBS", + Bronze: "LLR" + }, + { + Event: "English Elocution", + Gold: "LLR", + Silver: "SN/IG", + Bronze: "MT" + }, + { + Event: "Sketching", + Gold: "RP", + Silver: "Nehru", + Bronze: "Azad" + }, + { + Event: "Groups", + Gold: "Nehru", + Silver: "MMM", + Bronze: "" + }, + { + Event: "Western Instrumentals", + Gold: "Nehru", + Silver: "MT", + Bronze: "RK" + }, + { + Event: "Western Vocals", + Gold: "SN/IG", + Silver: "Nehru", + Bronze: "MMM" + }, + { + Event: "Eastern Vocals", + Gold: "MMM", + Silver: "RP", + Bronze: "RK" + }, + { + Event: "Eastern Instrumentals", + Gold: "Nehru", + Silver: "RK", + Bronze: "Azad" + }, + { + Event: "General Quiz", + Gold: "RP", + Silver: "Nehru", + Bronze: "VS" + }, + { + Event: "Debate", + Gold: "MT", + Silver: "RK", + Bronze: "Azad" + }, + { + Event: "What's the Good Word", + Gold: "Nehru", + Silver: "RK", + Bronze: "Patel" + }, + { + Event: "Painting", + Gold: "SNVH", + Silver: "MMM", + Bronze: "JCB" + }, + { + Event: "Thermocol and Clay Modelling", + Gold: "Nehru", + Silver: "RK", + Bronze: "Patel" + }, + { + Event: "Cartooning", + Gold: "Nehru", + Silver: "Azad", + Bronze: "SN/IG" + }, + { + Event: "Short Film Making", + Gold: "", + Silver: "MS", + Bronze: "LBS" + }, + { + Event: "Stage Play", + Gold: "", + Silver: "", + Bronze: "" + }, + { + Event: "Street Play", + Gold: "", + Silver: "", + Bronze: "" + }, + { + Event: "Choreography", + Gold: "", + Silver: "", + Bronze: "" + } + ] + }, + "2024-25": { + Sports: { + Male: [ + { + Sport: "Overall", + Gold: "", + Silver: "", + Bronze: "" + } + ], + Female: [ + { + Sport: "Overall", + Gold: "", + Silver: "", + Bronze: "" + } + ] + }, + Technology: [], + Socult: [ + { + Event: "Overall", + Gold: "SN/IG", + Silver: "Azad", + Bronze: "MMM" + }, + { + Event: "Cartooning", + Gold: "Azad", + Silver: "SN/IG", + Bronze: "SNVH" + }, + { + Event: "English Elocution", + Gold: "RP", + Silver: "SN/IG", + Bronze: "MMM" + }, + { + Event: "Sketching", + Gold: "RP", + Silver: "Azad", + Bronze: "Nehru" + }, + { + Event: "Eastern Instrumentals", + Gold: "LBS", + Silver: "Nehru", + Bronze: "MS" + }, + { + Event: "Street Play", + Gold: "MMM", + Silver: "Patel", + Bronze: "RK" + }, + { + Event: "Eastern vocals", + Gold: "SN/IG", + Silver: "Nehru", + Bronze: "BRH" + }, + { + Event: "Painting", + Gold: "Azad", + Silver: "SN/IG", + Bronze: "JCB" + }, + { + Event: "Western Instrumentals", + Gold: "VS", + Silver: "JCB", + Bronze: "RK" + } + ] } }; -export default GCdata; \ No newline at end of file +export default GCdata; diff --git a/src/pages/Results/data/InterIITdata.js b/src/pages/Results/data/InterIITdata.js index 1c31b0d2..b8d820a2 100644 --- a/src/pages/Results/data/InterIITdata.js +++ b/src/pages/Results/data/InterIITdata.js @@ -1,9 +1,9 @@ const InterIITdata = { "2016-17": { - Sports: + Sports: { // MALE STANDINGS - Male:[ + Male: [ { Sport: "Overall", Gold: "Kanpur", @@ -84,7 +84,7 @@ const InterIITdata = { } ], // FEMALE STANDINGS - Female:[ + Female: [ { Sport: "Overall", Gold: "Madras , Bombay", @@ -134,7 +134,7 @@ const InterIITdata = { Bronze: "Kanpur", } ] - }, + }, Technology: [ { Event: "Overall", @@ -189,10 +189,10 @@ const InterIITdata = { ] }, "2017-18": { - Sports: + Sports: { // MALE STANDINGS - Male:[ + Male: [ { Sport: "Overall", Gold: "Bombay", @@ -279,7 +279,7 @@ const InterIITdata = { } ], // FEMALE STANDINGS - Female:[ + Female: [ { Sport: "Overall", Gold: "Madras , Bombay", @@ -329,7 +329,7 @@ const InterIITdata = { Bronze: "Kanpur", } ] - }, + }, Technology: [ { Event: "Final Standings", @@ -600,10 +600,10 @@ const InterIITdata = { ] }, "2018-19": { - Sports: + Sports: { // MALE STANDINGS - Male:[ + Male: [ { Sport: "Overall", Gold: " ", @@ -684,7 +684,7 @@ const InterIITdata = { } ], // FEMALE STANDINGS - Female:[ + Female: [ { Sport: "Overall", Gold: " ", @@ -734,7 +734,7 @@ const InterIITdata = { Bronze: " ", } ] - }, + }, Technology: [ { Event: "Overall", @@ -744,14 +744,14 @@ const InterIITdata = { }, ], Socult: [ - + ] }, "2019-20": { - Sports: + Sports: { // MALE STANDINGS - Male:[ + Male: [ { Sport: "Overall", Gold: "Kharagpur", @@ -838,7 +838,7 @@ const InterIITdata = { } ], // FEMALE STANDINGS - Female:[ + Female: [ { Sport: "Overall", Gold: "Madras", @@ -888,7 +888,7 @@ const InterIITdata = { Bronze: "Madras", } ] - }, + }, Technology: [ { Event: "Overall", @@ -1021,10 +1021,10 @@ const InterIITdata = { ] }, "2020-21": { - Sports: + Sports: { // MALE STANDINGS - Male:[ + Male: [ { Sport: "EVENTS CANCELLED DUE TO COVID-19", Gold: " ", @@ -1033,7 +1033,7 @@ const InterIITdata = { }, ], // FEMALE STANDINGS - Female:[ + Female: [ { Sport: "EVENTS CANCELLED DUE TO COVID-19", Gold: " ", @@ -1041,7 +1041,7 @@ const InterIITdata = { Bronze: " ", }, ] - }, + }, Technology: [ { Event: "Overall", @@ -1051,14 +1051,14 @@ const InterIITdata = { } ], Socult: [ - + ] }, "2021-22": { - Sports: + Sports: { // MALE STANDINGS - Male:[ + Male: [ { Sport: "EVENTS CANCELLED DUE TO COVID-19", Gold: " ", @@ -1067,7 +1067,7 @@ const InterIITdata = { }, ], // FEMALE STANDINGS - Female:[ + Female: [ { Sport: "EVENTS CANCELLED DUE TO COVID-19", Gold: " ", @@ -1075,7 +1075,7 @@ const InterIITdata = { Bronze: " ", }, ] - }, + }, Technology: [ { Event: "Overall", @@ -1094,10 +1094,10 @@ const InterIITdata = { ] }, "2022-23": { - Sports: + Sports: { // MALE STANDINGS - Male:[ + Male: [ { Sport: " ", Gold: " ", @@ -1106,7 +1106,7 @@ const InterIITdata = { }, ], // FEMALE STANDINGS - Female:[ + Female: [ { Sport: " ", Gold: " ", @@ -1114,7 +1114,7 @@ const InterIITdata = { Bronze: " ", }, ] - }, + }, Technology: [ { Event: "Overall", @@ -1179,7 +1179,89 @@ const InterIITdata = { Bronze: "Kharagpur", } ] + }, + "2023-24": { + Sports: { + Male: [], + Female: [] + }, + Technology: [], + Socult: [ + { + Event: "Overall", + Gold: "IIT Kharagpur", + Silver: "IIT Bombay", + Bronze: "IIT Roorkee" + }, + { + Event: "Quiz", + Gold: "IIT Madras", + Silver: "IIT Kharagpur", + Bronze: "IIT Bombay" + }, + { + Event: "Literary Arts", + Gold: "IIT Bombay", + Silver: "IIT Kharagpur", + Bronze: "IIT Madras" + }, + { + Event: "Speaking and Comedic Arts", + Gold: "IIT Kharagpur", + Silver: "IIT Kanpur", + Bronze: "IIT Roorkee" + }, + { + Event: "Dance Arts", + Gold: "IIT Bombay", + Silver: "IIT Guwahati", + Bronze: "IIT Dhanbad" + }, + { + Event: "Musical Arts", + Gold: "IIT Kharagpur", + Silver: "IIT Kanpur", + Bronze: "IIT Bombay" + }, + { + Event: "Theatre Arts", + Gold: "IIT Kharagpur", + Silver: "IIT Bombay", + Bronze: "IIT Guwahati" + }, + { + Event: "Filmmaking", + Gold: "IIT Bombay", + Silver: "IIT Kharagpur", + Bronze: "IIT Guwahati" + }, + { + Event: "Fine Arts", + Gold: "IIT Kharagpur", + Silver: "IIT BHU", + Bronze: "IIT Delhi" + }, + { + Event: "Digital Arts", + Gold: "IIT Kharagpur", + Silver: "IIT BHU", + Bronze: "IIT Patna" + }, + { + Event: "Fashion", + Gold: "IIT Roorkee", + Silver: "IIT Kharagpur", + Bronze: "IIT Bombay" + }, + { + Event: "Culinary Arts", + Gold: "IIT Bombay", + Silver: "IIT Guwahati", + Bronze: "IIT Mandi" + } + ] } + }; export default InterIITdata; \ No newline at end of file