diff --git a/src/Components/Header.js b/src/Components/Header.js
index b607b2013755d9a6c2d975980e937ab3b2dbfb42..f721a372ad0f1794c5a0416bb7fea097b0e3f8b9 100644
--- a/src/Components/Header.js
+++ b/src/Components/Header.js
@@ -18,7 +18,7 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import React, { useContext, useState, useEffect } from 'react'
import axios from 'axios'
-import {apiUrl} from '../env'
+import { apiUrl } from '../env'
import MenuBar from './MenuBar'
import SearchBar from './SearchBar'
import SignUpModal from './SignUpModal'
@@ -27,7 +27,7 @@ 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} from 'react-router-dom'
+import { useLocation } from 'react-router-dom'
import MenuBarMobile from './MenuBarMobile.js'
//const StyledButton = styled(Button)`
@@ -35,149 +35,149 @@ import MenuBarMobile from './MenuBarMobile.js'
// boxShadow :none;
//`
function Alert(props) {
- return <MuiAlert elevation={6} variant="filled" {...props} />;
+ return <MuiAlert elevation={6} variant="filled" {...props} />;
}
-export default function Header(props){
- const { state, dispatch } = useContext(Store)
- const [signUpOpen, setSignUp] = useState(false)
- const [loginOpen, setLogin] = useState(false)
- const [successfulLoginOpen, handleSuccessfulLogin] = useState(false)
- const [modalColaborar, setModalColaborar] = useState(false)
-
- const validateToken = (config) => {
- axios.get(`${apiUrl}/auth/validate_token/`, config).then(
- (response) => {
- console.log(response.data)
- if ( response.headers['access-token'] ) {
- sessionStorage.setItem('@portalmec/accessToken', response.headers['access-token'])
- }
- dispatch ({
- type: "USER_LOGGED_IN",
- userLoggedIn: !state.userIsLoggedIn,
- login: response.data.data
- }
- )
-
- sessionStorage.setItem('@portalmec/id', response.data.data.id)
- sessionStorage.setItem('@portalmec/username', response.data.data.name)
- sessionStorage.setItem('@portalmec/uid', response.data.data.uid)
-
-
- let headers = {
- client:response.headers.client,
- "access-token":response.headers['access-token'],
- "token-type": "Bearer",
- expiry:response.headers.expiry,
- uid:response.data.data.uid
- }
- sessionStorage.setItem('@portalmec/auth_headers', JSON.stringify(headers))
- },
- (err) => {
- console.log(err)
- }
- )
- }
-
- useEffect( () => {
- if (sessionStorage.getItem('@portalmec/auth_headers')) {
- let config = { headers : JSON.parse(sessionStorage.getItem('@portalmec/auth_headers'))}
-
- validateToken(config)
- }
- }, [])
-
- useEffect ( () => {
- if (state.currentUser.askTeacherQuestion === true) {
- dispatch({
- type: "TOGGLE_MODAL_COLABORAR_PLATAFORMA",
- modalColaborarPlataformaOpen: true
- });
- }
- }, [state.currentUser.askTeacherQuestion])
-
- const redirect = () => {
- props.history.push('/')
- }
-
- let loc = useLocation()
- useEffect(() => {
- let query = new URLSearchParams(loc.search)
-
- if(query.get("auth_token")) {
- let config = {
- headers : {
- "access-token" : query.get("auth_token"),
- "client" : query.get("client_id"),
- "uid" : query.get("uid"),
- "expiry" : query.get("expiry"),
- "token-type" : 'Bearer'
- }
- }
- validateToken(config)
- redirect()
- }
-
- }, [loc])
-
- const toggleSnackbar = (event, reason) => {
- if (reason === 'clickaway') {
- return;
- }
-
- handleSuccessfulLogin(false);
- }
-
- const handleSignUp = () => {
- setSignUp(!signUpOpen)
- }
-
- const handleLogin = () => {
- setLogin(!loginOpen)
- }
-
- const handleClickSearch = (open) => {
- dispatch({
- type: "HANDLE_SEARCH_BAR",
- opened: !state.searchOpen
- })
- }
-
- let windowWidth = window.innerWidth
-
- return (
- <React.Fragment>
- {/*
+export default function Header(props) {
+ const { state, dispatch } = useContext(Store)
+ const [signUpOpen, setSignUp] = useState(false)
+ const [loginOpen, setLogin] = useState(false)
+ const [successfulLoginOpen, handleSuccessfulLogin] = useState(false)
+ const [modalColaborar, setModalColaborar] = useState(false)
+
+ const validateToken = (config) => {
+ axios.get(`${apiUrl}/auth/validate_token/`, config).then(
+ (response) => {
+ console.log(response.data)
+ if (response.headers['access-token']) {
+ sessionStorage.setItem('@portalmec/accessToken', response.headers['access-token'])
+ }
+ dispatch({
+ type: "USER_LOGGED_IN",
+ userLoggedIn: !state.userIsLoggedIn,
+ login: response.data.data
+ }
+ )
+
+ sessionStorage.setItem('@portalmec/id', response.data.data.id)
+ sessionStorage.setItem('@portalmec/username', response.data.data.name)
+ sessionStorage.setItem('@portalmec/uid', response.data.data.uid)
+
+
+ let headers = {
+ client: response.headers.client,
+ "access-token": response.headers['access-token'],
+ "token-type": "Bearer",
+ expiry: response.headers.expiry,
+ uid: response.data.data.uid
+ }
+ sessionStorage.setItem('@portalmec/auth_headers', JSON.stringify(headers))
+ },
+ (err) => {
+ console.log(err)
+ }
+ )
+ }
+
+ useEffect(() => {
+ if (sessionStorage.getItem('@portalmec/auth_headers')) {
+ let config = { headers: JSON.parse(sessionStorage.getItem('@portalmec/auth_headers')) }
+
+ validateToken(config)
+ }
+ }, [])
+
+ useEffect(() => {
+ if (state.currentUser.askTeacherQuestion === true) {
+ dispatch({
+ type: "TOGGLE_MODAL_COLABORAR_PLATAFORMA",
+ modalColaborarPlataformaOpen: true
+ });
+ }
+ }, [state.currentUser.askTeacherQuestion])
+
+ const redirect = () => {
+ props.history.push('/')
+ }
+
+ let loc = useLocation()
+ useEffect(() => {
+ let query = new URLSearchParams(loc.search)
+
+ if (query.get("auth_token")) {
+ let config = {
+ headers: {
+ "access-token": query.get("auth_token"),
+ "client": query.get("client_id"),
+ "uid": query.get("uid"),
+ "expiry": query.get("expiry"),
+ "token-type": 'Bearer'
+ }
+ }
+ validateToken(config)
+ redirect()
+ }
+
+ }, [loc])
+
+ const toggleSnackbar = (event, reason) => {
+ if (reason === 'clickaway') {
+ return;
+ }
+
+ handleSuccessfulLogin(false);
+ }
+
+ const handleSignUp = () => {
+ setSignUp(!signUpOpen)
+ }
+
+ const handleLogin = () => {
+ setLogin(!loginOpen)
+ }
+
+ const handleClickSearch = (open) => {
+ dispatch({
+ type: "HANDLE_SEARCH_BAR",
+ opened: !state.searchOpen
+ })
+ }
+
+ let windowWidth = window.innerWidth
+
+ return (
+ <React.Fragment>
+ {/*
windowWidth > 990 &&
<AcessibilityBar/>
*/}
- <Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
- anchorOrigin = {{ vertical:'top', horizontal:'center' }}
- >
- <Alert severity="success" style={{backgroundColor:"#00acc1"}}>Você está conectado(a)!</Alert>
- </Snackbar>
- {
- windowWidth > 990 ?
- (
- <React.Fragment>
- <MenuBar openSearchBar={handleClickSearch} openSignUp = {handleSignUp} openLogin = {handleLogin}/>
- {
- state.searchOpen &&
- <SearchBar/>
- }
- </React.Fragment>
-
- )
- :
- (
- <MenuBarMobile openSignUp = {handleSignUp} openLogin = {handleLogin}/>
- )
- }
- <SignUpModal open={signUpOpen} handleClose={handleSignUp} openLogin={handleLogin}/>
- <LoginModal open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
- openSnackbar={() => {handleSuccessfulLogin(true)}}/>
- <ColaborarModal open={modalColaborar} handleClose={() => {setModalColaborar(!modalColaborar)}} />
- </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>
+ {
+ windowWidth > 990 ?
+ (
+ <React.Fragment>
+ <MenuBar openSearchBar={handleClickSearch} openSignUp={handleSignUp} openLogin={handleLogin} />
+ {
+ state.searchOpen &&
+ <SearchBar />
+ }
+ </React.Fragment>
+
+ )
+ :
+ (
+ <MenuBarMobile openSignUp={handleSignUp} openLogin={handleLogin} />
+ )
+ }
+ <SignUpModal open={signUpOpen} handleClose={handleSignUp} openLogin={handleLogin} />
+ <LoginModal open={loginOpen} handleClose={() => setLogin(false)} openSignUp={handleSignUp}
+ openSnackbar={() => { handleSuccessfulLogin(true) }} />
+ <ColaborarModal open={modalColaborar} handleClose={() => { setModalColaborar(!modalColaborar) }} />
+ </React.Fragment>
+ )
}
diff --git a/src/Components/MenuBarMobile.js b/src/Components/MenuBarMobile.js
index ea3196dd0c45a6658adb77cc48c2358665beb616..4590e9dd578da0ed15a585e37982710e33cfced0 100644
--- a/src/Components/MenuBarMobile.js
+++ b/src/Components/MenuBarMobile.js
@@ -19,13 +19,13 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import React from 'react'
import MenuIcon from '@material-ui/icons/Menu';
import styled from 'styled-components'
-import {Button} from '@material-ui/core'
+import { Button } from '@material-ui/core'
import logo from '../img/logo_small.svg'
-import {Link} from 'react-router-dom'
+import { Link } from 'react-router-dom'
import Grid from '@material-ui/core/Grid';
import MobileDrawerMenu from './MobileDrawerMenu';
-export default function MenuBarMobile (props) {
+export default function MenuBarMobile(props) {
const [drawerOpen, setDrawerStatus] = React.useState(false);
@@ -37,45 +37,40 @@ export default function MenuBarMobile (props) {
};
return (
- <OuterDiv>
- <Grid container>
- <Grid item xs={3} style={{display : "flex"}}>
- <Button style={{color : "#00bcd4"}} onClick={toggleDrawer(true)}>
- <MenuIcon className="icon"/>
- </Button>
- </Grid>
-
- <Grid item xs={9} justify={'center'}>
- <div className="logo">
- <Link to="/">
- <img src={logo} alt={"Plataforma Integrada"}/>
- </Link>
- </div>
- </Grid>
- </Grid>
+ <>
<MobileDrawerMenu anchor={'left'} open={drawerOpen}
onClose={toggleDrawer(false)}
- openSignUp = {props.openSignUp} openLogin = {props.openLogin}
- />
- </OuterDiv>
+ openSignUp={props.openSignUp} openLogin={props.openLogin}
+ />
+ <OuterDiv>
+ <DrawerButtonDiv style={{justifySelf : "flex-start", position : "absolute", left : 0}}>
+ <Button style={{ color: "#00bcd4" }} onClick={toggleDrawer(true)}>
+ <MenuIcon className="icon" />
+ </Button>
+ </DrawerButtonDiv>
+ <div className="logo">
+ <Link to="/">
+ <img src={logo} alt={"Plataforma Integrada"} />
+ </Link>
+ </div>
+ </OuterDiv>
+ </>
)
}
-const OuterDiv = styled.div `
+const OuterDiv = styled.div`
height : 48px;
- margin : 5px 2px;
+ width : 100%;
display : flex;
- flex-direction : column;
- align-content : stretch;
+ flex-direction : row;
+ align-items : center;
justify-content : center;
+ position : relative;
.logo {
- height : 50px;
- width : 150px;
- padding : 5px;
- padding-top : 15px;
+ align-content : center;
+ justify-self : center;
text-align : center;
-
img {
height : 38px;
overflow : hidden;
@@ -98,3 +93,8 @@ const OuterDiv = styled.div `
color : inherit !important;
}
`
+const DrawerButtonDiv = styled.div`
+ justify-self : center;
+ position : absolute;
+ left : 0;
+`
\ No newline at end of file
diff --git a/src/Components/MobileDrawerMenu.js b/src/Components/MobileDrawerMenu.js
index 2b15988246f8298895220ca06267b1d70d6228fa..9670234e882becc1d11317e8bbf4b3d8f1e763fc 100644
--- a/src/Components/MobileDrawerMenu.js
+++ b/src/Components/MobileDrawerMenu.js
@@ -36,7 +36,8 @@ import HistoryIcon from '@material-ui/icons/History';
import FavoriteBorderIcon from '@material-ui/icons/FavoriteBorder';
import FolderOpenIcon from '@material-ui/icons/FolderOpen';
import SettingsIcon from '@material-ui/icons/Settings';
-import {apiDomain, apiUrl} from '../env.js'
+import {apiDomain, apiUrl} from '../env.js';
+import SearchIcon from '@material-ui/icons/Search';
import {getAxiosConfig} from './HelperFunctions/getAxiosConfig'
import axios from 'axios'
@@ -48,6 +49,7 @@ export default function MobileDrawerMenu (props) {
{ name : "Sobre a Plataforma", href : "sobre", icon : <InfoIcon/>},
{ name : "Contato", href : "contato", icon : <MailOutlineIcon/>},
{ name : "Central de Ajuda", href : "ajuda", icon : <HelpOutlineIcon/>},
+ { name: "Busca", href: `/busca?query=${state.search.query}&search_class=${state.search.class}`, icon : <SearchIcon/>},
{ name : "Termos de Uso", href : "termos", icon : <AssignmentIcon/>},
]
diff --git a/src/Components/TabPanels/PanelComponents/TemplateCuradoria.js b/src/Components/TabPanels/PanelComponents/TemplateCuradoria.js
index f4e1a73717a01ff64cd9c5fe0a5b2d59117f2b56..28390ab44fedca9c8e18c95af860496f2317ca55 100644
--- a/src/Components/TabPanels/PanelComponents/TemplateCuradoria.js
+++ b/src/Components/TabPanels/PanelComponents/TemplateCuradoria.js
@@ -25,6 +25,7 @@ import { WhiteContainer, StyledGrid } from '../StyledComponents.js'
import { ButtonsAreaRecurso } from './ButtonsArea'
export default function Template(props) {
+ console.log(props.sliceArr);
return (
<WhiteContainer>
<Title
@@ -48,18 +49,18 @@ export default function Template(props) {
props.sliceArr.map((card) =>
<Grid item md={3} xs={12} key={card.id}>
<ResourceCardFunction
- avatar={card.publisher.avatar}
- id={card.id}
- thumbnail={card.thumbnail}
- type={card.object_type ? card.object_type : "Outros"}
- title={card.name}
+ avatar={card.submitter.avatar}
+ id={card.learning_object.id}
+ thumbnail={card.learning_object.thumbnail}
+ type={card.learning_object.object_type ? card.learning_object.object_type : "Outros"}
+ title={card.learning_object.name}
published={false}
- likeCount={card.likes_count}
- liked={card.liked}
- rating={card.review_average}
- author={card.publisher.name}
- tags={card.tags}
- href={"/recurso/" + card.id}
+ likeCount={card.learning_object.likes_count}
+ liked={card.learning_object.liked}
+ rating={card.learning_object.review_average}
+ author={card.submitter.name}
+ tags={card.learning_object.tags}
+ href={"/recurso/" + card.learning_object.id}
downloadableLink={card.default_attachment_location}
/>
</Grid>
diff --git a/src/Components/TabPanels/StyledComponents.js b/src/Components/TabPanels/StyledComponents.js
index 9816407c1b6108c9b4193f2f193c02370aa31021..d77966a39660501c93ccc687a52056cd301b1eb2 100644
--- a/src/Components/TabPanels/StyledComponents.js
+++ b/src/Components/TabPanels/StyledComponents.js
@@ -184,11 +184,11 @@ export const UserProfileInfoDiv = styled.div`
`
export const CheckTeacherDiv = styled.div`
- @media screen and (min-width: 500px) {
- padding-top : 10px;
- padding-left : 250px;
- margin-bottom : -10px;
- }
+ padding-top : 10px;
+ padding-left : 250px;
+ margin-bottom : -10px;
+ display : absolute;
+
p {
margin : 0 0 10px;
font-family: Roboto;
@@ -206,9 +206,6 @@ export const CheckTeacherDiv = styled.div`
}
}
}
- @media screen and (max-width: 499px) {
- display : none;
- }
`
export const StyledTabs = styled(Tabs)`
diff --git a/src/Components/UserPageComponents/Cover.js b/src/Components/UserPageComponents/Cover.js
index 6fd3c539e020fc7e64bc674b3724f0ca746db932..d2ba43e93248e0c74cd19b0f94f49f87a68d5e3e 100644
--- a/src/Components/UserPageComponents/Cover.js
+++ b/src/Components/UserPageComponents/Cover.js
@@ -27,6 +27,8 @@ import ModalAlterarCover from '../ModalAlterarCover/ModalAlterarCover.js'
export default function Cover (props) {
const {state} = useContext(Store)
+ const WIDTH = window.innerWidth;
+
const [currentCover, setCoverImg] = useState(state.currentUser.cover_file_name)
const [tempCover, setTempCover] = useState('')
@@ -55,11 +57,21 @@ export default function Cover (props) {
{currentCover && <img src={apiDomain + currentCover} alt = '' style= {{width:"100%", height:"100%", objectFit : "cover" }}/>}
<input accept="image/*" style = {{display:"none"}} id="choose-cover-file" type="file" onChange={(e) => updateCover(e.target.files)}/>
<label htmlFor="choose-cover-file">
+ {
+ WIDTH >= 545 ?
+ <Tooltip title={<span style={{fontSize:"14px", overflow:"hidden", transition:"all .5s ease"}}>ALTERAR CAPA</span>} placement="left">
+ <IconButton style={{position:"absolute",right:"0",bottom: "0",color:"#fff"}}color="primary" aria-label="upload picture" component="span">
+ <PhotoCamera />
+ </IconButton>
+ </Tooltip>
+ :
<Tooltip title={<span style={{fontSize:"14px", overflow:"hidden", transition:"all .5s ease"}}>ALTERAR CAPA</span>} placement="left">
- <IconButton style={{position:"absolute",right:"0",top:"0",color:"#fff"}}color="primary" aria-label="upload picture" component="span">
+ <IconButton style={{position:"absolute",left:"0",top: "0",color:"#fff"}}color="primary" aria-label="upload picture" component="span">
<PhotoCamera />
</IconButton>
</Tooltip>
+ }
+
</label>
</CoverContainer>
</>
diff --git a/src/Components/UserPageComponents/EditProfileButton.js b/src/Components/UserPageComponents/EditProfileButton.js
index 4df7df2c7a5a6b4794ca5fd926d7440c77cc3ec1..beaa7137501ba03fc9de6f46d14391c6e7072f13 100644
--- a/src/Components/UserPageComponents/EditProfileButton.js
+++ b/src/Components/UserPageComponents/EditProfileButton.js
@@ -49,8 +49,8 @@ const EditProfileAnchor = styled(Link)`
box-shadow : 0 2px 5px 0 rgba(0,0,0,.26);
background-color : #fafafa;
position : absolute;
- right : 5px;
- bottom : 0;
+ right : 10px;
+ top : 10px;
margin-bottom : 20px;
color : #666;
padding : 0 10px;