Merge pull request RamGoel#8 from amarjyothi98/main

modified team cards, added desc of core team, added sponsorship link …
Aditya-Harsh · Apr 16, 2023 · c066db7 · c066db7
2 parents 48319a2 + f41be3c
commit c066db7
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/src/Atoms/NavCopy.jsx b/src/Atoms/NavCopy.jsx
@@ -6,7 +6,9 @@ import { Link } from 'react-router-dom'
 function Navbar() {
     return (
         <nav className="px-3 navbar navbar-expand-lg navbar-light ">
-            <img src="https://i.ibb.co/51ZNnWz/Genero23-01-1.png" width="50px" alt="" />
+            <Link to="/home?loaded=true=query=home-carousel">
+                <img src="https://i.ibb.co/51ZNnWz/Genero23-01-1.png" width="50px" alt="" />
+            </Link>
             <button className="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavAltarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
                 <span className="navbar-toggler-icon"></span>
             </button>

diff --git a/src/Atoms/Navbar.jsx b/src/Atoms/Navbar.jsx
@@ -6,7 +6,9 @@ import { Link } from 'react-router-dom'
 function Navbar() {
     return (
         <nav className="px-3 navbar navbar-expand-lg navbar-light ">
-            <img src="https://i.ibb.co/51ZNnWz/Genero23-01-1.png" width="50px" alt="" />
+            <a href="#home-carousel">
+                <img src="https://i.ibb.co/51ZNnWz/Genero23-01-1.png" width="50px" alt="" />
+            </a>
             <button className="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavAltarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
                 <span className="navbar-toggler-icon"></span>
             </button>

diff --git a/src/Pages/Footer/Footer.js b/src/Pages/Footer/Footer.js
@@ -6,7 +6,7 @@ import {
     faYoutube,
 } from "@fortawesome/free-brands-svg-icons";
 import './Footer.css';
-import { Link } from 'react-router-dom';
+// import { Link } from 'react-router-dom';
 
 
 const Footer = () => {
@@ -29,10 +29,10 @@ const Footer = () => {
                     <h3 className='ulhead'>Links</h3>
                     <div>
 
-                        <a href='/'>Sponsorship Brochure</a>
+                        <a href='https://drive.google.com/file/d/1kx7sKbX8WTmZ_m4x9WlsmI-ERI1V-bM8/view?usp=sharing'>Sponsorship Brochure</a>
                         <a href="https://drive.google.com/file/d/1O05zyCmPEg-muoht9DzlBuTJDyAP7lB3/view?usp=share_link">Cultural Rules</a>
                         <a href="https://drive.google.com/file/d/1K1qs5Er882QJR5Rq48n1UuUscbelfz96/view?usp=share_link">Event Details</a>
-                        <Link to="/cultural">Events</Link>
+                        {/* <Link to="/cultural">Events</Link> */}
                     </div>
                 </div>
 

diff --git a/src/Pages/TeamPage/TeamPage.js b/src/Pages/TeamPage/TeamPage.js
@@ -4,16 +4,19 @@ import SubTeamData from '../../components/team/SubTeamData'
 import Team from '../../components/team/Team'
 import Subteam from '../../components/team/Subteam'
 import Navbar from '../../Atoms/NavCopy'
+import Footer from '../Footer/Footer'
+
 export default function TeamPage() {
   return (
     <div id='team'>
-      <Navbar />
+      <Navbar id='team-navbar'/>
       <Team/>
       <div className='subteam-unique'>
         {SubTeamData.map((p) => 
            <Subteam key={p.id} post={p}/>
         )}
       </div>
+        <Footer/>
     </div>
   )
 }
diff --git a/src/Pages/TeamSection.jsx b/src/Pages/TeamSection.jsx
@@ -23,7 +23,7 @@ function TeamSection() {
         <div className=' w-100'>
 
           <h1 style={{ fontSize: '50px' }}>#TheTeam</h1>
-          <Link to="/teampage"><button>See All Members</button></Link>
+          <Link to="/teampage?loaded=true=query=team-navbar"><button>See All Members</button></Link>
         </div>
       </div>
 

diff --git a/src/components/team/Team.js b/src/components/team/Team.js
@@ -3,7 +3,7 @@ import React from 'react'
 import  './team.css'
 
 import LinkedInIcon from '@mui/icons-material/LinkedIn';
-import EmailIcon from '@mui/icons-material/Email';
+// import EmailIcon from '@mui/icons-material/Email';
 import InstagramIcon from '@mui/icons-material/Instagram';
 
 // Profile Images
@@ -42,10 +42,9 @@ export default function Team() {
                     <div className="info">
                         <h3>Utkarsh Singh</h3>
                         <span>General Secretary</span>
-                        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia sint debitis et deleniti nulla animi modi minima quod dignissimos illum.</p>
+                        <p>I am ambitious and driven. I thrive on challenge and constantly set goals for myself.</p>
                         <div className="icons">
                             <a href="s"><LinkedInIcon/></a>
-                            <a href="	[email protected]"><EmailIcon/></a>
                             <a href="utkarshsinghh__"><InstagramIcon/></a>
                         </div>
                     </div>
@@ -68,7 +67,6 @@ export default function Team() {
                         <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia sint debitis et deleniti nulla animi modi minima quod dignissimos illum.</p>
                         <div className="icons">
                             <a href="s"><LinkedInIcon/></a>
-                            <a href="s"><EmailIcon/></a>
                             <a href="s"><InstagramIcon/></a>
                         </div>
                     </div>
@@ -86,7 +84,6 @@ export default function Team() {
                         <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia sint debitis et deleniti nulla animi modi minima quod dignissimos illum.</p>
                         <div className="icons">
                             <a href="s"><LinkedInIcon/></a>
-                            <a href="s"><EmailIcon/></a>
                             <a href="s"><InstagramIcon/></a>
                         </div>
                     </div>
@@ -101,10 +98,9 @@ export default function Team() {
                     <div className="info">
                         <h3>Chanchal Malik</h3>
                         <span>Joint Secretary</span>
-                        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia sint debitis et deleniti nulla animi modi minima quod dignissimos illum.</p>
+                        <p>I'm a dynamic and versatile individual with a plethora of talents and skills.</p>
                         <div className="icons">
                             <a href="	https://www.linkedin.com/in/chanchal-malik-9a271a204"><LinkedInIcon/></a>
-                            <a href="	[email protected]"><EmailIcon/></a>
                             <a href="	https://instagram.com/_titan.nick_?igshid=ZDdkNTZiNTM="><InstagramIcon/></a>
                         </div>
                     </div>
@@ -119,10 +115,9 @@ export default function Team() {
                     <div className="info">
                         <h3>Aditya Gupta</h3>
                         <span>Joint Secretary</span>
-                        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia sint debitis et deleniti nulla animi modi minima quod dignissimos illum.</p>
+                        <p className='adityaGupta-para'>Bringing creativity to life as Joint Secretary of my college's cultural fest. Art, and literature enthusiast with a passion for creating experiences.</p>
                         <div className="icons">
                             <a href="	https://www.linkedin.com/in/i-am-aditya-gupta/"><LinkedInIcon/></a>
-                            <a href="s"><EmailIcon/></a>
                             <a href="https://www.instagram.com/aditya_harsh_official/"><InstagramIcon/></a>
                         </div>
                     </div>
@@ -142,10 +137,9 @@ export default function Team() {
                     <div className="info">
                         <h3>Aditya Kumar Singh</h3>
                         <span>Treasurer</span>
-                        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia sint debitis et deleniti nulla animi modi minima quod dignissimos illum.</p>
+                        <p>	The bigger and challenging the task, better the craze to solve it.</p>
                         <div className="icons">
                             <a href="	https://www.linkedin.com/in/aditya-singh-968a231a9"><LinkedInIcon/></a>
-                            <a href="s"><EmailIcon/></a>
                             <a href="https://instagram.com/alone13241423?igshid=ZDdkNTZiNTM="><InstagramIcon/></a>
                         </div>
                     </div>
@@ -164,7 +158,6 @@ export default function Team() {
                         <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia sint debitis et deleniti nulla animi modi minima quod dignissimos illum.</p>
                         <div className="icons">
                             <a href="s"><LinkedInIcon/></a>
-                            <a href="s"><EmailIcon/></a>
                             <a href="something"><InstagramIcon/></a>
                         </div>
                     </div>
@@ -180,10 +173,9 @@ export default function Team() {
                     <div className="info">
                         <h3>Siddhant</h3>
                         <span>Treasurer</span>
-                        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia sint debitis et deleniti nulla animi modi minima quod dignissimos illum.</p>
+                        <p>I am a hard-working and driven individual who isn’t afraid to face a challenge. </p>
                         <div className="icons">
                             <a href="https://www.linkedin.com/in/siddhant-singh-3a56081b3"><LinkedInIcon/></a>
-                            <a href="s"><EmailIcon/></a>
                             <a href="something"><InstagramIcon/></a>
                         </div>
                     </div>

diff --git a/src/components/team/team.css b/src/components/team/team.css
@@ -146,3 +146,7 @@
 #subteam {
     height: 400px;
 }
+
+.adityaGupta-para {
+    margin: 0;
+}