diff --git a/package.json b/package.json
index b2d7301750402498b1c650e4656e05ddc5146d43..e772e41cc80ac4ce0055060dd66958aea4bd59a3 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
},
"scripts": {
"analyze": "NODE_PATH=src/ source-map-explorer 'build/static/js/*.js'",
- "start": "NODE_PATH=src/ PORT=4000 react-scripts start watch",
+ "start": "NODE_PATH=src/ PORT=5000 react-scripts start watch",
"build": "NODE_PATH=src/ react-scripts build",
"test": "NODE_PATH=src/ react-scripts test",
"eject": "NODE_PATH=src/ react-scripts eject"
diff --git a/src/Components/CriarColecaoForm.js b/src/Components/CriarColecaoForm.js
index 0bcca5a200b0926d567df6aa6c822865331a734b..b09d5549b670fd2fc100e42bef6459aa4ef8ce84 100644
--- a/src/Components/CriarColecaoForm.js
+++ b/src/Components/CriarColecaoForm.js
@@ -41,6 +41,7 @@ export default function CriarColecaoForm(props) {
])
const handleChange = (event) => {
+ console.log("valor", event.target.value);
setValue(event.target.value);
};
@@ -95,7 +96,7 @@ export default function CriarColecaoForm(props) {
value={colName.value}
onChange={e => handleColName(e)}
error={colName.key}
- InputProps={props.contrast === "" ? { className: classes.lightTextField } : { className: classes.darkTextField }}
+ InputProps={state.contrast === "" ? { className: classes.lightTextField } : { className: classes.darkTextField }}
contrast={state.contrast}
helperText={colName.key ? <span>O nome é importante para identificar a sua coleção na plataforma.<br />Ex: Matemática Ensino Médio </span> : ""}
required={true}
diff --git a/src/Components/ModalLearningObjectPublished.js b/src/Components/ModalLearningObjectPublished.js
index 566460be99d3b1880e179745f8777fb7a9f94a56..190e31f7d657cc6d30363e80272398c0ad60a70e 100644
--- a/src/Components/ModalLearningObjectPublished.js
+++ b/src/Components/ModalLearningObjectPublished.js
@@ -28,6 +28,9 @@ import Twitter from '../img/twitter.svg'
import LinkIcon from '../img/link_icon.svg'
import CloseModalButton from './CloseModalButton.js'
+//Image Import
+import { Publicar } from "ImportImages.js";
+
export default function ModalLearningObjectPublished (props) {
// const refContainer = useRef(props.link);
@@ -50,7 +53,7 @@ export default function ModalLearningObjectPublished (props) {
}}
>
<Fade in={props.open}>
- <Container>
+ <Container contrast={props.contrast}>
<Header>
<span style={{width:"32px"}}/>
<h2>O seu recurso foi para a curadoria!</h2>
@@ -69,7 +72,7 @@ export default function ModalLearningObjectPublished (props) {
</Grid>
</Grid>
</Content>
- <ShareContainer>
+ <ShareContainer contrast={props.contrast}>
<p>Gostaria de convidar o seus amigos para conhecer o recurso?</p>
<p>Compartilhe nas redes sociais:</p>
<div className="logos-shared">
@@ -77,7 +80,7 @@ export default function ModalLearningObjectPublished (props) {
href={"https://www.facebook.com/sharer/sharer.php?u=https://plataformaintegrada.mec.gov.br/recurso/" + props.draftID}
rel="noreferrer"
target="_blank">
- <ShareButton>
+ <ShareButton contrast={props.contrast}>
<img src={Facebook} alt="facebook-logo"/>
</ShareButton>
</a>
@@ -86,12 +89,12 @@ export default function ModalLearningObjectPublished (props) {
href={"https://www.twitter.com/intent/tweet?url=https://plataformaintegrada.mec.gov.br/recurso/" + props.draftID}
rel="noreferrer"
target="_blank">
- <ShareButton>
+ <ShareButton contrast={props.contrast}>
<img src={Twitter} alt="twitter-logo"/>
</ShareButton>
</a>
- <ShareButton >
+ <ShareButton contrast={props.contrast}>
<img src={LinkIcon} alt="link-icon"/>
</ShareButton>
</div>
@@ -123,18 +126,18 @@ const ShareButton = styled(Button)`
p {
margin : 0 0 10px;
}
+
+ border: ${props => props.contrast === "" ? "" : "1px solid yellow"} !important;
`
const ShareContainer = styled.div`
padding-top : 20px;
- background-color : #f1f1f1;
width : 100%;
height : 215px;
font-size : 18px;
line-height : 30px;
text-align : center;
max-width : 600px;
- color : #666;
border-radius : 4px;
.logos-shared {
@@ -145,16 +148,18 @@ const ShareContainer = styled.div`
flex-direction : row;
justify-content : center;
}
+
+ background-color: ${props => props.contrast === "" ? "#f1f1f1" : "black"};
+ border-top: ${props => props.contrast === "" ? "" : "1px solid white"};
`
const Content = styled.div`
padding : 20px 30px;
overflow : visible;
max-width : 600px;
- color : #666;
.backgroundImg {
- background-image : url(https://plataformaintegrada.mec.gov.br/img/Publicar.png);
+ background-image : url(${Publicar});
width : 145px;
height : 125px;
background-repeat : no-repeat;
@@ -180,7 +185,6 @@ const Header = styled.div`
h2 {
font-size : 26px;
font-weight : lighter;
- color : #666
}
`
@@ -200,7 +204,6 @@ const StyledModal = styled(Modal)`
const Container = styled.div`
box-sizing : border-box;
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);
- background-color : #fff;
align : center;
display : flex;
flex-direction : column;
@@ -221,4 +224,8 @@ const Container = styled.div`
p {
margin : 0 0 10px;
}
+
+ color: ${props => props.contrast === "" ? "#666" : "white"};
+ background-color: ${props => props.contrast === "" ? "white" : "black"};
+ border: ${props => props.contrast === "" ? "" : "1px solid white"};
`
diff --git a/src/Components/ResourceList.js b/src/Components/ResourceList.js
index 67d22bc760ce3bf1e3449ddad59fb7755a8020b4..e708c007b8b2f258d8dcf81c90d009d25adb48de 100644
--- a/src/Components/ResourceList.js
+++ b/src/Components/ResourceList.js
@@ -127,7 +127,7 @@ export default function ResourceList(props) {
<Title contrast={props.contrast}>
{props.resources.length ?
props.resources.length + " recurso" + (props.resources.length === 1 ? "" : "s")
- : "Carregando coleção"}
+ : "Nenhum recurso encontrado"}
</Title>
</Grid>
<Grid item>
diff --git a/src/Components/SearchPageComponents/CollectionTemplate.js b/src/Components/SearchPageComponents/CollectionTemplate.js
index df3e526f1a127f4309dade2ab52b5df2bda59bdd..b2038c24285b79fd812209dc33ccc6daf0908ce0 100644
--- a/src/Components/SearchPageComponents/CollectionTemplate.js
+++ b/src/Components/SearchPageComponents/CollectionTemplate.js
@@ -117,7 +117,7 @@ const TotalPages = styled.span`
`
const StyledIconButton = styled(Paper)`
border-radius: 50% !important;
- background-color: ${props => props.contrast === "" ? props.disabled ? "#666" : "673ab7" : "black"} !important;
+ background-color: ${props => props.contrast === "" ? props.disabled ? "#666" : "#673ab7" : "black"} !important;
.icon{
color: ${props => props.contrast === "" ? "white": props.disabled ? "white" : "yellow"} !important;
}
diff --git a/src/Components/UploadPageComponents/PartThree.js b/src/Components/UploadPageComponents/PartThree.js
index 9e7f27128a157471cae3adfc4900af388a993cfb..96441256e85aabb298f5d38b0fd8a214a470f6c3 100644
--- a/src/Components/UploadPageComponents/PartThree.js
+++ b/src/Components/UploadPageComponents/PartThree.js
@@ -22,8 +22,6 @@ import Grid from '@material-ui/core/Grid';
import styled from 'styled-components'
import { apiDomain } from '../../env';
import Stepper from './Stepper.js'
-import Rating from '@material-ui/lab/Rating';
-import StarBorderIcon from '@material-ui/icons/StarBorder';
import LoadingSpinner from '../LoadingSpinner.js'
import MoreIcon from '@material-ui/icons/More';
import SdCardIcon from '@material-ui/icons/SdCard';
@@ -109,7 +107,7 @@ export default function PartThree(props) {
<StyledSessao1 className="page-content-preview">
<div className="cabecalho">
<div className="feedback-upload">
- <Stepper activeStep={props.activeStep} />
+ <Stepper contrast={props.contrast} activeStep={props.activeStep} />
<h2>Quase lá, agora só falta publicar!</h2>
<span className="subtitle">Veja abaixo como o seu Recurso vai aparecer na Plataforma:</span>
</div>
@@ -123,16 +121,6 @@ export default function PartThree(props) {
src={draft.thumbnail === null ? getDefaultThumbnail(draft.object_type) : apiDomain + draft.thumbnail} />
<div className="texto-objeto">
<h3>{draft.name}</h3>
- <div className="rating-objeto">
- <Rating
- name="customized-empty"
- value={draft.score}
- precision={0.5}
- style={{ color: "#666" }}
- emptyIcon={<StarBorderIcon fontSize="inherit" />}
- />
- </div>
-
<div className="relacionado">
Relacionado com: {subjects}
</div>
@@ -140,6 +128,7 @@ export default function PartThree(props) {
{
draft.tags &&
<div className="tags-objeto">
+ Palavras chave:
{draft.tags.map((tag) => {
return (
<div className="tag" key={tag.name}>{tag.name}</div>
@@ -156,7 +145,7 @@ export default function PartThree(props) {
<Grid item xs={windowWidth > 990 ? 7 : 12} className="left">
<div className="titulo">
Sobre o Recurso
- </div>
+ </div>
<div className="sobre-conteudo">
<p className="descricao">{description}</p>
{
@@ -205,13 +194,13 @@ export default function PartThree(props) {
</div>
</div>
</CaixaContainer>
- <Sessao3>
+ <Sessao3 contrast={props.contrast}>
<form>
<Grid container>
<Grid item xs={windowWidth > 990 ? 6 : 12} style={{ paddingRight: "15px", paddingLeft: "15px", textAlign: windowWidth > 990 ? 'right' : 'center' }}>
<span style={{ fontSize: "14px" }}>
Para segurança da plataforma <br /> marque que você não é um robô
- </span>
+ </span>
</Grid>
<Grid item xs={windowWidth > 990 ? 6 : 12} style={{ paddingRight: "15px", paddingLeft: "15px"}}>
@@ -224,27 +213,27 @@ export default function PartThree(props) {
</div>
</Grid>
<Grid item xs={12} style={{ paddingRight: "15px", paddingLeft: "15px", marginTop: "30px", textAlign: 'center' }}>
- <GrayButton onClick={() => { props.stepperControl(-1) }}>VOLTAR</GrayButton>
- <GrayButton onClick={() => { toggleModalCancelar(true) }}>CANCELAR</GrayButton>
+ <GrayButton contrast={props.contrast} onClick={() => { props.stepperControl(-1) }}>VOLTAR</GrayButton>
+ <GrayButton contrast={props.contrast} onClick={() => { toggleModalCancelar(true) }}>CANCELAR</GrayButton>
{
checkAccessLevel("partner") ?
(
unavailableButton ? (
- <GrayButton disabled={unavailableButton}>PUBLICAR RECURSO</GrayButton>
+ <GrayButton contrast={props.contrast} disabled={unavailableButton}>PUBLICAR RECURSO</GrayButton>
)
:
(
- <OrangeButton onClick={props.handlePost}>PUBLICAR RECURSO</OrangeButton>
+ <OrangeButton contrast={props.contrast} onClick={props.handlePost}>PUBLICAR RECURSO</OrangeButton>
)
)
:
(
unavailableButton ? (
- <GrayButton disabled={unavailableButton}>SUBMETER RECURSO</GrayButton>
+ <GrayButton contrast={props.contrast} disabled={unavailableButton}>SUBMETER RECURSO</GrayButton>
)
:
(
- <OrangeButton onClick={props.handleSubmit}>SUBMETER RECURSO</OrangeButton>
+ <OrangeButton contrast={props.contrast} onClick={props.handleSubmit}>SUBMETER RECURSO</OrangeButton>
)
)
@@ -282,8 +271,9 @@ const Sessao3 = styled.div`
@media screen and (min-width: 1200px) {
width : 970px;
}
- color : #666;
- background-color : #f4f4f4;
+
+ color: ${props => props.contrast === "" ? "#666" : "white"};
+ background-color: ${props => props.contrast === "" ? "#f4f4f4" : "black"};
`
diff --git a/src/Components/UploadPageComponents/PartTwoComponents/EditThumbnail.js b/src/Components/UploadPageComponents/PartTwoComponents/EditThumbnail.js
index 7cce6bf2058f9c6512430053e27d6ed04f479800..86ea414af96072848015010952a91c1358feb942 100644
--- a/src/Components/UploadPageComponents/PartTwoComponents/EditThumbnail.js
+++ b/src/Components/UploadPageComponents/PartTwoComponents/EditThumbnail.js
@@ -25,8 +25,8 @@ import styled from 'styled-components'
export default function EditThumbnail (props) {
const [crop] = useState({
unit: "%" ,
- width : 100,
- aspect: 9/3
+ width : 200,
+ aspect: 9/6
});
return (
<>
diff --git a/src/Pages/ChangePasswordPage.js b/src/Pages/ChangePasswordPage.js
index cf552c07180f6e589cb39e9c697c50f4df2641cc..8bc12a7f134ea3e7b3f9410e79d2c7ca3c9e26a3 100644
--- a/src/Pages/ChangePasswordPage.js
+++ b/src/Pages/ChangePasswordPage.js
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState, useContext } from "react";
import { BackgroundDiv } from '../Components/TabPanels/StyledComponents.js'
import Paper from '@material-ui/core/Paper'
import styled from 'styled-components'
@@ -13,12 +13,14 @@ import Grid from '@material-ui/core/Grid'
import IconButton from '@material-ui/core/IconButton'
import VisibilityIcon from '@material-ui/icons/Visibility'
import VisibilityOffIcon from '@material-ui/icons/VisibilityOff'
+import { Store } from '../Store'
function Alert(props) {
return <MuiAlert elevation={6} variant="filled" {...props} />;
}
export default function ChangePasswordPage(props) {
+ const { state } = useContext(Store)
const [error, setError] = useState(false)
const [success, setSuccess] = useState(false)
@@ -175,7 +177,7 @@ export default function ChangePasswordPage(props) {
if (error)
return (
- <BackgroundDiv>
+ <BackgroundDiv contrast={state.contrast}>
<Snackbar
open={snackInfo.open}
autoHideDuration={6000}
@@ -187,13 +189,13 @@ export default function ChangePasswordPage(props) {
</Alert>
</Snackbar>
<div>
- <CustomizedBreadcrumbs
+ <CustomizedBreadcrumbs contrast={state.contrast}
values={["Recuperar senha", "Alterar senha"]}
/>
</div>
<div style={{ justifyContent: "center", textAlign: "center", maxWidth: "600px", margin: "auto" }}>
<Paper elevation={3}>
- <CardDiv>
+ <CardDiv contrast={state.contrast}>
<div style={{ overflow: "hidden", display: "inline-block" }}>
<h2 style={{ fontSize: "32px", fontWeight: "200", marginBottom: "20px", lineHeight: '35px' }}>
Ocorreu um erro. Por favor, tente novamente mais tarde. Você será redirecionado para a home em... <StyledTimer>{time}</StyledTimer>
@@ -206,7 +208,7 @@ export default function ChangePasswordPage(props) {
)
else if (success)
return (
- <BackgroundDiv>
+ <BackgroundDiv contrast={state.contrast}>
<Snackbar
open={snackInfo.open}
autoHideDuration={6000}
@@ -218,13 +220,13 @@ export default function ChangePasswordPage(props) {
</Alert>
</Snackbar>
<div>
- <CustomizedBreadcrumbs
+ <CustomizedBreadcrumbs contrast={state.contrast}
values={["Recuperar senha", "Alterar senha"]}
/>
</div>
<div style={{ justifyContent: "center", textAlign: "center", maxWidth: "600px", margin: "auto" }}>
<Paper elevation={3}>
- <CardDiv>
+ <CardDiv contrast={state.contrast}>
<div style={{ overflow: "hidden", display: "inline-block" }}>
<h2 style={{ fontSize: "32px", fontWeight: "200", marginBottom: "20px", lineHeight: '35px' }}>
Sua senha foi alterada com sucesso. Você será redirecionado para a home em... <StyledTimer>{time}</StyledTimer>
@@ -237,7 +239,7 @@ export default function ChangePasswordPage(props) {
)
else
return (
- <BackgroundDiv>
+ <BackgroundDiv contrast={state.contrast}>
<Snackbar
open={snackInfo.open}
autoHideDuration={6000}
@@ -249,19 +251,20 @@ export default function ChangePasswordPage(props) {
</Alert>
</Snackbar>
<div>
- <CustomizedBreadcrumbs
+ <CustomizedBreadcrumbs contrast={state.contrast}
values={["Recuperar senha", "Alterar senha"]}
/>
</div>
<div style={{ justifyContent: "center", textAlign: "center", maxWidth: "600px", margin: "auto" }}>
<Paper elevation={3}>
- <CardDiv>
+ <CardDiv contrast={state.contrast}>
<div style={{ overflow: "hidden", display: "inline-block" }}>
<h2 style={{ fontSize: "32px", fontWeight: "200", marginBottom: "20px" }}>Confirme a nova senha</h2>
<form onSubmit={(e) => { e.preventDefault(); onSubmit(e); }}>
<Grid container direction='row' alignItems='center' spacing={1}>
<Grid item xs={10}>
<FormInput
+ contrast={state.contrast}
inputType={formPassword.hidePass ? "password" : ""}
name={"senha"}
value={formPassword.value}
@@ -275,11 +278,11 @@ export default function ChangePasswordPage(props) {
<Grid item xs={2}>
{
formPassword.hidePass ?
- <IconButton onClick={handleStateHideFormPass}>
+ <IconButton className={`${state.contrast}LinkColor`} onClick={handleStateHideFormPass}>
<VisibilityIcon />
</IconButton>
:
- <IconButton onClick={handleStateHideFormPass}>
+ <IconButton className={`${state.contrast}LinkColor`} onClick={handleStateHideFormPass}>
<VisibilityOffIcon />
</IconButton>
}
@@ -289,6 +292,7 @@ export default function ChangePasswordPage(props) {
<Grid container direction='row' alignItems='center' spacing={1}>
<Grid item xs={10}>
<FormInput
+ contrast={state.contrast}
inputType={formPasswordConfirmation.hidePass ? "password" : ""}
name={"confirme a senha"}
value={formPasswordConfirmation.value}
@@ -302,18 +306,18 @@ export default function ChangePasswordPage(props) {
<Grid item xs={2}>
{
formPasswordConfirmation.hidePass ?
- <IconButton onClick={handleStateHideConfFormPass}>
+ <IconButton className={`${state.contrast}LinkColor`} onClick={handleStateHideConfFormPass}>
<VisibilityIcon />
</IconButton>
:
- <IconButton onClick={handleStateHideConfFormPass}>
+ <IconButton className={`${state.contrast}LinkColor`} onClick={handleStateHideConfFormPass}>
<VisibilityOffIcon />
</IconButton>
}
</Grid>
</Grid>
<div style={{ display: "flex", justifyContent: "center" }}>
- <CompletarCadastroButton type="submit" >ATUALIZAR SENHA</CompletarCadastroButton>
+ <CompletarCadastroButton contrast={state.contrast} type="submit" >ATUALIZAR SENHA</CompletarCadastroButton>
</div>
</form>
</div>
@@ -325,7 +329,11 @@ export default function ChangePasswordPage(props) {
}
const CardDiv = styled.div`
- background-color : #fff;
+ color: ${props => props.contrast === "" ? "#666" : "white"} !important;
+ text-decoration: ${props => props.contrast === "" ? "none" : "yellow underline"} !important;
+ background-color: ${props => props.contrast === "" ? "white" : "black"} !important;
+ border: ${props => props.contrast === "" ? "" : "1px solid white"} !important;
+
box-shadow : 0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24);
padding : 20px 30px;
margin : 50px 0;
diff --git a/src/Pages/UploadPage.js b/src/Pages/UploadPage.js
index da22ab8ed44eb0d6fa57a6a2dac9ac3a50f40d81..204d7b73b514ed5a55fd2c92d761bf60d80e7d01 100644
--- a/src/Pages/UploadPage.js
+++ b/src/Pages/UploadPage.js
@@ -32,132 +32,133 @@ import LoadingSpinner from '../Components/LoadingSpinner.js'
import { Redirect } from 'react-router-dom'
export default function UploadPage(props) {
- const { state } = useContext(Store)
+ const { state } = useContext(Store)
- // {/*Object : link or file uploaded*/}
- // eslint-disable-next-line
- const [object, setObject] = useState()
+ // {/*Object : link or file uploaded*/}
+ // eslint-disable-next-line
+ const [object, setObject] = useState()
- const [loading, toggleLoading] = useState(true)
- const [draft, setDraft] = useState({})
- function handleSuccessfulGet(data) {
- setDraft(data)
- toggleLoading(false)
- }
- useEffect(() => {
- if (state.currentUser.id !== "") {
+ const [loading, toggleLoading] = useState(true)
+ const [draft, setDraft] = useState({})
+ function handleSuccessfulGet(data) {
+ setDraft(data)
+ toggleLoading(false)
+ }
+ useEffect(() => {
+ if (state.currentUser.id !== "") {
- const url = `/learning_objects/`
+ const url = `/learning_objects/`
- let payload = {}
+ let payload = {}
- postRequest(url, payload, handleSuccessfulGet, (error) => { console.log(error) })
+ postRequest(url, payload, handleSuccessfulGet, (error) => { console.log(error) })
- }
- }, [])
+ }
+ }, [])
- const [activeStep, setActiveStep] = React.useState(0);
- const stepperControl = (increment) => { setActiveStep(activeStep + increment) }
+ const [activeStep, setActiveStep] = React.useState(0);
+ const stepperControl = (increment) => { setActiveStep(activeStep + increment) }
- const [objectSubmitted, toggleModal] = useState(false)
- const handleModal = (value) => { toggleModal(value) }
+ const [objectSubmitted, toggleModal] = useState(false)
+ const handleModal = (value) => { toggleModal(value) }
- const handlePost = () => {
- if (state.currentUser.id !== "") {
- const url = `/learning_objects/${draft.id}/publish`
+ const handlePost = () => {
+ if (state.currentUser.id !== "") {
+ const url = `/learning_objects/${draft.id}/publish`
- let payload = {}
+ let payload = {}
- postRequest(url, payload,
- (data) => { handleModal(true) },
- (error) => { console.log(error) }
- )
+ postRequest(url, payload,
+ (data) => { handleModal(true) },
+ (error) => { console.log(error) }
+ )
+ }
}
- }
- const handleSubmit = () => {
- if (state.currentUser.id !== "") {
- const url = `/submissions/`
+ const handleSubmit = () => {
+ if (state.currentUser.id !== "") {
+ const url = `/submissions/`
- let payload = {
- "submission": {
- "learning_object_id": draft.id
- }
- }
+ let payload = {
+ "submission": {
+ "learning_object_id": draft.id
+ }
+ }
- postRequest(url, payload,
- (data) => { handleModal(true) },
- (error) => { console.log(error) }
- )
+ postRequest(url, payload,
+ (data) => { handleModal(true) },
+ (error) => { console.log(error) }
+ )
+ }
}
- }
-
- return (
- <React.Fragment>
- {
- state.currentUser.id === '' &&
- <Redirect to="/" />
- }
- {
- loading === true ?
- (
- <div style={state.contrast === "" ? {} : { backgroundColor: "black" }}>
- <LoadingSpinner contrast={state.contrast} text={"CARREGANDO..."} />
- </div>
- )
- :
- (
- <>
- <ModalLearningObjectPublished
- open={objectSubmitted}
- handleClose={() => { toggleModal(false); props.history.push('/') }}
- draftID={draft.id}
- />
- {
- activeStep === 2 ?
- (
- <PartThree draftID={draft.id} stepperControl={stepperControl} activeStep={activeStep} handlePost={handlePost} handleSubmit={handleSubmit} />
- )
- :
- (
- <Background contrast={state.contrast}>
- <div className="container">
- <Grid container spacing={2}>
- <Grid item md={4} xs={12}>
- <UploadFileWrapper contrast={state.contrast} draftID={draft.id} />
- </Grid>
- <Grid item md={8} xs={12}>
- <InfoBox contrast={state.contrast}>
- <div className="cabecalho">
- <h2>Informações sobre o Recurso</h2>
- <div className="feedback-upload">
- <Stepper contrast={state.contrast} activeStep={activeStep} />
- </div>
- </div>
- {
- activeStep === 0 &&
- <Grid container style={{ paddingLeft: "15px", paddingRight: "15px" }}>
- <PartOne draftID={draft.id} stepperControl={stepperControl} contrast={state.contrast} />
- </Grid>
- }
- {
- activeStep === 1 &&
- <Grid container style={{ paddingLeft: "15px", paddingRight: "15px" }}>
- <PartTwo draftID={draft.id} stepperControl={stepperControl} contrast={state.contrast} />
- </Grid>
- }
- </InfoBox>
- </Grid>
- </Grid>
- </div>
- </Background>
- )
- }
- </>
- )
- }
- </React.Fragment>
- )
+
+ return (
+ <React.Fragment>
+ {
+ state.currentUser.id === '' &&
+ <Redirect to="/" />
+ }
+ {
+ loading === true ?
+ (
+ <div style={state.contrast === "" ? {} : { backgroundColor: "black" }}>
+ <LoadingSpinner contrast={state.contrast} text={"CARREGANDO..."} />
+ </div>
+ )
+ :
+ (
+ <>
+ <ModalLearningObjectPublished
+ contrast={state.contrast}
+ open={objectSubmitted}
+ handleClose={() => { toggleModal(false); props.history.push('/') }}
+ draftID={draft.id}
+ />
+ {
+ activeStep === 2 ?
+ (
+ <PartThree draftID={draft.id} stepperControl={stepperControl} activeStep={activeStep} handlePost={handlePost} handleSubmit={handleSubmit} />
+ )
+ :
+ (
+ <Background contrast={state.contrast}>
+ <div className="container">
+ <Grid container spacing={2}>
+ <Grid item md={4} xs={12}>
+ <UploadFileWrapper contrast={state.contrast} draftID={draft.id} />
+ </Grid>
+ <Grid item md={8} xs={12}>
+ <InfoBox contrast={state.contrast}>
+ <div className="cabecalho">
+ <h2>Informações sobre o Recurso</h2>
+ <div className="feedback-upload">
+ <Stepper contrast={state.contrast} activeStep={activeStep} />
+ </div>
+ </div>
+ {
+ activeStep === 0 &&
+ <Grid container style={{ paddingLeft: "15px", paddingRight: "15px" }}>
+ <PartOne draftID={draft.id} stepperControl={stepperControl} contrast={state.contrast} />
+ </Grid>
+ }
+ {
+ activeStep === 1 &&
+ <Grid container style={{ paddingLeft: "15px", paddingRight: "15px" }}>
+ <PartTwo draftID={draft.id} stepperControl={stepperControl} contrast={state.contrast} />
+ </Grid>
+ }
+ </InfoBox>
+ </Grid>
+ </Grid>
+ </div>
+ </Background>
+ )
+ }
+ </>
+ )
+ }
+ </React.Fragment>
+ )
}