diff --git a/src/Components/AreasSubPages.js b/src/Components/AreasSubPages.js index f6b59bb2d31d904f2663f644951380405dd1bb0d..fb6fde62c8866609b613cd4e8fe1f7005532f5d2 100644 --- a/src/Components/AreasSubPages.js +++ b/src/Components/AreasSubPages.js @@ -54,7 +54,6 @@ class ReqResources extends Component { .get(`${apiUrl}/learning_objects?limit=12&sort=["published_at", "desc"]`) .then((res) => { this.setState({ resources: res.data }); - console.log(res.data); }); } render() { diff --git a/src/Components/Dropdown.js b/src/Components/Dropdown.js index a379b826b8df5498957d0b84ffe0645a20ca0b18..31d7047d63cfd5d837734ebbf0cd057bfbc4430f 100644 --- a/src/Components/Dropdown.js +++ b/src/Components/Dropdown.js @@ -95,7 +95,7 @@ function Dropdown(props) { <MenuList> { props.items.map((item)=> - <Link key={item.name} to={item.href} ><MenuItem>{item.name}</MenuItem></Link> + <Link key={`${item.name}_${new Date().toString()}` } to={item.href} ><MenuItem>{item.name}</MenuItem></Link> ) } </MenuList> diff --git a/src/Components/ExpansionPanels.js b/src/Components/ExpansionPanels.js index a16fa9047664d2e79573d0169ba9f2d834ab9210..9a242d21a3b8616c70c6ed7b419f24e133194aec 100644 --- a/src/Components/ExpansionPanels.js +++ b/src/Components/ExpansionPanels.js @@ -454,7 +454,7 @@ export default function SimpleExpansionPanel() { <Grid item xs={12} md={4}> <div style={{color:"#00BCD4",fontSize:"18px"}}> <p>BASICAMENTE,</p> - <p>O usuário poderá reportar,
utilizando a funcionalidade “Reportar†ou pelo formulário de “Contatoâ€, qualquer tipo de conteúdo publicado na Plataforma MEC RED que viole os direitos dos usuários, de terceiros ou a legislação aplicável.</p> + <p>O usuário poderá reportar,utilizando a funcionalidade “Reportar†ou pelo formulário de “Contatoâ€, qualquer tipo de conteúdo publicado na Plataforma MEC RED que viole os direitos dos usuários, de terceiros ou a legislação aplicável.</p> </div> </Grid> </Grid> diff --git a/src/Components/Header.js b/src/Components/Header.js index 14025e28280949a3f8d37107cf49dc74d057e6e5..b607b2013755d9a6c2d975980e937ab3b2dbfb42 100644 --- a/src/Components/Header.js +++ b/src/Components/Header.js @@ -105,7 +105,6 @@ export default function Header(props){ useEffect(() => { let query = new URLSearchParams(loc.search) - console.log(query.getAll("auth_token")) if(query.get("auth_token")) { let config = { headers : { @@ -115,10 +114,11 @@ export default function Header(props){ "expiry" : query.get("expiry"), "token-type" : 'Bearer' } - } + } validateToken(config) redirect() } + }, [loc]) const toggleSnackbar = (event, reason) => { diff --git a/src/Components/LoginModal.js b/src/Components/LoginModal.js index 18b5e7e6fb67bf3a36a94de27f3e422132ec6495..0cba39ecc64cdad3bd1ccab3fdd42bd012c16b26 100644 --- a/src/Components/LoginModal.js +++ b/src/Components/LoginModal.js @@ -123,6 +123,7 @@ export default function LoginModal (props){ /> </Zoom> </StyledLogin> + </> ) } diff --git a/src/Components/ResourceCardFunction.js b/src/Components/ResourceCardFunction.js index 8113aa671694a725dce337672825b74f56bf6970..ede74c3f2fc37d04bcce83901a6115cb91c6a85a 100644 --- a/src/Components/ResourceCardFunction.js +++ b/src/Components/ResourceCardFunction.js @@ -116,7 +116,7 @@ export default function ResourceCardFunction (props) { </EnviadoPor> </div> <TagContainer> - <Grid container spacing={1} justify='safe' style={{height : "inherit"}}> + <Grid container spacing={0} justify='flex-start' style={{height : "inherit"}}> { props.tags.map( (tag) => <Grid item key={tag.id}> diff --git a/src/Components/SearchExpansionPanel/SearchExpansionPanel.js b/src/Components/SearchExpansionPanel/SearchExpansionPanel.js index 31ce7434630c75d5f12fb8b9a2044f6eb7697281..92a2d39a9e3869d1570d8c0106bc54961a645b28 100644 --- a/src/Components/SearchExpansionPanel/SearchExpansionPanel.js +++ b/src/Components/SearchExpansionPanel/SearchExpansionPanel.js @@ -1,8 +1,8 @@ import React, { useState } from "react"; import { withStyles } from "@material-ui/core/styles"; -import MuiExpansionPanel from "@material-ui/core/ExpansionPanel"; -import MuiExpansionPanelSummary from "@material-ui/core/ExpansionPanelSummary"; -import MuiExpansionPanelDetails from "@material-ui/core/ExpansionPanelDetails"; +import MuiExpansionPanel from "@material-ui/core/Accordion"; +import MuiExpansionPanelSummary from "@material-ui/core/AccordionSummary"; +import MuiExpansionPanelDetails from "@material-ui/core/AccordionActions"; import Typography from "@material-ui/core/Typography"; import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; import SearchEPCompCurriculum from "./SearchEPCompCurriculum"; @@ -126,9 +126,9 @@ export default function SearchExpansionPanel(props) { <TesteTypography>Componentes Curriculares</TesteTypography> </ExpansionPanelSummary> <ExpansionPanelDetails> - <Typography> + <div> <SearchEPCompCurriculum onChange={props.onChange} /> - </Typography> + </div> </ExpansionPanelDetails> </ExpansionPanel> diff --git a/src/Pages/Search.js b/src/Pages/Search.js index d7c3fcd27250a8331a69e395dc5e78328b15cc11..057954758d2d3cfea84a8b8e642119b479a9d76d 100644 --- a/src/Pages/Search.js +++ b/src/Pages/Search.js @@ -75,10 +75,14 @@ export default function Search(props) { const [optionResult, setOptionResult] = useState(option); const collectStuff = (tipoBusca, filtro) => { + // Concertar o bug que não salva o filtro setado currFilter = filtro; if (filtro) setIsFiltering(true); + + console.log(currFilter) + console.log(`${apiUrl}/search?page=${page}&results_per_page=${resultsPerPage}&order=${order}&query=${state.search.query}${currFilter ? currFilter : ""}&search_class=${tipoBusca}`) axios .get( `${apiUrl}/search?page=${page}&results_per_page=${resultsPerPage}&order=${order}&query=${state.search.query}${currFilter ? currFilter : ""}&search_class=${tipoBusca}` @@ -136,34 +140,6 @@ export default function Search(props) { return ( <div style={{ backgroundColor: "#f4f4f4" }}> - {/* <React.Fragment> - <h1> - Search for {state.search.query !== "*" ? state.search.query : "all"}{" "} - in {state.search.class} - </h1> - {state.search.class === "LearningObject" && ( - <ul> - {results.map((res) => ( - <li key={res.id}> {res.name} </li> - ))} - </ul> - )} - {state.search.class === "Collection" && ( - <ul> - {results.map((res) => ( - <li key={res.id}> {res.name} </li> - ))} - </ul> - )} - {state.search.class === "User" && ( - <ul> - {results.map((res) => ( - <li key={res.id}> {res.name} </li> - ))} - </ul> - )} - </React.Fragment> */} - <Principal> <BreadCrumbsDiv> <StyledBreadCrumbs>