Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • Develop
  • Develop_copy_to_implement_acessibility
  • Develop_copy_to_implement_acessibility_in_admin
  • Fix_perfil
  • Fixing_bugs
  • GameficationAdmin
  • Gamification
  • Otimizando_Vinicius
  • Password_recovery_fix
  • centraliza-axios
  • fix/homologa
  • fixHomeScreen
  • fix_admin_bugs_luis
  • fix_remaining_bugs
  • gamificacaoLucas
  • gamification
  • google_oauth
  • homologa
  • homologa_arrumar_termos
  • homologa_fix_bug_1
  • homologa_fix_bug_36
  • homologa_fix_bug_cadastro
  • luis_accesibility_before_develop
  • luis_gamefication
  • master
  • raul
  • test_google_login
  • vinicius_accessibility_from_copy
  • vinicius_accessiblity
  • V1.0.0
  • V1.0.0-RC
  • V1.0.1
  • v1.1.0
  • v1.1.1
  • v1.2.0
35 results

Target

Select target project
  • portalmec/portalmec-react
  • rfhferreira/cleaning-portal-mec-react
2 results
Select Git revision
  • Develop
  • Develop_copy_to_implement_acessibility
  • Develop_copy_to_implement_acessibility_in_admin
  • Fix_perfil
  • Fixing_bugs
  • GameficationAdmin
  • Gamification
  • Otimizando_Vinicius
  • Password_recovery_fix
  • centraliza-axios
  • fix/homologa
  • fixHomeScreen
  • fix_admin_bugs_luis
  • fix_remaining_bugs
  • gamificacaoLucas
  • gamification
  • google_oauth
  • homologa
  • homologa_arrumar_termos
  • homologa_fix_bug_1
  • homologa_fix_bug_36
  • homologa_fix_bug_cadastro
  • luis_accesibility_before_develop
  • luis_gamefication
  • master
  • raul
  • test_google_login
  • vinicius_accessibility_from_copy
  • vinicius_accessiblity
  • V1.0.0
  • V1.0.0-RC
  • V1.0.1
  • v1.1.0
  • v1.1.1
  • v1.2.0
35 results
Show changes
Commits on Source (2)
This diff is collapsed.
......@@ -240,7 +240,7 @@ function TabRecurso({ contrast }) {
{
window.innerWidth <= 501 &&
<div style={{ display: "flex", justifyContent: "center" }}>
<Link to={`/busca?page=0&results_per_page=12&order=review_average&query=*&search_class=LearningObject`} className="button-ver">VER RECURSOS</Link>
<Link to={`/busca?page=0&results_per_page=12&order=score&query=*&search_class=LearningObject`} className="button-ver">VER RECURSOS</Link>
</div>
}
</StyledTab>
......@@ -359,7 +359,7 @@ function TabColecoes({ contrast }) {
{
window.innerWidth <= 501 &&
<div style={{ display: "flex", justifyContent: "center" }}>
<Link to={`/busca?page=0&results_per_page=12&order=review_average&query=*&search_class=Collection`} className="button-ver">VER COLEÇÕES</Link>
<Link to={`/busca?page=0&results_per_page=12&order=score&query=*&search_class=Collection`} className="button-ver">VER COLEÇÕES</Link>
</div>
}
</StyledTab>
......
......@@ -109,7 +109,7 @@ export default function HomeScreenSearchBar() {
return (
<StyledGrid container contrast={state.contrast}>
{goSearch && <Redirect to={`/busca?page=0&results_per_page=12&order=review_average&query=${state.search.query}&search_class=${state.search.class}`} />}
{goSearch && <Redirect to={`/busca?page=0&results_per_page=12&order=score&query=${state.search.query}&search_class=${state.search.class}`} />}
<Grid item md={7} xs={12} className={state.contrast === "" ? "first white" : "first black"}>
<StyledTextField
contrast={state.contrast}
......
......@@ -169,7 +169,7 @@ export default function SearchBar(props) {
}
const linkTarget = {
pathname: `/busca?page=0&results_per_page=12&order=review_average&query=${state.search.query}&search_class=${state.search.class}`,
pathname: `/busca?page=0&results_per_page=12&order=score&query=${state.search.query}&search_class=${state.search.class}`,
key: uuidv4(), // we could use Math.random, but that's not guaranteed unique.
state: {
applied: true
......@@ -179,7 +179,7 @@ export default function SearchBar(props) {
return (
<Grid container style={state.contrast === "" ? { paddingTop: "1em" } : { backgroundColor: "black", paddingTop: "1em" }}>
<Grid container item xs={12} sm={6} md={6} lg={6} xl={6}>
{goSearch && <Redirect to={`/busca?page=0&results_per_page=12&order=review_average&query=${state.search.query}&search_class=${state.search.class}`} />}
{goSearch && <Redirect to={`/busca?page=0&results_per_page=12&order=score&query=${state.search.query}&search_class=${state.search.class}`} />}
<TextFieldStyled
contrast={state.contrast}
id="standard-search"
......
......@@ -66,7 +66,7 @@ export default function CollectionPage(props) {
</Grid>
<Grid item>
<Link className="link" to={`/busca?page=0&results_per_page=12&order=review_average&query=*&search_class=Collection`}>
<Link className="link" to={`/busca?page=0&results_per_page=12&order=score&query=*&search_class=Collection`}>
<Button
variant='contained'
className="back-button"
......
......@@ -152,7 +152,7 @@ export default function LearningObjectPage(props) {
</p>
</Grid>
<Grid item>
<Link to={`/busca?page=0&results_per_page=12&order=review_average&query=*&search_class=LearningObject`}>
<Link to={`/busca?page=0&results_per_page=12&order=score&query=*&search_class=LearningObject`}>
<Button
variant='contained'
className="back-button"
......
......@@ -184,7 +184,7 @@ export default function Search() {
let url;
if (value !== 'User')
url = `/busca?page=0&results_per_page=12&order=review_average&query=${currQuery}&search_class=${value}`
url = `/busca?page=0&results_per_page=12&order=score&query=${currQuery}&search_class=${value}`
else
url = `/busca?page=0&results_per_page=12&query=${currQuery}&search_class=${value}`
......