Skip to content
Snippets Groups Projects
Commit 1245a4c5 authored by Gabriel Silva Hermida's avatar Gabriel Silva Hermida Committed by Mariana Moreira
Browse files

Issue #10: Cleaning Develop

parent cc6274e4
No related branches found
No related tags found
4 merge requests!58Version 1.1,!54Issue #53: Fix password info,!15Issue/4,!8Resolve "Criar Footer"
import React from 'react'; import React from "react";
import { HashRouter, Route } from 'react-router-dom'; import { HashRouter, Route } from "react-router-dom";
import CreateForm from './pages/CreateForm'; import CreateForm from "./pages/CreateForm";
import AnswerForm from './pages/AnswerForm'; import AnswerForm from "./pages/AnswerForm";
function App() { function App() {
return ( return (
......
import React from 'react'; import React from "react";
import { makeStyles } from '@material-ui/core/styles'; import { makeStyles } from "@material-ui/core/styles";
import Grid from '@material-ui/core/Grid'; import Grid from "@material-ui/core/Grid";
import Paper from '@material-ui/core/Paper'; import Paper from "@material-ui/core/Paper";
import TextField from '@material-ui/core/TextField'; import TextField from "@material-ui/core/TextField";
import DeleteOutlinedIcon from '@material-ui/icons/DeleteOutlined'; import DeleteOutlinedIcon from "@material-ui/icons/DeleteOutlined";
import IconButton from '@material-ui/core/IconButton'; import IconButton from "@material-ui/core/IconButton";
import Select from '@material-ui/core/Select'; import Select from "@material-ui/core/Select";
import MenuItem from '@material-ui/core/MenuItem'; import MenuItem from "@material-ui/core/MenuItem";
import AddCircleIcon from '@material-ui/icons/AddCircle'; import AddCircleIcon from "@material-ui/icons/AddCircle";
import CloseIcon from '@material-ui/icons/Close'; import CloseIcon from "@material-ui/icons/Close";
import Switch from '@material-ui/core/Switch'; import Switch from "@material-ui/core/Switch";
import FormControlLabel from '@material-ui/core/FormControlLabel'; import FormControlLabel from "@material-ui/core/FormControlLabel";
import Typography from '@material-ui/core/Typography'; import Typography from "@material-ui/core/Typography";
import Radio from '@material-ui/core/Radio'; import Radio from "@material-ui/core/Radio";
import RadioGroup from '@material-ui/core/RadioGroup'; import RadioGroup from "@material-ui/core/RadioGroup";
import FieldFooterOptions from './FieldFooterOptions';
import FieldFooterOptions from "./FieldFooterOptions";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
paper: { paper: {
...@@ -26,12 +25,10 @@ const useStyles = makeStyles(theme => ({ ...@@ -26,12 +25,10 @@ const useStyles = makeStyles(theme => ({
margin: theme.spacing(2) margin: theme.spacing(2)
}, },
questionsGrid: { questionsGrid: {
marginBottom: '20px' marginBottom: "20px"
}, }
})); }));
function FormFieldRadio(props) { function FormFieldRadio(props) {
const classes = useStyles(); const classes = useStyles();
...@@ -42,13 +39,16 @@ function FormFieldRadio(props) { ...@@ -42,13 +39,16 @@ function FormFieldRadio(props) {
}; };
const options = props.options.map(function(x) { const options = props.options.map(function(x) {
return <span> return (
<span>
{x.value} {x.value}
<Radio checked={selectedValue === x.value} <Radio
checked={selectedValue === x.value}
onChange={handleChange} onChange={handleChange}
value={x.value} value={x.value}
/> />
</span>; </span>
);
}); });
return ( return (
...@@ -59,19 +59,20 @@ function FormFieldRadio(props) { ...@@ -59,19 +59,20 @@ function FormFieldRadio(props) {
{props.question} {props.question}
</Typography> </Typography>
</Grid> </Grid>
<Grid item container <Grid
item
container
direction="column" direction="column"
justify="flex-start" justify="flex-start"
alignItems="flex-start" xs={5} className={classes.questionsGrid} alignItems="flex-start"
xs={5}
className={classes.questionsGrid}
> >
<RadioGroup> <RadioGroup>{options}</RadioGroup>
{options}
</RadioGroup>
</Grid> </Grid>
</Grid> </Grid>
</Paper> </Paper>
); );
} }
export default FormFieldRadio; export default FormFieldRadio;
import React from 'react'; import React from "react";
import { makeStyles } from '@material-ui/core/styles'; import { makeStyles } from "@material-ui/core/styles";
import Grid from '@material-ui/core/Grid'; import Grid from "@material-ui/core/Grid";
import Paper from '@material-ui/core/Paper'; import Paper from "@material-ui/core/Paper";
import TextField from '@material-ui/core/TextField'; import TextField from "@material-ui/core/TextField";
import DeleteOutlinedIcon from '@material-ui/icons/DeleteOutlined'; import DeleteOutlinedIcon from "@material-ui/icons/DeleteOutlined";
import IconButton from '@material-ui/core/IconButton'; import IconButton from "@material-ui/core/IconButton";
import Typography from '@material-ui/core/Typography'; import Typography from "@material-ui/core/Typography";
import FieldFooterOptions from './FieldFooterOptions'; import FieldFooterOptions from "./FieldFooterOptions";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
paper: { paper: {
...@@ -17,8 +17,8 @@ const useStyles = makeStyles(theme => ({ ...@@ -17,8 +17,8 @@ const useStyles = makeStyles(theme => ({
margin: theme.spacing(2) margin: theme.spacing(2)
}, },
questionsGrid: { questionsGrid: {
marginBottom: '20px' marginBottom: "20px"
}, }
})); }));
function FormFieldText(props) { function FormFieldText(props) {
...@@ -39,17 +39,17 @@ function FormFieldText(props) { ...@@ -39,17 +39,17 @@ function FormFieldText(props) {
placeholder="Resposta curta" placeholder="Resposta curta"
/> />
</Grid> </Grid>
<Grid item container <Grid
item
container
direction="row" direction="row"
justify="flex-end" justify="flex-end"
alignItems="flex-end" alignItems="flex-end"
xs={3} xs={3}
> ></Grid>
</Grid>
</Grid> </Grid>
</Paper> </Paper>
); );
} }
export default FormFieldText; export default FormFieldText;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment