Merge branch 'fix_footer_bugs' into 'develop_copy_to_fix_bug'

fixed anchor bug and added a logic to scroll to the top when user enters in...

See merge request !54

src/Components/EcFooter.js

@@ -20,7 +20,7 @@ import React, {Component} from 'react';
 import { Row, Col, Container } from 'react-grid-system';
 import eduConectada from '../img/educa-conectada.png';
 import styled from 'styled-components';
-import {Link} from 'react-router-dom'
+import { HashLink as Link } from 'react-router-hash-link';
 
 const BlueFooter = styled.div`
     background-color : #00bcd4;
@@ -30,8 +30,6 @@ const BlueFooter = styled.div`
     @media screen and (min-width : 502px) {
         padding-bottom : 2em;
     }
-
-    vertical-align: bottom;
 `
 
 

src/Pages/AboutPage.js

@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with Plataforma Integrada MEC.  If not, see <http://www.gnu.org/licenses/>.*/
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import Grid from '@material-ui/core/Grid';
 import styled from 'styled-components';
 import Modal from '../Components/ModalAbout';
@@ -567,6 +567,11 @@ export default function AboutPage(props) {
   })
   var marginSet = calculateMargin(pageWidth)
   const styleIMGSec3 = { float: "right", width: "80%", maxWidth: 475, marginRight: 30, marginTop: marginSet }
+
+  useEffect(() => {
+    window.scrollTo(0, 0)
+  }, [])
+
   return (
     <>
 

src/Pages/Contact.js

@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with Plataforma Integrada MEC.  If not, see <http://www.gnu.org/licenses/>.*/
 
-import React from "react";
+import React, { useEffect } from "react";
 import styled from "styled-components";
 import Banner1 from "../img/banner-sobre.jpg";
 import InputFormulario from "../Components/ContactForm.js";
@@ -137,6 +137,11 @@ const Formulario = styled.div`
 `;
 
 function Contact(props) {
+
+  useEffect(() => {
+    window.scrollTo(0, 0)
+  })
+
   return (
     <>
       <link

src/Pages/HelpCenter.js

@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with Plataforma Integrada MEC.  If not, see <http://www.gnu.org/licenses/>.*/
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import styled from 'styled-components';
 import Grid from '@material-ui/core/Grid';
 import { Link } from 'react-router-dom';
@@ -36,6 +36,8 @@ import CardGerenciando from '../Components/HelpCenter/Cards/CardGerenciando';
 function HelpCenter(props) {
   let windowWidth = window.innerWidth
 
+  useEffect(() => { window.scrollTo(0, 0) }, [])
+
   return (
     <div style={{ backgroundColor: "#f4f4f4" }}>
       <link href="https://fonts.googleapis.com/css?family=Pompiere|Roboto:300,400&display=swap" rel="stylesheet" />

src/Pages/TabsHelp/TabManageAc.js

@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with Plataforma Integrada MEC.  If not, see <http://www.gnu.org/licenses/>.*/
 
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import styled from "styled-components";
 import Tabs from "@material-ui/core/Tabs";
 import Tab from "@material-ui/core/Tab";
@@ -49,6 +49,8 @@ export default function TabManageAc(props) {
     setTabValue(newValue);
   };
 
+  useEffect(() => { window.scrollTo(0, 0) }, [])
+
   return (
     <div style={{ backgroundColor: "#f4f4f4" }}>
       <link

src/Pages/TabsHelp/TabNetPart.js

@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with Plataforma Integrada MEC.  If not, see <http://www.gnu.org/licenses/>.*/
 
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
 import Tabs from '@material-ui/core/Tabs'
 import Tab from '@material-ui/core/Tab';
@@ -49,7 +49,7 @@ export default function TabNetPart (props) {
     setTabValue(newValue)
   }
 
-
+  useEffect(() => { window.scrollTo(0, 0) }, [])
 
   return (
     <div style={{ backgroundColor: "#f4f4f4" }}>

src/Pages/TabsHelp/TabResourseFind.js

@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with Plataforma Integrada MEC.  If not, see <http://www.gnu.org/licenses/>.*/
 
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
 import Tabs from '@material-ui/core/Tabs'
 import Tab from '@material-ui/core/Tab';
@@ -51,6 +51,7 @@ export default function TabResourseFind (props) {
     setTabValue(newValue)
   }
 
+  useEffect(() => { window.scrollTo(0, 0) }, [])
   
   return (
     <div style={{ backgroundColor: "#f4f4f4" }}>

src/Pages/TabsHelp/TabResoursePub.js

@@ -16,7 +16,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with Plataforma Integrada MEC.  If not, see <http://www.gnu.org/licenses/>.*/
 
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
 import Tabs from '@material-ui/core/Tabs'
 import Tab from '@material-ui/core/Tab';
@@ -48,6 +48,8 @@ export default function TabResoursePub (props) {
     setTabValue(newValue)
   }
 
+  useEffect(() => { window.scrollTo(0, 0) }, [])
+
   return (
     <div style={{ backgroundColor: "#f4f4f4" }}>
       <link href="https://fonts.googleapis.com/css?family=Pompiere|Roboto:500,400&display=swap" rel="stylesheet" />

src/Pages/UserTerms.js

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License
 along with Plataforma Integrada MEC.  If not, see <http://www.gnu.org/licenses/>.*/
-import React, {Component} from 'react';
+import React, { useEffect } from 'react';
 import SimpleExpansionPanels from '../Components/ExpansionPanels'
 import Grid from '@material-ui/core/Grid';
 import Modal from '../Components/Modal'
@@ -186,9 +186,10 @@ const Secao4 = styled.div`
 `
 
 
-class UserTerms extends Component {
-    render() {
-
+export default function UserTerms() {
+  useEffect(() => {
+    window.scrollTo(0, 0)
+  }, [])
   return (
     <div style={{ color: "rgba(0,0,0,0.87" }} >
 
@@ -279,6 +280,4 @@ class UserTerms extends Component {
     </div>
   );
 }
-  }
 
-export default UserTerms;