diff --git a/src/Components/LoginModal.js b/src/Components/LoginModal.js index 3f3ea6976251726eef17ef39fa7ed454d1a58560..f1db5fcbd9e6a7bad8dd3dda31f60d22220ae8c4 100644 --- a/src/Components/LoginModal.js +++ b/src/Components/LoginModal.js @@ -26,6 +26,7 @@ import {Store} from '../Store.js' import Snackbar from '@material-ui/core/Snackbar'; import MuiAlert from '@material-ui/lab/Alert'; import {authentication} from './HelperFunctions/getAxiosConfig' +import LoadingSpinner from './LoadingSpinner.js' const StyledLogin = styled(Modal)` margin : 0 !important; @@ -46,6 +47,7 @@ export default function LoginModal (props){ const {state, dispatch} = useContext(Store) const [snackbarOpened, handleSnackbar] = useState(false) + const [loading, setLoading] = useState(false) const handleCloseSnackbar = (event, reason) => { if (reason === 'clickaway') { @@ -55,6 +57,14 @@ export default function LoginModal (props){ handleSnackbar(false); } + async function sleep(ms){ + setLoading(true) + await new Promise(resolve => setTimeout(resolve, ms)) + props.handleClose(); + props.openSnackbar(); + setLoading(false) + } + function handleSuccess (data) { dispatch ({ type: "USER_LOGGED_IN", @@ -62,8 +72,7 @@ export default function LoginModal (props){ login: data.data } ) - props.handleClose(); - props.openSnackbar(); + sleep(4000) } function handleError (error) { handleSnackbar(true) @@ -99,10 +108,20 @@ export default function LoginModal (props){ }} > <Zoom in={props.open} style={{ transitionDelay :"0.2ms"}}> - <LoginContainer handleClose={props.handleClose} - openSignUp={props.openSignUp} - handleLoginInfo={handleLoginInfo} - /> + { + loading ? ( + <div style={{backgroundColor: 'white', padding: '10px'}}> + <LoadingSpinner text={'Carregando...'} /> + </div> + ) + : + ( + <LoginContainer handleClose={props.handleClose} + openSignUp={props.openSignUp} + handleLoginInfo={handleLoginInfo} + /> + ) + } </Zoom> </StyledLogin> diff --git a/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js b/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js index c631e97d6eb3ec736b134117e752646b767a70ca..6a7aa88863a342036fab9e1474437c857e3e1d37 100644 --- a/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js +++ b/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js @@ -34,7 +34,7 @@ export default function TabPanelSolicitarContaProfessor (props) { <div className='card-config'> <div className='content-div'> { - state.currentUser.submitter_request === 'default' || state.currentUser.submitter_request === 'rejected' ? + !state.currentUser.roles.some(role => role.name === "teacher") && ( state.currentUser.submitter_request === 'default' || state.currentUser.submitter_request === 'rejected' ) ? ( <div> <ImageDiv/> @@ -60,11 +60,11 @@ export default function TabPanelSolicitarContaProfessor (props) { { state.currentUser.submitter_request === 'requested' ? ( - <span>Requested</span> + <h1>A sua conta de Professor foi solicitada</h1> ) : ( - <span>Professor</span> + <h1>Você já possui uma conta de Professor</h1> ) } </> diff --git a/src/Components/UploadPageComponents/ModalCancelar.js b/src/Components/UploadPageComponents/ModalCancelar.js index 9616436b10e683fdb274387b58ff2aed3c8d788b..fcfbc9b273cb75e79e05910aed2946eba4a39eb6 100644 --- a/src/Components/UploadPageComponents/ModalCancelar.js +++ b/src/Components/UploadPageComponents/ModalCancelar.js @@ -126,9 +126,9 @@ const Container = styled.div` border-radius : 4px; box-shadow : 0 7px 8px -4px rgba(0,0,0,.2),0 13px 19px 2px rgba(0,0,0,.14),0 5px 24px 4px rgba(0,0,0,.12); - @media screen and (max-width : 899px) { + @media screen and (max-width : 599px) { width : 100%; - height : 100%; + height : 40%; } ` const StyledButton = styled(Button)`