diff --git a/src/components/CardHome.js b/src/components/CardHome.js index 457582d..0769c74 100644 --- a/src/components/CardHome.js +++ b/src/components/CardHome.js @@ -1,10 +1,11 @@ import React from 'react' const CardHome = (props) => { - return ( - <> - -
-
- -
- -
-
+ +
+
+ +
+ +
+
+ +
+

{props.name}

+

{props.designation.toUpperCase()}

+ + +
    + {props.media.facebook && ( +
  • + + + +
    • + )} + {props.media.linkedin && ( +
  • + + + +
    • + )} + {props.media.instagram && ( +
  • + + + +
    • + )} +
+ + -
-

{props.name}

-

{props.designation.toUpperCase()}

- -
-
- - ) +
+
+ + ) } export default CardHome \ No newline at end of file diff --git a/src/data/wingData.js b/src/data/wingData.js index 7f8ef99..68e79f7 100644 --- a/src/data/wingData.js +++ b/src/data/wingData.js @@ -70,6 +70,89 @@ export const wingData = { }, ] }, + eloquense: { + name: 'eloquense', + coverImage: eloquenseImg, + aboutBrief: "'Eloquence', the official literary club of Netaji Subhash Engineering College Under Phoenix. Fostering articulate expression through public speaking, debate, communication skills development, inspiring confidence and persuasive prowess in students.", + aboutExtended: "Eloquence Club is a dynamic gathering of individuals passionate about mastering the art of communication. Through workshops, debates, and speeches, members refine their oratory skills, from persuasive rhetoric to captivating storytelling. The club fosters an environment of mutual support and constructive feedback, encouraging members to overcome stage fright and hone their confidence. With diverse topics and formats, Eloquence Club cultivates versatility in expression, empowering members to articulate ideas with clarity and impact. Whether polishing professional presentations or perfecting personal narratives, participants find a welcoming space to sharpen their eloquence and connect with like-minded communicators on a journey of continuous improvement.The Robonix Club is a student community dedicated to advancing skills and knowledge in utilizing modern technology for scientific endeavors. The club focuses on automation, artificial intelligence, and robotics. It provides a platform for students to explore these fields, turning innovative ideas into reality. The club organizes workshops, events, and technical sessions to enhance students’ understanding and practical experience in robotics, mechatronics, and related areas, fostering creativity and passion for technological advancements.", + members: [ + { + name: "soham das", + designation: "Wing Lead", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + { + name: "soham das", + designation: "Wing coordinator", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + { + name: "soham das", + designation: "Wing coordinator", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + { + name: "soham das", + designation: "Wing coordinator", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + ], + + gallery: [ + { + url: img1, + caption: "caption" + }, + { + url: img2, + caption: "caption" + }, + { + url: img3, + caption: "caption" + }, + { + url: img4, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + ] + }, robonix: { name: 'robonix', coverImage: robonixImg, @@ -152,5 +235,172 @@ export const wingData = { caption: "caption" }, ] - } + }, + nirman: { + name: 'nirman', + coverImage: nirmanImg, + aboutBrief: "Nirman is the Civil Wing of Phoenix - The official Tech club of Netaji Subhash Engineering College. Nirman engages civil engineering enthusiasts in activities, workshops, and projects to foster skill development and innovation within the field.", + aboutExtended: "Nirman is a hub for civil engineering enthusiasts, fostering skill development and networking. It offers workshops and seminars to enhance practical knowledge. Members engage in projects spanning construction, infrastructure, and sustainability, honing expertise in areas like structural analysis, project management, collaborative efforts to tackle real-world challenges, encouraging innovation and problem-solving. The club cultivates a community of future engineers, promoting camaraderie and professional growth. With a focus on hands-on learning and industry insights, Nirman Wing empowers members to excel in the dynamic field of civil engineering.", + members: [ + { + name: "soham das", + designation: "Wing Lead", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + { + name: "soham das", + designation: "Wing coordinator", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + { + name: "soham das", + designation: "Wing coordinator", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + { + name: "soham das", + designation: "Wing coordinator", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + ], + + gallery: [ + { + url: img1, + caption: "caption" + }, + { + url: img2, + caption: "caption" + }, + { + url: img3, + caption: "caption" + }, + { + url: img4, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + ] + }, + illustro: { + name: 'illustro', + coverImage: "", + aboutBrief: "Illustro is the official photography wing of Phoenix - The official Tech club of Netaji Subhash Engineering College. Capturing moments, creating memories. Explore, learn, and share your passion with Illustro. Join us to unleash your creativity through the lens.", + aboutExtended: "Illustro is a vibrant community of photography enthusiasts dedicated to capturing moments and exploring the artistry of visual storytelling. From amateur hobbyists to seasoned professionals, members share techniques, critique each other's work, and organize exhibitions to showcase their talents. Regular workshops and guest lectures by industry experts foster skill development and creativity. Through outings and photo walks, members discover new perspectives and subjects, enriching their photographic journeys. With a supportive atmosphere and a passion for imagery, Illustro serves as a hub for fostering talent and camaraderie among photographers of all levels.", + members: [ + { + name: "soham das", + designation: "Wing Lead", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + { + name: "soham das", + designation: "Wing coordinator", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + { + name: "soham das", + designation: "Wing coordinator", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + { + name: "soham das", + designation: "Wing coordinator", + profileImgUrl: "#", + socials: { + insta: "#", + github: "#", + linkedin: "#", + } + }, + ], + + gallery: [ + { + url: img1, + caption: "caption" + }, + { + url: img2, + caption: "caption" + }, + { + url: img3, + caption: "caption" + }, + { + url: img4, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + { + url: img1, + caption: "caption" + }, + ] + }, + } \ No newline at end of file diff --git a/src/pages/Clubs/Clubs.js b/src/pages/Clubs/Clubs.js index 698cb11..754389e 100644 --- a/src/pages/Clubs/Clubs.js +++ b/src/pages/Clubs/Clubs.js @@ -47,7 +47,18 @@ const data = [ link: 'nirman' }, isCLub: true + }, + { + image: "", + title: 'Illustro', + description: 'Illustro is the official photography wing of Phoenix - The official Tech club of Netaji Subhash Engineering College. Capturing moments, creating memories. Explore, learn, and share your passion with Illustro. Join us to unleash your creativity through the lens.', + extraButton: { + name: 'Learn More', + link: 'illustro' + }, + isCLub: true } + ] @@ -66,6 +77,15 @@ function Clubs() { case "robonix": setCurWing(wingData.robonix) break; + case "nirman": + setCurWing(wingData.nirman) + break; + case "eloquense": + setCurWing(wingData.eloquense) + break; + case "illustro": + setCurWing(wingData.illustro) + break; default: setCurWing() diff --git a/src/pages/Clubs/Wing.jsx b/src/pages/Clubs/Wing.jsx index a9b9b7c..9a48fea 100644 --- a/src/pages/Clubs/Wing.jsx +++ b/src/pages/Clubs/Wing.jsx @@ -1,85 +1,93 @@ import React from "react"; -import { useLocation } from 'react-router-dom'; +import { useLocation } from "react-router-dom"; import { GalleryGrid } from "../../components/GalleryGrid"; //icons import { AiFillInstagram } from "react-icons/ai"; import { FaGithub, FaLinkedinIn } from "react-icons/fa"; - const Wing = () => { - const location = useLocation() - - const { name, aboutExtended, coverImage, members, gallery } = location.state; - - return ( -
-
-
-

{name[0].toUpperCase() + name.slice(1)}

-
-
- - {/* cover image */} -
-
img -
-
-
- -
- {/* about */} -
-

About

-

{aboutExtended}

-
- - {/* wing members */} -
-

Wing Members

- - {/* ---for hierarchy --- */} - {/*
+ const location = useLocation(); + + const { name, aboutExtended, coverImage, members, gallery } = location.state; + + return ( +
+
+
+

+ {name[0].toUpperCase() + name.slice(1)} +

+
+
+ + {/* cover image */} +
+
+ {" "} + img +
+
+
+ +
+ {/* about */} +
+

About

+

{aboutExtended}

+
+ + {/* wing members */} +
+

+ Wing Members +

+ + {/* ---for hierarchy --- */} + {/*
*/} - {/* --- hierarchy --- */} - -
- {members.slice(0).map((item, index) => { - return (<> - - ) - })} -
-
- - {/* gallery */} -
-

Gallery

- -
-
+ {/* --- hierarchy --- */} + +
+ {members.slice(0).map((item, index) => { + return ( + <> + + + ); + })} +
- ) -} - + {/* gallery */} +
+

Gallery

+ +
+
+
+ ); +}; const MemberCard = ({ name, designation, socials }) => { - return (<> - - -
-
- img -
-
-

{name}

-

{designation}

-
-
    -
    • -
    • -
    • -
+ + +
+
+ img
- ) -} - -export default Wing; \ No newline at end of file +
+

{name}

+

{designation}

+
+ +
+ + ); +}; + +export default Wing; diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js index 4f9b51e..b58247f 100644 --- a/src/pages/Home/Home.js +++ b/src/pages/Home/Home.js @@ -7,13 +7,13 @@ import "./Home.css"; import "./glitch.css" import { Button } from "@chakra-ui/react"; import ZigBox from "../../components/ZigBox"; -import { useNavigate } from "react-router-dom"; + import { db } from "../../firebase-config"; import { getDocs, collection } from "firebase/firestore"; import Carousel from "react-multi-carousel"; import "react-multi-carousel/lib/styles.css"; import CardHome from "../../components/CardHome"; -import PopOver from "../../components/PopOver"; + function Home() { @@ -67,19 +67,20 @@ function Home() { try { const data = await getDocs(membersCollectionRef); + const filteredData = data.docs.map((doc) => ({ ...doc.data(), id: doc.id, })); - // console.log(filteredData) - - let lastYearData = filteredData.filter( - (element) => - parseInt(element.year.split("-")[0]) + 1 === date.getFullYear() + let newFilteredData = filteredData.filter( + (e) => parseInt(e.year.split("-")[1]) !== date.getFullYear() ); - setYearList(lastYearData); - // console.log(lastYearData); + + + setYearList(newFilteredData); + + } catch (error) { console.error(error); } @@ -89,7 +90,7 @@ function Home() { getMemberList(); }, []); - const navigate = useNavigate(); + const data = [ { image: img1, @@ -174,38 +175,38 @@ function Home() {
- - - - - + + + + +

@@ -214,9 +215,9 @@ function Home() {

Come Let's Rise

- - + +
-
+

OUR CORE MEMBERS

{yearList.map((element) => { - return element.members.map((e, index) => { - return ( - - ); - //
- - //
- }); + if (element.year === "2023-24") { + const cardHomeComponents = []; + + element.members.forEach((member, index) => { + cardHomeComponents.push( + + ); + }); + + return cardHomeComponents; + } else { + return null; + } })} + +
- + ); }