From 42d0b40d18e9a9a64ea861e3f0d3b759aa353ae7 Mon Sep 17 00:00:00 2001 From: Rajdip Sinha <55927185+rajdips834@users.noreply.github.com> Date: Sun, 29 Oct 2023 01:09:52 +0530 Subject: [PATCH 1/3] Team Functionality Added #5 * Footer Completed Functionality left * contributor list changed * Contact us section done * Card design pending * Marquee functionality added * Our team design mostly ready * Contact us button added --- package-lock.json | 10 ++++ package.json | 1 + src/App.jsx | 5 +- .../Aditya Shaw.png | Bin .../Anirban Sinha.png | Bin .../Arnab Chatterjee.png | Bin .../Bhumi Sinha.png | Bin .../Bikash Agawala.png | Bin .../Bishal Bhattacharjee.png | Bin .../Gourav Rajak.png | Bin .../Jayanta Pandit.png | Bin .../MD AMIR KHAN.png | Bin .../Moulina Pandey.png | Bin .../Niraj Modi.PNG | Bin .../Riya Kumari.png | Bin .../Rounak Kayal.png | Bin .../Shivam Kumar Shaw.png | Bin .../contactus.png | Bin .../rajdipSinha.png} | Bin src/assets/dp.png | Bin 0 -> 2811114 bytes src/assets/ourTeam.png | Bin 0 -> 10736 bytes src/components/ContactUs.jsx | 38 ---------------- src/components/NavBar.jsx | 43 +++++++++++------- src/components/contact/ContactUs.jsx | 43 ++++++++++++++++++ src/components/{ => footer}/Footer.jsx | 0 src/components/index.js | 10 ++-- src/components/marqueeCards/Marquee.jsx | 19 ++++++++ src/components/team/Card.jsx | 38 +++++++++++----- src/components/team/Team.jsx | 30 ++++++++---- src/data/data2023.json | 3 +- 30 files changed, 157 insertions(+), 83 deletions(-) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Aditya Shaw.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Anirban Sinha.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Arnab Chatterjee.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Bhumi Sinha.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Bikash Agawala.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Bishal Bhattacharjee.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Gourav Rajak.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Jayanta Pandit.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/MD AMIR KHAN.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Moulina Pandey.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Niraj Modi.PNG (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Riya Kumari.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Rounak Kayal.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/Shivam Kumar Shaw.png (100%) rename src/assets/{2023 Core Team Pic => coreTeamPictures}/contactus.png (100%) rename src/assets/{2023 Core Team Pic/Rajdip Sinha.png => coreTeamPictures/rajdipSinha.png} (100%) create mode 100644 src/assets/dp.png create mode 100644 src/assets/ourTeam.png delete mode 100644 src/components/ContactUs.jsx create mode 100644 src/components/contact/ContactUs.jsx rename src/components/{ => footer}/Footer.jsx (100%) create mode 100644 src/components/marqueeCards/Marquee.jsx diff --git a/package-lock.json b/package-lock.json index 3bdff6f..96e0d2b 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" }, @@ -1882,6 +1883,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 eb96eb7..064be53 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,10 +1,9 @@ -import {Navbar,Team,ContactUs,Footer} from "./components"; - +import { Navbar, Team, ContactUs, Footer } from "./components"; function App() { return (
- +
- ); -} diff --git a/src/components/NavBar.jsx b/src/components/NavBar.jsx index 22805e4..3e0df5b 100644 --- a/src/components/NavBar.jsx +++ b/src/components/NavBar.jsx @@ -1,22 +1,33 @@ -import React from 'react' -import Logo from '../assets/gdsc-logo.png' +import React from "react"; +import Logo from "../assets/gdsc-logo.png"; const Navbar = () => { return ( -
-
- image -

GDSC AEC

-
-
-