From 4a58447490a1178a7fb13a572ec908e606bddc56 Mon Sep 17 00:00:00 2001
From: Lucas Schoenfelder <les17@inf.ufpr.br>
Date: Sun, 15 Nov 2020 19:11:56 -0300
Subject: [PATCH] wip refactor

---
 src/Components/GuardarModal.js                |  1 -
 src/Components/Header.js                      | 54 +++++++++++++------
 src/Components/MenuBar.js                     |  4 +-
 .../UserPageTabs/PanelGerenciarConta.js       |  1 +
 4 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/Components/GuardarModal.js b/src/Components/GuardarModal.js
index e43a63fc..93d38cb6 100644
--- a/src/Components/GuardarModal.js
+++ b/src/Components/GuardarModal.js
@@ -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'
diff --git a/src/Components/Header.js b/src/Components/Header.js
index 361645e4..9448ecef 100644
--- a/src/Components/Header.js
+++ b/src/Components/Header.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>
   )
 }
diff --git a/src/Components/MenuBar.js b/src/Components/MenuBar.js
index 8ea5f162..2d49f259 100644
--- a/src/Components/MenuBar.js
+++ b/src/Components/MenuBar.js
@@ -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;
diff --git a/src/Components/TabPanels/UserPageTabs/PanelGerenciarConta.js b/src/Components/TabPanels/UserPageTabs/PanelGerenciarConta.js
index ee09ebe4..60d104f9 100644
--- a/src/Components/TabPanels/UserPageTabs/PanelGerenciarConta.js
+++ b/src/Components/TabPanels/UserPageTabs/PanelGerenciarConta.js
@@ -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>
-- 
GitLab