Skip to content

Commit

Permalink
Merge pull request #1 from Vishruth-S/master
Browse files Browse the repository at this point in the history 
Merging changes made to the team page
  • Loading branch information
@prnvsan
prnvsan authored Dec 16, 2020
2 parents c5d67f2 + 3fdaaf4 commit fe13fc2
Show file tree
Hide file tree
Showing 11 changed files with 247 additions and 9 deletions.
1 change: 1 addition & 0 deletions debug.log
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[1125/122112.955:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
2 changes: 1 addition & 1 deletion public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/logo.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
Expand Down
9 changes: 9 additions & 0 deletions public/logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/icon-linkedin.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 6 additions & 3 deletions src/components/Navbar/Navbar.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { NavHashLink as NavLink } from 'react-router-hash-link';
import { Link } from "react-router-dom";
import { Navbar, Nav } from 'react-bootstrap';
import { GiHamburgerMenu } from "react-icons/gi";
Expand All @@ -14,8 +15,10 @@ function Navigation(){
return(
<div className="container-fluid">
<Navbar expand="lg" fixed="top" style={ {"background":"white"} }>
<Navbar.Brand href="#home">
<img src={ logo } alt="Home"/>
<Navbar.Brand>
<NavLink to="/#home" smooth={true} spy={true} duration={2000}>
<img src={ logo } alt="Home"/>
</NavLink>
</Navbar.Brand>
<Navbar.Toggle aria-controls="responsive-navbar-nav"> <GiHamburgerMenu style={{color: "#808080", fontSize: "1.5rem"}}/> </Navbar.Toggle>
<Navbar.Collapse className="justify-content-end" id="responsive-navbar-nav">
Expand All @@ -35,7 +38,7 @@ function Navigation(){
<Nav.Link as={Link} to="/contact" className="nav-item">
Contact Us
</Nav.Link>
<Nav.Link href="https://discord.com/" target="_blank">
<Nav.Link href="https://discord.com/invite/XpQEB5d" target="_blank">
<img className="discord-container" src={ discord } alt="discord"/>
</Nav.Link>
</Nav>
Expand Down
4 changes: 4 additions & 0 deletions src/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
box-sizing: border-box;
}

html {
scroll-behavior: smooth;
}

body {
font-family: sans-serif;
-webkit-font-smoothing: antialiased;
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Landing/Landing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import './Landing.css';

function Landing() {
return (
<section className="landing container-fluid">
<section className="landing container-fluid" id="home">
<div className=" d-none d-lg-block landingRight">
<img className="mascots" src={mascots} alt="Mascots" />
</div>
Expand All @@ -29,7 +29,7 @@ function Landing() {
</div>
<div className="scroll-down">
<p className="d-none d-md-block d-lg-block d-xl">Powered by Google Developers</p>
<Link to="/#announcements" smooth={true} spy="true" duration={1000}>
<Link to="/#announcements" smooth={true} spy="true" duration={2000}>
<img src={scrollDown} alt="Scroll Down" />
</Link>
</div>
Expand Down
36 changes: 36 additions & 0 deletions src/pages/Team/Member.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
.circle-icon{
position: relative;
display: inline-flex;
height: 8vw;
width: 8vw;
min-width: 100px;
min-height: 100px;
border-radius: 50%;
max-width: 200px;
max-height: 200px;
box-shadow: 0px 2px 10px rgba(0,0,0,0.15);
object-fit: cover;
background: #ffffff;
z-index: -1;
}

.ln-icon{
position: absolute;
display: inline-flex;
top:6.5vw;
left:3vw;
height: 2vw;
width: 2vw;
border-radius: 50%;
box-shadow: 0px 0px 20px #fff;
background: #ffffff;
}

.member{
position: relative;
height: auto;
max-width: 250px;
border-radius: 50%;
display: inline-block;
margin: 25px;
}
19 changes: 19 additions & 0 deletions src/pages/Team/Member.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import { Image } from 'react-bootstrap';

import linkedinIcon from "../../assets/img/icon-linkedin.png";
import './Member.css';

function Member(props){
return(
<div className="member">
<Image className="circle-icon" src={props.img} alt="member" />

<a href={props.link} target="_blank" rel="noreferrer">
<Image className="ln-icon" src={linkedinIcon} alt="member" />
</a>
</div>
)
}

export default Member;
3 changes: 3 additions & 0 deletions src/pages/Team/Team.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.team-heading {
margin-top: 100px;
}
169 changes: 166 additions & 3 deletions src/pages/Team/Team.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,173 @@
import React from 'react'
import React from 'react';

import Member from "./Member";
import './Team.css'

function Team() {
let circleIcon = "https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Circle_Grey_Solid.svg/1200px-Circle_Grey_Solid.svg.png";
let link = "https://www.linkedin.com/"
return (
<div>
<h1>Team</h1>
</div>
<h1 className="team-heading">Meet Our Team</h1>
<div className="lead-container">
<Member img={circleIcon} link={link}/>
</div>
<div className="web-team-container">
<h1>Web Team</h1>
<Member img={circleIcon} link={link}/>
<div className="row">
<div className="col-lg-3">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-3">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-3">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-3">
<Member img={circleIcon} link={link}/>
</div>
</div>
<div className="row">
<div className="col-lg-3">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-3">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-3">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-3">
<Member img={circleIcon} link={link}/>
</div>
</div>
</div>
<div className="design-team-container">
<h1>Design Team</h1>
<div>
<Member img={circleIcon} link={link}/>
</div>
<div className="row">
<div className="col-lg-4">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-4">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-4">
<Member img={circleIcon} link={link}/>
</div>
</div>
<div className="row">
<div className="col-lg-6">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-6">
<Member img={circleIcon} link={link}/>
</div>
</div>
</div>
<div className="ml-publicity-team container">
<div className="row">
<div className="col-sm">
<h1>ML/Ai</h1>
<div>
<Member img={circleIcon} link={link}/>
</div>
<div className="row">
<div className="col-sm">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-sm">
<Member img={circleIcon} link={link}/>
</div>
</div>
</div>
<div className="col-sm">
<h1>publicity</h1>
<div>
<Member img={circleIcon} link={link}/>
</div>
<div className="row">
<div className="col-sm">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-sm">
<Member img={circleIcon} link={link}/>
</div>
</div>
</div>
</div>
</div>
<div className="flutter-team-container">
<h1>Flutter</h1>
<div>
<Member img={circleIcon} link={link}/>
</div>
<div className="row">
<div className="col-lg-4">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-4">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-4">
<Member img={circleIcon} link={link}/>
</div>
</div>
<div className="row">
<div className="col-lg-6">
<Member img={circleIcon} link={link}/>
</div>
<div className="col-lg-6">
<Member img={circleIcon} link={link}/>
</div>
</div>
</div>
<div className="org-content-marketing-team-container">
<div class="row">
<div class="col-sm">
<h1>Organization</h1>
<div>
<Member img={circleIcon} link={link}/>
</div>
</div>
<div class="col-sm">
<h1>Content</h1>
<div>
<Member img={circleIcon} link={link}/>
</div>
<div>
<Member img={circleIcon} link={link}/>
</div>
</div>
<div class="col-sm">
<h1>Marketing</h1>
<div>
<Member img={circleIcon} link={link}/>
</div>
</div>
</div>
</div>
<div className="social-wtm-team-container">
<div class="row">
<div class="col-sm">
<h1>Social Media</h1>
<div>
<Member img={circleIcon} link={link}/>
</div>
</div>
<div class="col-sm">
<h1>WTM</h1>
<div>
<Member img={circleIcon} link={link}/>
</div>
</div>
</div>
</div>
</div >
)
}

Expand Down

0 comments on commit fe13fc2

Please sign in to comment.