diff --git a/package-lock.json b/package-lock.json
index a24204e03d6088a08f1da082f8b3244f38d1dcec..b65fdc22639fe89b7c542920f5733c0b35374dc3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -920,37 +920,145 @@
"integrity": "sha512-kBa+cDHOR9jpRJ+kcGMsysrls0leukrm68DmFQoMIWQcXdr2cZvyvypWuGYT7U+9kAExUE7+T7r6G3C3A6L8MQ=="
},
"@material-ui/core": {
- "version": "3.9.3",
- "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.9.3.tgz",
- "integrity": "sha512-REIj62+zEvTgI/C//YL4fZxrCVIySygmpZglsu/Nl5jPqy3CDjZv1F9ubBYorHqmRgeVPh64EghMMWqk4egmfg==",
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.3.3.tgz",
+ "integrity": "sha512-wUQjoJEbtVWYi+R9gBWCPGy0O+c0oY8cAp2TugyB70f89ahq/cnfnTbMZl6O2arKe2xQlfAMzY8rOOy8UMzJoQ==",
"requires": {
"@babel/runtime": "7.4.5",
- "@material-ui/system": "3.0.0-alpha.2",
- "@material-ui/utils": "3.0.0-alpha.3",
- "@types/jss": "9.5.8",
- "@types/react-transition-group": "2.9.2",
- "brcast": "3.0.1",
- "classnames": "2.2.6",
- "csstype": "2.6.6",
- "debounce": "1.2.0",
- "deepmerge": "3.2.0",
- "dom-helpers": "3.4.0",
+ "@material-ui/styles": "4.3.3",
+ "@material-ui/system": "4.3.3",
+ "@material-ui/types": "4.1.1",
+ "@material-ui/utils": "4.3.0",
+ "@types/react-transition-group": "4.2.2",
+ "clsx": "1.0.4",
+ "convert-css-length": "2.0.1",
+ "deepmerge": "4.0.0",
"hoist-non-react-statics": "3.3.0",
- "is-plain-object": "2.0.4",
- "jss": "9.8.7",
- "jss-camel-case": "6.1.0",
- "jss-default-unit": "8.0.2",
- "jss-global": "3.0.0",
- "jss-nested": "6.0.1",
- "jss-props-sort": "6.0.0",
- "jss-vendor-prefixer": "7.0.0",
- "normalize-scroll-left": "0.1.2",
+ "is-plain-object": "3.0.0",
+ "normalize-scroll-left": "0.2.0",
"popper.js": "1.15.0",
"prop-types": "15.7.2",
- "react-event-listener": "0.6.6",
- "react-transition-group": "2.9.0",
- "recompose": "0.30.0",
+ "react-transition-group": "4.2.2",
"warning": "4.0.3"
+ },
+ "dependencies": {
+ "@material-ui/styles": {
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.3.3.tgz",
+ "integrity": "sha512-quupQ6RYXbtKBJxhLkF3RQx6LSfrfuh2lYpILvk7p9XNkfqOQq36fuNVgrJ/A+NNn03uqDFfQYIWh4CByKr4hA==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "@emotion/hash": "0.7.1",
+ "@material-ui/types": "4.1.1",
+ "@material-ui/utils": "4.3.0",
+ "clsx": "1.0.4",
+ "csstype": "2.6.6",
+ "deepmerge": "4.0.0",
+ "hoist-non-react-statics": "3.3.0",
+ "jss": "10.0.0-alpha.24",
+ "jss-plugin-camel-case": "10.0.0-alpha.24",
+ "jss-plugin-default-unit": "10.0.0-alpha.24",
+ "jss-plugin-global": "10.0.0-alpha.24",
+ "jss-plugin-nested": "10.0.0-alpha.24",
+ "jss-plugin-props-sort": "10.0.0-alpha.24",
+ "jss-plugin-rule-value-function": "10.0.0-alpha.24",
+ "jss-plugin-vendor-prefixer": "10.0.0-alpha.24",
+ "prop-types": "15.7.2",
+ "warning": "4.0.3"
+ }
+ },
+ "@material-ui/types": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-4.1.1.tgz",
+ "integrity": "sha512-AN+GZNXytX9yxGi0JOfxHrRTbhFybjUJ05rnsBVjcB+16e466Z0Xe5IxawuOayVZgTBNDxmPKo5j4V6OnMtaSQ==",
+ "requires": {
+ "@types/react": "16.9.2"
+ }
+ },
+ "deepmerge": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz",
+ "integrity": "sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww=="
+ },
+ "is-plain-object": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz",
+ "integrity": "sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==",
+ "requires": {
+ "isobject": "4.0.0"
+ }
+ },
+ "isobject": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
+ "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="
+ },
+ "jss-plugin-camel-case": {
+ "version": "10.0.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.24.tgz",
+ "integrity": "sha512-cRYLbGl6oO9wdGXp3hn+xqc8pw8bjaui25dDYuEeEsRZMh5/OKl3ByYxDT3PLKgFqouy5Xo+YmLGVH8l+nnEdQ==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "hyphenate-style-name": "1.0.3",
+ "jss": "10.0.0-alpha.24"
+ }
+ },
+ "jss-plugin-default-unit": {
+ "version": "10.0.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.24.tgz",
+ "integrity": "sha512-1E1XlJqJ/9I1lR5EO/tA75U1LIIicKvW6xZEKLxAP8NC/rUjI+yBQBTBJn61LOpua51e7fgW8me46Z+iuXiC4A==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "jss": "10.0.0-alpha.24"
+ }
+ },
+ "jss-plugin-global": {
+ "version": "10.0.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.24.tgz",
+ "integrity": "sha512-3LoxrZloF4tvXrS5S7enV9OhtaxXsEP3BQdiE76vI/ecCmgNDZNpnPd8MG20ptn2iAOsoMGfoMX20Ea1IKl/Mg==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "jss": "10.0.0-alpha.24"
+ }
+ },
+ "jss-plugin-nested": {
+ "version": "10.0.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.24.tgz",
+ "integrity": "sha512-BWU6NaRZTVSJc7N+3FeHacdkFOjCMThouoRQPCWVxeT0nmAVlVGwgYzChcI+vzncx+UaRQC0x+01FYhVQ2xAFA==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "jss": "10.0.0-alpha.24",
+ "tiny-warning": "1.0.2"
+ }
+ },
+ "jss-plugin-props-sort": {
+ "version": "10.0.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.24.tgz",
+ "integrity": "sha512-TB4RpXwnGSEE58rN2RRzcWqhIaz0oAS1UBg10mk1fuLpkKyHEJWuuZXzgGih23Ivl/8LDVzTF+QRY5JagMUUGg==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "jss": "10.0.0-alpha.24"
+ }
+ },
+ "jss-plugin-rule-value-function": {
+ "version": "10.0.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.24.tgz",
+ "integrity": "sha512-uFw4tf8PN48bdv4ZcDjG3OzKPIFZ4gpCC1cWO/dyexYfFIubX3bnQUbK4B0wPNe9LJU4KQo8s4F42B8B1ADTrA==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "jss": "10.0.0-alpha.24"
+ }
+ },
+ "jss-plugin-vendor-prefixer": {
+ "version": "10.0.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.24.tgz",
+ "integrity": "sha512-hffKj0kSSvZsXs6RYEylpBlEGjryMzU1lsWqC5vQAT/Xb3tDe60BbEarEOFLBGv7EfyajXkuRwlXAQocV5ejCg==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "css-vendor": "2.0.6",
+ "jss": "10.0.0-alpha.24"
+ }
+ }
}
},
"@material-ui/icons": {
@@ -961,6 +1069,30 @@
"@babel/runtime": "7.4.5"
}
},
+ "@material-ui/lab": {
+ "version": "4.0.0-alpha.23",
+ "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-4.0.0-alpha.23.tgz",
+ "integrity": "sha512-XoYXyXpOP9bJwDbfxwQdJT00KlKuqxa7GeJLXXVMHa5Aots1sxldr+bGykf+f0TnfF3wwNgTCsMvq2SZgTTb3Q==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "@material-ui/utils": "4.3.0",
+ "clsx": "1.0.4",
+ "prop-types": "15.7.2",
+ "warning": "4.0.3"
+ },
+ "dependencies": {
+ "@material-ui/utils": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.3.0.tgz",
+ "integrity": "sha512-tK3Z/ap5ifPQwIryuGQ+AHLh2hEyBLRPj4NCMcqVrQfD+0KH2IP5BXR4A+wGVsyamKfLaOc8tz1fzxZblsztpw==",
+ "requires": {
+ "@babel/runtime": "7.4.5",
+ "prop-types": "15.7.2",
+ "react-is": "16.8.6"
+ }
+ }
+ }
+ },
"@material-ui/styles": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.0.0.tgz",
@@ -1008,14 +1140,21 @@
}
},
"@material-ui/system": {
- "version": "3.0.0-alpha.2",
- "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-3.0.0-alpha.2.tgz",
- "integrity": "sha512-odmxQ0peKpP7RQBQ8koly06YhsPzcoVib1vByVPBH4QhwqBXuYoqlCjt02846fYspAqkrWzjxnWUD311EBbxOA==",
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.3.3.tgz",
+ "integrity": "sha512-j7JyvlhcTdc1wV6HzrDTU7XXlarxYXEUyzyHawOA0kCGmYVN2uFHENQRARLUdl+mEmuXO4TsAhNAiqiKakkFMg==",
"requires": {
"@babel/runtime": "7.4.5",
- "deepmerge": "3.2.0",
+ "deepmerge": "4.0.0",
"prop-types": "15.7.2",
"warning": "4.0.3"
+ },
+ "dependencies": {
+ "deepmerge": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz",
+ "integrity": "sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww=="
+ }
}
},
"@material-ui/types": {
@@ -1024,9 +1163,9 @@
"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",
- "integrity": "sha512-rwMdMZptX0DivkqBuC+Jdq7BYTXwqKai5G5ejPpuEDKpWzi1Oxp+LygGw329FrKpuKeiqpcymlqJTjmy+quWng==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.3.0.tgz",
+ "integrity": "sha512-tK3Z/ap5ifPQwIryuGQ+AHLh2hEyBLRPj4NCMcqVrQfD+0KH2IP5BXR4A+wGVsyamKfLaOc8tz1fzxZblsztpw==",
"requires": {
"@babel/runtime": "7.4.5",
"prop-types": "15.7.2",
@@ -1057,7 +1196,7 @@
"h2x-core": "1.1.1",
"h2x-plugin-jsx": "1.2.0",
"merge-deep": "3.0.2",
- "prettier": "1.17.1",
+ "prettier": "1.18.2",
"svgo": "1.2.2"
}
},
@@ -1074,15 +1213,6 @@
"loader-utils": "1.2.3"
}
},
- "@types/jss": {
- "version": "9.5.8",
- "resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.5.8.tgz",
- "integrity": "sha512-bBbHvjhm42UKki+wZpR89j73ykSXg99/bhuKuYYePtpma3ZAnmeGnl0WxXiZhPGsIfzKwCUkpPC0jlrVMBfRxA==",
- "requires": {
- "csstype": "2.6.6",
- "indefinite-observable": "1.0.2"
- }
- },
"@types/prop-types": {
"version": "15.7.1",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.1.tgz",
@@ -1094,20 +1224,20 @@
"integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="
},
"@types/react": {
- "version": "16.8.23",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.23.tgz",
- "integrity": "sha512-abkEOIeljniUN9qB5onp++g0EY38h7atnDHxwKUFz1r3VH1+yG1OKi2sNPTyObL40goBmfKFpdii2lEzwLX1cA==",
+ "version": "16.9.2",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.2.tgz",
+ "integrity": "sha512-jYP2LWwlh+FTqGd9v7ynUKZzjj98T8x7Yclz479QdRhHfuW9yQ+0jjnD31eXSXutmBpppj5PYNLYLRfnZJvcfg==",
"requires": {
"@types/prop-types": "15.7.1",
"csstype": "2.6.6"
}
},
"@types/react-transition-group": {
- "version": "2.9.2",
- "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.9.2.tgz",
- "integrity": "sha512-5Fv2DQNO+GpdPZcxp2x/OQG/H19A01WlmpjVD9cKvVFmoVLOZ9LvBgSWG6pSXIU4og5fgbvGPaCV5+VGkWAEHA==",
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.2.2.tgz",
+ "integrity": "sha512-YfoaTNqBwbIqpiJ5NNfxfgg5kyFP1Hqf/jqBtSWNv0E+EkkxmN+3VD6U2fu86tlQvdAc1o0SdWhnWFwcRMTn9A==",
"requires": {
- "@types/react": "16.8.23"
+ "@types/react": "16.9.2"
}
},
"@types/tapable": {
@@ -2760,11 +2890,6 @@
"repeat-element": "1.1.3"
}
},
- "brcast": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/brcast/-/brcast-3.0.1.tgz",
- "integrity": "sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg=="
- },
"brorand": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
@@ -2905,6 +3030,30 @@
"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
},
+ "build": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/build/-/build-0.1.4.tgz",
+ "integrity": "sha1-cH/gJv/O3crL/c3zVur9pk8VEEY=",
+ "requires": {
+ "cssmin": "0.3.2",
+ "jsmin": "1.0.1",
+ "jxLoader": "0.1.1",
+ "moo-server": "1.3.0",
+ "promised-io": "0.3.5",
+ "timespan": "2.3.0",
+ "uglify-js": "1.3.5",
+ "walker": "1.0.7",
+ "winston": "3.2.1",
+ "wrench": "1.3.9"
+ },
+ "dependencies": {
+ "uglify-js": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.3.5.tgz",
+ "integrity": "sha1-S1v/+Rhu/7qoiOTJ6UvZ/EyUkp0="
+ }
+ }
+ },
"builtin-status-codes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -3061,11 +3210,6 @@
"supports-color": "5.5.0"
}
},
- "change-emitter": {
- "version": "0.1.6",
- "resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz",
- "integrity": "sha1-6LL+PX8at9aaMhma/5HqaTFAlRU="
- },
"chardet": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
@@ -3371,6 +3515,36 @@
"simple-swizzle": "0.2.2"
}
},
+ "colornames": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
+ "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y="
+ },
+ "colors": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+ "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
+ },
+ "colorspace": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
+ "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
+ "requires": {
+ "color": "3.0.0",
+ "text-hex": "1.0.0"
+ },
+ "dependencies": {
+ "color": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
+ "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
+ "requires": {
+ "color-convert": "1.9.3",
+ "color-string": "1.5.3"
+ }
+ }
+ }
+ },
"combined-stream": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -3493,6 +3667,11 @@
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
},
+ "convert-css-length": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/convert-css-length/-/convert-css-length-2.0.1.tgz",
+ "integrity": "sha512-iGpbcvhLPRKUbBc0Quxx7w/bV14AC3ItuBEGMahA5WTYqB8lq9jH0kTXFheCBASsYnqeMFZhiTruNxr1N59Axg=="
+ },
"convert-source-map": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
@@ -3814,11 +3993,22 @@
"integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w="
},
"css-vendor": {
- "version": "0.3.8",
- "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-0.3.8.tgz",
- "integrity": "sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=",
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.6.tgz",
+ "integrity": "sha512-buv8FoZh84iMrtPHYGYll00/qSNV0gYO6E/GUCjUPTsSPj7uf/wot/QZwig+7qdFGxJ7HjOSJoclbhag09TVUQ==",
"requires": {
+ "@babel/runtime": "7.5.5",
"is-in-browser": "1.1.3"
+ },
+ "dependencies": {
+ "@babel/runtime": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz",
+ "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==",
+ "requires": {
+ "regenerator-runtime": "0.13.2"
+ }
+ }
}
},
"css-what": {
@@ -3836,6 +4026,11 @@
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
"integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q="
},
+ "cssmin": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/cssmin/-/cssmin-0.3.2.tgz",
+ "integrity": "sha1-3c5MVHtRCuDVlKjx+/iq+OLFwA0="
+ },
"cssnano": {
"version": "4.1.10",
"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
@@ -4112,11 +4307,6 @@
"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
},
- "debounce": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.0.tgz",
- "integrity": "sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg=="
- },
"debug": {
"version": "3.2.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -4338,6 +4528,16 @@
}
}
},
+ "diagnostics": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
+ "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
+ "requires": {
+ "colorspace": "1.1.2",
+ "enabled": "1.0.2",
+ "kuler": "1.0.1"
+ }
+ },
"diff": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
@@ -4544,6 +4744,14 @@
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
"integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
},
+ "enabled": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
+ "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
+ "requires": {
+ "env-variable": "0.0.5"
+ }
+ },
"encodeurl": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -4580,6 +4788,11 @@
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
},
+ "env-variable": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz",
+ "integrity": "sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA=="
+ },
"errno": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
@@ -4723,6 +4936,15 @@
}
}
},
+ "eslint-config-prettier": {
+ "version": "6.5.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.5.0.tgz",
+ "integrity": "sha512-cjXp8SbO9VFGW/Z7mbTydqS9to8Z58E5aYhj3e1+Hx7lS9s6gL5ILKNpCqZAFOVYRcSkWPFYljHrEh8QFEK5EQ==",
+ "dev": true,
+ "requires": {
+ "get-stdin": "6.0.0"
+ }
+ },
"eslint-config-react-app": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-3.0.8.tgz",
@@ -4911,18 +5133,59 @@
"jsx-ast-utils": "2.1.0"
}
},
+ "eslint-plugin-prettier": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz",
+ "integrity": "sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA==",
+ "dev": true,
+ "requires": {
+ "prettier-linter-helpers": "1.0.0"
+ }
+ },
"eslint-plugin-react": {
- "version": "7.11.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz",
- "integrity": "sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==",
+ "version": "7.16.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.16.0.tgz",
+ "integrity": "sha512-GacBAATewhhptbK3/vTP09CbFrgUJmBSaaRcWdbQLFvUZy9yVcQxigBNHGPU/KE2AyHpzj3AWXpxoMTsIDiHug==",
+ "dev": true,
"requires": {
"array-includes": "3.0.3",
"doctrine": "2.1.0",
"has": "1.0.3",
- "jsx-ast-utils": "2.1.0",
- "prop-types": "15.7.2"
+ "jsx-ast-utils": "2.2.3",
+ "object.entries": "1.1.0",
+ "object.fromentries": "2.0.1",
+ "object.values": "1.1.0",
+ "prop-types": "15.7.2",
+ "resolve": "1.12.0"
+ },
+ "dependencies": {
+ "jsx-ast-utils": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz",
+ "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==",
+ "dev": true,
+ "requires": {
+ "array-includes": "3.0.3",
+ "object.assign": "4.1.0"
+ }
+ },
+ "resolve": {
+ "version": "1.12.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+ "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+ "dev": true,
+ "requires": {
+ "path-parse": "1.0.6"
+ }
+ }
}
},
+ "eslint-plugin-react-hooks": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz",
+ "integrity": "sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA==",
+ "dev": true
+ },
"eslint-scope": {
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
@@ -5202,6 +5465,12 @@
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
},
+ "fast-diff": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+ "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+ "dev": true
+ },
"fast-glob": {
"version": "2.2.7",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
@@ -5515,6 +5784,11 @@
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
},
+ "fast-safe-stringify": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
+ "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="
+ },
"fastparse": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
@@ -5550,6 +5824,11 @@
"ua-parser-js": "0.7.19"
}
},
+ "fecha": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
+ "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
+ },
"figgy-pudding": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -6543,6 +6822,12 @@
"resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz",
"integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg=="
},
+ "get-stdin": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
+ "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
+ "dev": true
+ },
"get-stream": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
@@ -7450,14 +7735,6 @@
"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
},
- "indefinite-observable": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.2.tgz",
- "integrity": "sha512-Mps0898zEduHyPhb7UCgNmfzlqNZknVmaFz5qzr0mm04YQ5FGLhAyK/dJ+NaRxGyR6juQXIxh5Ev0xx+qq0nYA==",
- "requires": {
- "symbol-observable": "1.2.0"
- }
- },
"indexes-of": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
@@ -8591,6 +8868,11 @@
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
},
+ "jsmin": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/jsmin/-/jsmin-1.0.1.tgz",
+ "integrity": "sha1-570NzWSWw79IYyNb9GGj2YqjuYw="
+ },
"json-parse-better-errors": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -8662,59 +8944,14 @@
}
},
"jss": {
- "version": "9.8.7",
- "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz",
- "integrity": "sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==",
+ "version": "10.0.0-alpha.24",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.24.tgz",
+ "integrity": "sha512-kfuSitcj7MTrDtSPLkrWcZppgZlTE3A+cqrkC+Z10WYROt0RXIWINAaK8tE2ohwkDfUlaM1YcRYvV3iT6YNFTA==",
"requires": {
+ "@babel/runtime": "7.4.5",
+ "csstype": "2.6.6",
"is-in-browser": "1.1.3",
- "symbol-observable": "1.2.0",
- "warning": "3.0.0"
- },
- "dependencies": {
- "warning": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
- "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
- "requires": {
- "loose-envify": "1.4.0"
- }
- }
- }
- },
- "jss-camel-case": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/jss-camel-case/-/jss-camel-case-6.1.0.tgz",
- "integrity": "sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ==",
- "requires": {
- "hyphenate-style-name": "1.0.3"
- }
- },
- "jss-default-unit": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/jss-default-unit/-/jss-default-unit-8.0.2.tgz",
- "integrity": "sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg=="
- },
- "jss-global": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/jss-global/-/jss-global-3.0.0.tgz",
- "integrity": "sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q=="
- },
- "jss-nested": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/jss-nested/-/jss-nested-6.0.1.tgz",
- "integrity": "sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==",
- "requires": {
- "warning": "3.0.0"
- },
- "dependencies": {
- "warning": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
- "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
- "requires": {
- "loose-envify": "1.4.0"
- }
- }
+ "tiny-warning": "1.0.2"
}
},
"jss-plugin-camel-case": {
@@ -8876,19 +9113,6 @@
}
}
},
- "jss-props-sort": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz",
- "integrity": "sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g=="
- },
- "jss-vendor-prefixer": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz",
- "integrity": "sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA==",
- "requires": {
- "css-vendor": "0.3.8"
- }
- },
"jsx-ast-utils": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.1.0.tgz",
@@ -8897,6 +9121,24 @@
"array-includes": "3.0.3"
}
},
+ "jxLoader": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/jxLoader/-/jxLoader-0.1.1.tgz",
+ "integrity": "sha1-ATTqUUTlM7WU/B/yX/GU4jXFPs0=",
+ "requires": {
+ "js-yaml": "0.3.7",
+ "moo-server": "1.3.0",
+ "promised-io": "0.3.5",
+ "walker": "1.0.7"
+ },
+ "dependencies": {
+ "js-yaml": {
+ "version": "0.3.7",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz",
+ "integrity": "sha1-1znY7oZGHlSzVNan19HyrZoWf2I="
+ }
+ }
+ },
"killable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -8915,6 +9157,14 @@
"resolved": "https://registry.npmjs.org/kleur/-/kleur-2.0.2.tgz",
"integrity": "sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ=="
},
+ "kuler": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
+ "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
+ "requires": {
+ "colornames": "1.1.1"
+ }
+ },
"last-call-webpack-plugin": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
@@ -9110,6 +9360,18 @@
"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
},
+ "logform": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz",
+ "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==",
+ "requires": {
+ "colors": "1.4.0",
+ "fast-safe-stringify": "2.0.7",
+ "fecha": "2.3.3",
+ "ms": "2.1.1",
+ "triple-beam": "1.3.0"
+ }
+ },
"loglevel": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
@@ -9186,6 +9448,11 @@
"object-visit": "1.0.1"
}
},
+ "material-design-icons": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz",
+ "integrity": "sha1-mnHEh0chjrylHlGmbaaCA4zct78="
+ },
"math-random": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
@@ -9431,6 +9698,11 @@
}
}
},
+ "moo-server": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/moo-server/-/moo-server-1.3.0.tgz",
+ "integrity": "sha1-XceVaVZaENbv7VQ5SR5p0jkuWPE="
+ },
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -9648,9 +9920,9 @@
"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
},
"normalize-scroll-left": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/normalize-scroll-left/-/normalize-scroll-left-0.1.2.tgz",
- "integrity": "sha512-F9YMRls0zCF6BFIE2YnXDRpHPpfd91nOIaNdDgrx5YMoPLo8Wqj+6jNXHQsYBavJeXP4ww8HCt0xQAKc5qk2Fg=="
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/normalize-scroll-left/-/normalize-scroll-left-0.2.0.tgz",
+ "integrity": "sha512-t5oCENZJl8TGusJKoCJm7+asaSsPuNmK6+iEjrZ5TyBj2f02brCRsd4c83hwtu+e5d4LCSBZ0uoDlMjBo+A8yA=="
},
"normalize-url": {
"version": "3.3.0",
@@ -9723,6 +9995,12 @@
"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
"integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="
},
+ "object-inspect": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+ "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+ "dev": true
+ },
"object-keys": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -9747,6 +10025,50 @@
"object-keys": "1.1.1"
}
},
+ "object.entries": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
+ "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "es-abstract": "1.13.0",
+ "function-bind": "1.1.1",
+ "has": "1.0.3"
+ }
+ },
+ "object.fromentries": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.1.tgz",
+ "integrity": "sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "es-abstract": "1.16.0",
+ "function-bind": "1.1.1",
+ "has": "1.0.3"
+ },
+ "dependencies": {
+ "es-abstract": {
+ "version": "1.16.0",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz",
+ "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==",
+ "dev": true,
+ "requires": {
+ "es-to-primitive": "1.2.0",
+ "function-bind": "1.1.1",
+ "has": "1.0.3",
+ "has-symbols": "1.0.0",
+ "is-callable": "1.1.4",
+ "is-regex": "1.0.4",
+ "object-inspect": "1.6.0",
+ "object-keys": "1.1.1",
+ "string.prototype.trimleft": "2.1.0",
+ "string.prototype.trimright": "2.1.0"
+ }
+ }
+ }
+ },
"object.getownpropertydescriptors": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
@@ -9810,6 +10132,11 @@
"wrappy": "1.0.2"
}
},
+ "one-time": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz",
+ "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4="
+ },
"onetime": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -13606,9 +13933,18 @@
"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
},
"prettier": {
- "version": "1.17.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.17.1.tgz",
- "integrity": "sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg=="
+ "version": "1.18.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz",
+ "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw=="
+ },
+ "prettier-linter-helpers": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+ "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+ "dev": true,
+ "requires": {
+ "fast-diff": "1.2.0"
+ }
},
"pretty-bytes": {
"version": "4.0.2",
@@ -13673,6 +14009,11 @@
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
},
+ "promised-io": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/promised-io/-/promised-io-0.3.5.tgz",
+ "integrity": "sha1-StIXuzZYvKrplGsXqGaOzYUeE1Y="
+ },
"prompts": {
"version": "0.1.14",
"resolved": "https://registry.npmjs.org/prompts/-/prompts-0.1.14.tgz",
@@ -14045,16 +14386,6 @@
"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.6.tgz",
"integrity": "sha512-X1Y+0jR47ImDVr54Ab6V9eGk0Hnu7fVWGeHQSOXHf/C2pF9c6uy3gef8QUeuUiWlNb0i08InPSE5a/KJzNzw1Q=="
},
- "react-event-listener": {
- "version": "0.6.6",
- "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz",
- "integrity": "sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==",
- "requires": {
- "@babel/runtime": "7.4.5",
- "prop-types": "15.7.2",
- "warning": "4.0.3"
- }
- },
"react-grid-system": {
"version": "4.4.6",
"resolved": "https://registry.npmjs.org/react-grid-system/-/react-grid-system-4.4.6.tgz",
@@ -14076,11 +14407,6 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
"integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
},
- "react-lifecycles-compat": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
- "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
- },
"react-responsive-carousel": {
"version": "3.1.49",
"resolved": "https://registry.npmjs.org/react-responsive-carousel/-/react-responsive-carousel-3.1.49.tgz",
@@ -14147,7 +14473,6 @@
"eslint-plugin-flowtype": "2.50.1",
"eslint-plugin-import": "2.14.0",
"eslint-plugin-jsx-a11y": "6.1.2",
- "eslint-plugin-react": "7.11.1",
"file-loader": "2.0.0",
"fork-ts-checker-webpack-plugin-alt": "0.4.14",
"fs-extra": "7.0.0",
@@ -14652,14 +14977,14 @@
}
},
"react-transition-group": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
- "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.2.2.tgz",
+ "integrity": "sha512-uP0tjqewtvjb7kGZFpZYPoD/NlVZmIgts9eTt1w35pAaEApPxQGv94lD3VkqyXf2aMqrSGwhs6EV/DLaoKbLSw==",
"requires": {
+ "@babel/runtime": "7.4.5",
"dom-helpers": "3.4.0",
"loose-envify": "1.4.0",
- "prop-types": "15.7.2",
- "react-lifecycles-compat": "3.0.4"
+ "prop-types": "15.7.2"
}
},
"read-pkg": {
@@ -14997,26 +15322,6 @@
"util.promisify": "1.0.0"
}
},
- "recompose": {
- "version": "0.30.0",
- "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz",
- "integrity": "sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==",
- "requires": {
- "@babel/runtime": "7.4.5",
- "change-emitter": "0.1.6",
- "fbjs": "0.8.17",
- "hoist-non-react-statics": "2.5.5",
- "react-lifecycles-compat": "3.0.4",
- "symbol-observable": "1.2.0"
- },
- "dependencies": {
- "hoist-non-react-statics": {
- "version": "2.5.5",
- "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
- "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
- }
- }
- },
"recursive-readdir": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
@@ -16325,6 +16630,11 @@
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
},
+ "stack-trace": {
+ "version": "0.0.10",
+ "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+ "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
+ },
"stack-utils": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
@@ -16442,6 +16752,26 @@
}
}
},
+ "string.prototype.trimleft": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+ "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "function-bind": "1.1.1"
+ }
+ },
+ "string.prototype.trimright": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+ "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "function-bind": "1.1.1"
+ }
+ },
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -16639,11 +16969,6 @@
"util.promisify": "1.0.0"
}
},
- "symbol-observable": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
- "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
- },
"symbol-tree": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
@@ -16797,6 +17122,11 @@
"require-main-filename": "1.0.1"
}
},
+ "text-hex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
+ "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
+ },
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -16834,6 +17164,11 @@
"setimmediate": "1.0.5"
}
},
+ "timespan": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz",
+ "integrity": "sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk="
+ },
"timsort": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
@@ -16945,6 +17280,11 @@
"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
},
+ "triple-beam": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
+ "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
+ },
"tryer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
@@ -18078,6 +18418,43 @@
"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
},
+ "winston": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz",
+ "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==",
+ "requires": {
+ "async": "2.6.2",
+ "diagnostics": "1.1.1",
+ "is-stream": "1.1.0",
+ "logform": "2.1.2",
+ "one-time": "0.0.4",
+ "readable-stream": "3.4.0",
+ "stack-trace": "0.0.10",
+ "triple-beam": "1.3.0",
+ "winston-transport": "4.3.0"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+ "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+ "requires": {
+ "inherits": "2.0.3",
+ "string_decoder": "1.1.1",
+ "util-deprecate": "1.0.2"
+ }
+ }
+ }
+ },
+ "winston-transport": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz",
+ "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==",
+ "requires": {
+ "readable-stream": "2.3.6",
+ "triple-beam": "1.3.0"
+ }
+ },
"wordwrap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -18277,6 +18654,11 @@
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
+ "wrench": {
+ "version": "1.3.9",
+ "resolved": "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz",
+ "integrity": "sha1-bxPsNRRTF+spLKX2UxORskQRFBE="
+ },
"write": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
diff --git a/package.json b/package.json
index 262aecee11b00df2f8af8e708b982bdec07a21bd..bd35ff173a9af7f134ea8a13732610e65e535f52 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,13 @@
"version": "0.1.0",
"private": true,
"dependencies": {
- "@material-ui/core": "^3.9.2",
+ "@material-ui/core": "^4.3.3",
"@material-ui/icons": "^4.0.0",
+ "@material-ui/lab": "^4.0.0-alpha.23",
"@material-ui/styles": "^4.0.0",
"axios": "^0.19.0",
"binary-extensions": "^2.0.0",
+ "build": "^0.1.4",
"material-design-icons": "^3.0.1",
"react": "^16.8.4",
"react-dom": "^16.8.4",
diff --git a/src/App.js b/src/App.js
index 1678c8ade09f66a9cdd5fdb6b9d1b4b58424d6fe..922949aabf04035784062be84401ebf639ab1728 100644
--- a/src/App.js
+++ b/src/App.js
@@ -24,6 +24,9 @@ import EcFooter from './Components/EcFooter';
import GNUAGPLfooter from './Components/AGPLFooter';
import UserPage from './Pages/UserPage';
import UserTerms from './Pages/UserTerms';
+
+import Teste from './Pages/Teste';
+
import ResourcePage from './Pages/ResourcePage';
import {BrowserRouter, Switch, Route} from 'react-router-dom';
import { Store } from './Store'
@@ -67,7 +70,12 @@ export default function App(){
<Route path="/busca" component={Search} />
<Route path="/usuario" component={UserPage} />
<Route path="/recurso" component={ResourcePage}/>
- <Route path="/termos" component={UserTerms}/>
+<<<<<<< HEAD
+ <Route path="/termos" component={UserTerms}/>
+=======
+ <Route path="/termos" component={UserTerms}/>
+ <Route path="/teste" component={Teste}/>
+>>>>>>> 3ddcc71da0ad68662cfa886d12da8bc55c9a69b2
</Switch>
<EcFooter/>
<GNUAGPLfooter/>
diff --git a/src/Components/AboutResource.js b/src/Components/AboutResource.js
index d82d72e2057201aa8b3399b7cb0b0ec884049739..80968bbfacad2939c75ac710594325490e8b277e 100644
--- a/src/Components/AboutResource.js
+++ b/src/Components/AboutResource.js
@@ -17,104 +17,247 @@ 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 axios from 'axios';
import {apiUrl} from '../env';
+import {Col,Row} from 'react-grid-system';
import Paper from '@material-ui/core/Paper';
-import { withStyles } from '@material-ui/styles';
import Typography from '@material-ui/core/Typography';
import CardContent from '@material-ui/core/CardContent';
import Collapse from '@material-ui/core/Collapse';
-import CardHeader from '@material-ui/core/CardHeader';
import CardMedia from '@material-ui/core/CardMedia';
import CardActions from '@material-ui/core/CardActions';
-import Avatar from '@material-ui/core/Avatar';
+import Coment from './Coment';
+import Rating from '@material-ui/lab/Rating';
+import Tag from './Tags';
+import { Hidden } from '@material-ui/core';
+import Button from '@material-ui/core/Button';
import IconButton from '@material-ui/core/IconButton';
-import { red } from '@material-ui/core/colors';
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import Menu from '@material-ui/core/Menu';
+import ListItemIcon from '@material-ui/core/ListItemIcon';
+import MenuItem from '@material-ui/core/MenuItem';
import MoreVertIcon from '@material-ui/icons/MoreVert';
+/*imagens e icones*/
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
import ShareIcon from '@material-ui/icons/Share';
import ReportIcon from '@material-ui/icons/Error';
import AddIcon from '@material-ui/icons/CreateNewFolder';
-const contentStyle={
- margin: "2% 15% 2% 15%",
-};
+import FavoriteIcon from '@material-ui/icons/Favorite';
+import GetAppIcon from '@material-ui/icons/GetApp';
+import StarBorderIcon from '@material-ui/icons/StarBorder';
+import RateReviewIcon from '@material-ui/icons/RateReview';
+import VisibilityIcon from '@material-ui/icons/Visibility';
+import SdCardIcon from '@material-ui/icons/SdCard';
+import TranslateIcon from '@material-ui/icons/Translate';
+import InsertDriveFileIcon from '@material-ui/icons/InsertDriveFile';
+import DateRangeIcon from '@material-ui/icons/DateRange';
+import UpdateIcon from '@material-ui/icons/Update';
+import AssignmentOutlinedIcon from '@material-ui/icons/AssignmentOutlined';
+import OpenIcon from '@material-ui/icons/CallMade';
+import { TextField, FormControl } from '@material-ui/core';
+
+import noAvatar from "../img/default_profile.png";
+import styled from 'styled-components'
+
+
+const TypographyStyled = styled(Typography)`
+ padding: 5px;
+`
+
+const CardActionsStyled = styled(CardActions)`
+ padding:0px 0px 10px 0px;
+ align-items: center;
+`
+
+const PaperStyled = styled(Paper)`
+ margin: 2em 0em 2em 0em;
+ padding: 2em 2em 0em 2em;
+ @media only screen and (min-width :500px ) {
+ margin: 2em 10% 2em 10%;
+ }
+`
+const elevateStyle = 3;
+
+const Overlay = styled.div`
+ display: inline;
+ background: linear-gradient(transparent,transparent,#fff),transparent;
+ bottom: 0;
+ cursor: pointer;
+ left: 0;
+ opacity: .8;
+ filter: alpha(opacity=80);
+ position: absolute;
+ right: 0;
+ top: 0;
+ height: inherit;
+
+`
+async function getResource(id){
+ let res = await axios.get(`${apiUrl}/learning_objects/${id}`);
+ let data = res.data;
+ return(data);
+}
+
export default function AboutResource() {
- const [expanded, setExpanded] = React.useState(false);
+ var display = getResource(19133);
+ console.log(display);
+ const [anchorEl, setAnchorEl] = React.useState(null);
- function handleExpandClick() {
- setExpanded(!expanded);
+ function handleClick(event) {
+ setAnchorEl(event.currentTarget);
}
+ function handleClose() {
+ setAnchorEl(null);
+ }
return (
- <div>
- <Paper style={contentStyle}>
- <CardContent>
- <Typography variant="h5" color="textSecondary" component="h3">
- fICHA TÉCNICA
- </Typography>
- <div> tagsss </div>
- <Typography component="p" color="textSecondary">
- Paper can be used to build surface or other elements for your application.
- </Typography>
- <CardMedia
- image="/static/images/cards/paella.jpg"/>
- <CardActions style={{justifyContent: "space-between", fontSize: "0.7rem"}}>
- <IconButton aria-label="Reportar" size="small">
- <ReportIcon /> REPORTAR </IconButton>
- <IconButton aria-label="Compartilhar">
- <ShareIcon /> COMPARTILHAR </IconButton>
- <IconButton aria-label="Guardar">
- <AddIcon /> GUARDAR </IconButton>
- </CardActions>
- </CardContent>
- </Paper>
- <Paper style={contentStyle}>
- <CardContent>
+ <div style={{backgroundColor: "#f4f4f4", padding: "2em 0em 2em 0em"}}>
+ <PaperStyled elevation={elevateStyle}>
+ <CardMedia image={noAvatar}/>
+ <CardContent style={{padding: "0em"}}>
<Typography variant="h5" color="textSecondary" component="h3">
- Sobre o Recurso
+ {display.name}
</Typography>
- <Typography component="p" color="textSecondary">
- Paper can be used to build surface or other elements for your application.
- </Typography>
- </CardContent>
- <CardActions style={{borderTop:"1px solid #e5e5e5", justifyContent: "center"}}>
- <IconButton
- onClick={handleExpandClick}
- aria-expanded={expanded}
- aria-label="show more"
- style={{fontSize: "1.2rem", padding: "0px"}}>
- Ver Mais
- <ExpandMoreIcon size="small"/>
- </IconButton>
- </CardActions>
- <Collapse in={expanded} timeout="auto" unmountOnExit>
+ <CardActionsStyled >
+ <IconButton style={{padding: "0px"}}aria-label="Favoritar">
+ <FavoriteIcon />
+ </IconButton>
+ <Rating
+ name="customized-empty"
+ value={2}
+ precision={0.5}
+ emptyIcon={<StarBorderIcon fontSize="inherit" />}
+ />
+ <Hidden smDown>
+ <IconButton aria-label="Relatar">
+ <RateReviewIcon/>
+ </IconButton>
+ RELATAR
+ </Hidden>
+ </CardActionsStyled>
+ <CardContent style={{padding: "0em"}}>
+ <TypographyStyled component="p" color="textSecondary">
+ Tipo de Recurso:
+ </TypographyStyled>
+ <TypographyStyled component="p" color="textSecondary">
+ Componentes Curriculares:
+ </TypographyStyled>
+ <TypographyStyled component="p" color="textSecondary">
+ Outras Temáticas:
+ </TypographyStyled>
+ <TypographyStyled component="p" color="textSecondary">
+ Etapas de Ensino:
+ </TypographyStyled>
+ </CardContent>
+ <Row >
+ <Col md={4} sm={12}><VisibilityIcon style={{verticalAlign: "middle"}}/>Visualizações:</Col>
+ <Col md={5} sm={12}><GetAppIcon style={{verticalAlign: "middle"}}/>Baixados/Acessados:</Col>
+ </Row>
+ <CardActions disableSpacing style={{fontSize: "0.7rem", borderRadius: "2px", justifyContent: "space-between", paddingTop: "2em"}}>
+ <Hidden smDown>
+ <Button aria-label="Reportar" size="small">
+ <ReportIcon /> REPORTAR ABUSO OU ERRO </Button>
+ <Button aria-label="Compartilhar">
+ <ShareIcon /> COMPARTILHAR </Button>
+ </Hidden>
+ <Button aria-label="Guardar">
+ <AddIcon /> GUARDAR </Button>
+ <Button variant="contained" color="secondary">
+ <OpenIcon/> Abrir Recurso </Button>
+ <Hidden mdUp>
+ <Button aria-controls="simple-menu" aria-haspopup="true" onClick={handleClick}>
+ <MoreVertIcon/>
+ </Button>
+ <Menu
+ id="simple-menu"
+ anchorEl={anchorEl}
+ keepMounted
+ open={Boolean(anchorEl)}
+ onClose={handleClose}
+ >
+ <MenuItem onClick={handleClose}>
+ <ListItemIcon>
+ <ShareIcon />
+ </ListItemIcon>
+ Compartilhar</MenuItem>
+ <MenuItem onClick={handleClose}>
+ <ListItemIcon>
+ <ReportIcon />
+ </ListItemIcon>
+ Reportar</MenuItem>
+ </Menu>
+ </Hidden>
+ </CardActions>
+ </CardContent>
+ </PaperStyled>
+ <PaperStyled elevation={elevateStyle}>
+ <Row style={{padding: "15px"}}>
+ <Col md={8} sm={12}>
+ <Typography variant="h5" color="textSecondary" component="h3">
+ Sobre o Recurso
+ </Typography>
+ <Typography component="p" color="textSecondary">
+ Paper can be used to build surface or other elements for your application.
+ </Typography>
+ <div style={{paddingTop: "4em"}}>
+ <Typography variant="h5" color="textSecondary" component="h3">
+ Informações Adicionais</Typography>
+ <Tag name="teste"/>
+ <Typography component="p" color="textSecondary">
+ <SdCardIcon/>Tamanho:
+ </Typography>
+ <Typography component="p" color="textSecondary">
+ <TranslateIcon/>Idioma:
+ </Typography>
+ <Typography component="p" color="textSecondary">
+ <InsertDriveFileIcon/>Formato:
+ </Typography>
+ <Typography component="p" color="textSecondary">
+ <DateRangeIcon/>Data de Envio:
+ </Typography>
+ <Typography component="p" color="textSecondary">
+ <UpdateIcon/>Modificado em:
+ </Typography>
+ <Typography component="p" color="textSecondary">
+ <AssignmentOutlinedIcon/>Tipo de Licença:
+ </Typography>
+ </div>
+ </Col>
+ <Col md={4} sm={12}>
+ <div style={{borderLeft:"1px solid #e5e5e5"}}>
+ <Typography>
+ Enviado por:
+ </Typography><br/>
+ <img style={{padding: "2em" }} alt="Avatar" src={noAvatar} height="100em"/>
+ </div>
+ </Col>
+ </Row>
+
+
+ </PaperStyled>
+ <PaperStyled elevation={elevateStyle}>
<CardContent>
- <Typography paragraph>Method:</Typography>
- <Typography paragraph>
- Heat 1/2 cup of the broth in a pot until simmering, add saffron and set aside for 10
- minutes.
- </Typography>
- <Typography paragraph>
- Heat oil in a (14- to 16-inch) paella pan or a large, deep skillet over medium-high
- heat. Add chicken, shrimp and chorizo, and cook, stirring occasionally until lightly
- browned, 6 to 8 minutes. Transfer shrimp to a large plate and set aside, leaving chicken
- and chorizo in the pan. Add pimentón, bay leaves, garlic, tomatoes, onion, salt and
- pepper, and cook, stirring often until thickened and fragrant, about 10 minutes. Add
- saffron broth and remaining 4 1/2 cups chicken broth; bring to a boil.
- </Typography>
- <Typography paragraph>
- Add rice and stir very gently to distribute. Top with artichokes and peppers, and cook
- without stirring, until most of the liquid is absorbed, 15 to 18 minutes. Reduce heat to
- medium-low, add reserved shrimp and mussels, tucking them down into the rice, and cook
- again without stirring, until mussels have opened and rice is just tender, 5 to 7
- minutes more. (Discard any mussels that don’t open.)
- </Typography>
- <Typography>
- Set aside off of the heat to let rest for 10 minutes, and then serve.
- </Typography>
+ Conte sua experiência com o Recurso
+ <Rating
+ name="customized-color"
+ value={0}
+ precision={0.5}
+ />
+ <Row>
+ <Col md={10} sm={12}>
+ <TextField fullWidth="true" multiline="true" required="true" placeholder="Escreva aqui sua experiência com o recurso *"/>
+ </Col>
+ <Col>
+ <Button variant="contained" color="primary">submit </Button>
+ </Col>
+ </Row>
+
+ </CardContent>
+ <CardContent>
+ <Typography variant="h5" component="p" color="textSecondary">Relatos sobre o uso do Recurso</Typography>
+ <Coment author="jorginho" coment="muito bom gostei mto bom msm"/>
</CardContent>
- </Collapse>
- </Paper>
+ </PaperStyled>
</div>
);
}
diff --git a/src/Components/Carousel.js b/src/Components/Carousel.js
index ab1886ec698ab20926638eb828eb795e78b30dc2..27c394f4ce6a8deb60f90fdc37cd594560659c7a 100644
--- a/src/Components/Carousel.js
+++ b/src/Components/Carousel.js
@@ -15,3 +15,648 @@ 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 ReactDOM from 'react-dom';
+import "react-responsive-carousel/lib/styles/carousel.min.css";
+import { Carousel } from 'react-responsive-carousel';
+import styled from 'styled-components';
+import Grid from '@material-ui/core/Grid';
+import ArrowBackIosIcon from '@material-ui/icons/ArrowBackIos';
+import ArrowForwardIosIcon from '@material-ui/icons/ArrowForwardIos';
+
+
+
+/*Importação de imagens para o componente*/
+import Handshake from "../img/termos/handshake.svg"
+import Pessoa from "../img/termos/Pessoa.svg"
+import Email from "../img/termos/Email.svg"
+import Seguranca from "../img/termos/Seguranca.svg"
+import Aberto from "../img/termos/Aberto.png";
+import Fechado from "../img/termos/Fechado.png";
+import Arrow_down from "../img/termos/Arrow_down.svg";
+import Arrow_double from "../img/termos/Arrow_double.svg";
+import Arrow_O from "../img/termos/Arrow_O que é a plataforma.png";
+import Arrow_O_1 from "../img/termos/Arrow_O que é a plataforma-1.png";
+import Like from "../img/termos/Like.svg";
+import Unlike from "../img/termos/Unlike.svg";
+import Line from "../img/termos/Line.svg";
+import Entenda from "../img/termos/Entenda.svg";
+import V from "../img/termos/V.svg";
+import OrthogonalLineUp from "../img/termos/OrthogonalLineUp.png"
+import OrthogonalLineDown from "../img/termos/OrthogonalLineDown.png"
+
+
+const Slide = styled.div`
+
+position: absolute;
+height: 500px;
+width: 1366px;
+
+h2{
+ font-family: "Pompiere", regular;
+ font-size: 44px;
+ line-height: 120%;
+ color: #FFFFFF;
+}
+
+h3{
+ font-family: "Roboto", regular;
+ font-size: 27px;
+ line-height: 120%;
+ color: #FFFFFF;
+}
+
+p{
+ font-family: "Roboto", regular;
+ font-size: 20px;
+ line-height: 120%;
+ color: #FFFFFF;
+ text-align: left;
+}
+
+.container{
+ position: absolute;
+ height: auto;
+ width: auto;
+ margin: 70px 180px 90px;
+}
+
+
+.tmpl1{
+ background-color: #00BCD4;
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+
+
+ .box-text{
+ position: relative;
+ float: left;
+ padding-right: 10px;
+ padding-left: 10px;
+
+ p {
+ margin: 0 0 10px;
+ }
+ }
+
+ .box-image{
+ position: relative;
+ float: right;
+ }
+}
+
+.tmpl2{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #673AB7;
+
+ .title{
+ padding-bottom: 50px;
+ }
+
+ .images{
+ position: absolute;
+ display: table-row;
+ }
+
+ .arrow{
+ display: table-row;
+ position: absolute;
+ margin-left: 55px;
+ margin-top: -15px;
+ width: 282px;
+ }
+
+ .circle{
+ display: table-row;
+ position: absolute;
+ margin-top: -100px;
+ margin-left: 795px;
+ width: 191px;
+ }
+
+ h2 {
+ margin-top: 20px;
+ margin-bottom: 10px;
+ font-weight: 500;
+ }
+
+ .box-text{
+ p{
+ font-size: 18px;
+ line-height: 25px;
+ }
+
+ position: relative;
+
+ }
+
+
+}
+
+.tmpl3{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #E81F4F;
+
+ .title{
+ position: relative;
+ padding-left: 10px;
+ h3{
+ line-height: 40px;
+ }
+ }
+
+ .box-text1{
+ .text{
+ padding-top: 20px;
+ }
+
+ .content{
+ display: table-row;
+
+ p{
+ display: table-cell;
+ font-size: 18px;
+ line-height: 25px;
+ vertical-align: middle;
+ }
+
+ img{
+ position: relative;
+ left: 0;
+ margin-right: 20px;
+ display: table-cell;
+ vertical-align: middle;
+ margin: 10px 20px 10px -10px;
+ }
+ }
+
+ }
+
+ .box-text2{
+ top: -50px;
+ .content{
+ p{
+ padding-bottom: 20px;
+ }
+
+ img{
+ margin-left: -65px;
+ margin-top: 25px;
+ }
+
+ .twoArrow{
+ margin-top: -5px;
+ }
+ }
+
+
+ }
+
+
+
+}
+
+.tmpl4{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #FF7F00;
+
+ h2{
+ padding-bottom: 20px;
+ }
+
+ p{
+ font-size: 20px;
+ line-height: 25px;
+ vertical-align: middle;
+ }
+
+ .box-images{
+ height: inherit;
+ display: table-row;
+ padding-top: 50px;
+ }
+
+ img{
+ display: table-cell;
+ vertical-align: middle;
+ top: 40px;
+ }
+
+
+}
+
+.tmpl5{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #1AB9DE;
+
+ .title{
+ display: table-row;
+ align-items: center;
+
+ img{
+ display: table-cell;
+ margin-right: 30px;
+ }
+
+ h2{
+ display: table-cell;
+ text-align: center;
+ vertical-align: middle;
+ }
+ }
+
+ .box-text {
+ margin-top: 20px;
+ p{
+ font-size: 17px;
+ font-weight: 15px;
+ }
+ }
+
+}
+
+.tmpl6{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #673AB7;
+
+ .box-text-1{
+ h3{
+ margin-bottom: 20px;
+ font-size: 27px;
+ }
+ p{
+ margin-bottom: 20px;
+ font-size: 18px;
+ margin-top: 0px;
+ }
+
+
+ .licences{
+ padding: 35px 150px 50px 35px;
+ margin-top: 50pz;
+ background-image: url(${Entenda});
+ background-repeat: no-repeat;
+ background-size: cover;
+ p::before{
+ content: url(${V});
+ }
+ p{
+ padding-left: 20px;
+ font-family: "Kalam", regular;
+ font-size: 24px;
+ white-space: nowrap;
+ }
+ .row{
+ padding-bottom: 5px;
+
+
+ }
+ }
+ }
+
+
+ .box-text-2{
+ background-image: url(${OrthogonalLineUp}),url(${OrthogonalLineDown});
+ background-repeat: no-repeat;
+ background-position: left top, right bottom;
+ padding-top: 30px;
+ padding-left: 50px;
+ p{
+ font-size: 15px;
+ padding-bottom: 15px;
+ }
+
+ .licenses_type{
+ margin-left: -20px;
+ font-size: 22px;
+ font-weight: bold;
+ text-align: right;
+ white-space: nowrap;
+ }
+ .row {
+ margin-right: -15px;
+ margin-left: -15px;
+
+ p {
+ padding-left: 15px;
+ }
+ }
+ }
+
+}
+
+.tmpl7{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #E81F4F;
+
+ .title{
+ h2{
+ font-family: Roboto;
+ font-size: 44px;
+ }
+ }
+
+ .box-text{
+ margin-top: 20px;
+ p{
+ line-height: 20px;
+ font-family: "Roboto";
+ font-size: 18px;
+ }
+ }
+
+ .rodape{
+ margin-top: 40px;
+ p{
+ line-height: 20px;
+ font-family: "Pompiere", regular;
+ font-size: 28px;
+ text-align: center;
+ }
+ span{
+ text-decoration: underline;
+ font-family: "Pompiere", regular;
+ line-height: 20px;
+ font-size: 28px;
+ cursor: pointer;
+ }
+ }
+}
+
+`
+
+const CarouselStyled = styled(Carousel)`
+
+ .carousel.carousel-slider {
+ height: 500px !important;
+ }
+
+ .carousel .slider-wrapper.axis-horizontal {
+ height: 500px !important;
+ }
+ .carousel .control-dots {
+ position: absolute !important;
+ padding-bottom: 20px;
+ }
+
+ .carousel .control-arrow:before, .carousel.carousel-slider .control-arrow:before {
+ margin: 0 5px;
+ display: inline-block;
+ border-top: 8px solid transparent;
+ border-bottom: 8px solid transparent;
+ content: '';
+ }
+
+
+`
+
+
+class TermsCarousel extends Component {
+ render() {
+ return (
+ <CarouselStyled
+ showThumbs= {false}
+ showStatus= {false}
+ transitionTime={1000}
+
+ width={"1366px"}
+
+ >
+ <div >
+ <Slide>
+ <div className="tmpl1">
+ <div className="container">
+ <Grid container spacing={0}>
+ <Grid item xs={6} >
+ <div className="box-text">
+ <p>A Plataforma Integrada MEC RED é parte do Compromisso 6 do 3º Plano de Ação da Parceria para Governo Aberto (OGP-Brasil), que tem por objetivo “incorporar na polÃtica educacional o potencial da cultura digital, de modo a fomentar a autonomia para uso, reuso e adaptação de recursos educacionais digitais, valorizando a pluralidade e a diversidade da educação brasileiraâ€.</p>
+ </div>
+ </Grid>
+ <Grid style={{display:"flex",justifyContent:"center"}} item xs={6}>
+ <div className="box-image">
+ <img src={Handshake} alt="handshake"/>
+ </div>
+ </Grid>
+ </Grid>
+ </div>
+ </div>
+ </Slide>
+
+ </div>
+ <div>
+ <Slide>
+ <div className="tmpl2">
+ <div className="container">
+ <div className="title">
+ <h2>O que é a Plataforma Integrada MEC RED e como ela está organizada?</h2>
+ <div className="images">
+ <div className="arrow">
+ <img src={Arrow_O} alt="Arrow_O"/>
+ </div>
+ <div className="circle">
+ <img src={Arrow_O_1} alt="Arrow_O_1"/>
+ </div>
+ </div>
+ </div>
+ <Grid container>
+ <Grid className="box-text" item xs={6}>
+ <p>Uma plataforma interativa, colaborativa e criada em software livre, que disponibiliza conteúdos do acervo do MEC e indica conteúdos de parceiros com o objetivo de formar uma rede ativa de educadores interessados em usar, criar e compartilhar recursos educacionais digitais.</p>
+ </Grid>
+ <Grid className="box-text" item xs={6}>
+ <p><strong>Repositório</strong> de recursos educacionais digitais que permite aos usuários cadastrados a publicação de seus materiais e <strong>Referatório</strong> que aponta links para conteúdos em sites externos.</p>
+ </Grid>
+ </Grid>
+ </div>
+ </div>
+ </Slide>
+ </div>
+ <div>
+ <Slide>
+ <div className="tmpl3">
+ <div className="container">
+ <Grid className="title" container spacing={1}>
+ <Grid item xs={12}>
+ <h3>Os recursos educacionais disponibilizados<br/> podem ser de dois tipos:</h3>
+ </Grid>
+ </Grid>
+ <Grid className="box-text1" container spacing={1}>
+ <Grid className="text" item xs={8}>
+ <div className="content">
+ <img src={Aberto} alt="Aberto"/>
+ <p><strong>Abertos</strong>: recursos sem nenhuma restrição de acesso e<br/> com flexibilidade quanto ao uso ou reuso.</p>
+ </div>
+ <div className="content">
+ <img src={Fechado} alt="Fechado"/>
+ <p><strong>Fechados</strong>: recursos com alguma restrição de acesso, uso<br/> ou reuso, como aqueles que, para acesso, há demanda de<br/> cadastro ou que têm licenças restritivas.</p>
+ </div>
+ </Grid>
+ <Grid className="box-text2" item xs={4}>
+ <div className="content">
+ <img src={Arrow_down} alt="Arrow_down"/>
+ <p>Como repositório, a Plataforma hospeda somente Recursos Educacionais Abertos (REA). Todo conteúdo inserido por usuários deve ser aberto.</p>
+ </div>
+ <div className="content">
+ <img className="twoArrow" src={Arrow_double}/>
+ <p>Como referatório, a Plataforma aponta links para parceiros, e<br/> esses recursos podem ser abertos ou fechados.</p>
+ </div>
+ </Grid>
+ </Grid>
+ </div>
+ </div>
+ </Slide>
+ </div>
+ <div>
+ <Slide>
+ <div class="tmpl4">
+ <div class="container">
+ <Grid container spacing={5}>
+ <Grid item xs={6}>
+ <h2>Como se cadastrar?</h2>
+ <div>
+ <p>Para criar uma conta, o usuário deverá clicar no botão “Cadastre-se†na página inicial da Plataforma e fazer um cadastro utilizando um endereço de e-mail e criando uma senha.</p>
+ </div>
+ </Grid>
+ <Grid item xs={2} style={{alignSelf:"center"}}> <img style={{width:"150px",height:"150px"}} src={Pessoa} alt="Pessoa" /> </Grid>
+ <Grid item xs={2} style={{alignSelf:"center"}}> <img style={{width:"150px",height:"150px"}} src={Email} alt="Email" /> </Grid>
+ <Grid item xs={2} style={{alignSelf:"center"}}> <img style={{width:"150px",height:"150px"}} src={Seguranca} alt="Seguranca" /> </Grid>
+ </Grid>
+ </div>
+ </div>
+ </Slide>
+ </div>
+ <div>
+ <Slide>
+ <div class="tmpl5">
+ <div class="container">
+ <Grid container justify="space-evenly" spacing={12}>
+ <Grid style={{paddingRight: "40px"}} item xs={6}>
+ <div class="title">
+ <img src={Like} alt= "Like"/>
+ <h2>O que publicar?</h2>
+ </div>
+ <img src={Line} alt="Line"/>
+ <div class="box-text">
+ <p>Conteúdos de cunho educacional e pertinentes ao assunto no qual estão inseridos, de autoria do usuário, de autoria coletiva (com consentimento dos demais autores) ou que estejam no domÃnio público. </p>
+ </div>
+ </Grid>
+ <Grid item xs={6}>
+ <div class= "title">
+ <img src={Unlike} alt="Unlike"/>
+ <h2>O que não publicar?</h2>
+ </div>
+ <img src={Line} alt="Line"/>
+ <div class="box-text">
+ <p>Materiais ofensivos, pornográficos, relacionados a atividades ilegais, que invadam a privacidade de terceiros, que violem a legislação de Direito Autoral ou os Direitos Humanos. Propagandas, conteúdos com vÃrus, spam ou comentários abusivos.</p>
+ </div>
+ </Grid>
+ </Grid>
+ </div>
+ </div>
+ </Slide>
+ </div>
+ <div>
+ <Slide>
+ <div className="tmpl6">
+ <div className="container">
+ <Grid container>
+ <Grid className="box-text-1" item xs={7}>
+ <h3>Direitos do autor e licenças de uso</h3>
+ <p>Ao inserir um novo material de sua autoria no Repositório, o usuário deverá escolher um dos tipos de licença aberta disponÃveis na Plataforma:</p>
+ <div className="licences">
+ <Grid className="row" container>
+ <Grid item xs={6}>
+ <p>CC-BY</p>
+ </Grid>
+ <Grid item xs={6}>
+ <p>CC-BY-SA</p>
+ </Grid>
+ </Grid>
+ <Grid className="row" container>
+ <Grid item xs={6}>
+ <p>CC-BY-NC</p>
+ </Grid>
+ <Grid item xs={6}>
+ <p>CC-BY-NC-SA</p>
+ </Grid>
+ </Grid>
+ </div>
+ </Grid>
+ <Grid className="box-text-2" item xs={5}>
+ <Grid className="row" container>
+ <Grid item xs={2}>
+ <p className="licenses_type">CC-BY</p>
+ </Grid>
+ <Grid item xs={10}>
+ <p> significa que o autor permite que distribuam, remixem, adaptem e criem a partir do seu trabalho, desde que lhe atribuam o devido crédito pela criação original</p>
+ </Grid>
+ </Grid>
+ <Grid className="row" container>
+ <Grid item xs={2}>
+ <p className="licenses_type">NC</p>
+ </Grid>
+ <Grid item xs={10}>
+ <p> indica que as criações elaboradas a partir do trabalho do autor podem ser utilizadas somente para fins não comerciais (se não houver esta especificação, o novo recurso poderá ser utilizado para fins comerciais)</p>
+ </Grid>
+ </Grid>
+ <Grid className="row" container>
+ <Grid item xs={2}>
+ <p className="licenses_type">SA</p>
+ </Grid>
+ <Grid item xs={10}>
+ <p> quer dizer que as novas criações devem ser licenciadas sob termos idênticos aos do trabalho original</p>
+ </Grid>
+ </Grid>
+ </Grid>
+ </Grid>
+ </div>
+ </div>
+ </Slide>
+ </div>
+ <div>
+ <Slide>
+ <div class="tmpl7">
+ <div class="container">
+ <Grid container>
+ <Grid className="title" item xs={4}>
+ <h2>Respeitamos<br/> a sua privacidade</h2>
+ </Grid>
+ <Grid className="box-text" item xs={8}>
+ <p>Além de solicitar alguns dados pessoais para o cadastro, a Plataforma coleta, de forma automática, os dados não pessoais relativos à interação dos usuários no sistema. Esses dados nunca serão fornecidos para fins comerciais, assim como nunca serão compartilhados quaisquer dados pessoais que possam identificar o usuário.</p>
+ <p>Os dados anônimos poderão ser utilizados para fins de melhoria da plataforma, transparência e para o uso em pesquisas.</p>
+ </Grid>
+ </Grid>
+ <div class="rodape col-md-12">
+ <p>Dúvidas? Leia a Ãntegra dos <span ng-click="hide()">Termos de Uso</span> ou fale conosco por meio do <span ui-sref="contato">formulário de contato</span>.</p>
+ </div>
+ </div>
+ </div>
+ </Slide>
+ </div>
+ </CarouselStyled>
+ )
+ }
+}
+
+export default TermsCarousel;
diff --git a/src/Components/CollectionCard.js b/src/Components/CollectionCard.js
index 36ed5d0a9fd9c8941ff7c4929e5289a3dca6f0ad..6edf0540b2e21faf15f5a6f42872c9d848d1d959 100644
--- a/src/Components/CollectionCard.js
+++ b/src/Components/CollectionCard.js
@@ -19,16 +19,15 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import React, {Component} from 'react';
import './CardsAnimation.css';
import {apiDomain} from '../env';
-import {Col,Row, Container, Hidden, Visible} from 'react-grid-system';
+import {Col,Row, Container} from 'react-grid-system';
import Card from '@material-ui/core/Card';
import CardContent from '@material-ui/core/CardContent';
import CardActions from '@material-ui/core/CardActions';
-import Typography from '@material-ui/core/Typography';
import IconButton from '@material-ui/core/IconButton';
import FolderIcon from '@material-ui/icons/Folder';
import FavoriteIcon from '@material-ui/icons/Favorite';
-import StarRatings from 'react-star-ratings';
-import algumaCoisa from "../img/laranja/LIVRO_DIGITAL.jpg";
+import Rating from '@material-ui/lab/Rating';
+import StarBorderIcon from '@material-ui/icons/StarBorder';
import noAvatar from "../img/default_profile.png";
var authorStyle={
@@ -68,11 +67,11 @@ class RenderThumbs extends Component {
var array = this.props.thumbs.slice(0,4);
if (array.length < 3) {
return(
- <img height="160" src={apiDomain+array[0]}/>)
+ <img height="160" src={apiDomain+array[0]} alt="Thumbnail dos Recursos"/>)
}
return(
<Row>
- {array.map(thumb => <Col style={{padding: "0px"}} md={6}><img key={thumb.id} height="80" src={apiDomain+thumb}/> </Col>)}
+ {array.map(thumb => <Col style={{padding: "0px"}} md={6}><img key={thumb.id} height="80" src={apiDomain+thumb} alt="Thumbnail dos Recursos"/> </Col>)}
</Row>
);
}
@@ -105,28 +104,27 @@ class CollectionCard extends Component {
this.defAvatar();
return (
<Card onMouseOver={this.onHover.bind(this)} onMouseOut={this.onIddle.bind(this)} >
- <Container style={{padding:"0px", backgroundColor: "#673ab7"}}>
- <div className={this.state.userStyle}>
- <img style={slideStyle} src={this.state.userAvatar}/>
- <div style={publisherStyle}>Enviado por: <br/>{this.props.author}</div>
- <div> tags </div>
- </div>
- <RenderThumbs thumbs={this.props.thumbnail}/>
- <div style={authorStyle}>
- <div style={{textAlign: "center"}}>{this.props.name}</div>
- </div>
- <img style={pictureStyle} src={this.state.userAvatar}/>
+ <Container style={{padding:"0px", backgroundColor: "#673ab7"}}>
+ <div className={this.state.userStyle}>
+ <img style={slideStyle} src={this.state.userAvatar} alt="Avatar do usuário"/>
+ <div style={publisherStyle}>Enviado por: <br/>{this.props.author}</div>
+ <div> tags </div>
+ </div>
+ <RenderThumbs thumbs={this.props.thumbnail}/>
+ <div style={authorStyle}>
+ <div style={{textAlign: "center"}}>{this.props.name}</div>
+ </div>
+ <img style={pictureStyle} src={this.state.userAvatar} alt="Avatar do usuário"/>
- </Container>
+ </Container>
<CardContent style={{height: "60%", textAlign: "left", paddingBottom: "0px"}}>
</CardContent>
<Container style={{textAlign: "left"}}>
- <StarRatings
- rating={this.props.rating*100}
- starRatedColor="673ab7"
- starDimension="20px"
- starSpacing="2px"
- starHoverColor="red"
+ <Rating
+ name="customized-empty"
+ value={this.props.rating*100}
+ precision={0.5}
+ emptyIcon={<StarBorderIcon fontSize="inherit" />}
/>
</Container>
<CardActions style={{justifyContent: "space-between"}}>
diff --git a/src/Components/Coment.js b/src/Components/Coment.js
new file mode 100644
index 0000000000000000000000000000000000000000..f76cbf7fc21d321d7ce4155f57d4580f00190c75
--- /dev/null
+++ b/src/Components/Coment.js
@@ -0,0 +1,27 @@
+import React, {Component} from 'react';
+import CardContent from '@material-ui/core/CardContent';
+import Typography from '@material-ui/core/Typography';
+import StarRatings from 'react-star-ratings';
+
+
+class Coment extends Component {
+ constructor(props) {
+ super(props);
+
+ }
+render(){
+ return(
+ <CardContent>
+ <StarRatings
+ rating={2}
+ starRatedColor="ff7f00"
+ starDimension="20px"
+ starSpacing="2px"
+ />
+ <Typography component="p" varitant="srOnly" style={{color: "orange"}}> {this.props.author}:{this.props.coment}</Typography>
+ </CardContent>
+ );
+}
+
+}
+export default Coment;
diff --git a/src/Components/EcFooter.js b/src/Components/EcFooter.js
index 317a1e9426df5fcc7b3f32dd5dd73038ece04968..29d075706fac3c7dd8716f149083e0297439ced1 100644
--- a/src/Components/EcFooter.js
+++ b/src/Components/EcFooter.js
@@ -24,8 +24,8 @@ const blueFooter={
backgroundColor: "#00bcd4",
color: "white",
display: "block",
- paddingTop: "30px",
- paddingBottom: "20px",
+ paddingTop: "2em",
+ paddingBottom: "2em",
verticalAlign: "bottom"
}
const listStyle={
@@ -41,7 +41,7 @@ class EcFooter extends Component{
<div style={blueFooter}>
<Container>
<Row>
- <Col md={4} sm={4}>
+ <Col md={4} sm={5} xs={5}>
<h4>Sobre</h4>
<ul style={listStyle}>
<li> <a href="#sobre">Sobre a Plataforma</a> </li>
@@ -50,7 +50,7 @@ class EcFooter extends Component{
<li> <a href="#contato">Contato</a> </li>
</ul>
</Col>
- <Col md={4} sm={4}>
+ <Col md={4} sm={5} xs={5}>
<h4>Ajuda</h4>
<ul style={listStyle}>
<li> <a href="#ajuda">Central de Ajuda</a> </li>
@@ -60,7 +60,7 @@ class EcFooter extends Component{
<li> <a href="#conta">Gerenciando a Conta</a> </li>
</ul>
</Col>
- <Col md={4} sm={4}>
+ <Col md={4} sm={12} xs={12}>
<img src={eduConectada} height="50%" alt="logo educação conectada"/>
</Col>
</Row>
diff --git a/src/Components/Modal.js b/src/Components/Modal.js
index ad8d4f029b358d4e3894e08bf2ea22512cb6fdd4..38d84f11a216daf7c8964e81546ed760e8669d2d 100644
--- a/src/Components/Modal.js
+++ b/src/Components/Modal.js
@@ -19,7 +19,9 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
import React from 'react';
import { makeStyles } from '@material-ui/styles';
import Modal from '@material-ui/core/Modal';
-import { Carousel } from 'react-responsive-carousel';
+
+import TermsCarousel from './Carousel';
+
import Backdrop from '@material-ui/core/Backdrop';
import Grid from '@material-ui/core/Grid';
import Fade from '@material-ui/core/Fade';
@@ -28,9 +30,25 @@ import ArrowBackIosIcon from '@material-ui/icons/ArrowBackIos';
import ArrowForwardIosIcon from '@material-ui/icons/ArrowForwardIos';
import styled from 'styled-components'
-/*Importação de imagens para a página*/
-import Handshake from "../img/termos/handshake.svg"
+/*Importação de imagens para o componente*/
+import Handshake from "../img/termos/handshake.svg"
+import Pessoa from "../img/termos/Pessoa.svg"
+import Email from "../img/termos/Email.svg"
+import Seguranca from "../img/termos/Seguranca.svg"
+import Aberto from "../img/termos/Aberto.png";
+import Fechado from "../img/termos/Fechado.png";
+import Arrow_down from "../img/termos/Arrow_down.svg";
+import Arrow_double from "../img/termos/Arrow_double.svg";
+import Arrow_O from "../img/termos/Arrow_O que é a plataforma.png";
+import Arrow_O_1 from "../img/termos/Arrow_O que é a plataforma-1.png";
+import Like from "../img/termos/Like.svg";
+import Unlike from "../img/termos/Unlike.svg";
+import Line from "../img/termos/Line.svg";
+import Entenda from "../img/termos/Entenda.svg";
+import V from "../img/termos/V.svg";
+import OrthogonalLineUp from "../img/termos/OrthogonalLineUp.png"
+import OrthogonalLineDown from "../img/termos/OrthogonalLineDown.png"
@@ -51,44 +69,10 @@ const useStyles = makeStyles(theme => ({
}
}));
-const CarouselStyled = styled(Carousel)`
- .carousel .control-dots{
- position: inherit !important;
- }
- .carousel .control-arrow {
- background: black !important;
- position: relative !impontant;
- }
- .carousel .control-next.control-arrow::before{
- content: {<ArrowForwardIosIcon/>} !important;
- }
- .carousel.carousel-slider .control-arrow {
- top: 40% !important;
- bottom: 50% !important;
- border-radius: 100% !important;
- opacity: 0.8 !important;
- padding: 12px !important;
- }
- .MuiPaper-elevation1-209{
- box-shadow: none !important;
- }
-
- .selected{
- height:500px !important;
- width:1366px !important;
- }
-`
-
-const carousel = styled.div `
- .termsTemplates{
- }
-`
-
-
export default function TransitionsModal() {
const classes = useStyles();
const [open, setOpen] = React.useState(false);
@@ -102,9 +86,13 @@ export default function TransitionsModal() {
};
return (
+
+
<div style={{display:"flex", justifyContent: "center"}}>
+ <link href="https://fonts.googleapis.com/css?family=Kalam|Pompiere|Roboto&display=swap" rel="stylesheet"/>
+
<button style = {{background: "none",border: "none", color:"#fff",verticalAlign:"center"}} type="button" onClick={handleOpen}>
- <VisibilityOutlinedIcon style={{verticalAlign:"middle"}}/> <spam style={{verticalAlign: "middle"}}>VEJA A VERSÃO RESUMIDA</spam>
+ <VisibilityOutlinedIcon style={{verticalAlign:"middle"}}/> <spam style={{verticalAlign: "middle",fontWeight: "600",fontSize:"14px"}}>VEJA A VERSÃO RESUMIDA</spam>
</button>
<Modal
aria-labelledby="transition-modal-title"
@@ -119,91 +107,11 @@ export default function TransitionsModal() {
}}
>
<Fade in={open}>
- <CarouselStyled className={classes.carousel} showArrows={true} showThumbs={false} infiniteLoop={true} showStatus={false}>
-
- <div style={{background:"#00BCD4"}} >
- <Grid container spacing={3}>
- <Grid item md={6}>
- <p>A Plataforma Integrada MEC RED é parte do Compromisso 6 do 3º Plano de Ação da Parceria para Governo Aberto (OGP-Brasil), que tem por objetivo “incorporar na polÃtica educacional o potencial da cultura digital, de modo a fomentar a autonomia para uso, reuso e adaptação de recursos educacionais digitais, valorizando a pluralidade e a diversidade da educação brasileiraâ€.</p>
- </Grid>
-
- <Grid item md={6} style={{backgroundImage: "url(${Handshake)"}}></Grid>
- </Grid>
-
- </div>
-
- <div style={{background:"#673ab7"}}>
- <h2>O que é a Plataforma Integrada MEC RED e como ela está organizada?</h2>
-
- <p>Uma plataforma interativa, colaborativa e criada em software livre, que disponibiliza conteúdos do acervo do MEC e indica conteúdos de parceiros com o objetivo de formar uma rede ativa de educadores interessados em usar, criar e compartilhar recursos educacionais digitais.</p>
-
- <p><strong>Repositório</strong> de recursos educacionais digitais que permite aos usuários cadastrados a publicação de seus materiais e <strong>Referatório</strong> que aponta links para conteúdos em sites externos.</p>
- </div>
-
- <div style={{background:"#e81f4f"}}>
- <h3>Os recursos educacionais disponibilizados<br/> podem ser de dois tipos:</h3>
-
- <p><strong>Abertos</strong>: recursos sem nenhuma restrição de acesso e<br/> com flexibilidade quanto ao uso ou reuso.</p>
-
- <p><strong>Fechados</strong>: recursos com alguma restrição de acesso, uso<br/> ou reuso, como aqueles que, para acesso, há demanda de<br/> cadastro ou que têm licenças restritivas.</p>
-
- <p>Como repositório, a Plataforma hospeda somente Recursos Educacionais Abertos (REA). Todo conteúdo inserido por usuários deve ser aberto.</p>
-
- <p>Como referatório, a Plataforma aponta links para parceiros, e<br/> esses recursos podem ser abertos ou fechados.</p>
- </div>
-
- <div style={{background:"#ff7f00"}}>
- <h2>Como se cadastrar?</h2>
- <div>
- <p>Para criar uma conta, o usuário deverá clicar no botão “Cadastre-se†na página inicial da Plataforma e fazer um cadastro utilizando um endereço de e-mail e criando uma senha.</p>
- </div>
- </div>
-
- <div style={{background:"#1ab9de"}}>
- <h2>O que publicar?</h2>
-
- <p>Conteúdos de cunho educacional e pertinentes ao assunto no qual estão inseridos, de autoria do usuário, de autoria coletiva (com consentimento dos demais autores) ou que estejam no domÃnio público. </p>
-
- <h2>O que não publicar?</h2>
-
- <p>Materiais ofensivos, pornográficos, relacionados a atividades ilegais, que invadam a privacidade de terceiros, que violem a legislação de Direito Autoral ou os Direitos Humanos. Propagandas, conteúdos com vÃrus, spam ou comentários abusivos.</p>
- </div>
-
- <div style={{background:"#673ab7"}}>
- <h3>Direitos do autor e licenças de uso</h3>
-
- <p>Ao inserir um novo material de sua autoria no Repositório, o usuário deverá escolher um dos tipos de licença aberta disponÃveis na Plataforma:</p>
-
- <p>CC-BY</p>
-
- <p>CC-BY-SA</p>
-
- <p>CC-BY-NC</p>
-
- <p>CC-BY-NC-SA</p>
-
- <p>CC-BY</p>
-
- <p> significa que o autor permite que distribuam, remixem, adaptem e criem a partir do seu trabalho, desde que lhe atribuam o devido crédito pela criação original</p>
-
- <p>NC</p>
-
- <p> indica que as criações elaboradas a partir do trabalho do autor podem ser utilizadas somente para fins não comerciais (se não houver esta especificação, o novo recurso poderá ser utilizado para fins comerciais)</p>
-
- <p>SA</p>
-
- <p> quer dizer que as novas criações devem ser licenciadas sob termos idênticos aos do trabalho original</p>
- </div>
-
- <div style={{background:"#e81f4f"}}>
- <h2>Respeitamos<br/> a sua privacidade</h2>
- <p>Além de solicitar alguns dados pessoais para o cadastro, a Plataforma coleta, de forma automática, os dados não pessoais relativos à interação dos usuários no sistema. Esses dados nunca serão fornecidos para fins comerciais, assim como nunca serão compartilhados quaisquer dados pessoais que possam identificar o usuário.</p>
- <p>Os dados anônimos poderão ser utilizados para fins de melhoria da plataforma, transparência e para o uso em pesquisas.</p>
+ <div>
+ <TermsCarousel/>
+ </div>
- <p>Dúvidas? Leia a Ãntegra dos <span ng-click="hide()">Termos de Uso</span> ou fale conosco por meio do <span ui-sref="contato">formulário de contato</span>.</p>
- </div>
- </CarouselStyled>
</Fade>
</Modal>
</div>
diff --git a/src/Components/ResourceCard.js b/src/Components/ResourceCard.js
index 5e9cfb5fa52a807b03d20440da21f3f22bc90db7..a5eb7c12bbb915aa9218cfff94708fba2e345790 100644
--- a/src/Components/ResourceCard.js
+++ b/src/Components/ResourceCard.js
@@ -25,7 +25,6 @@ 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 StarRatings from 'react-star-ratings';
import animacao from "../img/laranja/ANIMACAO_SIMULACAO.jpg";
import apresentacao from "../img/laranja/APRESENTACAO.jpg";
import aplicativo from "../img/laranja/APP.jpg";
@@ -40,7 +39,8 @@ 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";
-
+import Rating from '@material-ui/lab/Rating';
+import StarBorderIcon from '@material-ui/icons/StarBorder';
import {apiDomain} from '../env';
import AddIcon from '@material-ui/icons/CreateNewFolder';
import Options from './CardOptions'
@@ -101,10 +101,10 @@ class ResourceCard extends Component {
<Card onMouseOver={this.onHover.bind(this)} onMouseOut={this.onIddle.bind(this)} >
<Container style={{padding:"0px", height:"175px", backgroundColor: "#ff7f00"}}>
<div className={this.state.userStyle}>
- <img style={slideStyle} src={this.state.userAvatar}/>
+ <img style={slideStyle} src={this.state.userAvatar} alt="Avatar"/>
<Typography style={publisherStyle}>Enviado por: <br/>{this.props.author}</Typography>
</div>
- <img src={this.state.thumbnail} style={{height:"100%"}}alt="thumbnail do recurso"/>
+ <img src={this.state.thumbnail} style={{height:"100%"}} alt="thumbnail do recurso"/>
</Container>
<CardContent style={{height: "60%", textAlign: "left", paddingBottom: "0px"}}>
<Typography variant="body2" color="textSecondary" component="p" style={{height:"45px", overflow: "hidden", fontSize: "0.8em"}}>
@@ -112,12 +112,12 @@ class ResourceCard extends Component {
</Typography>
</CardContent>
<Container style={{textAlign: "left"}}>
- <StarRatings
- rating={this.props.rating*100}
- starRatedColor="ff7f00"
- starDimension="20px"
- starSpacing="2px"
- starHoverColor="red"
+
+ <Rating
+ name="customized-empty"
+ value={this.props.rating*10}
+ precision={0.5}
+ emptyIcon={<StarBorderIcon fontSize="inherit" />}
/>
</Container>
<CardActions style={{justifyContent: "space-between", padding: "0px"}}>
diff --git a/src/Components/Tags.js b/src/Components/Tags.js
new file mode 100644
index 0000000000000000000000000000000000000000..6cc1077945ebf1882bbe67f75f505e227f0a5c21
--- /dev/null
+++ b/src/Components/Tags.js
@@ -0,0 +1,19 @@
+import React, {Component} from 'react';
+const tagStyle={
+ borderRadius: "10px",
+ backgroundColor: "gray",
+ color: "white",
+ padding: "4px",
+ display: "table",
+
+};
+
+class Tags extends Component {
+
+ render(){
+ return(
+ <div style={tagStyle}> {this.props.name} </div>
+ )
+ }
+}
+export default Tags;
diff --git a/src/Pages/Teste.js b/src/Pages/Teste.js
new file mode 100644
index 0000000000000000000000000000000000000000..38f6b4023ae3c9d8978f40b06474c06cc0a4215d
--- /dev/null
+++ b/src/Pages/Teste.js
@@ -0,0 +1,676 @@
+/*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, {Component} from 'react';
+import styled from 'styled-components';
+import Grid from '@material-ui/core/Grid';
+/*Importação de imagens para o componente*/
+import Handshake from "../img/termos/handshake.svg"
+import Pessoa from "../img/termos/Pessoa.svg"
+import Email from "../img/termos/Email.svg"
+import Seguranca from "../img/termos/Seguranca.svg"
+import Aberto from "../img/termos/Aberto.png";
+import Fechado from "../img/termos/Fechado.png";
+import Arrow_down from "../img/termos/Arrow_down.svg";
+import Arrow_double from "../img/termos/Arrow_double.svg";
+import Arrow_O from "../img/termos/Arrow_O que é a plataforma.png";
+import Arrow_O_1 from "../img/termos/Arrow_O que é a plataforma-1.png";
+
+
+const Slide = styled.div`
+
+position: absolute;
+height: 500px;
+width: 1366px;
+
+h2{
+ font-family: "Pompiere", regular;
+ font-size: 44px;
+ line-height: 120%;
+ color: #FFFFFF;
+}
+
+h3{
+ font-family: "Roboto", regular;
+ font-size: 27px;
+ line-height: 120%;
+ color: #FFFFFF;
+}
+
+p{
+ font-family: "Roboto", regular;
+ font-size: 20px;
+ line-height: 120%;
+ color: #FFFFFF;
+ text-align: left;
+}
+
+.container{
+ position: absolute;
+ height: auto;
+ width: auto;
+ margin: 70px 180px 90px;
+}
+
+
+.tmpl1{
+ background-color: #00BCD4;
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+
+
+ .box-text{
+ position: relative;
+ float: left;
+ padding-right: 10px;
+ padding-left: 10px;
+ }
+
+ .box-image{
+ position: relative;
+ float: right;
+ }
+}
+
+.tmpl2{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #673AB7;
+
+ .title{
+ padding-bottom: 50px;
+ }
+
+ .images{
+ position: relative;
+ display: table-row;
+ }
+
+ .arrow{
+ display: table-row;
+ position: absolute;
+ margin-left: 15px;
+ margin-top: -15px;
+ }
+
+ .circle{
+ display: table-row;
+ position: absolute;
+ margin-top: -100px;
+ margin-left: 755px;
+ }
+
+ .box-text{
+ p{
+ font-size: 18px;
+ line-height: 25px;
+ }
+
+ position: relative;
+
+ }
+
+
+}
+
+.tmpl3{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #E81F4F;
+
+ .title{
+ position: relative;
+ padding-left: 10px;
+ h3{
+ line-height: 40px;
+ }
+ }
+
+ .box-text1{
+ .text{
+ padding-top: 20px;
+ }
+
+ .content{
+ display: table-row;
+
+ p{
+ display: table-cell;
+ font-size: 18px;
+ line-height: 25px;
+ vertical-align: middle;
+ }
+
+ img{
+ position: relative;
+ left: 0;
+ margin-right: 20px;
+ display: table-cell;
+ vertical-align: middle;
+ margin: 10px 20px 10px -10px;
+ }
+ }
+
+ }
+
+ .box-text2{
+ top: -50px;
+ .content{
+ p{
+ padding-bottom: 20px;
+ }
+
+ img{
+ margin-left: -65px;
+ margin-top: 25px;
+ }
+
+ .twoArrow{
+ margin-top: -5px;
+ }
+ }
+
+
+ }
+
+
+
+}
+
+.tmpl4{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #FF7F00;
+
+ h2{
+ padding-bottom: 20px;
+ }
+
+ p{
+ font-size: 20px;
+ line-height: 25px;
+ vertical-align: middle;
+ }
+
+ .box-images{
+ height: inherit;
+ display: table-row;
+ padding-top: 50px;
+ }
+
+ img{
+ display: table-cell;
+ vertical-align: middle;
+ top: 40px;
+ }
+
+
+}
+
+.tmpl5{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #1AB9DE;
+
+ .title{
+ display: table-row;
+ align-items: center;
+
+ img{
+ display: table-cell;
+ margin-right: 30px;
+ }
+
+ h2{
+ display: table-cell;
+ text-align: center;
+ vertical-align: middle;
+ }
+ }
+
+ .box-text {
+ margin-top: 20px;
+ p{
+ font-size: 17px;
+ font-weight: 15px;
+ }
+ }
+
+}
+
+.tmpl6{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #673AB7;
+
+ .box-text-1{
+ h3{
+ margin-bottom: 20px;
+ font-size: 27px;
+ }
+ p{
+ margin-bottom: 20px;
+ font-size: 18px;
+ }
+
+
+ .licences{
+ padding: 35px 150px 50px 35px;
+ margin-top: 50pz;
+ background-image: url("../../img/termos/Entenda.svg");
+ background-repeat: no-repeat;
+ background-size: cover;
+ p::before{
+ content: url(../../img/termos/V.svg);
+ }
+ p{
+ padding-left: 20px;
+ font-family: "Kalam", regular;
+ font-size: 24px;
+ white-space: nowrap;
+ }
+ .row{
+ padding-bottom: 5px;
+ }
+ }
+ }
+
+
+ .box-text-2{
+ background-image: url("../../img/termos/OrthogonalLineUp.png"),url("../../img/termos/OrthogonalLineDown.png");
+ background-repeat: no-repeat;
+ background-position: left top, right bottom;
+ padding-top: 30px;
+ padding-left: 50px;
+ p{
+ font-size: 15px;
+ padding-bottom: 15px;
+ }
+
+ .licenses_type{
+ margin-left: -20px;
+ font-size: 22px;
+ font-weight: bold;
+ text-align: right;
+ white-space: nowrap;
+ }
+ }
+
+}
+
+.tmpl7{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #E81F4F;
+
+ .title{
+ h2{
+ font-family: Roboto;
+ font-size: 44px;
+ }
+ }
+
+ .box-text{
+ margin-top: 20px;
+ p{
+ line-height: 20px;
+ font-family: "Roboto";
+ font-size: 18px;
+ }
+ }
+
+ .rodape{
+ margin-top: 40px;
+ p{
+ line-height: 20px;
+ font-family: "Pompiere", regular;
+ font-size: 28px;
+ text-align: center;
+ }
+ span{
+ text-decoration: underline;
+ font-family: "Pompiere", regular;
+ line-height: 20px;
+ font-size: 28px;
+ cursor: pointer;
+ }
+ }
+}
+
+`
+
+
+
+
+const Slide1 = styled.div`
+
+ background:#00BCD4;
+ height:500px;
+ width:1366px;
+
+`
+
+
+
+const Slide3 = styled.div`
+
+ background:#e81f4f;
+ height:500px;
+ width:1366px;
+
+
+ .tmpl3{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #E81F4F;
+
+ .title{
+ position: relative;
+ padding-left: 10px;
+ h3{
+ line-height: 40px;
+ }
+ }
+
+ .box-text1{
+ .text{
+ padding-top: 20px;
+ }
+
+ .content{
+ display: table-row;
+
+ p{
+ display: table-cell;
+ font-size: 18px;
+ line-height: 25px;
+ vertical-align: middle;
+ }
+
+ img{
+ position: relative;
+ left: 0;
+ margin-right: 20px;
+ display: table-cell;
+ vertical-align: middle;
+ margin: 10px 20px 10px -10px;
+ }
+ }
+
+ }
+
+ .box-text2{
+ top: -50px;
+ .content{
+ p{
+ padding-bottom: 20px;
+ }
+
+ img{
+ margin-left: -65px;
+ margin-top: 25px;
+ }
+
+ .twoArrow{
+ margin-top: -5px;
+ }
+ }
+ }
+ }
+`
+
+
+const Slide4 = styled.div`
+
+
+ background:#ff7f00;
+ height:500px;
+ width:1366px;
+
+ position: absolute;
+ height: 500px;
+ width: 1366px;
+
+ .container{
+ position: absolute;
+ height: auto;
+ width: auto;
+ margin: 70px 180px 90px;
+ }
+ .tmpl4{
+ height: inherit;
+ width: inherit;
+ display: flex;
+ align-items: center;
+ background-color: #FF7F00;
+
+ h2{
+ padding-bottom: 20px;
+ font-family: Pompiere,regular;
+ font-size: 44px;
+ line-height: 120%;
+ color:#fff;
+ margin-top: 20px;
+ margin-bottom: 10px
+ }
+
+ p{
+ font-size: 20px;
+ line-height: 25px;
+ vertical-align: middle;
+ font-size: 20px;
+ font-family: Roboto,regular;
+ color:#fff;
+ margin: 0 0 10px;
+ text-align: left;
+ line-height: 25px;
+ padding-right: 10px;
+ }
+
+ .box-images{
+ height: inherit;
+ display: table-row;
+ padding-top: 50px;
+ }
+
+ img{
+ display: table-cell;
+ vertical-align: middle;
+ top: 40px;
+ }
+
+
+ }
+
+`
+
+
+
+
+class Teste extends Component {
+ render() {
+ return (
+ <div>
+ <link href="https://fonts.googleapis.com/css?family=Kalam|Pompiere|Roboto&display=swap" rel="stylesheet"/>
+
+ <Slide>
+ <div class="tmpl1">
+ <div class="container">
+ <Grid container spacing={0}>
+ <Grid item xs={6} >
+ <div class="box-text">
+ <p>A Plataforma Integrada MEC RED é parte do Compromisso 6 do 3º Plano de Ação da Parceria para Governo Aberto (OGP-Brasil), que tem por objetivo “incorporar na polÃtica educacional o potencial da cultura digital, de modo a fomentar a autonomia para uso, reuso e adaptação de recursos educacionais digitais, valorizando a pluralidade e a diversidade da educação brasileiraâ€.</p>
+ </div>
+ </Grid>
+ <Grid item xs={6}>
+ <div class="box-image">
+ <img src={Handshake} alt="handshake"/>
+ </div>
+ </Grid>
+ </Grid>
+ </div>
+ </div>
+ </Slide>
+
+ <Slide>
+ <div class="tmpl2">
+ <div class="container">
+ <div class="title">
+ <h2>O que é a Plataforma Integrada MEC RED e como ela está organizada?</h2>
+ <div class="images">
+ <div class="arrow">
+ <img src={Arrow_O} alt="Arrow_O"/>
+ </div>
+ <div class="circle">
+ <img src={Arrow_O_1} alt="Arrow_O_1"/>
+ </div>
+ </div>
+ </div>
+ <div class="box-text col-md-6">
+ <p>Uma plataforma interativa, colaborativa e criada em software livre, que disponibiliza conteúdos do acervo do MEC e indica conteúdos de parceiros com o objetivo de formar uma rede ativa de educadores interessados em usar, criar e compartilhar recursos educacionais digitais.</p>
+ </div>
+ <div class="box-text col-md-6">
+ <p><strong>Repositório</strong> de recursos educacionais digitais que permite aos usuários cadastrados a publicação de seus materiais e <strong>Referatório</strong> que aponta links para conteúdos em sites externos.</p>
+ </div>
+ </div>
+ </div>
+ </Slide>
+
+ <Slide3>
+ <div class="tmpl3">
+ <div class="container">
+ <div class="title">
+ <h3>As recursos educacionais disponibilizados<br/> podem ser de dois tipos:</h3>
+ </div>
+ <Grid container spacing={5}>
+
+
+ <Grid class="text" item md={8}>
+ <div class="content">
+ <img src={Aberto} alt="Aberto "/>
+ <p><strong>Abertos</strong>: recursos sem nenhuma restrição de acesso e<br/> com flexibilidade quanto ao uso ou reuso.</p>
+ </div>
+ <div class="content">
+ <img src={Fechado} alt="Fechado"/>
+ <p><strong>Fechados</strong>: recursos com alguma restrição de acesso, uso<br/> ou reuso, como aqueles que, para acesso, há demanda de<br/> cadastro ou que têm licenças restritivas.</p>
+ </div>
+ </Grid>
+
+
+
+ <Grid item md={4}>
+ <div class="content">
+ <img src={Arrow_down}/>
+ <p>Como repositório, a Plataforma hospeda somente Recursos Educacionais Abertos (REA). Todo conteúdo inserido por usuários deve ser aberto.</p>
+ </div>
+ <div class="content">
+ <img class="twoArrow" src={Arrow_double}/>
+ <p>Como referatório, a Plataforma aponta links para parceiros, e<br/> esses recursos podem ser abertos ou fechados.</p>
+ </div>
+ </Grid>
+
+
+ </Grid>
+ </div>
+ </div>
+ </Slide3>
+
+ <Slide>
+ <div class="tmpl4">
+ <div class="container">
+ <Grid container spacing={5}>
+ <Grid item xs={6}>
+ <h2>Como se cadastrar?</h2>
+ <div>
+ <p>Para criar uma conta, o usuário deverá clicar no botão “Cadastre-se†na página inicial da Plataforma e fazer um cadastro utilizando um endereço de e-mail e criando uma senha.</p>
+ </div>
+ </Grid>
+ <Grid item xs={2} style={{alignSelf:"center"}}> <img src={Pessoa} alt="Pessoa" /> </Grid>
+ <Grid item xs={2} style={{alignSelf:"center"}}> <img src={Email} alt="Email" /> </Grid>
+ <Grid item xs={2} style={{alignSelf:"center"}}> <img src={Seguranca} alt="Seguranca" /> </Grid>
+ </Grid>
+ </div>
+ </div>
+ </Slide>
+
+ <div style={{background:"#00BCD4", height:"500px", width:"1366px"}}>
+ <h2>O que publicar?</h2>
+
+ <p>Conteúdos de cunho educacional e pertinentes ao assunto no qual estão inseridos, de autoria do usuário, de autoria coletiva (com consentimento dos demais autores) ou que estejam no domÃnio público. </p>
+
+ <h2>O que não publicar?</h2>
+
+ <p>Materiais ofensivos, pornográficos, relacionados a atividades ilegais, que invadam a privacidade de terceiros, que violem a legislação de Direito Autoral ou os Direitos Humanos. Propagandas, conteúdos com vÃrus, spam ou comentários abusivos.</p>
+ </div>
+
+ <div style={{background:"#673ab7", height:"500px", width:"1366px"}}>
+ <h3>Direitos do autor e licenças de uso</h3>
+
+ <p>Ao inserir um novo material de sua autoria no Repositório, o usuário deverá escolher um dos tipos de licença aberta disponÃveis na Plataforma:</p>
+
+ <p>CC-BY</p>
+
+ <p>CC-BY-SA</p>
+
+ <p>CC-BY-NC</p>
+
+ <p>CC-BY-NC-SA</p>
+
+ <p>CC-BY</p>
+
+ <p> significa que o autor permite que distribuam, remixem, adaptem e criem a partir do seu trabalho, desde que lhe atribuam o devido crédito pela criação original</p>
+
+ <p>NC</p>
+
+ <p> indica que as criações elaboradas a partir do trabalho do autor podem ser utilizadas somente para fins não comerciais (se não houver esta especificação, o novo recurso poderá ser utilizado para fins comerciais)</p>
+
+ <p>SA</p>
+
+ <p> quer dizer que as novas criações devem ser licenciadas sob termos idênticos aos do trabalho original</p>
+ </div>
+
+ <div style={{background:"#e81f4f", height:"500px", width:"1366px"}}>
+ <h2>Respeitamos<br/> a sua privacidade</h2>
+
+ <p>Além de solicitar alguns dados pessoais para o cadastro, a Plataforma coleta, de forma automática, os dados não pessoais relativos à interação dos usuários no sistema. Esses dados nunca serão fornecidos para fins comerciais, assim como nunca serão compartilhados quaisquer dados pessoais que possam identificar o usuário.</p>
+ <p>Os dados anônimos poderão ser utilizados para fins de melhoria da plataforma, transparência e para o uso em pesquisas.</p>
+
+ <p>Dúvidas? Leia a Ãntegra dos <span ng-click="hide()">Termos de Uso</span> ou fale conosco por meio do <span ui-sref="contato">formulário de contato</span>.</p>
+ </div>
+ </div>
+ );
+ }
+ }
+
+export default Teste;