diff --git a/hello-world.js b/hello-world.js
deleted file mode 100644
index 18f976c49208ad7ee85548f9312dfd49cce44b21..0000000000000000000000000000000000000000
--- a/hello-world.js
+++ /dev/null
@@ -1,14 +0,0 @@
-
-var axios = require('axios')
-// Requisições do tipo GET
-axios.get('http://localhost:5000/v1/questions')
- .then(function(response){
- console.log(response.data); // ex.: { user: 'Your User'}
- console.log(response.status); // ex.: 200
- });
-
-// Requisições POST, note há um parâmetro extra indicando os parâmetros da requisição
-axios.post('/save', { id:'4', description: 'tudo bem', status: 'active' })
- .then(function(response){
- console.log('salvo com sucesso')
- });
diff --git a/package-lock.json b/package-lock.json
index 0a47b797aa23e468c5284ad255a0386e411572bf..54e05c3dd61ee4b2d84e62d7ab76306e974854e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -896,6 +896,11 @@
"resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
"integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
},
+ "@emotion/hash": {
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.1.tgz",
+ "integrity": "sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA=="
+ },
"@material-ui/core": {
"version": "3.9.3",
"resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.9.3.tgz",
@@ -930,6 +935,60 @@
"warning": "^4.0.1"
}
},
+ "@material-ui/icons": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.0.0.tgz",
+ "integrity": "sha512-hXoKnVLmVer+kic84ypoyG3Amym3a8q3pvDg4KYjeKW9fxGru7x/IkelBJODQL0jO+nAPz1+9RNpFWC75v35dg==",
+ "requires": {
+ "@babel/runtime": "^7.2.0"
+ }
+ },
+ "@material-ui/styles": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.0.0.tgz",
+ "integrity": "sha512-TUpmXlyZDVOl6E2//+UzsZxgi2E+2L753QY02nNkbAC6PPx8FUBqvnjYSGqX0V/BjTJ/fD4CkoS6ZpY3lHf+Gg==",
+ "requires": {
+ "@babel/runtime": "^7.2.0",
+ "@emotion/hash": "^0.7.1",
+ "@material-ui/types": "^4.0.0",
+ "@material-ui/utils": "^4.0.0",
+ "clsx": "^1.0.2",
+ "deepmerge": "^3.0.0",
+ "hoist-non-react-statics": "^3.2.1",
+ "jss": "^10.0.0-alpha.16",
+ "jss-plugin-camel-case": "^10.0.0-alpha.16",
+ "jss-plugin-default-unit": "^10.0.0-alpha.16",
+ "jss-plugin-global": "^10.0.0-alpha.16",
+ "jss-plugin-nested": "^10.0.0-alpha.16",
+ "jss-plugin-props-sort": "^10.0.0-alpha.16",
+ "jss-plugin-rule-value-function": "^10.0.0-alpha.16",
+ "jss-plugin-vendor-prefixer": "^10.0.0-alpha.16",
+ "prop-types": "^15.7.2",
+ "warning": "^4.0.1"
+ },
+ "dependencies": {
+ "@material-ui/utils": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.0.0.tgz",
+ "integrity": "sha512-gjz52hO1hkIbKPMng1diQybVgtfgCptOCrulUs4emSCHHKUoR1zfT+IUrjgOaKIpYZNOgS/CI7KDMp689+FzeQ==",
+ "requires": {
+ "@babel/runtime": "^7.2.0",
+ "prop-types": "^15.7.2",
+ "react-is": "^16.8.0"
+ }
+ },
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
"@material-ui/system": {
"version": "3.0.0-alpha.2",
"resolved": "https://registry.npmjs.org/@material-ui/system/-/system-3.0.0-alpha.2.tgz",
@@ -941,6 +1000,11 @@
"warning": "^4.0.1"
}
},
+ "@material-ui/types": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-4.0.0.tgz",
+ "integrity": "sha512-wuiQMo8nSljZR1oWh57UQYssdtFqaU+Cbhr16uLohzzTllpCAK4LkH0slnH3n+5vCa2dgOdNlZTrmsIDDwvRJQ=="
+ },
"@material-ui/utils": {
"version": "3.0.0-alpha.3",
"resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-3.0.0-alpha.3.tgz",
@@ -3656,6 +3720,11 @@
"shallow-clone": "^0.1.2"
}
},
+ "clsx": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.0.4.tgz",
+ "integrity": "sha512-1mQ557MIZTrL/140j+JVdRM6e31/OA4vTYxXgqIIZlndyfjHpyawKZia1Im05Vp9BWmImkcNrNtFYQMyFcgJDg=="
+ },
"co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -9061,6 +9130,165 @@
}
}
},
+ "jss-plugin-camel-case": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-nki+smHEsFyoZ0OlOYtaxVqcQA0ZHVJCE1slRnk+1TklbmxbBiO4TwITMTEaNIDv0U0Uyb0Z8wVgFgRwCCIFog==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "hyphenate-style-name": "^1.0.3",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-default-unit": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-jjGW4F/r9yKvoyUk22M8nWhdMfvoWzJw/oFO2cDRXCk2onnWFiRALfqeUsEDyocwdZbyVF9WhZbSHn4GL03kSw==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-global": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-B1mm2ZF9OEsWPmzkG5ZUXqV88smDqpc4unILLXhWVuj0U5JeT0DNitH+QbXFrSueDJzkWVfvqyckvWDR/0qeDg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-nested": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-3l/MB6COnIpq4GOXQFae6UydoaIPa81UxhuBTEQuiAojgTeUla9L7nB3h18Q4zAhQQpjxaEsyppAKuEzIP7kPQ==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16",
+ "tiny-warning": "^1.0.2"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-props-sort": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-+Yn9nugHAH58nf/d43H2uxMvlCFPDgLKRSmKO4Q4m1IGYjMbHsWt1Rk2HfC9IiCanqcqpc8hstwtzf+HG7PWFQ==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-rule-value-function": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-MQap9ne6ZGZH0NlpSQTMSm6QalBTF0hYpd2uaGQwam+GlT7IKeO+sTjd46I1WgO3kyOmwb0pIY6CnuLQGXKtSA==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
+ "jss-plugin-vendor-prefixer": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-70yJ6QE5dN8VlPUGKld5jK2SKyrteheEL/ismexpybIufunMs6iJgkhDndbOfv8ia13yZgUVqeakMdhRKYwK1A==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "css-vendor": "^2.0.1",
+ "jss": "10.0.0-alpha.16"
+ },
+ "dependencies": {
+ "css-vendor": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.2.tgz",
+ "integrity": "sha512-Xn5ZAlI00d8HaQ8/oQ8d+iBzSF//NCc77LPzsucM32X/R/yTqmXy6otVsAM0XleXk6HjPuXoVZwXsayky/fsFQ==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.0.2"
+ }
+ },
+ "jss": {
+ "version": "10.0.0-alpha.16",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.16.tgz",
+ "integrity": "sha512-HmKNNnr82TR5jkWjBcbrx/uim2ief588pWp7zsf4GQpL125zRkEaWYL1SXv5bR6bBvAoTtvJsTAOxDIlLxUNZg==",
+ "requires": {
+ "@babel/runtime": "^7.3.1",
+ "is-in-browser": "^1.1.3",
+ "tiny-warning": "^1.0.2"
+ }
+ }
+ }
+ },
"jss-props-sort": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz",
diff --git a/package.json b/package.json
index 5ee83066b45017d23c9580611cbbc52ea80fb90b..b1567621cb47c30979656de5fd5946b8f5bc329b 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,8 @@
"private": true,
"dependencies": {
"@material-ui/core": "^3.9.2",
+ "@material-ui/icons": "^4.0.0",
+ "@material-ui/styles": "^4.0.0",
"axios": "^0.18.0",
"binary-extensions": "^2.0.0",
"react": "^16.8.4",
diff --git a/src/App.css b/src/App.css
old mode 100755
new mode 100644
index f595a853d49a1b49ca1a0dffc6afa23b9b02596c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
--- a/src/App.css
+++ b/src/App.css
@@ -1,36 +0,0 @@
-.App {
- text-align: center;
-}
-
-.carrossel{
- background-color: red;
-}
-
-li.slide{
- background: White !important;
-
-}
-
-.MuiSelect-select-6:focus{
- background-color: white !important;
-}
-
-.MuiPaper-elevation2-85{
- box-shadow: none !important;
-}
-
-.material-icons {
- font-family: 'Material Icons';
- font-weight: normal;
- font-style: normal;
- font-size: 24px;
- line-height: 1;
- letter-spacing: normal;
- text-transform: none;
- display: inline-block;
- white-space: nowrap;
- word-wrap: normal;
- direction: ltr;
- -webkit-font-feature-settings: 'liga';
- -webkit-font-smoothing: antialiased;
-}
diff --git a/src/App.test.js b/src/App.test.js
deleted file mode 100755
index a754b201bf9c6caf5271293588189fb4210f99d1..0000000000000000000000000000000000000000
--- a/src/App.test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-
-it('renders without crashing', () => {
- const div = document.createElement('div');
- ReactDOM.render(<App />, div);
- ReactDOM.unmountComponentAtNode(div);
-});
diff --git a/src/Components/AGPLFooter.js b/src/Components/AGPLFooter.js
index ce1244ea3daf38c96b969074f58d1d37a43129e0..7f8a50f3ad4bf08fe4005d6b975d791a00979e24 100644
--- a/src/Components/AGPLFooter.js
+++ b/src/Components/AGPLFooter.js
@@ -16,7 +16,7 @@ class AGPLFooter extends Component{
<Container>
<Row justify="around">
<Col md={1}>
- <img src={acessoInfo} height="40"/>
+ <img src={acessoInfo} height="40" alt="acesso a informação"/>
</Col>
<Col md={8}>
<p style={{fontSize: "12px", textAlign: "center"}}>
diff --git a/src/Components/AreasSubPages.js b/src/Components/AreasSubPages.js
index adcff72a5f0f6ea2d70a06ca0ca4dba89e00e2ae..34a8f9ed879e92fa21dae08a28caf5cfc87a72c7 100644
--- a/src/Components/AreasSubPages.js
+++ b/src/Components/AreasSubPages.js
@@ -1,4 +1,6 @@
import React, {Component} from 'react';
+import axios from 'axios';
+import {apiUrl} from '../env';
import '../App.css';
import {Col,Row, Container, Hidden, Visible} from 'react-grid-system';
import MediaCard from './Card';
@@ -29,10 +31,41 @@ const areaStyle={
minHeight: "150px"
}
-class SubPages extends Component{
+class ReqCards extends Component{
constructor(props){
super(props);
+ this.state = {
+ resources: [],
+ };
+ }
+ componentWillMount(){
+ axios.get(`${apiUrl}/learning_objects?limit=12&sort=["published_at", "desc"]`)
+ .then(res=> {
+ this.setState({resources: res.data});
+ });
+ }
+ render(){
+ var row1 = this.state.resources.slice(0, 4);
+ var row2 = this.state.resources.slice(4, 8);
+ var row3 = this.state.resources.slice(8, 13);
+ return(
+ <Carousel showThumbs={false} autoPlay infiniteLoop={true} showStatus={false}>
+ <Row>
+ {row1.map(card => <Col md={3} sm={6} key={card.id}><MediaCard name={card.name} type={card.object_type} description={card.description}/></Col>)}
+ </Row>
+ <Row>
+ {row2.map(card => <Col md={3} sm={6} key={card.id}><MediaCard name={card.name} type={card.object_type} description={card.description}/></Col>)}
+ </Row>
+ <Row>
+ {row3.map(card => <Col md={3} sm={6} key={card.id}><MediaCard name={card.name} type={card.object_type} description={card.description}/></Col>)}
+ </Row>
+ </Carousel>
+ )
}
+}
+
+class SubPages extends Component{
+
areaRender(){
switch(this.props.banner){
case "Recursos":
@@ -40,7 +73,7 @@ class SubPages extends Component{
<React.Fragment>
<div style={{backgroundColor: "#ff7f00"}}>
<Container style={areaStyle}>
- <img src={recursos} height="100" style={{float: "left"}}/>
+ <img src={recursos} alt="aba recursos" height="100" style={{float: "left"}}/>
<p>Nesta área, você tem acesso a Recursos Educacionais Digitais, isto é,
a vÃdeos, animações e a outros recursos destinados à educação. São Recursos
de portais parceiros do MEC e de professores que, como você, atuam na
@@ -51,27 +84,10 @@ class SubPages extends Component{
<p style={{paddingBottom:"5px", borderBottom: "1px solid #ff7f00", color: "#ff7f00"}}>
Recursos mais recentes </p>
<Hidden sm xs>
- <Carousel showThumbs={false} autoPlay infiniteLoop={true} showStatus={false}>
- {carrossel}
- {carrossel}
- {carrossel}
- </Carousel>
+ <ReqCards/>
</Hidden>
<Visible sm xs>
- <Carousel showThumbs={false} autoPlay infiniteLoop={true} showStatus={false}>
- <Row justify="around" style={{paddingBottom: "50px"}} >
- {rows}
- {rows}
- </Row>
- <Row justify="around" style={{paddingBottom: "50px"}} >
- {rows}
- {rows}
- </Row>
- <Row justify="around" style={{paddingBottom: "50px"}} >
- {rows}
- {rows}
- </Row>
- </Carousel>
+ <ReqCards/>
</Visible>
</Container>
</React.Fragment>
@@ -81,7 +97,7 @@ class SubPages extends Component{
<React.Fragment>
<div style={{backgroundColor: "#e81f4f"}}>
<Container style={areaStyle}>
- <img src={materiais} height="100" style={{float: "left"}}/>
+ <img src={materiais} alt="aba materiais" height="100" style={{float: "left"}}/>
<p>Nesta área, você acessa livremente materiais completos de formação,
como cursos já oferecidos pelo MEC e seus parceiros. São conteúdos
elaborados por equipes multidisciplinares e de autoria de pesquisadores
@@ -104,7 +120,7 @@ class SubPages extends Component{
<React.Fragment>
<div style={{backgroundColor: "#673ab7"}}>
<Container style={areaStyle}>
- <img src={colecoes} height="100" style={{float: "left"}}/>
+ <img src={colecoes} alt="aba coleções" height="100" style={{float: "left"}}/>
<p>Nesta área, você tem acesso às coleções criadas e organizadas
pelos usuários da plataforma. É mais uma possibilidade de buscar
recursos educacionais para sua aula!</p>
@@ -130,7 +146,6 @@ class SubPages extends Component{
return(
<div>
{this.areaRender()}
-
</div>
);
}
diff --git a/src/Components/Card.js b/src/Components/Card.js
index 1a7c2c34d62f487afff7f33a6d182c1250d10b05..788a534c08172b9b88f20dde01601ee827c00ba5 100644
--- a/src/Components/Card.js
+++ b/src/Components/Card.js
@@ -1,57 +1,55 @@
import React from 'react';
-import PropTypes from 'prop-types';
-import { withStyles } from '@material-ui/core/styles';
import Card from '@material-ui/core/Card';
-import CardActionArea from '@material-ui/core/CardActionArea';
-import CardActions from '@material-ui/core/CardActions';
import CardContent from '@material-ui/core/CardContent';
-import CardMedia from '@material-ui/core/CardMedia';
-import Button from '@material-ui/core/Button';
+import CardActions from '@material-ui/core/CardActions';
+import IconButton from '@material-ui/core/IconButton';
import Typography from '@material-ui/core/Typography';
+import FavoriteIcon from '@material-ui/icons/Favorite';
+import ShareIcon from '@material-ui/icons/Share';
+import animacao from "../img/laranja/ANIMACAO_SIMULACAO.jpg";
+import apresentacao from "../img/laranja/APRESENTACAO.jpg";
+import aplicativo from "../img/laranja/APP.jpg";
+import audio from "../img/laranja/AUDIO.jpg";
+import vazio from "../img/laranja/EMPTY.jpg";
+import imagem from "../img/laranja/IMAGEM.jpg";
+import grafico from "../img/laranja/INFOGRAFICO.jpg";
+import jogo from "../img/laranja/JOGO.jpg";
+import livro from "../img/laranja/LIVRO_DIGITAL.jpg";
+import mapa from "../img/laranja/MAPA.jpg";
+import outros from "../img/laranja/OUTROS.jpg";
+import software from "../img/laranja/SOFTWARE.jpg";
+import texto from "../img/laranja/TEXTO.jpg";
+import video from "../img/laranja/VIDEO.jpg";
-const styles = {
- card: {
- maxWidth: 250,
- },
- media: {
- height: 125,
- },
-};
-
-function MediaCard(props) {
- const { classes } = props;
+var types = [{label: "Animação", thumb: animacao}, {label: "Apresentação", thumb: apresentacao},
+{label: "Aplicativo" , thumb: aplicativo}, {label: "Ãudio", thumb: audio}, {label: "Vazio", thumb: vazio}, {label: "Imagem", thumb: imagem}, {label: "Gráfico", thumb: grafico}, {label: "Jogo", thumb: jogo}, {label: "Livro", thumb: livro}, {label: "Mapa", thumb: mapa}, {label: "Outros", thumb: outros}, {label: "Software", thumb:software}, {label: "Texto", thumb:texto}, {label: "VÃdeo", thumb:video}]
+function RecipeReviewCard(props){
+var thumbnail = props.thumbnail;
+if (thumbnail == null) {
+ thumbnail = types.find(function(element){ return element.label == props.type});
+}
+thumbnail = thumbnail.thumb
return (
- <Card className={classes.card}>
- <CardActionArea>
- <CardMedia
- className={classes.media}
- image="/static/images/cards/contemplative-reptile.jpg"
- title="Contemplative Reptile"
- />
- <CardContent>
- <Typography gutterBottom variant="h5" component="h2">
- {classes.name}
- </Typography>
- <Typography component="p">
- Lizards are a widespread group of squamate reptiles, with over 6,000 species, ranging
- across all continents except Antarctica
- </Typography>
- </CardContent>
- </CardActionArea>
+ <Card>
+ <img src={thumbnail} alt="thumbnail do recurso"/>
+ <CardContent style={{height: "200px"}}>
+ <Typography variant="body1" color="textPrimary" component="p">
+ {props.name}
+ </Typography>
+ <Typography variant="caption" color="textSecondary" component="p">
+ {props.description}
+ </Typography>
+ </CardContent>
<CardActions>
- <Button size="small" color="primary">
- Share
- </Button>
- <Button size="small" color="primary">
- Learn More
- </Button>
+ <IconButton aria-label="Add to favorites">
+ <FavoriteIcon />
+ </IconButton>
+ <IconButton aria-label="Share">
+ <ShareIcon />
+ </IconButton>
</CardActions>
</Card>
);
}
-MediaCard.propTypes = {
- classes: PropTypes.object.isRequired,
-};
-
-export default withStyles(styles)(MediaCard);
+export default RecipeReviewCard;
diff --git a/src/Components/EcFooter.js b/src/Components/EcFooter.js
index 22ba7667a6e33cda0e389cfbbdab7765d072f61c..3d19a703e38f7ec07cb9beccf46b87715600c6dd 100644
--- a/src/Components/EcFooter.js
+++ b/src/Components/EcFooter.js
@@ -26,24 +26,24 @@ class EcFooter extends Component{
<Col md={4} sm={4}>
<h4>Sobre</h4>
<ul style={listStyle}>
- <li> <a>Sobre a Plataforma</a> </li>
- <li> <a>Portais Parceiros</a> </li>
- <li> <a>Termos de Uso</a> </li>
- <li> <a>Contato</a> </li>
+ <li> <a href="#sobre">Sobre a Plataforma</a> </li>
+ <li> <a href="#parceiros">Portais Parceiros</a> </li>
+ <li> <a href="#termos-de-uso">Termos de Uso</a> </li>
+ <li> <a href="#contato">Contato</a> </li>
</ul>
</Col>
<Col md={4} sm={4}>
<h4>Ajuda</h4>
<ul style={listStyle}>
- <li> <a>Central de Ajuda</a> </li>
- <li> <a>Publicando Recursos</a> </li>
- <li> <a>Encontrando Recursos</a> </li>
- <li> <a>Participando da Rede</a> </li>
- <li> <a>Gerenciando a Conta</a> </li>
+ <li> <a href="#ajuda">Central de Ajuda</a> </li>
+ <li> <a href="#publicar">Publicando Recursos</a> </li>
+ <li> <a href="#busca">Encontrando Recursos</a> </li>
+ <li> <a href="#rede">Participando da Rede</a> </li>
+ <li> <a href="#conta">Gerenciando a Conta</a> </li>
</ul>
</Col>
<Col md={4} sm={4}>
- <img src={eduConectada} height="50%"/>
+ <img src={eduConectada} height="50%" alt="logo educação conectada"/>
</Col>
</Row>
</Container>
diff --git a/src/Components/Funcionalities.js b/src/Components/Funcionalities.js
index 38c924ecc575e08985099be3db72033fc43300e7..d308f796b3e4121e6538bd4a4569e25b52a4462c 100644
--- a/src/Components/Funcionalities.js
+++ b/src/Components/Funcionalities.js
@@ -31,7 +31,7 @@ class Funcionalities extends Component{
<h2>Aqui na Plataforma você pode:</h2>
<Row style={imgRow}>
<Col sm={4} md={4}>
- <img src={compartilhar} height="150px"/>
+ <img src={compartilhar} height="150px" alt="compartilhar recursos"/>
<span>
<span style={title}>
Compartilhar
@@ -42,7 +42,7 @@ class Funcionalities extends Component{
</span>
</Col>
<Col sm={4} md={4}>
- <img src={relatar} height="150px"/>
+ <img src={relatar} height="150px" alt="relatar experiências"/>
<span>
<span style={title}>
Relatar experiências,
@@ -53,7 +53,7 @@ class Funcionalities extends Component{
</span>
</Col>
<Col sm={4} md={4}>
- <img src={guardar} height="150px"/>
+ <img src={guardar} height="150px" alt="guardar recursos"/>
<span>
<span style={title}>
Guardar recursos
@@ -65,7 +65,7 @@ class Funcionalities extends Component{
</Col>
<Col sm={4} md={4}>
- <img src={seguir} height="150px"/>
+ <img src={seguir} height="150px" alt="seguir usuários"/>
<span>
<span style={title}>
Seguir usuários
@@ -76,7 +76,7 @@ class Funcionalities extends Component{
</span>
</Col>
<Col sm={4} md={4}>
- <img src={baixar} height="150px"/>
+ <img src={baixar} height="150px" alt="baixar recursos"/>
<span>
<span style={title}>
Baixar
@@ -87,7 +87,7 @@ class Funcionalities extends Component{
</span>
</Col>
<Col sm={4} md={4}>
- <img src={acessar} height="150px"/>
+ <img src={acessar} height="150px" alt="acessar materiais"/>
<span>
<span style={title}>
Acessar materiais
diff --git a/src/Components/MenuBar.js b/src/Components/MenuBar.js
index e08688624e51d0ead3309cff7bcc11cc64daf72c..fb7996877a585cb738ae272519a74396e5b97f3b 100644
--- a/src/Components/MenuBar.js
+++ b/src/Components/MenuBar.js
@@ -1,22 +1,21 @@
import React, {Component} from 'react';
-import {Row, Col, Container, Hidden, Visible} from 'react-grid-system'
+import {Row, Col, Container} from 'react-grid-system'
import '../App.css';
-import logoPlataforma from '../img/logo.svg';
-import logoEC from '../img/logoEC.svg';
+
import tumbnail from '../img/logo_small.svg'
import BT from './Button';
import Menulist from './menulist';
import { Link } from 'react-router-dom'
import {IoIosMenu} from "react-icons/io";
-const logosStyle={
- borderRight:"1px rgba(0,0,0,.1) solid",
- paddingTop:"20px",
- paddingBottom:"5px",
- paddingLeft: "0px",
- paddingRight: "0px",
- justifyContent:"left",
- display:"inline-flex"
-};
+// const logosStyle={
+// borderRight:"1px rgba(0,0,0,.1) solid",
+// paddingTop:"20px",
+// paddingBottom:"5px",
+// paddingLeft: "0px",
+// paddingRight: "0px",
+// justifyContent:"left",
+// display:"inline-flex"
+// };
const rowStyle={
verticalAlign: "left"
};
@@ -32,7 +31,7 @@ class MenuBar extends Component{
</Col>
<Col sm={2} md={2} style={{padding:"0px", alingItens: "left", alignSelf:"center"}}><Menulist children={<IoIosMenu/>} label={"Menu"}/></Col>
<Col sm={2} md={2} style={{padding:"0px", paddingTop: "-5px", alignSelf:"center"}}><Menulist label={"Ajuda"}/></Col>
- <Col sm={2} md={2} style={{padding:"0px", alignSelf:"center"}}>< Link to ="/sobre">Busca</Link></Col>
+ <Col sm={2} md={2} style={{padding:"0px", alignSelf:"center"}}>< Link to ="/usuario">Busca</Link></Col>
<Col sm={4} md={3}style={{paddingTop:"10px"}} justify="Right">
<BT name="Entrar"/>
<BT name="Cadastre-se"/>
diff --git a/src/Components/SearchBar.js b/src/Components/SearchBar.js
index 93af4af7f33ddb93d3234f3ad092dad1b3cb3c08..5e272af1ab78b3eef75293a34ac568cb1541f400 100644
--- a/src/Components/SearchBar.js
+++ b/src/Components/SearchBar.js
@@ -1,20 +1,19 @@
import React, {Component} from 'react';
import '../App.css';
-import {Row, Col, Container} from 'react-grid-system';
-
+import {Row, Col} from 'react-grid-system';
import Button from '@material-ui/core/Button';
import Select from './Select';
import TextField from '@material-ui/core/TextField';
import {IoIosSearch} from 'react-icons/io';
-const barStyle={
- backgroundColor: "white",
- border: "none"
-};
-const searchButton={
- backgroundColor: "white",
- border: "none",
- borderRadius: "0"
-};
+// const barStyle={
+// backgroundColor: "white",
+// border: "none"
+// };
+// const searchButton={
+// backgroundColor: "white",
+// border: "none",
+// borderRadius: "0"
+// };
class SearchBar extends Component {
constructor (props) {
@@ -66,7 +65,7 @@ class SearchBar extends Component {
<Col sm={3} md={2}>
<Button
type='submit'
- size="100%"
+ size="medium"
onClick={this.handleSearch.bind(this)}>
<IoIosSearch size="30px"/>
</Button>
diff --git a/src/Components/SearchSection.js b/src/Components/SearchSection.js
index 36de5afbed2bdda5f5a34b0b5c1f053528420ec9..0faedfd41573349e58bdee47c7dbd2834cf0781f 100644
--- a/src/Components/SearchSection.js
+++ b/src/Components/SearchSection.js
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
import '../App.css';
import banner from '../img/bannerBusca.jpg';
import SearchBar from './SearchBar';
-import {Row, Col, Container} from 'react-grid-system';
+import {Row, Container} from 'react-grid-system';
import {MdInfoOutline} from "react-icons/md"
import { FaRegPlayCircle} from "react-icons/fa";
@@ -54,8 +54,8 @@ class SearchSection extends Component{
<SearchBar/>
</Container>
<div style={{paddingBottom: "100px", color: "white"}}>
- <a><MdInfoOutline size="30px"/>SOBRE A PLATAFORMA</a>
- <a> <FaRegPlayCircle size="25px"/>VÃDEO DE APRESENTAÇÃO</a>
+ <a href="#sobre"><MdInfoOutline size="30px"/>SOBRE A PLATAFORMA</a>
+ <a href="#apresentacao"> <FaRegPlayCircle size="25px"/>VÃDEO DE APRESENTAÇÃO</a>
</div>
<Row justify="center">
<button style={{...buttonStyle, ...{backgroundColor: "#ff7f00"}}} onClick={()=> {this.props.function("Recursos")}}>Recursos Educacionais Digitais</button>
diff --git a/src/Components/Select.js b/src/Components/Select.js
index 0e71ff23e16084b600dcdb8c4b35af758b2f5542..8ad195b06dc985c01cdb081f155047804d5ad4ff 100644
--- a/src/Components/Select.js
+++ b/src/Components/Select.js
@@ -1,10 +1,8 @@
import React from 'react';
-import PropTypes from 'prop-types';
import { withStyles } from '@material-ui/core/styles';
import MenuItem from '@material-ui/core/MenuItem';
import FormControl from '@material-ui/core/FormControl';
import Select from '@material-ui/core/Select';
-import NativeSelect from '@material-ui/core/NativeSelect';
import InputBase from '@material-ui/core/InputBase';
const BootstrapInput = withStyles(theme => ({
@@ -15,18 +13,18 @@ const BootstrapInput = withStyles(theme => ({
},
}))(InputBase);
-const styles = theme => ({
- root: {
- display: 'flex',
- flexWrap: 'wrap',
- },
- margin: {
- margin: theme.spacing.unit,
- },
- bootstrapFormLabel: {
- fontSize: 18,
- },
-});
+// const styles = theme => ({
+// root: {
+// display: 'flex',
+// flexWrap: 'wrap',
+// },
+// margin: {
+// margin: theme.spacing.unit,
+// },
+// bootstrapFormLabel: {
+// fontSize: 18,
+// },
+// });
class CustomizedSelects extends React.Component {
state = {
@@ -38,7 +36,7 @@ class CustomizedSelects extends React.Component {
};
render() {
- const { classes } = this.props;
+ // const { classes } = this.props;
return (
<FormControl>
@@ -56,8 +54,5 @@ class CustomizedSelects extends React.Component {
}
}
-CustomizedSelects.propTypes = {
- classes: PropTypes.object.isRequired,
-};
export default (CustomizedSelects);
diff --git a/src/Components/Sobre.js b/src/Components/Sobre.js
deleted file mode 100644
index ce1244ea3daf38c96b969074f58d1d37a43129e0..0000000000000000000000000000000000000000
--- a/src/Components/Sobre.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, {Component} from 'react';
-import {Row, Col, Container} from 'react-grid-system';
-import acessoInfo from '../img/acesso-a-informacao.png';
-const grayFooter={
- backgroundColor: "#434343",
- color: "white",
- textAlign: "center",
- display: "block",
- paddingTop: "20px",
- paddingBottom: "10px"
-};
-class AGPLFooter extends Component{
- render(){
- return(
- <div style={grayFooter}>
- <Container>
- <Row justify="around">
- <Col md={1}>
- <img src={acessoInfo} height="40"/>
- </Col>
- <Col md={8}>
- <p style={{fontSize: "12px", textAlign: "center"}}>
- As tecnologias da Plataforma Integrada possuem as licenças MIT(Frontend) e licença GNU/AGPL(Backend).
- </p>
- </Col>
- </Row>
- </Container>
- <br/>
- <Container>
- <Row>
- <Col offset={{ md: 3 }} md={6}>
- <p style={{fontSize: "9px"}}>
- Esta versão da platarfoma funciona melhor nas últimas versões dos navegadores Chrome e Firefox.
- Para uma melhor experiência mantenha seus navegadores atualizados! Versão 1.02
- </p>
- </Col>
- </Row>
- </Container>
- </div>
- )
- }
-}
-export default AGPLFooter;
diff --git a/src/Components/StatsBar.js b/src/Components/StatsBar.js
index 37892db6e415bdc94418c63ab77c976391fdab2c..683c46c4ac1491beff863167388ae3448f102e90 100644
--- a/src/Components/StatsBar.js
+++ b/src/Components/StatsBar.js
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
-import {Grid, Col,Row, Container} from 'react-grid-system';
+import {Col,Row, Container} from 'react-grid-system';
import mapaBrasil from '../img/mapa-brasil-line-icon.svg';
const brasilStyle={
backgroundColor: "#00bcd4",
@@ -16,10 +16,6 @@ const numberStyle={
fontFamily: "Roboto, sans-serif",
textAlign: "center"
};
-const captions={
- fontSize: "1.1em",
- fontFamily: "Roboto, sans-serif"
-};
const statistcStyle={
display: "inline-block",
padding: "5px",
@@ -33,7 +29,7 @@ class StatsBar extends Component{
<Container>
<Row>
<Col md={6} sm={6} style={{borderRight:"2px dotted #fff", textAlign: "right", alignSelf: "center"}}>
- <img src={mapaBrasil} height="83px"/>
+ <img src={mapaBrasil} height="83px" alt="mapa do brasil"/>
<span style={statistcStyle}>
<span style={numberStyle}>
31061
diff --git a/src/Pages/CollectionPage.js b/src/Pages/CollectionPage.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ebfcecd83368c08d1fd91f9681ada06b5429e78
--- /dev/null
+++ b/src/Pages/CollectionPage.js
@@ -0,0 +1,12 @@
+import React, {Component} from 'react';
+
+
+class CollectionPage extends Component {
+ render() {
+ return (
+ <h1> Página visulizar coleção</h1>
+ );
+ }
+ }
+
+export default CollectionPage;
diff --git a/src/Home.js b/src/Pages/Home.js
similarity index 67%
rename from src/Home.js
rename to src/Pages/Home.js
index 821ef368819e4243bbec6b5bc84e066c3afaf0a3..799cb05f4cd01776a0197753abd9be8c0e04a23c 100755
--- a/src/Home.js
+++ b/src/Pages/Home.js
@@ -1,9 +1,9 @@
-import React, {Component, Object} from 'react';
-import './App.css';
-import SearchSection from './Components/SearchSection';
-import SubPages from './Components/AreasSubPages';
-import StatsBar from './Components/StatsBar';
-import Funcionalities from './Components/Funcionalities';
+import React, {Component} from 'react';
+import './Styles/Home.css';
+import SearchSection from '../Components/SearchSection';
+import SubPages from '../Components/AreasSubPages';
+import StatsBar from '../Components/StatsBar';
+import Funcionalities from '../Components/Funcionalities';
class App extends Component {
constructor(props){
super(props);
diff --git a/src/Pages/ProfilePage.js b/src/Pages/ProfilePage.js
new file mode 100644
index 0000000000000000000000000000000000000000..f022e2a7bb699ee6391f535b144eca307800e759
--- /dev/null
+++ b/src/Pages/ProfilePage.js
@@ -0,0 +1,12 @@
+import React, {Component} from 'react';
+
+
+class ProfilePage extends Component {
+ render() {
+ return (
+ <h1> Página visulizar prefil de usuário</h1>
+ );
+ }
+ }
+
+export default ProfilePage;
diff --git a/src/Pages/ResourcePage.js b/src/Pages/ResourcePage.js
new file mode 100644
index 0000000000000000000000000000000000000000..3fa033abae1f43c035d80e597b6bae3bac0521c3
--- /dev/null
+++ b/src/Pages/ResourcePage.js
@@ -0,0 +1,12 @@
+import React, {Component} from 'react';
+
+
+class ResourcePage extends Component {
+ render() {
+ return (
+ <h1> Página visulizar Recurso</h1>
+ );
+ }
+ }
+
+export default ResourcePage;
diff --git a/src/Pages/Styles/Home.css b/src/Pages/Styles/Home.css
new file mode 100755
index 0000000000000000000000000000000000000000..f595a853d49a1b49ca1a0dffc6afa23b9b02596c
--- /dev/null
+++ b/src/Pages/Styles/Home.css
@@ -0,0 +1,36 @@
+.App {
+ text-align: center;
+}
+
+.carrossel{
+ background-color: red;
+}
+
+li.slide{
+ background: White !important;
+
+}
+
+.MuiSelect-select-6:focus{
+ background-color: white !important;
+}
+
+.MuiPaper-elevation2-85{
+ box-shadow: none !important;
+}
+
+.material-icons {
+ font-family: 'Material Icons';
+ font-weight: normal;
+ font-style: normal;
+ font-size: 24px;
+ line-height: 1;
+ letter-spacing: normal;
+ text-transform: none;
+ display: inline-block;
+ white-space: nowrap;
+ word-wrap: normal;
+ direction: ltr;
+ -webkit-font-feature-settings: 'liga';
+ -webkit-font-smoothing: antialiased;
+}
diff --git a/src/Pages/Untitled Document b/src/Pages/Untitled Document
new file mode 100644
index 0000000000000000000000000000000000000000..1f9c4d9398d6a2a20674450f2560df5173669591
--- /dev/null
+++ b/src/Pages/Untitled Document
@@ -0,0 +1,12 @@
+import React, {Component} from 'react';
+
+
+class UserPage extends Component {
+ render() {
+ return (
+ <h1> Página visulizar usuário</h1>
+ );
+ }
+ }
+
+export default UserPage;
diff --git a/src/Pages/UserPage.js b/src/Pages/UserPage.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f9c4d9398d6a2a20674450f2560df5173669591
--- /dev/null
+++ b/src/Pages/UserPage.js
@@ -0,0 +1,12 @@
+import React, {Component} from 'react';
+
+
+class UserPage extends Component {
+ render() {
+ return (
+ <h1> Página visulizar usuário</h1>
+ );
+ }
+ }
+
+export default UserPage;
diff --git a/src/env.js b/src/env.js
new file mode 100644
index 0000000000000000000000000000000000000000..666d34e69d8fe4cc878357af2c7d8f13896a88b5
--- /dev/null
+++ b/src/env.js
@@ -0,0 +1,6 @@
+
+var apiDomain = 'http://localhost:5000',
+ apiVersion = 'v1',
+ apiUrl = apiDomain + '/' + apiVersion;
+
+export {apiUrl};
diff --git a/src/img/girassol.jpg b/src/img/girassol.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4e825de7716e8a6ec5396b8f1c0b9bad70743288
Binary files /dev/null and b/src/img/girassol.jpg differ
diff --git a/src/img/laranja/ANIMACAO_SIMULACAO.jpg b/src/img/laranja/ANIMACAO_SIMULACAO.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6fad96035aeaaf5a261772b2894263a5e4df8ab7
Binary files /dev/null and b/src/img/laranja/ANIMACAO_SIMULACAO.jpg differ
diff --git a/src/img/laranja/APP.jpg b/src/img/laranja/APP.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..519ac1546dcb36912d3c1ad066e086229f309bb6
Binary files /dev/null and b/src/img/laranja/APP.jpg differ
diff --git a/src/img/laranja/APRESENTACAO.jpg b/src/img/laranja/APRESENTACAO.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b171257c80d2f412c0be33f0607d81bfeeca6d3a
Binary files /dev/null and b/src/img/laranja/APRESENTACAO.jpg differ
diff --git a/src/img/laranja/AUDIO.jpg b/src/img/laranja/AUDIO.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..486d300ef5c6d0a50868bb95e6cb7128504cf723
Binary files /dev/null and b/src/img/laranja/AUDIO.jpg differ
diff --git a/src/img/laranja/EMPTY.jpg b/src/img/laranja/EMPTY.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4aa2c2878618019818c0cf0d0f7c3deb39fe26ac
Binary files /dev/null and b/src/img/laranja/EMPTY.jpg differ
diff --git a/src/img/laranja/IMAGEM.jpg b/src/img/laranja/IMAGEM.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8a52983504f4cfb8309f0a35d52cc43e677ce893
Binary files /dev/null and b/src/img/laranja/IMAGEM.jpg differ
diff --git a/src/img/laranja/INFOGRAFICO.jpg b/src/img/laranja/INFOGRAFICO.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b4e0fa95d62b8f20c00d80d9038d10a27f08b951
Binary files /dev/null and b/src/img/laranja/INFOGRAFICO.jpg differ
diff --git a/src/img/laranja/JOGO.jpg b/src/img/laranja/JOGO.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7ef0f5dfa4dc7373b552b96a569df238134d00b5
Binary files /dev/null and b/src/img/laranja/JOGO.jpg differ
diff --git a/src/img/laranja/LIVRO_DIGITAL.jpg b/src/img/laranja/LIVRO_DIGITAL.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f6bcf2fc35f096a55622bb7432306cbcbcfaa8da
Binary files /dev/null and b/src/img/laranja/LIVRO_DIGITAL.jpg differ
diff --git a/src/img/laranja/MAPA.jpg b/src/img/laranja/MAPA.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..aeb04e3d3c247c018686e7c0b949b5de13fa10a5
Binary files /dev/null and b/src/img/laranja/MAPA.jpg differ
diff --git a/src/img/laranja/OUTROS.jpg b/src/img/laranja/OUTROS.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..28afbdbcbb96e52d54139f3a29b7c7f0e6fac3cd
Binary files /dev/null and b/src/img/laranja/OUTROS.jpg differ
diff --git a/src/img/laranja/SOFTWARE.jpg b/src/img/laranja/SOFTWARE.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8d680e0c37f713c6bfc1df7bad54a94d29ea959c
Binary files /dev/null and b/src/img/laranja/SOFTWARE.jpg differ
diff --git a/src/img/laranja/TEXTO.jpg b/src/img/laranja/TEXTO.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fa6ed82c58189411b5b0c6c7a18c605b3ec26108
Binary files /dev/null and b/src/img/laranja/TEXTO.jpg differ
diff --git a/src/img/laranja/VIDEO.jpg b/src/img/laranja/VIDEO.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f895f6acf8f35b4accea379a9afaa87b62c5c669
Binary files /dev/null and b/src/img/laranja/VIDEO.jpg differ
diff --git a/src/index.js b/src/index.js
index ff0209272015154c42b596edcba06b8aca27471b..c32b1e4570d989c29e84e9694071db84c3178b1a 100755
--- a/src/index.js
+++ b/src/index.js
@@ -1,12 +1,12 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
-import App from './Home';
+import Home from './Pages/Home';
import MenuBar from './Components/MenuBar';
import EcFooter from './Components/EcFooter';
import GNUAGPLfooter from './Components/AGPLFooter';
import AcessibilityBar from './Components/AcessibilityBar';
-import Sobre from './Components/Sobre';
+import UserPage from './Pages/UserPage';
import * as serviceWorker from './serviceWorker';
import {BrowserRouter, Switch, Route} from 'react-router-dom';
@@ -16,8 +16,8 @@ ReactDOM.render(
<MenuBar/>
<div style={{backgroundImage: "linear-gradient(to right,#ff7f00,#e81f4f,#673ab7,#00bcd4)", height:"5px"}}></div>
<Switch>
- <Route path="/" exact={true} component={App}/>
- <Route path="/sobre" component={Sobre} />
+ <Route path="/" exact={true} component={Home}/>
+ <Route path="/usuario" component={UserPage} />
</Switch>
<EcFooter/>
<GNUAGPLfooter/>