diff --git a/package.json b/package.json index 8b97d2c..b60061b 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "prop-types": "^15.8.1", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-fast-marquee": "^1.6.5", "react-router-dom": "^6.22.1", "react-toastify": "^10.0.4", "vite": "^5.1.0" diff --git a/src/assets/images/About/oval.svg b/src/assets/images/About/oval.svg deleted file mode 100644 index 9f4841a..0000000 --- a/src/assets/images/About/oval.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/assets/images/About/stockimage1.svg b/src/assets/images/About/stockimage1.svg deleted file mode 100644 index 15b00c3..0000000 --- a/src/assets/images/About/stockimage1.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/assets/images/About/stockimage3.svg b/src/assets/images/About/stockimage3.svg deleted file mode 100644 index 4a8a80b..0000000 --- a/src/assets/images/About/stockimage3.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/assets/images/About/stockimage4.svg b/src/assets/images/About/stockimage4.svg deleted file mode 100644 index 85147f9..0000000 --- a/src/assets/images/About/stockimage4.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/assets/images/Core/BoscoChanam.jpg b/src/assets/images/Core/BoscoChanam.jpg new file mode 100644 index 0000000..45da57f Binary files /dev/null and b/src/assets/images/Core/BoscoChanam.jpg differ diff --git a/src/assets/images/Core/GarretFernandes.jpg b/src/assets/images/Core/GarretFernandes.jpg new file mode 100644 index 0000000..fafd764 Binary files /dev/null and b/src/assets/images/Core/GarretFernandes.jpg differ diff --git a/src/assets/images/Core/PramitSharma.jpg b/src/assets/images/Core/PramitSharma.jpg new file mode 100644 index 0000000..799fca6 Binary files /dev/null and b/src/assets/images/Core/PramitSharma.jpg differ diff --git a/src/assets/images/Core/RupaliGangarde.jpg b/src/assets/images/Core/RupaliGangarde.jpg new file mode 100644 index 0000000..965c7ea Binary files /dev/null and b/src/assets/images/Core/RupaliGangarde.jpg differ diff --git a/src/assets/images/Core/SakshamGupta.jpg b/src/assets/images/Core/SakshamGupta.jpg new file mode 100644 index 0000000..598db78 Binary files /dev/null and b/src/assets/images/Core/SakshamGupta.jpg differ diff --git a/src/assets/images/Core/SehajSaluja.jpg b/src/assets/images/Core/SehajSaluja.jpg new file mode 100644 index 0000000..0bc1ade Binary files /dev/null and b/src/assets/images/Core/SehajSaluja.jpg differ diff --git a/src/assets/images/Core/ShraddhaBhaskar.jpg b/src/assets/images/Core/ShraddhaBhaskar.jpg new file mode 100644 index 0000000..78514b9 Binary files /dev/null and b/src/assets/images/Core/ShraddhaBhaskar.jpg differ diff --git a/src/components/AboutUs/index.jsx b/src/components/AboutUs/index.jsx new file mode 100644 index 0000000..8875979 --- /dev/null +++ b/src/components/AboutUs/index.jsx @@ -0,0 +1,172 @@ +import { Link } from "react-router-dom"; +import Marquee from "react-fast-marquee"; +import Card from "@/components/Card"; + +export default function AboutSection() { + const images1 = [ + { + src: "/CodeX-Website/gallery/AIML SESSION/aiml6.jpg", + alt: "AIML Session", + key: 0, + }, + { + src: "/CodeX-Website/gallery/Community Session/cs1.jpg", + alt: "Community Session", + key: 1, + }, + { + src: "/CodeX-Website/gallery/Generative ai session/gas3.jpg", + alt: "Generative AI Session", + key: 2, + }, + { + src: "/CodeX-Website/gallery/HackTober Fest/htf2_1.jpg", + alt: "HackTober Fest Session", + key: 3, + }, + { + src: "/CodeX-Website/gallery/Laser Lock/ll7.jpg", + alt: "Laser Lock", + key: 4, + }, + { + src: "/CodeX-Website/gallery/RUST SESSION/rs1.JPG", + alt: "image1-6", + key: 5, + }, + { + src: "/CodeX-Website/gallery/AIML SESSION/aiml5.jpg", + alt: "image1-7", + key: 6, + }, + ]; + + const images2 = [ + { + src: "/CodeX-Website/gallery/Community Session/cs2.jpg", + alt: "Community Session", + key: 0, + }, + { + src: "/CodeX-Website/gallery/Generative ai session/gas1.jpg", + alt: "Gen AI Session", + key: 1, + }, + { + src: "/CodeX-Website/gallery/HackTober Fest/htf3_1.jpg", + alt: "HackTober Fest Session", + key: 2, + }, + { + src: "/CodeX-Website/gallery/Laser Lock/ll9.jpg", + alt: "Laser Lock Event", + key: 3, + }, + { + src: "/CodeX-Website/gallery/HackTober Fest/htf4_1.jpg", + alt: "HackTober Fest Session", + key: 4, + }, + { + src: "/CodeX-Website/gallery/AIML SESSION/aiml2.jpg", + alt: "AIML Session", + key: 5, + }, + { + src: "/CodeX-Website/gallery/AIML SESSION/aiml3.jpg", + alt: "AIML Session", + key: 6, + }, + ]; + + return ( + <> +
+
+
+
+

+ ABOUT US +

+ +
+

+ + Codex is the coding club at{" "} + + + Symbiosis Institute of Technology + + + {" "} + that brings together students passionate about technology and + programming. Our club is committed to creating an engaging + environment{" "} + + + where members can learn, collaborate, and grow their coding + expertise through a variety of activities and events. + +

+ + + +
+
+
+
+
+ + {images1.map((image) => ( + + {image.alt} + + ))} + + + + {images2.map((image) => ( + + {image.alt} + + ))} + +
+ + ); +} diff --git a/src/components/Card/index.jsx b/src/components/Card/index.jsx new file mode 100644 index 0000000..6c440a3 --- /dev/null +++ b/src/components/Card/index.jsx @@ -0,0 +1,17 @@ +import PropTypes from "prop-types"; + +export function Card({ children, className }) { + return
{children}
; +} + +Card.propTypes = { + children: PropTypes.node, + className: PropTypes.string, +}; + +Card.defaultProps = { + children: null, + className: "", +}; + +export default Card; diff --git a/src/pages/Gallery/Gallery.jsx b/src/pages/Gallery/Gallery.jsx index 3966df2..44c2bb9 100644 --- a/src/pages/Gallery/Gallery.jsx +++ b/src/pages/Gallery/Gallery.jsx @@ -105,7 +105,6 @@ const images = [ }, ]; - export default function Gallery() { const [modalOpen, setModalOpen] = useState(false); const [selectedImageIndex, setSelectedImageIndex] = useState(null); @@ -124,14 +123,14 @@ export default function Gallery() { // Function to navigate to the previous image const goToPrevious = () => { setSelectedImageIndex((prevIndex) => - prevIndex === 0 ? images.length - 1 : prevIndex - 1 + prevIndex === 0 ? images.length - 1 : prevIndex - 1, ); }; // Function to navigate to the next image const goToNext = () => { setSelectedImageIndex((prevIndex) => - prevIndex === images.length - 1 ? 0 : prevIndex + 1 + prevIndex === images.length - 1 ? 0 : prevIndex + 1, ); }; diff --git a/src/pages/Home/index.jsx b/src/pages/Home/index.jsx index 861f565..b42e3b0 100644 --- a/src/pages/Home/index.jsx +++ b/src/pages/Home/index.jsx @@ -1,7 +1,7 @@ import { useContext } from "react"; -import Heading from "@/components/Heading"; import { CursorVariantContext } from "@/context/CursorVariantProvider"; import PageTransition from "@/components/PageTransition"; +import AboutSection from "@/components/AboutUs"; function Home() { const { setCursorVariantText, setCursorVariantDefault } = @@ -23,7 +23,7 @@ function Home() {
- + ); } diff --git a/src/pages/Teams/TeamMember.jsx b/src/pages/Teams/TeamMember.jsx index 9f8a048..39bf9b5 100644 --- a/src/pages/Teams/TeamMember.jsx +++ b/src/pages/Teams/TeamMember.jsx @@ -3,10 +3,27 @@ import { Link } from "react-router-dom"; import LinkedInIcon from "@/assets/images/Teams/linkedin.svg"; import GithubIcon from "@/assets/images/Teams/github.svg"; import InstagramIcon from "@/assets/images/Teams/instagram.svg"; +import SakshamGuptaImage from "@/assets/images/Core/SakshamGupta.jpg"; +import RupaliGangardeImage from "@/assets/images/Core/RupaliGangarde.jpg"; +import SehajSalujaImage from "@/assets/images/Core/SehajSaluja.jpg"; +import PramitSharmaImage from "@/assets/images/Core/PramitSharma.jpg"; +import ShraddhaBhaskarImage from "@/assets/images/Core/ShraddhaBhaskar.jpg"; +import GarretFernandesImage from "@/assets/images/Core/GarretFernandes.jpg"; +import BoscoChanamImage from "@/assets/images/Core/BoscoChanam.jpg"; + +const images = { + 1: SakshamGuptaImage, + 2: RupaliGangardeImage, + 3: SehajSalujaImage, + 4: PramitSharmaImage, + 5: ShraddhaBhaskarImage, + 6: GarretFernandesImage, + 7: BoscoChanamImage, +}; function TeamMember({ member }) { - const { name, position, image, description, linkedin, instagram, github } = - member; + const { name, position, description, linkedin, instagram, github, id } = member; + const image = images[id]; return (
@@ -14,7 +31,7 @@ function TeamMember({ member }) { {name}

{name} @@ -60,11 +77,11 @@ TeamMember.propTypes = { member: PropTypes.shape({ name: PropTypes.string.isRequired, position: PropTypes.string.isRequired, - image: PropTypes.string.isRequired, description: PropTypes.string.isRequired, linkedin: PropTypes.string.isRequired, instagram: PropTypes.string.isRequired, github: PropTypes.string.isRequired, + id: PropTypes.number.isRequired, }).isRequired, }; diff --git a/src/pages/Teams/index.jsx b/src/pages/Teams/index.jsx index 0cc4ac6..2ddf3a0 100644 --- a/src/pages/Teams/index.jsx +++ b/src/pages/Teams/index.jsx @@ -1,5 +1,5 @@ import TeamMember from "@/pages/Teams/TeamMember"; -import SkewButton from "@/components/SkewButton"; +// import SkewButton from "@/components/SkewButton"; import Heading from "@/components/Heading/index"; import teamMembersData from "./teamsdata.json"; import PageTransition from "@/components/PageTransition"; @@ -21,7 +21,7 @@ function Teams() {
{teamMembers}
- + {/* */}

diff --git a/src/pages/Teams/teamsdata.json b/src/pages/Teams/teamsdata.json index 7d52aa3..886ed8c 100644 --- a/src/pages/Teams/teamsdata.json +++ b/src/pages/Teams/teamsdata.json @@ -1,38 +1,64 @@ [ { - "name": "Aditya Desai", + "name": "Saksham Gupta", "position": "PRESIDENT", - "image": "/CodeX-Website/images/teams/Aditya-Desai.jpeg", - "description": "Praesent vestibulum libero non diam Praesent vestibulum libero non diam", - "linkedin": "https://linkedin.com/in/john-doe", - "instagram": "https://instagram.com/john_doe", - "github": "https://github.com/john-doe" + "description": "\"As president, I work to get the best out of my team, stay open to different ideas, and create a strong coding culture in our college.\"", + "linkedin": "https://www.linkedin.com/in/sakshamgupta912/", + "instagram": "https://instagram.com/sakshamgupta__", + "github": "https://github.com/sakshamgupta912", + "id": 1 }, { "name": "Dr. Rupali Gangarde", "position": "FACULTY ADVISOR", - "image": "https://media-pnq1-2.cdn.whatsapp.net/v/t61.24694-24/362246050_985287035952930_3222687059276313181_n.jpg?ccb=11-4&oh=01_AdQzhJX4u0dIpMxNBjPYbrW4sfwKKQ4xbLc3kW69swB3Wg&oe=65EA2552&_nc_sid=e6ed6c&_nc_cat=106", - "description": "Praesent vestibulum libero non diam Praesent vestibulum libero non diam", - "linkedin": "https://linkedin.com/in/jane-doe", - "instagram": "https://instagram.com/jane_doe", - "github": "https://github.com/jane-doe" + "description": "\"As the guiding light of Codex Club, I provide mentorship, share insights from my experience, and help our team excel in fostering innovation and collaboration.\"", + "linkedin": "https://www.linkedin.com/in/dr-rupali-gangarde-33aa79121/", + "instagram": "https://instagram.com/rupali.gangarde", + "github": "https://github.com/", + "id": 2 }, { - "name": "Saksham Gupta", + "name": "Sehaj Saluja", "position": "VICE-PRESIDENT", - "image": "/CodeX-Website/images/teams/Saksham-Gupta.jpeg", - "description": "Praesent vestibulum libero non diam Praesent vestibulum libero non diam", - "linkedin": "https://linkedin.com/in/john-doe", - "instagram": "https://instagram.com/john_doe", - "github": "https://github.com/john-doe" + "description": "\"As the vice-president, I assist in strategic planning, lead initiatives to strengthen our club's vision, and create opportunities for members to thrive.\"", + "linkedin": "https://linkedin.com/in/sehaj-saluja/", + "instagram": "https://instagram.com/sehajsalujaaa", + "github": "https://github.com/sehajsaluja17", + "id": 3 }, { - "name": "Saksham Gupta", - "position": "VICE-PRESIDENT", - "image": "/CodeX-Website/images/teams/Saksham-Gupta.jpeg", - "description": "Praesent vestibulum libero non diam Praesent vestibulum libero non diam", - "linkedin": "https://linkedin.com/in/john-doe", - "instagram": "https://instagram.com/john_doe", - "github": "https://github.com/john-doe" + "name": "Pramit Sharma", + "position": "TECHNICAL HEAD", + "description": "\"As the technical head, I lead our coding initiatives, mentor members in honing their skills, and drive innovation through impactful projects.\"", + "linkedin": "https://linkedin.com/in/pramit-sharma/", + "instagram": "https://instagram.com/pramit.sharma", + "github": "https://github.com/MatricalDefunkt", + "id": 4 + }, + { + "name": "Shraddha Bhaskar", + "position": "EVENTS HEAD", + "description": "\"As the events head, I plan and organize engaging activities, foster collaboration among members, and bring our club’s vision to life.\"", + "linkedin": "https://linkedin.com/in/shraddha-bhaskar-77a280254/", + "instagram": "https://instagram.com/shraddha.836", + "github": "https://github.com/11sb03", + "id": 5 + },{ + "name": "Garret Fernandes", + "position": "MEDIA HEAD", + "description": "\"As the media head, I work to highlight our team's achievements, expand our media outreach, and foster a thriving tech community.\"", + "linkedin": "https://linkedin.com/in/garret-fernandez-148809249/", + "instagram": "https://instagram.com/garretfernandezz", + "github": "https://github.com/garretfernandezz", + "id": 6 + }, + { + "name": "Bosco Chanam", + "position": "TECHNICAL ADVISOR", + "description": "\"As a technical advisor, I aid the technical team with enlightening our members with new skills and technologies.\"", + "linkedin": "https://linkedin.com/in/boscochanam/", + "instagram": "https://instagram.com/boscochanam", + "github": "https://github.com/boscochanam", + "id": 7 } ] \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index f26839c..152807e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -23,6 +23,9 @@ export default { text: { light: "#F7F7F7", dark: "#232323", + aboutuslight: "#B7AB98", + aboutusdark: "#595959", + aboutusorange: "#E76941" }, gradient: { light: "#383838",