diff --git a/package-lock.json b/package-lock.json
index 2311a4adb00c8bb9ea6d93f28f62e25340c3367d..b82ef6df43770183c6c14a32b78cd5696acee4b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1603,6 +1603,20 @@
"@syncfusion/ej2-popups": "~18.3.52"
}
},
+ "@types/cookie": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
+ "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
+ },
+ "@types/hoist-non-react-statics": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+ "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+ "requires": {
+ "@types/react": "*",
+ "hoist-non-react-statics": "^3.3.0"
+ }
+ },
"@types/parse-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
@@ -4152,9 +4166,9 @@
}
},
"cookie": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
- "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
+ "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
},
"cookie-signature": {
"version": "1.0.6",
@@ -6009,6 +6023,11 @@
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
},
+ "cookie": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+ "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+ },
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -14020,6 +14039,16 @@
}
}
},
+ "react-cookie": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-4.0.3.tgz",
+ "integrity": "sha512-cmi6IpdVgTSvjqssqIEvo779Gfqc4uPGHRrKMEdHcqkmGtPmxolGfsyKj95bhdLEKqMdbX8MLBCwezlnhkHK0g==",
+ "requires": {
+ "@types/hoist-non-react-statics": "^3.0.1",
+ "hoist-non-react-statics": "^3.0.0",
+ "universal-cookie": "^4.0.0"
+ }
+ },
"react-dev-utils": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-8.0.0.tgz",
@@ -17106,6 +17135,15 @@
"imurmurhash": "^0.1.4"
}
},
+ "universal-cookie": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz",
+ "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==",
+ "requires": {
+ "@types/cookie": "^0.3.3",
+ "cookie": "^0.4.0"
+ }
+ },
"universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -17220,6 +17258,11 @@
"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
},
+ "use-cookie-state": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/use-cookie-state/-/use-cookie-state-1.0.0.tgz",
+ "integrity": "sha512-I76Rg8olmAqUQL3mWnHxfSWaXNhc7UEfjX2frRrFnaCWjoyTxNggL5rE5a4LY1bnhEFOCc2BT3q0ctG6tizz4g=="
+ },
"util": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
diff --git a/package.json b/package.json
index 027b97c66ff58707036f1b3345fab429c41b2621..cb8630015621519a71f19013dd39334d5b674435 100644
--- a/package.json
+++ b/package.json
@@ -12,11 +12,13 @@
"base64-img": "^1.0.4",
"binary-extensions": "^2.1.0",
"build": "^0.1.4",
+ "cookie": "^0.4.1",
"fine-uploader": "^5.16.2",
"image-to-base64": "^2.1.1",
"material-design-icons": "^3.0.1",
"moment": "^2.29.1",
"react": "^16.14.0",
+ "react-cookie": "^4.0.3",
"react-dom": "^16.14.0",
"react-dropdown": "^1.9.0",
"react-dropdown-select": "^4.7.1",
@@ -33,7 +35,8 @@
"react-scripts": "^2.1.8",
"react-star-ratings": "^2.3.0",
"styled-components": "^4.4.1",
- "typescript": "^3.9.7"
+ "typescript": "^3.9.7",
+ "use-cookie-state": "^1.0.0"
},
"devDependencies": {
"eslint-config-prettier": "^6.15.0",
diff --git a/src/Components/CollectionCardFunction.js b/src/Components/CollectionCardFunction.js
index c308f39380e841af00f86b86d3422ee686837b0d..bb56a8214354817898b0b1a8c8529fc341bdeed1 100644
--- a/src/Components/CollectionCardFunction.js
+++ b/src/Components/CollectionCardFunction.js
@@ -233,9 +233,9 @@ const SlideAvatarDiv = styled.div`
vertical-align : middle;
border : 0;
- img {
- height : 40px;
- width : 40px;
+ img {
+ height : 40px !important;
+ width : 40px !important;
border : 0;
vertical-align : middle;
border-radius : 50%;
@@ -288,7 +288,7 @@ const AvatarDiv = styled.div`
border-radius : 50%;
height : 70px;
width : 70px;
- border : 2px solid #fff;
+ border : 2px solid #fff !important;
background-color : #fff;
box-shadow : 0 1px 3px rgba(0,0,0,.45);
}
diff --git a/src/Components/GuardarModal.js b/src/Components/GuardarModal.js
index 93d38cb6c95c28ac224175c36a5cb7db4452e112..868f09b5baa6151c84b8932380c4e085570bffc1 100644
--- a/src/Components/GuardarModal.js
+++ b/src/Components/GuardarModal.js
@@ -149,7 +149,7 @@ export default function ReportModal (props) {
)
:
(
- state.currentUser.collectionsCount === 0 ?
+ state.currentUser.collections_count === 0 ?
(
<>
<div classname="no-cols">
diff --git a/src/Components/Header.js b/src/Components/Header.js
index e9aa87d2d56b11e1b0ec94553c1f7f5c3a6be88b..88694bd3dbceb978e008c2a7ccd97efb7c43ee69 100644
--- a/src/Components/Header.js
+++ b/src/Components/Header.js
@@ -30,6 +30,7 @@ import Snackbar from '@material-ui/core/Snackbar';
import MuiAlert from '@material-ui/lab/Alert';
import {useLocation} from 'react-router-dom'
import MenuBarMobile from './MenuBarMobile.js'
+import { useCookies } from "react-cookie";
//const StyledButton = styled(Button)`
// background : #ffa54c !important;
@@ -46,6 +47,49 @@ export default function Header(props){
const [loginOpen, setLogin] = useState(false)
const [successfulLoginOpen, handleSuccessfulLogin] = useState(false)
const [modalColaborar, setModalColaborar] = useState(false)
+ const [cookies, setCookie, removeCookie] = useCookies(["auth_headers"]);
+
+ 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/accessToken', response.headers['access-token'])
+ sessionStorage.setItem('@portalmec/clientToken', response.headers.client)
+ 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') != undefined) {
+ let config = { headers : JSON.parse(sessionStorage.getItem('@portalmec/auth_headers'))}
+
+ validateToken(config)
+ }
+ }, [])
useEffect ( () => {
if (state.currentUser.askTeacherQuestion == true) {
@@ -64,7 +108,6 @@ export default function Header(props){
useEffect(() => {
let query = new URLSearchParams(loc.search)
- //POR PARAMETRO
console.log(query.getAll("auth_token"))
if(query.get("auth_token") != undefined) {
let config = {
@@ -74,45 +117,10 @@ export default function Header(props){
"uid" : query.get("uid"),
"expiry" : query.get("expiry"),
"token-type" : 'Bearer'
- }
- }
- 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: {
- askTeacherQuestion : response.data.data.ask_teacher_question,
- id : response.data.data.id,
- username : response.data.data.name,
- email : response.data.data.email,
- accessToken : response.headers['access-token'],
- clientToken : response.headers.client,
- userAvatar : response.data.data.avatar_file_name,
- userCover : response.data.data.cover_file_name,
- uid : response.data.data.uid,
- followCount : response.data.data.follows_count,
- collectionsCount : response.data.data.collections_count,
- submitter_request : response.data.data.submitter_request,
- roles : response.data.data.roles
- }
- }
- )
- sessionStorage.setItem('@portalmec/accessToken', response.headers['access-token'])
- sessionStorage.setItem('@portalmec/clientToken', response.headers.client)
- sessionStorage.setItem('@portalmec/id', response.data.data.id)
- sessionStorage.setItem('@portalmec/username', response.data.data.name)
- sessionStorage.setItem('@portalmec/uid', response.data.data.uid)
- redirect()
- },
- (err) => {
- console.log(err)
- }
- )
+ }
+ }
+ validateToken(config)
+ redirect()
}
}, [loc])
@@ -142,11 +150,11 @@ export default function Header(props){
let windowWidth = window.innerWidth
return (
- <React.Fragment>
- {
+ <React.Fragment style={{paddingTop : "10px"}}>
+ {/*
windowWidth > 990 &&
<AcessibilityBar/>
- }
+ */}
<Snackbar open={successfulLoginOpen} autoHideDuration={1000} onClose={toggleSnackbar}
anchorOrigin = {{ vertical:'top', horizontal:'center' }}
>
diff --git a/src/Components/IllegalContentModal.js b/src/Components/IllegalContentModal.js
index 01ccf37bca84035048722dc7e1175c0c4b03a3f9..65b658a47c5071b87f107e4bd03fd84a58d90239 100644
--- a/src/Components/IllegalContentModal.js
+++ b/src/Components/IllegalContentModal.js
@@ -112,7 +112,7 @@ export default function IllegalContentModal (props) {
<Fade in={props.open}>
<StyledDivContainer >
<StyledDivContent>
- <StyledH2>{state.currentUser.username}!</StyledH2>
+ <StyledH2>{state.currentUser.name}!</StyledH2>
<div>
<StyledParagraph>Seu recurso não está de acordo com os termos</StyledParagraph>
</div>
diff --git a/src/Components/LoginContainerFunction.js b/src/Components/LoginContainerFunction.js
index 94b964407307b24e3e2589f13012bcac111d2be9..0b538b3a4d2ef65b23411d5618ea1a086e388dc1 100644
--- a/src/Components/LoginContainerFunction.js
+++ b/src/Components/LoginContainerFunction.js
@@ -94,7 +94,7 @@ export default function LoginContainer (props) {
const onSubmit = (e) => {
e.preventDefault()
- const login = {email : formEmail.value, senha : formSenha.value, checkbox : checkboxControl}
+ const login = {email : formEmail.value, senha : formSenha.value, checkboxChecked : checkboxControl}
if (!(formEmail.key || formSenha.key)) {
props.handleLoginInfo(login)
diff --git a/src/Components/LoginModal.js b/src/Components/LoginModal.js
index 5f2c5931996915e89c6c79e6820d7172d406cc19..91f9e4d0fabd1f84d16c231a202c074753ae7a20 100644
--- a/src/Components/LoginModal.js
+++ b/src/Components/LoginModal.js
@@ -28,7 +28,6 @@ import axios from 'axios'
import {apiUrl} from '../env';
import Snackbar from '@material-ui/core/Snackbar';
import MuiAlert from '@material-ui/lab/Alert';
-
const StyledLogin = styled(Modal)`
margin : 0 !important;
margin-left : 0 !important;
@@ -68,21 +67,7 @@ export default function LoginModal (props){
dispatch ({
type: "USER_LOGGED_IN",
userLoggedIn: !state.userIsLoggedIn,
- login: {
- askTeacherQuestion : response.data.data.ask_teacher_question,
- id : response.data.data.id,
- username : response.data.data.name,
- email : response.data.data.email,
- accessToken : response.headers['access-token'],
- clientToken : response.headers.client,
- userAvatar : response.data.data.avatar_file_name,
- userCover : response.data.data.cover_file_name,
- uid : response.data.data.uid,
- followCount : response.data.data.follows_count,
- collectionsCount : response.data.data.collections_count,
- submitter_request : response.data.data.submitter_request,
- roles : response.data.data.roles
- }
+ login: response.data.data
}
)
sessionStorage.setItem('@portalmec/accessToken', response.headers['access-token'])
@@ -90,12 +75,20 @@ export default function LoginModal (props){
sessionStorage.setItem('@portalmec/id', response.data.data.id)
sessionStorage.setItem('@portalmec/username', response.data.data.name)
sessionStorage.setItem('@portalmec/uid', response.data.data.uid)
- sessionStorage.setItem('@portalmec/senha', login.senha)
+
+ 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))
if (login.checkboxChecked) {
- localStorage.setItem('@portalmec/email', login.email)
- localStorage.setItem('@portalmec/senha', login.senha) //MUDAR ISSO ASAP
+ localStorage.setItem('@portalmec/auth_headers', JSON.stringify(headers))
}
+
props.handleClose();
props.openSnackbar();
}, (error) => {
diff --git a/src/Components/MenuBar.js b/src/Components/MenuBar.js
index 078188d2f59b9ec0bd7389b9fb8592510c2edd9c..35b3fecf5f4dc01dc16710e040a015f7be07dc1d 100644
--- a/src/Components/MenuBar.js
+++ b/src/Components/MenuBar.js
@@ -37,7 +37,7 @@ const ContainerStyled = styled(Container)`
align-items: center;
border-top: 1px rgba(0,0,0,.1) solid;
padding: 5px;
-
+ padding-top : 10px;
`
export const ButtonStyled = styled(Button)`
diff --git a/src/Components/MenuList.js b/src/Components/MenuList.js
index 402fa2e747ff3f45f7357d675d64db260472f556..6236239d8809005fd81d79cc0593fc8a3d9a8a64 100644
--- a/src/Components/MenuList.js
+++ b/src/Components/MenuList.js
@@ -94,13 +94,13 @@ export default function MenuList(props) {
>
<div style={{borderRadius: "50%", border: "2px solid #fff", background: "#fff", overflow: "hidden", maxWidth : "50px", maxHeight : "50px"}}>
{
- state.currentUser.userAvatar == '' || state.currentUser.userAvatar == null ?
+ state.currentUser.avatar_file_name == '' || state.currentUser.avatar_file_name == null ?
(
<img src={Profile} alt={'user avatar'} style={{width:"100%", height:"100%", verticalAlign : "middle", marginLeft : "0"}}/>
):
(
- <img src={apiDomain + state.currentUser.userAvatar} alt={'user avatar'} style={{width:"100%", height:"100%", verticalAlign : "middle", marginLeft : "0"}}/>
+ <img src={apiDomain + state.currentUser.avatar_file_name} alt={'user avatar'} style={{width:"100%", height:"100%", verticalAlign : "middle", marginLeft : "0"}}/>
)
}
</div>
diff --git a/src/Components/MobileDrawerMenu.js b/src/Components/MobileDrawerMenu.js
index 19201b3d77e7722d4a4f414394a25565b9c950f9..114254048d40ae6102d0fa767ce09330b7b3a81c 100644
--- a/src/Components/MobileDrawerMenu.js
+++ b/src/Components/MobileDrawerMenu.js
@@ -59,11 +59,11 @@ export default function MobileDrawerMenu (props) {
};
const getUserAvatar = () => {
- if (state.currentUser.userAvatar == '' || state.currentUser.userAvatar == null) {
+ if (state.currentUser.avatar_file_name == '' || state.currentUser.avatar_file_name == null) {
return DefaultAvatar
}
else {
- return apiDomain + state.currentUser.userAvatar
+ return apiDomain + state.currentUser.avatar_file_name
}
}
diff --git a/src/Components/ModalVideoApresentacao.js b/src/Components/ModalVideoApresentacao.js
new file mode 100644
index 0000000000000000000000000000000000000000..709ea57b6042a9058a209a8667e91e9a45fd22be
--- /dev/null
+++ b/src/Components/ModalVideoApresentacao.js
@@ -0,0 +1,78 @@
+/*Copyright (C) 2019 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana
+
+This file is part of Plataforma Integrada MEC.
+
+Plataforma Integrada MEC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plataforma Integrada MEC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+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 from 'react';
+import Modal from '@material-ui/core/Modal';
+import Backdrop from '@material-ui/core/Backdrop';
+import Fade from '@material-ui/core/Fade';
+import styled from 'styled-components';
+
+export default function ModalVideoApresentacao (props) {
+
+ return (
+ <StyledModal
+ aria-labelledby="transition-modal-title"
+ aria-describedby="transition-modal-description"
+ open={props.open}
+ centered="true"
+ onClose={props.handleClose}
+ closeAfterTransition
+ BackdropComponent={Backdrop}
+ BackdropProps={{
+ timeout: 500,
+ }}
+ >
+ <Fade in={props.open}>
+ <VideoContainer>
+ <iframe
+ src="https://www.youtube.com/embed/gejBqyfJr9A" width="560" height="315"
+ frameBorder="0" allowFullScreen className="video"
+ />
+ </VideoContainer>
+ </Fade>
+ </StyledModal>
+ )
+}
+
+const VideoContainer = styled.div`
+ position : relative;
+ width : 100%;
+ height : 0;
+ padding-bottom : 56.25%;
+
+ .video {
+ width : 100%;
+ height : 100%;
+ position : absolute;
+ top : 0;
+ left : 0;
+ }
+`
+
+const StyledModal = styled(Modal)`
+ .djXaxP{
+ margin : 0 !important;
+ }
+ display : flex;
+ align-items: center;
+ justify-content : center;
+ text-align : center;
+ padding : 10px !important;
+ max-width : none;
+ max-height : none;
+`
diff --git a/src/Components/ResourceCardFunction.js b/src/Components/ResourceCardFunction.js
index 6a1f73d48268818b2fe8b91bbb59226872dba362..b65cba0ec4feece0e3174544819eb1b62c47b948 100644
--- a/src/Components/ResourceCardFunction.js
+++ b/src/Components/ResourceCardFunction.js
@@ -132,11 +132,11 @@ export default function ResourceCardFunction (props) {
</Link>
</div>
- </Slide >
+ </Slide >
}
<div className={`slideContentLinkBeforeActive${slideIn}`} style={{}}>
- <Link to={props.href}>
+ <Link to={props.href}>
<img className="img-cover" src={thumbnail} alt="learning object thumbnail"/>
</Link>
</div>
@@ -239,6 +239,8 @@ const AvatarDiv = styled.div`
width : 45px;
img {
width : 45px;
+ height : 40px !important;
+ width : 40px !important;
border : 0;
vertical-align : middle;
border-radius : 50%;
diff --git a/src/Components/ResourcePageComponents/CommentsArea.js b/src/Components/ResourcePageComponents/CommentsArea.js
index 3bdf29714925ba86ff04ad681315243505c846ed..b77465f79dc00f4c46be96995667645069f0d79b 100644
--- a/src/Components/ResourcePageComponents/CommentsArea.js
+++ b/src/Components/ResourcePageComponents/CommentsArea.js
@@ -55,7 +55,7 @@ export default function CommentsArea (props) {
<h3>Conte sua experiência com o Recurso</h3>
<Grid container style={{paddingTop : "20px"}}>
<Grid item xs={2} style={{paddingLeft : "15px", paddingRight : "15px"}}>
- <img src={apiDomain + state.currentUser.userAvatar} className="minha-imagem" alt="user avatar"/>
+ <img src={apiDomain + state.currentUser.avatar_file_name} className="minha-imagem" alt="user avatar"/>
</Grid>
<Grid item xs={10}>
<CommentForm
diff --git a/src/Components/SearchSection.js b/src/Components/SearchSection.js
index c82035cc368fb52601ce32dc3ebb4cae30d5a9c5..fac1acb0fc1bbf0423cc56a59eb93d6b4d4ca957 100644
--- a/src/Components/SearchSection.js
+++ b/src/Components/SearchSection.js
@@ -16,13 +16,14 @@ 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, {Component} from 'react';
+import React, {Component} from 'react';
import '../App.css';
import banner from '../img/bannerBusca.jpg';
// import SearchBar from './SearchBar';
import {Row} from 'react-grid-system';
import {MdInfoOutline} from "react-icons/md"
import { FaRegPlayCircle} from "react-icons/fa";
+import ModalVideoApresentacao from "./ModalVideoApresentacao.js"
const bannerStyle={
width: "100%",
@@ -55,12 +56,18 @@ class SearchSection extends Component{
constructor(props){
super(props);
this.state={
- color: "#ff7f00"
+ color: "#ff7f00",
+ modalOpen : false
};}
+ toggleModal = () => {
+ this.setState({modalOpen : !this.state.modalOpen})
+ }
render(){
return(
+ <React.Fragment>
+ <ModalVideoApresentacao open={this.state.modalOpen} handleClose={this.toggleModal}/>
<div style={bannerStyle}>
<div style={titleStyle}>
<h2>Plataforma MEC de Recursos Educacionais Digitais</h2>
@@ -72,8 +79,10 @@ class SearchSection extends Component{
<SearchBar/>
</Container> */}
<div style={{paddingBottom: "100px", color: "white"}}>
- <a href="sobre" style={{color:"#fff",textDecoration: "none", outline:"none"}}><MdInfoOutline size="24px" style={{verticalAlign: "middle"}} />SOBRE A PLATAFORMA</a>
- <a href="#apresentacao" style={{color:"#fff",textDecoration: "none"}}> <FaRegPlayCircle size="20px" style={{verticalAlign: "middle"}} />VÃDEO DE APRESENTAÇÃO</a>
+ <a href="sobre" style={{color:"#fff",textDecoration: "none", outline:"none", paddingRight : "10px"}}><MdInfoOutline size="24px" style={{verticalAlign: "middle", paddingRight : "5px"}} />SOBRE A PLATAFORMA</a>
+ <span onClick={this.toggleModal} style={{cursor : "pointer"}}>
+ <FaRegPlayCircle size="20px" style={{verticalAlign: "middle", paddingRight : "5px"}}/>VÃDEO DE APRESENTAÇÃO
+ </span>
</div>
<Row justify="center">
<button style={{...buttonStyle, ...{backgroundColor: "#ff7f00",fontSize:"1.14em", outline:"none"}}} onClick={()=> {this.props.function("Recursos")}}>Recursos Educacionais Digitais</button>
@@ -81,6 +90,7 @@ class SearchSection extends Component{
<button style={{...buttonStyle, ...{backgroundColor: "#673ab7",fontSize:"1.14em", outline:"none"}}} onClick={()=> {this.props.function("Colecoes")}}>Coleções dos Usuários</button>
</Row>
</div>
+ </React.Fragment>
);
}
}
diff --git a/src/Components/SignUpModal.js b/src/Components/SignUpModal.js
index b4c156af213fcc92dd57daa0996ce4a40d8381b6..7f5da85dc55eb3e2260375b15f9ee5037041eef8 100644
--- a/src/Components/SignUpModal.js
+++ b/src/Components/SignUpModal.js
@@ -61,15 +61,7 @@ export default function SignUpModal (props) {
dispatch ( {
type: 'USER_SIGNED_UP',
userLoggedIn: !state.userIsLoggedIn,
- login: {
- id : response.data.id,
- username : response.data.name,
- email : response.data.email,
- accessToken : response.headers['access-token'],
- clientToken : response.headers.client,
- userAvatar : response.data.avatar_file_name,
- userCover : response.data.cover_file_name
- }
+ user: response.data.data
}
)
localStorage.setItem('@portalmec/accessToken', response.headers['access-token'])
@@ -77,7 +69,16 @@ export default function SignUpModal (props) {
localStorage.setItem('@portalmec/id', response.data.data.id)
localStorage.setItem('@portalmec/username', response.data.data.name)
localStorage.setItem('@portalmec/uid', response.data.data.uid)
- console.log(state.currentUser)
+
+ 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))
+
props.handleClose()
}, (error) => {
console.log(':(')
@@ -92,7 +93,7 @@ export default function SignUpModal (props) {
aria-labelledby="transition-modal-title"
aria-describedby="transition-modal-description"
open={props.open}
-
+
centered="true"
onClose={props.handleClose}
closeAfterTransition
diff --git a/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js b/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js
index 07a5751e3a40ddb7942c8a20ea412a4b97bbf3d5..25bf953c61b91c41329ec2c58fa1ae576d913afb 100644
--- a/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js
+++ b/src/Components/TabPanels/UserPageTabs/PanelEditarPerfil.js
@@ -103,7 +103,7 @@ export default function TabPanelEditarPerfil (props) {
<div style={{padding:"0", display:"flex", flexDirection:"column"}}>
<HeaderContainer>
<div style={{position:"relative", height:"100%"}}>
- <img src={`${apiDomain}` + state.currentUser.userCover} alt="user cover avatar" style={{width:"100%", height:"100%", objectFit:"cover"}}/>
+ <img src={`${apiDomain}` + state.currentUser.cover_file_name} alt="user cover avatar" style={{width:"100%", height:"100%", objectFit:"cover"}}/>
<input accept="image/*" style = {{display:"none"}} id="icon-button-file" type="file" onChange={(e) => updateCover(e.target.files)}/>
<label htmlFor="icon-button-file">
<Tooltip title={<span style={{fontSize:"14px", overflow:"hidden", transition:"all .5s ease"}}>ALTERAR CAPA</span>} placement="left">
@@ -114,7 +114,7 @@ export default function TabPanelEditarPerfil (props) {
</label>
</div>
<ProfileAvatarDiv onMouseEnter={handleHoverAlterarFoto} onMouseLeave={handleHoverAlterarFoto}>
- <img src={`${apiDomain}` + state.currentUser.userAvatar} alt = "user avatar" style={{border:"0", verticalAlign:"middle"}}/>
+ <img src={`${apiDomain}` + state.currentUser.avatar_file_name} alt = "user avatar" style={{border:"0", verticalAlign:"middle"}}/>
<ChangeAvatarDiv style={ {display : hoverAlterarFoto ? 'flex' : 'none'}}>
<span>Alterar Foto</span>
</ChangeAvatarDiv>
diff --git a/src/Components/UploadPageComponents/Forms/Autor.js b/src/Components/UploadPageComponents/Forms/Autor.js
index c2427708808305757edb1df197161c5909abd9af..9b8c77e0e91347a5ae1460f4e45b9e1799c22972 100644
--- a/src/Components/UploadPageComponents/Forms/Autor.js
+++ b/src/Components/UploadPageComponents/Forms/Autor.js
@@ -43,7 +43,7 @@ function Autor (props) {
const [outroAutor, setOutroAutor] = useState(props.initialOutroAutor ? props.initialOutroAutor : '')
const getAuthor = () => {
- return authorValue === "0" ? state.currentUser.username : outroAutor
+ return authorValue === "0" ? state.currentUser.name : outroAutor
}
return (
diff --git a/src/Components/UserPageComponents/Avatar.js b/src/Components/UserPageComponents/Avatar.js
index f1026a358b3b784ce81494ed1f502da63800c045..d52aa5b8484566c47d9a9697693a894b23d84fe3 100644
--- a/src/Components/UserPageComponents/Avatar.js
+++ b/src/Components/UserPageComponents/Avatar.js
@@ -26,7 +26,7 @@ import ModalAlterarAvatar from '../ModalAlterarAvatar/ModalAlterarAvatar.js'
export default function ProfileAvatar (props) {
const {state, dispatch} = useContext(Store)
- const [currentAvatar, setAvatar] = useState(state.currentUser.userAvatar)
+ const [currentAvatar, setAvatar] = useState(state.currentUser.avatar_file_name)
const [hoverBool, toggleHover] = React.useState(false)
const handleToggleHover = () => {toggleHover(!hoverBool)}
@@ -34,7 +34,7 @@ export default function ProfileAvatar (props) {
const [open, toggleOpen] = useState(false)
const controlModal = () => {toggleOpen(!open)}
- useEffect(() => {setAvatar(state.currentUser.userAvatar)}, state.currentUser.userAvatar)
+ useEffect(() => {setAvatar(state.currentUser.avatar_file_name)}, state.currentUser.avatar_file_name)
return (
<>
diff --git a/src/Components/UserPageComponents/Cover.js b/src/Components/UserPageComponents/Cover.js
index 2af5bd7473f2414f1e3a97e627ff01cf5b028b87..1d339373ed7bf62f233f751abf7fbe286f231cd1 100644
--- a/src/Components/UserPageComponents/Cover.js
+++ b/src/Components/UserPageComponents/Cover.js
@@ -28,7 +28,7 @@ import ModalAlterarCover from '../ModalAlterarCover/ModalAlterarCover.js'
export default function Cover (props) {
const {state} = useContext(Store)
- const [currentCover, setCoverImg] = useState(state.currentUser.userCover)
+ const [currentCover, setCoverImg] = useState(state.currentUser.cover_file_name)
const [tempCover, setTempCover] = useState('')
const [open, toggleOpen] = useState(false)
@@ -42,8 +42,8 @@ export default function Cover (props) {
}
useEffect( () => {
- setCoverImg(state.currentUser.userCover)
- }, state.currentUser.userCover)
+ setCoverImg(state.currentUser.cover_file_name)
+ }, state.currentUser.cover_file_name)
return (
<>
<ModalAlterarCover
diff --git a/src/Components/UserPageComponents/UserInfo.js b/src/Components/UserPageComponents/UserInfo.js
index 0a45ac75dff68aeb5065a2610a9c8cdc75a14b37..8c776a95eef3a345b8407007c453c6c2a995ddf5 100644
--- a/src/Components/UserPageComponents/UserInfo.js
+++ b/src/Components/UserPageComponents/UserInfo.js
@@ -22,7 +22,7 @@ import {UserProfileInfoDiv} from '../TabPanels/StyledComponents.js'
export default function UserInfo (props) {
const {state} = useContext(Store)
- const user = state.currentUser.username
+ const user = state.currentUser.name
const education = state.currentUser.education
return (
diff --git a/src/Pages/EditLearningObjectPage.js b/src/Pages/EditLearningObjectPage.js
index 2597832c9390ffb0d18167f05f0b7982e53d38d5..76a20246be0ce4cdc91b346410a471509a2ae358 100644
--- a/src/Pages/EditLearningObjectPage.js
+++ b/src/Pages/EditLearningObjectPage.js
@@ -309,11 +309,11 @@ export default function EditLearningObjectPage (props) {
<Grid item xs={12} style={{paddingBottom : "40px"}}>
<Autor draftID={learningObject.id}
initialValue={
- learningObject.author === state.currentUser.username ?
+ learningObject.author === state.currentUser.name ?
0 : 1
}
initialOutroAutor={
- learningObject.author !== state.currentUser.username ?
+ learningObject.author !== state.currentUser.name ?
learningObject.author : ''
}
onBlurCallback={onBlurCallback}
diff --git a/src/Pages/UserPage.js b/src/Pages/UserPage.js
index 6c1359d6b64ae45c734d83c0108e66f964f29a07..c61900957fc1c4cb1c88e5a31a7a6ac12852e053 100644
--- a/src/Pages/UserPage.js
+++ b/src/Pages/UserPage.js
@@ -111,7 +111,7 @@ export default function UserPage (props){
<ModalAlterarAvatar
open={modalOpen}
handleClose={() => {toggleModal(false)}}
- userAvatar={state.currentUser.userAvatar}
+ userAvatar={state.currentUser.avatar_file_name}
/>
<BackgroundDiv>
diff --git a/src/Store.js b/src/Store.js
index 3838a6b5245ef2be9598ec739fdde53c14f217ea..421c0128b55d8ce77d86b48fa82e0251258e820f 100644
--- a/src/Store.js
+++ b/src/Store.js
@@ -37,15 +37,13 @@ const initialState = {
currentUser: {
askTeacherQuestion : false,
id : '',
- username : '',
+ name : '',
email : '',
- accessToken : '',
- clientToken : '',
- userAvatar : '',
- userCover : '',
+ avatar_file_name : '',
+ cover_file_name : '',
uid : '',
- followCount : 0,
- collectionsCount : 0,
+ follows_count : 0,
+ collections_count : 0,
submitter_request : 'default',
roles : []
}
@@ -78,7 +76,7 @@ function reducer(state, action) {
return {
...state,
userIsLoggedIn:action.userLoggedIn,
- currentUser:action.login
+ currentUser:action.user
}
case 'USER_LOGGED_OUT':
sessionStorage.clear()
diff --git a/src/index.js b/src/index.js
index 7759fd80d097363e57313a8bedfae2e84e0ce75f..032a5eeeccd2687e53c6e2e72097dae3ff7efa72 100755
--- a/src/index.js
+++ b/src/index.js
@@ -19,7 +19,6 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import React from 'react';
import ReactDOM from 'react-dom';
import * as serviceWorker from './serviceWorker';
-
import './index.css';
import App from './App.js'
import { StoreProvider } from './Store';
@@ -27,7 +26,7 @@ import { StoreProvider } from './Store';
ReactDOM.render(
<StoreProvider>
- <App />
+ <App />
</StoreProvider>
, document.getElementById('root'));