Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prop types #36

Merged
merged 8 commits into from
Jun 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/components/Footer/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@

.container__footer {
display: flex;
flex-direction: row;
justify-content: space-between;
flex-direction: column;
border-top: 1px solid $colorborder;
align-items: center;
padding: 10px 0;
font-family: $defaultfont;
padding: 0 25px;
height: 70px;
border-top: 1px solid $colorborder;
@media all and (min-width: $bptablet){
flex-direction: row;
justify-content: space-between;
padding: 0 25px;
height: 70px;
}
}

.footer__nfq,
Expand Down
25 changes: 18 additions & 7 deletions src/components/Header/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@

.container__header {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: 89px;
padding: 0 39px;
position: relative;
@media all and (min-width: $bptablet){
position: relative;
height: 97px;
}
}

.header__stackList {
Expand All @@ -25,9 +29,16 @@
}

.header__button-link {
text-decoration: none;
color: $colorblue;
position: absolute;
top: 27px;
left: 39px;
}
padding: 0 0 40px 0;
@media all and (min-width: $bptablet){
text-decoration: none;
color: $colorblue;
position: absolute;
top: 27px;
left: 39px;
}
}

.header__link-image {
margin-right: 12px;
}
18 changes: 14 additions & 4 deletions src/components/Home/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
}

.header__home {
width: 372px;
width: 250px;
@media all and (min-width: $bptablet){
width: 372px;
}
}

.home__main {
Expand All @@ -33,11 +36,14 @@

.home__title {
font-family: $defaultfont;
font-size: 30px;
color: $colorwhite;
margin: 60px 30px 60px;
text-align: center;
font-size: 25px;
font-weight: normal;
@media all and (min-width: $bptablet){
font-size: 30px;
}
}

.info__btn {
Expand Down Expand Up @@ -72,15 +78,19 @@

.home__btn {
font-family: $defaultfont;
font-size: 33px;
width: 400px;
font-size: 23px;
width: 250px;
color: $colorgrey;
height: 70px;
border-radius: 5px;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
cursor: pointer;
background: $colorwhite;
border: 0;
@media all and (min-width: $bptablet){
width: 400px;
font-size: 33px;
}
}

.home__btn:hover {
Expand Down
15 changes: 12 additions & 3 deletions src/components/QuestionDetails/Answer/styles.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import '../../../scss/colors';
@import '../../../scss/variables';

.MuiPaper-root.MuiPaper-elevation1.QuestionDetails-paperAnswer-7.MuiPaper-rounded {
display: flex;
Expand All @@ -8,7 +9,10 @@
.container__text {
display: flex;
flex-direction: row;
text-align: left;
text-align: center;
@media all and (min-width: $bptablet){
text-align: left;
}
}

.answer__heart {
Expand All @@ -33,8 +37,11 @@
.container__user {
display: flex;
flex-direction: column;
align-items: flex-end;
align-items: center;
color: $colorgrey;
@media all and (min-width: $bptablet){
align-items: flex-end;
}
}

.container__face {
Expand All @@ -52,6 +59,8 @@
height: auto;
}

.answer__date  {
.answer__date {
margin: 0;
padding: 0 10px;
color: $colorgrey;
}
1 change: 1 addition & 0 deletions src/components/QuestionDetails/Form/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ class Form extends Component {

Form.propTypes = {
classPaper: PropTypes.string.isRequired,
classButton: PropTypes.string.isRequired,
updatedQuestion: PropTypes.func,
questionItem: PropTypes.object
};
Expand Down
6 changes: 6 additions & 0 deletions src/components/StackList/Button/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Fab from '@material-ui/core/Fab';
import AddIcon from '@material-ui/icons/Add';
import { withStyles, createMuiTheme } from '@material-ui/core/styles';
import { ThemeProvider } from '@material-ui/styles';
import PropTypes from 'prop-types';

const theme = createMuiTheme({
palette: {
Expand Down Expand Up @@ -34,4 +35,9 @@ function FloatingActionButtons({ dialogueFunction, classes }) {
);
}

FloatingActionButtons.propTypes = {
dialogueFunction: PropTypes.func,
classes: PropTypes.object.isRequired
};

export default withStyles(styles)(FloatingActionButtons);
5 changes: 5 additions & 0 deletions src/components/StackList/Filter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { Fragment } from 'react';
import { makeStyles } from '@material-ui/core/styles';
import TextField from '@material-ui/core/TextField';
import Grid from '@material-ui/core/Grid';
import PropTypes from 'prop-types';
import './styles.scss';

const useStyles = makeStyles(theme => ({
Expand Down Expand Up @@ -37,4 +38,8 @@ function Filter({handleInputValue}) {
);
}

Filter.propTypes = {
handleInputValue: PropTypes.func
};

export default Filter;
15 changes: 14 additions & 1 deletion src/components/StackList/Filter/styles.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@import '../../../scss/colors';
@import '../../../scss/variables';


.filter__wrapper {
background-color: $colorlightgrey;
Expand All @@ -7,7 +9,18 @@
justify-content: center;
align-items: center;
height: 100px;
padding: 0 30px;
padding: 0 20px;
@media all and (min-width: $bptablet){
padding: 0 auto;
}
}

.MuiInputBase-input.MuiInput-input{
margin: 0 20px;
max-width: 700px;
@media all and(min-width: $bptablet){
max-width: 950px;
}
}

.MuiGrid-root.MuiGrid-item.MuiGrid-grid-xs-1 {
Expand Down
21 changes: 17 additions & 4 deletions src/components/StackList/QuestionContent/styles.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@import '../../../scss/colors';
@import '../../../scss/variables';


.question__title {
color: $colorgrey;
Expand All @@ -14,8 +16,15 @@
.title__container,
.subtitle__container {
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: column;
text-align: center;
@media all and (min-width: $bptablet){
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
text-align: left;
}
}

.subtitle__container {
Expand All @@ -37,12 +46,16 @@
list-style: none;
padding: 0;
margin: 0;
align-items: center;
}

.question__tags-list {
display: flex;
justify-content: center;
padding: 15px 0;
flex-wrap: wrap;
.question__tag {
margin-right: 10px;
margin: 5px;
background-color: $colorblue;
color: $colorwhite;
padding: 5px 8px;
Expand All @@ -51,4 +64,4 @@
margin-right: 0;
}
}
}
}
2 changes: 1 addition & 1 deletion src/components/TeamInfo/Member/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const findClassIcon = iconName => {
return classForIcon;
};

export default function Member({ member: { name, bio, links, img, role } }) {
export default function Member({ member: { name, links, img, role } }) {
return (
<Fragment>
<div className="member__image--container">
Expand Down
19 changes: 16 additions & 3 deletions src/components/TeamInfo/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,19 @@
padding: 0;
margin: 0;
display: flex;
justify-content: space-between;
flex-direction: column;
align-self: center;
height: 100%;
align-items: flex-start;
flex-grow: 1;
padding: 0 0 20px;
padding: 0 10px 20px;
@media all and (min-width: 1160px){
flex-direction: row;
padding: 0 20px;
justify-content: space-between;
max-width: 1300px;
max-height: 900px;
}
}

.member__item {
Expand All @@ -46,6 +54,7 @@
justify-content: space-between;
max-width: 200px;
margin: 0 20px;
padding: 20px 0;
&:nth-child(odd) {
align-self: flex-end;
}
Expand All @@ -55,6 +64,10 @@
color: $colorblack;
max-width: 800px;
margin: 0 auto 50px;
font-size: 22px;
line-height: 30px;
font-size: 18px;
padding: 0 50px;
@media all and (min-width: $bptablet){
font-size: 22px;
}
}
2 changes: 1 addition & 1 deletion src/data/dataMembers.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const dataMembers = [
{
name: 'Leire Rico',
img: leireImg,
links: [{ name: 'github', src: 'https://github.com/leireriel' }, { name: 'linkedin', src: 'https://www.linkedin.com/in/leirerico/' }, { name: 'twitter', src: 'https://twitter.com/leireriel1?lang=es' }, { name: 'email', src: 'mailto:leirericop@gmail.com' }],
links: [{ name: 'github', src: 'https://github.com/leireriel' }, { name: 'linkedin', src: 'https://www.linkedin.com/in/leirerico/' }, { name: 'twitter', src: 'https://twitter.com/leireriel1' }, { name: 'email', src: 'mailto:leirericop@gmail.com' }],
role: 'Responsable Comunicación con la empresa'
},
{
Expand Down
1 change: 1 addition & 0 deletions src/scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
$defaultfont: 'Roboto', sans-serif;
$teamtfont: 'Playfair Display', serif;
$bptablet: 768px;