From f7111f73c2c555946c49d145c13b15bba2d88777 Mon Sep 17 00:00:00 2001
From: Luis Felipe Risch <lfr20@inf.ufpr.br>
Date: Mon, 30 Nov 2020 08:26:38 -0300
Subject: [PATCH] Fix The style from this pages, because it was not responsive
---
.../Components/DataCards/ActivityCard.js | 55 ++++++++-----
.../Components/DataCards/CollectionCard.js | 75 ++++++++++-------
.../DataCards/CommunityQuestionCard.js | 59 ++++++++------
.../Components/DataCards/InstitutionsCard.js | 80 ++++++++++++-------
.../Components/DataCards/NoteVarCard.js | 76 +++++++++++-------
.../Components/DataCards/RatingCard.js | 75 ++++++++++-------
.../Components/Inputs/CreateInstitution.js | 34 ++++----
.../Components/Inputs/CreateLanguage.js | 32 ++++----
.../Components/Inputs/CreateQuestion.js | 34 ++++----
.../Components/Inputs/CreateRating.js | 34 ++++----
.../Components/Inputs/EditCollection.js | 32 ++++----
.../Components/Inputs/EditLanguage.js | 4 +-
.../Components/Inputs/EditRating.js | 32 ++++----
.../Components/Inputs/IntitutionsInputs.js | 41 +++++-----
.../Components/Inputs/NoteVarInputs.js | 39 +++++----
src/Admin/Components/Components/Table.js | 2 +-
src/Admin/Components/Styles/DataCard.js | 3 +
src/Admin/Pages/Pages/SubPages/Activity.js | 22 ++---
src/Admin/Pages/Pages/SubPages/Collections.js | 34 ++++----
.../Pages/SubPages/CommunityQuestions.js | 20 ++---
.../Pages/Pages/SubPages/Institutions.js | 20 +++--
src/Admin/Pages/Pages/SubPages/Languages.js | 20 +++--
.../Pages/Pages/SubPages/NoteVariables.js | 15 ++--
src/Admin/Pages/Pages/SubPages/Questions.js | 27 ++++---
src/Admin/Pages/Pages/SubPages/Rating.js | 15 ++--
25 files changed, 500 insertions(+), 380 deletions(-)
diff --git a/src/Admin/Components/Components/DataCards/ActivityCard.js b/src/Admin/Components/Components/DataCards/ActivityCard.js
index 4cc04b47..29459574 100644
--- a/src/Admin/Components/Components/DataCards/ActivityCard.js
+++ b/src/Admin/Components/Components/DataCards/ActivityCard.js
@@ -17,6 +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';
// Maerial ui components
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
@@ -25,6 +26,7 @@ import Button from "@material-ui/core/Button";
import ListRoundedIcon from "@material-ui/icons/ListRounded";
import ButtonGroup from "@material-ui/core/ButtonGroup";
import { useStyles } from "../../Styles/DataCard";
+import Grid from "@material-ui/core/Grid";
//imports from local files
import { GetAData } from "../../../Filters";
import { GetSpecificData } from '../../../Services';
@@ -37,6 +39,13 @@ const ActivityCard = ({ match }) => {
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 DisplayDate = (date) => {
+ const convertedData = moment.utc(date);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
//getting data from server
useEffect(() => {
@@ -91,7 +100,7 @@ const ActivityCard = ({ match }) => {
},
{
subTitle: "Criado em",
- prop: item["created_at"],
+ prop: DisplayDate(item["created_at"]),
},
{
subTitle: "Recipient type",
@@ -101,27 +110,31 @@ const ActivityCard = ({ match }) => {
];
return (
- <Card className={classes.root} variant="outlined">
+ <Card>
<CardContent>
- <div className={classes.displayRow}>
- <Typography className={classes.title} color="inherit" gutterBottom>
- {item.id}
- </Typography>
- <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>
- </div>
+ <Grid container xs={12} justify="space-between" alignItems="center" alignContent="center">
+ <Grid item>
+ <Typography className={classes.title} color="inherit" gutterBottom>
+ {item.id}
+ </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>
+ </Grid>
+ </Grid>
{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 8442d6ae..f43e9eb0 100644
--- a/src/Admin/Components/Components/DataCards/CollectionCard.js
+++ b/src/Admin/Components/Components/DataCards/CollectionCard.js
@@ -17,6 +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';
// Maerial ui components
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
@@ -25,6 +26,7 @@ import Button from "@material-ui/core/Button";
import ListRoundedIcon from "@material-ui/icons/ListRounded";
import ButtonGroup from "@material-ui/core/ButtonGroup";
import { useStyles } from "../../Styles/DataCard";
+import Grid from '@material-ui/core/Grid';
// Icons
import EditRoundedIcon from "@material-ui/icons/EditRounded";
//imports from local files
@@ -40,6 +42,13 @@ const CollectionCard = ({ match }) => {
const [isLoaded, setIsLoaded] = useState(false); //Necessary to consult the API, wait until complete
const [item, setItem] = useState({}); //Necessary to consult the API, data
+ const DisplayDate = (date) => {
+ const convertedData = moment.utc(date);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
+
useEffect(() => {
const headers = {
Accept: "application/json",
@@ -95,46 +104,50 @@ const CollectionCard = ({ match }) => {
},
{
subTitle: "Criação",
- prop: item.created_at,
+ prop: DisplayDate(item.created_at),
},
{
subTitle: "Atualização",
- prop: item.updated_at,
+ prop: DisplayDate(item.updated_at),
},
];
return (
- <Card className={classes.root} variant="outlined">
+ <Card>
<CardContent>
- <div className={classes.displayRow}>
- <Typography className={classes.title} color="inherit" gutterBottom>
- {item.name}
- </Typography>
- <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>
+ <Grid xs={12} justify="space-between" alignItems="center" container>
+ <Grid item>
+ <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/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
- </Button>
- </Link>
- </ButtonGroup>
- </div>
+ <Link style={{ textDecoration: 'none' }} to={`/admin/EditCollection/${item.id}`}>
+ <Button
+ startIcon={<EditRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Editar
+ </Button>
+ </Link>
+ </ButtonGroup>
+ </Grid>
+ </Grid>
{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 717aef13..be8dadfb 100644
--- a/src/Admin/Components/Components/DataCards/CommunityQuestionCard.js
+++ b/src/Admin/Components/Components/DataCards/CommunityQuestionCard.js
@@ -17,8 +17,10 @@ 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';
// Maerial ui components
import Card from "@material-ui/core/Card";
+import Grid from "@material-ui/core/Grid";
import CardContent from "@material-ui/core/CardContent";
import Typography from "@material-ui/core/Typography";
import Button from "@material-ui/core/Button";
@@ -38,7 +40,14 @@ const CommunityQuestions = ({ match }) => {
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);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
useEffect(() => {
const headers = {
@@ -93,37 +102,41 @@ const CommunityQuestions = ({ match }) => {
</Link> : null
},
{
- subTitle: "Endereço",
+ subTitle: "Mensagem",
prop: item.message,
},
{
subTitle: "Criado em",
- prop: item.created_at,
+ prop: DisplayDate(item.created_at),
},
];
return (
- <Card className={classes.root} variant="outlined">
+ <Card>
<CardContent>
- <div className={classes.displayRow}>
- <Typography className={classes.title} color="inherit" gutterBottom>
- {item.name}
- </Typography>
- <ButtonGroup
- color="primary"
- aria-label="outlined primary button group"
- >
- <Link style={{textDecoration: 'none'}} to={`/admin/CommunityQuestions`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Listar
- </Button>
- </Link>
- </ButtonGroup>
- </div>
+ <Grid direction="row" justify="space-between" alignContent="center" alignItems="center" container>
+ <Grid item>
+ <Typography className={classes.title} color="inherit" gutterBottom>
+ {item.name}
+ </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
+ </Button>
+ </Link>
+ </ButtonGroup>
+ </Grid>
+ </Grid>
{DATA.map((info, index) => (
<div className={classes.displayColumn} key={index}>
<Typography color="initial" className={classes.subTitle}>
diff --git a/src/Admin/Components/Components/DataCards/InstitutionsCard.js b/src/Admin/Components/Components/DataCards/InstitutionsCard.js
index b4278ea2..fc3c3625 100644
--- a/src/Admin/Components/Components/DataCards/InstitutionsCard.js
+++ b/src/Admin/Components/Components/DataCards/InstitutionsCard.js
@@ -17,6 +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'
// Maerial ui components
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
@@ -25,6 +26,7 @@ import Button from "@material-ui/core/Button";
import ListRoundedIcon from "@material-ui/icons/ListRounded";
import ButtonGroup from "@material-ui/core/ButtonGroup";
import { useStyles } from "../../Styles/DataCard";
+import Grid from '@material-ui/core/Grid';
// Icons
import EditRoundedIcon from "@material-ui/icons/EditRounded";
//imports from local files
@@ -39,6 +41,14 @@ const InstitutionCard = ({ match }) => {
const [isLoaded, setIsLoaded] = useState(false); //Necessary to consult the API, wait until complete
const [item, setItem] = useState({}); //Necessary to consult the API, data
+ const DisplayDate = (date) => {
+ const convertedData = moment.utc(date);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
+
+
useEffect(() => {
fetch(GetAData('institutions', match.params.id))
.then((res) => res.json())
@@ -84,40 +94,52 @@ const InstitutionCard = ({ match }) => {
subTitle: "PaÃs",
prop: item.country,
},
+ {
+ subTitle: "Criação",
+ prop: DisplayDate(item.created_at),
+ },
+ {
+ subTitle: "Atualizado",
+ prop: DisplayDate(item.updated_at),
+ },
];
return (
- <Card className={classes.root} variant="outlined">
+ <Card>
<CardContent>
- <div className={classes.displayRow}>
- <Typography className={classes.title} color="inherit" gutterBottom>
- {item.name}
- </Typography>
- <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>
+ <Grid container xs={12} justify="space-between" alignItems="center" alignContent="center">
+ <Grid item>
+ <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/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
- </Button>
- </Link>
- </ButtonGroup>
- </div>
+ <Link style={{textDecoration: 'none'}} to={`/admin/institutionEdit/${item.id}`}>
+ <Button
+ startIcon={<EditRoundedIcon/>}
+ color="primary"
+ variant="outlined"
+ >
+ Editar
+ </Button>
+ </Link>
+ </ButtonGroup>
+ </Grid>
+ </Grid>
{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 d13dcab8..9e1de8c6 100644
--- a/src/Admin/Components/Components/DataCards/NoteVarCard.js
+++ b/src/Admin/Components/Components/DataCards/NoteVarCard.js
@@ -17,12 +17,14 @@ 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';
// Maerial ui components
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
import Typography from "@material-ui/core/Typography";
import Button from "@material-ui/core/Button";
import ListRoundedIcon from "@material-ui/icons/ListRounded";
+import Grid from "@material-ui/core/Grid";
import ButtonGroup from "@material-ui/core/ButtonGroup";
import { useStyles } from "../../Styles/DataCard";
// Icons
@@ -39,6 +41,14 @@ const NoteCard = ({ match }) => {
const [isLoaded, setIsLoaded] = useState(false); //Necessary to consult the API, wait until complete
const [item, setItem] = useState({}); //Necessary to consult the API, data
+ const DisplayDate = (date) => {
+ const convertedData = moment.utc(date);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
+
+
useEffect(() => {
fetch(GetAData('scores', match.params.id))
.then((res) => res.json())
@@ -78,46 +88,50 @@ const NoteCard = ({ match }) => {
},
{
subTitle: "Criação",
- prop: item.created_at,
+ prop: DisplayDate(item.created_at),
},
{
subTitle: "Atualizado",
- prop: item.updated_at,
+ prop: DisplayDate(item.updated_at),
},
]
return (
- <Card className={classes.root} variant="outlined">
+ <Card>
<CardContent>
- <div className={classes.displayRow}>
- <Typography className={classes.title} color="inherit" gutterBottom>
- {item.name}
- </Typography>
- <ButtonGroup
- color="primary"
- aria-label="outlined primary button group"
- >
- <Link style={{textDecoration: 'none'}} to={`/admin/noteVars`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
- >
- Listar
- </Button>
- </Link>
+ <Grid container xs={12} justify="space-between" alignContent="center" alignItems="center">
+ <Grid item>
+ <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/noteVars`}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Listar
+ </Button>
+ </Link>
- <Link style={{textDecoration: 'none'}} to={`/admin/noteVarEdit/${item.id}`}>
- <Button
- startIcon={<EditRoundedIcon/>}
- color="primary"
- variant="outlined"
- >
- Editar
- </Button>
- </Link>
- </ButtonGroup>
- </div>
+ <Link style={{textDecoration: 'none'}} to={`/admin/noteVarEdit/${item.id}`}>
+ <Button
+ startIcon={<EditRoundedIcon/>}
+ color="primary"
+ variant="outlined"
+ >
+ Editar
+ </Button>
+ </Link>
+ </ButtonGroup>
+ </Grid>
+ </Grid>
{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 18121f9b..f56420a8 100644
--- a/src/Admin/Components/Components/DataCards/RatingCard.js
+++ b/src/Admin/Components/Components/DataCards/RatingCard.js
@@ -17,6 +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';
// Maerial ui components
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
@@ -24,6 +25,7 @@ import Typography from "@material-ui/core/Typography";
import Button from "@material-ui/core/Button";
import ListRoundedIcon from "@material-ui/icons/ListRounded";
import ButtonGroup from "@material-ui/core/ButtonGroup";
+import Grid from "@material-ui/core/Grid";
import { useStyles } from "../../Styles/DataCard";
// Icons
import EditRoundedIcon from "@material-ui/icons/EditRounded";
@@ -39,6 +41,13 @@ const RatingCard = ({ match }) => {
const [isLoaded, setIsLoaded] = useState(false); //Necessary to consult the API, wait until complete
const [item, setItem] = useState({}); //Necessary to consult the API, data
+ const DisplayDate = (date) => {
+ const convertedData = moment.utc(date);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
+
useEffect(() => {
fetch(GetAData('ratings', match.params.id))
.then((res) => res.json())
@@ -74,46 +83,50 @@ const RatingCard = ({ match }) => {
},
{
subTitle: "Criado em",
- prop: item.created_at,
+ prop: DisplayDate(item.created_at),
},
{
subTitle: "Atualizado em",
- prop: item.updated_at,
+ prop: DisplayDate(item.updated_at),
},
];
return (
- <Card className={classes.root} variant="outlined">
+ <Card variant="outlined">
<CardContent>
- <div className={classes.displayRow}>
- <Typography className={classes.title} color="inherit" gutterBottom>
- {item.name}
- </Typography>
- <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>
+ <Grid container xs={12} justify="space-between" alignItems="center" alignContent="center">
+ <Grid item>
+ <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/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
- </Button>
- </Link>
- </ButtonGroup>
- </div>
+ <Link style={{textDecoration: 'none'}} to={`/admin/EditRating/${item.id}`}>
+ <Button
+ startIcon={<EditRoundedIcon/>}
+ color="primary"
+ variant="outlined"
+ >
+ Editar
+ </Button>
+ </Link>
+ </ButtonGroup>
+ </Grid>
+ </Grid>
{DATA.map((info, index) => (
<div className={classes.displayColumn} key={index}>
<Typography color="initial" className={classes.subTitle}>
diff --git a/src/Admin/Components/Components/Inputs/CreateInstitution.js b/src/Admin/Components/Components/Inputs/CreateInstitution.js
index e403ce28..62d0565d 100644
--- a/src/Admin/Components/Components/Inputs/CreateInstitution.js
+++ b/src/Admin/Components/Components/Inputs/CreateInstitution.js
@@ -186,7 +186,7 @@ const CreateInstitution = (props) => {
]
return (
- <Card variant='outlined'>
+ <Card>
<SnackBar
severity={snackInfo.icon}
text={snackInfo.message}
@@ -200,20 +200,24 @@ const CreateInstitution = (props) => {
})}
/>
<CardContent>
- <Grid container direction='row' justify='space-between'>
- <Typography variant='h4'>
- {name}
- </Typography>
- <Link style={{textDecoration: 'none'}} to={'/admin/intitutions'}>
- <Button
- onClick={props.BackToList}
- startIcon={<ListRoundedIcon />}
- variant='outlined'
- color='primary'
- >
- Listar
- </Button>
- </Link>
+ <Grid container direction='row' justify='space-between' alignContent="center" alignItems="center" xs={12}>
+ <Grid item>
+ <Typography variant='h4'>
+ {name}
+ </Typography>
+ </Grid>
+ <Grid item>
+ <Link style={{textDecoration: 'none'}} to={'/admin/intitutions'}>
+ <Button
+ onClick={props.BackToList}
+ startIcon={<ListRoundedIcon />}
+ variant='outlined'
+ color='primary'
+ >
+ Listar
+ </Button>
+ </Link>
+ </Grid>
</Grid>
<div style={{ height: '1em' }}></div>
diff --git a/src/Admin/Components/Components/Inputs/CreateLanguage.js b/src/Admin/Components/Components/Inputs/CreateLanguage.js
index 3996f377..40e7add7 100644
--- a/src/Admin/Components/Components/Inputs/CreateLanguage.js
+++ b/src/Admin/Components/Components/Inputs/CreateLanguage.js
@@ -165,20 +165,24 @@ const CreateLanguage = (props) => {
})}
/>
<CardContent>
- <Grid container direction='row' justify='space-between'>
- <Typography variant='h4'>
- {name}
- </Typography>
- <Link to={'/admin/languages'} style={{textDecoration: 'none'}}>
- <Button
- onClick={props.BackToList}
- startIcon={<ListRoundedIcon />}
- variant='outlined'
- color='primary'
- >
- Listar
- </Button>
- </Link>
+ <Grid container direction='row' justify='space-between' alignItems="center" alignContent="center" xs={12}>
+ <Grid item>
+ <Typography variant='h4'>
+ {name}
+ </Typography>
+ </Grid>
+ <Grid item>
+ <Link to={'/admin/languages'} style={{textDecoration: 'none'}}>
+ <Button
+ onClick={props.BackToList}
+ startIcon={<ListRoundedIcon />}
+ variant='outlined'
+ color='primary'
+ >
+ Listar
+ </Button>
+ </Link>
+ </Grid>
</Grid>
<div style={{ height: '1em' }}></div>
diff --git a/src/Admin/Components/Components/Inputs/CreateQuestion.js b/src/Admin/Components/Components/Inputs/CreateQuestion.js
index 180deeb9..c4279f14 100644
--- a/src/Admin/Components/Components/Inputs/CreateQuestion.js
+++ b/src/Admin/Components/Components/Inputs/CreateQuestion.js
@@ -153,7 +153,7 @@ const CreateQuestion = (props) => {
];
return (
- <Card variant='outlined'>
+ <Card>
<SnackBar
severity={snackInfo.icon}
text={snackInfo.message}
@@ -167,20 +167,24 @@ const CreateQuestion = (props) => {
})}
/>
<CardContent>
- <Grid container direction='row' justify='space-between'>
- <Typography variant='h4'>
- Nova question
- </Typography>
- <Link to={'/admin/Questions'} style={{ textDecoration: 'none' }}>
- <Button
- onClick={props.BackToList}
- startIcon={<ListRoundedIcon />}
- variant='outlined'
- color='primary'
- >
- Listar
- </Button>
- </Link>
+ <Grid container direction='row' justify='space-between' alignContent="center" alignItems="center" xs={12}>
+ <Grid item>
+ <Typography variant='h4'>
+ Nova question
+ </Typography>
+ </Grid>
+ <Grid item>
+ <Link to={'/admin/Questions'} style={{ textDecoration: 'none' }}>
+ <Button
+ onClick={props.BackToList}
+ startIcon={<ListRoundedIcon />}
+ variant='outlined'
+ color='primary'
+ >
+ Listar
+ </Button>
+ </Link>
+ </Grid>
</Grid>
<div style={{ height: '1em' }}></div>
diff --git a/src/Admin/Components/Components/Inputs/CreateRating.js b/src/Admin/Components/Components/Inputs/CreateRating.js
index b42375b8..111c656f 100644
--- a/src/Admin/Components/Components/Inputs/CreateRating.js
+++ b/src/Admin/Components/Components/Inputs/CreateRating.js
@@ -151,7 +151,7 @@ const CreateRating = (props) => {
]
return (
- <Card variant='outlined'>
+ <Card>
<SnackBar
severity={snackInfo.icon}
text={snackInfo.message}
@@ -165,20 +165,24 @@ const CreateRating = (props) => {
})}
/>
<CardContent>
- <Grid container direction='row' justify='space-between'>
- <Typography variant='h4'>
- {name}
- </Typography>
- <Link to={'/admin/Ratings'} style={{textDecoration: 'none'}}>
- <Button
- onClick={props.BackToList}
- startIcon={<ListRoundedIcon />}
- variant='outlined'
- color='primary'
- >
- Listar
- </Button>
- </Link>
+ <Grid container direction='row' justify='space-between' alignItems="center" alignContent="center" xs={12}>
+ <Grid item>
+ <Typography variant='h4'>
+ {name}
+ </Typography>
+ </Grid>
+ <Grid item>
+ <Link to={'/admin/Ratings'} style={{textDecoration: 'none'}}>
+ <Button
+ onClick={props.BackToList}
+ startIcon={<ListRoundedIcon />}
+ variant='outlined'
+ color='primary'
+ >
+ Listar
+ </Button>
+ </Link>
+ </Grid>
</Grid>
<div style={{ height: '1em' }}></div>
diff --git a/src/Admin/Components/Components/Inputs/EditCollection.js b/src/Admin/Components/Components/Inputs/EditCollection.js
index 49bd4a9c..98699262 100644
--- a/src/Admin/Components/Components/Inputs/EditCollection.js
+++ b/src/Admin/Components/Components/Inputs/EditCollection.js
@@ -221,7 +221,7 @@ const EditCollection = ({ match }) => {
return <div> Carregando... </div>
} else {
return (
- <Card variant='outlined'>
+ <Card>
<SnackBar
severity={snackInfo.icon}
text={snackInfo.message}
@@ -235,19 +235,23 @@ const EditCollection = ({ match }) => {
})}
/>
<CardContent>
- <Grid container direction='row' justify='space-between'>
- <Typography variant='h4'>
- {name}
- </Typography>
- <Link style={{ textDecoration: 'none' }} to={'/admin/Collections'}>
- <Button
- startIcon={<ListRoundedIcon />}
- variant='outlined'
- color='primary'
- >
- Listar
- </Button>
- </Link>
+ <Grid container direction='row' justify='space-between' xs={12} alignItems="center">
+ <Grid item>
+ <Typography variant='h4'>
+ {name}
+ </Typography>
+ </Grid>
+ <Grid item>
+ <Link style={{ textDecoration: 'none' }} to={'/admin/Collections'}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ variant='outlined'
+ color='primary'
+ >
+ Listar
+ </Button>
+ </Link>
+ </Grid>
</Grid>
<div style={{ height: '1em' }}></div>
diff --git a/src/Admin/Components/Components/Inputs/EditLanguage.js b/src/Admin/Components/Components/Inputs/EditLanguage.js
index 408064ac..f890c6d1 100644
--- a/src/Admin/Components/Components/Inputs/EditLanguage.js
+++ b/src/Admin/Components/Components/Inputs/EditLanguage.js
@@ -182,7 +182,7 @@ const EditLanguage = ({ match }) => {
return <div> Carregando... </div>
} else {
return (
- <Card variant='outlined'>
+ <Card>
<SnackBar
severity={snackInfo.icon}
text={snackInfo.message}
@@ -196,7 +196,7 @@ const EditLanguage = ({ match }) => {
})}
/>
<CardContent>
- <Grid container direction='row' justify='space-between'>
+ <Grid container direction='row' justify='space-between' alignContent="center" alignItems="center">
<Typography variant='h4'>
{name}
</Typography>
diff --git a/src/Admin/Components/Components/Inputs/EditRating.js b/src/Admin/Components/Components/Inputs/EditRating.js
index 4cbb1a48..6b38e471 100644
--- a/src/Admin/Components/Components/Inputs/EditRating.js
+++ b/src/Admin/Components/Components/Inputs/EditRating.js
@@ -184,7 +184,7 @@ const EditRating = ({ match }) => {
return <div> Carregando... </div>
} else {
return (
- <Card variant='outlined'>
+ <Card>
<SnackBar
severity={snackInfo.icon}
text={snackInfo.message}
@@ -198,19 +198,23 @@ const EditRating = ({ match }) => {
})}
/>
<CardContent>
- <Grid container direction='row' justify='space-between'>
- <Typography variant='h4'>
- {name}
- </Typography>
- <Link style={{textDecoration: 'none'}} to={'/admin/Ratings'}>
- <Button
- startIcon={<ListRoundedIcon />}
- variant='outlined'
- color='primary'
- >
- Listar
- </Button>
- </Link>
+ <Grid container direction='row' justify='space-between' alignContent="center" alignItems="center" xs={12}>
+ <Grid item>
+ <Typography variant='h4'>
+ {name}
+ </Typography>
+ </Grid>
+ <Grid item>
+ <Link style={{textDecoration: 'none'}} to={'/admin/Ratings'}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ variant='outlined'
+ color='primary'
+ >
+ Listar
+ </Button>
+ </Link>
+ </Grid>
</Grid>
<div style={{ height: '1em' }}></div>
diff --git a/src/Admin/Components/Components/Inputs/IntitutionsInputs.js b/src/Admin/Components/Components/Inputs/IntitutionsInputs.js
index 318c9626..6e5f1d04 100644
--- a/src/Admin/Components/Components/Inputs/IntitutionsInputs.js
+++ b/src/Admin/Components/Components/Inputs/IntitutionsInputs.js
@@ -25,6 +25,7 @@ import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
import Typography from "@material-ui/core/Typography";
import ListRoundedIcon from "@material-ui/icons/ListRounded";
+import Grid from "@material-ui/core/Grid";
//imports local files
import SnackBar from '../../../../Components/SnackbarComponent';
//imports services
@@ -216,7 +217,7 @@ const EditInstitution = ({ match }) => {
return <div> Loading... </div>
} else {
return (
- <Card variant="outlined">
+ <Card>
<SnackBar
severity={snackInfo.icon}
text={snackInfo.message}
@@ -230,25 +231,29 @@ const EditInstitution = ({ match }) => {
})}
/>
<CardContent>
- <div style={{ display: 'flex', justifyContent: 'space-between' }}>
- <Typography
- variant='h4'
- color="inherit"
- gutterBottom
- >
- {name}
- </Typography>
-
- <Link style={{textDecoration: 'none'}} to={`/admin/intitutions`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
+ <Grid container xs={12} justify="space-between" alignItems="center" alignContent="center">
+ <Grid item>
+ <Typography
+ variant='h4'
+ color="inherit"
+ gutterBottom
>
- Listar
+ {name}
+ </Typography>
+ </Grid>
+
+ <Grid item>
+ <Link style={{textDecoration: 'none'}} to={`/admin/intitutions`}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Listar
</Button>
- </Link>
- </div>
+ </Link>
+ </Grid>
+ </Grid>
<div>
<div>
diff --git a/src/Admin/Components/Components/Inputs/NoteVarInputs.js b/src/Admin/Components/Components/Inputs/NoteVarInputs.js
index 905893fd..bba28a04 100644
--- a/src/Admin/Components/Components/Inputs/NoteVarInputs.js
+++ b/src/Admin/Components/Components/Inputs/NoteVarInputs.js
@@ -25,6 +25,7 @@ import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
import Typography from "@material-ui/core/Typography";
import ListRoundedIcon from "@material-ui/icons/ListRounded";
+import Grid from '@material-ui/core/Grid';
//imports local files
import SnackBar from '../../../../Components/SnackbarComponent';
//imports services
@@ -229,25 +230,29 @@ const NoteVarInputs = ({ match }) => {
/>
<CardContent>
- <div style={{ display: 'flex', justifyContent: 'space-between' }}>
- <Typography
- variant='h4'
- color="inherit"
- gutterBottom
- >
- {name}
- </Typography>
-
- <Link style={{textDecoration: 'none'}} to={`/admin/noteVars`}>
- <Button
- startIcon={<ListRoundedIcon />}
- color="primary"
- variant="outlined"
+ <Grid container xs={12} justify="space-between" alignItems="center" alignContent="center">
+ <Grid>
+ <Typography
+ variant='h4'
+ color="inherit"
+ gutterBottom
>
- Listar
+ {name}
+ </Typography>
+ </Grid>
+
+ <Grid>
+ <Link style={{ textDecoration: 'none' }} to={`/admin/noteVars`}>
+ <Button
+ startIcon={<ListRoundedIcon />}
+ color="primary"
+ variant="outlined"
+ >
+ Listar
</Button>
- </Link>
- </div>
+ </Link>
+ </Grid>
+ </Grid>
<form style={{ display: 'flex', flexDirection: 'column' }}>
{fields.map((field, index) => (
diff --git a/src/Admin/Components/Components/Table.js b/src/Admin/Components/Components/Table.js
index 84b0972d..2da01f13 100644
--- a/src/Admin/Components/Components/Table.js
+++ b/src/Admin/Components/Components/Table.js
@@ -24,6 +24,7 @@ const StyledTableCell = withStyles((theme) => ({
const useStyles = makeStyles({
table: {
minWidth: 700,
+ width : "100%"
},
root: {
minWidth: 275,
@@ -46,7 +47,6 @@ const useStyles = makeStyles({
const TableData = (props) => {
const classes = useStyles();
- console.log(props.onIconPressed)
return (
<TableContainer component={Paper}>
<Table className={classes.table} aria-label="customized table">
diff --git a/src/Admin/Components/Styles/DataCard.js b/src/Admin/Components/Styles/DataCard.js
index eeacbcb9..17083da5 100644
--- a/src/Admin/Components/Styles/DataCard.js
+++ b/src/Admin/Components/Styles/DataCard.js
@@ -48,6 +48,9 @@ const useStyles = makeStyles({
flexDirection: "column",
marginBottom: "1em",
},
+ marginTop : {
+ marginTop : '1em',
+ }
});
export { useStyles };
\ No newline at end of file
diff --git a/src/Admin/Pages/Pages/SubPages/Activity.js b/src/Admin/Pages/Pages/SubPages/Activity.js
index d51b3793..e26bd37e 100644
--- a/src/Admin/Pages/Pages/SubPages/Activity.js
+++ b/src/Admin/Pages/Pages/SubPages/Activity.js
@@ -17,6 +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, { useEffect, useState } from "react";
+import moment from 'moment';
//imports from local files
import TableData from "../../../Components/Components/Table";
import SnackBar from "../../../../Components/SnackbarComponent";
@@ -203,17 +204,16 @@ const Activity = () => {
});
};
+ const DisplayDate = (date) => {
+ const convertedData = moment.utc(date);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
+
//getting data from server
useEffect(() => {
- const headers = {
- Accept: "application/json",
- "Content-Type": "application/json; charset=utf-8",
- "access-token": sessionStorage.getItem("@portalmec/accessToken"),
- client: sessionStorage.getItem("@portalmec/clientToken"),
- uid: sessionStorage.getItem("@portalmec/uid"),
- };
-
- GetFullList(Url("activities", "", `${currPage}`, "DESC"), headers).then(
+ GetFullList(Url("activities", "", `${currPage}`, "DESC")).then(
(res) => {
if (res.state) {
const arrData = [...res.data];
@@ -294,7 +294,7 @@ const Activity = () => {
startIcon={<FilterListRoundedIcon />}
>
Filtrar
- </Button>
+ </Button>
</Grid>
</Grid>
</Grid>
@@ -363,7 +363,7 @@ const Activity = () => {
) : (
<StyledTableRow key={index}>
<StyledTableCell component="th" scope="row">
- {row.created_at}
+ {DisplayDate(row.created_at)}
</StyledTableCell>
<StyledTableCell align="right">
{
diff --git a/src/Admin/Pages/Pages/SubPages/Collections.js b/src/Admin/Pages/Pages/SubPages/Collections.js
index 33d7571c..dbb96d39 100644
--- a/src/Admin/Pages/Pages/SubPages/Collections.js
+++ b/src/Admin/Pages/Pages/SubPages/Collections.js
@@ -17,6 +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, { useEffect, useState } from "react";
+import moment from 'moment';
//imports from local files
import TableData from "../../../Components/Components/Table";
import SnackBar from "../../../../Components/SnackbarComponent";
@@ -275,17 +276,16 @@ const Collections = () => {
});
}
+ const DisplayDate = (date) => {
+ const convertedData = moment.utc(date);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
+
//getting data from server
useEffect(() => {
- const headers = {
- Accept: "application/json",
- "Content-Type": "application/json; charset=utf-8",
- "access-token": sessionStorage.getItem("@portalmec/accessToken"),
- client: sessionStorage.getItem("@portalmec/clientToken"),
- uid: sessionStorage.getItem("@portalmec/uid"),
- };
-
- GetFullList(Url("collections", "", `${currPage}`, "DESC"), headers).then(
+ GetFullList(Url("collections", "", `${currPage}`, "DESC")).then(
(res) => {
if (res.state) {
const arrData = [...res.data];
@@ -376,8 +376,8 @@ const Collections = () => {
<>
<div style={{ height: "1em" }}></div>
- <div style={{ justifyContent: 'space-between', display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
- <div>
+ <Grid container alignItems="center" alignContent="center" xs={12} direction="row" justify="space-between">
+ <Grid item>
<TextField
select
label="Filtro"
@@ -394,17 +394,17 @@ const Collections = () => {
</MenuItem>
))}
</TextField>
- </div>
+ </Grid>
- <div>
+ <Grid item>
<TextField
label="Pesquisa"
onChange={(event) => HandleSearch(event)}
>
</TextField>
- </div>
- </div>
+ </Grid>
+ </Grid>
</>
) : null}
</Paper>
@@ -465,10 +465,10 @@ const Collections = () => {
}
</StyledTableCell>
<StyledTableCell align="right">
- {row.created_at}
+ {DisplayDate(row.created_at)}
</StyledTableCell>
<StyledTableCell align="right">
- {row.updated_at}
+ {DisplayDate(row.updated_at)}
</StyledTableCell>
<StyledTableCell align="right">
{row.privacy}
diff --git a/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js b/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js
index 01fe0fd4..8fa874d4 100644
--- a/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js
+++ b/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js
@@ -17,6 +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, { useEffect, useState } from "react";
+import moment from 'moment';
//imports from local files
import TableData from "../../../Components/Components/Table";
import SnackBar from "../../../../Components/SnackbarComponent";
@@ -251,17 +252,16 @@ const Activity = () => {
});
};
+ const DisplayDate = (date) => {
+ const convertedData = moment.utc(date);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
+
//getting data from server
useEffect(() => {
- const headers = {
- Accept: "application/json",
- "Content-Type": "application/json; charset=utf-8",
- "access-token": sessionStorage.getItem("@portalmec/accessToken"),
- client: sessionStorage.getItem("@portalmec/clientToken"),
- uid: sessionStorage.getItem("@portalmec/uid"),
- };
-
- GetFullList(Url("contacts", "", `${currPage}`, "DESC"), headers).then(
+ GetFullList(Url("contacts", "", `${currPage}`, "DESC")).then(
(res) => {
if (res.state) {
const arrData = [...res.data];
@@ -510,7 +510,7 @@ const Activity = () => {
{row.id}
</StyledTableCell>
<StyledTableCell align="right">
- {row.created_at}
+ {DisplayDate(row.created_at)}
</StyledTableCell>
<StyledTableCell align="right">
{row.name}
diff --git a/src/Admin/Pages/Pages/SubPages/Institutions.js b/src/Admin/Pages/Pages/SubPages/Institutions.js
index 7b208939..e1d74e29 100644
--- a/src/Admin/Pages/Pages/SubPages/Institutions.js
+++ b/src/Admin/Pages/Pages/SubPages/Institutions.js
@@ -313,18 +313,16 @@ const Institutions = () => {
}
useEffect(() => {
- fetch(Url("institutions", "", `${currPage}`, "DESC"))
- .then((res) => res.json())
- .then(
- (result) => {
+ GetFullList(Url("institutions", "", `${currPage}`, "DESC"))
+ .then(
+ (result) => {
+ if(result.state){
setIsLoaded(true);
- setItems(result.concat(addOndeLenght));
- },
- (error) => {
- setIsLoaded(true);
- setError(error);
- }
- );
+ setItems(result.data.concat(addOndeLenght));
+ } else setError(true);
+ },
+ );
+
}, []);
if (error) {
diff --git a/src/Admin/Pages/Pages/SubPages/Languages.js b/src/Admin/Pages/Pages/SubPages/Languages.js
index 72eb06b9..64005fd7 100644
--- a/src/Admin/Pages/Pages/SubPages/Languages.js
+++ b/src/Admin/Pages/Pages/SubPages/Languages.js
@@ -187,19 +187,17 @@ const Languages = () => {
//getting data from server
useEffect(() => {
- fetch(Url('languages', '', `${currPage}`, 'DESC'))
- .then(res => res.json())
- .then(
- (result) => {
+ GetFullList(Url('languages', '', `${currPage}`, 'DESC'))
+ .then(
+ (result) => {
+ if(result.state){
setIsLoaded(true);
- setItems(result.concat(ADD_ONE_LENGHT));
- },
- (error) => {
- setIsLoaded(true);
- // HandleSnack('Erro ao carregar os dados', true, 'warning', '#FA8072')
- setError(error);
+ setItems(result.data.concat(ADD_ONE_LENGHT));
+ } else {
+ setError(true);
}
- )
+ },
+ )
}, []);
diff --git a/src/Admin/Pages/Pages/SubPages/NoteVariables.js b/src/Admin/Pages/Pages/SubPages/NoteVariables.js
index 01c7b351..0d3b33ff 100644
--- a/src/Admin/Pages/Pages/SubPages/NoteVariables.js
+++ b/src/Admin/Pages/Pages/SubPages/NoteVariables.js
@@ -146,18 +146,15 @@ const NoteVariables = () => {
}
useEffect(() => {
- fetch(Url('scores', '', '0', 'DESC'))
- .then(res => res.json())
+ GetFullList(Url('scores', '', '0', 'DESC'))
.then(
(result) => {
- setIsLoaded(true);
- setItems(result.concat(AddOneLenght));
+ if(result.state){
+ setIsLoaded(true);
+ setItems(result.data.concat(AddOneLenght));
+ } else setError(true);
+
},
- (error) => {
- setIsLoaded(true);
- HandleSnack('Erro ao carregar os dados', true, 'warning', '#FA8072')
- setError(error);
- }
)
}, []);
diff --git a/src/Admin/Pages/Pages/SubPages/Questions.js b/src/Admin/Pages/Pages/SubPages/Questions.js
index 4487d32c..70b07a98 100644
--- a/src/Admin/Pages/Pages/SubPages/Questions.js
+++ b/src/Admin/Pages/Pages/SubPages/Questions.js
@@ -17,6 +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, { useEffect, useState } from 'react'
+import moment from 'moment';
//imports from local files
import TableData from '../../../Components/Components/Table';
import SnackBar from '../../../../Components/SnackbarComponent';
@@ -186,20 +187,24 @@ const Questions = () => {
}
+ const DisplayDate = (date) => {
+ const convertedData = moment.utc(date);
+ return moment(convertedData)
+ .format("LLL")
+ .toString();
+ };
+
//getting data from server
useEffect(() => {
- fetch(Url('questions', '', `${currPage}`, 'DESC'))
- .then(res => res.json())
+ GetFullList(Url('questions', '', `${currPage}`, 'DESC'))
.then(
(result) => {
- setIsLoaded(true);
- setItems(result.concat(ADD_ONE_LENGHT));
+ if(result.state)
+ {
+ setIsLoaded(true);
+ setItems(result.data.concat(ADD_ONE_LENGHT));
+ } else setError(true)
},
- (error) => {
- setIsLoaded(true);
- // HandleSnack('Erro ao carregar os dados', true, 'warning', '#FA8072')
- setError(error);
- }
)
}, []);
@@ -309,7 +314,7 @@ const Questions = () => {
<StyledTableRow key={index}>
<StyledTableCell component="th" scope="row">{row.id}</StyledTableCell>
- <StyledTableCell align="right">{row.created_at}</StyledTableCell>
+ <StyledTableCell align="right">{DisplayDate(row.created_at)}</StyledTableCell>
<StyledTableCell align="right">{row.description}</StyledTableCell>
<StyledTableCell align="right">
{
@@ -347,7 +352,7 @@ const Questions = () => {
</Grid>
}
</StyledTableCell>
- <StyledTableCell align="right">{row.updated_at}</StyledTableCell>
+ <StyledTableCell align="right">{DisplayDate(row.updated_at)}</StyledTableCell>
</StyledTableRow>
))}
</TableBody>
diff --git a/src/Admin/Pages/Pages/SubPages/Rating.js b/src/Admin/Pages/Pages/SubPages/Rating.js
index 0b18fe29..fd2bab6e 100644
--- a/src/Admin/Pages/Pages/SubPages/Rating.js
+++ b/src/Admin/Pages/Pages/SubPages/Rating.js
@@ -185,18 +185,15 @@ const Ratings = () => {
useEffect(() => {
- fetch(Url('ratings', '', currPage, 'DESC'))
- .then(res => res.json())
+ GetFullList(Url('ratings', '', currPage, 'DESC'))
.then(
(result) => {
- setIsLoaded(true);
- setItems(result.concat(AddOneLenght));
+ if(result.state)
+ {
+ setIsLoaded(true);
+ setItems(result.data.concat(AddOneLenght));
+ } else setError(true)
},
- (error) => {
- setIsLoaded(true);
- HandleSnack('Erro ao carregar os dados', true, 'warning', '#FA8072')
- setError(error);
- }
)
}, []);
--
GitLab