Skip to content
Snippets Groups Projects
Commit 66fab99f authored by vgm18's avatar vgm18
Browse files

Updating some things changed in Develop

parent ceff7bb0
No related branches found
No related tags found
3 merge requests!78MERGE DEVELOP INTO MASTER,!77Merge develop into master,!74Improved performance
......@@ -31,11 +31,14 @@ 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 noAvatar from '../../img/default_profile.png';
import IconButton from '@material-ui/core/IconButton';
import KeyboardArrowDownIcon from '@material-ui/icons/KeyboardArrowDown';
import SnackBarComponent from '../../Components/SnackbarComponent';
//Image Import
import { Comentarios } from "ImportImages.js";
import { noAvatar } from "ImportImages.js";
function Alert(props) {
return <MuiAlert elevation={6} variant="filled" {...props} />;
}
......
......@@ -3,12 +3,14 @@ import Paper from '@material-ui/core/Paper';
import styled from 'styled-components';
import Grid from '@material-ui/core/Grid';
import LoadingSpinner from '../LoadingSpinner';
import noCollections from '../../img/Pagina_vazia_colecao.png';
import CollectionCardFunction from '../CollectionCardFunction';
import IconButton from '@material-ui/core/IconButton';
import ArrowBackIcon from '@material-ui/icons/ArrowBack';
import ArrowForwardIcon from '@material-ui/icons/ArrowForward';
//Image Import
import { ColecaoVazia } from "ImportImages.js";
export default function ResourceTemplate({ isLoading, resources, totalResources, currPage, handlePreviousPage, handleNextPage }) {
const topRef = React.useRef();
const totalPages = parseInt(totalResources) === 0 ? 0 : Math.ceil(totalResources / 12) - 1; //Dividing by 12 because i want to cath total pages, and results per page is 12
......@@ -54,7 +56,7 @@ export default function ResourceTemplate({ isLoading, resources, totalResources,
<h3>
Desculpe, não dados nessa página.
</h3>
<img src={noCollections} alt='No cards' />
<img src={ColecaoVazia} alt='No cards' />
</NoContentDiv>
}
</Grid>
......
......@@ -3,12 +3,14 @@ import Paper from '@material-ui/core/Paper';
import styled from 'styled-components';
import Grid from '@material-ui/core/Grid';
import LoadingSpinner from '../LoadingSpinner';
import noResources from '../../img/Pagina_vazia_Sem_publicar.png';
import ResourceCardFunction from '../ResourceCardFunction';
import IconButton from '@material-ui/core/IconButton';
import ArrowBackIcon from '@material-ui/icons/ArrowBack';
import ArrowForwardIcon from '@material-ui/icons/ArrowForward';
//Image Import
import { RecursoVazio } from "ImportImages.js";
export default function ResourceTemplate({ isLoading, resources, totalResources, currPage, handlePreviousPage, handleNextPage }) {
const totalPages = parseInt(totalResources) === 0 ? 0 : Math.ceil(totalResources / 12) - 1; //Dividing by 12 because i want to cath total pages, and results per page is 12
const topRef = React.useRef();
......@@ -54,7 +56,7 @@ export default function ResourceTemplate({ isLoading, resources, totalResources,
<h3>
Desculpe, não dados nessa página.
</h3>
<img src={noResources} alt='No cards' />
<img src={RecursoVazio} alt='No cards' />
</NoContentDiv>
}
</Grid>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment