From 94fc7bfb7076e0dbcb843354854398f82999d54d Mon Sep 17 00:00:00 2001 From: "Henrique V. Ehrenfried" <hvehrenfried@inf.ufpr.br> Date: Thu, 21 Jan 2021 11:57:56 -0300 Subject: [PATCH] Fix warnings in some files Signed-off-by: Henrique V. Ehrenfried <hvehrenfried@inf.ufpr.br> --- package-lock.json | 6 +- src/App.js | 2 +- src/Components/AchievementDescriptionCard.js | 1 - src/Components/ColaborarModal.js | 2 +- src/Components/CollectionCard.js | 1 - src/Components/CollectionCommentSection.js | 2 +- src/Components/CollectionDowloadButton.js | 7 +- src/Components/ContactCardOptions.js | 14 ++-- src/Components/FollowCollectionButton.js | 7 +- src/Components/FormInput.js | 1 - src/Components/GuardarModal.js | 1 - .../HelpCenter/Cards/CardEncontrando.js | 1 - .../HelpCenter/TabsPlataformaMEC/How.js | 1 + src/Components/IframeOverlay.js | 1 - src/Components/IframeOverlay/SearchInput.js | 1 - src/Components/IframeOverlay/SmallFooter.js | 3 +- src/Components/IllegalContentModal.js | 4 +- src/Components/LoadingSpinner.js | 2 +- src/Components/LoginContainerFunction.js | 8 +- src/Components/Modal.js | 2 - src/Components/ModalAbout.js | 2 - src/Components/ModalAvaliarRecurso.js | 14 ---- .../ModalLearningObjectPublished.js | 26 ++----- src/Components/ModalVideoApresentacao.js | 1 + .../PageProfessorComponents/PartThree.js | 3 +- .../PasswordRecoveryComponents/Success.js | 2 - src/Components/ReportButton.js | 1 + src/Components/ReportModal.js | 3 - src/Components/RequirementsDialog.js | 24 ------ src/Components/ResourceCard.js | 14 ++-- src/Components/ResourceCardFunction.js | 42 +++++----- src/Components/ResourceCardOptions.js | 15 ++-- src/Components/ResourceList.js | 7 +- .../ResourcePageComponents/CommentForm.js | 1 - .../ResourcePageComponents/CommentsArea.js | 4 +- .../ResourcePageComponents/Footer.js | 2 - .../ResourcePageComponents/Sobre.js | 3 +- .../ResourcePageComponents/TextoObjeto.js | 5 +- .../SearchEPCompCurriculum.js | 2 +- .../SearchExpansionPanel/SearchEPIdiomas.js | 2 +- .../SearchExpansionPanel/SearchEPTiposRec.js | 2 +- .../SearchExpansionPanel/SesrchEPEtapasEns.js | 2 +- src/Components/ShareModal.js | 15 +--- .../TabPanels/PanelComponents/NoContent.js | 10 +-- .../PublicUserPageTabs/LastLearnObj.js | 2 +- .../PublicUserPageTabs/TabColecoes.js | 1 - .../TabPanels/PublicUserPageTabs/TabInicio.js | 4 +- .../PublicUserPageTabs/TabRecursos.js | 1 - .../TabPanels/PublicUserPageTabs/TabRede.js | 2 +- .../TabPanels/TabPanelStatusEConquistas.js | 10 ++- .../UserPageTabs/PanelEditarPerfil.js | 1 + .../PanelSolicitarContaProfessor.js | 1 + src/Components/TermsPageContent.js | 10 --- .../UploadPageComponents/Forms/Autor.js | 3 +- .../UploadPageComponents/GetIconByName.js | 38 ---------- .../UploadPageComponents/PartThree.js | 5 +- .../PartTwoComponents/DisplayThumbnail.js | 2 +- .../UploadPageComponents/Stepper.js | 76 +++++++++---------- .../UploadPageComponents/StyledComponents.js | 7 -- src/Pages/CollectionPage.js | 10 --- src/Pages/PageProfessor.js | 1 - src/Pages/PasswordRecoveryPage.js | 8 -- src/Pages/PublicUserPage.js | 8 +- src/Pages/ResourcePage.js | 7 +- src/Pages/Search.js | 2 +- src/Pages/UserTerms.js | 23 +----- src/env.js | 4 +- 67 files changed, 149 insertions(+), 346 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7c8f79a0..a8fb0106 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3630,9 +3630,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001083", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001083.tgz", - "integrity": "sha512-CnYJ27awX4h7yj5glfK7r1TOI13LBytpLzEgfj0s4mY75/F8pnQcYjL+oVpmS38FB59+vU0gscQ9D8tc+lIXvA==" + "version": "1.0.30001179", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz", + "integrity": "sha512-blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==" }, "capture-exit": { "version": "1.2.0", diff --git a/src/App.js b/src/App.js index b1487680..80523ca9 100644 --- a/src/App.js +++ b/src/App.js @@ -35,7 +35,7 @@ import TabManageAc from './Pages/TabsHelp/TabManageAc'; import PasswordRecoveryPage from './Pages/PasswordRecoveryPage.js' import PageProfessor from './Pages/PageProfessor.js' import ResourcePage from './Pages/ResourcePage'; -import {BrowserRouter, Switch, Route, useLocation } from 'react-router-dom'; +import {BrowserRouter, Switch, Route } from 'react-router-dom'; import { Store } from './Store' import TermsPage from './Pages/TermsPage.js' import PublicationPermissionsPage from './Pages/PublicationPermissionsPage.js' diff --git a/src/Components/AchievementDescriptionCard.js b/src/Components/AchievementDescriptionCard.js index 3af102fe..ad01fc46 100644 --- a/src/Components/AchievementDescriptionCard.js +++ b/src/Components/AchievementDescriptionCard.js @@ -1,6 +1,5 @@ import React from 'react' import styled from 'styled-components' -import { Container } from 'react-grid-system' import Paper from '@material-ui/core/Paper'; import { Grid } from '@material-ui/core' import RequirementDialog from './RequirementsDialog.js'; diff --git a/src/Components/ColaborarModal.js b/src/Components/ColaborarModal.js index 3c971a28..1c23fb01 100644 --- a/src/Components/ColaborarModal.js +++ b/src/Components/ColaborarModal.js @@ -78,7 +78,7 @@ const Styledspan = styled.span` ` export default function ColaborarModal (props) { - const {state, dispatch} = useContext(Store) + // const {state, dispatch} = useContext(Store) const [checkbox, controlCheckbox] = useState(false) const handleCheckbox = () => controlCheckbox(!checkbox) diff --git a/src/Components/CollectionCard.js b/src/Components/CollectionCard.js index b6006301..a252100a 100644 --- a/src/Components/CollectionCard.js +++ b/src/Components/CollectionCard.js @@ -26,7 +26,6 @@ import CardActions from '@material-ui/core/CardActions'; import IconButton from '@material-ui/core/IconButton'; import FolderIcon from '@material-ui/icons/Folder'; import FavoriteIcon from '@material-ui/icons/Favorite'; -import StarRatings from 'react-star-ratings'; import noAvatar from "../img/default_profile.png"; import Rating from '@material-ui/lab/Rating'; import StarBorderIcon from '@material-ui/icons/StarBorder'; diff --git a/src/Components/CollectionCommentSection.js b/src/Components/CollectionCommentSection.js index df6ead81..9351596e 100644 --- a/src/Components/CollectionCommentSection.js +++ b/src/Components/CollectionCommentSection.js @@ -91,7 +91,7 @@ export default function CollectionCommentSection(props) { const CollectionComments = () => { return ( <div> - <Title>{reviews.length} {reviews.length == 1 ? "Relato" : "Relatos"} sobre a Coleção</Title> + <Title>{reviews.length} {reviews.length === 1 ? "Relato" : "Relatos"} sobre a Coleção</Title> {reviews.map(r => { return ( <Comment diff --git a/src/Components/CollectionDowloadButton.js b/src/Components/CollectionDowloadButton.js index 2e081f43..f36eed11 100644 --- a/src/Components/CollectionDowloadButton.js +++ b/src/Components/CollectionDowloadButton.js @@ -1,15 +1,12 @@ -import React, { useContext, useState, useEffect } from 'react'; +import React, { useState, useEffect } from 'react'; import axios from 'axios'; import GetAppIcon from '@material-ui/icons/GetApp'; import Button from '@material-ui/core/Button'; import styled from 'styled-components'; import { apiUrl, apiDomain } from '../env'; -import FollowCollectionButton from './FollowCollectionButton.js'; -import { Store } from '../Store.js' -import { Grid } from '@material-ui/core'; + const DowloadButton = (props) => { - const { state } = useContext(Store); const [download_url, setDownloadUrl] = useState(''); useEffect(() => { diff --git a/src/Components/ContactCardOptions.js b/src/Components/ContactCardOptions.js index 7cccf882..39178575 100644 --- a/src/Components/ContactCardOptions.js +++ b/src/Components/ContactCardOptions.js @@ -34,7 +34,7 @@ import ReportModal from './ReportModal.js' import {Link} from 'react-router-dom' export default function SimpleMenu(props) { - const {state} = useContext(Store) + // const {state} = useContext(Store) const [anchorEl, setAnchorEl] = React.useState(null); function handleClick(event) { @@ -66,12 +66,12 @@ export default function SimpleMenu(props) { const [reportModal, toggleReportModal] = useState(false) const handleModal = (value) => { toggleReportModal(value) - {/*if (state.currentUser.id) { - toggleReportModal(!reportModal) - } - else { - toggleLoginModal(true) - }*/} + // {/*if (state.currentUser.id) { + // toggleReportModal(!reportModal) + // } + // else { + // toggleLoginModal(true) + // }*/} } return ( diff --git a/src/Components/FollowCollectionButton.js b/src/Components/FollowCollectionButton.js index cbabd884..cf7d7323 100644 --- a/src/Components/FollowCollectionButton.js +++ b/src/Components/FollowCollectionButton.js @@ -56,7 +56,7 @@ export default function FollowCollectionButton(props) { setIcon(<CheckIcon fontSize="large" />) setFollowing(true); } - + return undefined }) SaveNewHeaders(response) }) @@ -166,11 +166,6 @@ export default function FollowCollectionButton(props) { else return (<div></div>); } -const Title = styled.h1` - font-size: 3em; - color: rgb(102, 102, 102); - float: left; -` const ButtonText = styled.span` font-weight: bolder; font-size: 1.2em; diff --git a/src/Components/FormInput.js b/src/Components/FormInput.js index c107ab51..813877ed 100644 --- a/src/Components/FormInput.js +++ b/src/Components/FormInput.js @@ -70,7 +70,6 @@ export default function FormInput(props) { type = {props.inputType} value = {props.value} onChange = {props.handleChange} - helperText = {props.help} rows = {props.rows} error = {props.error} rowsMax = {props.rowsMax} diff --git a/src/Components/GuardarModal.js b/src/Components/GuardarModal.js index 868f09b5..8d4fc7ff 100644 --- a/src/Components/GuardarModal.js +++ b/src/Components/GuardarModal.js @@ -22,7 +22,6 @@ 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 SignUpContainer from './SignUpContainerFunction.js' import {Store} from '../Store.js' import axios from 'axios' import {apiUrl, apiDomain} from '../env'; diff --git a/src/Components/HelpCenter/Cards/CardEncontrando.js b/src/Components/HelpCenter/Cards/CardEncontrando.js index f1c2db1b..f989352e 100644 --- a/src/Components/HelpCenter/Cards/CardEncontrando.js +++ b/src/Components/HelpCenter/Cards/CardEncontrando.js @@ -46,7 +46,6 @@ export default function CardEncontrando(props) { > Como filtrar os resultados? </Link> - <a></a> <br /> <Link to={{ diff --git a/src/Components/HelpCenter/TabsPlataformaMEC/How.js b/src/Components/HelpCenter/TabsPlataformaMEC/How.js index 930476c1..9834d939 100644 --- a/src/Components/HelpCenter/TabsPlataformaMEC/How.js +++ b/src/Components/HelpCenter/TabsPlataformaMEC/How.js @@ -31,6 +31,7 @@ export default function How(props) { </div> <div style={{ width: "640px", height: "360px" }}> <iframe + title="Video Página Ajuda" width="640" height="360" src="https://www.youtube.com/embed/CRW5h2pHugM" diff --git a/src/Components/IframeOverlay.js b/src/Components/IframeOverlay.js index c7e8979e..2166e716 100644 --- a/src/Components/IframeOverlay.js +++ b/src/Components/IframeOverlay.js @@ -1,6 +1,5 @@ import React, { useState } from 'react'; import styled from 'styled-components'; -import Grid from '@material-ui/core/Grid'; import ExpandButton from './IframeOverlay/ExpandButton.js'; import Drawer from '@material-ui/core/Drawer'; import DrawerContent from './IframeOverlay/DrawerContent.js'; diff --git a/src/Components/IframeOverlay/SearchInput.js b/src/Components/IframeOverlay/SearchInput.js index 18f82103..f201d314 100644 --- a/src/Components/IframeOverlay/SearchInput.js +++ b/src/Components/IframeOverlay/SearchInput.js @@ -3,7 +3,6 @@ import styled from 'styled-components'; import SearchIcon from '@material-ui/icons/Search'; import IconButton from '@material-ui/core/IconButton'; import OutlinedInput from '@material-ui/core/OutlinedInput'; -import InputLabel from '@material-ui/core/InputLabel'; import InputAdornment from '@material-ui/core/InputAdornment'; import FormControl from '@material-ui/core/FormControl'; diff --git a/src/Components/IframeOverlay/SmallFooter.js b/src/Components/IframeOverlay/SmallFooter.js index c376bdee..95350b07 100644 --- a/src/Components/IframeOverlay/SmallFooter.js +++ b/src/Components/IframeOverlay/SmallFooter.js @@ -1,7 +1,5 @@ import React from 'react'; -import { Link } from 'react-router-dom'; import styled from 'styled-components'; -import Grid from '@material-ui/core/Grid'; import ImgInfo from '../../img/acesso-a-informacao.png'; export default function SmallFooter(props) { @@ -12,6 +10,7 @@ export default function SmallFooter(props) { <a alt="Governo Federal" href="http://www.brasil.gov.br/" + rel="noreferrer" target="_blank" > <Img src={ImgInfo} /> diff --git a/src/Components/IllegalContentModal.js b/src/Components/IllegalContentModal.js index 65b658a4..135270c2 100644 --- a/src/Components/IllegalContentModal.js +++ b/src/Components/IllegalContentModal.js @@ -5,8 +5,6 @@ import styled from 'styled-components' import { Button } from '@material-ui/core'; import Backdrop from '@material-ui/core/Backdrop'; import { Store } from '../Store.js'; -import axios from 'axios' -import {apiUrl} from '../env'; const StyledModal = styled(Modal)` margin : 0 !important; @@ -81,7 +79,7 @@ const StyledDivContainer = styled.div` ` export default function IllegalContentModal (props) { - const {state, dispatch} = useContext(Store) + const {state} = useContext(Store) // const func = () => { // let name = '' diff --git a/src/Components/LoadingSpinner.js b/src/Components/LoadingSpinner.js index ffeec909..68c447c4 100644 --- a/src/Components/LoadingSpinner.js +++ b/src/Components/LoadingSpinner.js @@ -3,7 +3,7 @@ import LoadingGif from '../img/loading_busca.gif' const LoadingSpinner = (props) => ( <div style={{display:"flex", flexDirection:"column", alignItems:"center", justifyContent:"center"}}> - <img src={LoadingGif} /> + <img alt="" src={LoadingGif} /> <span style={{textTransform:"uppercase"}}>{props.text}</span> </div> ); diff --git a/src/Components/LoginContainerFunction.js b/src/Components/LoginContainerFunction.js index 5e6bd3fc..33b7ff15 100644 --- a/src/Components/LoginContainerFunction.js +++ b/src/Components/LoginContainerFunction.js @@ -69,14 +69,14 @@ export default function LoginContainer (props) { key : flag, value : userInput }) - {/*console.log(formEmail)*/} + // {/*console.log(formEmail)*/} } else if(type === 'password') { setSenha({...formSenha, key : flag, value : userInput }) - {/*console.log(formSenha)*/} + // {/*console.log(formSenha)*/} } } @@ -140,7 +140,7 @@ export default function LoginContainer (props) { handleChange={e => handleChange(e, 'email')} required={true} error = {formEmail.key} - help = {formEmail.key ? ( formEmail.value.length == 0 ? "Faltou preencher seu e-mail." : <span>Insira um endereço de e-mail válido.<br/>Por exemplo: seunome@gmail.com, seunome@hotmail.com</span>) : ""} + help = {formEmail.key ? ( formEmail.value.length === 0 ? "Faltou preencher seu e-mail." : <span>Insira um endereço de e-mail válido.<br/>Por exemplo: seunome@gmail.com, seunome@hotmail.com</span>) : ""} /> <br/> <FormInput @@ -151,7 +151,7 @@ export default function LoginContainer (props) { handleChange={e => handleChange(e, 'password')} required={true} error = {formSenha.key} - help = {formSenha.key ? (formSenha.value.length == 0 ? "Faltou digitar sua senha." : "A senha precisa ter no mínimo 8 caracteres.") : ""} + help = {formSenha.key ? (formSenha.value.length === 0 ? "Faltou digitar sua senha." : "A senha precisa ter no mínimo 8 caracteres.") : ""} /> <br/> diff --git a/src/Components/Modal.js b/src/Components/Modal.js index cd970dd2..dd2de1bc 100644 --- a/src/Components/Modal.js +++ b/src/Components/Modal.js @@ -23,11 +23,9 @@ import Modal from '@material-ui/core/Modal'; import TermsCarousel from './Carousel'; import Backdrop from '@material-ui/core/Backdrop'; -import Grid from '@material-ui/core/Grid'; import Fade from '@material-ui/core/Fade'; import VisibilityOutlinedIcon from '@material-ui/icons/VisibilityOutlined'; -import styled from 'styled-components' /*Importação de imagens para o componente*/ diff --git a/src/Components/ModalAbout.js b/src/Components/ModalAbout.js index 3739a893..84998e7c 100644 --- a/src/Components/ModalAbout.js +++ b/src/Components/ModalAbout.js @@ -23,9 +23,7 @@ import Modal from '@material-ui/core/Modal'; import Formulario from "./ContactForm"; import Backdrop from '@material-ui/core/Backdrop'; -import Grid from '@material-ui/core/Grid'; import Fade from '@material-ui/core/Fade'; -import VisibilityOutlinedIcon from '@material-ui/icons/VisibilityOutlined'; import styled from 'styled-components' diff --git a/src/Components/ModalAvaliarRecurso.js b/src/Components/ModalAvaliarRecurso.js index 9d6c588e..8604461a 100644 --- a/src/Components/ModalAvaliarRecurso.js +++ b/src/Components/ModalAvaliarRecurso.js @@ -22,9 +22,6 @@ 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 {Store} from '../Store.js' -import axios from 'axios' -import {apiDomain} from '../env'; import Grid from '@material-ui/core/Grid'; import RadioGroup from '@material-ui/core/RadioGroup'; import Radio from '@material-ui/core/Radio'; @@ -32,7 +29,6 @@ import FormControl from '@material-ui/core/FormControl'; import FormControlLabel from '@material-ui/core/FormControlLabel'; import CloseModalButton from './CloseModalButton' import Snackbar from '@material-ui/core/Snackbar'; -import Alert from '../Components/Alert.js'; import TextField from '@material-ui/core/TextField'; import { withStyles } from '@material-ui/core/styles'; @@ -232,16 +228,6 @@ const Header = styled.div` } ` -const StyledCloseModalButton = styled(Button)` - display : inline-block; - position : relative; - float : right !important; - margin-right : -8px !important; - background : transparent !important; - min-width: 0 !important; - width : 40px; -` - const StyledModal = styled(Modal)` .djXaxP{ margin : 0 !important; diff --git a/src/Components/ModalLearningObjectPublished.js b/src/Components/ModalLearningObjectPublished.js index 8fe0d148..0dc48601 100644 --- a/src/Components/ModalLearningObjectPublished.js +++ b/src/Components/ModalLearningObjectPublished.js @@ -22,10 +22,6 @@ 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 SignUpContainer from './SignUpContainerFunction.js' -import {Store} from '../Store.js' -import axios from 'axios' -import {apiDomain} from '../env'; import Grid from '@material-ui/core/Grid'; import Facebook from '../img/facebook.svg' import Twitter from '../img/twitter.svg' @@ -33,12 +29,12 @@ import LinkIcon from '../img/link_icon.svg' import CloseModalButton from './CloseModalButton.js' export default function ModalLearningObjectPublished (props) { - const refContainer = useRef(props.link); + // const refContainer = useRef(props.link); - function copyToClipboard(e) { - let copyText = document.getElementById('p-text') - console.log(copyText) - }; + // function copyToClipboard(e) { + // let copyText = document.getElementById('p-text') + // console.log(copyText) + // }; return ( <StyledModal @@ -79,6 +75,7 @@ export default function ModalLearningObjectPublished (props) { <div className="logos-shared"> <a href={"https://www.facebook.com/sharer/sharer.php?u=https://plataformaintegrada.mec.gov.br/recurso/" + props.draftID} + rel="noreferrer" target="_blank"> <ShareButton> <img src={Facebook} alt="facebook-logo"/> @@ -87,6 +84,7 @@ export default function ModalLearningObjectPublished (props) { <a href={"https://www.twitter.com/intent/tweet?url=https://plataformaintegrada.mec.gov.br/recurso/" + props.draftID} + rel="noreferrer" target="_blank"> <ShareButton> <img src={Twitter} alt="twitter-logo"/> @@ -186,16 +184,6 @@ const Header = styled.div` } ` -const StyledCloseModalButton = styled(Button)` - display : inline-block; - position : relative; - float : right !important; - margin-right : -8px !important; - background : transparent !important; - min-width: 0 !important; - width : 40px; -` - const StyledModal = styled(Modal)` .djXaxP{ margin : 0 !important; diff --git a/src/Components/ModalVideoApresentacao.js b/src/Components/ModalVideoApresentacao.js index 709ea57b..3b83f173 100644 --- a/src/Components/ModalVideoApresentacao.js +++ b/src/Components/ModalVideoApresentacao.js @@ -40,6 +40,7 @@ export default function ModalVideoApresentacao (props) { <Fade in={props.open}> <VideoContainer> <iframe + title="Video Apresentação" src="https://www.youtube.com/embed/gejBqyfJr9A" width="560" height="315" frameBorder="0" allowFullScreen className="video" /> diff --git a/src/Components/PageProfessorComponents/PartThree.js b/src/Components/PageProfessorComponents/PartThree.js index 2ee7c262..d52d17ba 100644 --- a/src/Components/PageProfessorComponents/PartThree.js +++ b/src/Components/PageProfessorComponents/PartThree.js @@ -1,8 +1,7 @@ import React, {useState} from 'react' -import {Content, ButtonsArea} from './PartOne.js' +import {Content} from './PartOne.js' import {ButtonCancelar, ButtonGrey} from './PartTwo.js' import FormControl from '@material-ui/core/FormControl'; -import InputLabel from '@material-ui/core/InputLabel'; import Stepper from '../Stepper.js' import FormInput from '../FormInput.js' import styled from 'styled-components' diff --git a/src/Components/PasswordRecoveryComponents/Success.js b/src/Components/PasswordRecoveryComponents/Success.js index d366bc3c..34feb617 100644 --- a/src/Components/PasswordRecoveryComponents/Success.js +++ b/src/Components/PasswordRecoveryComponents/Success.js @@ -1,6 +1,4 @@ import React from 'react' -import {CompletarCadastroButton} from '../TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js' -import FormInput from "../FormInput.js" export default function Default (props) { return ( diff --git a/src/Components/ReportButton.js b/src/Components/ReportButton.js index ea8bb313..654780a7 100644 --- a/src/Components/ReportButton.js +++ b/src/Components/ReportButton.js @@ -42,6 +42,7 @@ export default function ReportButton (props) { /*modal variables------------------------------------*/ const [reportModal, toggleReportModal] = useState(false) + // eslint-disable-next-line const [loginModal, toggleLoginModal] = useState(false) const handleModal = () => { diff --git a/src/Components/ReportModal.js b/src/Components/ReportModal.js index 16f6c1ed..be2248df 100644 --- a/src/Components/ReportModal.js +++ b/src/Components/ReportModal.js @@ -22,7 +22,6 @@ 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 SignUpContainer from './SignUpContainerFunction.js' import {Store} from '../Store.js' import axios from 'axios' import {apiUrl} from '../env'; @@ -30,7 +29,6 @@ import CloseIcon from '@material-ui/icons/Close'; import ReportUserForm from './ReportUserForm.js' import ReportRecursoForm from './ReportRecursoForm.js' import ReportColecaoForm from './ReportColecaoForm.js' -import ReportCollectionForm from './ReportCollectionForm.js'; function CloseModalButton (props) { return ( @@ -80,7 +78,6 @@ export default function ReportModal (props) { return ( <ReportRecursoForm handleClose={props.handleClose} handleSubmit={handleSubmit}/> ) - break; default: return ( <ReportUserForm handleClose={props.handleClose} handleSubmit={handleSubmit}/> diff --git a/src/Components/RequirementsDialog.js b/src/Components/RequirementsDialog.js index a8f5f208..49aeb473 100644 --- a/src/Components/RequirementsDialog.js +++ b/src/Components/RequirementsDialog.js @@ -1,36 +1,12 @@ import React from 'react'; -import { makeStyles } from '@material-ui/core/styles'; import Button from '@material-ui/core/Button'; import Dialog from '@material-ui/core/Dialog'; import DialogActions from '@material-ui/core/DialogActions'; import DialogContent from '@material-ui/core/DialogContent'; import DialogContentText from '@material-ui/core/DialogContentText'; import DialogTitle from '@material-ui/core/DialogTitle'; -import FormControl from '@material-ui/core/FormControl'; -import FormControlLabel from '@material-ui/core/FormControlLabel'; -import InputLabel from '@material-ui/core/InputLabel'; -import MenuItem from '@material-ui/core/MenuItem'; -import Select from '@material-ui/core/Select'; -import Switch from '@material-ui/core/Switch'; - -const useStyles = makeStyles(theme => ({ - form: { - display: 'flex', - flexDirection: 'column', - margin: 'auto', - width: 'fit-content', - }, - formControl: { - marginTop: theme.spacing(2), - minWidth: 120, - }, - formControlLabel: { - marginTop: theme.spacing(1), - }, -})); export default function MaxWidthDialog(props) { - const classes = useStyles(); const [open, setOpen] = React.useState(false); const fullWidth = true; const maxWidth = 'sm'; diff --git a/src/Components/ResourceCard.js b/src/Components/ResourceCard.js index ea072ee2..03576afd 100644 --- a/src/Components/ResourceCard.js +++ b/src/Components/ResourceCard.js @@ -96,13 +96,13 @@ class ResourceCard extends Component { this.setState({thumbnail: `${apiDomain}` + this.props.thumbnail}); } } - {/*if (!this.state.thumbnail && !this.props.thumbnail ) { - var aux = types.find(function(element){ return element.label === type}); - this.setState({thumbnail: aux.thumb}); - } - if (!this.state.thumbnail && this.props.thumbnail ) { - this.setState({thumbnail: apiDomain + this.props.thumbnail}); - }*/} + // {/*if (!this.state.thumbnail && !this.props.thumbnail ) { + // var aux = types.find(function(element){ return element.label === type}); + // this.setState({thumbnail: aux.thumb}); + // } + // if (!this.state.thumbnail && this.props.thumbnail ) { + // this.setState({thumbnail: apiDomain + this.props.thumbnail}); + // }*/} } onHover() { this.setState({ userStyle: "animatiOn" }); diff --git a/src/Components/ResourceCardFunction.js b/src/Components/ResourceCardFunction.js index d783645d..8113aa67 100644 --- a/src/Components/ResourceCardFunction.js +++ b/src/Components/ResourceCardFunction.js @@ -22,28 +22,28 @@ import axios from 'axios' import {apiDomain, apiUrl} from '../env'; import ResourceCardOptions from './ResourceCardOptions' import noAvatar from "../img/default_profile.png"; -import { makeStyles } from '@material-ui/core/styles'; +// import { makeStyles } from '@material-ui/core/styles'; import Button from '@material-ui/core/Button'; import styled from 'styled-components' -import animacao from "../img/laranja/ANIMACAO_SIMULACAO.jpg"; -import apresentacao from "../img/laranja/APRESENTACAO.jpg"; -import aplicativo from "../img/laranja/APP.jpg"; -import audio from "../img/laranja/AUDIO.jpg"; -import vazio from "../img/laranja/EMPTY.jpg"; -import imagem from "../img/laranja/IMAGEM.jpg"; -import grafico from "../img/laranja/INFOGRAFICO.jpg"; -import jogo from "../img/laranja/JOGO.jpg"; -import livro from "../img/laranja/LIVRO_DIGITAL.jpg"; -import mapa from "../img/laranja/MAPA.jpg"; -import outros from "../img/laranja/OUTROS.jpg"; -import software from "../img/laranja/SOFTWARE.jpg"; -import texto from "../img/laranja/TEXTO.jpg"; -import video from "../img/laranja/VIDEO.jpg"; +// import animacao from "../img/laranja/ANIMACAO_SIMULACAO.jpg"; +// import apresentacao from "../img/laranja/APRESENTACAO.jpg"; +// import aplicativo from "../img/laranja/APP.jpg"; +// import audio from "../img/laranja/AUDIO.jpg"; +// import vazio from "../img/laranja/EMPTY.jpg"; +// import imagem from "../img/laranja/IMAGEM.jpg"; +// import grafico from "../img/laranja/INFOGRAFICO.jpg"; +// import jogo from "../img/laranja/JOGO.jpg"; +// import livro from "../img/laranja/LIVRO_DIGITAL.jpg"; +// import mapa from "../img/laranja/MAPA.jpg"; +// import outros from "../img/laranja/OUTROS.jpg"; +// import software from "../img/laranja/SOFTWARE.jpg"; +// import texto from "../img/laranja/TEXTO.jpg"; +// import video from "../img/laranja/VIDEO.jpg"; import Rating from '@material-ui/lab/Rating'; import StarBorderIcon from '@material-ui/icons/StarBorder'; -import AddIcon from '@material-ui/icons/CreateNewFolder'; -import Video from '@material-ui/icons/OndemandVideo'; -import MoreIcon from '@material-ui/icons/More'; +// import AddIcon from '@material-ui/icons/CreateNewFolder'; +// import Video from '@material-ui/icons/OndemandVideo'; +// import MoreIcon from '@material-ui/icons/More'; import FavoriteIcon from '@material-ui/icons/Favorite'; import ButtonGuardarColecao from './ButtonGuardarColecao.js' import Slide from '@material-ui/core/Slide'; @@ -55,17 +55,17 @@ import {getAxiosConfig} from './HelperFunctions/getAxiosConfig' import "./ResourceCard.css"; -const types = [{label: "Animação", thumb: animacao}, {label: "Apresentação", thumb: apresentacao}, -{label: "Aplicativo" , thumb: aplicativo}, {label: "Áudio", thumb: audio}, {label: "Vazio", thumb: vazio}, {label: "Imagem", thumb: imagem}, {label: "Gráfico", thumb: grafico}, {label: "Jogo", thumb: jogo}, {label: "Livro", thumb: livro}, {label:"Livro digital", thumb: livro}, {label: "Mapa", thumb: mapa}, {label: "Outros", thumb: outros}, {label: "Software Educacional", thumb:software}, {label: "Software", thumb:software}, {label: "Texto", thumb:texto}, {label: "Vídeo", thumb:video}] +// const types = [{label: "Animação", thumb: animacao}, {label: "Apresentação", thumb: apresentacao}, +// {label: "Aplicativo" , thumb: aplicativo}, {label: "Áudio", thumb: audio}, {label: "Vazio", thumb: vazio}, {label: "Imagem", thumb: imagem}, {label: "Gráfico", thumb: grafico}, {label: "Jogo", thumb: jogo}, {label: "Livro", thumb: livro}, {label:"Livro digital", thumb: livro}, {label: "Mapa", thumb: mapa}, {label: "Outros", thumb: outros}, {label: "Software Educacional", thumb:software}, {label: "Software", thumb:software}, {label: "Texto", thumb:texto}, {label: "Vídeo", thumb:video}] export default function ResourceCardFunction (props) { const [thumbnail, setThumbnail] = useState(null) + // eslint-disable-next-line const [label, setLabel] = useState(props.type) const [userAvatar, setUserAvatar] = useState(noAvatar) const [slideIn, setSlide] = useState(false) const controlSlide = () => {setSlide(!slideIn)} const [liked, toggleLiked] = useState(props.liked) - const [publisher, setPublisher] = useState(undefined) const [likesCount, setLikesCount] = useState(props.likeCount) useEffect( () => { diff --git a/src/Components/ResourceCardOptions.js b/src/Components/ResourceCardOptions.js index 53d401f0..7503fec2 100644 --- a/src/Components/ResourceCardOptions.js +++ b/src/Components/ResourceCardOptions.js @@ -26,9 +26,6 @@ import MenuItem from '@material-ui/core/MenuItem'; import MoreVertIcon from '@material-ui/icons/MoreVert'; import OpenIcon from '@material-ui/icons/OpenInNew'; import ReportIcon from '@material-ui/icons/Error'; -import axios from 'axios' -import {apiUrl} from '../env'; -import {getAxiosConfig} from './HelperFunctions/getAxiosConfig' import ReportModal from './ReportModal.js' import {Link} from 'react-router-dom' import DownloadIcon from '@material-ui/icons/CloudDownload'; @@ -53,12 +50,12 @@ export default function ResourceCardOptions (props) { const [reportModal, toggleReportModal] = useState(false) const handleModalReportar = (value) => { toggleReportModal(value) - {/*if (state.currentUser.id) { - toggleReportModal(!reportModal) - } - else { - toggleLoginModal(true) - }*/} + // {/*if (state.currentUser.id) { + // toggleReportModal(!reportModal) + // } + // else { + // toggleLoginModal(true) + // }*/} } const [saveToCol, toggleSave] = useState(false) diff --git a/src/Components/ResourceList.js b/src/Components/ResourceList.js index 0121232b..77c3ce1d 100644 --- a/src/Components/ResourceList.js +++ b/src/Components/ResourceList.js @@ -26,7 +26,6 @@ import CheckBoxIcon from '@material-ui/icons/CheckBox'; import GetAppIcon from '@material-ui/icons/GetApp'; import ResourceCardFunction from './ResourceCardFunction.js'; import FloatingDownloadButton from './FloatingDownloadButton.js'; -import CircularProgress from '@material-ui/core/CircularProgress'; import Snackbar from '@material-ui/core/Snackbar'; import MuiAlert from '@material-ui/lab/Alert'; import { apiUrl } from '../env.js'; @@ -59,7 +58,7 @@ export default function ResourceList(props) { } const handleDownloadSelection = () => { - const selected_resources = props.resources.filter(resource => selected[props.resources.indexOf(resource)]); + // const selected_resources = props.resources.filter(resource => selected[props.resources.indexOf(resource)]); setSnackbarOpen(true); } @@ -93,7 +92,7 @@ export default function ResourceList(props) { <Grid item> <Title> {props.resources.length ? - props.resources.length+" recurso"+(props.resources.length == 1 ? "" : "s") + props.resources.length+" recurso"+(props.resources.length === 1 ? "" : "s") : "Carregando coleção"} </Title> </Grid> @@ -159,7 +158,7 @@ export default function ResourceList(props) { Os recursos serão baixados </Alert> </Snackbar> - <FloatingDownloadButton url={download_url} empty={selected.indexOf(true) == -1}/> + <FloatingDownloadButton url={download_url} empty={selected.indexOf(true) === -1}/> </ResourceListContainer> ); } diff --git a/src/Components/ResourcePageComponents/CommentForm.js b/src/Components/ResourcePageComponents/CommentForm.js index 0b13b147..1859e116 100644 --- a/src/Components/ResourcePageComponents/CommentForm.js +++ b/src/Components/ResourcePageComponents/CommentForm.js @@ -1,7 +1,6 @@ import React, {useState} from 'react' import styled from 'styled-components' import Rating from '@material-ui/lab/Rating'; -import StarBorderIcon from '@material-ui/icons/StarBorder'; import StarIcon from '@material-ui/icons/Star'; import TextField from "@material-ui/core/TextField"; import { Button } from '@material-ui/core'; diff --git a/src/Components/ResourcePageComponents/CommentsArea.js b/src/Components/ResourcePageComponents/CommentsArea.js index b77465f7..fdabf836 100644 --- a/src/Components/ResourcePageComponents/CommentsArea.js +++ b/src/Components/ResourcePageComponents/CommentsArea.js @@ -86,7 +86,7 @@ export default function CommentsArea (props) { comentarios.length !== 0 ? ( <ComentariosBox> - <h3>{comentarios.length} {comentarios.length != 1 ? 'Relatos' : 'Relato'} sobre o uso do Recurso</h3> + <h3>{comentarios.length} {comentarios.length !== 1 ? 'Relatos' : 'Relato'} sobre o uso do Recurso</h3> { comentarios.map( comentario => <div className="comentario-template" key={comentario.id}> @@ -114,7 +114,7 @@ export default function CommentsArea (props) { ( <Grid item xs={12}> <LogInToComment> - <img src={Comentarios} /> + <img alt="" src={Comentarios} /> <span className="span-laranja">Compartilhe sua experiência com a Rede!</span> <AoRelatar> Ao relatar sua experiência de uso do Recurso você estará auxiliando professores de todo país. diff --git a/src/Components/ResourcePageComponents/Footer.js b/src/Components/ResourcePageComponents/Footer.js index ea2253c4..a0fcbcda 100644 --- a/src/Components/ResourcePageComponents/Footer.js +++ b/src/Components/ResourcePageComponents/Footer.js @@ -26,9 +26,7 @@ import ShareIcon from '@material-ui/icons/Share'; import FolderIcon from '@material-ui/icons/Folder'; import GetAppIcon from '@material-ui/icons/GetApp'; import CallMadeIcon from '@material-ui/icons/CallMade'; -import {Link} from 'react-router-dom' import ReportModal from '../ReportModal.js' -import ReportRecursoForm from '../ReportRecursoForm.js' import ShareModal from '../ShareModal.js' import GuardarModal from '../GuardarModal.js' import RedirectModal from '../RedirectModal' diff --git a/src/Components/ResourcePageComponents/Sobre.js b/src/Components/ResourcePageComponents/Sobre.js index 1b4bfa62..0ff18fa7 100644 --- a/src/Components/ResourcePageComponents/Sobre.js +++ b/src/Components/ResourcePageComponents/Sobre.js @@ -22,7 +22,6 @@ import styled from 'styled-components' import Grid from '@material-ui/core/Grid'; import {Link} from 'react-router-dom' import {NoIcon} from '../ContactButtons/FollowButton.js' -import MoreVertIcon from '@material-ui/icons/MoreVert'; import Collapse from '@material-ui/core/Collapse'; import SdCardIcon from '@material-ui/icons/SdCard'; import TranslateIcon from '@material-ui/icons/Translate'; @@ -198,7 +197,7 @@ export default function Sobre (props) { <div style={{paddingTop : "0.75em", display : "flex", justifyContent : "center"}}> { - (props.id != state.currentUser.id) && + (props.id !== state.currentUser.id) && <> <NoIcon followableID={props.id}/> <ContactCardOptions followableID={props.id}/> diff --git a/src/Components/ResourcePageComponents/TextoObjeto.js b/src/Components/ResourcePageComponents/TextoObjeto.js index 5c7c400f..5b5bc3cd 100644 --- a/src/Components/ResourcePageComponents/TextoObjeto.js +++ b/src/Components/ResourcePageComponents/TextoObjeto.js @@ -31,7 +31,7 @@ import Alert from '../Alert.js'; import Snackbar from '@material-ui/core/Snackbar'; import {getAxiosConfig} from '../HelperFunctions/getAxiosConfig' import axios from 'axios' -import {apiUrl, apiDomain} from '../../env'; +import {apiUrl} from '../../env'; export default function TextoObjeto (props) { const {state} = useContext(Store) @@ -52,6 +52,7 @@ export default function TextoObjeto (props) { else { outrasTem.push(subject.name) } + return undefined }) setOutrasTem(outrasTem.join(' - ')) setCompCurr(compCurr.join(' - ')) @@ -98,7 +99,7 @@ export default function TextoObjeto (props) { } const checkAccessLevel = (levelToCheck) => { - if (state.currentUser.id != '') { + if (state.currentUser.id !== '') { return(checkUserRole(levelToCheck)) } else { diff --git a/src/Components/SearchExpansionPanel/SearchEPCompCurriculum.js b/src/Components/SearchExpansionPanel/SearchEPCompCurriculum.js index fef89eec..180eaeef 100644 --- a/src/Components/SearchExpansionPanel/SearchEPCompCurriculum.js +++ b/src/Components/SearchExpansionPanel/SearchEPCompCurriculum.js @@ -35,7 +35,7 @@ export default function SearchEPCompCurriculum(props) { setChecked(newChecked); for(let i = 0; i < newChecked.length; i++){ - if(newChecked[i] != 0){ + if(newChecked[i] !== 0){ filterString = filterString + `&subjects[]=${newChecked[i]}` console.log(filterString) } diff --git a/src/Components/SearchExpansionPanel/SearchEPIdiomas.js b/src/Components/SearchExpansionPanel/SearchEPIdiomas.js index 73d04d57..e9bcacf3 100644 --- a/src/Components/SearchExpansionPanel/SearchEPIdiomas.js +++ b/src/Components/SearchExpansionPanel/SearchEPIdiomas.js @@ -35,7 +35,7 @@ export default function SearchEPIdiomas(props) { let filterString = ""; for(let i = 0; i < newChecked.length; i++){ - if(newChecked[i] != 0){ + if(newChecked[i] !== 0){ filterString = filterString + `&languages[]=${newChecked[i]}` console.log(filterString) } diff --git a/src/Components/SearchExpansionPanel/SearchEPTiposRec.js b/src/Components/SearchExpansionPanel/SearchEPTiposRec.js index e1a3f999..8dc4fcf6 100644 --- a/src/Components/SearchExpansionPanel/SearchEPTiposRec.js +++ b/src/Components/SearchExpansionPanel/SearchEPTiposRec.js @@ -35,7 +35,7 @@ export default function SearchEPTiposRec(props) { setChecked(newChecked); for(let i = 0; i < newChecked.length; i++){ - if(newChecked[i] != 0){ + if(newChecked[i] !== 0){ filterString = filterString + `&object_types[]=${newChecked[i]}` console.log(filterString) } diff --git a/src/Components/SearchExpansionPanel/SesrchEPEtapasEns.js b/src/Components/SearchExpansionPanel/SesrchEPEtapasEns.js index 6588853d..b08fdb68 100644 --- a/src/Components/SearchExpansionPanel/SesrchEPEtapasEns.js +++ b/src/Components/SearchExpansionPanel/SesrchEPEtapasEns.js @@ -35,7 +35,7 @@ export default function SearchEPEtapasEns(props) { let filterString = ""; for(let i = 0; i < newChecked.length; i++){ - if(newChecked[i] != 0){ + if(newChecked[i] !== 0){ filterString = filterString + `&educational_stages[]=${newChecked[i]}` } } diff --git a/src/Components/ShareModal.js b/src/Components/ShareModal.js index fd9e6441..4089314b 100644 --- a/src/Components/ShareModal.js +++ b/src/Components/ShareModal.js @@ -22,9 +22,6 @@ 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 SignUpContainer from './SignUpContainerFunction.js' -import {Store} from '../Store.js' -import axios from 'axios' import {apiDomain} from '../env'; import Grid from '@material-ui/core/Grid'; import Facebook from '../img/facebook.svg' @@ -78,6 +75,7 @@ export default function ReportModal (props) { <Grid item xs={4}> <a href={"https://www.facebook.com/sharer/sharer.php?u=" + props.link} + rel="noreferrer" target="_blank"> <ShareButton> <img src={Facebook} alt="facebook-logo"/> @@ -90,6 +88,7 @@ export default function ReportModal (props) { <Grid item xs={4}> <a href={"https://www.twitter.com/intent/tweet?url=" + props.link} + rel="noreferrer" target="_blank"> <ShareButton> <img src={Twitter} alt="twitter-logo"/> @@ -208,16 +207,6 @@ const Header = styled.div` } ` -const StyledCloseModalButton = styled(Button)` - display : inline-block; - position : relative; - float : right !important; - margin-right : -8px !important; - background : transparent !important; - min-width: 0 !important; - width : 40px; -` - const StyledModal = styled(Modal)` .djXaxP{ margin : 0 !important; diff --git a/src/Components/TabPanels/PanelComponents/NoContent.js b/src/Components/TabPanels/PanelComponents/NoContent.js index 60c8d76d..ef129ece 100644 --- a/src/Components/TabPanels/PanelComponents/NoContent.js +++ b/src/Components/TabPanels/PanelComponents/NoContent.js @@ -51,8 +51,8 @@ export const DivTextoNoPublications = styled.div` padding-right : 15px; ` -{/*const DivConteudoNaoPublicado = styled.div` - position : relative; - top : 50%; - transform : translateY(-50%); -`*/} +// {/*const DivConteudoNaoPublicado = styled.div` +// position : relative; +// top : 50%; +// transform : translateY(-50%); +// `*/} diff --git a/src/Components/TabPanels/PublicUserPageTabs/LastLearnObj.js b/src/Components/TabPanels/PublicUserPageTabs/LastLearnObj.js index d1c3b131..044ebc5b 100644 --- a/src/Components/TabPanels/PublicUserPageTabs/LastLearnObj.js +++ b/src/Components/TabPanels/PublicUserPageTabs/LastLearnObj.js @@ -22,7 +22,7 @@ export default function LastLearnObjs (props) { </HeaderGrid> { - props.count == 0 ? + props.count === 0 ? ( [ <Grid container> diff --git a/src/Components/TabPanels/PublicUserPageTabs/TabColecoes.js b/src/Components/TabPanels/PublicUserPageTabs/TabColecoes.js index d7d1ddac..3622356c 100644 --- a/src/Components/TabPanels/PublicUserPageTabs/TabColecoes.js +++ b/src/Components/TabPanels/PublicUserPageTabs/TabColecoes.js @@ -1,5 +1,4 @@ import React, {useState, useEffect} from 'react' -import styled from 'styled-components' import {HeaderGrid, ContainerStyled, Carregados} from '../StyledComponents.js' import Grid from '@material-ui/core/Grid'; import CollectionCardFunction from '../../CollectionCardFunction.js' diff --git a/src/Components/TabPanels/PublicUserPageTabs/TabInicio.js b/src/Components/TabPanels/PublicUserPageTabs/TabInicio.js index f0febf17..9e3cd80b 100644 --- a/src/Components/TabPanels/PublicUserPageTabs/TabInicio.js +++ b/src/Components/TabPanels/PublicUserPageTabs/TabInicio.js @@ -32,7 +32,7 @@ export function NoContent (props) { return ( <NoContentContainer> <div style={{paddingTop : "1em"}}> - <img src={props.image} style={{width : "130px", verticalAlign : "middle", border : "0"}}/> + <img alt="" src={props.image} style={{width : "130px", verticalAlign : "middle", border : "0"}}/> <h3> {props.text1} </h3> @@ -54,7 +54,7 @@ export default function TabInicio (props) { <UserDescription text={props.user.description}/> } { - props.user.learning_objects_count == 0 && props.user.collections_count == 0 ? + props.user.learning_objects_count === 0 && props.user.collections_count === 0 ? ( [ <ContainerStyled> diff --git a/src/Components/TabPanels/PublicUserPageTabs/TabRecursos.js b/src/Components/TabPanels/PublicUserPageTabs/TabRecursos.js index ce445d9a..6f2a08ba 100644 --- a/src/Components/TabPanels/PublicUserPageTabs/TabRecursos.js +++ b/src/Components/TabPanels/PublicUserPageTabs/TabRecursos.js @@ -1,5 +1,4 @@ import React, {useState, useEffect} from 'react' -import styled from 'styled-components' import {HeaderGrid, ContainerStyled, Carregados} from '../StyledComponents.js' import Grid from '@material-ui/core/Grid'; import ResourceCardFunction from '../../ResourceCardFunction.js' diff --git a/src/Components/TabPanels/PublicUserPageTabs/TabRede.js b/src/Components/TabPanels/PublicUserPageTabs/TabRede.js index ac1d3a06..b3dea17e 100644 --- a/src/Components/TabPanels/PublicUserPageTabs/TabRede.js +++ b/src/Components/TabPanels/PublicUserPageTabs/TabRede.js @@ -1,6 +1,6 @@ import React, {useState, useEffect} from 'react' import axios from 'axios' -import {apiUrl, apiDomain} from '../../../env'; +import {apiUrl} from '../../../env'; import PanelTemplateRede from '../PanelComponents/TemplateRede.js' const getConfig = () => { diff --git a/src/Components/TabPanels/TabPanelStatusEConquistas.js b/src/Components/TabPanels/TabPanelStatusEConquistas.js index 00a3a1f2..2617f8a7 100644 --- a/src/Components/TabPanels/TabPanelStatusEConquistas.js +++ b/src/Components/TabPanels/TabPanelStatusEConquistas.js @@ -1,12 +1,8 @@ import React, {useContext, useState, useEffect} from 'react' import { Store } from '../../Store.js' import styled from 'styled-components' -import { Container } from 'react-grid-system' import Paper from '@material-ui/core/Paper'; -import Button from '@material-ui/core/Button'; import {ContainerDivStyled} from './StyledComponents.js' -import LoadingSpinner from '../LoadingSpinner.js' -import PaginaVaziaColecao from '../../img/Pagina_vazia_colecao.png' import axios from 'axios' import {apiUrl} from '../../env'; import LevelDescriptionCard from '../LevelDescriptionCard.js' @@ -14,11 +10,17 @@ import AchievementDescriptionCard from '../AchievementDescriptionCard.js' import { Grid } from '@material-ui/core' export default function TabPanelStatusEConquistas (props) { + // eslint-disable-next-line const [achievements, setAchievements] = useState([]); + // eslint-disable-next-line const [level, setLevel] = useState(0); + // eslint-disable-next-line const [xp, setXP] = useState(0); + // eslint-disable-next-line const [coins, setCoins] = useState(0); + // eslint-disable-next-line const [barSize, setBarSize] = useState(0); + // eslint-disable-next-line const [xpToNextLevel, setXpToNextLevel] = useState(0); const { state } = useContext(Store) diff --git a/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js b/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js index 4f6030b4..9e0560fd 100644 --- a/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js +++ b/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js @@ -30,6 +30,7 @@ import {apiDomain} from '../../../env.js' export default function TabPanelEditarPerfil (props) { + // eslint-disable-next-line const {state, dispatch} = useContext(Store) const [hoverAlterarFoto, handleAlterarFoto] = React.useState(false) diff --git a/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js b/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js index 83f116f0..769977a5 100644 --- a/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js +++ b/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js @@ -26,6 +26,7 @@ import Button from '@material-ui/core/Button'; //Professor em análise (submitter_request = requested) //Professor aceito (submitter_request = accepted) export default function TabPanelSolicitarContaProfessor (props) { + // eslint-disable-next-line const {state, dispatch} = useContext(Store) return ( diff --git a/src/Components/TermsPageContent.js b/src/Components/TermsPageContent.js index 25b597cd..918e040b 100644 --- a/src/Components/TermsPageContent.js +++ b/src/Components/TermsPageContent.js @@ -1,16 +1,6 @@ import React from 'react'; import Typography from '@material-ui/core/Typography'; import CardContent from '@material-ui/core/CardContent'; -import styled from 'styled-components' - -const h3Styled = styled.h3` - font-size: 24px; - align-self: center; -` - -const h4Styled = styled.h4` - font-size: 24px; -` export default function TermsPageContent () { return ( diff --git a/src/Components/UploadPageComponents/Forms/Autor.js b/src/Components/UploadPageComponents/Forms/Autor.js index 9b8c77e0..30a3535b 100644 --- a/src/Components/UploadPageComponents/Forms/Autor.js +++ b/src/Components/UploadPageComponents/Forms/Autor.js @@ -21,8 +21,7 @@ import {Store} from '../../../Store.js' import { withStyles } from '@material-ui/core/styles'; import FormControl from '@material-ui/core/FormControl'; -import {StyledTextField, StyledFormLabel, OutroAutorTextField} from '../StyledComponents.js' -import FormHelperText from '@material-ui/core/FormHelperText'; +import { StyledFormLabel, OutroAutorTextField} from '../StyledComponents.js' import RadioGroup from '@material-ui/core/RadioGroup'; import Radio from '@material-ui/core/Radio'; import FormControlLabel from '@material-ui/core/FormControlLabel'; diff --git a/src/Components/UploadPageComponents/GetIconByName.js b/src/Components/UploadPageComponents/GetIconByName.js index 2d4bb7c6..b5f8e840 100644 --- a/src/Components/UploadPageComponents/GetIconByName.js +++ b/src/Components/UploadPageComponents/GetIconByName.js @@ -45,79 +45,54 @@ export function GetSubjectIconByName (subjName) { switch (subjName) { case "Arte": return <Arte className="icon"/> - break; case "Biologia": return <Biologia className="icon"/> - break; case "Ciências da Natureza": return <CienciasNatureza className="icon"/> - break; case "Direitos Humanos": return <DireitosHumanos className="icon"/> - break; case "Educação Ambiental": return <EducacaoAmbiental className="icon"/>; - break; case "Educação do Campo": return <EducacaoCampo className="icon"/>; - break; case "Educação Especial": return <EducacaoEspecial className="icon"/>; - break; case "Educação Física": return <EducacaoFisica className="icon"/>; - break; case "Educação Indígena": return <EducacaoIndigena className="icon"/>; - break; case "Educação Quilombola": return <EducacaoQuilombola className="icon"/>; - break; case "Educação Sexual": return <EducacaoSexual className="icon"/>; - break; case "Ensino Religioso": return <EnsinoReligioso className="icon"/>; - break; case "Filosofia": return <Filosofia className="icon"/>;; - break; case "Física": return <Fisica className="icon"/>; - break; case "Geografia": return <Geografia className="icon"/>; - break; case "História": return <Historia className="icon"/>; - break; case "Informática": return <Informatica className="icon"/>; - break; case "Língua Espanhola": return <LinguaEspanhola className="icon"/>; - break; case "Língua Inglesa": return <LinguaInglesa className="icon"/>; - break; case "Língua Portuguesa": return <LinguaPortuguesa className="icon"/>; - break; case "Matemática": return <Matematica className="icon"/>; - break; case "Outras Línguas": return <OutrasLinguas className="icon"/>; - break; case "Química": return <Quimica className="icon"/>; - break; case "Sociologia": return <Sociologia className="icon"/>; - break; default: return <Outros className="icon"/>; - break; } } @@ -125,43 +100,30 @@ export default function GetIconByName (objName) { switch (objName.toLowerCase()) { case "imagem": return <ImagemIcon className="icon" />; - break; case "mapa": return <MapaIcon className="icon"/>; - break; case "software educacional" : return <SoftwareEducacionalIcon className="icon"/>; - break; case "aplicativo móvel": return <AplicativoMovelIcon className="icon"/>; - break; case "apresentação": return <ApresentacaoIcon className="icon"/>; - break; case "áudio": return <AudioIcon className="icon"/>; - break; case "infográfico": return <InfograficoIcon className="icon"/>; - break; case "jogo": return <JogoIcon className="icon"/>; - break; case "livro digital" : return <LivroDigitalIcon className="icon"/>; - break; case "texto": return <TextoIcon className="icon"/>; - break; case "vídeo": return <VideoIcon className="icon"/>; - break; case "animação": return <AnimacaoIcon className="icon"/>; - break; default: return <OutrosIcon className="icon"/>; - break; } } diff --git a/src/Components/UploadPageComponents/PartThree.js b/src/Components/UploadPageComponents/PartThree.js index cce31c71..3a2608c7 100644 --- a/src/Components/UploadPageComponents/PartThree.js +++ b/src/Components/UploadPageComponents/PartThree.js @@ -39,7 +39,6 @@ import {getDefaultThumbnail} from '../HelperFunctions/getDefaultThumbnail' export default function PartThree (props) { var moment = require('moment') - const now = moment() const {state} = useContext(Store) const [loading, setLoading] = useState(true) @@ -74,7 +73,7 @@ export default function PartThree (props) { const [modalCancelar, toggleModalCancelar] = useState(false) const checkAccessLevel = (levelToCheck) => { - if (state.currentUser.id != '') { + if (state.currentUser.id !== '') { return(checkUserRole(levelToCheck)) } } @@ -109,7 +108,7 @@ export default function PartThree (props) { <CaixaContainer> <div> <div className="cabecalho-objeto"> - <img className="img-objeto" + <img alt="" className="img-objeto" src={draft.thumbnail === null ? getDefaultThumbnail(draft.object_type) : apiDomain + draft.thumbnail}/> <div className="texto-objeto"> <h3>{draft.name}</h3> diff --git a/src/Components/UploadPageComponents/PartTwoComponents/DisplayThumbnail.js b/src/Components/UploadPageComponents/PartTwoComponents/DisplayThumbnail.js index cc123a4c..261df04c 100644 --- a/src/Components/UploadPageComponents/PartTwoComponents/DisplayThumbnail.js +++ b/src/Components/UploadPageComponents/PartTwoComponents/DisplayThumbnail.js @@ -32,7 +32,7 @@ export default function DisplayThumbnail (props) { <ImagemCarregada container> <Grid item xs={windowWidth > 990 ? 6 : 12}> <div className="img-preview"> - <img src={props.thumbnail}/> + <img alt="" src={props.thumbnail}/> <div className="alterar-imagem"> <input type="file" onChange = {(e) => handleUpload(e, e.target.files)} id="upload-file-thumbnail" style={{display : "none"}} /> diff --git a/src/Components/UploadPageComponents/Stepper.js b/src/Components/UploadPageComponents/Stepper.js index f6780984..2c0a1179 100644 --- a/src/Components/UploadPageComponents/Stepper.js +++ b/src/Components/UploadPageComponents/Stepper.js @@ -1,18 +1,12 @@ import React from 'react'; import styled from 'styled-components' import PropTypes from 'prop-types'; -import { makeStyles, withStyles } from '@material-ui/core/styles'; +import { makeStyles } from '@material-ui/core/styles'; import clsx from 'clsx'; import Stepper from '@material-ui/core/Stepper'; import Step from '@material-ui/core/Step'; import StepLabel from '@material-ui/core/StepLabel'; import Check from '@material-ui/icons/Check'; -import SettingsIcon from '@material-ui/icons/Settings'; -import GroupAddIcon from '@material-ui/icons/GroupAdd'; -import VideoLabelIcon from '@material-ui/icons/VideoLabel'; -import StepConnector from '@material-ui/core/StepConnector'; -import Button from '@material-ui/core/Button'; -import Typography from '@material-ui/core/Typography'; const useColorlibStepIconStyles = makeStyles({ root: { @@ -73,51 +67,51 @@ ColorlibStepIcon.propTypes = { icon: PropTypes.node, }; -const useStyles = makeStyles((theme) => ({ - root: { - width: '100%', - }, - button: { - marginRight: theme.spacing(1), - }, - instructions: { - marginTop: theme.spacing(1), - marginBottom: theme.spacing(1), - }, -})); +// const useStyles = makeStyles((theme) => ({ +// root: { +// width: '100%', +// }, +// button: { +// marginRight: theme.spacing(1), +// }, +// instructions: { +// marginTop: theme.spacing(1), +// marginBottom: theme.spacing(1), +// }, +// })); function getSteps() { return ['Select campaign settings', 'Create an ad group', 'Create an ad']; } -function getStepContent(step) { - switch (step) { - case 0: - return 'Select campaign settings...'; - case 1: - return 'What is an ad group anyways?'; - case 2: - return 'This is the bit I really care about!'; - default: - return 'Unknown step'; - } -} +// function getStepContent(step) { +// switch (step) { +// case 0: +// return 'Select campaign settings...'; +// case 1: +// return 'What is an ad group anyways?'; +// case 2: +// return 'This is the bit I really care about!'; +// default: +// return 'Unknown step'; +// } +// } export default function CustomizedSteppers(props) { - const classes = useStyles(); + // const classes = useStyles(); const steps = getSteps(); -{/* const handleNext = () => { - setActiveStep((prevActiveStep) => prevActiveStep + 1); - }; +// {/* const handleNext = () => { +// setActiveStep((prevActiveStep) => prevActiveStep + 1); +// }; - const handleBack = () => { - setActiveStep((prevActiveStep) => prevActiveStep - 1); - }; +// const handleBack = () => { +// setActiveStep((prevActiveStep) => prevActiveStep - 1); +// }; - const handleReset = () => { - setActiveStep(0); - };*/} +// const handleReset = () => { +// setActiveStep(0); +// };*/} return ( diff --git a/src/Components/UploadPageComponents/StyledComponents.js b/src/Components/UploadPageComponents/StyledComponents.js index 2bac9300..944e96cf 100644 --- a/src/Components/UploadPageComponents/StyledComponents.js +++ b/src/Components/UploadPageComponents/StyledComponents.js @@ -22,7 +22,6 @@ import { Button } from '@material-ui/core'; import TextField from '@material-ui/core/TextField'; import FormHelperText from '@material-ui/core/FormHelperText'; import FormLabel from '@material-ui/core/FormLabel'; -import NativeSelect from '@material-ui/core/NativeSelect'; import { makeStyles } from '@material-ui/core/styles'; import Radio from '@material-ui/core/Radio'; import GetIconByName from './GetIconByName.js' @@ -395,12 +394,6 @@ export const StyledTextField = styled(TextField)` } ` - - const StyledNativeSelect = styled(NativeSelect)` - .MuiInput-underline::after { - border-bottom: 1px solid #00bcd4 !important; - } - ` const useStyles = makeStyles({ root: { '&:hover': { diff --git a/src/Pages/CollectionPage.js b/src/Pages/CollectionPage.js index 37cd3daf..123f6c6a 100644 --- a/src/Pages/CollectionPage.js +++ b/src/Pages/CollectionPage.js @@ -24,8 +24,6 @@ import CollectionDescription from '../Components/CollectionDescription.js'; import ResourceList from '../Components/ResourceList.js'; import CollectionCommentSection from '../Components/CollectionCommentSection.js'; import { apiUrl, apiDomain } from '../env'; -import CircularProgress from '@material-ui/core/CircularProgress'; -import GetAppIcon from '@material-ui/icons/GetApp'; import styled from 'styled-components'; import DowloadButton from '../Components/CollectionDowloadButton.js'; import Breadcrumbs from "@material-ui/core/Breadcrumbs"; @@ -189,10 +187,6 @@ export default function CollectionPage(props) { ); } -const mainContainerStyle = { - marginTop: '5%', -} - const StyledBreadCrumbs = styled(Breadcrumbs)` display: flex; justify-content: flex-start; @@ -211,8 +205,4 @@ const BreadCrumbsDiv = styled.div` display: flex; `; -const TopInfos = styled(Grid)` - marginTop: 0; - marginLeft: 20; -` diff --git a/src/Pages/PageProfessor.js b/src/Pages/PageProfessor.js index 8a2783de..6c2f4538 100644 --- a/src/Pages/PageProfessor.js +++ b/src/Pages/PageProfessor.js @@ -1,6 +1,5 @@ import React, {useState,useContext} from 'react' import {Store} from '../Store.js' -import styled from 'styled-components' import Paper from '@material-ui/core/Paper'; import PartOne from '../Components/PageProfessorComponents/PartOne.js' import PartTwo from '../Components/PageProfessorComponents/PartTwo.js' diff --git a/src/Pages/PasswordRecoveryPage.js b/src/Pages/PasswordRecoveryPage.js index 82038103..8e7808fc 100644 --- a/src/Pages/PasswordRecoveryPage.js +++ b/src/Pages/PasswordRecoveryPage.js @@ -1,22 +1,17 @@ import React, {useState, useContext} from 'react' import {BackgroundDiv} from '../Components/TabPanels/StyledComponents.js' -import {Link} from 'react-router-dom' import Paper from '@material-ui/core/Paper'; import styled from 'styled-components' -import FormInput from "../Components/FormInput.js" import ValidateUserInput from '../Components/FormValidationFunction.js' -import {CompletarCadastroButton} from '../Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js' import Default from '../Components/PasswordRecoveryComponents/Default.js' import Success from '../Components/PasswordRecoveryComponents/Success.js' import CaseError from '../Components/PasswordRecoveryComponents/Error.js' -import {Store} from '../Store.js' import CustomizedBreadcrumbs from '../Components/TabPanels/Breadcrumbs.js' import {apiUrl, apiDomain} from '../env'; import axios from 'axios' export default function PasswordRecoveryPage (props) { - const {state, dispatch} = useContext(Store) const [formEmail, setEmail] = useState( { @@ -70,13 +65,10 @@ export default function PasswordRecoveryPage (props) { switch(value) { case 'success': return components.success; - break; case 'error': return components.error; - break; default: return components.default - break; } } diff --git a/src/Pages/PublicUserPage.js b/src/Pages/PublicUserPage.js index 2c38097a..6ff59cb4 100644 --- a/src/Pages/PublicUserPage.js +++ b/src/Pages/PublicUserPage.js @@ -21,15 +21,12 @@ import styled from 'styled-components' import axios from 'axios' import {apiUrl, apiDomain} from '../env'; import CustomizedBreadcrumbs from '../Components/TabPanels/Breadcrumbs.js' -import {Link} from 'react-router-dom'; import Grid from '@material-ui/core/Grid'; import FollowButton from '../Components/ContactButtons/FollowButton.js' import FollowingButton from '../Components/ContactButtons/FollowingButton.js' import FollowersCountButton from '../Components/ContactButtons/FollowersCountButton.js' import noAvatar from "../img/default_profile.png"; -import Button from '@material-ui/core/Button'; import Tab from '@material-ui/core/Tab'; -import Tabs from '@material-ui/core/Tabs'; import TabInicio from '../Components/TabPanels/PublicUserPageTabs/TabInicio.js' import TabRecursos from '../Components/TabPanels/PublicUserPageTabs/TabRecursos.js' import TabColecoes from '../Components/TabPanels/PublicUserPageTabs/TabColecoes.js' @@ -88,7 +85,7 @@ const RenderCheckTeacher = (submitter_request) => { <CheckTeacherDiv> <p> <span> - <img src={CheckDecagram}/> + <img alt="" src={CheckDecagram}/> </span> Professor(a) </p> @@ -107,6 +104,7 @@ export default function PublicUserPage (props) { /*---------------------------------------------------------*/ /*content control variables--------------------------------*/ + // eslint-disable-next-line const [tabs, setTabs] = useState([ 'Início', 'Recursos', 'Coleções', 'Rede' ]) @@ -194,7 +192,7 @@ export default function PublicUserPage (props) { { tabs.map( (tab) => <Tab label={tab} key={tab} - disabled={tab === "Recursos" && learningObjArr.length === 0 || tab === "Coleções" && collectionsArr.length === 0} + disabled={(tab === "Recursos" && learningObjArr.length === 0) || (tab === "Coleções" && collectionsArr.length === 0)} /> ) } diff --git a/src/Pages/ResourcePage.js b/src/Pages/ResourcePage.js index 9ed188d5..546cffcd 100644 --- a/src/Pages/ResourcePage.js +++ b/src/Pages/ResourcePage.js @@ -70,7 +70,7 @@ export default function LearningObjectPage (props){ setRecurso(response.data) toggle(false) }, (error) => {console.log(error);}) - }, [, state.currentUser]) + }, [state.currentUser]) const [snackbarOpen, toggleSnackbar] = useState(false) @@ -88,7 +88,7 @@ export default function LearningObjectPage (props){ const handleModalCuradoria = (value) => {toggleModalCuradoria(value)} const checkAccessLevel = (levelToCheck) => { - if (state.currentUser.id != '') { + if (state.currentUser.id !== '') { return(checkUserRole(levelToCheck)) } else { @@ -185,7 +185,7 @@ export default function LearningObjectPage (props){ <Card> <div> {recurso.thumbnail && - <img src={apiDomain + recurso.thumbnail}/> + <img alt="" src={apiDomain + recurso.thumbnail}/> } @@ -218,7 +218,6 @@ export default function LearningObjectPage (props){ title={recurso.name} thumb={recurso.thumbnail} currPageLink={window.location.href} - handleSnackbar={handleSnackbar} complained={recurso.complained} /> </Card> diff --git a/src/Pages/Search.js b/src/Pages/Search.js index 1ee9749f..d7c3fcd2 100644 --- a/src/Pages/Search.js +++ b/src/Pages/Search.js @@ -26,7 +26,7 @@ import LoadingSpinner from '../Components/LoadingSpinner'; // import ResourceCard from '../Components/ResourceCard' // import CollectionCard from '../Components/CollectionCard' // import UserCard from '../Components/UserCard' -import Select from "react-dropdown-select"; +// import Select from "react-dropdown-select"; import Breadcrumbs from "@material-ui/core/Breadcrumbs"; import { apiUrl } from "../env"; import "./Styles/Home.css"; diff --git a/src/Pages/UserTerms.js b/src/Pages/UserTerms.js index ad0dead2..fed310ad 100644 --- a/src/Pages/UserTerms.js +++ b/src/Pages/UserTerms.js @@ -42,27 +42,6 @@ const BannerStyle=styled.div` verticalAlign: "middle" ` -const center={ - width: "100%", - textAlign: "center" -} - -const container={ - paddingInline: "15px", - paddingBlock: "20px", - marginInline: "auto", - textAlign:"center", - width:"750px" - -} - -const secao2={ - height: "100%", - alignItems: "center", - paddingBlock: "30px" -} - - const AColorido = styled.a` color: #00BCD4; @@ -269,7 +248,7 @@ class UserTerms extends Component { <Grid item xs={12} md={10}> <Secao4> <div class="texto" style={{paddingTop:"70px"}}> - <p>O <a href="http://www.planalto.gov.br/ccivil_03/_ato2011-2014/2014/lei/l13005.htm" target="_blank">Plano Nacional de Educação</a> (2014-2024) enfatiza nas metas 5 e 7 a importância dos recursos educacionais abertos para fomentar a qualidade da educação básica. A <a href="http://portal.mec.gov.br/index.php?option=com_docman&view=download&alias=35541-res-cne-ces-001-14032016-pdf&category_slug=marco-2016-pdf&Itemid=30192" target="_blank">Resolução CNE/CES nº 1</a>, de 11 de março de 2016, também destaca a importância dos recursos educacionais abertos para as instituições de educação superior e para as atividades de educação a distância.</p> + <p>O <a href="http://www.planalto.gov.br/ccivil_03/_ato2011-2014/2014/lei/l13005.htm" rel="noreferrer" target="_blank">Plano Nacional de Educação</a> (2014-2024) enfatiza nas metas 5 e 7 a importância dos recursos educacionais abertos para fomentar a qualidade da educação básica. A <a href="http://portal.mec.gov.br/index.php?option=com_docman&view=download&alias=35541-res-cne-ces-001-14032016-pdf&category_slug=marco-2016-pdf&Itemid=30192" rel="noreferrer" target="_blank">Resolução CNE/CES nº 1</a>, de 11 de março de 2016, também destaca a importância dos recursos educacionais abertos para as instituições de educação superior e para as atividades de educação a distância.</p> </div> <div class="titulo"> <h3>TERMOS DE USO</h3> diff --git a/src/env.js b/src/env.js index 1f221ee7..c13c03e4 100644 --- a/src/env.js +++ b/src/env.js @@ -22,8 +22,8 @@ var apiDomain = 'https://api.portalmec.c3sl.ufpr.br', apiUrl = apiDomain + '/' + apiVersion; var simcaqAPIDomain = 'https://www.simcaq.c3sl.ufpr.br/api', - apiVersion = 'v1', - simcaqAPIurl = simcaqAPIDomain + '/' + apiVersion + apiSimcaqVersion = 'v1', + simcaqAPIurl = simcaqAPIDomain + '/' + apiSimcaqVersion export {apiUrl}; export {apiDomain}; -- GitLab