From 109ee9e05d07bba27b68eefe582d92672d446ce9 Mon Sep 17 00:00:00 2001 From: sayuri <smr17@inf.ufpr.br> Date: Wed, 26 Jun 2019 10:55:38 -0300 Subject: [PATCH] =?UTF-8?q?Defini=C3=A7=C3=A3o=20das=20p=C3=A1ginas=20a=20?= =?UTF-8?q?serem=20feitas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hello-world.js | 14 ----------- src/App.css | 36 --------------------------- src/App.test.js | 9 ------- src/Components/AreasSubPages.js | 1 - src/Components/MenuBar.js | 2 +- src/Components/Sobre.js | 43 --------------------------------- src/Pages/CollectionPage.js | 12 +++++++++ src/{ => Pages}/Home.js | 10 ++++---- src/Pages/ProfilePage.js | 12 +++++++++ src/Pages/ResourcePage.js | 12 +++++++++ src/Pages/Styles/Home.css | 36 +++++++++++++++++++++++++++ src/Pages/Untitled Document | 12 +++++++++ src/Pages/UserPage.js | 12 +++++++++ src/index.js | 8 +++--- 14 files changed, 106 insertions(+), 113 deletions(-) delete mode 100644 hello-world.js mode change 100755 => 100644 src/App.css delete mode 100755 src/App.test.js delete mode 100644 src/Components/Sobre.js create mode 100644 src/Pages/CollectionPage.js rename src/{ => Pages}/Home.js (72%) create mode 100644 src/Pages/ProfilePage.js create mode 100644 src/Pages/ResourcePage.js create mode 100755 src/Pages/Styles/Home.css create mode 100644 src/Pages/Untitled Document create mode 100644 src/Pages/UserPage.js diff --git a/hello-world.js b/hello-world.js deleted file mode 100644 index 18f976c4..00000000 --- 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/src/App.css b/src/App.css old mode 100755 new mode 100644 index f595a853..e69de29b --- 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 a754b201..00000000 --- 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/AreasSubPages.js b/src/Components/AreasSubPages.js index 851ee881..34a8f9ed 100644 --- a/src/Components/AreasSubPages.js +++ b/src/Components/AreasSubPages.js @@ -42,7 +42,6 @@ class ReqCards extends Component{ axios.get(`${apiUrl}/learning_objects?limit=12&sort=["published_at", "desc"]`) .then(res=> { this.setState({resources: res.data}); - console.log(res.data); }); } render(){ diff --git a/src/Components/MenuBar.js b/src/Components/MenuBar.js index 3a57648e..fb799687 100644 --- a/src/Components/MenuBar.js +++ b/src/Components/MenuBar.js @@ -31,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/Sobre.js b/src/Components/Sobre.js deleted file mode 100644 index c1a4a5c4..00000000 --- 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" alt="Acesso a informação"/> - </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/Pages/CollectionPage.js b/src/Pages/CollectionPage.js new file mode 100644 index 00000000..0ebfcecd --- /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 72% rename from src/Home.js rename to src/Pages/Home.js index a558ecc5..799cb05f 100755 --- a/src/Home.js +++ b/src/Pages/Home.js @@ -1,9 +1,9 @@ import React, {Component} 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 './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 00000000..f022e2a7 --- /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 00000000..3fa033ab --- /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 00000000..f595a853 --- /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 00000000..1f9c4d93 --- /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 00000000..1f9c4d93 --- /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/index.js b/src/index.js index ff020927..c32b1e45 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/> -- GitLab