diff --git a/src/Components/HomeScreenSearchBar.js b/src/Components/HomeScreenSearchBar.js index 9d46b99628766d08b8de6693c5992d21cc015fbb..4427eb29fc05fdf4405695a860e83c4c3917d092 100644 --- a/src/Components/HomeScreenSearchBar.js +++ b/src/Components/HomeScreenSearchBar.js @@ -25,7 +25,7 @@ import { Store } from '../Store'; import { List, ListItem, ListItemIcon, ListItemText, MenuItem, Button, TextField } from '@material-ui/core' import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown'; import SearchIcon from '@material-ui/icons/Search'; -import {Link} from 'react-router-dom' +/*import {Link} from 'react-router-dom'*/ export default function HomeScreenSearchBar (props) { const [ query, setQuery ] = useState("") @@ -94,8 +94,8 @@ export default function HomeScreenSearchBar (props) { return ( <StyledGrid container> + {goSearch && <Redirect to={`/busca?query=${state.search.query}&search_class=${state.search.class}`} />} <Grid item md={7} xs={12} className="first white"> - {goSearch && <Redirect to={`/busca?query=${state.search.query}&search_class=${state.search.class}`} />} <StyledTextField id="standard-search" placeholder="O que está buscando?" @@ -146,18 +146,16 @@ export default function HomeScreenSearchBar (props) { </Grid> <Grid item md={2} xs={12}> <div style={{height : "100%"}}> - <Link to={`/busca?query=${state.search.query}&search_class=${searchClass}`}> - <Button className="custom-button" style={{backgroundColor : options[selectedIndex].color, color : "#fff"}}> - { - WIDTH < 503 && - <span>Buscar</span> - } - <SearchIcon fontSize="large"/> - </Button> - </Link> + <Button onClick={handleKeyDown} className="custom-button" style={{backgroundColor : options[selectedIndex].color, color : "#fff"}}> + { + WIDTH < 503 && + <span>Buscar</span> + } + <SearchIcon fontSize="large"/> + </Button> </div> - </Grid> - </StyledGrid> + </Grid> + </StyledGrid> ) } diff --git a/src/Components/PageProfessorComponents/PartThree.js b/src/Components/PageProfessorComponents/PartThree.js index d52d17ba19da2ebb4a9105dc028c2d4d249aa940..4dc30604264bb51d3b51704b5be14fcd9c2d25dc 100644 --- a/src/Components/PageProfessorComponents/PartThree.js +++ b/src/Components/PageProfessorComponents/PartThree.js @@ -17,8 +17,8 @@ export default function PartThree (props) { const handleChangePhoneNumber = (event) => { const input = event.target.value.replace(/\D/,'') setPhoneNumber({...phoneNumber, - flagInvalid : (input.length < 9 ? true : false), - number : (input.length > 9 ? phoneNumber.number : input), + flagInvalid : (input.length < 10 ? true : false), + number : (input.length > 10 ? phoneNumber.number : input), }) } @@ -48,14 +48,13 @@ export default function PartThree (props) { <h4>Vamos localizar o seu cadastro:</h4> <Stepper items={props.stepper}/> <form style={{textAlign:"start"}}> - <span>CENTRO EDUC INF MEU PEDACINHO DE CHAO</span> <FormControl required style={{width:"100%"}}> <p>Inserir o telefone da escola:</p> <FormInput inputType={'text'} pattern="[0-9]" name={'DDD e Número'} - placeholder={'DDD e Número'} + placeholder={'Exemplo: 4112345678'} value={phoneNumber.number} handleChange={handleChangePhoneNumber} error={phoneNumber.flagInvalid} diff --git a/src/Components/SearchBar.js b/src/Components/SearchBar.js index 88993387285ce786eb2f47947184544702d61115..1c36964e90f24460d54fd70e0386839ac9754335 100644 --- a/src/Components/SearchBar.js +++ b/src/Components/SearchBar.js @@ -54,11 +54,13 @@ const TextFieldStyled = styled(TextField)` margin: 0 2vw !important; ` +/* const RadioGroupStyled = styled(RadioGroup)` display: flex; flex-direction: row; flex-grow: 1; ` +*/ const FormControlLabelStyled = styled(FormControlLabel)` *{ @@ -82,7 +84,6 @@ const SelectStyled = styled(Select)` ` const MenuItemStyled = styled(MenuItem)` text-transform: uppercase; - color: #ff8a17 !important; fontWeight: bolder; ` @@ -147,7 +148,7 @@ export default function SearchBar(props) { return ( <Grid container> - <Grid container item xs={12} sm={12} md={6} lg={6} xl={6}> + <Grid container item xs={12} sm={6} md={6} lg={6} xl={6}> {goSearch && <Redirect to={`/busca?query=${state.search.query}&search_class=${state.search.class}`} />} <TextFieldStyled id="standard-search" @@ -159,58 +160,58 @@ export default function SearchBar(props) { onKeyPress={handleKeyDown} /> </Grid> - <Grid container item justify="center" alignItems="center" xs={12} sm={12} md={6} lg={6} xl={6}> + <Grid container item justify="center" alignItems="center" xs={12} sm={6} md={6} lg={6} xl={6}> {state.windowSize.width >= 960 ? <React.Fragment> - <Grid container justify="center" alignItems="center" xs={12} sm={1} md={1} lg={1} xl={1}> + <Grid container item justify="center" alignItems="center" xs={12} sm={1} md={1} lg={1} xl={1}> <Link to={linkTarget} > <ButtonStyled onClick={handleKeyDown} ><IconSearchStyled /></ButtonStyled> </Link> </Grid> - <Grid container justify="center" alignItems="center" xs={12} sm={3} md={3} lg={3} xl={3}> + <Grid container item justify="center" alignItems="center" xs={12} sm={3} md={3} lg={3} xl={3}> <span>Pressione "Enter" ou click na lupa</span> </Grid> - <Grid container justify="center" alignItems="center" xs={12} sm={1} md={1} lg={1} xl={1}> + <Grid container item justify="center" alignItems="center" xs={12} sm={1} md={1} lg={1} xl={1}> <DividerVertical /> </Grid> - <Grid container justify="center" alignItems="center" xs={12} sm={7} md={7} lg={7} xl={7}> - <RadioGroupStyled row={true} + <Grid container item justify="center" alignItems="center" xs={12} sm={7} md={7} lg={7} xl={7}> + <RadioGroup row={true} aria-label="Tipo" name="types" value={searchClass} onChange={ (event) => setSearchClass(event.target.value) } + justify="center" alignItems="center" > <FormControlLabelStyled value="LearningObject" control={<RadioStyled />} label="Recursos" /> <FormControlLabelStyled value="Collection" control={<RadioStyled />} label="Coleções" /> <FormControlLabelStyled value="User" control={<RadioStyled />} label="Usuários" /> - </RadioGroupStyled> + </RadioGroup> </Grid> </React.Fragment> : <React.Fragment> - <Grid container justify="center" alignItems="center" xs={5} sm={5} md={5} lg={5} xl={5}> + <Grid container item justify="center" alignItems="center" xs={5} sm={5} md={5} lg={5} xl={5}> <FormControl> <SelectStyled value={searchClass} onChange={(event) => setSearchClass(event.target.value)} > - <MenuItemStyled value="LearningObject" aria-label="Recursos">Recursos</MenuItemStyled> - <MenuItemStyled value="Collection" aria-label="Coleções">Coleções</MenuItemStyled> - <MenuItemStyled value="User" aria-label="Usuários">Usuários</MenuItemStyled> + <MenuItemStyled style={{color : "#ff7f00"}} value="LearningObject" aria-label="Recursos">Recursos</MenuItemStyled> + <MenuItemStyled style={{color : "#673ab7"}} value="Collection" aria-label="Coleções">Coleções</MenuItemStyled> + <MenuItemStyled style={{color : "#00bcd4"}} value="User" aria-label="Usuários">Usuários</MenuItemStyled> </SelectStyled> </FormControl> </Grid> - <Grid container justify="center" alignItems="center" xs={2} sm={2} md={2} lg={2} xl={2}> + <Grid container item justify="center" alignItems="center" xs={2} sm={2} md={2} lg={2} xl={2}> <DividerVertical /> </Grid> - <Grid container justify="center" alignItems="center" xs={5} sm={5} md={5} lg={5} xl={5}> + <Grid container item justify="center" alignItems="center" xs={5} sm={5} md={5} lg={5} xl={5}> <Link to={linkTarget} > - <span style={{color: "black"}}>Buscar</span> <ButtonStyled onClick={handleKeyDown} ><IconSearchStyled /></ButtonStyled> </Link> </Grid> diff --git a/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js b/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js index 0f2d25afb8ec829e53ce5f9b9d861a54166e66ee..e8d253324b68c006cc892d5084ab8d0f15e3f977 100644 --- a/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js +++ b/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js @@ -150,13 +150,10 @@ export default function TabPanelEditarPerfil(props) { </ProfileAvatarDiv> </HeaderContainer> <br /> - <br /> - <br /> - <br /> </div> <div style={{ paddingTop: "90px" }}> - <div style={{ display: "flex", flexDirection: "row" }}> + <div style={{ display: "flex", flexDirection: "row", justifyContent: "center" }}> <form onSubmit={e => handleSubmit(e)}> <FormInput inputType={"text"} @@ -279,8 +276,11 @@ const ChangeAvatarDiv = styled.div` ` const ProfileAvatarDiv = styled.div` - bottom: -20px; - left : 120px; + top: 70px; + left: 0; + right: 0; + bottom: -40px; + margin: auto; border-radius : 100%; position : absolute; max-width : 100px; diff --git a/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js b/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js index a31c0676151a96e765c4d3da889f4df67e9e413b..c631e97d6eb3ec736b134117e752646b767a70ca 100644 --- a/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js +++ b/src/Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js @@ -20,6 +20,7 @@ import React, {useContext} from 'react' import { Store } from '../../../Store.js'; import styled from 'styled-components' import Button from '@material-ui/core/Button'; +import {Link} from 'react-router-dom'; //3 casos //Professor nao cadastrado (nao pediu OU submitter_request = rejected) @@ -42,9 +43,14 @@ export default function TabPanelSolicitarContaProfessor (props) { digitais na plataforma com toda a comunidade escolar do país. </StyledP> <div> - <CompletarCadastroButton> - SIM, COMPLETAR CADASTRO - </CompletarCadastroButton> + <Link to={{ + pathname: '/termos-publicar-recurso', + state: true + }}> + <CompletarCadastroButton > + SIM, COMPLETAR CADASTRO + </CompletarCadastroButton> + </Link> </div> </div> ) diff --git a/src/Components/UserPageComponents/SubmitterStatus.js b/src/Components/UserPageComponents/SubmitterStatus.js index 7795a90df8376ca052eb13013c1771b1c522d03a..1cb29365644038f8a8a9a115675ddf8f0af1ccfd 100644 --- a/src/Components/UserPageComponents/SubmitterStatus.js +++ b/src/Components/UserPageComponents/SubmitterStatus.js @@ -18,6 +18,7 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/> import React, {useContext} from 'react'; import { Store } from '../../Store.js'; import CheckDecagram from '../../img/check-decagram-gray.svg' +import {Link} from 'react-router-dom'; export default function SubmitterStatus (props) { const {state} = useContext(Store) @@ -42,7 +43,15 @@ export default function SubmitterStatus (props) { <img src={CheckDecagram} alt='check icon'/> </span> {text} - <span style={{color:"#00bcd4"}}> SAIBA MAIS</span> + <Link to={{ + pathname: '/editarperfil', + tabValue: { + value: 1 + } + }}> + <span style={{color:"#00bcd4"}}> SAIBA MAIS</span> + </Link> + </span> </p> </React.Fragment> diff --git a/src/Pages/EditProfilePage.js b/src/Pages/EditProfilePage.js index a7e7755588243eaf22194f14a97f0673f5453563..0cf1e91667ca942dca98460c73cb6223519de77c 100644 --- a/src/Pages/EditProfilePage.js +++ b/src/Pages/EditProfilePage.js @@ -21,7 +21,7 @@ export default function EditProfilePage(props) { const [tabs, setTabs] = useState([ 'Editar Perfil', 'Solicitar conta de Professor', 'Gerenciar Conta' ]) - const [tabValue, setTabValue] = useState(0) + const [tabValue, setTabValue] = useState(props.location.tabValue !== undefined ? props.location.tabValue.value : 0) const handleChangeTab = (e, newValue) => { setTabValue(newValue) } @@ -139,7 +139,7 @@ export default function EditProfilePage(props) { </h4> <StyledTabs orientation="vertical" - variant="scrollable" + variant="fullWidth" value={tabValue} onChange={handleChangeTab} TabIndicatorProps={{ style: { display: "none" } }} diff --git a/src/Pages/PageProfessor.js b/src/Pages/PageProfessor.js index 6ee8588e27a0ba57100336e6da714c2c938f1acd..96cd46bb141e537274c606200855b89428a8e54a 100644 --- a/src/Pages/PageProfessor.js +++ b/src/Pages/PageProfessor.js @@ -78,8 +78,8 @@ export default function PageProfessor (props) { const handleParteTres = (phone, cpf) => { setRegisterInformation({...registerInformation, - teacher_cpf: (phone ? phone : ''), - school_phone: (cpf ? cpf : ''), + teacher_cpf: (cpf ? cpf : ''), + school_phone: (phone ? phone : ''), }) handleModal(); } @@ -141,7 +141,7 @@ export default function PageProfessor (props) { } { stepper[3].selected && - <SuccessfulRequest email={state.currentUser.email}/> + <SuccessfulRequest email={state.currentUser.email} history={props.history}/> } </div> </Paper>