From 063f9677ce67a82450742221e7410752f417f3c4 Mon Sep 17 00:00:00 2001
From: Luis Felipe Risch <lfr20@inf.ufpr.br>
Date: Mon, 7 Dec 2020 10:05:54 -0300
Subject: [PATCH] Trying to fix the merge errors
---
src/Components/EcFooter.js | 19 ++++++++++---------
src/Components/MenuBar.js | 2 +-
src/Pages/AboutPage.js | 6 +++---
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/Components/EcFooter.js b/src/Components/EcFooter.js
index 29d07570..604610ff 100644
--- a/src/Components/EcFooter.js
+++ b/src/Components/EcFooter.js
@@ -19,6 +19,7 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import React, {Component} from 'react';
import {Row, Col, Container} from 'react-grid-system';
import eduConectada from '../img/educa-conectada.png';
+import { Link } from '@material-ui/core';
const blueFooter={
backgroundColor: "#00bcd4",
@@ -44,20 +45,20 @@ class EcFooter extends Component{
<Col md={4} sm={5} xs={5}>
<h4>Sobre</h4>
<ul style={listStyle}>
- <li> <a href="#sobre">Sobre a Plataforma</a> </li>
- <li> <a href="#parceiros">Portais Parceiros</a> </li>
- <li> <a href="#termos-de-uso">Termos de Uso</a> </li>
- <li> <a href="#contato">Contato</a> </li>
+ <li> <a href="/sobre">Sobre a Plataforma</a> </li>
+ <Link> <a ref="ref" href="/sobre">Portais Parceiros</a> </Link>
+ <li> <a href="/termos">Termos de Uso</a> </li>
+ <li> <a href="/contato">Contato</a> </li>
</ul>
</Col>
<Col md={4} sm={5} xs={5}>
<h4>Ajuda</h4>
<ul style={listStyle}>
- <li> <a href="#ajuda">Central de Ajuda</a> </li>
- <li> <a href="#publicar">Publicando Recursos</a> </li>
- <li> <a href="#busca">Encontrando Recursos</a> </li>
- <li> <a href="#rede">Participando da Rede</a> </li>
- <li> <a href="#conta">Gerenciando a Conta</a> </li>
+ <li> <a href="/ajuda">Central de Ajuda</a> </li>
+ <li> <a href="/publicando-recurso">Publicando Recursos</a> </li>
+ <li> <a href="/encontrando-recurso">Encontrando Recursos</a> </li>
+ <li> <a href="/participando-da-rede">Participando da Rede</a> </li>
+ <li> <a href="/gerenciando-conta">Gerenciando a Conta</a> </li>
</ul>
</Col>
<Col md={4} sm={12} xs={12}>
diff --git a/src/Components/MenuBar.js b/src/Components/MenuBar.js
index 8ea5f162..3c0d234b 100644
--- a/src/Components/MenuBar.js
+++ b/src/Components/MenuBar.js
@@ -102,7 +102,7 @@ export default function MenuBar(props){
const menuSobre = [
{ name: "Sobre a Plataforma", href: "sobre" },
- { name: "Portais Parceiros", href: "" },
+ { name: "Portais Parceiros", href: "sobre#parceiros" },
{ name: "Termos de Uso", href: "termos" },
{ name: "Contato", href: "contato" }
]
diff --git a/src/Pages/AboutPage.js b/src/Pages/AboutPage.js
index a61ee551..fa8143fc 100644
--- a/src/Pages/AboutPage.js
+++ b/src/Pages/AboutPage.js
@@ -47,8 +47,6 @@ import Impulsiona from "../img/logo_parceiros/impulsiona.png";
import InstPeninsula from "../img/logo_parceiros/inst-peninsula.png";
import Telefonica from "../img/logo_parceiros/telefonica.png";
-
-
const Secao1 = styled.div`
height: 600px;
background-color: #333;
@@ -575,6 +573,8 @@ const Secao8 = styled.div`
export default function AboutPage(props) {
+ const ref = React.createRef();
+
return (
<>
@@ -660,7 +660,7 @@ export default function AboutPage(props) {
</Secao3>
<Secao4>
- <div className="container">
+ <div ref={ref} className="container">
<div className="container-secao">
<div className="conteudo-secao">
<div>
--
GitLab