diff --git a/src/Admin/Components/Components/DataCards/ActivityCard.js b/src/Admin/Components/Components/DataCards/ActivityCard.js
index 517bb9a0f6c047dc57a7484a4e5f896b8789dd8b..23f7213361154d195f8da33c3027a2ba86d50970 100644
--- a/src/Admin/Components/Components/DataCards/ActivityCard.js
+++ b/src/Admin/Components/Components/DataCards/ActivityCard.js
@@ -110,22 +110,18 @@ const ActivityCard = ({ match }) => {
</Typography>
</Grid>
<Grid item>
- <ButtonGroup
- color="primary"
- aria-label="outlined primary button group"
- >
- <Link style={{ textDecoration: 'none' }} to={`/admin/activities`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Listar
- </Button>
- </Link>
- </ButtonGroup>
+ <Link style={{ textDecoration: 'none' }} to={`/admin/activities`}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Listar
+ </Button>
+ </Link>
</Grid>
</Grid>
+ <div style={{height: "1em"}}/>
{DATA.map((info, index) => (
<div className={classes.displayColumn} key={index}>
<Typography color="initial" className={classes.subTitle}>
diff --git a/src/Admin/Components/Components/DataCards/CollectionCard.js b/src/Admin/Components/Components/DataCards/CollectionCard.js
index 79773d75017ce2eb1f5084677f6e7b0df2675791..11a93d43c8abf698ae516fda1a60e8e3ee03e315 100644
--- a/src/Admin/Components/Components/DataCards/CollectionCard.js
+++ b/src/Admin/Components/Components/DataCards/CollectionCard.js
@@ -169,41 +169,37 @@ const CollectionCard = ({ match }) => {
</Typography>
</Grid>
<Grid item>
- <ButtonGroup
- color="primary"
- aria-label="outlined primary button group"
- >
- <Link style={{ textDecoration: 'none' }} to={`/admin/Collections`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Listar
- </Button>
- </Link>
-
- <Link style={{ textDecoration: 'none' }} to={`/admin/EditCollection/${item.id}`}>
- <Button
- startIcon={<EditRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Editar
+ <Link style={{ textDecoration: 'none' }} to={`/admin/Collections`}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Listar
</Button>
- </Link>
+ </Link>
+ <Link style={{ textDecoration: 'none' }} to={`/admin/EditCollection/${item.id}`}>
<Button
- startIcon={<DeleteRoundedIcon />}
- color="secondary"
+ startIcon={<EditRoundedIcon />}
+ color="primary"
variant="outlined"
- onClick={DeleteHandler}
>
- Deletar
- </Button>
- </ButtonGroup>
+ Editar
+ </Button>
+ </Link>
+
+ <Button
+ startIcon={<DeleteRoundedIcon />}
+ color="secondary"
+ variant="outlined"
+ onClick={DeleteHandler}
+ >
+ Deletar
+ </Button>
</Grid>
</Grid>
+ <div style={{height: "1em"}}/>
{DATA.map((info, index) => (
<div className={classes.displayColumn} key={index}>
<Typography color="initial" className={classes.subTitle}>
diff --git a/src/Admin/Components/Components/DataCards/CommunityQuestionCard.js b/src/Admin/Components/Components/DataCards/CommunityQuestionCard.js
index cf52b6ac957090aafaad1cfcbccf1b5bc5bbd066..5b23f6ebd87d16ecb9d26b0d86237755214ab320 100644
--- a/src/Admin/Components/Components/DataCards/CommunityQuestionCard.js
+++ b/src/Admin/Components/Components/DataCards/CommunityQuestionCard.js
@@ -131,22 +131,18 @@ const CommunityQuestions = ({ match }) => {
</Typography>
</Grid>
<Grid>
- <ButtonGroup
- color="primary"
- aria-label="outlined primary button group"
- >
- <Link style={{ textDecoration: 'none' }} to={`/admin/CommunityQuestions`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Listar
+ <Link style={{ textDecoration: 'none' }} to={`/admin/CommunityQuestions`}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Listar
</Button>
- </Link>
- </ButtonGroup>
+ </Link>
</Grid>
</Grid>
+ <div style={{ height: "1em" }} />
{DATA.map((info, index) => (
<div className={classes.displayColumn} key={index}>
<Typography color="initial" className={classes.subTitle}>
diff --git a/src/Admin/Components/Components/DataCards/ComplaintsCard.js b/src/Admin/Components/Components/DataCards/ComplaintsCard.js
index 72afd79ad3058e9b24ea4819508574a60b13ba6c..e253872c3fab721fd1d9881bedbaaef9d4bfc13b 100644
--- a/src/Admin/Components/Components/DataCards/ComplaintsCard.js
+++ b/src/Admin/Components/Components/DataCards/ComplaintsCard.js
@@ -704,7 +704,7 @@ const CollectionCard = ({ match }) => {
</Link>
</Grid>
</Grid>
-
+ <div style={{height: "1em"}}/>
{DATA.map((info, index) => (
<div className={classes.displayColumn} key={index}>
<Typography color="initial" className={classes.subTitle}>
diff --git a/src/Admin/Components/Components/DataCards/EducationalObjectsCard.js b/src/Admin/Components/Components/DataCards/EducationalObjectsCard.js
index 8f78633dd111ab871b73152746ea09cca842b646..63cf1288c63d9c2dd7f5fa97cf67a77873f5e5ad 100644
--- a/src/Admin/Components/Components/DataCards/EducationalObjectsCard.js
+++ b/src/Admin/Components/Components/DataCards/EducationalObjectsCard.js
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>.*/
import React, { useState, useEffect } from "react";
-import moment from 'moment';
+import moment from "moment";
// Maerial ui components
import Card from "@material-ui/core/Card";
import Paper from "@material-ui/core/Paper";
@@ -26,7 +26,7 @@ import Typography from "@material-ui/core/Typography";
import Button from "@material-ui/core/Button";
import ListRoundedIcon from "@material-ui/icons/ListRounded";
import VisibilityIcon from "@material-ui/icons/Visibility";
-import EditRoundedIcon from '@material-ui/icons/EditRounded';
+import EditRoundedIcon from "@material-ui/icons/EditRounded";
import ButtonGroup from "@material-ui/core/ButtonGroup";
import { useStyles } from "../../Styles/DataCard";
import DeleteRoundedIcon from "@material-ui/icons/DeleteRounded";
@@ -35,17 +35,20 @@ import { GetAData, DeleteFilter } from "../../../Filters";
import { Link, useHistory } from "react-router-dom";
import { apiUrl, apiDomain } from "../../../../env";
import { Grid } from "@material-ui/core";
-import LoadingSpinner from '../../../../Components/LoadingSpinner';
-import { getRequest, deleteRequest } from '../../../../Components/HelperFunctions/getAxiosConfig'
-import SnackBar from '../../../../Components/SnackbarComponent';
+import LoadingSpinner from "../../../../Components/LoadingSpinner";
+import {
+ getRequest,
+ deleteRequest,
+} from "../../../../Components/HelperFunctions/getAxiosConfig";
+import SnackBar from "../../../../Components/SnackbarComponent";
const CommunityQuestions = ({ match }) => {
const classes = useStyles();
- let history = useHistory()
+ let history = useHistory();
const [error, setError] = useState(null); //Necessary to consult the API, catch errors
const [isLoaded, setIsLoaded] = useState(false); //Necessary to consult the API, wait until complete
- const [item, setItem] = useState({});//Necessary to consult the API, data
+ const [item, setItem] = useState({}); //Necessary to consult the API, data
const DisplayDate = (date) => {
const convertedData = moment.utc(date);
@@ -71,7 +74,7 @@ const CommunityQuestions = ({ match }) => {
});
async function DeleteHandler() {
- const id = match.params.id
+ const id = match.params.id;
deleteRequest(
DeleteFilter("learning_objects", id),
(data) => {
@@ -84,7 +87,7 @@ const CommunityQuestions = ({ match }) => {
"success",
"#228B22"
);
- history.goBack()
+ history.goBack();
}
},
(error) => {
@@ -105,13 +108,13 @@ const CommunityQuestions = ({ match }) => {
setIsLoaded(true);
setError(true);
}
- )
+ );
}, []);
if (error) {
return <div>Houve um erro</div>;
} else if (!isLoaded) {
- return <LoadingSpinner text="Carregando..." />
+ return <LoadingSpinner text="Carregando..." />;
} else {
console.log(item);
const DATA = [
@@ -210,12 +213,14 @@ const CommunityQuestions = ({ match }) => {
text={snackInfo.message}
snackbarOpen={snackInfo.open}
color={snackInfo.color}
- handleClose={() => setSnackInfo({
- message: '',
- icon: '',
- open: false,
- color: ''
- })}
+ handleClose={() =>
+ setSnackInfo({
+ message: "",
+ icon: "",
+ open: false,
+ color: "",
+ })
+ }
/>
<CardContent>
<Grid
@@ -227,68 +232,68 @@ const CommunityQuestions = ({ match }) => {
alignContent="space-between"
>
<Grid item>
- <Typography className={classes.title} color="inherit" gutterBottom>
+ <Typography
+ className={classes.title}
+ color="inherit"
+ gutterBottom
+ >
{item.name}
</Typography>
</Grid>
<Grid item>
- <ButtonGroup
- color="primary"
- aria-label="outlined primary button group"
+ <Link
+ style={{ textDecoration: "none" }}
+ to={`/admin/learningObjects`}
>
- <Link
- style={{ textDecoration: "none" }}
- to={`/admin/learningObjects`}
- >
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Listar
- </Button>
- </Link>
<Button
- startIcon={<VisibilityIcon />}
+ startIcon={<ListRoundedIcon />}
color="primary"
variant="outlined"
>
- <a
- style={{ textDecoration: "none" }}
- target="_blank"
- href={
- apiUrl +
- "/learning_objects/" +
- match.params.id +
- "/download"
- }
- >
- Ver recurso
- </a>
+ Listar
</Button>
- <Link
+ </Link>
+ <Button
+ startIcon={<VisibilityIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ <a
style={{ textDecoration: "none" }}
- to={`/admin/learningObjectEdit/${item.id}`}
+ target="_blank"
+ href={
+ apiUrl +
+ "/learning_objects/" +
+ match.params.id +
+ "/download"
+ }
>
- <Button
- startIcon={<EditRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Editar
- </Button>
- </Link>
+ Ver recurso
+ </a>
+ </Button>
+ <Link
+ style={{ textDecoration: "none" }}
+ to={`/admin/learningObjectEdit/${item.id}`}
+ >
<Button
- startIcon={<DeleteRoundedIcon />}
- color="secondary"
+ startIcon={<EditRoundedIcon />}
+ color="primary"
variant="outlined"
- onClick={DeleteHandler}
>
- Deletar
+ Editar
</Button>
- </ButtonGroup>
+ </Link>
+ <Button
+ startIcon={<DeleteRoundedIcon />}
+ color="secondary"
+ variant="outlined"
+ onClick={DeleteHandler}
+ >
+ Deletar
+ </Button>
</Grid>
</Grid>
+ <div style={{height: "1em"}}/>
{item.thumbnail ? (
<div style={{ marginTop: "1em", marginBottom: "1em" }}>
<a target="_blank" href={apiDomain + item.thumbnail}>
diff --git a/src/Admin/Components/Components/DataCards/InstitutionsCard.js b/src/Admin/Components/Components/DataCards/InstitutionsCard.js
index 520bd316e9445f732b48bf77e769474ed8366190..0e0ebd90af7be80f2cb655899b9da84daeadd35b 100644
--- a/src/Admin/Components/Components/DataCards/InstitutionsCard.js
+++ b/src/Admin/Components/Components/DataCards/InstitutionsCard.js
@@ -167,41 +167,37 @@ const InstitutionCard = ({ match }) => {
</Typography>
</Grid>
<Grid item>
- <ButtonGroup
- color="primary"
- aria-label="outlined primary button group"
- >
- <Link style={{ textDecoration: 'none' }} to={`/admin/intitutions`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Listar
- </Button>
- </Link>
-
- <Link style={{ textDecoration: 'none' }} to={`/admin/institutionEdit/${item.id}`}>
- <Button
- startIcon={<EditRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Editar
+ <Link style={{ textDecoration: 'none' }} to={`/admin/intitutions`}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Listar
</Button>
- </Link>
+ </Link>
+ <Link style={{ textDecoration: 'none' }} to={`/admin/institutionEdit/${item.id}`}>
<Button
- startIcon={<DeleteRoundedIcon />}
- color="secondary"
+ startIcon={<EditRoundedIcon />}
+ color="primary"
variant="outlined"
- onClick={DeleteHandler}
>
- Deletar
+ Editar
+ </Button>
+ </Link>
+
+ <Button
+ startIcon={<DeleteRoundedIcon />}
+ color="secondary"
+ variant="outlined"
+ onClick={DeleteHandler}
+ >
+ Deletar
</Button>
- </ButtonGroup>
</Grid>
</Grid>
+ <div style={{height: "1em"}}/>
{DATA.map((info, index) => (
<div className={classes.displayColumn} key={index}>
<Typography color="initial" className={classes.subTitle}>
diff --git a/src/Admin/Components/Components/DataCards/NoteVarCard.js b/src/Admin/Components/Components/DataCards/NoteVarCard.js
index 7afaac4aa867072eddb49a8e766fde158dc2d1a4..deaf5b3a71c3875a182f5931a371167fb8e20ba7 100644
--- a/src/Admin/Components/Components/DataCards/NoteVarCard.js
+++ b/src/Admin/Components/Components/DataCards/NoteVarCard.js
@@ -68,7 +68,7 @@ const NoteCard = ({ match }) => {
if (error) {
return <div>Houve um erro</div>;
} else if (!isLoaded) {
- return <LoadingSpinner text="Carregando..."/>
+ return <LoadingSpinner text="Carregando..." />
} else {
const DATA = [
{
@@ -107,32 +107,28 @@ const NoteCard = ({ match }) => {
</Typography>
</Grid>
<Grid item>
- <ButtonGroup
- color="primary"
- aria-label="outlined primary button group"
- >
- <Link style={{textDecoration: 'none'}} to={`/admin/noteVars`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Listar
+ <Link style={{ textDecoration: 'none' }} to={`/admin/noteVars`}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Listar
</Button>
- </Link>
+ </Link>
- <Link style={{textDecoration: 'none'}} to={`/admin/noteVarEdit/${item.id}`}>
- <Button
- startIcon={<EditRoundedIcon/>}
- color="primary"
- variant="outlined"
- >
- Editar
+ <Link style={{ textDecoration: 'none' }} to={`/admin/noteVarEdit/${item.id}`}>
+ <Button
+ startIcon={<EditRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Editar
</Button>
- </Link>
- </ButtonGroup>
+ </Link>
</Grid>
</Grid>
+ <div style={{height: "1em"}}/>
{DATA.map((info, index) => (
<div className={classes.displayColumn} key={index}>
<Typography color="initial" className={classes.subTitle}>
diff --git a/src/Admin/Components/Components/DataCards/RatingCard.js b/src/Admin/Components/Components/DataCards/RatingCard.js
index 82585c189a8f5d15d53729b7d33bd87996ccacd4..5d87570206e21e2c9ce6176dfb444d55c8c62783 100644
--- a/src/Admin/Components/Components/DataCards/RatingCard.js
+++ b/src/Admin/Components/Components/DataCards/RatingCard.js
@@ -156,41 +156,37 @@ const RatingCard = ({ match }) => {
</Typography>
</Grid>
<Grid item>
- <ButtonGroup
- color="primary"
- aria-label="outlined primary button group"
- >
- <Link style={{ textDecoration: 'none' }} to={`/admin/Ratings`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Listar
- </Button>
- </Link>
-
- <Link style={{ textDecoration: 'none' }} to={`/admin/EditRating/${item.id}`}>
- <Button
- startIcon={<EditRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Editar
+ <Link style={{ textDecoration: 'none' }} to={`/admin/Ratings`}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Listar
</Button>
- </Link>
+ </Link>
+ <Link style={{ textDecoration: 'none' }} to={`/admin/EditRating/${item.id}`}>
<Button
- startIcon={<DeleteRoundedIcon />}
- color="secondary"
+ startIcon={<EditRoundedIcon />}
+ color="primary"
variant="outlined"
- onClick={DeleteHandler}
>
- Deletar
+ Editar
+ </Button>
+ </Link>
+
+ <Button
+ startIcon={<DeleteRoundedIcon />}
+ color="secondary"
+ variant="outlined"
+ onClick={DeleteHandler}
+ >
+ Deletar
</Button>
- </ButtonGroup>
</Grid>
</Grid>
+ <div style={{height: "1em"}}/>
{DATA.map((info, index) => (
<div className={classes.displayColumn} key={index}>
<Typography color="initial" className={classes.subTitle}>
diff --git a/src/Admin/Components/Components/Inputs/EmailInputs.js b/src/Admin/Components/Components/Inputs/EmailInputs.js
index 87ac1268686411236cfd3c251c745c4cb4606a9a..c5f6349224598c4b85dcefd6b63c36fa95abc170 100644
--- a/src/Admin/Components/Components/Inputs/EmailInputs.js
+++ b/src/Admin/Components/Components/Inputs/EmailInputs.js
@@ -56,7 +56,7 @@ const EmailInputs = (props) => {
const [index, setIndex] = useState(0); //Used to display something above the text field 'to' depending on what the user clicks
// Capture th text insert by the user in the fields
- const [emails, setEmails] = useState(props.email);
+ const [emails, setEmails] = useState(props.email === "none" ? "" : props.email);
const [emailsAdress, setEmailsAdress] = useState([]);
const [subject, setSubject] = useState("");
const [message, setMessage] = useState("");
diff --git a/src/Admin/Pages/Pages/SubPages/Activity.js b/src/Admin/Pages/Pages/SubPages/Activity.js
index 4a6e9220d8adc0596a297ce8fa8aabcef86e1528..54c7c9d23b660770fbecf0769eb268f7634b9643 100644
--- a/src/Admin/Pages/Pages/SubPages/Activity.js
+++ b/src/Admin/Pages/Pages/SubPages/Activity.js
@@ -234,14 +234,14 @@ const Activity = () => {
<Paper style={{ padding: "1em" }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">Atividades</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/AproveTeacher.js b/src/Admin/Pages/Pages/SubPages/AproveTeacher.js
index 40359292c8b3fd08e100b1067992e7b4301f6988..cb8d59bd705df9ee8fc2c6c58706d271b02da0f4 100644
--- a/src/Admin/Pages/Pages/SubPages/AproveTeacher.js
+++ b/src/Admin/Pages/Pages/SubPages/AproveTeacher.js
@@ -454,14 +454,14 @@ const AproveTeacher = () => {
<Paper style={{ padding: "1em" }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">
Lista de pedidos para professores
</Typography>
</Grid>
- <Grid item xs={6}>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid item xs={12}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/BlockedUsers.js b/src/Admin/Pages/Pages/SubPages/BlockedUsers.js
index 81bd15d905c72b4d7c69a83fb6cdeb259728da9f..c89b08bdbc5642225bb3bd45a0eb595db831964b 100644
--- a/src/Admin/Pages/Pages/SubPages/BlockedUsers.js
+++ b/src/Admin/Pages/Pages/SubPages/BlockedUsers.js
@@ -344,16 +344,17 @@ const BlockedUsers = () => {
<Paper style={{ padding: '1em' }}>
<Grid container direction="row" alignItems="center">
<Grid container spacing={3} >
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">
Lista de usuários bloqueados
</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
+
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/Collections.js b/src/Admin/Pages/Pages/SubPages/Collections.js
index 4a62e4a1dfe1456fc0c635d72b3dac8d02b9476c..763aa71ea6aaf28df4411103b5fd0ad77c850c15 100644
--- a/src/Admin/Pages/Pages/SubPages/Collections.js
+++ b/src/Admin/Pages/Pages/SubPages/Collections.js
@@ -328,11 +328,11 @@ const Collections = () => {
/>
<Paper style={{ padding: "1em" }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">Coleções</Typography>
</Grid>
- <Grid item xs={6}>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid item xs={12}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js b/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js
index 424b15eaa0effea1e0738960fa6c9c74e6fd00f0..6288249acd829619deddb1153e7a7eac6f1adc26 100644
--- a/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js
+++ b/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js
@@ -290,14 +290,14 @@ const CommunityQuestion = () => {
<Paper style={{ padding: "1em" }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">Dúvidas da comunidade</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/Complaints.js b/src/Admin/Pages/Pages/SubPages/Complaints.js
index f4466ddac9f401c399c4ee645e1f3d27fddcb41c..466836a80a6855f8dd529b22a287ea1314eae318 100644
--- a/src/Admin/Pages/Pages/SubPages/Complaints.js
+++ b/src/Admin/Pages/Pages/SubPages/Complaints.js
@@ -424,15 +424,15 @@ const Complaints = () => {
<Paper style={{ padding: "1em" }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">Denúncias</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/EducationalObjects.js b/src/Admin/Pages/Pages/SubPages/EducationalObjects.js
index 1f2f3b543be97c65f8e86618d06f32e738333b29..a4219eea0efbc89a1af6c218b2d0fce6ca5b47da 100644
--- a/src/Admin/Pages/Pages/SubPages/EducationalObjects.js
+++ b/src/Admin/Pages/Pages/SubPages/EducationalObjects.js
@@ -403,16 +403,17 @@ const EducationalObjects = () => {
{/************** Start of the header **************/}
<Paper style={{ padding: "1em" }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography className={classes.paper} variant="h4">
Lista de objetos educacionais
- </Typography>
+ </Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
+
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
aria-describedby={id}
@@ -427,7 +428,7 @@ const EducationalObjects = () => {
}
>
Filtrar
- </Button>
+ </Button>
<Popover
id={id}
open={open}
diff --git a/src/Admin/Pages/Pages/SubPages/Institutions.js b/src/Admin/Pages/Pages/SubPages/Institutions.js
index c33932641bd59f4921d3bad487fe2a75e27ec797..d8f41e7dac618091750a2fd09e8bb5e0d72c6e48 100644
--- a/src/Admin/Pages/Pages/SubPages/Institutions.js
+++ b/src/Admin/Pages/Pages/SubPages/Institutions.js
@@ -438,16 +438,16 @@ const Institutions = () => {
{/************** Start of the header **************/}
<Paper style={{ padding: "1em" }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography className={classes.paper} variant="h4">
Lista de Instituições
</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
aria-describedby={id}
diff --git a/src/Admin/Pages/Pages/SubPages/Languages.js b/src/Admin/Pages/Pages/SubPages/Languages.js
index 9c003e96d51178a8f2efb572daad321800e0bd19..00693f02998a332451f42f0bc8aa744e8d4e28d9 100644
--- a/src/Admin/Pages/Pages/SubPages/Languages.js
+++ b/src/Admin/Pages/Pages/SubPages/Languages.js
@@ -244,16 +244,16 @@ const Languages = () => {
<Paper style={{ padding: '1em' }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">
Linguagens
</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/NoteVariables.js b/src/Admin/Pages/Pages/SubPages/NoteVariables.js
index 4769edd9d2a27c65b393770d5163a42f70bdfc1c..16c39487c44ed81523beab4d0351ef1e07a5c093 100644
--- a/src/Admin/Pages/Pages/SubPages/NoteVariables.js
+++ b/src/Admin/Pages/Pages/SubPages/NoteVariables.js
@@ -199,16 +199,16 @@ const NoteVariables = () => {
/>
<Paper style={{ padding: '1em' }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">
Variáveis de nota
- </Typography>
+ </Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/Permissions.js b/src/Admin/Pages/Pages/SubPages/Permissions.js
index a22f19f944b2870d42f59b6f981f64f2f1d84701..842ce3e076d3ee770b4d757516b4ce15e742837d 100644
--- a/src/Admin/Pages/Pages/SubPages/Permissions.js
+++ b/src/Admin/Pages/Pages/SubPages/Permissions.js
@@ -244,16 +244,16 @@ const UserPermissions = () => {
<Paper style={{ padding: '1em' }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">
Lista de permissões de usuário
</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/Questions.js b/src/Admin/Pages/Pages/SubPages/Questions.js
index e56f81bc768c5b3614ee2b9808a6478985e490a4..8f25ee68630e4ea2fe88bb00b2e19e5aa4f6bef9 100644
--- a/src/Admin/Pages/Pages/SubPages/Questions.js
+++ b/src/Admin/Pages/Pages/SubPages/Questions.js
@@ -279,16 +279,16 @@ const Questions = () => {
<Paper style={{ padding: '1em' }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">
Perguntas da curadoria
</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/Rating.js b/src/Admin/Pages/Pages/SubPages/Rating.js
index 77a8e50b56c8d4167bc62f5a8a39d7ff0a652b23..547e140ddf41a9b427bc7fabe894d71bac16be5e 100644
--- a/src/Admin/Pages/Pages/SubPages/Rating.js
+++ b/src/Admin/Pages/Pages/SubPages/Rating.js
@@ -244,16 +244,16 @@ const Ratings = () => {
/>
<Paper style={{ padding: '1em' }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">
Lista de ratings
</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Admin/Pages/Pages/SubPages/Users.js b/src/Admin/Pages/Pages/SubPages/Users.js
index d709707b22bee75d4141c3df31e2ba5e30e09eda..fe3524c9e120bb5586a9965bbdccfa4a541f0d91 100644
--- a/src/Admin/Pages/Pages/SubPages/Users.js
+++ b/src/Admin/Pages/Pages/SubPages/Users.js
@@ -285,16 +285,16 @@ const Users = () => {
/>
<Paper style={{ padding: '1em' }}>
<Grid container spacing={3} direction="row" alignItems="center">
- <Grid item xs={6}>
+ <Grid item xs={12}>
<Typography variant="h4">
Lista de usuários
</Typography>
</Grid>
<Grid
item
- xs={6}
+ xs={12}
>
- <Grid container justify="flex-end" spacing={3}>
+ <Grid container justify="flex-start" spacing={3}>
<Grid item>
<Button
variant="contained"
diff --git a/src/Pages/CollectionPage.js b/src/Pages/CollectionPage.js
index ba89c4d86e631012cfec82131f12d0d565d5ce8f..b0bfdeb7db587ccfa45f4d11ef030f330978322f 100644
--- a/src/Pages/CollectionPage.js
+++ b/src/Pages/CollectionPage.js
@@ -118,58 +118,6 @@ export default function CollectionPage(props) {
</Grid>
</Grid>
</>
-
-
- // <Grid container
- // direction="row"
- // justify="space-around"
- // alignItems="center"
- // style={mainContainerStyle}>
-
- // <Grid item xs={10} md={3}>
- // <CollectionAuthor
- // author_id={collection.owner ? collection.owner.id : 0}
- // name={collection.owner ? collection.owner.name : ""}
- // imgsrc={collection.owner ? apiDomain+collection.owner.avatar : ''}/>
- // </Grid>
-
- // <VerticalRuler width={1} height={300} color="rgb(238, 238, 238)"/>
-
- // <Grid item xs={10} md={6}>
- // <CollectionDescription
- // scrollToComments={handleScrollToComments}
- // title={collection.name ? collection.name : ""}
- // collection_id={collection.id ? collection.id : 0}/>
- // </Grid>
-
- // <Grid container item xs={12} direction="row" justify="center" alignItems="center" style={{backgroundColor: '#f4f4f4'}}>
- // <Grid item xs={10}>
- // <ResourceList resources={
- // collection.collection_items ?
- // collection.collection_items.map(i => {
- // return {
- // type: i.collectionable.object_type,
- // author: i.collectionable.author,
- // published: i.collectionable.published_at,
- // title: i.collectionable.name,
- // rating: i.collectionable.review_average,
- // likeCount: i.collectionable.likes_count,
- // liked: i.collectionable.liked,
- // avatar: i.collectionable.publisher.avatar,
- // thumbnail: i.collectionable.thumbnail,
- // tags: i.collectionable.tags.map(t => t.name),
- // id: i.collectionable.id,
- // }
- // })
- // : []
- // }/>
-
- // </Grid>
- // <Grid container item xs={12} style={{marginTop: 40}} ref={comment_ref}>
- // <CollectionCommentSection id={collection_id}/>
- // </Grid>
- // </Grid>
- // </Grid>
);
}