From 71135725059faa593353d3ecb6a38b002b3ec5cf Mon Sep 17 00:00:00 2001
From: Lucas Schoenfelder <les17@inf.ufpr.br>
Date: Fri, 5 Feb 2021 10:06:06 -0300
Subject: [PATCH] changed request function names to reflect the api change from
axios to fetch
---
src/Components/AreasSubPages.js | 6 +++---
src/Components/ColCardPublicOptions.js | 4 ++--
src/Components/CollectionCardFunction.js | 6 +++---
src/Components/CollectionCommentSection.js | 4 ++--
src/Components/Comment.js | 6 +++---
src/Components/ContactButtons/FollowButton.js | 6 +++---
src/Components/ContactButtons/FollowingButton.js | 4 ++--
src/Components/ContactCardOptions.js | 4 ++--
src/Components/ContactForm.js | 4 ++--
src/Components/CriarColecaoForm.js | 4 ++--
src/Components/EditarColecaoForm.js | 6 +++---
src/Components/Firulas.js | 4 ++--
src/Components/FollowCollectionButton.js | 8 ++++----
src/Components/GuardarModal.js | 6 +++---
src/Components/HelperFunctions/getAxiosConfig.js | 8 ++++----
src/Components/IframeOverlay/DrawerContent.js | 4 ++--
src/Components/MenuList.js | 4 ++--
src/Components/MobileDrawerMenu.js | 4 ++--
.../ModalAlterarAvatar/ComponentAlterarAvatar.js | 4 ++--
.../ModalAlterarCover/ComponentAlterarCover.js | 4 ++--
src/Components/ModalConfirmarCuradoria.js | 4 ++--
src/Components/ModalExcluirColecao.js | 4 ++--
src/Components/Notifications.js | 4 ++--
src/Components/NotificationsInner.js | 4 ++--
src/Components/PublicationPermissionsContent.js | 4 ++--
src/Components/ReportModal.js | 4 ++--
src/Components/ResourceCardFunction.js | 4 ++--
.../ResourcePageComponents/CommentForm.js | 4 ++--
.../ResourcePageComponents/CommentsArea.js | 4 ++--
.../ResourcePageComponents/TextoObjeto.js | 4 ++--
.../TabPanels/PublicUserPageTabs/TabRecursos.js | 4 ++--
.../TabPanels/UserPageTabs/ModalExcluirConta.js | 4 ++--
.../TabPanels/UserPageTabs/PanelAtividades.js | 4 ++--
.../TabPanels/UserPageTabs/PanelCuradoria.js | 4 ++--
.../UploadPageComponents/FileUploadStage.js | 4 ++--
.../UploadPageComponents/ModalCancelar.js | 4 ++--
src/Components/UploadPageComponents/PartOne.js | 6 +++---
src/Components/UploadPageComponents/PartThree.js | 4 ++--
src/Components/UploadPageComponents/PartTwo.js | 8 ++++----
src/Components/UploadPageComponents/SendInfo.js | 7 +++++--
.../UploadPageComponents/UploadFileWrapper.js | 6 +++---
src/Pages/EditLearningObjectPage.js | 14 +++++++-------
src/Pages/EditProfilePage.js | 8 ++++----
src/Pages/PageProfessor.js | 4 ++--
src/Pages/PasswordRecoveryPage.js | 4 ++--
src/Pages/ResourcePage.js | 6 +++---
src/Pages/UploadPage.js | 8 ++++----
src/Pages/UserPage.js | 4 ++--
48 files changed, 123 insertions(+), 120 deletions(-)
diff --git a/src/Components/AreasSubPages.js b/src/Components/AreasSubPages.js
index 2988d77c..c4444afe 100644
--- a/src/Components/AreasSubPages.js
+++ b/src/Components/AreasSubPages.js
@@ -28,7 +28,7 @@ import colecoes from "../img/ilustra_colecoes.png";
import Grid from "@material-ui/core/Grid";
import ResourceCardFunction from "./ResourceCardFunction.js";
import CollectionCardFunction from "./CollectionCardFunction.js";
-import {axiosGetRequest} from './HelperFunctions/getAxiosConfig.js'
+import {getRequest} from './HelperFunctions/getAxiosConfig.js'
const areaStyle = {
paddingTop: "5px",
@@ -51,7 +51,7 @@ class ReqResources extends Component {
componentDidMount() {
const url = `/learning_objects?limit=12&sort=["published_at", "desc"]`
- axiosGetRequest(url, (data) => {this.setState({ resources: data })}, (error) => {console.log(error)})
+ getRequest(url, (data) => {this.setState({ resources: data })}, (error) => {console.log(error)})
}
render() {
var row1 = this.state.resources.slice(0, 4);
@@ -138,7 +138,7 @@ class ReqCollections extends Component {
componentDidMount() {
const url = `/collections?limit=12&sort=["updated_at", "desc"]`
- axiosGetRequest(url, (data) => {this.setState({ collections: data })}, (error) => {console.log(error)})
+ getRequest(url, (data) => {this.setState({ collections: data })}, (error) => {console.log(error)})
}
render() {
var row1 = this.state.collections.slice(0, 4);
diff --git a/src/Components/ColCardPublicOptions.js b/src/Components/ColCardPublicOptions.js
index 1e386410..aad23a6a 100644
--- a/src/Components/ColCardPublicOptions.js
+++ b/src/Components/ColCardPublicOptions.js
@@ -27,7 +27,7 @@ import MoreVertIcon from '@material-ui/icons/MoreVert';
import styled from 'styled-components'
import ErrorIcon from '@material-ui/icons/Error';
import ReportModal from './ReportModal.js'
-import {axiosDeleteRequest} from '../Components/HelperFunctions/getAxiosConfig'
+import {deleteRequest} from '../Components/HelperFunctions/getAxiosConfig'
export default function ColCardPublicOptions (props) {
const [anchorEl, setAnchorEl] = React.useState(null);
@@ -45,7 +45,7 @@ export default function ColCardPublicOptions (props) {
const handleUnfollow = () => {
- axiosDeleteRequest(`/collections/${props.id}/follow`, (data) => {console.log(data)}, (error) => {console.log(error)})
+ deleteRequest(`/collections/${props.id}/follow`, (data) => {console.log(data)}, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/CollectionCardFunction.js b/src/Components/CollectionCardFunction.js
index 7c80e7b4..c0c21870 100644
--- a/src/Components/CollectionCardFunction.js
+++ b/src/Components/CollectionCardFunction.js
@@ -35,7 +35,7 @@ import LockIcon from '@material-ui/icons/Lock';
import ColCardOwnerOptions from './ColCardOwnerOptions.js'
import ColCardPublicOptions from './ColCardPublicOptions'
import {Link} from 'react-router-dom';
-import {axiosPutRequest} from '../Components/HelperFunctions/getAxiosConfig'
+import {putRequest} from '../Components/HelperFunctions/getAxiosConfig'
export default function CollectionCardFunction (props) {
const {state} = useContext(Store)
@@ -53,7 +53,7 @@ export default function CollectionCardFunction (props) {
setLikesCount(data.count)
}
const handleLike = () => {
- axiosPutRequest(`/collections/${props.id}/like`, {}, handleSuccessLike, (error) => {console.log(error)})
+ putRequest(`/collections/${props.id}/like`, {}, handleSuccessLike, (error) => {console.log(error)})
}
const [followingHover, handleFollowingHover] = useState(false)
@@ -66,7 +66,7 @@ export default function CollectionCardFunction (props) {
handleToggleUserFollowingCol()
}
const handleFollow = () => {
- axiosPutRequest(`/collections/${props.id}/follow`, {}, handleSuccessFollow, (error) => {console.log(error)})
+ putRequest(`/collections/${props.id}/follow`, {}, handleSuccessFollow, (error) => {console.log(error)})
}
const RenderFollowButton = () => {
diff --git a/src/Components/CollectionCommentSection.js b/src/Components/CollectionCommentSection.js
index 9aba6d1e..f7a3ad52 100644
--- a/src/Components/CollectionCommentSection.js
+++ b/src/Components/CollectionCommentSection.js
@@ -27,7 +27,7 @@ import Comment from './Comment.js';
import Snackbar from '@material-ui/core/Snackbar';
import MuiAlert from '@material-ui/lab/Alert';
import Comentario from '../img/comentarios.png';
-import {axiosGetRequest} from '../Components/HelperFunctions/getAxiosConfig'
+import {getRequest} from '../Components/HelperFunctions/getAxiosConfig'
export default function CollectionCommentSection(props) {
const [post_snack_open, setPostSnackOpen] = useState(false);
@@ -113,7 +113,7 @@ export default function CollectionCommentSection(props) {
}
useEffect(() => {
- axiosGetRequest(`/collections/${props.id}/reviews`, (data) => {setReviews(data)}, (error) => {console.log(error)})
+ getRequest(`/collections/${props.id}/reviews`, (data) => {setReviews(data)}, (error) => {console.log(error)})
}, [render_state]);
return (
diff --git a/src/Components/Comment.js b/src/Components/Comment.js
index 1d9c0058..09b66d5a 100644
--- a/src/Components/Comment.js
+++ b/src/Components/Comment.js
@@ -31,7 +31,7 @@ import TextField from "@material-ui/core/TextField";
import Menu from '@material-ui/core/Menu';
import MenuItem from '@material-ui/core/MenuItem';
import ModalExcluir from './ModalExcluirComentario.js'
-import {axiosPutRequest, axiosDeleteRequest} from './HelperFunctions/getAxiosConfig'
+import {putRequest, deleteRequest} from './HelperFunctions/getAxiosConfig'
export default function Comment (props) {
@@ -93,7 +93,7 @@ export default function Comment (props) {
"review_ratings_attributes" : props.reviewRatings
}
}
- axiosPutRequest(`/learning_objects/${props.objectID}/reviews/`, payload, handleOnSuccessfulComment, (error) => {console.log(error)})
+ putRequest(`/learning_objects/${props.objectID}/reviews/`, payload, handleOnSuccessfulComment, (error) => {console.log(error)})
}
}
@@ -105,7 +105,7 @@ export default function Comment (props) {
const deleteComment = () => {
- axiosDeleteRequest(`/learning_objects/${props.objectID}/reviews/${props.reviewID}`, handleSuccessDeleteComment, (error) => {console.log(error)})
+ deleteRequest(`/learning_objects/${props.objectID}/reviews/${props.reviewID}`, handleSuccessDeleteComment, (error) => {console.log(error)})
toggleModal(false)
diff --git a/src/Components/ContactButtons/FollowButton.js b/src/Components/ContactButtons/FollowButton.js
index e2ddc04a..5594fa66 100644
--- a/src/Components/ContactButtons/FollowButton.js
+++ b/src/Components/ContactButtons/FollowButton.js
@@ -20,7 +20,7 @@ import React from 'react'
import PersonAddIcon from '@material-ui/icons/PersonAdd';
import styled from 'styled-components'
import Button from '@material-ui/core/Button';
-import {axiosPutRequest} from '../HelperFunctions/getAxiosConfig'
+import {putRequest} from '../HelperFunctions/getAxiosConfig'
export default function FollowButton (props) {
@@ -31,7 +31,7 @@ export default function FollowButton (props) {
const handleFollow = (followerID) => {
if (followerID !== undefined) {
const url = `/users/${followerID}/follow/`
- axiosPutRequest(url, {}, handleSuccess, (error) => {console.log(error)})
+ putRequest(url, {}, handleSuccess, (error) => {console.log(error)})
}
}
@@ -51,7 +51,7 @@ export function NoIcon (props) {
const handleFollow = (followerID) => {
if (followerID !== undefined) {
const url = `/users/${followerID}/follow/`
- axiosPutRequest(url, {}, (data) => {console.log(data)}, (error) => {console.log(error)})
+ putRequest(url, {}, (data) => {console.log(data)}, (error) => {console.log(error)})
}
}
diff --git a/src/Components/ContactButtons/FollowingButton.js b/src/Components/ContactButtons/FollowingButton.js
index cbe0b692..b2d22f24 100644
--- a/src/Components/ContactButtons/FollowingButton.js
+++ b/src/Components/ContactButtons/FollowingButton.js
@@ -21,7 +21,7 @@ import styled from 'styled-components'
import Button from '@material-ui/core/Button';
import FollowingIcon from '../../img/how_to_reg-24px.png'
import ModalConfirmarUnfollow from '../ModalConfirmarUnfollow.js'
-import {axiosPutRequest} from '../HelperFunctions/getAxiosConfig'
+import {putRequest} from '../HelperFunctions/getAxiosConfig'
export default function FollowingButton (props) {
@@ -44,7 +44,7 @@ export default function FollowingButton (props) {
const handleUnfollowPartTwo = () => {
const url = `/users/${unfollowID}/follow/`
- axiosPutRequest(url, {}, handleSuccess, (error) => {console.log(error)})
+ putRequest(url, {}, handleSuccess, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/ContactCardOptions.js b/src/Components/ContactCardOptions.js
index 3a5ed17d..24d16ab1 100644
--- a/src/Components/ContactCardOptions.js
+++ b/src/Components/ContactCardOptions.js
@@ -26,7 +26,7 @@ import MoreVertIcon from '@material-ui/icons/MoreVert';
import OpenIcon from '@material-ui/icons/OpenInNew';
import ReportIcon from '@material-ui/icons/Error';
import PersonAddIcon from '@material-ui/icons/PersonAdd';
-import {axiosPutRequest} from './HelperFunctions/getAxiosConfig'
+import {putRequest} from './HelperFunctions/getAxiosConfig'
import ReportModal from './ReportModal.js'
import {Link} from 'react-router-dom'
@@ -43,7 +43,7 @@ export default function SimpleMenu(props) {
}
const handleFollow = (followerID) => {
- axiosPutRequest(`/users/${followerID}/follow`, {}, (data) => {console.log(data)}, (error) => {console.log(error)})
+ putRequest(`/users/${followerID}/follow`, {}, (data) => {console.log(data)}, (error) => {console.log(error)})
}
const [reportModal, toggleReportModal] = useState(false)
diff --git a/src/Components/ContactForm.js b/src/Components/ContactForm.js
index 914dd3ab..971001eb 100644
--- a/src/Components/ContactForm.js
+++ b/src/Components/ContactForm.js
@@ -19,7 +19,7 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import React, { useState } from 'react';
import styled from 'styled-components';
import FormInput from "../Components/FormInput.js"
-import {axiosPostRequest} from './HelperFunctions/getAxiosConfig'
+import {postRequest} from './HelperFunctions/getAxiosConfig'
const Button = styled.button`
@@ -190,7 +190,7 @@ const Button = styled.button`
message: mensagem.dict.value
}
}
- axiosPostRequest(`/contacts`, payload, (data) => {limpaTudo()}, (error) => {console.log(error)})
+ postRequest(`/contacts`, payload, (data) => {limpaTudo()}, (error) => {console.log(error)})
}
}
diff --git a/src/Components/CriarColecaoForm.js b/src/Components/CriarColecaoForm.js
index 4fd1fefe..ea8c0507 100644
--- a/src/Components/CriarColecaoForm.js
+++ b/src/Components/CriarColecaoForm.js
@@ -25,7 +25,7 @@ import RadioGroup from '@material-ui/core/RadioGroup';
import FormControlLabel from '@material-ui/core/FormControlLabel';
import FormControl from '@material-ui/core/FormControl';
import TextField from '@material-ui/core/TextField';
-import {axiosPostRequest} from './HelperFunctions/getAxiosConfig'
+import {postRequest} from './HelperFunctions/getAxiosConfig'
export default function CriarColecaoForm (props) {
const {state} = useContext(Store)
@@ -77,7 +77,7 @@ export default function CriarColecaoForm (props) {
"privacy" : finalRadioValue
}
}
- axiosPostRequest( `/collections/`, payload, handleSuccess, (error) =>{console.log(error)})
+ postRequest( `/collections/`, payload, handleSuccess, (error) =>{console.log(error)})
}
}
diff --git a/src/Components/EditarColecaoForm.js b/src/Components/EditarColecaoForm.js
index 2b21b04c..4e127b9a 100644
--- a/src/Components/EditarColecaoForm.js
+++ b/src/Components/EditarColecaoForm.js
@@ -25,7 +25,7 @@ import RadioGroup from '@material-ui/core/RadioGroup';
import FormControlLabel from '@material-ui/core/FormControlLabel';
import FormControl from '@material-ui/core/FormControl';
import TextField from '@material-ui/core/TextField';
-import {axiosGetRequest, axiosPutRequest} from './HelperFunctions/getAxiosConfig'
+import {getRequest, putRequest} from './HelperFunctions/getAxiosConfig'
export default function EditarColecaoForm (props) {
const {state} = useContext(Store)
@@ -37,7 +37,7 @@ export default function EditarColecaoForm (props) {
}
useEffect(() => {
- axiosGetRequest(`/collections/${props.id}`, handleSuccessfulGet, (error) => {console.log(error)})
+ getRequest(`/collections/${props.id}`, handleSuccessfulGet, (error) => {console.log(error)})
}, [])
const [value, setValue] = useState(-1);
@@ -88,7 +88,7 @@ export default function EditarColecaoForm (props) {
}
}
- axiosPutRequest(`/collections/${props.id}/`, payload, handleSuccessfulSubmit, (error) =>{console.log(error)})
+ putRequest(`/collections/${props.id}/`, payload, handleSuccessfulSubmit, (error) =>{console.log(error)})
}
}
diff --git a/src/Components/Firulas.js b/src/Components/Firulas.js
index 20d6c101..6a368a11 100644
--- a/src/Components/Firulas.js
+++ b/src/Components/Firulas.js
@@ -4,7 +4,7 @@ import Rating from '@material-ui/lab/Rating';
import StarBorderIcon from '@material-ui/icons/StarBorder';
import {LikeCounter, ButtonNoWidth} from '../Components/ResourceCardFunction.js'
import FavoriteIcon from '@material-ui/icons/Favorite';
-import {axiosPutRequest} from './HelperFunctions/getAxiosConfig'
+import {putRequest} from './HelperFunctions/getAxiosConfig'
export default function Firulas (props) {
const [liked, setLiked] = useState(props.liked)
@@ -13,7 +13,7 @@ export default function Firulas (props) {
setLiked(!liked)
}
const handleLike = () => {
- axiosPutRequest(`/learning_objects/${props.recursoId}/like/`, {}, handleSuccess, (error) => {console.log(error)})
+ putRequest(`/learning_objects/${props.recursoId}/like/`, {}, handleSuccess, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/FollowCollectionButton.js b/src/Components/FollowCollectionButton.js
index 5cea848a..be01ad44 100644
--- a/src/Components/FollowCollectionButton.js
+++ b/src/Components/FollowCollectionButton.js
@@ -22,7 +22,7 @@ import CheckIcon from '@material-ui/icons/Check';
import AddIcon from '@material-ui/icons/Add';
import styled from 'styled-components';
import SignUpModal from './SignUpModal.js';
-import {axiosGetRequest, axiosPutRequest} from './HelperFunctions/getAxiosConfig'
+import {getRequest, putRequest} from './HelperFunctions/getAxiosConfig'
export default function FollowCollectionButton(props) {
const [icon, setIcon] = useState(<AddIcon fontSize="large" />);
@@ -45,7 +45,7 @@ export default function FollowCollectionButton(props) {
}
useEffect(() => {
const url = `/users/${props.user_id}/following/Collection`
- axiosGetRequest(url, handleSuccessGet, (error) => console.log(error))
+ getRequest(url, handleSuccessGet, (error) => console.log(error))
}, []);
//handleMouse{Enter, Leave} only do anything when user follows given collection:
@@ -83,9 +83,9 @@ export default function FollowCollectionButton(props) {
if (!props.user_id)
setSignUpOpen(true);
else if (!following) {
- axiosPutRequest(url, {}, handleSuccessfulFollow, (error) => {console.log(error)})
+ putRequest(url, {}, handleSuccessfulFollow, (error) => {console.log(error)})
} else {
- axiosPutRequest(url, {}, handleSuccessfulUnfollow, (error) => {console.log(error)})
+ putRequest(url, {}, handleSuccessfulUnfollow, (error) => {console.log(error)})
}
};
diff --git a/src/Components/GuardarModal.js b/src/Components/GuardarModal.js
index 728ba0b8..3a231ac2 100644
--- a/src/Components/GuardarModal.js
+++ b/src/Components/GuardarModal.js
@@ -30,7 +30,7 @@ import LockIcon from '@material-ui/icons/Lock';
import LoadingSpinner from './LoadingSpinner.js'
import CriarColecaoForm from './CriarColecaoForm.js'
import SnackbarComponent from './SnackbarComponent'
-import {axiosGetRequest, axiosPostRequest} from './HelperFunctions/getAxiosConfig'
+import {getRequest, postRequest} from './HelperFunctions/getAxiosConfig'
function CloseModalButton (props) {
return (
@@ -57,7 +57,7 @@ export default function ReportModal (props) {
const url = `/users/${id}/collections/`
- axiosGetRequest(url, handleSuccessGetCols, (error) => {console.log('error')})
+ getRequest(url, handleSuccessGetCols, (error) => {console.log('error')})
}
}
@@ -74,7 +74,7 @@ export default function ReportModal (props) {
"items" : [ {"id":props.recursoId, "type":"LearningObject"} ]
}
}
- axiosPostRequest( url, payload, handleSuccessPostToCol, (error) => {console.log(error)})
+ postRequest( url, payload, handleSuccessPostToCol, (error) => {console.log(error)})
}
diff --git a/src/Components/HelperFunctions/getAxiosConfig.js b/src/Components/HelperFunctions/getAxiosConfig.js
index c59bb1a7..e88e370d 100644
--- a/src/Components/HelperFunctions/getAxiosConfig.js
+++ b/src/Components/HelperFunctions/getAxiosConfig.js
@@ -80,7 +80,7 @@ function updateAccessToken (newAccessToken) {
}
}
-export const axiosGetRequest = (url, onSuccess, onError) => {
+export const getRequest = (url, onSuccess, onError) => {
fetch((`${apiUrl}${url}`), {
headers : fetchHeaders()
})
@@ -99,7 +99,7 @@ export const axiosGetRequest = (url, onSuccess, onError) => {
})
}
-export const axiosDeleteRequest = (url, onSuccess, onError) => {
+export const deleteRequest = (url, onSuccess, onError) => {
fetch((`${apiUrl}${url}`), {
method : 'DELETE',
headers : fetchHeaders()
@@ -119,7 +119,7 @@ export const axiosDeleteRequest = (url, onSuccess, onError) => {
})
}
-export const axiosPutRequest = (url, payload, onSuccess, onError) => {
+export const putRequest = (url, payload, onSuccess, onError) => {
fetch((`${apiUrl}${url}`), {
method : 'PUT',
headers : fetchHeaders(),
@@ -140,7 +140,7 @@ export const axiosPutRequest = (url, payload, onSuccess, onError) => {
})
}
-export const axiosPostRequest = (url, payload, onSuccess, onError) => {
+export const postRequest = (url, payload, onSuccess, onError) => {
fetch((`${apiUrl}${url}`), {
method : 'POST',
headers : fetchHeaders(),
diff --git a/src/Components/IframeOverlay/DrawerContent.js b/src/Components/IframeOverlay/DrawerContent.js
index 1a89a937..124a8f4e 100644
--- a/src/Components/IframeOverlay/DrawerContent.js
+++ b/src/Components/IframeOverlay/DrawerContent.js
@@ -4,7 +4,7 @@ import Grid from '@material-ui/core/Grid';
import SearchInput from './SearchInput.js';
import ResourceCard from './ResourceCard.js';
import SmallFooter from './SmallFooter.js';
-import {axiosGetRequest} from '../HelperFunctions/getAxiosConfig'
+import {getRequest} from '../HelperFunctions/getAxiosConfig'
export default function DrawerContent(props) {
const [resources, setResources] = useState([]);
@@ -16,7 +16,7 @@ export default function DrawerContent(props) {
const url = `/search?
page=0&results_per_page=5&query=${query}&search_class=LearningObject`
- axiosGetRequest(url, handleSuccess, (error) => {console.log(error)})
+ getRequest(url, handleSuccess, (error) => {console.log(error)})
}
useEffect(() => {
diff --git a/src/Components/MenuList.js b/src/Components/MenuList.js
index 0d2b2117..0b2963f7 100644
--- a/src/Components/MenuList.js
+++ b/src/Components/MenuList.js
@@ -27,7 +27,7 @@ import { Store } from '../Store';
import Profile from '../img/default_profile0.png'
import styled from 'styled-components'
import {apiDomain} from '../env.js'
-import {axiosDeleteRequest} from './HelperFunctions/getAxiosConfig'
+import {deleteRequest} from './HelperFunctions/getAxiosConfig'
const OverrideButton = styled(Button)`
@@ -54,7 +54,7 @@ export default function MenuList(props) {
}
const handleLogout = () => {
const url = `/auth/sign_out`
- axiosDeleteRequest(url, handleSuccessSignOut, (error) => {console.log(error)})
+ deleteRequest(url, handleSuccessSignOut, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/MobileDrawerMenu.js b/src/Components/MobileDrawerMenu.js
index 6409770f..4e0d6b22 100644
--- a/src/Components/MobileDrawerMenu.js
+++ b/src/Components/MobileDrawerMenu.js
@@ -37,7 +37,7 @@ import FavoriteBorderIcon from '@material-ui/icons/FavoriteBorder';
import FolderOpenIcon from '@material-ui/icons/FolderOpen';
import SettingsIcon from '@material-ui/icons/Settings';
import {apiDomain} from '../env.js'
-import {axiosDeleteRequest} from './HelperFunctions/getAxiosConfig'
+import {deleteRequest} from './HelperFunctions/getAxiosConfig'
export default function MobileDrawerMenu (props) {
const {state, dispatch} = useContext(Store)
@@ -83,7 +83,7 @@ export default function MobileDrawerMenu (props) {
}
const handleLogout = () => {
const url = `/auth/sign_out`
- axiosDeleteRequest(url, handleSuccessSignOut, (error) => {console.log(error)})
+ deleteRequest(url, handleSuccessSignOut, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/ModalAlterarAvatar/ComponentAlterarAvatar.js b/src/Components/ModalAlterarAvatar/ComponentAlterarAvatar.js
index ddb11196..8936af0a 100644
--- a/src/Components/ModalAlterarAvatar/ComponentAlterarAvatar.js
+++ b/src/Components/ModalAlterarAvatar/ComponentAlterarAvatar.js
@@ -24,7 +24,7 @@ import {apiDomain} from '../../env';
import CloseIcon from '@material-ui/icons/Close';
import Profile from '../../img/default_profile0.png'
import Cropper from '../Cropper.js'
-import {axiosPutRequest} from '../HelperFunctions/getAxiosConfig'
+import {putRequest} from '../HelperFunctions/getAxiosConfig'
function ChooseImage (props) {
return (
@@ -103,7 +103,7 @@ export default function ComponentAlterarAvatar (props) {
let fdAvatar = new FormData()
fdAvatar.set('user[avatar]', newAvatar)
- axiosPutRequest(url, fdAvatar, handleSuccess, (error) => {console.log(error)})
+ putRequest(url, fdAvatar, handleSuccess, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/ModalAlterarCover/ComponentAlterarCover.js b/src/Components/ModalAlterarCover/ComponentAlterarCover.js
index f9da4385..99a5f549 100644
--- a/src/Components/ModalAlterarCover/ComponentAlterarCover.js
+++ b/src/Components/ModalAlterarCover/ComponentAlterarCover.js
@@ -22,7 +22,7 @@ import styled from 'styled-components'
import {Store} from '../../Store.js'
import CloseIcon from '@material-ui/icons/Close';
import Cropper from '../Cropper.js'
-import {axiosPutRequest} from '../HelperFunctions/getAxiosConfig'
+import {putRequest} from '../HelperFunctions/getAxiosConfig'
export default function ComponentAlterarCover (props) {
const {state, dispatch} = useContext(Store)
@@ -53,7 +53,7 @@ export default function ComponentAlterarCover (props) {
let fdCover = new FormData()
fdCover.set('user[cover]', newCover)
- axiosPutRequest(url, fdCover, handleSuccess, (error) => {console.log(error)})
+ putRequest(url, fdCover, handleSuccess, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/ModalConfirmarCuradoria.js b/src/Components/ModalConfirmarCuradoria.js
index 77fa7a4b..4687b187 100644
--- a/src/Components/ModalConfirmarCuradoria.js
+++ b/src/Components/ModalConfirmarCuradoria.js
@@ -23,7 +23,7 @@ import Backdrop from '@material-ui/core/Backdrop';
import Fade from '@material-ui/core/Fade';
import styled from 'styled-components'
import CloseModalButton from './CloseModalButton'
-import {axiosPostRequest} from './HelperFunctions/getAxiosConfig'
+import {postRequest} from './HelperFunctions/getAxiosConfig'
export default function ModalConfirmarCuradoriaOpen (props) {
@@ -52,7 +52,7 @@ export default function ModalConfirmarCuradoriaOpen (props) {
"answers" : transformReportCriteria(props.reportCriteria)
}
}
- axiosPostRequest(url, payload, handleSuccess, (error) => {console.log(error)})
+ postRequest(url, payload, handleSuccess, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/ModalExcluirColecao.js b/src/Components/ModalExcluirColecao.js
index c405179d..879112ae 100644
--- a/src/Components/ModalExcluirColecao.js
+++ b/src/Components/ModalExcluirColecao.js
@@ -24,7 +24,7 @@ import styled from 'styled-components'
import GreyButton from './GreyButton.js'
import PurpleButton from './PurpleButton.js'
import SnackbarComponent from './SnackbarComponent'
-import {axiosDeleteRequest} from './HelperFunctions/getAxiosConfig'
+import {deleteRequest} from './HelperFunctions/getAxiosConfig'
export default function ModalExcluirColecao (props) {
const [snackbarOpen, toggleSnackbar] = useState(false)
@@ -36,7 +36,7 @@ export default function ModalExcluirColecao (props) {
const handleDelete = () => {
const url = `/collections/${props.id}`
- axiosDeleteRequest(url, handleDeleteSuccess, (error) => {console.log(error)})
+ deleteRequest(url, handleDeleteSuccess, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/Notifications.js b/src/Components/Notifications.js
index 5911a309..cf8a2f05 100644
--- a/src/Components/Notifications.js
+++ b/src/Components/Notifications.js
@@ -23,7 +23,7 @@ import styled from 'styled-components'
import Menu from '@material-ui/core/Menu';
import {apiDomain} from '../env.js'
import ActivityListItem from './ActivityListItem.js'
-import {axiosGetRequest} from './HelperFunctions/getAxiosConfig.js'
+import {getRequest} from './HelperFunctions/getAxiosConfig.js'
import { withStyles } from '@material-ui/core/styles';
import {Link} from 'react-router-dom'
@@ -89,7 +89,7 @@ export default function Notification (props) {
useEffect(() => {
- axiosGetRequest('/feed?offset=0&limit=30', handleAxiosSuccess, handleAxiosError)
+ getRequest('/feed?offset=0&limit=30', handleAxiosSuccess, handleAxiosError)
}, [])
diff --git a/src/Components/NotificationsInner.js b/src/Components/NotificationsInner.js
index 6d05f5f5..46302879 100644
--- a/src/Components/NotificationsInner.js
+++ b/src/Components/NotificationsInner.js
@@ -2,7 +2,7 @@ import React, {useState, useContext, useEffect} from 'react'
import styled from 'styled-components'
import {apiDomain} from '../env.js'
import ActivityListItem from './ActivityListItem.js'
-import {axiosGetRequest} from './HelperFunctions/getAxiosConfig'
+import {getRequest} from './HelperFunctions/getAxiosConfig'
export default function NotificationInner (props) {
const [notifications, setNotifications] = useState([]);
@@ -15,7 +15,7 @@ export default function NotificationInner (props) {
useEffect(() => {
const url = `/feed?offset=0&limit=30`
- axiosGetRequest(url, handleSuccess, (error) => {console.log('error while running getNotifications')})
+ getRequest(url, handleSuccess, (error) => {console.log('error while running getNotifications')})
}, [])
return (
diff --git a/src/Components/PublicationPermissionsContent.js b/src/Components/PublicationPermissionsContent.js
index 0237291d..ddccba30 100644
--- a/src/Components/PublicationPermissionsContent.js
+++ b/src/Components/PublicationPermissionsContent.js
@@ -8,7 +8,7 @@ import Radio from '@material-ui/core/Radio';
import FormControl from '@material-ui/core/FormControl';
import Grid from '@material-ui/core/Grid';
import { withStyles } from '@material-ui/core/styles';
-import {axiosGetRequest} from './HelperFunctions/getAxiosConfig'
+import {getRequest} from './HelperFunctions/getAxiosConfig'
const StyledFormControl = styled(FormControl)`
display: "block ruby";
@@ -37,7 +37,7 @@ export default function PublicationPermissionsContent (props) {
useEffect(() => {
const url = `/questions/`
- axiosGetRequest(url, handleSuccess, (error) => {console.log(error)})
+ getRequest(url, handleSuccess, (error) => {console.log(error)})
}, [])
diff --git a/src/Components/ReportModal.js b/src/Components/ReportModal.js
index 1f94364f..736d00b2 100644
--- a/src/Components/ReportModal.js
+++ b/src/Components/ReportModal.js
@@ -27,7 +27,7 @@ import CloseIcon from '@material-ui/icons/Close';
import ReportUserForm from './ReportUserForm.js'
import ReportRecursoForm from './ReportRecursoForm.js'
import ReportColecaoForm from './ReportColecaoForm.js'
-import {axiosPostRequest} from './HelperFunctions/getAxiosConfig'
+import {postRequest} from './HelperFunctions/getAxiosConfig'
function CloseModalButton (props) {
return (
@@ -52,7 +52,7 @@ export default function ReportModal (props) {
}
}
- axiosPostRequest(url, payload, (data) => {console.log(data)}, (error) => {console.log(error)})
+ postRequest(url, payload, (data) => {console.log(data)}, (error) => {console.log(error)})
}
diff --git a/src/Components/ResourceCardFunction.js b/src/Components/ResourceCardFunction.js
index 46c55724..44e4feb8 100644
--- a/src/Components/ResourceCardFunction.js
+++ b/src/Components/ResourceCardFunction.js
@@ -51,7 +51,7 @@ import {Link} from 'react-router-dom';
import {getDefaultThumbnail} from './HelperFunctions/getDefaultThumbnail'
import GetIconByName from './UploadPageComponents/GetIconByName'
import "./ResourceCard.css";
-import {axiosPutRequest} from './HelperFunctions/getAxiosConfig'
+import {putRequest} from './HelperFunctions/getAxiosConfig'
export default function ResourceCardFunction (props) {
const [thumbnail, setThumbnail] = useState(null)
@@ -86,7 +86,7 @@ export default function ResourceCardFunction (props) {
const handleLike = () => {
const url = `/learning_objects/${props.id}/like/`
- axiosPutRequest(url, {}, handleSuccessLike, (error) => {console.log(error)})
+ putRequest(url, {}, handleSuccessLike, (error) => {console.log(error)})
}
const SlideAnimationContent = () => {
diff --git a/src/Components/ResourcePageComponents/CommentForm.js b/src/Components/ResourcePageComponents/CommentForm.js
index 99729ed8..5e5f3921 100644
--- a/src/Components/ResourcePageComponents/CommentForm.js
+++ b/src/Components/ResourcePageComponents/CommentForm.js
@@ -6,7 +6,7 @@ import TextField from "@material-ui/core/TextField";
import { Button } from '@material-ui/core';
import EditIcon from '@material-ui/icons/Edit';
import Grid from '@material-ui/core/Grid';
-import {axiosPostRequest} from '../HelperFunctions/getAxiosConfig'
+import {postRequest} from '../HelperFunctions/getAxiosConfig'
export default function CommentForm (props) {
const [rating, setRating] = useState({
@@ -51,7 +51,7 @@ export default function CommentForm (props) {
}
}
- axiosPostRequest(url, payload, handleSuccess, (error) => {console.log(error)})
+ postRequest(url, payload, handleSuccess, (error) => {console.log(error)})
}
else {
setAttempt(true)
diff --git a/src/Components/ResourcePageComponents/CommentsArea.js b/src/Components/ResourcePageComponents/CommentsArea.js
index 60cb407b..10a9482f 100644
--- a/src/Components/ResourcePageComponents/CommentsArea.js
+++ b/src/Components/ResourcePageComponents/CommentsArea.js
@@ -26,7 +26,7 @@ import Comentarios from '../../img/comentarios.png'
import {apiDomain} from '../../env';
import CommentForm from './CommentForm.js'
import Comment from '../Comment.js'
-import {axiosGetRequest} from '../HelperFunctions/getAxiosConfig'
+import {getRequest} from '../HelperFunctions/getAxiosConfig'
export default function CommentsArea (props) {
const {state} = useContext(Store)
@@ -41,7 +41,7 @@ export default function CommentsArea (props) {
useEffect( () => {
const url = `/learning_objects/${props.recursoId}/reviews`
- axiosGetRequest(url, handleSuccess, (error) => {console.log(error)})
+ getRequest(url, handleSuccess, (error) => {console.log(error)})
}, [gambiarra])
return (
diff --git a/src/Components/ResourcePageComponents/TextoObjeto.js b/src/Components/ResourcePageComponents/TextoObjeto.js
index 87637f54..1554cc9e 100644
--- a/src/Components/ResourcePageComponents/TextoObjeto.js
+++ b/src/Components/ResourcePageComponents/TextoObjeto.js
@@ -29,7 +29,7 @@ import Button from '@material-ui/core/Button';
import {Link, Redirect} from 'react-router-dom'
import Alert from '../Alert.js';
import Snackbar from '@material-ui/core/Snackbar';
-import {axiosDeleteRequest} from '../HelperFunctions/getAxiosConfig'
+import {deleteRequest} from '../HelperFunctions/getAxiosConfig'
export default function TextoObjeto (props) {
const {state} = useContext(Store)
@@ -85,7 +85,7 @@ export default function TextoObjeto (props) {
}
const handleDelete = () => {
const url = `/learning_objects/${props.recursoId}`
- axiosDeleteRequest(url, handleSuccess, (error) => {console.log(error)})
+ deleteRequest(url, handleSuccess, (error) => {console.log(error)})
}
const checkAccessLevel = (levelToCheck) => {
diff --git a/src/Components/TabPanels/PublicUserPageTabs/TabRecursos.js b/src/Components/TabPanels/PublicUserPageTabs/TabRecursos.js
index 2a8d54b6..a4e2b068 100644
--- a/src/Components/TabPanels/PublicUserPageTabs/TabRecursos.js
+++ b/src/Components/TabPanels/PublicUserPageTabs/TabRecursos.js
@@ -21,7 +21,7 @@ import {HeaderGrid, ContainerStyled, Carregados} from '../StyledComponents.js'
import Grid from '@material-ui/core/Grid';
import ResourceCardFunction from '../../ResourceCardFunction.js'
import {ButtonMostrarMaisRecurso} from '../PanelComponents/ButtonsArea'
-import {axiosGetRequest} from '../../HelperFunctions/getAxiosConfig'
+import {getRequest} from '../../HelperFunctions/getAxiosConfig'
export default function TabRecursos (props) {
const [arr, setArr] = useState([])
@@ -43,7 +43,7 @@ export default function TabRecursos (props) {
if (newLength > 12) {
const url = `/users/${props.id}/learning_objects?limit=${newLength}$offset=4`
- axiosGetRequest(url,handleSuccess,(error) => {console.log(error)})
+ getRequest(url,handleSuccess,(error) => {console.log(error)})
}
else {
handleSlice(arr.slice(0, sliceLength + quantity))
diff --git a/src/Components/TabPanels/UserPageTabs/ModalExcluirConta.js b/src/Components/TabPanels/UserPageTabs/ModalExcluirConta.js
index 171b6b73..1d441049 100644
--- a/src/Components/TabPanels/UserPageTabs/ModalExcluirConta.js
+++ b/src/Components/TabPanels/UserPageTabs/ModalExcluirConta.js
@@ -29,7 +29,7 @@ import GreyButton from '../../GreyButton'
import FormInput from '../../FormInput'
import {Link} from 'react-router-dom'
import SnackbarComponent from '../../SnackbarComponent.js'
-import {axiosDeleteRequest} from '../../HelperFunctions/getAxiosConfig'
+import {deleteRequest} from '../../HelperFunctions/getAxiosConfig'
function CloseModalButton (props) {
return (
@@ -71,7 +71,7 @@ export default function ModalExcluirConta (props) {
}
const deleteAccount = () => {
const url = `/auth`
- axiosDeleteRequest(url, handleSuccess, (error) => {console.log(error)})
+ deleteRequest(url, handleSuccess, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/TabPanels/UserPageTabs/PanelAtividades.js b/src/Components/TabPanels/UserPageTabs/PanelAtividades.js
index 42809ba6..d43ce0da 100644
--- a/src/Components/TabPanels/UserPageTabs/PanelAtividades.js
+++ b/src/Components/TabPanels/UserPageTabs/PanelAtividades.js
@@ -25,7 +25,7 @@ import Bolo from '../../../img/Bolo.png'
import LoadingSpinner from '../../LoadingSpinner.js'
import ActivityListItem from '../../ActivityListItem.js'
import List from '@material-ui/core/List';
-import {axiosGetRequest} from '../../HelperFunctions/getAxiosConfig.js'
+import {getRequest} from '../../HelperFunctions/getAxiosConfig.js'
export default function TabPanelAtividades (props) {
const [loading, handleLoading] = useState(true)
@@ -49,7 +49,7 @@ export default function TabPanelAtividades (props) {
useEffect( () => {
const url = `/feed?offset=0&limit=30`
- axiosGetRequest(url, handleSuccess, (error) => {console.log(error)})
+ getRequest(url, handleSuccess, (error) => {console.log(error)})
}, [])
diff --git a/src/Components/TabPanels/UserPageTabs/PanelCuradoria.js b/src/Components/TabPanels/UserPageTabs/PanelCuradoria.js
index b14f5b94..796bee8a 100644
--- a/src/Components/TabPanels/UserPageTabs/PanelCuradoria.js
+++ b/src/Components/TabPanels/UserPageTabs/PanelCuradoria.js
@@ -19,7 +19,7 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import React, {useState, useEffect} from 'react'
import LoadingSpinner from '../../LoadingSpinner.js'
import TemplateCuradoria from '../PanelComponents/TemplateCuradoria.js'
-import {axiosGetRequest} from '../../HelperFunctions/getAxiosConfig'
+import {getRequest} from '../../HelperFunctions/getAxiosConfig'
export default function TabPanelCuradoria (props) {
const [loading, handleLoading] = useState(true)
@@ -42,7 +42,7 @@ export default function TabPanelCuradoria (props) {
useEffect( () => {
const url = `/users/${props.id}/submissions?offset=0&status=submitted`
- axiosGetRequest(url, handleSuccess, (error) => {console.log(error)})
+ getRequest(url, handleSuccess, (error) => {console.log(error)})
}, [])
return (
diff --git a/src/Components/UploadPageComponents/FileUploadStage.js b/src/Components/UploadPageComponents/FileUploadStage.js
index 9aa89aa2..880ff018 100644
--- a/src/Components/UploadPageComponents/FileUploadStage.js
+++ b/src/Components/UploadPageComponents/FileUploadStage.js
@@ -21,7 +21,7 @@ import styled from 'styled-components'
import {WrapperBox} from './StyledComponents.js'
import DoneIcon from '@material-ui/icons/Done';
import DeleteIcon from '@material-ui/icons/Delete';
-import {axiosDeleteRequest} from '../HelperFunctions/getAxiosConfig.js'
+import {deleteRequest} from '../HelperFunctions/getAxiosConfig.js'
export default function FileUploadStage (props) {
const [uploading, toggleUploading] = useState(true)
@@ -32,7 +32,7 @@ export default function FileUploadStage (props) {
const handleDelete = () => {
const url = `/learning_objects/${props.draftID}`
- axiosDeleteRequest(url, handleSuccess, (error) => {console.log(error)})
+ deleteRequest(url, handleSuccess, (error) => {console.log(error)})
}
return (
diff --git a/src/Components/UploadPageComponents/ModalCancelar.js b/src/Components/UploadPageComponents/ModalCancelar.js
index 1bf82317..9616436b 100644
--- a/src/Components/UploadPageComponents/ModalCancelar.js
+++ b/src/Components/UploadPageComponents/ModalCancelar.js
@@ -23,7 +23,7 @@ import Backdrop from '@material-ui/core/Backdrop';
import Fade from '@material-ui/core/Fade';
import styled from 'styled-components'
import {Link} from 'react-router-dom'
-import {axiosDeleteRequest} from '../HelperFunctions/getAxiosConfig.js'
+import {deleteRequest} from '../HelperFunctions/getAxiosConfig.js'
export default function ModalCancelar (props) {
@@ -37,7 +37,7 @@ export default function ModalCancelar (props) {
if (props.draftID) {
const url = `/learning_objects/${props.draftID}`
- axiosDeleteRequest(url, handleSuccess, (error) => {console.log(error)})
+ deleteRequest(url, handleSuccess, (error) => {console.log(error)})
}
}
diff --git a/src/Components/UploadPageComponents/PartOne.js b/src/Components/UploadPageComponents/PartOne.js
index 2e4a1724..fbb47cb5 100644
--- a/src/Components/UploadPageComponents/PartOne.js
+++ b/src/Components/UploadPageComponents/PartOne.js
@@ -26,7 +26,7 @@ import Autor from './Forms/Autor.js'
import TipoDeRecurso from './Forms/TipoDeRecurso.js'
import Idioma from './Forms/Idioma.js'
import {SendInfo} from './SendInfo.js'
-import {axiosGetRequest} from '../HelperFunctions/getAxiosConfig.js'
+import {getRequest} from '../HelperFunctions/getAxiosConfig.js'
export default function PartOne (props) {
// {/*const [subjects, setSubjects] = useState([])*/}
@@ -37,9 +37,9 @@ export default function PartOne (props) {
setObjTypes(data.sort((a, b) => (a.name) > (b.name) ? 1 : -1))
}
useEffect( () => {
- axiosGetRequest(`/object_types/`, handleSuccessGetObjTypes, (error) => {console.log(error)})
+ getRequest(`/object_types/`, handleSuccessGetObjTypes, (error) => {console.log(error)})
- axiosGetRequest(`/languages/`, (data) => {setLanguages(data)}, (error) => {console.log(error)})
+ getRequest(`/languages/`, (data) => {setLanguages(data)}, (error) => {console.log(error)})
}, [])
const handleSubmit = () => {
diff --git a/src/Components/UploadPageComponents/PartThree.js b/src/Components/UploadPageComponents/PartThree.js
index 340c19bb..3b4b6b81 100644
--- a/src/Components/UploadPageComponents/PartThree.js
+++ b/src/Components/UploadPageComponents/PartThree.js
@@ -34,7 +34,7 @@ import AssignmentIcon from '@material-ui/icons/Assignment';
import { GrayButton, OrangeButton} from './StyledComponents';
import ModalCancelar from './ModalCancelar.js'
import {getDefaultThumbnail} from '../HelperFunctions/getDefaultThumbnail'
-import {axiosGetRequest} from '../HelperFunctions/getAxiosConfig.js'
+import {getRequest} from '../HelperFunctions/getAxiosConfig.js'
export default function PartThree (props) {
var moment = require('moment')
@@ -61,7 +61,7 @@ export default function PartThree (props) {
if (state.currentUser.id !== "") {
const url = `/learning_objects/${props.draftID}`
- axiosGetRequest(url, handleSuccess, (error) => {console.log(error)})
+ getRequest(url, handleSuccess, (error) => {console.log(error)})
}
}, [state.currentUser.id])
diff --git a/src/Components/UploadPageComponents/PartTwo.js b/src/Components/UploadPageComponents/PartTwo.js
index 6d30d2b7..6ab05cee 100644
--- a/src/Components/UploadPageComponents/PartTwo.js
+++ b/src/Components/UploadPageComponents/PartTwo.js
@@ -32,7 +32,7 @@ import {SendInfo} from './SendInfo.js'
import EditThumbnail from './PartTwoComponents/EditThumbnail.js'
import DisplayThumbnail from './PartTwoComponents/DisplayThumbnail.js'
import CustomCircularProgress from './PartTwoComponents/CustomCircularProgress';
-import {axiosGetRequest, axiosPutRequest} from '../HelperFunctions/getAxiosConfig.js'
+import {getRequest, putRequest} from '../HelperFunctions/getAxiosConfig.js'
export function LoadingDiv () {
return (
@@ -53,9 +53,9 @@ export default function PartTwo (props) {
}
useEffect(() => {
- axiosGetRequest(`/educational_stages/`, (data) => {setEduStages(data)}, (error) => {console.log(error)})
+ getRequest(`/educational_stages/`, (data) => {setEduStages(data)}, (error) => {console.log(error)})
- axiosGetRequest(`/subjects/`, handleSuccess, (error) => {console.log(error)})
+ getRequest(`/subjects/`, handleSuccess, (error) => {console.log(error)})
}, [])
@@ -88,7 +88,7 @@ export default function PartTwo (props) {
let fdThumb = new FormData()
fdThumb.set('learning_object[thumbnail]', thumbnail)
- axiosPutRequest(url, fdThumb, (data) => {setThumbnailStage('done')}, (error) => {console.log(error)})
+ putRequest(url, fdThumb, (data) => {setThumbnailStage('done')}, (error) => {console.log(error)})
}
const [thumbnailStage, setThumbnailStage] = useState('default')
diff --git a/src/Components/UploadPageComponents/SendInfo.js b/src/Components/UploadPageComponents/SendInfo.js
index b9a8585a..8b5a4070 100644
--- a/src/Components/UploadPageComponents/SendInfo.js
+++ b/src/Components/UploadPageComponents/SendInfo.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 {axiosPutRequest} from '../HelperFunctions/getAxiosConfig.js'
+import {putRequest} from '../HelperFunctions/getAxiosConfig.js'
export function SendInfo (fieldName, payload, draftID) {
@@ -35,7 +35,10 @@ export function SendInfo (fieldName, payload, draftID) {
}
putObject.learning_object[key] = value
+ console.log("typeof putObject", typeof putObject)
+ console.log(putObject)
+
const url = `/learning_objects/${draftID}`
- axiosPutRequest(url, putObject, (data) => {console.log(data)}, (error) => {console.log(error)})
+ putRequest(url, putObject, (data) => {console.log(data)}, (error) => {console.log(error)})
}
diff --git a/src/Components/UploadPageComponents/UploadFileWrapper.js b/src/Components/UploadPageComponents/UploadFileWrapper.js
index 0675f589..123512f2 100644
--- a/src/Components/UploadPageComponents/UploadFileWrapper.js
+++ b/src/Components/UploadPageComponents/UploadFileWrapper.js
@@ -21,7 +21,7 @@ import LinkIcon from '../../img/link_icon.svg'
import ChooseLink from './ChooseLinkSection.js'
import {WrapperBox, BlueButton, GrayButton} from './StyledComponents.js';
import {DottedBox} from './StyledComponents.js';
-import {getAxiosConfigFromJSON, updateHeaders, axiosDeleteRequest, axiosPutRequest} from '../HelperFunctions/getAxiosConfig.js'
+import {getAxiosConfigFromJSON, updateHeaders, deleteRequest, putRequest} from '../HelperFunctions/getAxiosConfig.js'
import AddAPhotoIcon from '@material-ui/icons/AddAPhoto';
import axios from 'axios'
import {apiUrl} from '../../env';
@@ -114,7 +114,7 @@ export default function UploadFileWrapper (props) {
if (attachmentID != null) {
const url = `/learning_objects/${props.draftID}/attachment/${attachmentID}`
- axiosDeleteRequest(url, (data) => {handleNextStage("default")}, (error) => {console.log(error)})
+ deleteRequest(url, (data) => {handleNextStage("default")}, (error) => {console.log(error)})
}
}
@@ -151,7 +151,7 @@ export default function UploadFileWrapper (props) {
}
}
- axiosPutRequest(url, payload, (data) => {toggleSnackbar(true)}, (error) => {console.log(error)})
+ putRequest(url, payload, (data) => {toggleSnackbar(true)}, (error) => {console.log(error)})
}
switch (stage) {
diff --git a/src/Pages/EditLearningObjectPage.js b/src/Pages/EditLearningObjectPage.js
index 141f83ff..5e04a247 100644
--- a/src/Pages/EditLearningObjectPage.js
+++ b/src/Pages/EditLearningObjectPage.js
@@ -40,7 +40,7 @@ import {LoadingDiv} from '../Components/UploadPageComponents/PartTwo.js'
import EditThumbnail from '../Components/UploadPageComponents/PartTwoComponents/EditThumbnail.js'
import DisplayThumbnail from '../Components/UploadPageComponents/PartTwoComponents/DisplayThumbnail.js'
import DragAndDropThumbnail from '../Components/UploadPageComponents/PartTwoComponents/DragAndDropThumbnail'
-import {axiosGetRequest, axiosDeleteRequest, axiosPutRequest, axiosPostRequest} from '../Components/HelperFunctions/getAxiosConfig.js'
+import {getRequest, deleteRequest, putRequest, postRequest} from '../Components/HelperFunctions/getAxiosConfig.js'
export default function EditLearningObjectPage (props) {
const recursoId = props.match.params.recursoId
@@ -63,7 +63,7 @@ export default function EditLearningObjectPage (props) {
useEffect( () => {
const url = `/learning_objects/${recursoId}`
- axiosGetRequest(url, handleSuccessfulGet, (error) => {console.log(error)})
+ getRequest(url, handleSuccessfulGet, (error) => {console.log(error)})
axios.get(`${apiUrl}/object_types/`).then(
(response) => {
@@ -113,7 +113,7 @@ export default function EditLearningObjectPage (props) {
const handleDelete = () => {
const url = `/learning_objects/${learningObject.id}`
- axiosDeleteRequest(url, handleSuccessfulDelete, (error) => {console.log(error)})
+ deleteRequest(url, handleSuccessfulDelete, (error) => {console.log(error)})
}
const handleUpdateInfo = () => {
@@ -122,7 +122,7 @@ export default function EditLearningObjectPage (props) {
"learning_object" : updatedInfo
}
- axiosPutRequest(url, payload, (data) => {props.history.goBack()}, (error) => {console.log(error)})
+ putRequest(url, payload, (data) => {props.history.goBack()}, (error) => {console.log(error)})
}
const handlePost = () => {
@@ -132,7 +132,7 @@ export default function EditLearningObjectPage (props) {
"learning_object" : updatedInfo
}
- axiosPostRequest(url, payload,
+ postRequest(url, payload,
(data) => {props.history.push( `/recurso/${learningObject.id}`)},
(error) => {console.log(error)}
)
@@ -171,7 +171,7 @@ export default function EditLearningObjectPage (props) {
let fdThumb = new FormData()
fdThumb.set('learning_object[thumbnail]', thumbnail)
- axiosPutRequest(url, fdThumb, handleFinalizeThumb, (error) => {setThumbnailStage('default')})
+ putRequest(url, fdThumb, handleFinalizeThumb, (error) => {setThumbnailStage('default')})
}
const handleDeleteThumbnail = () => {
@@ -180,7 +180,7 @@ export default function EditLearningObjectPage (props) {
let fdThumb = new FormData()
fdThumb.set('learning_object[thumbnail]', null)
- axiosPutRequest(url, fdThumb, (data) => {setThumbnailStage('default')}, (error) => {console.log(error)})
+ putRequest(url, fdThumb, (data) => {setThumbnailStage('default')}, (error) => {console.log(error)})
}
const chooseRenderStageThumbnail = () => {
diff --git a/src/Pages/EditProfilePage.js b/src/Pages/EditProfilePage.js
index 6a33290b..381a2872 100644
--- a/src/Pages/EditProfilePage.js
+++ b/src/Pages/EditProfilePage.js
@@ -10,7 +10,7 @@ import Snackbar from '@material-ui/core/Snackbar';
import {Alert} from '../Components/LoginModal.js'
import Grid from '@material-ui/core/Grid'
import CustomizedBreadcrumbs from '../Components/TabPanels/Breadcrumbs.js'
-import {axiosPutRequest} from '../Components/HelperFunctions/getAxiosConfig'
+import {putRequest} from '../Components/HelperFunctions/getAxiosConfig'
import {Store} from '../Store.js'
export default function EditProfilePage (props) {
@@ -38,7 +38,7 @@ export default function EditProfilePage (props) {
const updateUserInfo = (newUserInfo) => {
const url = `/users/${id}`
- axiosPutRequest(url, newUserInfo,
+ putRequest(url, newUserInfo,
(data) => {props.history.push('/perfil')},
(error) => {console.log(error)}
)
@@ -62,14 +62,14 @@ export default function EditProfilePage (props) {
const updateUserEmail = (newUserInfo) => {
const url = `/users/${id}`
- axiosPutRequest(url, newUserInfo, handleSuccessUpdateEmail, (error) => {console.log(error)}
+ putRequest(url, newUserInfo, handleSuccessUpdateEmail, (error) => {console.log(error)}
)
}
const updateUserPassword = (newUserInfo) => {
const url = `/users/${id}`
- axiosPutRequest(url, newUserInfo,
+ putRequest(url, newUserInfo,
(data) => {handleSnackbar(true)},
(error) => {console.log(error)}
)
diff --git a/src/Pages/PageProfessor.js b/src/Pages/PageProfessor.js
index 496ffdd4..6ee8588e 100644
--- a/src/Pages/PageProfessor.js
+++ b/src/Pages/PageProfessor.js
@@ -6,7 +6,7 @@ import PartTwo from '../Components/PageProfessorComponents/PartTwo.js'
import PartThree from '../Components/PageProfessorComponents/PartThree.js'
import SuccessfulRequest from '../Components/PageProfessorComponents/SuccessfulRequest.js'
import ModalConfirmarProfessor from '../Components/PageProfessorComponents/ModalConfirmarProfessor.js'
-import {axiosPostRequest} from '../Components/HelperFunctions/getAxiosConfig'
+import {postRequest} from '../Components/HelperFunctions/getAxiosConfig'
export default function PageProfessor (props) {
const {state} = useContext(Store)
@@ -105,7 +105,7 @@ export default function PageProfessor (props) {
uf : registerInformation.school_uf.name
}
- axiosPostRequest(url, payload, handleSuccessfulSubmit, (error) =>{console.log(error)})
+ postRequest(url, payload, handleSuccessfulSubmit, (error) =>{console.log(error)})
}
return (
diff --git a/src/Pages/PasswordRecoveryPage.js b/src/Pages/PasswordRecoveryPage.js
index 78f289a0..010a164b 100644
--- a/src/Pages/PasswordRecoveryPage.js
+++ b/src/Pages/PasswordRecoveryPage.js
@@ -7,7 +7,7 @@ import Default from '../Components/PasswordRecoveryComponents/Default.js'
import Success from '../Components/PasswordRecoveryComponents/Success.js'
import CaseError from '../Components/PasswordRecoveryComponents/Error.js'
import CustomizedBreadcrumbs from '../Components/TabPanels/Breadcrumbs.js'
-import {axiosPostRequest} from '../Components/HelperFunctions/getAxiosConfig'
+import {postRequest} from '../Components/HelperFunctions/getAxiosConfig'
export default function PasswordRecoveryPage (props) {
@@ -51,7 +51,7 @@ export default function PasswordRecoveryPage (props) {
"redirect_url" : "https://plataformaintegrada.mec.gov.br/recuperar-senha#/alterar-senha"
}
- axiosPostRequest(url, payload, handleSuccessfulSubmit, (error) => {console.log(error)})
+ postRequest(url, payload, handleSuccessfulSubmit, (error) => {console.log(error)})
}
diff --git a/src/Pages/ResourcePage.js b/src/Pages/ResourcePage.js
index d3a736ce..194807e6 100644
--- a/src/Pages/ResourcePage.js
+++ b/src/Pages/ResourcePage.js
@@ -35,7 +35,7 @@ import AppBar from '@material-ui/core/AppBar';
import ButtonAvaliarRecurso from '../Components/ButtonAvaliarRecurso'
import ModalAvaliarRecurso from '../Components/ModalAvaliarRecurso'
import ModalConfirmarCuradoria from '../Components/ModalConfirmarCuradoria'
-import {axiosGetRequest} from '../Components/HelperFunctions/getAxiosConfig'
+import {getRequest} from '../Components/HelperFunctions/getAxiosConfig'
function urlVerify (url) {
return (url ? url.indexOf("youtu") !== -1 || url.indexOf("vimeo") !== -1 : false)
@@ -54,7 +54,7 @@ export default function LearningObjectPage (props){
useEffect( () => {
const url = `/learning_objects/${id}`
- axiosGetRequest(url, handleSuccessfulGet, (error) => {console.log(error)})
+ getRequest(url, handleSuccessfulGet, (error) => {console.log(error)})
}, [])
@@ -105,7 +105,7 @@ export default function LearningObjectPage (props){
const finalizeCuratorshipFlow = () => {
handleModalConfirmarCuradoria(false)
const url = `/learning_objects/${id}`
- axiosGetRequest(url, (data) => {setRecurso(data)}, (error) => {console.log(error)})
+ getRequest(url, (data) => {setRecurso(data)}, (error) => {console.log(error)})
}
return (
diff --git a/src/Pages/UploadPage.js b/src/Pages/UploadPage.js
index 0ddf5264..848b3b5b 100644
--- a/src/Pages/UploadPage.js
+++ b/src/Pages/UploadPage.js
@@ -22,7 +22,7 @@ import UploadFileWrapper from '../Components/UploadPageComponents/UploadFileWrap
import {Store} from '../Store.js'
import {InfoBox} from '../Components/UploadPageComponents/StyledComponents.js'
import Stepper from '../Components/UploadPageComponents/Stepper.js'
-import {axiosPostRequest} from '../Components/HelperFunctions/getAxiosConfig.js'
+import {postRequest} from '../Components/HelperFunctions/getAxiosConfig.js'
import PartOne from '../Components/UploadPageComponents/PartOne.js'
import PartTwo from '../Components/UploadPageComponents/PartTwo.js'
import PartThree from '../Components/UploadPageComponents/PartThree.js'
@@ -51,7 +51,7 @@ export default function UploadPage (props) {
let payload = {}
- axiosPostRequest(url, payload, handleSuccessfulGet, (error) => {console.log(error)})
+ postRequest(url, payload, handleSuccessfulGet, (error) => {console.log(error)})
}
}, [])
@@ -68,7 +68,7 @@ export default function UploadPage (props) {
let payload = {}
- axiosPostRequest(url, payload,
+ postRequest(url, payload,
(data) => {handleModal(true)},
(error) => {console.log(error)}
)
@@ -86,7 +86,7 @@ export default function UploadPage (props) {
}
}
- axiosPostRequest(url, payload,
+ postRequest(url, payload,
(data) => {handleModal(true)},
(error) => {console.log(error)}
)
diff --git a/src/Pages/UserPage.js b/src/Pages/UserPage.js
index a1f4b928..c4b07550 100644
--- a/src/Pages/UserPage.js
+++ b/src/Pages/UserPage.js
@@ -36,7 +36,7 @@ import ProfileAvatar from '../Components/UserPageComponents/Avatar.js'
import UserInfo from '../Components/UserPageComponents/UserInfo.js'
import EditProfileButton from '../Components/UserPageComponents/EditProfileButton.js'
import SubmitterStatus from '../Components/UserPageComponents/SubmitterStatus.js'
-import {axiosGetRequest} from '../Components/HelperFunctions/getAxiosConfig.js'
+import {getRequest} from '../Components/HelperFunctions/getAxiosConfig.js'
export default function UserPage (props){
const {state, dispatch} = useContext(Store)
@@ -70,7 +70,7 @@ export default function UserPage (props){
if (id !== '') {
const url = `/users/${id}`
- axiosGetRequest(url, handleSuccessfulGet, (error) => {console.log(error)})
+ getRequest(url, handleSuccessfulGet, (error) => {console.log(error)})
}
}, [])
--
GitLab