Skip to content
This repository has been archived by the owner on Feb 17, 2019. It is now read-only.

Commit

Permalink
Added Team page
Browse files Browse the repository at this point in the history
  • Loading branch information
DivyeshPuri committed Dec 21, 2018
1 parent ddeb3cd commit df2b706
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 4 deletions.
27 changes: 27 additions & 0 deletions src/components/Team-Container/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react';
import {connect} from 'react-redux';

import Team from '../team';
import './styles.css';

class About extends React.Component {
componentDidMount() {
document.body.scrollTop = 0;
}
render() {
return <div className="uk-container">
<div className={'uk-margin-large-top'}>
<div className={'team-title'}>Team</div>
{this.props.team.map((team, idx) => <Team key={idx} team={team}/>)}
</div>
</div>
}
}

const mapStateToProps = state => {
return {
team: state.team.team
}
};

export default connect(mapStateToProps)(About);
6 changes: 6 additions & 0 deletions src/components/Team-Container/styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.team-title {
padding-left: 8px;
font-size: 4rem;
font-style: italic;
font-weight: bolder;
}
2 changes: 2 additions & 0 deletions src/components/header/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ class Header extends React.Component {
<Link className={'heading-text'} to={'/timeline'}><span>Timeline</span></Link></li>
<li className={[this.props.location.pathname === '/about' ? 'uk-active' : ''].join(' ')}>
<Link className={'heading-text'} to={'/about'}><span>About</span></Link></li>
<li className={[this.props.location.pathname === '/team' ? 'uk-active' : ''].join(' ')}>
<Link className={'heading-text'} to={'/team'}><span>Team</span></Link></li>
<li className={[this.props.location.pathname === '/dashboard' ? 'uk-active' : ''].join(' ')}>
{!this.props.signedIN ? <SignIn/> : <Link className={'heading-text'} to={'/dashboard'}>
<span>Dashboard</span></Link>}</li>
Expand Down
8 changes: 4 additions & 4 deletions src/components/team/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ class Team extends React.Component {
return <div className="team-section">
<div uk-grid="true" className={'uk-grid-large uk-child-width-expand@s'}>
{this.props.team.members.map((member, idx) => <div
className={'uk-width-1-3@s uk-width-1-4@m uk-width-1-5@l uk-margin-large-top uk-text-center'} key={idx}>
<img src={member.img ? member.img : '/fest-logo.png'} className={'uk-thumbnail uk-border-circle'}
className={'uk-width-1-3@s uk-width-1-4@m uk-width-1-5@l uk-margin-large-top'} key={idx}>
<img src={member.img ? member.img : '/fest-logo.png'} className={'uk-thumbnail'}
alt={member.name}
style={{width: '100%', overflow: 'hidden', backgroundSize: 'cover', backgroundPosition: 'center'}}/>
<div className={'uk-margin-top'}>{member.name}</div>
<div>
[ <span className={'primary-color'}>{this.props.team.name}</span> ]
<span className={'primary-color team-name'}>{this.props.team.name}</span>
</div>
<div className={'uk-margin-left'}>
<div className="team-name">
{member.links.github &&
<a href={member.links.github} target={'_blank'} className={'uk-margin-right team-ext'}><FaGithub/></a>}
{member.links.linkedin &&
Expand Down
4 changes: 4 additions & 0 deletions src/components/team/team.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
.team-section{
padding: 5px;
}

.team-name {
font-size: small;
}
3 changes: 3 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import About from './components/about';
import Dashboard from './components/dashboard';
import Event from './components/event';
import Timeline from './components/timeline';
import Team from './components/Team-Container';
import TeamContainer from './components/Team-Container';

// UIKit
UIKit.use(Icons);
Expand Down Expand Up @@ -52,6 +54,7 @@ ReactDOM.render(
<Route exact path={'/timeline'} component={Timeline}/>
<Route exact path={'/events/:id'} component={Event}/>
<Route exact path={'/about'} component={About}/>
<Route exact path={'/team'} component={TeamContainer}/>
</Switch>
<Footer/>
</div>
Expand Down

0 comments on commit df2b706

Please sign in to comment.