From 50acfbd18ada8291f5ad87420bc998765e521e8d Mon Sep 17 00:00:00 2001 From: Rajdip Sinh Date: Sat, 28 Oct 2023 11:52:15 +0530 Subject: [PATCH 1/2] Marquee functionality added --- CONTRIBUTORS | 3 -- package-lock.json | 10 ++++++ package.json | 1 + src/App.jsx | 11 ++---- src/{Assests => assets}/gdsc-logo.png | Bin src/components/NavBar/NavBar.jsx | 43 +++++++++++++++--------- src/components/footer/Footer.jsx | 14 -------- src/components/marqueeCards/Marquee.jsx | 16 +++++++++ src/components/team/Card.jsx | 26 ++++++++------ src/components/team/Team.jsx | 25 +++++++++----- 10 files changed, 88 insertions(+), 61 deletions(-) rename src/{Assests => assets}/gdsc-logo.png (100%) create mode 100644 src/components/marqueeCards/Marquee.jsx diff --git a/CONTRIBUTORS b/CONTRIBUTORS index be02927..73bada8 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,7 +1,4 @@ Niraj Modi Jayanta Pandit Rajdip Sinha -<<<<<<< HEAD -======= Shivam kumar Shaw ->>>>>>> 8edfb0f806db73a6c5fa74aa22c70469c2ea7a62 diff --git a/package-lock.json b/package-lock.json index 798189a..fab733e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "react": "^18.2.0", "react-dom": "^18.2.0", + "react-fast-marquee": "^1.6.2", "react-icons": "^4.11.0", "web-vitals": "^2.1.4" }, @@ -1922,6 +1923,15 @@ "react": "^18.2.0" } }, + "node_modules/react-fast-marquee": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/react-fast-marquee/-/react-fast-marquee-1.6.2.tgz", + "integrity": "sha512-bXUuW1r+Yzd8ZjsPmMDy8WJMubHAZd/7n0W/IzUQHtd0iBfxWohP6hzCFnEHWMCOtC9wxSAq/BiEnig4kdI2Vw==", + "peerDependencies": { + "react": ">= 16.8.0 || 18.0.0", + "react-dom": ">= 16.8.0 || 18.0.0" + } + }, "node_modules/react-icons": { "version": "4.11.0", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.11.0.tgz", diff --git a/package.json b/package.json index 1767f57..2c1e935 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "dependencies": { "react": "^18.2.0", "react-dom": "^18.2.0", + "react-fast-marquee": "^1.6.2", "react-icons": "^4.11.0", "web-vitals": "^2.1.4" }, diff --git a/src/App.jsx b/src/App.jsx index eee5cda..6745034 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,20 +1,13 @@ -<<<<<<< HEAD -import ContactUs from "./components/contact/ContactUs"; -======= import Navbar from "./components/NavBar/NavBar"; ->>>>>>> 8edfb0f806db73a6c5fa74aa22c70469c2ea7a62 import Footer from "./components/footer/Footer"; import Team from "./components/team/Team"; - +import ContactUs from "./components/contact/ContactUs"; function App() { return (
-<<<<<<< HEAD + -======= - ->>>>>>> 8edfb0f806db73a6c5fa74aa22c70469c2ea7a62
); diff --git a/src/Assests/gdsc-logo.png b/src/assets/gdsc-logo.png similarity index 100% rename from src/Assests/gdsc-logo.png rename to src/assets/gdsc-logo.png diff --git a/src/components/NavBar/NavBar.jsx b/src/components/NavBar/NavBar.jsx index a9da52e..8a7c6d4 100644 --- a/src/components/NavBar/NavBar.jsx +++ b/src/components/NavBar/NavBar.jsx @@ -1,22 +1,33 @@ -import React from 'react' -import Logo from '../../Assests/gdsc-logo.png' +import React from "react"; +import Logo from "../../assets/gdsc-logo.png"; const Navbar = () => { return ( -
-
- image -

GDSC AEC

-
-
-
    -
  • About us
    • -
  • Event
    • -
  • Our Team
    • -
  • Contact
    • +
    +
    + image +

    GDSC AEC

    +
    +
    +
      +
    • + About us +
      • +
    • + Event +
      • +
    • + Our Team +
      • +
    • + Contact +
    - ) -} + ); +}; -export default Navbar +export default Navbar; diff --git a/src/components/footer/Footer.jsx b/src/components/footer/Footer.jsx index 773d5d1..bb82d8b 100644 --- a/src/components/footer/Footer.jsx +++ b/src/components/footer/Footer.jsx @@ -4,11 +4,7 @@ import { FaLinkedin, FaInstagram, FaTwitter } from "react-icons/fa"; export default function Footer() { return (
    -<<<<<<< HEAD
    -======= -
    ->>>>>>> 8edfb0f806db73a6c5fa74aa22c70469c2ea7a62

    Dive into the new world of in-house music @@ -41,7 +37,6 @@ export default function Footer() {

    • -<<<<<<< HEAD
    • @@ -49,15 +44,6 @@ export default function Footer() {
    • -======= - -
      • -
    • - -
      • -
    • - ->>>>>>> 8edfb0f806db73a6c5fa74aa22c70469c2ea7a62
    diff --git a/src/components/marqueeCards/Marquee.jsx b/src/components/marqueeCards/Marquee.jsx new file mode 100644 index 0000000..476953e --- /dev/null +++ b/src/components/marqueeCards/Marquee.jsx @@ -0,0 +1,16 @@ +import Marquee from "react-fast-marquee"; + +const MarqueeCards = ({ children, direction }) => { + return ( + + {children} + + ); +}; + +export default MarqueeCards; diff --git a/src/components/team/Card.jsx b/src/components/team/Card.jsx index c87239c..94b6474 100644 --- a/src/components/team/Card.jsx +++ b/src/components/team/Card.jsx @@ -1,24 +1,30 @@ +import { FaLinkedin, FaGithub, FaTwitter } from "react-icons/fa"; export default function Card({ name, image, role, linkedin, github, twitter }) { - console.log(role.name); return ( -
    -
    {role}
    +
    Meh -

    {name}

    -

    {role}

    -
    +

    + {name} +

    +

    + {role} +

    +
    diff --git a/src/components/team/Team.jsx b/src/components/team/Team.jsx index a9413c5..dcb325c 100644 --- a/src/components/team/Team.jsx +++ b/src/components/team/Team.jsx @@ -1,17 +1,24 @@ import * as data from "../../data/data2023.json"; +import Marquee from "../marqueeCards/Marquee"; import Card from "./Card"; export default function Team() { console.log(data.teamMembers[0]); + return ( -
    - +
    + + {data.teamMembers.map((members, index) => ( + + ))} +
    ); } From 1ebbd83496d032f09fd706dff01a35a47b9378e4 Mon Sep 17 00:00:00 2001 From: Rajdip Sinh Date: Sat, 28 Oct 2023 14:28:02 +0530 Subject: [PATCH 2/2] Our team design mostly ready --- src/assets/ourTeam.png | Bin 0 -> 10736 bytes src/components/contact/ContactUs.jsx | 58 ++++++++++++------------ src/components/marqueeCards/Marquee.jsx | 5 +- src/components/team/Card.jsx | 19 ++++++-- src/components/team/Team.jsx | 9 +++- 5 files changed, 53 insertions(+), 38 deletions(-) create mode 100644 src/assets/ourTeam.png diff --git a/src/assets/ourTeam.png b/src/assets/ourTeam.png new file mode 100644 index 0000000000000000000000000000000000000000..13d0bc89dc195c35b5d0967c36148e872abbc992 GIT binary patch literal 10736 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 -
    - Contact Us +
    + Contact Us -
    -

    - Get in Touch -

    -

    - If you have any questions or inquiries, feel free to ask us. -

    -
    - - - -
    -
    +
    +

    + Get in Touch +

    +

    + If you have any questions or inquiries, feel free to ask us. +

    +
    + + + +
    ); diff --git a/src/components/marqueeCards/Marquee.jsx b/src/components/marqueeCards/Marquee.jsx index 476953e..9d286f2 100644 --- a/src/components/marqueeCards/Marquee.jsx +++ b/src/components/marqueeCards/Marquee.jsx @@ -1,10 +1,13 @@ import Marquee from "react-fast-marquee"; const MarqueeCards = ({ children, direction }) => { + const containerStyle = {}; return ( diff --git a/src/components/team/Card.jsx b/src/components/team/Card.jsx index 94b6474..0525635 100644 --- a/src/components/team/Card.jsx +++ b/src/components/team/Card.jsx @@ -1,10 +1,19 @@ import { FaLinkedin, FaGithub, FaTwitter } from "react-icons/fa"; -export default function Card({ name, image, role, linkedin, github, twitter }) { +export default function Card({ + name, + image, + role, + linkedin, + github, + twitter, + colour, +}) { + console.log(colour); + const className = `flex flex-col m-6 justify-center gap-2 items-center shadow-[0px_0px_15px_2px_rgba(0,0,0,0.17)] border-b-8 border-b-[${colour}] border-solid + w-[18rem] h-[22rem] shrink-0`; + return ( -
    +
    +
    + Our Team {data.teamMembers.map((members, index) => ( ))}