diff --git a/src/Components/Alert.js b/src/Components/Alert.js
index 747b819931a0cf64cd14804dd23203bd3932be5c..49bbd29e165d171a27a08044aa178f47d6eb0a8a 100644
--- a/src/Components/Alert.js
+++ b/src/Components/Alert.js
@@ -20,5 +20,5 @@ import React from 'react'
import MuiAlert from '@material-ui/lab/Alert';
export default function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
+ return <MuiAlert elevation={6} variant="filled" {...props} />;
}
diff --git a/src/Components/ButtonGuardarColecao.js b/src/Components/ButtonGuardarColecao.js
index ca0729a269e8d756bfc4686eb04acded43dbce12..eaa40ad7a2835c2dfab8e8bdae719f03364add8c 100644
--- a/src/Components/ButtonGuardarColecao.js
+++ b/src/Components/ButtonGuardarColecao.js
@@ -6,8 +6,8 @@ import CreateNewFolderIcon from '@material-ui/icons/CreateNewFolder';
import GuardarModal from './GuardarModal'
import SignUpModal from './SignUpModal'
import LoginModal from './LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
+
+import SnackBar from './SnackbarComponent';
export default function ButtonGuardarColecao(props) {
const { state } = useContext(Store)
@@ -29,10 +29,6 @@ export default function ButtonGuardarColecao(props) {
setLogin(!loginOpen)
}
- function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
- }
-
function toggleLoginSnackbar(reason) {
if (reason === 'clickaway') {
return;
@@ -51,11 +47,13 @@ export default function ButtonGuardarColecao(props) {
<LoginModal contrast={props.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
/>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleLoginSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleLoginSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
<GuardarModal contrast={props.contrast} open={saveToCol} handleClose={() => { toggleSave(false) }}
thumb={props.thumb} title={props.title} recursoId={props.learningObjectId}
/>
diff --git a/src/Components/CollectionCardFunction.js b/src/Components/CollectionCardFunction.js
index 926de15f02f20605b7f3dd5ad7407974e186111d..632c522dbddc3573a12ef43f6b34d7be6c288e28 100644
--- a/src/Components/CollectionCardFunction.js
+++ b/src/Components/CollectionCardFunction.js
@@ -36,8 +36,8 @@ import { Link } from 'react-router-dom';
import { putRequest } from '../Components/HelperFunctions/getAxiosConfig'
import SignUpModal from './SignUpModal'
import LoginModal from './LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
+
+import SnackBar from './SnackbarComponent';
//Image Import
import { noAvatar } from "ImportImages.js";
@@ -168,10 +168,6 @@ export default function CollectionCardFunction(props) {
setLogin(!loginOpen)
}
- function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
- }
-
function toggleLoginSnackbar(reason) {
if (reason === 'clickaway') {
return;
@@ -186,11 +182,13 @@ export default function CollectionCardFunction(props) {
<LoginModal contrast={props.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
/>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleLoginSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleLoginSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
<StyledCard>
<CardDiv className={`${props.contrast}Border`}>
<CardReaDiv className={`${props.contrast}BackColor`}>
diff --git a/src/Components/CollectionCommentSection.js b/src/Components/CollectionCommentSection.js
index a317a429b6174183140a772b4eab292bc10d4c66..8acd3a5477d1b0139a0227a1f379657ffee09d25 100644
--- a/src/Components/CollectionCommentSection.js
+++ b/src/Components/CollectionCommentSection.js
@@ -23,17 +23,16 @@ import Button from '@material-ui/core/Button';
import styled from 'styled-components';
import CommentForm from './ResourcePageComponents/CommentForm.js';
import Comment from './Comment.js';
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
import { getRequest } from '../Components/HelperFunctions/getAxiosConfig'
import ExitToAppIcon from '@material-ui/icons/ExitToApp';
import SignUpModal from './SignUpModal.js';
import LoginModal from './LoginModal.js';
-import SnackBarComponent from './SnackbarComponent';
import CircularProgress from '@material-ui/core/CircularProgress';
import IconButton from '@material-ui/core/IconButton';
import KeyboardArrowDownIcon from '@material-ui/icons/KeyboardArrowDown';
+import SnackBar from './SnackbarComponent';
+
//Image Import
import { Comentarios } from "ImportImages.js";
@@ -95,10 +94,6 @@ export default function CollectionCommentSection(props) {
setSignUpOpen(true)
}
- function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
- }
-
function handleLoadMoreReviews() {
if (reviews.length !== parseInt(totalReviews))
setCurrPageReviews((previous) => previous + 1)
@@ -196,7 +191,7 @@ export default function CollectionCommentSection(props) {
return (
<CommentAreaContainer contrast={props.contrast} container xs={12} direction="row" justify="center" alignItems="center">
- <SnackBarComponent
+ <SnackBar
snackbarOpen={snackInfo.open}
handleClose={handleCloseSnack}
severity={snackInfo.severity}
@@ -259,26 +254,18 @@ export default function CollectionCommentSection(props) {
}
</CommentAreaCard>
</Grid>
- <Snackbar
- open={post_snack_open}
- autoHideDuration={6000}
- onClose={handlePostSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert onClose={handlePostSnackbar} severity="info">
- Seu comentário foi publicado com sucesso!
- </Alert>
- </Snackbar>
- <Snackbar
- open={delete_snack_open}
- autoHideDuration={6000}
- onClose={handleDeleteSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert onClose={handleDeleteSnackbar} severity="info">
- Comentário deletado com sucesso.
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={post_snack_open}
+ handleClose={handlePostSnackbar}
+ severity={"info"}
+ text={"Seu comentário foi publicado com sucesso!"}
+ />
+ <SnackBar
+ snackbarOpen={delete_snack_open}
+ handleClose={handleDeleteSnackbar}
+ severity={"info"}
+ text={"Comentário deletado com sucesso."}
+ />
</CommentAreaContainer>
);
}
diff --git a/src/Components/CollectionDowloadButton.js b/src/Components/CollectionDowloadButton.js
index 427b3464a833c94e60b0a76d55de7dc74b936767..ed934968110dd795e8ffab5f1ecebf3392f7cbe2 100644
--- a/src/Components/CollectionDowloadButton.js
+++ b/src/Components/CollectionDowloadButton.js
@@ -5,12 +5,8 @@ import Button from '@material-ui/core/Button';
import styled from 'styled-components';
import { apiUrl, apiDomain } from '../env';
import { getRequest } from './HelperFunctions/getAxiosConfig'
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
+import SnackBar from './SnackbarComponent';
const DowloadButton = (props) => {
const [download_url, setDownloadUrl] = useState('');
@@ -85,16 +81,12 @@ const DowloadButton = (props) => {
return (
<>
- <Snackbar
- open={snackInfo.open}
- autoHideDuration={6000}
- onClose={handleCloseSnack}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert onClose={handleCloseSnack} severity={snackInfo.severity}>
- {snackInfo.text}
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackInfo.open}
+ handleClose={handleCloseSnack}
+ severity={snackInfo.severity}
+ text={snackInfo.text}
+ />
<DownloadButton
contrast={props.contrast}
variant="outlined"
diff --git a/src/Components/ContactButtons/FollowButton.js b/src/Components/ContactButtons/FollowButton.js
index 96c7794c6fd25ee6a5a333d3c0132e9456f7d1e9..114028d7ee1abbfcfb8fe5d9ab9d1bf5f011b0e4 100644
--- a/src/Components/ContactButtons/FollowButton.js
+++ b/src/Components/ContactButtons/FollowButton.js
@@ -23,13 +23,9 @@ import styled from 'styled-components'
import Button from '@material-ui/core/Button';
import { putRequest } from '../HelperFunctions/getAxiosConfig'
import LoginModal from './../LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
import SignUpModal from './../SignUpModal'
-import MuiAlert from '@material-ui/lab/Alert';
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
+import SnackBar from '../SnackbarComponent';
export default function FollowButton(props) {
@@ -67,11 +63,13 @@ export default function FollowButton(props) {
return (
<React.Fragment>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
{/*-------------------------------MODALS---------------------------------------*/}
<LoginModal contrast={props.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
@@ -145,11 +143,13 @@ export function NoIcon(props) {
return (
<React.Fragment>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
{/*-------------------------------MODALS---------------------------------------*/}
<LoginModal contrast={props.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
diff --git a/src/Components/ContactCardOptions.js b/src/Components/ContactCardOptions.js
index f347928a858b6e6c3ab40f365cc5c6063e1250e0..4811e21ad6952ce5ae32b63a34652bf1b3c8618e 100644
--- a/src/Components/ContactCardOptions.js
+++ b/src/Components/ContactCardOptions.js
@@ -31,13 +31,9 @@ import { putRequest } from './HelperFunctions/getAxiosConfig'
import ReportModal from './ReportModal.js'
import {Link} from 'react-router-dom'
import LoginModal from './LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
import SignUpModal from './SignUpModal'
-import MuiAlert from '@material-ui/lab/Alert';
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
+import SnackBar from './SnackbarComponent';
export default function SimpleMenu(props) {
const {state} = useContext(Store)
@@ -86,11 +82,13 @@ export default function SimpleMenu(props) {
return (
<React.Fragment>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
{/*-------------------------------MODALS---------------------------------------*/}
<LoginModal contrast={props.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
diff --git a/src/Components/ContactForm.js b/src/Components/ContactForm.js
index e44460d3f1cf0148a2d29738dbefc15e6b715195..8d7f120c4f37c6eb04149fc2c8181d35f2b367a9 100644
--- a/src/Components/ContactForm.js
+++ b/src/Components/ContactForm.js
@@ -22,13 +22,9 @@ import styled from 'styled-components';
import FormInput from "../Components/FormInput.js"
import { postRequest } from './HelperFunctions/getAxiosConfig'
import LoginModal from './LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
import SignUpModal from './SignUpModal'
-import MuiAlert from '@material-ui/lab/Alert';
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
+import SnackBar from './SnackbarComponent';
const Button = styled.button`
background-color: ${props => props.contrast === "" ? "#00acc1" : "black"};
@@ -224,11 +220,13 @@ function Formulario(props) {
return (
<React.Fragment>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
{/*-------------------------------MODALS---------------------------------------*/}
<LoginModal contrast={props.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
diff --git a/src/Components/Firulas.js b/src/Components/Firulas.js
index 72dd44f196698f089f0039f3fac6eae7ceb37bff..d54f369dc120c70593c963a317ab507c0809ca7f 100644
--- a/src/Components/Firulas.js
+++ b/src/Components/Firulas.js
@@ -8,8 +8,8 @@ import FavoriteIcon from '@material-ui/icons/Favorite';
import { putRequest } from './HelperFunctions/getAxiosConfig'
import SignUpModal from './SignUpModal'
import LoginModal from './LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
+
+import SnackBar from './SnackbarComponent';
export default function Firulas(props) {
const { state } = useContext(Store);
@@ -20,10 +20,6 @@ export default function Firulas(props) {
const [loginOpen, setLogin] = useState(false)
const [successfulLoginOpen, handleSuccessfulLogin] = useState(false)
- function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
- }
-
function handleSuccessLike(data) {
toggleLiked(!liked)
setLikesCount(data.count)
@@ -62,11 +58,13 @@ export default function Firulas(props) {
<LoginModal contrast={props.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
/>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleLoginSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleLoginSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
<Rating
className={`${props.contrast}IconColor`}
name="customized-empty"
diff --git a/src/Components/Header.js b/src/Components/Header.js
index fb512f3c13fc314a98eb864fc7e8d67e26694952..b374379c8193abbcae8983523426284492e3b1a5 100644
--- a/src/Components/Header.js
+++ b/src/Components/Header.js
@@ -23,19 +23,11 @@ import SignUpModal from './SignUpModal'
import LoginModal from './LoginModal.js'
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, useHistory } from 'react-router-dom'
import MenuBarMobile from './MenuBarMobile.js'
import { getRequest, validateGoogleLoginToken } from './HelperFunctions/getAxiosConfig'
-//const StyledButton = styled(Button)`
-// background : #ffa54c !important;
-// boxShadow :none;
-//`
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
+import SnackBar from './SnackbarComponent';
export default function Header(props) {
const { state, dispatch } = useContext(Store)
@@ -123,11 +115,13 @@ export default function Header(props) {
return (
<React.Fragment>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
{
windowWidth > 990 ?
(
diff --git a/src/Components/ItemCardAction.js b/src/Components/ItemCardAction.js
index ed1cc7dde66752bb622375c25b65172ab3d42e92..05ecb2354594b9ef5fcf70db5b491698124ba05e 100644
--- a/src/Components/ItemCardAction.js
+++ b/src/Components/ItemCardAction.js
@@ -17,8 +17,6 @@ You should have received a copy of the GNU Affero General Public License
along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>.*/
import React, {useState} from 'react';
import styled from 'styled-components';
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
import Button from '@material-ui/core/Button';
import gem from '../img/gamification/gem.svg';
import Dialog from '@material-ui/core/Dialog';
@@ -29,9 +27,7 @@ import DialogTitle from '@material-ui/core/DialogTitle';
import axios from 'axios'
import {apiUrl} from '../env';
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
+import SnackBar from './SnackbarComponent';
const actionStyle = (operation) => {
var stl = {
@@ -124,42 +120,45 @@ export default function ItemCardAction (props) {
return (
<div>
- <Snackbar open={info} autoHideDuration={6000} onClose={() => handleClose('info')}>
- <Alert onClose={handleClose} severity="info">
- {message}
- </Alert>
- </Snackbar>
- <Snackbar open={success} autoHideDuration={6000} onClose={() => handleClose('success')}>
- <Alert onClose={handleClose} severity="success">
- {message}
- </Alert>
- </Snackbar>
- <Snackbar open={failure} autoHideDuration={6000} onClose={() => handleClose('failure')}>
- <Alert onClose={handleClose} severity="error">
- {message}
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={info}
+ handleClose={() => handleClose('info')}
+ severity={"info"}
+ text={message}
+ />
+ <SnackBar
+ snackbarOpen={success}
+ handleClose={() => handleClose('success')}
+ severity={"success"}
+ text={message}
+ />
+ <SnackBar
+ snackbarOpen={failure}
+ handleClose={() => handleClose('failure')}
+ severity={"error"}
+ text={message}
+ />
<span style={actionStyle(props.operation)} onClick={handleClick}>
{props.operation === 'buy' ? <GemImg src={gem}/> : <span/>}
{props.operation === 'buy' ? "COMPRAR" :
props.operation === 'equip' ? "USAR" : "TIRAR"}
</span>
<Dialog
- open={open_dialog}
- onClose={handleClose}
- aria-labelledby="alert-dialog-title"
- aria-describedby="alert-dialog-description"
- >
+ open={open_dialog}
+ onClose={handleClose}
+ aria-labelledby="alert-dialog-title"
+ aria-describedby="alert-dialog-description"
+ >
<DialogTitle id="alert-dialog-title">{"Deseja realmente comprar este item?"}</DialogTitle>
<DialogContent>
<DialogContentText id="alert-dialog-description">
- <strong>Esta compra não envolve nenhum dinheiro real.</strong>
+ <strong>Esta compra não envolve nenhum dinheiro real.</strong>
- <br/><br/>O item que você deseja comprar, <strong>NOME DO ITEM</strong>, custa
- <GemImg src={gem}/><GemSpan>PREÇO</GemSpan> gemas. Você possui
- <GemImg src={gem}/><GemSpan><strong>GEMAS</strong></GemSpan> gemas.
+ <br/><br/>O item que você deseja comprar, <strong>NOME DO ITEM</strong>, custa
+ <GemImg src={gem}/><GemSpan>PREÇO</GemSpan> gemas. Você possui
+ <GemImg src={gem}/><GemSpan><strong>GEMAS</strong></GemSpan> gemas.
- <br/><br/>Comprar este item lhe deixará com <GemImg src={gem}/><GemSpan><strong>TANTAS</strong></GemSpan> gemas.
+ <br/><br/>Comprar este item lhe deixará com <GemImg src={gem}/><GemSpan><strong>TANTAS</strong></GemSpan> gemas.
</DialogContentText>
</DialogContent>
<DialogActions>
diff --git a/src/Components/LoginModal.js b/src/Components/LoginModal.js
index eeb51a8c4f7bfc6d1968800f7872a965bfd8dc17..8dc9da52c2ecf210d6606c79e38a7ffc0077a2e0 100644
--- a/src/Components/LoginModal.js
+++ b/src/Components/LoginModal.js
@@ -23,10 +23,10 @@ import Zoom from '@material-ui/core/Fade';
import styled from 'styled-components'
import LoginContainer from './LoginContainerFunction.js'
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 SnackBar from './SnackbarComponent';
+
const StyledLogin = styled(Modal)`
margin : 0 !important;
margin-left : 0 !important;
@@ -38,9 +38,6 @@ const StyledLogin = styled(Modal)`
border-radius : 4px;
`
-export function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
export default function LoginModal(props) {
const { state, dispatch } = useContext(Store)
@@ -81,11 +78,12 @@ export default function LoginModal(props) {
return (
<>
- <Snackbar open={snackbarOpened} autoHideDuration={1000} onClose={handleCloseSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert severity="error">Ocorreu um erro ao se conectar!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackbarOpened}
+ handleClose={handleCloseSnackbar}
+ severity={"error"}
+ text={"Ocorreu um erro ao se conectar!"}
+ />
<StyledLogin
aria-labelledby="transition-modal-title"
aria-describedby="transition-modal-description"
diff --git a/src/Components/ModalAvaliarRecurso.js b/src/Components/ModalAvaliarRecurso.js
index 4376cee70643c1f48b5ee74b34c86065ca0c5a2f..8ba192b8d024b66a2b7b2f20321aa766577db3b5 100644
--- a/src/Components/ModalAvaliarRecurso.js
+++ b/src/Components/ModalAvaliarRecurso.js
@@ -28,12 +28,13 @@ import Radio from '@material-ui/core/Radio';
import FormControl from '@material-ui/core/FormControl';
import FormControlLabel from '@material-ui/core/FormControlLabel';
import CloseModalButton from './CloseModalButton'
-import Snackbar from '@material-ui/core/Snackbar';
import { withStyles } from '@material-ui/core/styles';
import { getRequest } from './HelperFunctions/getAxiosConfig'
import LoadingSpinner from '../Components/LoadingSpinner'
import {StyledTextField, useStyles} from './ReportUserForm.js'
+import SnackBar from './SnackbarComponent';
+
const StyledRadio = withStyles({
root: {
color: '#666',
@@ -118,9 +119,11 @@ export default function ModalAvaliarRecurso(props) {
return (
<>
- <Snackbar open={snackbarCancelar} autoHideDuration={1000} onClose={toggleSnackbarCancelar}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- message="Você cancelou a avaliação deste recurso."
+ <SnackBar
+ snackbarOpen={snackbarCancelar}
+ handleClose={toggleSnackbarCancelar}
+ severity={"info"}
+ text={"Você cancelou a avaliação deste recurso."}
/>
{
options ?
diff --git a/src/Components/ModalExcluirColecao.js b/src/Components/ModalExcluirColecao.js
index cb55a931f2784e8662820ff494ca932c5fb8bed4..f4b2dafdb37d68b3e9cea4d9b34dfe28763413a0 100644
--- a/src/Components/ModalExcluirColecao.js
+++ b/src/Components/ModalExcluirColecao.js
@@ -23,7 +23,7 @@ import Fade from '@material-ui/core/Fade';
import styled from 'styled-components'
import { ButtonCancelar, ButtonEnviar } from './EditarColecaoForm';
import CloseModalButton from './CloseModalButton'
-import SnackbarComponent from './SnackbarComponent'
+import Snackbar from './SnackbarComponent'
import {deleteRequest} from './HelperFunctions/getAxiosConfig'
export default function ModalExcluirColecao (props) {
@@ -56,7 +56,7 @@ export default function ModalExcluirColecao (props) {
>
<Fade in={props.open}>
<>
- <SnackbarComponent snackbarOpen={snackbarOpen} severity={"info"} handleClose={() => {toggleSnackbar(false)}} text={"Coleção excluída com sucesso"}/>
+ <Snackbar snackbarOpen={snackbarOpen} severity={"info"} handleClose={() => {toggleSnackbar(false)}} text={"Coleção excluída com sucesso"}/>
<Container contrast={props.contrast}>
<Header>
<h2>Tem certeza que deseja excluir esta Coleção?</h2>
diff --git a/src/Components/ReportModal.js b/src/Components/ReportModal.js
index 0bccdb086451935d80d3703b8fa321f8a96d99a2..d9cdd16d9d1f75674f4bb9d01471eb86fe223a9a 100644
--- a/src/Components/ReportModal.js
+++ b/src/Components/ReportModal.js
@@ -28,7 +28,7 @@ import ReportUserForm from './ReportUserForm.js'
import ReportRecursoForm from './ReportRecursoForm.js'
import ReportColecaoForm from './ReportColecaoForm.js'
import {postRequest} from './HelperFunctions/getAxiosConfig'
-import SnackbarComponent from './SnackbarComponent.js'
+import Snackbar from './SnackbarComponent.js'
function CloseModalButton (props) {
return (
@@ -80,7 +80,7 @@ export default function ReportModal (props) {
return (
<React.Fragment>
- <SnackbarComponent snackbarOpen={snackbarOpen} severity={"success"} handleClose={() => {handleSnackbar(false)}} text={"Sua reclamação foi recebida."}/>
+ <Snackbar snackbarOpen={snackbarOpen} severity={"success"} handleClose={() => {handleSnackbar(false)}} text={"Sua reclamação foi recebida."}/>
<StyledModal
aria-labelledby="transition-modal-title"
aria-describedby="transition-modal-description"
diff --git a/src/Components/ResourceCardFunction.js b/src/Components/ResourceCardFunction.js
index 009310081359e26e51a92cc2fb07395fba1f9bf2..5cd567edd15ec9121b36c078a3a49f6ea972a5c0 100644
--- a/src/Components/ResourceCardFunction.js
+++ b/src/Components/ResourceCardFunction.js
@@ -36,8 +36,8 @@ import "./ResourceCard.css";
import { putRequest } from './HelperFunctions/getAxiosConfig'
import SignUpModal from './SignUpModal'
import LoginModal from './LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
+
+import SnackBar from './SnackbarComponent';
//Image Import
import { noAvatar } from "ImportImages.js";
@@ -58,10 +58,6 @@ export default function ResourceCardFunction(props) {
const [loginOpen, setLogin] = useState(false)
const [successfulLoginOpen, handleSuccessfulLogin] = useState(false)
- function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
- }
-
useEffect(() => {
//decide which thumbnail to use
if (props.thumbnail) {
@@ -149,11 +145,13 @@ export default function ResourceCardFunction(props) {
<LoginModal contrast={props.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
/>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleLoginSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleLoginSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
<StyledCard>
<CardDiv className={`${props.contrast}Text ${props.contrast}Border`}>
<CardReaDiv>
diff --git a/src/Components/ResourceCardOptions.js b/src/Components/ResourceCardOptions.js
index acec633b1e0d3bbe05a79efd69728920a51bab1d..6c1b1e36e6116dec3fbf16a9f314f3a833e46b8a 100644
--- a/src/Components/ResourceCardOptions.js
+++ b/src/Components/ResourceCardOptions.js
@@ -33,7 +33,7 @@ import ShareIcon from '@material-ui/icons/Share';
import AddIcon from '@material-ui/icons/CreateNewFolder';
import GuardarModal from './GuardarModal'
import ShareModal from './ShareModal'
-import SnackbarComponent from './SnackbarComponent'
+import Snackbar from './SnackbarComponent'
import OpenInBrowserIcon from '@material-ui/icons/OpenInBrowser';
import { getRequest } from './HelperFunctions/getAxiosConfig'
@@ -126,7 +126,7 @@ export default function ResourceCardOptions(props) {
<ShareModal contrast={props.contrast} open={shareOpen} handleClose={() => { toggleShare(false) }}
thumb={props.thumb} title={props.title} link={getShareablePageLink()}
/>
- <SnackbarComponent snackbarOpen={snackbarOpen} severity={"info"} handleClose={() => { toggleSnackbar(false) }} text={"Baixando o Recurso... Lembre-se de relatar sua experiência após o uso do Recurso!"}
+ <Snackbar snackbarOpen={snackbarOpen} severity={"info"} handleClose={() => { toggleSnackbar(false) }} text={"Baixando o Recurso... Lembre-se de relatar sua experiência após o uso do Recurso!"}
/>
<div style={{ fontSize: "12px", display: "flex", flexDirection: "column", justifyContent: "center" }}>
<ButtonNoWidth aria-controls="simple-menu" aria-haspopup="true" onClick={handleClick}>
diff --git a/src/Components/ResourceList.js b/src/Components/ResourceList.js
index e708c007b8b2f258d8dcf81c90d009d25adb48de..ce720dc78e6e0d30c19004e3cd843d0e1ee52e0b 100644
--- a/src/Components/ResourceList.js
+++ b/src/Components/ResourceList.js
@@ -26,14 +26,9 @@ import CheckBoxIcon from '@material-ui/icons/CheckBox';
import GetAppIcon from '@material-ui/icons/GetApp';
import ResourceCardFunction from './ResourceCardFunction.js';
import FloatingDownloadButton from './FloatingDownloadButton.js';
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
import { apiUrl } from '../env.js';
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
-
+import SnackBar from './SnackbarComponent';
export default function ResourceList(props) {
@@ -184,16 +179,12 @@ export default function ResourceList(props) {
);
})}
</Grid>
- <Snackbar
- open={snackInfo.open}
- autoHideDuration={6000}
- onClose={handleCloseSnack}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert onClose={handleCloseSnack} severity={snackInfo.severity}>
- {snackInfo.text}
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackInfo.open}
+ handleClose={handleCloseSnack}
+ severity={snackInfo.severity}
+ text={snackInfo.text}
+ />
<FloatingDownloadButton
handleDownloadSelection={handleDownloadSelection}
/>
diff --git a/src/Components/ResourcePageComponents/CommentsArea.js b/src/Components/ResourcePageComponents/CommentsArea.js
index 990e60982fc38606d8a4461a773154a0b30749ce..3da805e22686fe9283e03fc200dfd5ea21137941 100644
--- a/src/Components/ResourcePageComponents/CommentsArea.js
+++ b/src/Components/ResourcePageComponents/CommentsArea.js
@@ -27,22 +27,17 @@ import CommentForm from './CommentForm.js'
import Comment from '../Comment.js'
import { getRequest } from '../HelperFunctions/getAxiosConfig'
import LoginModal from './../LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
import SignUpModal from './../SignUpModal'
-import MuiAlert from '@material-ui/lab/Alert';
import CircularProgress from '@material-ui/core/CircularProgress';
import IconButton from '@material-ui/core/IconButton';
import KeyboardArrowDownIcon from '@material-ui/icons/KeyboardArrowDown';
-import SnackBarComponent from '../../Components/SnackbarComponent';
+
+import SnackBar from '../SnackbarComponent';
//Image Import
import { Comentarios } from "ImportImages.js";
import { noAvatar } from "ImportImages.js";
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
-
export default function CommentsArea(props) {
const { state } = useContext(Store)
const [comentarios, setComentarios] = useState([])
@@ -193,18 +188,20 @@ export default function CommentsArea(props) {
return (
<React.Fragment>
- <SnackBarComponent
+ <SnackBar
snackbarOpen={snackInfo.open}
handleClose={handleCloseSnack}
severity={snackInfo.severity}
text={snackInfo.text}
color={snackInfo.color}
/>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
{/*-------------------------------MODALS---------------------------------------*/}
<LoginModal contrast={props.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
diff --git a/src/Components/ResourcePageComponents/Footer.js b/src/Components/ResourcePageComponents/Footer.js
index f1bc74654af9d90ee856c4ef8a8647649c05a72e..b4b0e38678ecda0db944823b35cdb397195d9488 100644
--- a/src/Components/ResourcePageComponents/Footer.js
+++ b/src/Components/ResourcePageComponents/Footer.js
@@ -34,14 +34,10 @@ import MoreVertIcon from '@material-ui/icons/MoreVert';
import Menu from '@material-ui/core/Menu';
import MenuItem from '@material-ui/core/MenuItem';
import LoginModal from './../LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
import SignUpModal from './../SignUpModal'
-import MuiAlert from '@material-ui/lab/Alert';
import { getRequest } from '../HelperFunctions/getAxiosConfig'
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
+import SnackBar from '../SnackbarComponent';
function ReportButton(props) {
return (
@@ -148,11 +144,13 @@ export default function Footer(props) {
return (
<React.Fragment>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
{/*-------------------------------MODALS---------------------------------------*/}
<ReportModal contrast={props.contrast} open={reportOpen} handleClose={() => { toggleReport(false) }}
form="recurso"
diff --git a/src/Components/ResourcePageComponents/Sobre.js b/src/Components/ResourcePageComponents/Sobre.js
index 63f646ae6aa9aa3c0299309ae70753e2ec61fa06..a13ff431a4f2f116cb159a34443562b066b252e8 100644
--- a/src/Components/ResourcePageComponents/Sobre.js
+++ b/src/Components/ResourcePageComponents/Sobre.js
@@ -34,17 +34,13 @@ import UpdateIcon from '@material-ui/icons/Update';
import AssignmentIcon from '@material-ui/icons/Assignment';
import ContactCardOptions from '../ContactCardOptions.js'
import LoginModal from './../LoginModal.js'
-import Snackbar from '@material-ui/core/Snackbar';
import SignUpModal from './../SignUpModal'
-import MuiAlert from '@material-ui/lab/Alert';
+
+import SnackBar from '../SnackbarComponent';
//Image Import
import { License } from "ImportImages.js";
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
-
function AdditionalInfoItem(props) {
return (
<span className="meta-objeto">
@@ -171,11 +167,13 @@ export default function Sobre(props) {
return (
<React.Fragment>
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
- >
- <Alert severity="success" style={{ backgroundColor: "#00acc1" }}>Você está conectado(a)!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={successfulLoginOpen}
+ handleClose={toggleSnackbar}
+ severity={"success"}
+ color={"#00acc1"}
+ text={"Você está conectado(a)!"}
+ />
{/*-------------------------------MODALS---------------------------------------*/}
<LoginModal contrast={state.contrast} open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
openSnackbar={() => { handleSuccessfulLogin(true) }}
diff --git a/src/Components/ResourcePageComponents/TextoObjeto.js b/src/Components/ResourcePageComponents/TextoObjeto.js
index f40324cf53c37c6909325ef65bf238c8e9ef4b67..96585e7bcb769217088ae0cf9c778cc57dca8e30 100644
--- a/src/Components/ResourcePageComponents/TextoObjeto.js
+++ b/src/Components/ResourcePageComponents/TextoObjeto.js
@@ -27,10 +27,10 @@ import EditIcon from '@material-ui/icons/Edit';
import DeleteForeverIcon from '@material-ui/icons/DeleteForever';
import Button from '@material-ui/core/Button';
import {Link, Redirect} from 'react-router-dom'
-import Alert from '../Alert.js';
-import Snackbar from '@material-ui/core/Snackbar';
import {deleteRequest} from '../HelperFunctions/getAxiosConfig'
+import SnackBar from '../SnackbarComponent';
+
export default function TextoObjeto (props) {
const {state} = useContext(Store)
@@ -111,13 +111,13 @@ export default function TextoObjeto (props) {
}}
/>
}
- <Snackbar open={snackbarOpen} autoHideDuration={1000} onClose={() => {toggleSnackbar(false)}}
- anchorOrigin = {{ vertical:'top', horizontal:'right' }}
- >
- <Alert severity="info" style={{backgroundColor:"#00acc1"}}>
- Recurso excluido com sucesso!
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackbarOpen}
+ handleClose={() => {toggleSnackbar(false)}}
+ severity={"info"}
+ color={"#00acc1"}
+ text={"Recurso excluido com sucesso!"}
+ />
<Grid container style={{paddingLeft : "15px"}}>
<Grid item xs={11}>
<h3>{props.name}</h3>
diff --git a/src/Components/SignUpModal.js b/src/Components/SignUpModal.js
index 3114f8e578e5e8c83bd15bfa08f9c9db81ff1e7f..8a329fcac137299ee68150daf5520ecb79237db0 100644
--- a/src/Components/SignUpModal.js
+++ b/src/Components/SignUpModal.js
@@ -23,13 +23,8 @@ import styled from 'styled-components'
import SignUpContainer from './SignUpContainerFunction.js'
import { Store } from '../Store.js'
import { authentication } from './HelperFunctions/getAxiosConfig'
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
-//import {postRequest} from './HelperFunctions/getAxiosConfig'
-export function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
+import SnackBar from './SnackbarComponent';
export default function SignUpModal(props) {
const { state, dispatch } = useContext(Store)
@@ -73,11 +68,12 @@ export default function SignUpModal(props) {
return (
<>
- <Snackbar open={snackbarOpened} autoHideDuration={1000} onClose={handleCloseSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert severity="error">Ocorreu um erro ao se conectar!</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackbarOpened}
+ handleClose={handleCloseSnackbar}
+ severity={"error"}
+ text={"Ocorreu um erro ao se conectar!"}
+ />
<StyledModalSignUp
aria-labelledby="transition-modal-title"
aria-describedby="transition-modal-description"
diff --git a/src/Components/SnackbarComponent.js b/src/Components/SnackbarComponent.js
index 9017c2dc36b44ecb3daa836d5f534e5e1672e948..0250f3a5c0aed5cd908b2c0752f0b3a0ecb59419 100644
--- a/src/Components/SnackbarComponent.js
+++ b/src/Components/SnackbarComponent.js
@@ -16,19 +16,19 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>.*/
-import React, { /*useContext*/ } from 'react'
-import Alert from '../Components/Alert.js';
+import React, { useContext } from 'react'
+import Alert from './Alert.js';
import Snackbar from '@material-ui/core/Snackbar';
-//import { Store } from '../Store.js'
+import { Store } from '../Store.js'
export default function SnackbarComponent(props) {
-// const { state } = useContext(Store)
+ const { state } = useContext(Store)
return (
- <Snackbar open={props.snackbarOpen} autoHideDuration={3000} onClose={props.handleClose}
+ <Snackbar open={props.snackbarOpen} autoHideDuration={2000} onClose={props.handleClose}
anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
>
- <Alert severity={props.severity}>
+ <Alert severity={props.severity} style={state.contrast === "" ? props.color ? { backgroundColor: props.color } : {} : { backgroundColor: "black", color: "white", border: "1px solid white" }}>
{props.text}
</Alert>
</Snackbar>
diff --git a/src/Components/TabPanels/UserPageTabs/ModalExcluirConta.js b/src/Components/TabPanels/UserPageTabs/ModalExcluirConta.js
index 19f4c6e4485d3e674e1d5ba01a43ffd15932cf35..e4e99bc6a5c4187577a34e1e64236b5db2effb85 100644
--- a/src/Components/TabPanels/UserPageTabs/ModalExcluirConta.js
+++ b/src/Components/TabPanels/UserPageTabs/ModalExcluirConta.js
@@ -27,7 +27,7 @@ import CloseIcon from '@material-ui/icons/Close';
import GreyButton from '../../GreyButton'
import FormInput from '../../FormInput'
import {Link} from 'react-router-dom'
-import SnackbarComponent from '../../SnackbarComponent.js'
+import Snackbar from '../../SnackbarComponent.js'
import {deleteRequest} from '../../HelperFunctions/getAxiosConfig'
//Image Import
@@ -78,7 +78,7 @@ export default function ModalExcluirConta (props) {
return (
<React.Fragment>
- <SnackbarComponent snackbarOpen={snackbarOpen} severity={"info"} handleClose={() => {toggleSnackbar(false)}} text={deletedAccountText}/>
+ <Snackbar snackbarOpen={snackbarOpen} severity={"info"} handleClose={() => {toggleSnackbar(false)}} text={deletedAccountText}/>
<StyledModal
aria-labelledby="transition-modal-title"
aria-describedby="transition-modal-description"
diff --git a/src/Components/UploadPageComponents/UploadFileWrapper.js b/src/Components/UploadPageComponents/UploadFileWrapper.js
index 866f02097561cf25a9075ff8b3bb208c08bec2d5..8aa1b13b123b3954d17eeb4a4217199830f99f4e 100644
--- a/src/Components/UploadPageComponents/UploadFileWrapper.js
+++ b/src/Components/UploadPageComponents/UploadFileWrapper.js
@@ -27,8 +27,8 @@ import axios from 'axios'
import { apiUrl } from '../../env';
import DoneIcon from '@material-ui/icons/Done';
import DeleteIcon from '@material-ui/icons/Delete';
-import Alert from '../Alert.js';
-import Snackbar from '@material-ui/core/Snackbar';
+
+import SnackBar from '../SnackbarComponent';
export default function UploadFileWrapper(props) {
/*-----------------------------------------------------------------
@@ -221,13 +221,13 @@ export default function UploadFileWrapper(props) {
case "choosingLink":
return (
<React.Fragment>
- <Snackbar open={snackbarOpen} autoHideDuration={1000} onClose={() => { toggleSnackbar(false) }}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert severity="info" style={{ backgroundColor: "#00acc1" }}>
- Link salvo com sucesso!
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackbarOpen}
+ handleClose={() => { toggleSnackbar(false) }}
+ severity={"info"}
+ color={"#00acc1"}
+ text={"Link salvo com sucesso!"}
+ />
<ChooseLink contrast={props.contrast} handleNextStage={handleNextStage} submit={handleChooseLink} />
</React.Fragment>
)
diff --git a/src/Pages/ChangePasswordPage.js b/src/Pages/ChangePasswordPage.js
index a7f90c2203cdd680446f35977b71d97424d4b4f6..c7a2d84b441e029b8d6a915d4fbcf2613f97afc6 100644
--- a/src/Pages/ChangePasswordPage.js
+++ b/src/Pages/ChangePasswordPage.js
@@ -7,17 +7,13 @@ import { CompletarCadastroButton } from '../Components/TabPanels/UserPageTabs/Pa
import ValidateUserInput from '../Components/HelperFunctions/FormValidationFunction.js'
import CustomizedBreadcrumbs from '../Components/TabPanels/Breadcrumbs.js'
import { putRequest } from '../Components/HelperFunctions/getAxiosConfig'
-import Snackbar from '@material-ui/core/Snackbar'
-import MuiAlert from '@material-ui/lab/Alert'
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} />;
-}
+import SnackBar from '../Components/SnackbarComponent';
export default function ChangePasswordPage(props) {
const { state } = useContext(Store)
@@ -176,16 +172,12 @@ export default function ChangePasswordPage(props) {
if (error)
return (
<BackgroundDiv contrast={state.contrast}>
- <Snackbar
- open={snackInfo.open}
- autoHideDuration={6000}
- onClose={handleCloseSnack}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert onClose={handleCloseSnack} severity={snackInfo.severity}>
- {snackInfo.text}
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackInfo.open}
+ handleClose={handleCloseSnack}
+ severity={snackInfo.severity}
+ text={snackInfo.text}
+ />
<div>
<CustomizedBreadcrumbs contrast={state.contrast}
values={["Recuperar senha", "Alterar senha"]}
@@ -207,16 +199,12 @@ export default function ChangePasswordPage(props) {
else if (success)
return (
<BackgroundDiv contrast={state.contrast}>
- <Snackbar
- open={snackInfo.open}
- autoHideDuration={6000}
- onClose={handleCloseSnack}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert onClose={handleCloseSnack} severity={snackInfo.severity}>
- {snackInfo.text}
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackInfo.open}
+ handleClose={handleCloseSnack}
+ severity={snackInfo.severity}
+ text={snackInfo.text}
+ />
<div>
<CustomizedBreadcrumbs contrast={state.contrast}
values={["Recuperar senha", "Alterar senha"]}
@@ -238,16 +226,12 @@ export default function ChangePasswordPage(props) {
else
return (
<BackgroundDiv contrast={state.contrast}>
- <Snackbar
- open={snackInfo.open}
- autoHideDuration={6000}
- onClose={handleCloseSnack}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert onClose={handleCloseSnack} severity={snackInfo.severity}>
- {snackInfo.text}
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackInfo.open}
+ handleClose={handleCloseSnack}
+ severity={snackInfo.severity}
+ text={snackInfo.text}
+ />
<div>
<CustomizedBreadcrumbs contrast={state.contrast}
values={["Recuperar senha", "Alterar senha"]}
diff --git a/src/Pages/EditLearningObjectPage.js b/src/Pages/EditLearningObjectPage.js
index e9b4da89fa5c10ce21e6cd2a33e53d1552284365..a8325bc0d4a3b5dfcf1208a57c298d7bc58ebeb7 100644
--- a/src/Pages/EditLearningObjectPage.js
+++ b/src/Pages/EditLearningObjectPage.js
@@ -22,8 +22,6 @@ import axios from 'axios'
import {apiUrl, apiDomain} from '../env';
import Grid from '@material-ui/core/Grid';
import UploadFileWrapper from '../Components/UploadPageComponents/UploadFileWrapper.js'
-import Alert from '../Components/Alert.js';
-import Snackbar from '@material-ui/core/Snackbar';
import {Redirect} from 'react-router-dom'
import {GreyButton, OrangeButton, InfoBox} from '../Components/UploadPageComponents/StyledComponents.js'
import {Background} from '../Components/UploadPageComponents/StyledComponents'
@@ -43,6 +41,8 @@ import DisplayThumbnail from '../Components/UploadPageComponents/PartTwoComponen
import DragAndDropThumbnail from '../Components/UploadPageComponents/PartTwoComponents/DragAndDropThumbnail'
import {getRequest, deleteRequest, putRequest, postRequest} from '../Components/HelperFunctions/getAxiosConfig.js'
+import SnackBar from '../Components/SnackbarComponent';
+
export default function EditLearningObjectPage (props) {
const recursoId = props.match.params.recursoId
const {state} = useContext(Store)
@@ -246,13 +246,13 @@ export default function EditLearningObjectPage (props) {
}}
/>
}
- <Snackbar open={snackbarOpen} autoHideDuration={1000} onClose={() => {toggleSnackbar(false)}}
- anchorOrigin = {{ vertical:'top', horizontal:'right' }}
- >
- <Alert severity="info" style={{backgroundColor:"#00acc1"}}>
- Recurso excluido com sucesso!
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackbarOpen}
+ handleClose={() => {toggleSnackbar(false)}}
+ severity={"info"}
+ color={"#00acc1"}
+ text={"Recurso excluido com sucesso!"}
+ />
{
!loading ?
(
diff --git a/src/Pages/EditProfilePage.js b/src/Pages/EditProfilePage.js
index 6ed58aec32a714348acef51edd0b8b49000743c8..56a72c8cac3ddca27ec88dda0c36f367c84c95b6 100644
--- a/src/Pages/EditProfilePage.js
+++ b/src/Pages/EditProfilePage.js
@@ -6,13 +6,13 @@ import Paper from '@material-ui/core/Paper';
import TabPanelEditarPerfil from '../Components/TabPanels/UserPageTabs/PanelEditarPerfil.js'
import TabPanelSolicitarContaProfessor from '../Components/TabPanels/UserPageTabs/PanelSolicitarContaProfessor.js'
import TabPanelGerenciarConta from '../Components/TabPanels/UserPageTabs/PanelGerenciarConta.js'
-import Snackbar from '@material-ui/core/Snackbar';
-import { Alert } from '../Components/LoginModal.js'
import Grid from '@material-ui/core/Grid'
import CustomizedBreadcrumbs from '../Components/TabPanels/Breadcrumbs.js'
import { putRequest } from '../Components/HelperFunctions/getAxiosConfig'
import { Store } from '../Store.js'
+import SnackBar from '../Components/SnackbarComponent';
+
export default function EditProfilePage(props) {
const { state, dispatch } = useContext(Store)
const id = state.currentUser.id
@@ -120,11 +120,12 @@ export default function EditProfilePage(props) {
return (
<Main contrast={state.contrast}>
- <Snackbar open={snackbarOpened.open} autoHideDuration={1000} onClose={handleCloseSnackbar}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert severity={snackbarOpened.severity} >{snackbarOpened.text}</Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackbarOpened.open}
+ handleClose={handleCloseSnackbar}
+ severity={snackbarOpened.severity}
+ text={snackbarOpened.text}
+ />
<CustomizedBreadcrumbs
contrast={state.contrast}
diff --git a/src/Pages/ResourcePage.js b/src/Pages/ResourcePage.js
index 17cc07adf2121aface9b8140785ce21098d1da89..290de7b749eafef0bff765b3b87ca2aabf33fe58 100644
--- a/src/Pages/ResourcePage.js
+++ b/src/Pages/ResourcePage.js
@@ -25,8 +25,6 @@ import TextoObjeto from "../Components/ResourcePageComponents/TextoObjeto.js";
import Footer from "../Components/ResourcePageComponents/Footer.js";
import Sobre from "../Components/ResourcePageComponents/Sobre.js";
import CommentsArea from "../Components/ResourcePageComponents/CommentsArea.js";
-import Snackbar from "@material-ui/core/Snackbar";
-import Alert from "../Components/Alert.js";
import VideoPlayer from "../Components/ResourcePageComponents/VideoPlayer.js";
import LoadingSpinner from "../Components/LoadingSpinner.js";
import { makeStyles } from "@material-ui/core/styles";
@@ -38,6 +36,8 @@ import { getRequest } from "../Components/HelperFunctions/getAxiosConfig";
import Button from '@material-ui/core/Button';
import { Link } from 'react-router-dom';
+import SnackBar from '../Components/SnackbarComponent';
+
//Image Import
import { noAvatar } from "ImportImages.js";
@@ -166,183 +166,179 @@ export default function LearningObjectPage(props) {
else
return (
<React.Fragment>
- <Snackbar
- open={snackbarOpen}
- autoHideDuration={6000}
- onClose={toggleSnackbar}
- anchorOrigin={{ vertical: "top", horizontal: "right" }}
- >
- <Alert severity="info"
- style={{ backgroundColor: "#00acc1" }}>
- {snackbarText[snackbarIndex]}
- </Alert>
- </Snackbar>
-
- <ModalAvaliarRecurso
- contrast={state.contrast}
- open={modalCuradoriaOpen}
- handleClose={() => {
- handleModalCuradoria(false);
- }}
- title={recurso.name}
- confirm={handleConfirm}
- setCriteria={setReportCriteria}
- />
- <ModalConfirmarCuradoria
- contrast={state.contrast}
- aceito={submissionAccepted}
- reportCriteria={reportCriteria}
- justificativa={justificativa}
- open={modalConfirmarCuradoriaOpen}
- handleClose={() => {
- handleModalConfirmarCuradoria(false);
- }}
- cancel={() => {
- handleModalCuradoria(true);
- }}
- recursoId={recurso.submission_id}
- finalizeCuratorshipFlow={finalizeCuratorshipFlow}
- handleErrorAprove={() => {
- handleSnackbar(6)
- }}
- />
- <Background contrast={state.contrast}>
- {carregando ? (
- <LoadingSpinner contrast={state.contrast} text={"Carregando Recurso"} />
- ) : (
- <>
- <Grid container spacing={2}>
- {recurso.object_type === "Vídeo" && !recurso.link ? (
- <Grid item xs={12}>
- <Card contrast={state.contrast}>
- <VideoPlayer
+ <SnackBar
+ snackbarOpen={snackbarOpen}
+ handleClose={toggleSnackbar}
+ severity={"info"}
+ color={"#00acc1"}
+ text={snackbarText[snackbarIndex]}
+ />
+
+ <ModalAvaliarRecurso
+ contrast={state.contrast}
+ open={modalCuradoriaOpen}
+ handleClose={() => {
+ handleModalCuradoria(false);
+ }}
+ title={recurso.name}
+ confirm={handleConfirm}
+ setCriteria={setReportCriteria}
+ />
+ <ModalConfirmarCuradoria
+ contrast={state.contrast}
+ aceito={submissionAccepted}
+ reportCriteria={reportCriteria}
+ justificativa={justificativa}
+ open={modalConfirmarCuradoriaOpen}
+ handleClose={() => {
+ handleModalConfirmarCuradoria(false);
+ }}
+ cancel={() => {
+ handleModalCuradoria(true);
+ }}
+ recursoId={recurso.submission_id}
+ finalizeCuratorshipFlow={finalizeCuratorshipFlow}
+ handleErrorAprove={() => {
+ handleSnackbar(6)
+ }}
+ />
+ <Background contrast={state.contrast}>
+ {carregando ? (
+ <LoadingSpinner contrast={state.contrast} text={"Carregando Recurso"} />
+ ) : (
+ <>
+ <Grid container spacing={2}>
+ {recurso.object_type === "Vídeo" && !recurso.link ? (
+ <Grid item xs={12}>
+ <Card contrast={state.contrast}>
+ <VideoPlayer
+ contrast={state.contrast}
+ link={recurso.link}
+ urlVerified={false}
+ videoUrl={recurso.default_attachment_location}
+ videoType={recurso.default_mime_type}
+ />
+ </Card>
+ </Grid>
+ ) : (
+ urlVerify(recurso.link) && (
+ <Grid item xs={12}>
+ <Card contrast={state.contrast}>
+ <VideoPlayer contrast={state.contrast} link={recurso.link} urlVerified={true} />
+ </Card>
+ </Grid>
+ )
+ )}
+
+ <Grid item xs={12}>
+ <Card contrast={state.contrast}>
+ <div>
+ {recurso.thumbnail && (
+ <img alt="recurso" src={apiDomain + recurso.thumbnail} />
+ )}
+
+ <TextoObjeto
contrast={state.contrast}
- link={recurso.link}
- urlVerified={false}
- videoUrl={recurso.default_attachment_location}
- videoType={recurso.default_mime_type}
+ name={recurso.name}
+ rating={recurso.review_average}
+ recursoId={id}
+ likesCount={recurso.likes_count}
+ likedBool={recurso.liked}
+ objType={recurso.object_type}
+ subjects={recurso.subjects}
+ educationalStages={recurso.educational_stages}
+ viewCount={recurso.views_count}
+ downloadCount={recurso.downloads_count}
+ id={recurso.publisher ? recurso.publisher.id : undefined}
+ stateRecurso={recurso.state}
+ attachments={recurso.attachments}
+ audioUrl={recurso.default_attachment_location}
/>
- </Card>
- </Grid>
- ) : (
- urlVerify(recurso.link) && (
- <Grid item xs={12}>
- <Card contrast={state.contrast}>
- <VideoPlayer contrast={state.contrast} link={recurso.link} urlVerified={true} />
- </Card>
- </Grid>
- )
- )}
-
- <Grid item xs={12}>
- <Card contrast={state.contrast}>
- <div>
- {recurso.thumbnail && (
- <img alt="recurso" src={apiDomain + recurso.thumbnail} />
- )}
+ </div>
- <TextoObjeto
+ <Footer
contrast={state.contrast}
- name={recurso.name}
- rating={recurso.review_average}
recursoId={id}
- likesCount={recurso.likes_count}
- likedBool={recurso.liked}
- objType={recurso.object_type}
- subjects={recurso.subjects}
- educationalStages={recurso.educational_stages}
- viewCount={recurso.views_count}
- downloadCount={recurso.downloads_count}
- id={recurso.publisher ? recurso.publisher.id : undefined}
- stateRecurso={recurso.state}
- attachments={recurso.attachments}
- audioUrl={recurso.default_attachment_location}
+ downloadableLink={recurso.default_attachment_location}
+ handleSnackbar={handleSnackbar}
+ link={recurso.link}
+ title={recurso.name}
+ thumb={recurso.thumbnail}
+ currPageLink={window.location.href}
+ complained={recurso.complained}
/>
- </div>
-
- <Footer
- contrast={state.contrast}
- recursoId={id}
- downloadableLink={recurso.default_attachment_location}
- handleSnackbar={handleSnackbar}
- link={recurso.link}
- title={recurso.name}
- thumb={recurso.thumbnail}
- currPageLink={window.location.href}
- complained={recurso.complained}
- />
- </Card>
- </Grid>
-
- <Grid item xs={12}>
- <Card contrast={state.contrast}>
- {/*todo: change render method on additional item info*/}
- <Sobre
- avatar={
- recurso.publisher
- ? recurso.publisher.avatar
- ? apiDomain + recurso.publisher.avatar
- : noAvatar
- : noAvatar
- }
- publisher={
- recurso.publisher ? recurso.publisher.name : undefined
- }
- id={recurso.publisher ? recurso.publisher.id : undefined}
- description={recurso.description}
- author={recurso.author}
- tags={recurso.tags}
- attachments={recurso.attachments}
- language={recurso.language}
- mimeType={recurso.default_mime_type}
- createdAt={recurso.created_at}
- updatedAt={recurso.updated_at}
- license={recurso.license}
- followed={recurso.publisher ? recurso.publisher.followed : undefined}
- />
- </Card>
- </Grid>
+ </Card>
+ </Grid>
- {recurso.state !== "submitted" && (
<Grid item xs={12}>
<Card contrast={state.contrast}>
- {/*adicionar funcionalidade ao botao de entrar*/}
- <CommentsArea
- recursoId={id}
- handleSnackbar={handleSnackbar}
- objType={recurso.object_type}
- recurso={true}
+ {/*todo: change render method on additional item info*/}
+ <Sobre
+ avatar={
+ recurso.publisher
+ ? recurso.publisher.avatar
+ ? apiDomain + recurso.publisher.avatar
+ : noAvatar
+ : noAvatar
+ }
+ publisher={
+ recurso.publisher ? recurso.publisher.name : undefined
+ }
+ id={recurso.publisher ? recurso.publisher.id : undefined}
+ description={recurso.description}
+ author={recurso.author}
+ tags={recurso.tags}
+ attachments={recurso.attachments}
+ language={recurso.language}
+ mimeType={recurso.default_mime_type}
+ createdAt={recurso.created_at}
+ updatedAt={recurso.updated_at}
+ license={recurso.license}
+ followed={recurso.publisher ? recurso.publisher.followed : undefined}
/>
</Card>
</Grid>
- )}
- </Grid>
-
- {recurso.state === "submitted" && checkAccessLevel("curator") && (
- <AppBar
- position="fixed"
- className={classes.appBar}
- style={state.contrast === "" ? { backgroundColor: "white" } : { backgroundColor: "black", borderTop: "1px solid white" }}
- >
- <StyledAppBarContainer contrast={state.contrast}>
- <div className="container">
- <div className="botoes">
- <ButtonAvaliarRecurso
- contrast={state.contrast}
- callback={() => {
- handleModalCuradoria(true);
- }}
+
+ {recurso.state !== "submitted" && (
+ <Grid item xs={12}>
+ <Card contrast={state.contrast}>
+ {/*adicionar funcionalidade ao botao de entrar*/}
+ <CommentsArea
+ recursoId={id}
+ handleSnackbar={handleSnackbar}
+ objType={recurso.object_type}
+ recurso={true}
/>
+ </Card>
+ </Grid>
+ )}
+ </Grid>
+
+ {recurso.state === "submitted" && checkAccessLevel("curator") && (
+ <AppBar
+ position="fixed"
+ className={classes.appBar}
+ style={state.contrast === "" ? { backgroundColor: "white" } : { backgroundColor: "black", borderTop: "1px solid white" }}
+ >
+ <StyledAppBarContainer contrast={state.contrast}>
+ <div className="container">
+ <div className="botoes">
+ <ButtonAvaliarRecurso
+ contrast={state.contrast}
+ callback={() => {
+ handleModalCuradoria(true);
+ }}
+ />
+ </div>
</div>
- </div>
- </StyledAppBarContainer>
- </AppBar>
- )}
- </>
- )}
- </Background>
- </React.Fragment>
- );
+ </StyledAppBarContainer>
+ </AppBar>
+ )}
+ </>
+ )}
+ </Background>
+ </React.Fragment>
+ );
}
const useStyles = makeStyles((theme) => ({
diff --git a/src/Pages/Search.js b/src/Pages/Search.js
index cedd26122f5acd816dd39c1912c79f21b1ea0774..89cff15f4d95264311bd2576200046d57616950d 100644
--- a/src/Pages/Search.js
+++ b/src/Pages/Search.js
@@ -36,13 +36,9 @@ import {
filtersStages,
filtersLanguages,
} from '../Components/SearchPageComponents/filters';
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
import { Store } from '../Store'
-function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
-}
+import SnackBar from '../Components/SnackbarComponent';
export default function Search() {
const history = useHistory();
@@ -430,16 +426,12 @@ export default function Search() {
return (
<div style={state.contrast === "" ? {} : { backgroundColor: "black" }}>
<MainPageError>
- <Snackbar
- open={snackInfo.open}
- autoHideDuration={6000}
- onClose={handleCloseSnack}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert onClose={handleCloseSnack} severity={snackInfo.severity}>
- {snackInfo.text}
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackInfo.open}
+ handleClose={handleCloseSnack}
+ severity={snackInfo.severity}
+ text={snackInfo.text}
+ />
<Error contrast={state.contrast} />
</MainPageError>
</div>
@@ -448,16 +440,12 @@ export default function Search() {
return (
<div style={state.contrast === "" ? {} : { backgroundColor: "black" }}>
<MainPage>
- <Snackbar
- open={snackInfo.open}
- autoHideDuration={6000}
- onClose={handleCloseSnack}
- anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
- >
- <Alert onClose={handleCloseSnack} severity={snackInfo.severity}>
- {snackInfo.text}
- </Alert>
- </Snackbar>
+ <SnackBar
+ snackbarOpen={snackInfo.open}
+ handleClose={handleCloseSnack}
+ severity={snackInfo.severity}
+ text={snackInfo.text}
+ />
<StyledBreadCrumbs contrast={state.contrast}>
<Link to='/'>Página Inicial</Link>
<span>Busca</span>