From a363da3343e21612245cdaea0552482b835acb36 Mon Sep 17 00:00:00 2001
From: Vinicius Gabriel Machado <vgm18@inf.ufpr.br>
Date: Fri, 3 Sep 2021 06:28:40 -0300
Subject: [PATCH] Changed recaptcha key to the production one, removed
console.logs and fixed contrast on request teacher account page
---
.../Components/DataCards/ActivityCard.js | 1 -
.../DataCards/EducationalObjectsCard.js | 1 -
.../Components/Inputs/CreateQuestion.js | 1 -
.../Components/Inputs/EditCollection.js | 1 -
.../Components/Inputs/EditEducationalObect.js | 1 -
src/Components/ContactCardOptions.js | 1 -
src/Components/ContactForm.js | 5 ----
src/Components/CriarColecaoForm.js | 1 -
.../HelperFunctions/getAxiosConfig.js | 1 -
src/Components/HomeScreenSearchBar.js | 1 -
src/Components/IframeOverlay/DrawerContent.js | 4 ---
src/Components/LoginContainerFunction.js | 3 ---
src/Components/ModalAbout.js | 2 +-
.../ComponentAlterarAvatar.js | 1 -
src/Components/Notifications.js | 1 -
.../ModalConfirmarProfessor.js | 23 ++++++++--------
.../PageProfessorComponents/PartOne.js | 3 ---
.../PageProfessorComponents/PartTwo.js | 3 ---
src/Components/ReportColecaoForm.js | 3 ---
src/Components/ReportModal.js | 1 -
src/Components/ReportRecursoForm.js | 3 ---
.../ResourcePageComponents/VideoPlayer.js | 1 -
.../SearchPageComponents/ResourceTemplate.js | 2 +-
src/Components/SignUpContainerFunction.js | 5 ----
.../PanelComponents/TemplateCuradoria.js | 1 -
.../UserPageTabs/PanelMeusRecursos.js | 2 --
.../PanelSolicitarContaProfessor.js | 27 ++++++++++++-------
src/Components/TopicCard.js | 3 +--
.../UploadPageComponents/ChooseLinkSection.js | 1 -
.../UploadPageComponents/Forms/Idioma.js | 2 --
.../UploadPageComponents/ModalCancelar.js | 1 -
.../UploadPageComponents/PartThree.js | 10 +++----
.../UploadPageComponents/PartTwo.js | 3 ---
.../UploadPageComponents/UploadFileWrapper.js | 8 +++---
src/Components/UserPageComponents/Cover.js | 1 -
src/Pages/ChangePasswordPage.js | 2 --
src/Pages/EditLearningObjectPage.js | 2 --
src/Pages/FormationMaterialPage.js | 2 --
src/Pages/PageProfessor.js | 3 +--
src/Pages/PasswordRecoveryPage.js | 1 -
src/Pages/PublicationPermissionsPage.js | 4 ---
src/Pages/SummarizedUserTerms.js | 1 -
42 files changed, 41 insertions(+), 102 deletions(-)
diff --git a/src/Admin/Components/Components/DataCards/ActivityCard.js b/src/Admin/Components/Components/DataCards/ActivityCard.js
index 915df2f9..58497e2e 100644
--- a/src/Admin/Components/Components/DataCards/ActivityCard.js
+++ b/src/Admin/Components/Components/DataCards/ActivityCard.js
@@ -68,7 +68,6 @@ const ActivityCard = () => {
} else if (!isLoaded) {
return <LoadingSpinner text="Carregando..." />
} else {
- console.log(item)
const DATA = [
{
subTitle: "ID",
diff --git a/src/Admin/Components/Components/DataCards/EducationalObjectsCard.js b/src/Admin/Components/Components/DataCards/EducationalObjectsCard.js
index 08a8f325..6f865726 100644
--- a/src/Admin/Components/Components/DataCards/EducationalObjectsCard.js
+++ b/src/Admin/Components/Components/DataCards/EducationalObjectsCard.js
@@ -116,7 +116,6 @@ const CommunityQuestions = () => {
} else if (!isLoaded) {
return <LoadingSpinner text="Carregando..." />;
} else {
- console.log(item);
const DATA = [
{
subTitle: "ID",
diff --git a/src/Admin/Components/Components/Inputs/CreateQuestion.js b/src/Admin/Components/Components/Inputs/CreateQuestion.js
index 58f0d5d4..37f15756 100644
--- a/src/Admin/Components/Components/Inputs/CreateQuestion.js
+++ b/src/Admin/Components/Components/Inputs/CreateQuestion.js
@@ -120,7 +120,6 @@ const CreateQuestion = (props) => {
const handleChange = (e) => {
const value = e.target.value;
setStatus(value);
- console.log(status)
};
// Fields
diff --git a/src/Admin/Components/Components/Inputs/EditCollection.js b/src/Admin/Components/Components/Inputs/EditCollection.js
index 4085a706..98b7a38f 100644
--- a/src/Admin/Components/Components/Inputs/EditCollection.js
+++ b/src/Admin/Components/Components/Inputs/EditCollection.js
@@ -105,7 +105,6 @@ const EditCollection = () => {
const handleChange = (e) => {
const value = e.target.value;
setPrivacy(value);
- console.log(privacy)
};
// Handle snack infos
diff --git a/src/Admin/Components/Components/Inputs/EditEducationalObect.js b/src/Admin/Components/Components/Inputs/EditEducationalObect.js
index 45a74427..0335f596 100644
--- a/src/Admin/Components/Components/Inputs/EditEducationalObect.js
+++ b/src/Admin/Components/Components/Inputs/EditEducationalObect.js
@@ -259,7 +259,6 @@ const EditEducationalObject = () => {
"language_ids": languagesID,
},
};
- console.log(text)
putRequest(
api,
body,
diff --git a/src/Components/ContactCardOptions.js b/src/Components/ContactCardOptions.js
index 966ea18d..f347928a 100644
--- a/src/Components/ContactCardOptions.js
+++ b/src/Components/ContactCardOptions.js
@@ -73,7 +73,6 @@ export default function SimpleMenu(props) {
const handleFollow = (followerID) => {
putRequest(`/users/${followerID}/follow`, {}, (data) => {
- console.log(data);
props.toggleFollowed()
}, (error) => { console.log(error) })
diff --git a/src/Components/ContactForm.js b/src/Components/ContactForm.js
index 9683375f..e44460d3 100644
--- a/src/Components/ContactForm.js
+++ b/src/Components/ContactForm.js
@@ -138,7 +138,6 @@ function Formulario(props) {
value: e.target.value
}
})
- console.log(nome)
}
const preencheEmail = (e) => {
@@ -150,12 +149,10 @@ function Formulario(props) {
value: e.target.value
}
})
- console.log(email)
}
const preencheMensagem = (e) => {
const msg = e.target.value
- console.log(msg)
let flag = validateMensagem(msg)
handleMensagem({
...mensagem, dict: {
@@ -163,7 +160,6 @@ function Formulario(props) {
value: msg
}
})
- console.log(mensagem)
}
const limpaTudo = () => {
@@ -210,7 +206,6 @@ function Formulario(props) {
const onSubmit = (e) => {
//on submit we should prevent the page from refreshing
e.preventDefault(); //though this is arguable
- console.log(!(nome.dict.key && email.dict.key && mensagem.dict.key))
// Se não houver erro em nunhum dos campos E nenhum dos campos for vazio: a página faz o contato com o backend e os campos ficam em branco no formulário
if (!(nome.dict.key || email.dict.key || mensagem.dict.key)) {
let payload = {
diff --git a/src/Components/CriarColecaoForm.js b/src/Components/CriarColecaoForm.js
index b09d5549..f5c9b4d3 100644
--- a/src/Components/CriarColecaoForm.js
+++ b/src/Components/CriarColecaoForm.js
@@ -41,7 +41,6 @@ export default function CriarColecaoForm(props) {
])
const handleChange = (event) => {
- console.log("valor", event.target.value);
setValue(event.target.value);
};
diff --git a/src/Components/HelperFunctions/getAxiosConfig.js b/src/Components/HelperFunctions/getAxiosConfig.js
index 8ced7d5b..b987089a 100644
--- a/src/Components/HelperFunctions/getAxiosConfig.js
+++ b/src/Components/HelperFunctions/getAxiosConfig.js
@@ -284,7 +284,6 @@ export const validateGoogleLoginToken = (url, config, onSuccess, onError) => {
})
})
.then(data => {
- console.log(data)
onSuccess(data)
})
.catch(error => {
diff --git a/src/Components/HomeScreenSearchBar.js b/src/Components/HomeScreenSearchBar.js
index 6b517193..364bce64 100644
--- a/src/Components/HomeScreenSearchBar.js
+++ b/src/Components/HomeScreenSearchBar.js
@@ -97,7 +97,6 @@ export default function HomeScreenSearchBar() {
};
const handleMenuItemClick = (event, index, value) => {
- console.log(value)
setSelectedIndex(index);
setSearchClass(value)
setAnchorEl(null);
diff --git a/src/Components/IframeOverlay/DrawerContent.js b/src/Components/IframeOverlay/DrawerContent.js
index 72c1d659..8936cfd8 100644
--- a/src/Components/IframeOverlay/DrawerContent.js
+++ b/src/Components/IframeOverlay/DrawerContent.js
@@ -26,10 +26,6 @@ export default function DrawerContent(props) {
search(props.tag);
}, [props.tag]);
- useEffect(() => {
- console.log(resources);
- }, [resources]);
-
return(
<Wrapper container
direction="row"
diff --git a/src/Components/LoginContainerFunction.js b/src/Components/LoginContainerFunction.js
index 6fc620e9..086cca3d 100644
--- a/src/Components/LoginContainerFunction.js
+++ b/src/Components/LoginContainerFunction.js
@@ -30,7 +30,6 @@ import { Link } from 'react-router-dom'
import { apiUrl } from '../env.js'
async function handleGoogleAttempt() {
- console.log("handleGoogleAttempt")
let request_url = (
`${apiUrl}/omniauth/google_oauth2?auth_origin_url=` + window.location.href + '&omniauth_window_type=sameWindow&resource_class=User'
)
@@ -70,7 +69,6 @@ export default function LoginContainer(props) {
key: flag,
value: userInput
})
- // {/*console.log(formEmail)*/}
}
else if (type === 'password') {
setSenha({
@@ -78,7 +76,6 @@ export default function LoginContainer(props) {
key: flag,
value: userInput
})
- // {/*console.log(formSenha)*/}
}
}
diff --git a/src/Components/ModalAbout.js b/src/Components/ModalAbout.js
index 568305f7..377ab6cd 100644
--- a/src/Components/ModalAbout.js
+++ b/src/Components/ModalAbout.js
@@ -153,7 +153,7 @@ const Formulário = styled.div`
`;
export default function TransitionsModal({ contrast }) {
- console.log(contrast);
+
const classes = useStyles();
const [open, setOpen] = React.useState(false);
diff --git a/src/Components/ModalAlterarAvatar/ComponentAlterarAvatar.js b/src/Components/ModalAlterarAvatar/ComponentAlterarAvatar.js
index eea67935..9af51a6c 100644
--- a/src/Components/ModalAlterarAvatar/ComponentAlterarAvatar.js
+++ b/src/Components/ModalAlterarAvatar/ComponentAlterarAvatar.js
@@ -70,7 +70,6 @@ export default function ComponentAlterarAvatar (props) {
const handleFile = (selectorFiles) => {
const objectURL = URL.createObjectURL(selectorFiles[0])
- console.log(objectURL)
setTempImg(objectURL)
setUploading(true)
}
diff --git a/src/Components/Notifications.js b/src/Components/Notifications.js
index 6b9f666f..c91283dd 100644
--- a/src/Components/Notifications.js
+++ b/src/Components/Notifications.js
@@ -117,7 +117,6 @@ export default function Notification(props) {
function handleClick(event) {
- console.log('event.currentTarget: ', event.currentTarget)
setAnchorEl(event.currentTarget);
}
diff --git a/src/Components/PageProfessorComponents/ModalConfirmarProfessor.js b/src/Components/PageProfessorComponents/ModalConfirmarProfessor.js
index f8bceee1..87d1a05b 100644
--- a/src/Components/PageProfessorComponents/ModalConfirmarProfessor.js
+++ b/src/Components/PageProfessorComponents/ModalConfirmarProfessor.js
@@ -17,12 +17,12 @@ 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 from 'react';
-import { Button } from '@material-ui/core';
import Modal from '@material-ui/core/Modal';
import Backdrop from '@material-ui/core/Backdrop';
import Fade from '@material-ui/core/Fade';
import styled from 'styled-components'
-import CloseIcon from '@material-ui/icons/Close';
+import CloseModalButton from '../CloseModalButton';
+import { ButtonCancelar, ButtonEnviar } from '../ReportUserForm';
const StyledModal = styled(Modal)`
display : flex;
@@ -50,13 +50,11 @@ export default function ModalConfirmarProfessor (props){
>
<Fade in={props.open} style={{ transitionDelay :"0.4ms"}}>
<>
- <ConfirmarProfessorComponent>
+ <ConfirmarProfessorComponent contrast={props.contrast}>
<HeaderDiv>
<span style={{width:"32px"}}/>
<h2>Confirme os Dados</h2>
- <Button style={{marginRight:"-8px", color:"000"}} onClick={props.handleClose}>
- <CloseIcon style={{color:"#666", cursor:"pointer", verticalAlign:"middle"}}/>
- </Button>
+ <CloseModalButton contrast={props.contrast} handleClose={props.handleClose}/>
</HeaderDiv>
<DialogContentDiv>
@@ -66,8 +64,8 @@ export default function ModalConfirmarProfessor (props){
<p><strong>Telefone da Escola:</strong> {props.info.school_phone}</p>
<p><strong>Seu CPF:</strong> {props.info.teacher_cpf}</p>
<ButtonsDiv>
- <ConfirmButton onClick ={props.confirmar}>CONFIRMAR</ConfirmButton>
- <CancelButton onClick = {props.cancelar}>CANCELAR</CancelButton>
+ <ButtonEnviar contrast={props.contrast} onClick={props.confirmar}>CONFIRMAR</ButtonEnviar>
+ <ButtonCancelar contrast={props.contrast} onClick={props.cancelar}>CANCELAR</ButtonCancelar>
</ButtonsDiv>
</ContainerCentralized>
</DialogContentDiv>
@@ -78,7 +76,7 @@ export default function ModalConfirmarProfessor (props){
)
}
-
+/*
const CancelButton = styled(Button)`
width : 140px !important;
color :#666 !important;
@@ -109,7 +107,7 @@ const ConfirmButton = styled(Button)`
margin : 6px 8px !important;
display : inline-block !important;
`
-
+*/
const ButtonsDiv = styled.div`
margin-top : 10px;
display : flex;
@@ -148,6 +146,7 @@ const HeaderDiv = styled.div`
const ConfirmarProfessorComponent = styled.div`
min-width : 600px;
border-radius : 4px;
- background-color : #fff;
- color : #666;
+ background-color: ${props => props.contrast === "" ? "white" : "black"};
+ color: ${props => props.contrast === "" ? "#666" : "white"};
+ border: ${props => props.contrast === "" ? "" : "1px solid white"};
`
diff --git a/src/Components/PageProfessorComponents/PartOne.js b/src/Components/PageProfessorComponents/PartOne.js
index e33c0719..e46c4f87 100644
--- a/src/Components/PageProfessorComponents/PartOne.js
+++ b/src/Components/PageProfessorComponents/PartOne.js
@@ -115,7 +115,6 @@ export default function PartOne(props) {
useEffect(() => {
axios.get(('https://simcaq.c3sl.ufpr.br/api/v1/state')
).then((response) => {
- console.log(sortDict(response.data.result))
handleSetStates(sortDict(response.data.result))
},
(error) => console.log('erro acessando api do simcaq (estados)'))
@@ -124,7 +123,6 @@ export default function PartOne(props) {
const handleChooseUF = (event) => {
const ufName = event.target.value
const { id, abbreviation } = extractUFInfo(ufList, ufName)
- console.log(id, abbreviation)
setUF({
...uf,
@@ -143,7 +141,6 @@ export default function PartOne(props) {
const handleChooseCity = (event) => {
const cityName = event.target.value
- console.log(cityName)
setMunicipio({
...municipio,
algumFoiEscolhido: true,
diff --git a/src/Components/PageProfessorComponents/PartTwo.js b/src/Components/PageProfessorComponents/PartTwo.js
index c2f634ed..a2b325cf 100644
--- a/src/Components/PageProfessorComponents/PartTwo.js
+++ b/src/Components/PageProfessorComponents/PartTwo.js
@@ -24,7 +24,6 @@ export default function PartTwo(props) {
if (code !== '') {
axios.get((`${simcaqAPIurl}/portal_mec_inep?filter=school_cod:` + code)
).then((response) => {
- console.log(response.data.result)
setSchoolList(sortDict(response.data.result))
}, (error) => console.log('erro ao dar get na escola por inep code')
)
@@ -32,7 +31,6 @@ export default function PartTwo(props) {
else if (uf !== '' && municipio !== '') {
axios.get((`${simcaqAPIurl}/school?search=state_name:"` + uf + '",city_name:"' + municipio + '"&filter=year:2017')
).then((response) => {
- console.log(response.data.result)
setSchoolList(sortDict(response.data.result))
}, (error) => console.log('erro ao dar get na escola por uf e municipio', code, uf, municipio)
)
@@ -40,7 +38,6 @@ export default function PartTwo(props) {
}, [])
const onClickTable = (city_name, id, name, state_name) => {
- console.log(id);
props.handleBuscar(city_name, id, name, state_name)
}
diff --git a/src/Components/ReportColecaoForm.js b/src/Components/ReportColecaoForm.js
index 6c5a79a7..56141563 100644
--- a/src/Components/ReportColecaoForm.js
+++ b/src/Components/ReportColecaoForm.js
@@ -74,9 +74,6 @@ export default function ReportColecaoForm (props) {
if( finalRadioValue !== -1 && !(finalMoreInfo.key)) {
props.handleSubmit(finalRadioValue, finalMoreInfo.value)
}
- else {
- console.log('oops')
- }
}
return (
diff --git a/src/Components/ReportModal.js b/src/Components/ReportModal.js
index eb3d7395..0bccdb08 100644
--- a/src/Components/ReportModal.js
+++ b/src/Components/ReportModal.js
@@ -55,7 +55,6 @@ export default function ReportModal (props) {
}
postRequest(url, payload, (data) => {
- console.log(data)
props.handleClose();
handleSnackbar(true);
}, (error) => {console.log(error)})
diff --git a/src/Components/ReportRecursoForm.js b/src/Components/ReportRecursoForm.js
index b0d57b99..34de4547 100644
--- a/src/Components/ReportRecursoForm.js
+++ b/src/Components/ReportRecursoForm.js
@@ -74,9 +74,6 @@ export default function ReportRecursoForm (props) {
if( finalRadioValue !== -1 && !(finalMoreInfo.key)) {
props.handleSubmit(finalRadioValue, finalMoreInfo.value)
}
- else {
- console.log('oops')
- }
}
return (
diff --git a/src/Components/ResourcePageComponents/VideoPlayer.js b/src/Components/ResourcePageComponents/VideoPlayer.js
index b1c61b1d..6b5a9822 100644
--- a/src/Components/ResourcePageComponents/VideoPlayer.js
+++ b/src/Components/ResourcePageComponents/VideoPlayer.js
@@ -37,7 +37,6 @@ function GetEmbeddedLink(link) {
}
else if (link.indexOf("vimeo") !== -1) { //if the 13th character = o (vimeo videos)
link_id = link.split("?")[0].split("/")
- console.log(link_id) //key # = from 19th character on
embed = "https://player.vimeo.com/video/" + link_id.pop(); //Add vimeo link before key #
}
return embed
diff --git a/src/Components/SearchPageComponents/ResourceTemplate.js b/src/Components/SearchPageComponents/ResourceTemplate.js
index bb618c29..d5a0a226 100644
--- a/src/Components/SearchPageComponents/ResourceTemplate.js
+++ b/src/Components/SearchPageComponents/ResourceTemplate.js
@@ -48,7 +48,7 @@ export default function ResourceTemplate({ isLoading, resources, totalResources,
liked={card.liked}
rating={card.review_average}
author={card.author}
- tags={card.educational_stages}
+ tags={card.tags}
href={"/recurso/" + card.id}
downloadableLink={card.default_attachment_location}
/>
diff --git a/src/Components/SignUpContainerFunction.js b/src/Components/SignUpContainerFunction.js
index 6b81ac5e..c66d3d43 100644
--- a/src/Components/SignUpContainerFunction.js
+++ b/src/Components/SignUpContainerFunction.js
@@ -31,7 +31,6 @@ import GoogleLogo from "../img/logo_google.svg"
import ReCaptcha from 'react-recaptcha'
async function handleGoogleAttempt() {
- console.log("handleGoogleAttempt")
let request_url = (
`${apiUrl}/omniauth/google_oauth2?auth_origin_url=` + window.location.href + '&omniauth_window_type=sameWindow&resource_class=User'
)
@@ -78,7 +77,6 @@ export default function SignUpContainer(props) {
key: flag,
value: userInput
})
- console.log(formNome)
}
else if (type === 'email') {
setEmail({
@@ -86,7 +84,6 @@ export default function SignUpContainer(props) {
key: flag,
value: userInput
})
- console.log(formEmail)
}
else if (type === 'password') {
setSenha({
@@ -94,7 +91,6 @@ export default function SignUpContainer(props) {
key: flag,
value: userInput
})
- console.log(formSenha)
}
else if (type === 'confirmation') {
setConfirmation({
@@ -102,7 +98,6 @@ export default function SignUpContainer(props) {
key: flag,
value: userInput
})
- console.log(formConfirmation)
}
}
diff --git a/src/Components/TabPanels/PanelComponents/TemplateCuradoria.js b/src/Components/TabPanels/PanelComponents/TemplateCuradoria.js
index 422c3e86..b6da514b 100644
--- a/src/Components/TabPanels/PanelComponents/TemplateCuradoria.js
+++ b/src/Components/TabPanels/PanelComponents/TemplateCuradoria.js
@@ -26,7 +26,6 @@ import { ButtonsAreaRecurso } from './ButtonsArea'
import LoadingSpinner from '../../LoadingSpinner.js';
export default function Template(props) {
- console.log(props.sliceArr);
return (
<WhiteContainer contrast={props.contrast}>
<Title
diff --git a/src/Components/TabPanels/UserPageTabs/PanelMeusRecursos.js b/src/Components/TabPanels/UserPageTabs/PanelMeusRecursos.js
index 4f82ce7e..c4cabfee 100644
--- a/src/Components/TabPanels/UserPageTabs/PanelMeusRecursos.js
+++ b/src/Components/TabPanels/UserPageTabs/PanelMeusRecursos.js
@@ -116,7 +116,6 @@ export default function TabPanelAtividades(props) {
const showMoreDrafts = (limite) => {
setLoadingMoreDrafts(true);
- console.log(limite);
const limit = limite;
setcurrLimitDrafts(currLimitDrafts + limit)
const url = `/users/${props.id}/drafts?offset=${currLimitDrafts}&limit=${limit}`;
@@ -129,7 +128,6 @@ export default function TabPanelAtividades(props) {
else if (data.length >= 1) {
let currData = [...drafts];
currData = [...currData.concat(data)];
- console.log('drafs: ', currData);
setLoadingMoreDrafts(false);
setDrafts([...currData]);
}
diff --git a/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js b/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js
index d13847cb..fd0e59f1 100644
--- a/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js
+++ b/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js
@@ -37,7 +37,7 @@ export default function TabPanelSolicitarContaProfessor(props) {
<div className='card-config'>
<div className='content-div'>
{
- !state.currentUser.roles.some(role => role.name === "teacher") && (state.currentUser.submitter_request === 'default' || state.currentUser.submitter_request === 'rejected') ?
+ !state.currentUser.roles.some(role => role.name === "teacher") && (state.currentUser.submitter_request === 'default') ?
(
<div>
<ImageDiv />
@@ -61,14 +61,23 @@ export default function TabPanelSolicitarContaProfessor(props) {
(
<>
{
- state.currentUser.submitter_request === 'requested' ?
- (
- <h1 className="title">A sua conta de Professor foi solicitada</h1>
- )
- :
- (
- <h1 className="title">Você já possui uma conta de Professor</h1>
- )
+ (() => {
+ switch (state.currentUser.submitter_request) {
+ case 'requested':
+ return (
+ <h1 className="title">A sua conta de Professor foi solicitada</h1>
+ )
+ case 'rejected':
+ return (
+ <h1 className="title">Sua solicitação foi negada</h1>
+ )
+ default:
+ return (
+ <h1 className="title">Você já possui uma conta de Professor</h1>
+ )
+
+ }
+ })()
}
</>
)
diff --git a/src/Components/TopicCard.js b/src/Components/TopicCard.js
index e19c4c27..0ec3baf9 100644
--- a/src/Components/TopicCard.js
+++ b/src/Components/TopicCard.js
@@ -26,9 +26,8 @@ import Button from '@material-ui/core/Button';
import { Link } from 'react-router-dom';
export default function MaterialCard(props) {
- console.log(props);
const thumb = require(`../../public/${props.topic.img}`)
-//className={`${props.contrast}BackColor`}
+
return (
<Card className={`${props.contrast}BackColor ${props.contrast}Border`} style={{ maxHeight: "100%", maxWidth: "300px" }}>
<img style={{ maxHeight: "100%", maxWidth: "100%" }} src={thumb} alt="thumbnail do recurso" />
diff --git a/src/Components/UploadPageComponents/ChooseLinkSection.js b/src/Components/UploadPageComponents/ChooseLinkSection.js
index 44f89db0..19186952 100644
--- a/src/Components/UploadPageComponents/ChooseLinkSection.js
+++ b/src/Components/UploadPageComponents/ChooseLinkSection.js
@@ -59,7 +59,6 @@ export default function ChooseLink(props) {
const handleSubmit = (e) => {
e.preventDefault()
- console.log(link.flag)
if (!link.flag) {
props.submit(link.value)
setLinkSent(true)
diff --git a/src/Components/UploadPageComponents/Forms/Idioma.js b/src/Components/UploadPageComponents/Forms/Idioma.js
index 61b138ab..bf8b875f 100644
--- a/src/Components/UploadPageComponents/Forms/Idioma.js
+++ b/src/Components/UploadPageComponents/Forms/Idioma.js
@@ -66,8 +66,6 @@ export default function Idioma(props) {
setChosenLanguage(copyChosenLanguages);
setIds(copyIds);
- console.log(copyChosenLanguages);
- console.log(copyIds);
// if (!chosenLanguage.some(language => language === newLanguage.name)) {
// setChosenLanguage(chosenLanguage => [...chosenLanguage, newLanguage.name]);
// setIds(ids => [...ids, newLanguage.id])
diff --git a/src/Components/UploadPageComponents/ModalCancelar.js b/src/Components/UploadPageComponents/ModalCancelar.js
index ce980740..b7569f16 100644
--- a/src/Components/UploadPageComponents/ModalCancelar.js
+++ b/src/Components/UploadPageComponents/ModalCancelar.js
@@ -29,7 +29,6 @@ export default function ModalCancelar (props) {
function handleSuccess (data) {
props.handleClose()
- console.log('ir pra home')
}
const handleDelete = () => {
diff --git a/src/Components/UploadPageComponents/PartThree.js b/src/Components/UploadPageComponents/PartThree.js
index f2e09f1c..19a4ac03 100644
--- a/src/Components/UploadPageComponents/PartThree.js
+++ b/src/Components/UploadPageComponents/PartThree.js
@@ -50,10 +50,6 @@ export default function PartThree(props) {
const [author, setAuthor] = useState('')
function handleSuccess(data) {
- console.log(data.tags)
- console.log(data.language)
- console.log(data.subjects)
- console.log(data)
setDraft(data)
/*extract subjects*/
@@ -278,7 +274,11 @@ export default function PartThree(props) {
</h4>
</Grid>
<Grid item>
- <ReCaptcha sitekey="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI" verifyCallback={captchaVerified} />
+ {
+ //<ReCaptcha sitekey={process.env.REACT_APP_SITE_KEY} verifyCallback={captchaVerified} /> //when key set in env
+ <ReCaptcha sitekey="6LfxuKUUAAAAAIzYpCzEtJyeE8QRjBYa44dvHlTX" verifyCallback={captchaVerified} /> //use this one on production
+ //<ReCaptcha sitekey="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI" verifyCallback={captchaVerified} /> //test key, from google, do not use this one on production
+ }
</Grid>
</Grid>
diff --git a/src/Components/UploadPageComponents/PartTwo.js b/src/Components/UploadPageComponents/PartTwo.js
index 80264279..1c1cb116 100644
--- a/src/Components/UploadPageComponents/PartTwo.js
+++ b/src/Components/UploadPageComponents/PartTwo.js
@@ -144,7 +144,6 @@ export default function PartTwo(props) {
useEffect(() => {
if (didMountRef.current) {
- console.log(learningObject);
toggleLoading(false)
}
else {
@@ -165,14 +164,12 @@ export default function PartTwo(props) {
const acceptFile = (file) => {
const objectURL = URL.createObjectURL(file)
- console.log(file)
setTempUrl(objectURL)
setThumbnailStage('editing')
}
const updateThumb = (newThumbnail) => {
setThumbnail(newThumbnail)
- console.log(thumbnail)
}
const handleDeleteThumb = () => {
diff --git a/src/Components/UploadPageComponents/UploadFileWrapper.js b/src/Components/UploadPageComponents/UploadFileWrapper.js
index d922219f..866f0209 100644
--- a/src/Components/UploadPageComponents/UploadFileWrapper.js
+++ b/src/Components/UploadPageComponents/UploadFileWrapper.js
@@ -60,7 +60,7 @@ export default function UploadFileWrapper(props) {
if (!file) return;
let newFile = file
- console.log(newFile)
+ //console.log(newFile)
setFileToUpload(newFile);
setFileName(newFile.name)
@@ -85,7 +85,7 @@ export default function UploadFileWrapper(props) {
try {
const response = await axios.post(uploadUrl, formData, config);
- console.log(response)
+ //console.log(response)
if (response.headers['access-token']) {
updateHeaders(response.headers)
}
@@ -104,7 +104,6 @@ export default function UploadFileWrapper(props) {
currentChunkFinalByte = currentChunkStartByte + chunkSize;
}
} catch (error) {
- console.log(error)
handleNextStage("error")
return;
}
@@ -120,7 +119,7 @@ export default function UploadFileWrapper(props) {
}
const handleCancel = () => {
- console.log('cancelar request')
+
}
const handleDragOver = e => {
@@ -134,7 +133,6 @@ export default function UploadFileWrapper(props) {
e.stopPropagation();
let files = [...e.dataTransfer.files]
- console.log('files: ', files)
if (files && files.length > 0) {
onFileChange(files[0])
}
diff --git a/src/Components/UserPageComponents/Cover.js b/src/Components/UserPageComponents/Cover.js
index d4a20747..27aae391 100644
--- a/src/Components/UserPageComponents/Cover.js
+++ b/src/Components/UserPageComponents/Cover.js
@@ -37,7 +37,6 @@ export default function Cover (props) {
const updateCover = (selectorFiles) => {
const objectURL = URL.createObjectURL(selectorFiles[0])
- console.log(objectURL)
setTempCover(objectURL)
controlModal()
}
diff --git a/src/Pages/ChangePasswordPage.js b/src/Pages/ChangePasswordPage.js
index 8bc12a7f..a7f90c22 100644
--- a/src/Pages/ChangePasswordPage.js
+++ b/src/Pages/ChangePasswordPage.js
@@ -79,9 +79,7 @@ export default function ChangePasswordPage(props) {
}
handleSnackInfo(snackInfo)
} else {
- //console.log("senha bate");
if (!formPassword.key && !formPasswordConfirmation.key) {
- console.log("senha bate");
const urlParams = new URLSearchParams(window.location.search);
const clientId = urlParams.get("client_id");
diff --git a/src/Pages/EditLearningObjectPage.js b/src/Pages/EditLearningObjectPage.js
index 2f1a37f1..e9b4da89 100644
--- a/src/Pages/EditLearningObjectPage.js
+++ b/src/Pages/EditLearningObjectPage.js
@@ -187,13 +187,11 @@ export default function EditLearningObjectPage (props) {
const acceptFile = (file) => {
const objectURL = URL.createObjectURL(file)
- console.log('acceptFile: ', file)
setTempUrl(objectURL)
setThumbnailStage('editing')
}
const updateThumb = (newThumbnail) => {
setThumbnail(newThumbnail)
- console.log('updateThumb: ', thumbnail)
}
diff --git a/src/Pages/FormationMaterialPage.js b/src/Pages/FormationMaterialPage.js
index 64d23291..7f6c27cd 100644
--- a/src/Pages/FormationMaterialPage.js
+++ b/src/Pages/FormationMaterialPage.js
@@ -60,8 +60,6 @@ export default function FormationMaterialPage(props) {
window.scrollTo(0, topic_list_ref.current.offsetTop);
}
- console.log(colecao_obj);
-
return (
<Background contrast={state.contrast}>
<BreadCrumbsDiv>
diff --git a/src/Pages/PageProfessor.js b/src/Pages/PageProfessor.js
index 9c9a2554..c77fe1d5 100644
--- a/src/Pages/PageProfessor.js
+++ b/src/Pages/PageProfessor.js
@@ -94,7 +94,6 @@ export default function PageProfessor(props) {
const handleFinalSubmit = () => {
const url = `/users/teacher_request`
- console.log(registerInformation)
const payload = {
city: registerInformation.school_city,
@@ -114,7 +113,7 @@ export default function PageProfessor(props) {
state.userAgreedToPublicationTerms ?
(
<>
- <ModalConfirmarProfessor contrast={props.contrast} open={modalOpen} handleClose={handleModal}
+ <ModalConfirmarProfessor contrast={state.contrast} open={modalOpen} handleClose={handleModal}
info={registerInformation} confirmar={() => { handleFinalSubmit() }}
cancelar={() => { toggleModal() }}
/>
diff --git a/src/Pages/PasswordRecoveryPage.js b/src/Pages/PasswordRecoveryPage.js
index f3145f4b..e1a42071 100644
--- a/src/Pages/PasswordRecoveryPage.js
+++ b/src/Pages/PasswordRecoveryPage.js
@@ -33,7 +33,6 @@ export default function PasswordRecoveryPage(props) {
const [aux, setCase] = useState('default')
const handleChangeSwitch = (value) => {
- console.log(value)
if (value !== "success") {
setEmail({ key: false, value: "" })
}
diff --git a/src/Pages/PublicationPermissionsPage.js b/src/Pages/PublicationPermissionsPage.js
index 986e371e..a7a121b3 100644
--- a/src/Pages/PublicationPermissionsPage.js
+++ b/src/Pages/PublicationPermissionsPage.js
@@ -116,14 +116,10 @@ export default function PermissionsContainer(props) {
let radioTmp2 = {id: parseInt(e.target.name), value: e.target.value};
let temp = radios;
const index = temp.findIndex(x => x.id === parseInt(e.target.name));
- console.log(index);
temp[index] = radioTmp2;
- console.log(e.target.name);
- console.log(e.target.value);
setRadioValues(temp);
- console.log(radios);
setCheckboxAvailability(!(radios.every((radio) => radio.value === "Não")));
};
diff --git a/src/Pages/SummarizedUserTerms.js b/src/Pages/SummarizedUserTerms.js
index b48e5369..401530a4 100644
--- a/src/Pages/SummarizedUserTerms.js
+++ b/src/Pages/SummarizedUserTerms.js
@@ -63,7 +63,6 @@ export default function SummarizedUserTerms() {
const [slide, updateSlide] = useState(0);
const handleGoUp = () => {
- console.log(slide - 1);
if (slide > 1) {
var element = document.getElementById("slide" + (slide - 1).toString());
if (element.offsetHeight < state.windowSize.height) element.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'center' })
--
GitLab