-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
123 additions
and
64 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,38 @@ | ||
| <<<<<<< HEAD:src/components/NavBar.jsx | ||
| import React from 'react' | ||
| import Logo from '../assets/gdsc-logo.png' | ||
| ======= | ||
| import React from "react"; | ||
| import Logo from "../../assets/gdsc-logo.png"; | ||
| >>>>>>> team/initial-design:src/components/NavBar/NavBar.jsx | ||
| const Navbar = () => { | ||
| return ( | ||
| <div className='w-[100%] flex justify-center items-center py-6 relative'> | ||
| <div className='flex justify-center items-center absolute left-[5vw] gap-1'> | ||
| <img src={Logo} alt="image" className='h-[3.5rem]'/> | ||
| <h1 className='font-bold text-lg text-[#767676]'>GDSC AEC</h1> | ||
| </div> | ||
| <div style={{boxShadow:' 0 0 10px rgba(0, 0, 0, 0.2)'}} className=' px-[5em] rounded-full '> | ||
| <ul className=' flex justify-center items-center gap-12 drop-shadow-2xl text-sm h-[6.4vh] text-[#535353] transition-all delay-300'> | ||
| <li className='hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500'>About us</li> | ||
| <li className='hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500'>Event</li> | ||
| <li className='hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500'>Our Team</li> | ||
| <li className='hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500'>Contact</li> | ||
| <div className="w-[100%] flex justify-center items-center py-6 relative"> | ||
| <div className="flex justify-center items-center absolute left-[5vw] gap-1"> | ||
| <img src={Logo} alt="image" className="h-[3.5rem]" /> | ||
| <h1 className="font-bold text-lg text-[#767676]">GDSC AEC</h1> | ||
| </div> | ||
| <div | ||
| style={{ boxShadow: " 0 0 10px rgba(0, 0, 0, 0.2)" }} | ||
| className=" px-[5em] rounded-full " | ||
| > | ||
| <ul className=" flex justify-center items-center gap-12 drop-shadow-2xl text-sm h-[6.4vh] text-[#535353] transition-all delay-300"> | ||
| <li className="hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500"> | ||
| About us | ||
| </li> | ||
| <li className="hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500"> | ||
| Event | ||
| </li> | ||
| <li className="hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500"> | ||
| Our Team | ||
| </li> | ||
| <li className="hover:border-b-2 hover:border-b-blue-400 hover:cursor-pointer hover:text-blue-500"> | ||
| Contact | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
| ); | ||
| }; | ||
|
|
||
| export default Navbar | ||
| export default Navbar; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,29 @@ | ||
| import * as data from "../../data/data2023.json"; | ||
| import Marquee from "../marqueeCards/Marquee"; | ||
| import Card from "./Card"; | ||
| import ourTeam from "../../assets/ourTeam.png"; | ||
| export default function Team() { | ||
| console.log(data.teamMembers[0]); | ||
| const colourChoices = ["#EA4335", "#34A853", "#4285F4", "#FBBC05"]; | ||
| return ( | ||
| <div className="flex 6flex-row justify-evenly"> | ||
| <Card | ||
| name={data.teamMembers[0].name} | ||
| role={data.teamMembers[0].role} | ||
| linkedin={data.teamMembers[0].linkedinUrl} | ||
| github={data.teamMembers[0].githubUrl} | ||
| twitter={data.teamMembers[0].twitterUrl} | ||
| image={data.teamMembers[0].image} | ||
| /> | ||
| <div | ||
| style={{ display: "flex", alignItems: "center", flexDirection: "column" }} | ||
| > | ||
| <img src={ourTeam} alt="Our Team" /> | ||
| <Marquee direction="left"> | ||
| {data.teamMembers.map((members, index) => ( | ||
| <Card | ||
| name={members.name} | ||
| role={members.role} | ||
| linkedin={members.linkedinUrl} | ||
| github={members.githubUrl} | ||
| twitter={members.twitterUrl} | ||
| image={members.image} | ||
| key={index} | ||
| colour={colourChoices[index % 4]} | ||
| /> | ||
| ))} | ||
| </Marquee> | ||
| </div> | ||
| ); | ||
| } |