diff --git a/src/Components/AreasSubPagesFunction.js b/src/Components/AreasSubPagesFunction.js
index 5a2aa3b94c81a92f99c949b5474703a724519d8d..f08832691ff2fc7d21160c18b362a4d7cfd6344d 100644
--- a/src/Components/AreasSubPagesFunction.js
+++ b/src/Components/AreasSubPagesFunction.js
@@ -86,7 +86,7 @@ function ReqResources(props) {
{
rows.length >= 1 ?
rows.map((row, index) => (
- <Row style={{ paddingBottom: "5px", margin: '0 auto', width: "80%", justifyContent: "center" }} key={(index + 1)}>
+ <Row style={{ paddingBottom: "5px", margin: '0 auto', width: "80%", justifyContent: "center", minHeight: "50px" }} key={(index + 1)}>
{row.map((card) => (
<div style={{ marginLeft: 10, display: 'flex' }} key={card.id * (index + 1)}>
<ResourceCardFunction
@@ -153,7 +153,7 @@ function ReqCollections(props) {
<Carousel showThumbs={false} infiniteLoop={true} showStatus={false}>
{
rows.map((row, index) => (
- <Row style={{ paddingBottom: "5px", margin: '0 auto', width: "80%", justifyContent: "center" }} key={(index + 1)}>
+ <Row style={{ paddingBottom: "5px", margin: '0 auto', width: "80%", justifyContent: "center", minHeight: "50px" }} key={(index + 1)}>
{row.map((card) => (
<div style={{ marginLeft: 10, display: 'flex' }} key={card.id * (index + 1)}>
<CollectionCardFunction
@@ -223,7 +223,7 @@ function TabRecurso() {
{
window.innerWidth <= 501 &&
<div style={{ display: "flex", justifyContent: "center" }}>
- <Link to={`/busca?query=&search_class=LearningObject`} className="button-ver">VER RECURSOS</Link>
+ <Link to={`/busca?query=*&search_class=LearningObject`} className="button-ver">VER RECURSOS</Link>
</div>
}
</StyledTab>
@@ -320,7 +320,7 @@ function TabColecoes() {
{
window.innerWidth <= 501 &&
<div style={{ display: "flex", justifyContent: "center" }}>
- <Link to={`/busca?query=&search_class=Collection`} className="button-ver">VER COLEÇÕES</Link>
+ <Link to={`/busca?query=*&search_class=Collection`} className="button-ver">VER COLEÇÕES</Link>
</div>
}
</StyledTab>
diff --git a/src/Components/ExpansionPanels.js b/src/Components/ExpansionPanels.js
index 9a242d21a3b8616c70c6ed7b419f24e133194aec..017816eb2c4160545b7b9597c206a28eec9b3b1d 100644
--- a/src/Components/ExpansionPanels.js
+++ b/src/Components/ExpansionPanels.js
@@ -182,7 +182,7 @@ export default function SimpleExpansionPanel() {
<h6 style={{fontSize:"18px",marginBlock: "10px"}}>3.2 É vedado ao usuário:</h6>
<ul>
<li>
- <p>Transmitir, exibir, enviar, ou de qualquer outra forma, disponibilizar conteúdo que contenha material pornográfico e/ou atividades ilegais relativas a menores de 18 anos (consoante o <AColorido href="http://www.planalto.gov.br/ccivil_03/leis/L8069.htm" target="_blank">Estatuto da Criança e do Adolescente</AColorido>), que invada a privacidade de terceiros, que tenha cunho comercial, viole os <AColorido href="http://www.onu.org.br/img/2014/09/DUDH.pdf" target="_blank">Direitos Humanos</AColorido> ou seja ilegal, ofensivo, ameaçador, que incite a violência, seja vulgar, preconceituoso ou racista (como descrito nos artigos 138-140 do Código Penal Brasileiro), ou de qualquer forma seja contrário às cláusulas destes Termos de Uso;</p>
+ <p>Transmitir, exibir, enviar, ou de qualquer outra forma, disponibilizar conteúdo que contenha material pornográfico e/ou atividades ilegais relativas a menores de 18 anos (consoante o <AColorido href="http://www.planalto.gov.br/ccivil_03/leis/L8069.htm" target="_blank">Estatuto da Criança e do Adolescente</AColorido>), que invada a privacidade de terceiros, que tenha cunho comercial, viole os <AColorido href="https://www.ohchr.org/EN/UDHR/Pages/Language.aspx?LangID=por" target="_blank">Direitos Humanos</AColorido> ou seja ilegal, ofensivo, ameaçador, que incite a violência, seja vulgar, preconceituoso ou racista (como descrito nos artigos 138-140 do Código Penal Brasileiro), ou de qualquer forma seja contrário às cláusulas destes Termos de Uso;</p>
</li>
<li>
<p>Assumir a identidade de outra pessoa, física ou jurídica; forjar cabeçalhos, ou de qualquer outra forma manipular identificadores, a fim de disfarçar a origem de qualquer material contido na plataforma, com sentido de desmoralizar, desprestigiar ou se fazer passar pela <strong>Plataforma Integrada de RED do MEC</strong>;</p>
diff --git a/src/Components/ModalAvaliarRecurso.js b/src/Components/ModalAvaliarRecurso.js
index 71e0a37d95053eb414256d80cf4434448520b0ef..7795876d0203a82bac0c05ddbb531773b505c39e 100644
--- a/src/Components/ModalAvaliarRecurso.js
+++ b/src/Components/ModalAvaliarRecurso.js
@@ -162,8 +162,8 @@ export default function ModalAvaliarRecurso(props) {
</Grid>
<Grid item xs={2}>
<RadioGroup row onChange={(e) => { handleRadios(e, option.id) }}>
- <FormControlLabel value={"Sim"} control={<StyledRadio />} label="Sim" />
- <FormControlLabel value={"Não"} control={<StyledRadio />} label="Não" />
+ <FormControlLabel value={"Sim"} control={<StyledRadio />} label="Não" />
+ <FormControlLabel value={"Não"} control={<StyledRadio />} label="Sim" />
</RadioGroup>
</Grid>
</Grid>
diff --git a/src/Components/Notifications.js b/src/Components/Notifications.js
index b452b2157622560976cd9af179cabb1bd87e9d45..c8fbe2ae21be7c1b7897c603034785e9e345e2b9 100644
--- a/src/Components/Notifications.js
+++ b/src/Components/Notifications.js
@@ -204,6 +204,7 @@ export default function Notification(props) {
</div>
{
notifications.map((notification) =>
+ (notification.viewed === false) &&
<ActivityListItem
onMenuBar={true}
avatar={notification.owner.avatar ? apiDomain + notification.owner.avatar : null}
@@ -222,7 +223,7 @@ export default function Notification(props) {
<Link to="/perfil">
<NoPadButton>
MOSTRAR TODAS
- </NoPadButton>
+ </NoPadButton>
</Link>
</div>
</ContainerDiv>
diff --git a/src/Components/SearchBar.js b/src/Components/SearchBar.js
index 8dc8b65cd2463abab60df99007a8b5f17bb387b0..0363f68369583ed6b578ad270860958aa4d6fe01 100644
--- a/src/Components/SearchBar.js
+++ b/src/Components/SearchBar.js
@@ -25,6 +25,7 @@ import { RadioGroup, Radio, FormControl, Select, MenuItem, Button, FormControlLa
import styled from 'styled-components'
import { Store } from '../Store';
import { v4 as uuidv4 } from 'uuid'
+import Grid from "@material-ui/core/Grid"
const dividerStyled = {
@@ -85,12 +86,12 @@ const MenuItemStyled = styled(MenuItem)`
fontWeight: bolder;
`
-const Bar = styled.div`
+/*const Bar = styled.div`
display: flex;
align-items: center;
justify-content: space-between;
border-top: 1px rgba(0,0,0,.1) solid;
-`
+`*/
const Flex = styled.span`
display: flex;
align-items: center;
@@ -145,59 +146,63 @@ export default function SearchBar(props) {
};
return (
- <Bar>
- {goSearch && <Redirect to={`/busca?query=${state.search.query}&search_class=${state.search.class}`} />}
- <TextFieldStyled
- id="standard-search"
- label="O que você está buscando"
- type="search"
- margin="normal"
- value={query}
- onChange={handleChange}
- onKeyPress={handleKeyDown}
- />
- <Flex>
- <Link
- to={linkTarget}
- >
- <ButtonStyled onClick={handleKeyDown} ><IconSearchStyled /></ButtonStyled>
- </Link>
-
- {state.windowSize.width >= 900 ?
- <React.Fragment>
- <Flex style={{ "justifyContent": 'middle', 'flexDirection': 'column' }}>
- <div>Pressione "Enter"</div>
- <div>ou click na lupa</div>
- </Flex>
- <DividerVertical />
- <RadioGroupStyled row={true}
- aria-label="Tipo"
- name="types" value={searchClass}
- onChange={
- (event) => setSearchClass(event.target.value)
- }
- >
- <FormControlLabelStyled value="LearningObject" control={<RadioStyled />} label="Recursos" />
- <FormControlLabelStyled value="Collection" control={<RadioStyled />} label="Coleções" />
- <FormControlLabelStyled value="User" control={<RadioStyled />} label="Usuários" />
- </RadioGroupStyled>
- </React.Fragment>
- :
- <React.Fragment>
- <DividerVertical />
- <FormControl>
- <SelectStyled
- value={searchClass}
- onChange={(event) => setSearchClass(event.target.value)}
+ <Grid container>
+ <Grid container item md={6} xs={12} sm={12}>
+ {goSearch && <Redirect to={`/busca?query=${state.search.query}&search_class=${state.search.class}`} />}
+ <TextFieldStyled
+ id="standard-search"
+ label="O que você está buscando"
+ type="search"
+ margin="normal"
+ value={query}
+ onChange={handleChange}
+ onKeyPress={handleKeyDown}
+ />
+ </Grid>
+ <Grid container item md={6} xs={12} sm={12}>
+ <Flex>
+ <Link
+ to={linkTarget}
+ >
+ <ButtonStyled onClick={handleKeyDown} ><IconSearchStyled /></ButtonStyled>
+ </Link>
+
+ {state.windowSize.width >= 900 ?
+ <React.Fragment>
+ <Flex style={{ "justifyContent": 'middle', 'flexDirection': 'column' }}>
+ <div>Pressione "Enter"</div>
+ <div>ou click na lupa</div>
+ </Flex>
+ <DividerVertical />
+ <RadioGroupStyled row={true}
+ aria-label="Tipo"
+ name="types" value={searchClass}
+ onChange={
+ (event) => setSearchClass(event.target.value)
+ }
>
- <MenuItemStyled value="LearningObject" aria-label="Recursos">Recursos</MenuItemStyled>
- <MenuItemStyled value="Collection" aria-label="Coleções">Coleções</MenuItemStyled>
- <MenuItemStyled value="User" aria-label="Usuários">Usuários</MenuItemStyled>
- </SelectStyled>
- </FormControl>
- </React.Fragment>
- }
- </Flex>
- </Bar>
+ <FormControlLabelStyled value="LearningObject" control={<RadioStyled />} label="Recursos" />
+ <FormControlLabelStyled value="Collection" control={<RadioStyled />} label="Coleções" />
+ <FormControlLabelStyled value="User" control={<RadioStyled />} label="Usuários" />
+ </RadioGroupStyled>
+ </React.Fragment>
+ :
+ <React.Fragment>
+ <DividerVertical />
+ <FormControl>
+ <SelectStyled
+ value={searchClass}
+ onChange={(event) => setSearchClass(event.target.value)}
+ >
+ <MenuItemStyled value="LearningObject" aria-label="Recursos">Recursos</MenuItemStyled>
+ <MenuItemStyled value="Collection" aria-label="Coleções">Coleções</MenuItemStyled>
+ <MenuItemStyled value="User" aria-label="Usuários">Usuários</MenuItemStyled>
+ </SelectStyled>
+ </FormControl>
+ </React.Fragment>
+ }
+ </Flex>
+ </Grid>
+ </Grid>
)
}
diff --git a/src/Components/TabPanels/UserPageTabs/PanelAtividades.js b/src/Components/TabPanels/UserPageTabs/PanelAtividades.js
index 0985db2b681552b0e8a2a726cb959ef72892e7c6..694fcfe3b81e0e0e024beb8b9117b3b6577d7123 100644
--- a/src/Components/TabPanels/UserPageTabs/PanelAtividades.js
+++ b/src/Components/TabPanels/UserPageTabs/PanelAtividades.js
@@ -139,7 +139,7 @@ export default function TabPanelAtividades(props) {
</Grid>
<Grid xs={12} md={4} item style={{ fontSize: "14px", color: "#666" }}>
<ShowData disabled={true}>
- Mostrando {notificatonsLength} {notificatonsLength === 1 ? "Atividade" : "Atividades"}
+ Mostrando {notificatonsLength} {notificatonsLength === 1 ? "Atividade " : "Atividades "}
de {totalResults}
</ShowData>
</Grid>
@@ -195,7 +195,7 @@ const NoNotificationsDiv = styled.div`
const LoadMoreButton = styled(Button)`
outline : none !important;
- display : inline-block !important;
+ display : block !important;
cusor : pointer !important;
min-height : 36px !important;
min-widht : 88px !important;
@@ -203,7 +203,7 @@ const LoadMoreButton = styled(Button)`
vertical-align: middle !important;
border : 0 !important;
padding : 0 px !important;
- margin : 6px 8px !important;
+ margin : auto !important;
text-decoration : none !important;
font-weight : 500 !important;
overflow : hidden !important;
@@ -218,7 +218,7 @@ const LoadMoreButton = styled(Button)`
const ShowData = styled(Button)`
outline : none !important;
- display : inline-block !important;
+ display : block !important;
cusor : pointer !important;
min-height : 36px !important;
min-widht : 88px !important;
@@ -226,7 +226,7 @@ const ShowData = styled(Button)`
vertical-align: middle !important;
border : 0 !important;
padding : 0 px !important;
- margin : 6px 8px !important;
+ margin : auto !important;
text-decoration : none !important;
font-weight : 500 !important;
overflow : hidden !important;
diff --git a/src/Pages/UserPage.js b/src/Pages/UserPage.js
index da97c43e1f7d0a75be524b76168c8e666125a584..53a0c9c53f5ade9f72e739311f80122332cd37c6 100644
--- a/src/Pages/UserPage.js
+++ b/src/Pages/UserPage.js
@@ -54,7 +54,6 @@ export default function UserPage(props) {
const [follows, setFollows] = useState(0);
const [following, setFollowing] = useState(0);
const [loading, setLoading] = useState(false);
-
const [tabValue, setTabValue] = useState(Number(props.location.state) || 0);
const [tabs, setTabs] = useState([
"Atividades",
@@ -108,7 +107,7 @@ export default function UserPage(props) {
}, []);
useEffect(() => {
- setTabValue(Number(props.location.state))
+ setTabValue(Number(props.location.state) || 0)
}, [window.history.state.key])
const redirect = () => {