From 17c47aac7c9b26fb2a5f68586e556034870bb16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Nunes=20Soares?= Date: Tue, 21 Jan 2020 10:26:26 -0300 Subject: [PATCH 1/6] Adicionando logos e chamada graphQL --- package-lock.json | 134 ++++++++++++++++++ projetol-frontend/package-lock.json | 17 +++ projetol-frontend/package.json | 2 + projetol-frontend/public/index.html | 2 +- projetol-frontend/src/App.js | 10 +- .../src/components/main/wikilegis.js | 40 +++++- .../src/components/main/wikilegis_logo.svg | 15 ++ projetol-frontend/src/eDemocracia_logo.svg | 86 +++++++++++ .../src/pages/main/audiencias_logo.png | Bin 0 -> 66405 bytes projetol-frontend/src/pages/main/banner.png | Bin 0 -> 33174 bytes projetol-frontend/src/pages/main/banner.svg | 41 ++++++ projetol-frontend/src/pages/main/index.js | 34 +++-- .../src/pages/main/pauta_logo.svg | 31 ++++ 13 files changed, 388 insertions(+), 24 deletions(-) create mode 100644 package-lock.json create mode 100644 projetol-frontend/src/components/main/wikilegis_logo.svg create mode 100644 projetol-frontend/src/eDemocracia_logo.svg create mode 100644 projetol-frontend/src/pages/main/audiencias_logo.png create mode 100644 projetol-frontend/src/pages/main/banner.png create mode 100644 projetol-frontend/src/pages/main/banner.svg create mode 100644 projetol-frontend/src/pages/main/pauta_logo.svg diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..0255aec --- /dev/null +++ b/package-lock.json @@ -0,0 +1,134 @@ +{ + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "@apollo/react-common": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@apollo/react-common/-/react-common-3.1.3.tgz", + "integrity": "sha512-Q7ZjDOeqjJf/AOGxUMdGxKF+JVClRXrYBGVq+SuVFqANRpd68MxtVV2OjCWavsFAN0eqYnRqRUrl7vtUCiJqeg==", + "requires": { + "ts-invariant": "^0.4.4", + "tslib": "^1.10.0" + } + }, + "@apollo/react-components": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@apollo/react-components/-/react-components-3.1.3.tgz", + "integrity": "sha512-H0l2JKDQMz+LkM93QK7j3ThbNXkWQCduN3s3eKxFN3Rdg7rXsrikJWvx2wQ868jmqy0VhwJbS1vYdRLdh114uQ==", + "requires": { + "@apollo/react-common": "^3.1.3", + "@apollo/react-hooks": "^3.1.3", + "prop-types": "^15.7.2", + "ts-invariant": "^0.4.4", + "tslib": "^1.10.0" + } + }, + "@apollo/react-hoc": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@apollo/react-hoc/-/react-hoc-3.1.3.tgz", + "integrity": "sha512-oCPma0uBVPTcYTR5sOvtMbpaWll4xDBvYfKr6YkDorUcQVeNzFu1LK1kmQjJP64bKsaziKYji5ibFaeCnVptmA==", + "requires": { + "@apollo/react-common": "^3.1.3", + "@apollo/react-components": "^3.1.3", + "hoist-non-react-statics": "^3.3.0", + "ts-invariant": "^0.4.4", + "tslib": "^1.10.0" + } + }, + "@apollo/react-hooks": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@apollo/react-hooks/-/react-hooks-3.1.3.tgz", + "integrity": "sha512-reIRO9xKdfi+B4gT/o/hnXuopUnm7WED/ru8VQydPw+C/KG/05Ssg1ZdxFKHa3oxwiTUIDnevtccIH35POanbA==", + "requires": { + "@apollo/react-common": "^3.1.3", + "@wry/equality": "^0.1.9", + "ts-invariant": "^0.4.4", + "tslib": "^1.10.0" + } + }, + "@apollo/react-ssr": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@apollo/react-ssr/-/react-ssr-3.1.3.tgz", + "integrity": "sha512-fUTmEYHxSTX1GA43B8vICxXXplpcEBnDwn0IgdAc3eG0p2YK97ZrJDRFCJ5vD7fyDZsrYhMf+rAI3sd+H2SS+A==", + "requires": { + "@apollo/react-common": "^3.1.3", + "@apollo/react-hooks": "^3.1.3", + "tslib": "^1.10.0" + } + }, + "@wry/equality": { + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.1.9.tgz", + "integrity": "sha512-mB6ceGjpMGz1ZTza8HYnrPGos2mC6So4NhS1PtZ8s4Qt0K7fBiIGhpSxUbQmhwcSWE3no+bYxmI2OL6KuXYmoQ==", + "requires": { + "tslib": "^1.9.3" + } + }, + "hoist-non-react-statics": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", + "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==", + "requires": { + "react-is": "^16.7.0" + } + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + }, + "react-apollo": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-3.1.3.tgz", + "integrity": "sha512-orCZNoAkgveaK5b75y7fw1MSqSHOU/Wuu9rRFOGmRQBSQVZjvV4DI+hj604rHmuN9+WDABxb5W48wTa0F/xNZQ==", + "requires": { + "@apollo/react-common": "^3.1.3", + "@apollo/react-components": "^3.1.3", + "@apollo/react-hoc": "^3.1.3", + "@apollo/react-hooks": "^3.1.3", + "@apollo/react-ssr": "^3.1.3" + } + }, + "react-is": { + "version": "16.12.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", + "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==" + }, + "ts-invariant": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.4.tgz", + "integrity": "sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==", + "requires": { + "tslib": "^1.9.3" + } + }, + "tslib": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" + } + } +} diff --git a/projetol-frontend/package-lock.json b/projetol-frontend/package-lock.json index a0a6c8e..9eed907 100644 --- a/projetol-frontend/package-lock.json +++ b/projetol-frontend/package-lock.json @@ -4175,6 +4175,15 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "cosmiconfig": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", @@ -8974,6 +8983,14 @@ "object-visit": "^1.0.0" } }, + "material-ui-image": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/material-ui-image/-/material-ui-image-3.2.2.tgz", + "integrity": "sha512-2CdBG0rOYqEC2oyc6owdReEfU5jdYAuEIUvY2J2QU16q2OFIwB3ElPm/ZCDzzSjzeJ1T6nFPyNurjyJridDaew==", + "requires": { + "prop-types": "^15.5.8" + } + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", diff --git a/projetol-frontend/package.json b/projetol-frontend/package.json index 01ad5e7..c864928 100644 --- a/projetol-frontend/package.json +++ b/projetol-frontend/package.json @@ -8,6 +8,8 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.4.0", "@testing-library/user-event": "^7.2.1", + "cors": "^2.8.5", + "material-ui-image": "^3.2.2", "node-sass": "^4.13.1", "react": "^16.12.0", "react-dom": "^16.12.0", diff --git a/projetol-frontend/public/index.html b/projetol-frontend/public/index.html index aa069f2..f642042 100644 --- a/projetol-frontend/public/index.html +++ b/projetol-frontend/public/index.html @@ -24,7 +24,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - React App + e-Democracia diff --git a/projetol-frontend/src/App.js b/projetol-frontend/src/App.js index d32f763..8d88c2b 100644 --- a/projetol-frontend/src/App.js +++ b/projetol-frontend/src/App.js @@ -1,5 +1,5 @@ import React from 'react'; -import logo from './logo.svg'; +import logo from './eDemocracia_logo.svg' import './App.css'; import './App.scss'; @@ -18,16 +18,16 @@ function App() { return (
-