diff --git a/src/Admin/Components/Components/DataCards/ActionCard.js b/src/Admin/Components/Components/DataCards/ActionCard.js
index d240b498fd3a2054e51dd881ee5a2d6f27aed67a..546a1ee6fd2fe5038e3dd27d58cf1dd5fef5cddb 100644
--- a/src/Admin/Components/Components/DataCards/ActionCard.js
+++ b/src/Admin/Components/Components/DataCards/ActionCard.js
@@ -39,7 +39,7 @@ import {
deleteRequest,
} from "../../../../Components/HelperFunctions/getAxiosConfig";
import styled from 'styled-components'
-import { GrAction } from 'react-icons/gr'
+import { FaRegHandPointer } from 'react-icons/fa'
const AchievementCard = ({ match }) => {
let history = useHistory();
@@ -85,6 +85,7 @@ const AchievementCard = ({ match }) => {
"success",
"#228B22"
);
+ setReloadPage(!reloadPage)
}
history.goBack()
},
@@ -193,7 +194,7 @@ const AchievementCard = ({ match }) => {
borderBottom: "solid #d4d4d4 1px"
}}>
<ImgDiv>
- <GrAction size={200} color="#00bcd4" />
+ <FaRegHandPointer size={200} color="#00bcd4" />
</ImgDiv>
</Grid>
<Grid item sm={7} xs={12}>
@@ -256,9 +257,9 @@ const AchievementCard = ({ match }) => {
return (
<li key={require.created_at}>
<Link to={`/admin/requirement/${require.id}`}>
- <a style={{ textDecoration: 'none', color: "#00bcd4" }}>
+ <span style={{ textDecoration: 'none', color: "#00bcd4" }}>
{require.description}
- </a>
+ </span>
</Link>
</li>
)
diff --git a/src/Admin/Components/Components/DataCards/RequirementCard.js b/src/Admin/Components/Components/DataCards/RequirementCard.js
index 68b264c64a96a68911e1c6dbdf5162939dcdbd9f..69cae60511fed7e08225cb03ffb175366264f299 100644
--- a/src/Admin/Components/Components/DataCards/RequirementCard.js
+++ b/src/Admin/Components/Components/DataCards/RequirementCard.js
@@ -85,6 +85,7 @@ const AchievementCard = ({ match }) => {
"success",
"#228B22"
);
+ setReloadPage(!reloadPage)
}
history.goBack()
},
@@ -206,9 +207,9 @@ const AchievementCard = ({ match }) => {
Nome
</Typography>
<Link to={`/admin/action/${item.action.id}`}>
- <a style={{ textDecoration: 'none', color: "#673ab7" }}>
+ <span style={{ textDecoration: 'none', color: "#673ab7" }}>
{item.action.name}
- </a>
+ </span>
</Link>
</Grid>
<Grid item>
@@ -256,9 +257,9 @@ const AchievementCard = ({ match }) => {
return (
<li key={achieve.created_at}>
<Link to={`/admin/achievement/${achieve.id}`}>
- <a style={{ textDecoration: 'none', color: "#673ab7" }}>
+ <span style={{ textDecoration: 'none', color: "#673ab7" }}>
{achieve.name}
- </a>
+ </span>
</Link>
</li>
)
diff --git a/src/Admin/Components/Components/DisplayIcon.js b/src/Admin/Components/Components/DisplayIcon.js
index b5692e42d006b54370b98d466e1b2bcff14e343e..d79eb0437a3d902e3f9b1278c389e17b1c61e661 100644
--- a/src/Admin/Components/Components/DisplayIcon.js
+++ b/src/Admin/Components/Components/DisplayIcon.js
@@ -40,7 +40,7 @@ import AllOutIcon from "@material-ui/icons/AllOut";
import SportsEsportsRoundedIcon from '@material-ui/icons/SportsEsportsRounded';
import { GiAchievement } from "react-icons/gi"
import { DiRequirejs } from "react-icons/di"
-import { GrAction } from 'react-icons/gr'
+import { FaRegHandPointer } from 'react-icons/fa'
//This file manipulate the icon that will be displayed in the left navigation menu
@@ -69,7 +69,7 @@ const icons = [
<SportsEsportsRoundedIcon style={{ fill: orange }} />,
<GiAchievement size={24} style={{ fill: pink }} />,
<DiRequirejs size={24} style={{ fill: purple }} />,
- <GrAction size={24} style={{ fill: blue }} />,
+ <FaRegHandPointer size={24} style={{ fill: blue }} />,
<TimelineRoundedIcon style={{ fill: orange }} />,
<SettingsRoundedIcon style={{ fill: pink }} />,
<ExitToAppRoundedIcon style={{ fill: purple }} />,
diff --git a/src/Admin/Components/Components/Inputs/CreateAction.js b/src/Admin/Components/Components/Inputs/CreateAction.js
index 1124da0db0c94def7e089b84c9aec83cbd55c69b..7812afa5c9f33ec9403a4cbb6a522bf52f9f836e 100644
--- a/src/Admin/Components/Components/Inputs/CreateAction.js
+++ b/src/Admin/Components/Components/Inputs/CreateAction.js
@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
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, useContext, useEffect } from 'react'
+import React, { useState, useContext } from 'react'
//imports material ui componets
import Card from "@material-ui/core/Card"
import CardContent from "@material-ui/core/CardContent"
diff --git a/src/Admin/Components/Components/Inputs/CreateItem/CompAddImg.js b/src/Admin/Components/Components/Inputs/CreateItem/CompAddImg.js
index 102ea0b081c55608e56da2785ea345eb6a22e517..fc2db478913a0a4c130aad6ceef131af2508d15c 100644
--- a/src/Admin/Components/Components/Inputs/CreateItem/CompAddImg.js
+++ b/src/Admin/Components/Components/Inputs/CreateItem/CompAddImg.js
@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
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, { useContext, useState } from 'react';
+import React, { useState } from 'react';
import { Button } from '@material-ui/core';
import styled from 'styled-components'
import CloseIcon from '@material-ui/icons/Close';
diff --git a/src/Admin/Components/Components/Inputs/CreateRequirement.js b/src/Admin/Components/Components/Inputs/CreateRequirement.js
index e7d51d25753455c3d79a39d8bdf4d540c0b8fbbb..41e5128b07d920bb292aa83e12d53cc5cd68a139 100644
--- a/src/Admin/Components/Components/Inputs/CreateRequirement.js
+++ b/src/Admin/Components/Components/Inputs/CreateRequirement.js
@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
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, useContext, useEffect } from 'react'
+import React, { useState, useContext } from 'react'
//imports material ui componets
import Card from "@material-ui/core/Card"
import CardContent from "@material-ui/core/CardContent"
@@ -47,8 +47,6 @@ const CreateRequirement = () => {
const [stringReq, setStringReq] = useState("")
const [isLoading, setIsLoading] = useState(false)
- const [isLoaded, setIsLoaded] = useState(false)
- const [error, setError] = useState(false)
const [errorInGoal, setErrorInGoal] = useState({
error: false,
diff --git a/src/Admin/Components/Components/MobileComponents/MobilePageHeader.js b/src/Admin/Components/Components/MobileComponents/MobilePageHeader.js
index 99405165da5b74310a7c9f4fb7c794ce4fea3106..f3520c9f12319310eba1544dd60d551aa001a29e 100644
--- a/src/Admin/Components/Components/MobileComponents/MobilePageHeader.js
+++ b/src/Admin/Components/Components/MobileComponents/MobilePageHeader.js
@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
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 React from "react";
import Paper from "@material-ui/core/Paper"
import Grid from "@material-ui/core/Grid"
import Button from "@material-ui/core/Button"
diff --git a/src/Admin/Components/Components/PageHeader.js b/src/Admin/Components/Components/PageHeader.js
index 12351fec8b7568aa35174bd84df3ec96d60713b7..beef3c04f372e78dec96dbe82d252e787555e7e9 100644
--- a/src/Admin/Components/Components/PageHeader.js
+++ b/src/Admin/Components/Components/PageHeader.js
@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
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 React from "react";
import Paper from "@material-ui/core/Paper"
import Grid from "@material-ui/core/Grid"
import Button from "@material-ui/core/Button"
diff --git a/src/Admin/Pages/Pages/SubPages/Gamefication.js b/src/Admin/Pages/Pages/SubPages/Gamefication.js
index 92149ab63d272c4e3098fce01b1b88bf49610f99..9237ed255628ce10815344d9e1a612c29a736f33 100644
--- a/src/Admin/Pages/Pages/SubPages/Gamefication.js
+++ b/src/Admin/Pages/Pages/SubPages/Gamefication.js
@@ -421,6 +421,8 @@ const Gamefication = () => {
(error) => {
HandleSnack('Erro ao carregar os dados', true, 'warning', '#FA8072')
setIsLoadingMoreItems(false)
+ setLoaded(true)
+ setError(true)
}
)
}, [currPage, typeOpt, stateOpt, name])
diff --git a/src/Admin/Pages/Pages/SubPages/GameficationAchieves.js b/src/Admin/Pages/Pages/SubPages/GameficationAchieves.js
index fcf6c5bca1506496d6e0fe901e17b62638668601..17a85a4c2f0703acb52cb3b38df527ddf6b35fa2 100644
--- a/src/Admin/Pages/Pages/SubPages/GameficationAchieves.js
+++ b/src/Admin/Pages/Pages/SubPages/GameficationAchieves.js
@@ -399,6 +399,8 @@ const GameficationAchieves = () => {
(error) => {
HandleSnack('Erro ao carregar os dados', true, 'warning', '#FA8072')
setIsLoadingMoreItems(false)
+ setLoaded(true)
+ setError(true)
}
)
}, [currPage, name, stateOpt])
diff --git a/src/Admin/Pages/Pages/SubPages/GameficationActions.js b/src/Admin/Pages/Pages/SubPages/GameficationActions.js
index c066b0c1eddecbb56d37bf3a308dbd192abf5aa2..b386a02db6baa8922bc04c43f52e8d5e85211aab 100644
--- a/src/Admin/Pages/Pages/SubPages/GameficationActions.js
+++ b/src/Admin/Pages/Pages/SubPages/GameficationActions.js
@@ -21,8 +21,8 @@ import moment from "moment";
import Unauthorized from "../../../Components/Components/Unauthorized";
import { Store } from "../../../../Store";
import { Link, useHistory } from "react-router-dom";
-import { getRequest, deleteRequest, putRequest } from "../../../../Components/HelperFunctions/getAxiosConfig";
-import { Url, DeleteFilter, EditFilter } from "../../../Filters";
+import { getRequest, deleteRequest } from "../../../../Components/HelperFunctions/getAxiosConfig";
+import { Url, DeleteFilter } from "../../../Filters";
import UpdateRoundedIcon from "@material-ui/icons/UpdateRounded";
import { withStyles } from "@material-ui/core/styles";
import AddRoundedIcon from "@material-ui/icons/AddRounded";
@@ -33,7 +33,6 @@ import PageHeader from "../../../Components/Components/PageHeader";
import SnackBar from "../../../../Components/SnackbarComponent";
import TableData from "../../../Components/Components/Table";
import TextField from "@material-ui/core/TextField";
-import MenuItem from "@material-ui/core/MenuItem";
import TableBody from "@material-ui/core/TableBody";
import TableCell from "@material-ui/core/TableCell";
import TableRow from "@material-ui/core/TableRow";
@@ -45,7 +44,7 @@ import styled from 'styled-components'
import MobileList from "../../../Components/Components/MobileComponents/SimpleList"
import { Grid } from "@material-ui/core";
import AlertDialog from "../../../Components/Components/AlertDialog"
-import { GrAction } from 'react-icons/gr'
+import { FaRegHandPointer } from 'react-icons/fa'
import DeleteRoundedIcon from '@material-ui/icons/DeleteRounded';
const StyledTableCell = withStyles((theme) => ({
@@ -208,6 +207,8 @@ const GameficationActions = () => {
},
(error) => {
HandleSnack('Erro ao carregar os dados', true, 'warning', '#FA8072')
+ setLoaded(true)
+ setError(true)
setIsLoadingMoreItems(false)
}
)
@@ -343,7 +344,7 @@ const GameficationActions = () => {
subtitle={row.id}
backColor={"#00bcd4"}
avatar={
- <GrAction size={20} color="white" />
+ <FaRegHandPointer size={20} color="white" />
}
href={`/admin/action/${row.id}`}
reset={() => { }}
@@ -369,9 +370,9 @@ const GameficationActions = () => {
return (
<li key={req.created_at}>
<Link to={`/admin/requirement/${req.id}`}>
- <a style={{ color: "#00bcd4", textDecoration: "none" }}>
+ <span style={{ color: "#00bcd4", textDecoration: "none" }}>
{req.description}
- </a>
+ </span>
</Link>
</li>
)
diff --git a/src/Admin/Pages/Pages/SubPages/GameficationRequires.js b/src/Admin/Pages/Pages/SubPages/GameficationRequires.js
index 64099c70d7d0d59b9e05d08bd85487b9196da860..7385729b63073975061fb4ca1e38021691347641 100644
--- a/src/Admin/Pages/Pages/SubPages/GameficationRequires.js
+++ b/src/Admin/Pages/Pages/SubPages/GameficationRequires.js
@@ -21,8 +21,8 @@ import moment from "moment";
import Unauthorized from "../../../Components/Components/Unauthorized";
import { Store } from "../../../../Store";
import { Link, useHistory } from "react-router-dom";
-import { getRequest, deleteRequest, putRequest } from "../../../../Components/HelperFunctions/getAxiosConfig";
-import { Url, DeleteFilter, EditFilter } from "../../../Filters";
+import { getRequest, deleteRequest } from "../../../../Components/HelperFunctions/getAxiosConfig";
+import { Url, DeleteFilter } from "../../../Filters";
import UpdateRoundedIcon from "@material-ui/icons/UpdateRounded";
import { withStyles } from "@material-ui/core/styles";
import AddRoundedIcon from "@material-ui/icons/AddRounded";
@@ -33,7 +33,6 @@ import PageHeader from "../../../Components/Components/PageHeader";
import SnackBar from "../../../../Components/SnackbarComponent";
import TableData from "../../../Components/Components/Table";
import TextField from "@material-ui/core/TextField";
-import MenuItem from "@material-ui/core/MenuItem";
import TableBody from "@material-ui/core/TableBody";
import TableCell from "@material-ui/core/TableCell";
import TableRow from "@material-ui/core/TableRow";
@@ -205,6 +204,8 @@ const GameficationRequires = () => {
(error) => {
HandleSnack('Erro ao carregar os dados', true, 'warning', '#FA8072')
setIsLoadingMoreItems(false)
+ setLoaded(true)
+ setError(true)
}
)
}, [currPage, descricao, stateOpt])
@@ -352,9 +353,9 @@ const GameficationRequires = () => {
return (
<li key={achieve.created_at}>
<Link to={`/admin/achievement/${achieve.id}`}>
- <a style={{textDecoration: "none", color: '#673ab7'}}>
+ <span style={{textDecoration: "none", color: '#673ab7', backgroundColor:'none'}}>
{achieve.name}
- </a>
+ </span>
</Link>
</li>
)