Skip to content
This repository has been archived by the owner on May 28, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into feat/mentors-page
Browse files Browse the repository at this point in the history
  • Loading branch information
thayannevls authored Oct 11, 2019
2 parents 8604d3b + 99ed01e commit 57ab10d
Show file tree
Hide file tree
Showing 10 changed files with 127 additions and 5 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GITHUB_TOKEN=
50 changes: 50 additions & 0 deletions data/equipe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[
{
"name": "Thayanne Luiza",
"urlGithub": "https://github.com/thayannevls"
},
{
"name": "Fanny Vieira",
"urlGithub": "https://github.com/fanny"
},
{
"name": "Héricles Emanuel",
"urlGithub": "https://github.com/hericlesme"
},
{
"name": "José Renan",
"urlGithub": "https://github.com/JoseRenan"
},
{
"name": "José Robson",
"urlGithub": "https://github.com/JRobsonJr"
},
{
"name": "Juan Barros",
"urlGithub": "https://github.com/JuanBarros2"
},
{
"name": "Julio Guedes",
"urlGithub": "https://github.com/juliobguedes"
},
{
"name": "Lucas Medeiros",
"urlGithub": "https://github.com/lucasmedeiros"
},
{
"name": "Matheus Alves",
"urlGithub": "https://github.com/alvesmatheus"
},
{
"name": "Paulo Leitão",
"urlGithub": "https://github.com/paulojbleitao"
},
{
"name": "Pedro Espíndula",
"urlGithub": "https://github.com/pedroespindula"
},
{
"name": "Ivyna Santino",
"urlGithub": "https://github.com/ivynasantino"
}
]
1 change: 0 additions & 1 deletion src/components/app/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const AppHeader = () => (
<HeaderWrapperNavLinks>
<HeaderNavLink to="/quem-somos">Quem Somos?</HeaderNavLink>
<HeaderNavLink to="/junte-se">Junte-se!</HeaderNavLink>
<HeaderNavLink to="/contribuir">Contribuir</HeaderNavLink>
</HeaderWrapperNavLinks>
</Header>
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/app/Routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import React from 'react';
import { Switch, Route } from 'react-router-dom';
import ProjectsPage from '../projects/ProjectsPage';
import JoinUsPage from '../joinus/JoinUsPage';
import TeamPage from '../team/TeamPage';

const Routes = () => (
<Switch>
<Route exact path="/" component={ProjectsPage} />
<Route path="/quem-somos" render={() => <div />} />
<Route path="/quem-somos" render={TeamPage} />
<Route path="/junte-se" component={JoinUsPage} />
<Route path="/contribuir" render={() => <div />} />
</Switch>
);

Expand Down
20 changes: 20 additions & 0 deletions src/components/team/Member.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// @flow

import React from 'react';
import type { MemberProps } from './member';
import './teamPage.css';

const Member = ({ name, urlGithub }: MemberProps) => (
<div className="member">
<a href={urlGithub}>
<img
className="member-image"
src={`${urlGithub}.png`}
alt={urlGithub}
/>
</a>
<figcaption className="member-name">{name}</figcaption>
</div>
);

export default Member;
17 changes: 17 additions & 0 deletions src/components/team/TeamPage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// @flow

import React from 'react';
import Member from './Member';
import members from '../../../data/equipe.json';
import './teamPage.css';

const renderMembers = () =>
members.map(member => (
<li>
<Member {...member} />
</li>
));

const TeamPage = () => <ul className="team">{renderMembers()}</ul>;

export default TeamPage;
6 changes: 6 additions & 0 deletions src/components/team/member.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @flow

export type MemberProps = {
name: string,
urlGithub: string,
};
29 changes: 29 additions & 0 deletions src/components/team/teamPage.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
.team {
display: flex;
flex-wrap: wrap;
justify-content: center;
}
ul {
list-style: none;
}

.member {
display: flex;
flex-direction: column;
margin: 8px;
transition: transform 0.2s ease;
}

.member:hover {
transform: scale(1.2);
}

.member-image {
align-self: center;
object-fit: cover;
max-width: 130px;
border-radius: 50%;
}
.member-name {
align-self: center;
}
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import './index.css';
import 'blueprint-css/dist/blueprint.min.css';

const mountNode = document.getElementById('app');

ReactDOM.render(
<BrowserRouter>
<App />
Expand Down
3 changes: 1 addition & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5097,8 +5097,7 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0"
ajv-keywords "^3.1.0"


schema-utils@^2.0.0:
schema-utils@^2.0.0, schema-utils@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.4.1.tgz#e89ade5d056dc8bcaca377574bb4a9c4e1b8be56"
integrity sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==
Expand Down

0 comments on commit 57ab10d

Please sign in to comment.