Skip to content
Snippets Groups Projects
Commit 4a584474 authored by Lucas Eduardo Schoenfelder's avatar Lucas Eduardo Schoenfelder
Browse files

wip refactor

parent e1f36af4
No related branches found
No related tags found
4 merge requests!57Merge of develop into master,!56Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...,!39Update admin system,!32Homologa
......@@ -27,7 +27,6 @@ import {Store} from '../Store.js'
import axios from 'axios'
import {apiUrl, apiDomain} from '../env';
import CloseIcon from '@material-ui/icons/Close';
import Grid from '@material-ui/core/Grid';
import PublicIcon from '@material-ui/icons/Public';
import LockIcon from '@material-ui/icons/Lock';
import LoadingSpinner from './LoadingSpinner.js'
......
......@@ -27,6 +27,9 @@ import { Store } from '../Store';
import ColaborarModal from './ColaborarModal.js'
import Snackbar from '@material-ui/core/Snackbar';
import MuiAlert from '@material-ui/lab/Alert';
import {useLocation} from 'react-router-dom'
import MenuBarMobile from './MenuBarMobile.js'
//const StyledButton = styled(Button)`
// background : #ffa54c !important;
// boxShadow :none;
......@@ -66,23 +69,40 @@ export default function Header(props){
})
}
return(
<>
<AcessibilityBar/>
<Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
anchorOrigin = {{ vertical:'top', horizontal:'center' }}
>
let windowWidth = window.innerWidth
return (
<React.Fragment>
{
windowWidth > 990 &&
<AcessibilityBar/>
}
<Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
anchorOrigin = {{ vertical:'top', horizontal:'center' }}
>
<Alert severity="success" style={{backgroundColor:"#00acc1"}}>Você está conectado(a)!</Alert>
</Snackbar>
<MenuBar openSearchBar={handleClickSearch} openSignUp = {handleSignUp} openLogin = {handleLogin}/>
{ state.searchOpen &&
<SearchBar/>
}
<SignUpModal open={signUpOpen} handleClose={handleSignUp} openLogin={handleLogin}/>
<LoginModal open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => {handleSuccessfulLogin(true)}}/>
<ColaborarModal open={modalColaborar} handleClose={() => {setModalColaborar(!modalColaborar)}} />
</>
</Snackbar>
{
windowWidth > 990 ?
(
<React.Fragment>
<MenuBar openSearchBar={handleClickSearch} openSignUp = {handleSignUp} openLogin = {handleLogin}/>
{
state.searchOpen &&
<SearchBar/>
}
</React.Fragment>
)
:
(
<MenuBarMobile openSignUp = {handleSignUp} openLogin = {handleLogin}/>
)
}
<SignUpModal open={signUpOpen} handleClose={handleSignUp} openLogin={handleLogin}/>
<LoginModal open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => {handleSuccessfulLogin(true)}}/>
<ColaborarModal open={modalColaborar} handleClose={() => {setModalColaborar(!modalColaborar)}} />
</React.Fragment>
)
}
......@@ -40,7 +40,7 @@ const ContainerStyled = styled(Container)`
`
const ButtonStyled = styled(Button)`
export const ButtonStyled = styled(Button)`
text-transform: capitalize !important;
margin : 0 8px !important;
font-weight : normal !important;
......@@ -86,7 +86,7 @@ const Left = styled.span `
align-items: center;
`
const ButtonPubRecursoStyled = styled(Button)`
export const ButtonPubRecursoStyled = styled(Button)`
font-weight : 500 !important;
border : 1.5px #666 solid !important;
color: #666;
......
......@@ -210,6 +210,7 @@ export default function TabPanelGerenciarConta (props) {
<span style={{margin:"0", display:"flex", justifyContent:"flex-start"}}>Antes de excluir a sua conta, saiba que ela será removida permanentemente.</span>
</div>
<div style={{margin:"0", display:"flex", justifyContent:"flex-start"}}>
{/*//TODO: MODAL DELETAR CONTA*/}
<ButtonCancelar style={{color:'#eb4034'}}>EXCLUIR CONTA</ButtonCancelar>
</div>
</div>
......
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