diff --git a/src/Admin/Pages/Pages/SubPages/Activity.js b/src/Admin/Pages/Pages/SubPages/Activity.js
index 2c0a137f18c0837536f5cf1266d4ad42d5860269..b8a4448a615c0d75682900ad8c3bf3128256ca5a 100644
--- a/src/Admin/Pages/Pages/SubPages/Activity.js
+++ b/src/Admin/Pages/Pages/SubPages/Activity.js
@@ -79,8 +79,6 @@ const Activity = () => {
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false); //controlls the state of loadind more data
- const [isUpdating, setIsUpdating] = useState(false); //controlls the state of updating data
-
const [showFilter, setShowFilter] = useState(false);
const [option, setOption] = useState(); //labels of the text field 'to'
const [currPage, setCurrPage] = useState(0)
@@ -207,13 +205,12 @@ const Activity = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -341,7 +338,7 @@ const Activity = () => {
actions={[
{
name: "Atualizar",
- isLoading: isUpdating,
+ isLoading: false,
func: () => {
setCurrPage(0)
},
@@ -427,7 +424,7 @@ const Activity = () => {
<StyledTableCell align="right">{row.privacy}</StyledTableCell>
<StyledTableCell align="right">
<Link to={`/admin/activity/${row.id}`}>
- <IconButton onClick={() => { currPage = 0 }}>
+ <IconButton>
<VisibilityIcon style={{ fill: "#00bcd4" }} />
</IconButton>
</Link>
diff --git a/src/Admin/Pages/Pages/SubPages/AproveTeacher.js b/src/Admin/Pages/Pages/SubPages/AproveTeacher.js
index 7ff0da907971b862b013b526cdcac01e9739c19f..5b3ad8b20fc172fb5bfd558bef1913df0030b693 100644
--- a/src/Admin/Pages/Pages/SubPages/AproveTeacher.js
+++ b/src/Admin/Pages/Pages/SubPages/AproveTeacher.js
@@ -91,7 +91,6 @@ const AproveTeacher = () => {
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false); //controlls the state of loadind more data
- const [isUpdating, setIsUpdating] = useState(false); //controlls the state of updating data
const [currPage, setCurrPage] = useState(0)
const [showFilter, setShowFilter] = useState(false);
@@ -390,17 +389,12 @@ const AproveTeacher = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {isUpdating ? (
- <CircularProgress size={24} />
- ) : (
- "Atualizar"
- )}
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -616,17 +610,12 @@ const AproveTeacher = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {isUpdating ? (
- <CircularProgress size={24} />
- ) : (
- "Atualizar"
- )}
+ Atualizar
</Button>
</Grid>
<Grid item>
diff --git a/src/Admin/Pages/Pages/SubPages/BlockedUsers.js b/src/Admin/Pages/Pages/SubPages/BlockedUsers.js
index 705a4c58ea279df20418bc84403be48cd5925688..eb170763701cddd4e9d8c43a5137fb40538e46e7 100644
--- a/src/Admin/Pages/Pages/SubPages/BlockedUsers.js
+++ b/src/Admin/Pages/Pages/SubPages/BlockedUsers.js
@@ -72,7 +72,6 @@ const BlockedUsers = () => {
const [isLoaded, setIsLoaded] = useState(false); //Necessary to consult the API, wait until complete
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false)
- const [isUpdating, setIsUpdating] = useState(false)
const [stateOpt, setStateOpt] = useState(1)
const [currPage, setCurrPage] = useState(0)
@@ -264,15 +263,12 @@ const BlockedUsers = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
</Grid>
@@ -418,15 +414,12 @@ const BlockedUsers = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
</Grid>
diff --git a/src/Admin/Pages/Pages/SubPages/Collections.js b/src/Admin/Pages/Pages/SubPages/Collections.js
index 626aeed6d473b5a047c7f2b525502c42f03075c1..08502d06e53c4ce7cb1cf92287a7ede76d153bd5 100644
--- a/src/Admin/Pages/Pages/SubPages/Collections.js
+++ b/src/Admin/Pages/Pages/SubPages/Collections.js
@@ -87,7 +87,6 @@ const Collections = () => {
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false); //controlls the state of loadind more data
- const [isUpdating, setIsUpdating] = useState(false); //controlls the state of updating data
const [showFilter, setShowFilter] = useState(false);
const [valueOfSearch, setValueOfSearch] = useState("")
@@ -288,13 +287,12 @@ const Collections = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -469,13 +467,12 @@ const Collections = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
<Grid item>
diff --git a/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js b/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js
index e7a59b94acb960c414602c835f36ee8762a14851..8ffa8a15fc329a63a1a4aa958ecfe66aef67dc0e 100644
--- a/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js
+++ b/src/Admin/Pages/Pages/SubPages/CommunityQuestions.js
@@ -32,13 +32,11 @@ import TableBody from "@material-ui/core/TableBody";
import TableCell from "@material-ui/core/TableCell";
import TableRow from "@material-ui/core/TableRow";
import TextField from "@material-ui/core/TextField";
-import Popover from "@material-ui/core/Popover";
import IconButton from "@material-ui/core/IconButton";
import { Button, Typography, Paper, Grid } from "@material-ui/core";
import CircularProgress from "@material-ui/core/CircularProgress";
import AddRoundedIcon from "@material-ui/icons/AddRounded";
import UpdateRoundedIcon from "@material-ui/icons/UpdateRounded";
-import CancelRoundedIcon from '@material-ui/icons/CancelRounded';
import FilterListRoundedIcon from "@material-ui/icons/FilterListRounded";
import VisibilityIcon from "@material-ui/icons/Visibility";
import EmailRoundedIcon from '@material-ui/icons/EmailRounded';
@@ -80,14 +78,12 @@ const CommunityQuestion = () => {
]; //Labels from Table
const WINDOW_WIDTH = window.innerWidth
- const [anchorEl, setAnchorEl] = React.useState(null);
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 [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false); //controlls the state of loadind more data
- const [isUpdating, setIsUpdating] = useState(false); //controlls the state of updating data
const [currPage, setCurrPage] = useState(0)
//Works with the filter
@@ -256,13 +252,12 @@ const CommunityQuestion = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -430,13 +425,12 @@ const CommunityQuestion = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
<Grid item>
diff --git a/src/Admin/Pages/Pages/SubPages/Complaints.js b/src/Admin/Pages/Pages/SubPages/Complaints.js
index e7d47fbe95ee13b5907a21dae57c3c3d3aea9946..7d96f842fae0c410634ef7f34a4e2f2358ec82d1 100644
--- a/src/Admin/Pages/Pages/SubPages/Complaints.js
+++ b/src/Admin/Pages/Pages/SubPages/Complaints.js
@@ -88,8 +88,6 @@ const Complaints = () => {
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false); //controlls the state of loadind more data
- const [isUpdating, setIsUpdating] = useState(false); //controlls the state of updating data
-
const [showFilter, setShowFilter] = useState(false);
const [stateOption, setStateOption] = useState(0);
@@ -145,60 +143,6 @@ const Complaints = () => {
return canUserEdit;
}
- //handle load more items
- const LoadMoreItens = async (api) => {
- setIsLoadingMoreItems(true);
- getRequest(
- api,
- (data, header) => {
- const arrData = [...data];
- if (arrData.length === 0) {
- HandleSnack(
- "Não há mais dados para serem carregados",
- true,
- "warning",
- "#FFC125"
- );
- } else {
- const arrItems = [...items];
- arrItems.pop(); //Deleting the last position, that was used to display the button of load more items
- const arrResult = arrItems.concat(arrData);
- setItems(arrResult.concat(ADD_ONE_LENGHT));
- }
- setIsLoadingMoreItems(false);
- },
- (error) => {
- HandleSnack("Erro ao carregar os dados", true, "warning", "#FA8072");
- setIsLoadingMoreItems(false);
- }
- )
- };
-
- // handle update list data
- const UpdateHandler = async (api) => {
- setIsUpdating(true);
- getRequest(
- api,
- (data, header) => {
- HandleSnack(
- "A lista de dados foi atualizada",
- true,
- "success",
- "#228B22"
- );
- const arrData = [...data];
- setItems(arrData.concat(ADD_ONE_LENGHT));
- setIsUpdating(false);
-
- },
- (error) => {
- HandleSnack("Erro ao carregar os dados", true, "warning", "#FA8072");
- setIsUpdating(false);
-
- }
- )
- };
-
const handleChangeState = (e, type) => {
const value = e.target.value;
setStateOption(value);
@@ -284,23 +228,23 @@ const Complaints = () => {
const buildUrl = (complainOpt, state, description) => {
if (complainOpt && (state >= 0 && state <= 2) && description)
- return Url("/complaints", `"state" : ${state}, "complaint_reason_id" : ${complainOpt}, "description" : "${description}"`, currPage, "DESC")
+ return Url("complaints", `"state" : ${state}, "complaint_reason_id" : ${complainOpt}, "description" : "${description}"`, currPage, "DESC")
else if (complainOpt && description)
- return Url("/complaints", `"complaint_reason_id" : ${complainOpt}, "description" : "${description}"`, currPage, "DESC")
+ return Url("complaints", `"complaint_reason_id" : ${complainOpt}, "description" : "${description}"`, currPage, "DESC")
else if (complainOpt && (state >= 0 && state <= 2))
- return Url("/complaints", `"complaint_reason_id" : ${complainOpt}, "state" : ${state}`, currPage, "DESC")
+ return Url("complaints", `"complaint_reason_id" : ${complainOpt}, "state" : ${state}`, currPage, "DESC")
else if (description && (state >= 0 && state <= 2))
- return Url("/complaints", `"description" : "${description}", "state" : ${state}`, currPage, "DESC")
+ return Url("complaints", `"description" : "${description}", "state" : ${state}`, currPage, "DESC")
else if (complainOpt)
- return Url("/complaints", `"complaint_reason_id" : ${complainOpt}`, currPage, "DESC")
+ return Url("complaints", `"complaint_reason_id" : ${complainOpt}`, currPage, "DESC")
else if (state >= 0 && state <= 2)
- return Url("/complaints", `"state" : ${state}`, currPage, "DESC")
+ return Url("complaints", `"state" : ${state}`, currPage, "DESC")
else if (description)
- return Url("/complaints", `"description" : ${description}`, currPage, "DESC")
+ return Url("complaints", `"description" : ${description}`, currPage, "DESC")
else
- return Url("/complaints", "", currPage, "DESC")
+ return Url("complaints", "", currPage, "DESC")
}
useEffect(() => {
@@ -383,13 +327,12 @@ const Complaints = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -561,13 +504,12 @@ const Complaints = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
<Grid item>
diff --git a/src/Admin/Pages/Pages/SubPages/EducationalObjects.js b/src/Admin/Pages/Pages/SubPages/EducationalObjects.js
index 1467f26b28c6bf1f14290fb63c26a5f3a4b135b6..6cf1defe6e50d4ef842f09deb1de50d45adcd533 100644
--- a/src/Admin/Pages/Pages/SubPages/EducationalObjects.js
+++ b/src/Admin/Pages/Pages/SubPages/EducationalObjects.js
@@ -31,7 +31,6 @@ import TableBody from "@material-ui/core/TableBody";
import TableCell from "@material-ui/core/TableCell";
import TableRow from "@material-ui/core/TableRow";
import IconButton from "@material-ui/core/IconButton";
-import CancelRoundedIcon from "@material-ui/icons/CancelRounded";
import VisibilityIcon from "@material-ui/icons/Visibility";
import DeleteIcon from "@material-ui/icons/Delete";
// Import from material-ui
@@ -40,7 +39,6 @@ import Paper from "@material-ui/core/Paper";
import Button from "@material-ui/core/Button";
import Grid from "@material-ui/core/Grid";
import { Typography, CircularProgress } from "@material-ui/core";
-import Popover from "@material-ui/core/Popover";
import TextField from "@material-ui/core/TextField";
// services
import { getRequest, deleteRequest } from '../../../../Components/HelperFunctions/getAxiosConfig'
@@ -96,7 +94,6 @@ const EducationalObjects = () => {
const [currPage, setCurrPage] = useState(0)
const [deleteItem, setDeleteItem] = useState({}); //Delete Item
const [isLoadingToDelete, setIsLoadingToDelete] = useState(null);
- const [isUpdating, setIsUpdating] = useState(false);
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false);
const [showFilter, setShowFilter] = useState(false)
const [openAlertDialog, setOpenAlertDialog] = useState(false);
@@ -369,12 +366,11 @@ const EducationalObjects = () => {
color="secondary"
className={classes.button}
startIcon={<UpdateRoundedIcon />}
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
</Grid>
@@ -535,12 +531,11 @@ const EducationalObjects = () => {
color="secondary"
className={classes.button}
startIcon={<UpdateRoundedIcon />}
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
</Grid>
diff --git a/src/Admin/Pages/Pages/SubPages/Gamefication.js b/src/Admin/Pages/Pages/SubPages/Gamefication.js
index 9237ed255628ce10815344d9e1a612c29a736f33..e055d8fa83d733b4cad7c121569a72696e5f49fe 100644
--- a/src/Admin/Pages/Pages/SubPages/Gamefication.js
+++ b/src/Admin/Pages/Pages/SubPages/Gamefication.js
@@ -374,23 +374,23 @@ const Gamefication = () => {
const buildUrl = (objType, state, name) => {
if (objType && (state >= 0 && state <= 2) && name)
- return Url("/items", `"state" : ${state}, "item_type" : "${objType}", "name" : "${name}"`, currPage, "DESC")
+ return Url("items", `"state" : ${state}, "item_type" : "${objType}", "name" : "${name}"`, currPage, "DESC")
else if (objType && name)
- return Url("/items", `"item_type" : "${objType}", "name" : "${name}"`, currPage, "DESC")
+ return Url("items", `"item_type" : "${objType}", "name" : "${name}"`, currPage, "DESC")
else if (objType && (state >= 0 && state <= 2))
- return Url("/items", `"item_type" : "${objType}", "state" : ${state}`, currPage, "DESC")
+ return Url("items", `"item_type" : "${objType}", "state" : ${state}`, currPage, "DESC")
else if (name && (state >= 0 && state <= 2))
- return Url("/items", `"name" : "${name}", "state" : ${state}`, currPage, "DESC")
+ return Url("items", `"name" : "${name}", "state" : ${state}`, currPage, "DESC")
else if (objType)
- return Url("/items", `"item_type" : "${objType}"`, currPage, "DESC")
+ return Url("items", `"item_type" : "${objType}"`, currPage, "DESC")
else if (state >= 0 && state <= 2)
- return Url("/items", `"state" : ${state}`, currPage, "DESC")
+ return Url("items", `"state" : ${state}`, currPage, "DESC")
else if (name)
- return Url("/items", `"name" : ${name}`, currPage, "DESC")
+ return Url("items", `"name" : ${name}`, currPage, "DESC")
else
- return Url("/items", "", currPage, "DESC")
+ return Url("items", "", currPage, "DESC")
}
useEffect(() => {
diff --git a/src/Admin/Pages/Pages/SubPages/GameficationAchieves.js b/src/Admin/Pages/Pages/SubPages/GameficationAchieves.js
index 17a85a4c2f0703acb52cb3b38df527ddf6b35fa2..93909b137ef1a64165238866a5da473ea6edfd41 100644
--- a/src/Admin/Pages/Pages/SubPages/GameficationAchieves.js
+++ b/src/Admin/Pages/Pages/SubPages/GameficationAchieves.js
@@ -362,13 +362,13 @@ const GameficationAchieves = () => {
const buildUrl = (name, state) => {
if (name && (state >= 0 && state <= 2))
- return Url("/achievements", `"state" : ${stateOpt}, "name" : "${name}"`, currPage, "DESC")
+ return Url("achievements", `"state" : ${stateOpt}, "name" : "${name}"`, currPage, "DESC")
else if (name)
- return Url("/achievements", `"name" : "${name}"`, currPage, "DESC")
+ return Url("achievements", `"name" : "${name}"`, currPage, "DESC")
else if (state >= 0 && state <= 2)
- return Url("/achievements", `"state" : ${stateOpt}`, currPage, "DESC")
+ return Url("achievements", `"state" : ${stateOpt}`, currPage, "DESC")
else
- return Url("/achievements", "", currPage, "DESC")
+ return Url("achievements", "", currPage, "DESC")
}
useEffect(() => {
diff --git a/src/Admin/Pages/Pages/SubPages/GameficationActions.js b/src/Admin/Pages/Pages/SubPages/GameficationActions.js
index b386a02db6baa8922bc04c43f52e8d5e85211aab..450bb1812a61f89d82be0f79ffdd8bc969dde74f 100644
--- a/src/Admin/Pages/Pages/SubPages/GameficationActions.js
+++ b/src/Admin/Pages/Pages/SubPages/GameficationActions.js
@@ -171,13 +171,13 @@ const GameficationActions = () => {
const buildUrl = (description, name) => {
if (description && name)
- return Url("/actions", `"description" : "${description}", "name" : "${name}"`, currPage, "DESC")
+ return Url("actions", `"description" : "${description}", "name" : "${name}"`, currPage, "DESC")
if (description)
- return Url("/actions", `"description" : "${description}"`, currPage, "DESC")
+ return Url("actions", `"description" : "${description}"`, currPage, "DESC")
if (name)
- return Url("/actions", `"name" : "${name}"`, currPage, "DESC")
+ return Url("actions", `"name" : "${name}"`, currPage, "DESC")
else
- return Url("/actions", "", currPage, "DESC")
+ return Url("actions", "", currPage, "DESC")
}
useEffect(() => {
diff --git a/src/Admin/Pages/Pages/SubPages/GameficationRequires.js b/src/Admin/Pages/Pages/SubPages/GameficationRequires.js
index 7385729b63073975061fb4ca1e38021691347641..e38325fed859997fd5e9f5de7ae8ef964a2036f5 100644
--- a/src/Admin/Pages/Pages/SubPages/GameficationRequires.js
+++ b/src/Admin/Pages/Pages/SubPages/GameficationRequires.js
@@ -171,9 +171,9 @@ const GameficationRequires = () => {
const buildUrl = (description) => {
if (description)
- return Url("/requirements", `"description" : "${description}"`, currPage, "DESC")
+ return Url("requirements", `"description" : "${description}"`, currPage, "DESC")
else
- return Url("/requirements", "", currPage, "DESC")
+ return Url("requirements", "", currPage, "DESC")
}
useEffect(() => {
diff --git a/src/Admin/Pages/Pages/SubPages/Institutions.js b/src/Admin/Pages/Pages/SubPages/Institutions.js
index 7b9b45bd09f51232b235594be4a8cc6dd2381c23..870af7529d1cc7a8dcd9c45ee6fdfc7cea95b5e0 100644
--- a/src/Admin/Pages/Pages/SubPages/Institutions.js
+++ b/src/Admin/Pages/Pages/SubPages/Institutions.js
@@ -30,7 +30,6 @@ import TableBody from "@material-ui/core/TableBody";
import TableCell from "@material-ui/core/TableCell";
import TableRow from "@material-ui/core/TableRow";
import IconButton from "@material-ui/core/IconButton";
-import CancelRoundedIcon from "@material-ui/icons/CancelRounded";
import VisibilityIcon from "@material-ui/icons/Visibility";
import DeleteIcon from "@material-ui/icons/Delete";
// Import from material-ui
@@ -39,12 +38,11 @@ import Paper from "@material-ui/core/Paper";
import Button from "@material-ui/core/Button";
import Grid from "@material-ui/core/Grid";
import { Typography, CircularProgress } from "@material-ui/core";
-import Popover from "@material-ui/core/Popover";
import TextField from "@material-ui/core/TextField";
// services
import { getRequest, deleteRequest } from '../../../../Components/HelperFunctions/getAxiosConfig'
//Filters
-import { Url, GetOneOfAllUrl, DeleteFilter } from "../../../Filters";
+import { Url, DeleteFilter } from "../../../Filters";
//router
import { Link } from 'react-router-dom';
import styled from "styled-components"
@@ -96,7 +94,6 @@ const Institutions = () => {
const [currPage, setCurrPage] = useState(0)
const [deleteItem, setDeleteItem] = useState({}); //Delete Item
const [isLoadingToDelete, setIsLoadingToDelete] = useState(null);
- const [isUpdating, setIsUpdating] = useState(false);
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false);
const [openAlertDialog, setOpenAlertDialog] = useState(false);
@@ -372,12 +369,11 @@ const Institutions = () => {
color="secondary"
className={classes.button}
startIcon={<UpdateRoundedIcon />}
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
</Grid>
@@ -549,12 +545,11 @@ const Institutions = () => {
color="secondary"
className={classes.button}
startIcon={<UpdateRoundedIcon />}
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
>
- {isUpdating ? <CircularProgress size={24} /> : "Atualizar"}
+ Atualizar
</Button>
</Grid>
</Grid>
diff --git a/src/Admin/Pages/Pages/SubPages/Languages.js b/src/Admin/Pages/Pages/SubPages/Languages.js
index c0ba74a95cd36dc59fca2f6a0e280bdd072e9848..ee01f1ed970c7d08d40223807489bb1d7cb9d461 100644
--- a/src/Admin/Pages/Pages/SubPages/Languages.js
+++ b/src/Admin/Pages/Pages/SubPages/Languages.js
@@ -71,7 +71,6 @@ const Languages = () => {
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false) //controlls the state of loadind more data
- const [isUpdating, setIsUpdating] = useState(false); //controlls the state of updating data
const [openAlertDialog, setOpenAlertDialog] = useState(false); //controlls the state od alert dialog
const [currPage, setCurrPage] = useState(0)
@@ -230,15 +229,12 @@ const Languages = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -356,15 +352,12 @@ const Languages = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>
diff --git a/src/Admin/Pages/Pages/SubPages/NoteVariables.js b/src/Admin/Pages/Pages/SubPages/NoteVariables.js
index 2c4f7bb9607253a6b3fb7090ba9d530653e9496e..c700790b32fc25973448975ea3b2a0f4644a5c00 100644
--- a/src/Admin/Pages/Pages/SubPages/NoteVariables.js
+++ b/src/Admin/Pages/Pages/SubPages/NoteVariables.js
@@ -70,7 +70,6 @@ const NoteVariables = () => {
const [currPage, setCurrPage] = useState(0)
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false)
- const [isUpdating, setIsUpdating] = useState(false)
const [snackInfo, setSnackInfo] = useState({
message: '',
@@ -163,15 +162,12 @@ const NoteVariables = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
</Grid>
@@ -269,15 +265,12 @@ const NoteVariables = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
</Grid>
diff --git a/src/Admin/Pages/Pages/SubPages/Permissions.js b/src/Admin/Pages/Pages/SubPages/Permissions.js
index 5b0a672d9363c1e83fc10c0fdea228995a2863d9..5a4702fa5131e194fe3993db0488a252109a62a4 100644
--- a/src/Admin/Pages/Pages/SubPages/Permissions.js
+++ b/src/Admin/Pages/Pages/SubPages/Permissions.js
@@ -70,7 +70,6 @@ const UserPermissions = () => {
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [currPage, setCurrPage] = useState(0)
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false) //controlls the state of loadind more data
- const [isUpdating, setIsUpdating] = useState(false); //controlls the state of updating data
const [openAlertDialog, setOpenAlertDialog] = useState(false); //controlls the state od alert dialog
const [deleteItem, setDeleteItem] = useState({}); //Delete Item
@@ -227,15 +226,12 @@ const UserPermissions = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -350,15 +346,12 @@ const UserPermissions = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>
diff --git a/src/Admin/Pages/Pages/SubPages/Questions.js b/src/Admin/Pages/Pages/SubPages/Questions.js
index 0234ac0b31e0839b748f4aad1a42f4aa1b3b5dd6..d01e5b1b6e7844093369f08ecb861487749a45f3 100644
--- a/src/Admin/Pages/Pages/SubPages/Questions.js
+++ b/src/Admin/Pages/Pages/SubPages/Questions.js
@@ -72,7 +72,6 @@ const Questions = () => {
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [currPage, setCurrPage] = useState(0)
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false) //controlls the state of loadind more data
- const [isUpdating, setIsUpdating] = useState(false); //controlls the state of updating data
const [snackInfo, setSnackInfo] = useState({
message: '',
@@ -244,15 +243,12 @@ const Questions = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -377,15 +373,12 @@ const Questions = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>
diff --git a/src/Admin/Pages/Pages/SubPages/Rating.js b/src/Admin/Pages/Pages/SubPages/Rating.js
index 6d1725d9314b4360d36316b23a0c5950059afc65..a8e9c4e88ef236b2d43d90f4c512004e083fa8c4 100644
--- a/src/Admin/Pages/Pages/SubPages/Rating.js
+++ b/src/Admin/Pages/Pages/SubPages/Rating.js
@@ -72,7 +72,6 @@ const Ratings = () => {
const [isLoaded, setIsLoaded] = useState(false); //Necessary to consult the API, wait until complete
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false)
- const [isUpdating, setIsUpdating] = useState(false)
const [currPage, setCurrPage] = useState(0)
const [openAlertDialog, setOpenAlertDialog] = useState(false); //controlls the state od alert dialog
const [deleteItem, setDeleteItem] = useState({}); //Delete Item
@@ -233,15 +232,12 @@ const Ratings = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -357,15 +353,12 @@ const Ratings = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>
diff --git a/src/Admin/Pages/Pages/SubPages/Users.js b/src/Admin/Pages/Pages/SubPages/Users.js
index 75a2b016921f030806c061eee20372956573911a..66644dc2da6ba9dc78ef2d49b8ecdf91df55d364 100644
--- a/src/Admin/Pages/Pages/SubPages/Users.js
+++ b/src/Admin/Pages/Pages/SubPages/Users.js
@@ -71,7 +71,6 @@ const Users = () => {
const [isLoaded, setIsLoaded] = useState(false); //Necessary to consult the API, wait until complete
const [items, setItems] = useState([]); //Necessary to consult the API, data
const [isLoadingMoreItems, setIsLoadingMoreItems] = useState(false)
- const [isUpdating, setIsUpdating] = useState(false)
const [showFilter, setShowFilter] = useState(false)
const [currPage, setCurrPage] = useState(0)
@@ -171,13 +170,13 @@ const Users = () => {
const buildUrl = (email, name) => {
if (email && name)
- return Url("/users", `"email" : "${email}", "name" : "${name}"`, currPage, "DESC")
+ return Url("users", `"email" : "${email}", "name" : "${name}"`, currPage, "DESC")
if (email)
- return Url("/users", `"email" : "${email}"`, currPage, "DESC")
+ return Url("users", `"email" : "${email}"`, currPage, "DESC")
if (name)
- return Url("/users", `"name" : "${name}"`, currPage, "DESC")
+ return Url("users", `"name" : "${name}"`, currPage, "DESC")
else
- return Url("/users", "", currPage, "DESC")
+ return Url("users", "", currPage, "DESC")
}
useEffect(() => {
@@ -261,15 +260,12 @@ const Users = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>
@@ -454,15 +450,12 @@ const Users = () => {
<Button
variant="contained"
color="secondary"
- disabled={isUpdating}
onClick={() => {
setCurrPage(0)
}}
startIcon={<UpdateRoundedIcon />}
>
- {
- isUpdating ? <CircularProgress size={24} /> : 'Atualizar'
- }
+ Atualizar
</Button>
</Grid>
<Grid item>