Skip to content
Snippets Groups Projects
Commit 72094a07 authored by lfr20's avatar lfr20
Browse files

Give the correct spacing between lines

parent a36b40f3
No related branches found
No related tags found
6 merge requests!57Merge of develop into master,!56Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...,!39Update admin system,!32Homologa,!31Fix console error,!29Training materials into fix console error
...@@ -18,7 +18,7 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/> ...@@ -18,7 +18,7 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import React, { useContext, useState, useEffect } from 'react' import React, { useContext, useState, useEffect } from 'react'
import axios from 'axios' import axios from 'axios'
import {apiUrl} from '../env' import { apiUrl } from '../env'
import MenuBar from './MenuBar' import MenuBar from './MenuBar'
import SearchBar from './SearchBar' import SearchBar from './SearchBar'
import SignUpModal from './SignUpModal' import SignUpModal from './SignUpModal'
...@@ -27,7 +27,7 @@ import { Store } from '../Store'; ...@@ -27,7 +27,7 @@ import { Store } from '../Store';
import ColaborarModal from './ColaborarModal.js' import ColaborarModal from './ColaborarModal.js'
import Snackbar from '@material-ui/core/Snackbar'; import Snackbar from '@material-ui/core/Snackbar';
import MuiAlert from '@material-ui/lab/Alert'; import MuiAlert from '@material-ui/lab/Alert';
import {useLocation} from 'react-router-dom' import { useLocation } from 'react-router-dom'
import MenuBarMobile from './MenuBarMobile.js' import MenuBarMobile from './MenuBarMobile.js'
//const StyledButton = styled(Button)` //const StyledButton = styled(Button)`
...@@ -35,149 +35,149 @@ import MenuBarMobile from './MenuBarMobile.js' ...@@ -35,149 +35,149 @@ import MenuBarMobile from './MenuBarMobile.js'
// boxShadow :none; // boxShadow :none;
//` //`
function Alert(props) { function Alert(props) {
return <MuiAlert elevation={6} variant="filled" {...props} />; return <MuiAlert elevation={6} variant="filled" {...props} />;
} }
export default function Header(props){ export default function Header(props) {
const { state, dispatch } = useContext(Store) const { state, dispatch } = useContext(Store)
const [signUpOpen, setSignUp] = useState(false) const [signUpOpen, setSignUp] = useState(false)
const [loginOpen, setLogin] = useState(false) const [loginOpen, setLogin] = useState(false)
const [successfulLoginOpen, handleSuccessfulLogin] = useState(false) const [successfulLoginOpen, handleSuccessfulLogin] = useState(false)
const [modalColaborar, setModalColaborar] = useState(false) const [modalColaborar, setModalColaborar] = useState(false)
const validateToken = (config) => { const validateToken = (config) => {
axios.get(`${apiUrl}/auth/validate_token/`, config).then( axios.get(`${apiUrl}/auth/validate_token/`, config).then(
(response) => { (response) => {
console.log(response.data) console.log(response.data)
if ( response.headers['access-token'] ) { if (response.headers['access-token']) {
sessionStorage.setItem('@portalmec/accessToken', response.headers['access-token']) sessionStorage.setItem('@portalmec/accessToken', response.headers['access-token'])
} }
dispatch ({ dispatch({
type: "USER_LOGGED_IN", type: "USER_LOGGED_IN",
userLoggedIn: !state.userIsLoggedIn, userLoggedIn: !state.userIsLoggedIn,
login: response.data.data login: response.data.data
} }
) )
sessionStorage.setItem('@portalmec/id', response.data.data.id) sessionStorage.setItem('@portalmec/id', response.data.data.id)
sessionStorage.setItem('@portalmec/username', response.data.data.name) sessionStorage.setItem('@portalmec/username', response.data.data.name)
sessionStorage.setItem('@portalmec/uid', response.data.data.uid) sessionStorage.setItem('@portalmec/uid', response.data.data.uid)
let headers = { let headers = {
client:response.headers.client, client: response.headers.client,
"access-token":response.headers['access-token'], "access-token": response.headers['access-token'],
"token-type": "Bearer", "token-type": "Bearer",
expiry:response.headers.expiry, expiry: response.headers.expiry,
uid:response.data.data.uid uid: response.data.data.uid
} }
sessionStorage.setItem('@portalmec/auth_headers', JSON.stringify(headers)) sessionStorage.setItem('@portalmec/auth_headers', JSON.stringify(headers))
}, },
(err) => { (err) => {
console.log(err) console.log(err)
} }
) )
} }
useEffect( () => { useEffect(() => {
if (sessionStorage.getItem('@portalmec/auth_headers')) { if (sessionStorage.getItem('@portalmec/auth_headers')) {
let config = { headers : JSON.parse(sessionStorage.getItem('@portalmec/auth_headers'))} let config = { headers: JSON.parse(sessionStorage.getItem('@portalmec/auth_headers')) }
validateToken(config) validateToken(config)
} }
}, []) }, [])
useEffect ( () => { useEffect(() => {
if (state.currentUser.askTeacherQuestion === true) { if (state.currentUser.askTeacherQuestion === true) {
dispatch({ dispatch({
type: "TOGGLE_MODAL_COLABORAR_PLATAFORMA", type: "TOGGLE_MODAL_COLABORAR_PLATAFORMA",
modalColaborarPlataformaOpen: true modalColaborarPlataformaOpen: true
}); });
} }
}, [state.currentUser.askTeacherQuestion]) }, [state.currentUser.askTeacherQuestion])
const redirect = () => { const redirect = () => {
props.history.push('/') props.history.push('/')
} }
let loc = useLocation() let loc = useLocation()
useEffect(() => { useEffect(() => {
let query = new URLSearchParams(loc.search) let query = new URLSearchParams(loc.search)
if(query.get("auth_token")) { if (query.get("auth_token")) {
let config = { let config = {
headers : { headers: {
"access-token" : query.get("auth_token"), "access-token": query.get("auth_token"),
"client" : query.get("client_id"), "client": query.get("client_id"),
"uid" : query.get("uid"), "uid": query.get("uid"),
"expiry" : query.get("expiry"), "expiry": query.get("expiry"),
"token-type" : 'Bearer' "token-type": 'Bearer'
} }
} }
validateToken(config) validateToken(config)
redirect() redirect()
} }
}, [loc]) }, [loc])
const toggleSnackbar = (event, reason) => { const toggleSnackbar = (event, reason) => {
if (reason === 'clickaway') { if (reason === 'clickaway') {
return; return;
} }
handleSuccessfulLogin(false); handleSuccessfulLogin(false);
} }
const handleSignUp = () => { const handleSignUp = () => {
setSignUp(!signUpOpen) setSignUp(!signUpOpen)
} }
const handleLogin = () => { const handleLogin = () => {
setLogin(!loginOpen) setLogin(!loginOpen)
} }
const handleClickSearch = (open) => { const handleClickSearch = (open) => {
dispatch({ dispatch({
type: "HANDLE_SEARCH_BAR", type: "HANDLE_SEARCH_BAR",
opened: !state.searchOpen opened: !state.searchOpen
}) })
} }
let windowWidth = window.innerWidth let windowWidth = window.innerWidth
return ( return (
<React.Fragment> <React.Fragment>
{/* {/*
windowWidth > 990 && windowWidth > 990 &&
<AcessibilityBar/> <AcessibilityBar/>
*/} */}
<Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar} <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
anchorOrigin = {{ vertical:'top', horizontal:'center' }} anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
> >
<Alert severity="success" style={{backgroundColor:"#00acc1"}}>Você está conectado(a)!</Alert> <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
</Snackbar> </Snackbar>
{ {
windowWidth > 990 ? windowWidth > 990 ?
( (
<React.Fragment> <React.Fragment>
<MenuBar openSearchBar={handleClickSearch} openSignUp = {handleSignUp} openLogin = {handleLogin}/> <MenuBar openSearchBar={handleClickSearch} openSignUp={handleSignUp} openLogin={handleLogin} />
{ {
state.searchOpen && state.searchOpen &&
<SearchBar/> <SearchBar />
} }
</React.Fragment> </React.Fragment>
) )
: :
( (
<MenuBarMobile openSignUp = {handleSignUp} openLogin = {handleLogin}/> <MenuBarMobile openSignUp={handleSignUp} openLogin={handleLogin} />
) )
} }
<SignUpModal open={signUpOpen} handleClose={handleSignUp} openLogin={handleLogin}/> <SignUpModal open={signUpOpen} handleClose={handleSignUp} openLogin={handleLogin} />
<LoginModal open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp} <LoginModal open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => {handleSuccessfulLogin(true)}}/> openSnackbar={() => { handleSuccessfulLogin(true) }} />
<ColaborarModal open={modalColaborar} handleClose={() => {setModalColaborar(!modalColaborar)}} /> <ColaborarModal open={modalColaborar} handleClose={() => { setModalColaborar(!modalColaborar) }} />
</React.Fragment> </React.Fragment>
) )
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment