From 66fab99fa9fd727c37e4564eb6e76c46030d33cf Mon Sep 17 00:00:00 2001 From: Vinicius Gabriel Machado <vgm18@inf.ufpr.br> Date: Wed, 7 Jul 2021 22:12:19 -0300 Subject: [PATCH] Updating some things changed in Develop --- src/Admin/Components/Components/AdminTemplate.js | 2 +- src/Components/ResourcePageComponents/CommentsArea.js | 5 ++++- src/Components/SearchPageComponents/CollectionTemplate.js | 6 ++++-- src/Components/SearchPageComponents/ResourceTemplate.js | 6 ++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/Admin/Components/Components/AdminTemplate.js b/src/Admin/Components/Components/AdminTemplate.js index 3677dea3..e0affe5c 100644 --- a/src/Admin/Components/Components/AdminTemplate.js +++ b/src/Admin/Components/Components/AdminTemplate.js @@ -61,4 +61,4 @@ const AdminTemplate = (props) => { ) } -export default AdminTemplate; \ No newline at end of file +export default AdminTemplate; diff --git a/src/Components/ResourcePageComponents/CommentsArea.js b/src/Components/ResourcePageComponents/CommentsArea.js index 7472b087..1ee202d9 100644 --- a/src/Components/ResourcePageComponents/CommentsArea.js +++ b/src/Components/ResourcePageComponents/CommentsArea.js @@ -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} />; } diff --git a/src/Components/SearchPageComponents/CollectionTemplate.js b/src/Components/SearchPageComponents/CollectionTemplate.js index c3bcb3ee..d75c13a4 100644 --- a/src/Components/SearchPageComponents/CollectionTemplate.js +++ b/src/Components/SearchPageComponents/CollectionTemplate.js @@ -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 há dados nessa página. </h3> - <img src={noCollections} alt='No cards' /> + <img src={ColecaoVazia} alt='No cards' /> </NoContentDiv> } </Grid> diff --git a/src/Components/SearchPageComponents/ResourceTemplate.js b/src/Components/SearchPageComponents/ResourceTemplate.js index 01f74736..362bf17d 100644 --- a/src/Components/SearchPageComponents/ResourceTemplate.js +++ b/src/Components/SearchPageComponents/ResourceTemplate.js @@ -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 há dados nessa página. </h3> - <img src={noResources} alt='No cards' /> + <img src={RecursoVazio} alt='No cards' /> </NoContentDiv> } </Grid> -- GitLab