From 00682c135e53fbb53c24e55cd4cf41ccb8a90680 Mon Sep 17 00:00:00 2001
From: Vinicius Gabriel Machado <vgm18@inf.ufpr.br>
Date: Mon, 2 Aug 2021 02:03:56 -0300
Subject: [PATCH] Fixed carousel background on about page, added option to
create collection in guardar modal when collection number = 0 and fixed
button like in resource card when not logged in
---
src/Components/AboutCarousel.css | 4 ++++
src/Components/AboutCarouselPartner.css | 4 ++++
src/Components/GuardarModal.js | 15 ++++++++-------
src/Components/ResourceCardFunction.js | 11 +++++++----
src/Components/ResourceCardOptions.js | 21 ++++++++-------------
src/Components/carousel.css | 5 +++--
6 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/src/Components/AboutCarousel.css b/src/Components/AboutCarousel.css
index 92e69e00..1e258659 100644
--- a/src/Components/AboutCarousel.css
+++ b/src/Components/AboutCarousel.css
@@ -3,4 +3,8 @@
}
.dot{
border: 1px solid black;
+}
+
+.carousel .slide {
+ background-color: inherit !important;
}
\ No newline at end of file
diff --git a/src/Components/AboutCarouselPartner.css b/src/Components/AboutCarouselPartner.css
index 4ccfbadb..d009fc14 100644
--- a/src/Components/AboutCarouselPartner.css
+++ b/src/Components/AboutCarouselPartner.css
@@ -3,4 +3,8 @@
}
.dot{
border: 1px solid black;
+}
+
+.carousel .slide {
+ background-color: inherit !important;
}
\ No newline at end of file
diff --git a/src/Components/GuardarModal.js b/src/Components/GuardarModal.js
index 9b49137c..075f74d6 100644
--- a/src/Components/GuardarModal.js
+++ b/src/Components/GuardarModal.js
@@ -40,7 +40,7 @@ function CloseModalButton(props) {
)
}
-export default function ReportModal(props) {
+export default function GuardarModal(props) {
const { state } = useContext(Store)
const [collsArr, setcolls] = useState([])
const [loading, toggleLoading] = useState(true)
@@ -169,7 +169,7 @@ export default function ReportModal(props) {
<div classname="no-cols">
<h2>Você não possui coleções ainda.</h2>
</div>
- </>
+ </>
)
:
(
@@ -194,17 +194,18 @@ export default function ReportModal(props) {
}
</div>
</ChooseCol>
- <div style={{ display: "flex", justifyContent: "center" }}>
- <CriarColButton onClick={() => { setCreating(true) }}>CRIAR COLEÇÃO</CriarColButton>
- </div>
</>
)
)
}
</ChooseColContainer>
+
)
- }
+ }
+ <div style={{ display: "flex", justifyContent: "center" }}>
+ <CriarColButton onClick={() => { setCreating(true) }}>CRIAR COLEÇÃO</CriarColButton>
+ </div>
</Content>
</Container>
</Fade>
@@ -308,7 +309,7 @@ const ResourceInfo = styled.div`
overflow : hidden;
border-radius : 5px;
display : flex;
- flex-direction : row;
+ flex-direction : column;
align-items : center;
align-content : center;
max-wdith : 100%;
diff --git a/src/Components/ResourceCardFunction.js b/src/Components/ResourceCardFunction.js
index 5ccc0325..d81a0ade 100644
--- a/src/Components/ResourceCardFunction.js
+++ b/src/Components/ResourceCardFunction.js
@@ -16,7 +16,8 @@ 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, { useState, useEffect } from 'react';
+import React, { useState, useContext, useEffect } from 'react';
+import { Store } from '../Store.js'
import Card from '@material-ui/core/Card';
import { apiDomain } from '../env';
import ResourceCardOptions from './ResourceCardOptions'
@@ -42,6 +43,7 @@ import { noAvatar } from "ImportImages.js";
import { IcDefault } from "ImportImages.js";
export default function ResourceCardFunction(props) {
+ const { state } = useContext(Store)
const [thumbnail, setThumbnail] = useState(null)
// eslint-disable-next-line
const [label, setLabel] = useState(props.type)
@@ -83,9 +85,10 @@ export default function ResourceCardFunction(props) {
}
const handleLike = () => {
- const url = `/learning_objects/${props.id}/like/`
-
- putRequest(url, {}, handleSuccessLike, (error) => { console.log(error) })
+ if (state.currentUser.id)
+ putRequest(`/learning_objects/${props.id}/like/`, {}, handleSuccessLike, (error) => { console.log(error) })
+ else
+ handleLogin()
}
const handleLogin = () => {
diff --git a/src/Components/ResourceCardOptions.js b/src/Components/ResourceCardOptions.js
index 2e89a35a..1ac22f4a 100644
--- a/src/Components/ResourceCardOptions.js
+++ b/src/Components/ResourceCardOptions.js
@@ -35,7 +35,6 @@ import GuardarModal from './GuardarModal'
import ShareModal from './ShareModal'
import SnackbarComponent from './SnackbarComponent'
import OpenInBrowserIcon from '@material-ui/icons/OpenInBrowser';
-import Tooltip from '@material-ui/core/Tooltip';
import { getRequest } from './HelperFunctions/getAxiosConfig'
export default function ResourceCardOptions(props) {
@@ -140,19 +139,15 @@ export default function ResourceCardOptions(props) {
open={Boolean(anchorEl)}
onClose={handleClose}
>
- <Tooltip title="Não preserva filtro" arrow>
- <StyledMenuItem onClick={handleClose}>
- <Link to={"/recurso/" + props.learningObjectId}>
- <ListItemIcon><OpenIcon /></ListItemIcon>Abrir
- </Link>
- </StyledMenuItem>
- </Tooltip>
+ <StyledMenuItem>
+ <Link to={"/recurso/" + props.learningObjectId}>
+ <ListItemIcon><OpenIcon /></ListItemIcon>Abrir
+ </Link>
+ </StyledMenuItem>
- <Tooltip title="Preserva filtro" arrow>
- <StyledMenuItem onClick={() => window.open("/recurso/" + props.learningObjectId, "_blank")}>
- <ListItemIcon><OpenInBrowserIcon /></ListItemIcon> Abrir em nova guia
- </StyledMenuItem>
- </Tooltip>
+ <StyledMenuItem onClick={() => window.open("/recurso/" + props.learningObjectId, "_blank")}>
+ <ListItemIcon><OpenInBrowserIcon /></ListItemIcon> Abrir em nova guia
+ </StyledMenuItem>
{
props.downloadableLink &&
diff --git a/src/Components/carousel.css b/src/Components/carousel.css
index 9c7ea986..e1c5dc42 100644
--- a/src/Components/carousel.css
+++ b/src/Components/carousel.css
@@ -26,9 +26,10 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
-webkit-box-shadow: 0 8px 17px 2px rgba(0,0,0,0.14), 0 3px 14px 2px rgba(0,0,0,0.12), 0 5px 5px -3px rgba(0,0,0,0.2);
box-shadow: 0 8px 17px 2px rgba(0,0,0,0.14), 0 3px 14px 2px rgba(0,0,0,0.12), 0 5px 5px -3px rgba(0,0,0,0.2);
+}
-
-
+.carousel .slide {
+ background-color: inherit !important;
}
.MuiPaper-elevation1-209{
--
GitLab