Skip to content
Snippets Groups Projects
Commit 00682c13 authored by vgm18's avatar vgm18
Browse files

Fixed carousel background on about page, added option to create collection in...

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
parent ec0b9432
No related branches found
No related tags found
3 merge requests!78MERGE DEVELOP INTO MASTER,!77Merge develop into master,!76Fixed carousel background on about page, added option to create collection in...
......@@ -3,4 +3,8 @@
}
.dot{
border: 1px solid black;
}
.carousel .slide {
background-color: inherit !important;
}
\ No newline at end of file
......@@ -3,4 +3,8 @@
}
.dot{
border: 1px solid black;
}
.carousel .slide {
background-color: inherit !important;
}
\ No newline at end of file
......@@ -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%;
......
......@@ -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 = () => {
......
......@@ -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 &&
......
......@@ -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{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment