diff --git a/Makefile b/Makefile index 9a0977fe7..dee8ac8b5 100644 --- a/Makefile +++ b/Makefile @@ -225,6 +225,10 @@ website-build: ##@2 website build website @echo "${YELLOW}Building website${RESET}" @cd website && yarn build +website-serve: ##@2 website build & serve website + @$(MAKE) website-build + @./node_modules/.bin/serve -l 5678 ./website/build + website-deploy: ##@2 website build & deploy website @$(MAKE) website-build diff --git a/conf/base.yaml b/conf/base.yaml index 79e444c30..b3edcd874 100644 --- a/conf/base.yaml +++ b/conf/base.yaml @@ -1,6 +1,7 @@ capture: - baseUrl: http://localhost:3000 + baseUrl: http://localhost:5678 pages: + # capture illustrations for readme - path: /bar selector: .chart-tabs__content output: ./packages/bar/doc/bar.png @@ -112,3 +113,92 @@ capture: - path: /waffle/canvas selector: .chart-tabs__content output: ./packages/waffle/doc/waffle-canvas.png + + # capture icons for website + - path: /icons + selector: '#bar-grey' + output: ./website/src/assets/icons/bar-grey.png + + - path: /icons + selector: '#bar-red' + output: ./website/src/assets/icons/bar-red.png + + - path: /icons + selector: '#heatmap-grey' + output: ./website/src/assets/icons/heatmap-grey.png + + - path: /icons + selector: '#heatmap-red' + output: ./website/src/assets/icons/heatmap-red.png + + - path: /icons + selector: '#waffle-grey' + output: ./website/src/assets/icons/waffle-grey.png + + - path: /icons + selector: '#waffle-red' + output: ./website/src/assets/icons/waffle-red.png + + - path: /icons + selector: '#pie-grey' + output: ./website/src/assets/icons/pie-grey.png + + - path: /icons + selector: '#pie-red' + output: ./website/src/assets/icons/pie-red.png + + #- path: /icons + # selector: '#radar-grey' + # output: ./website/src/assets/icons/radar-grey.png + + #- path: /icons + # selector: '#radar-red' + # output: ./website/src/assets/icons/radar-red.png + + - path: /icons + selector: '#line-grey' + output: ./website/src/assets/icons/line-grey.png + + - path: /icons + selector: '#line-red' + output: ./website/src/assets/icons/line-red.png + + - path: /icons + selector: '#bullet-grey' + output: ./website/src/assets/icons/bullet-grey.png + + - path: /icons + selector: '#bullet-red' + output: ./website/src/assets/icons/bullet-red.png + + - path: /icons + selector: '#circle-packing-grey' + output: ./website/src/assets/icons/circle-packing-grey.png + + - path: /icons + selector: '#circle-packing-red' + output: ./website/src/assets/icons/circle-packing-red.png + + - path: /icons + selector: '#stream-grey' + output: ./website/src/assets/icons/stream-grey.png + + - path: /icons + selector: '#stream-red' + output: ./website/src/assets/icons/stream-red.png + + - path: /icons + selector: '#scatterplot-grey' + output: ./website/src/assets/icons/scatterplot-grey.png + + - path: /icons + selector: '#scatterplot-red' + output: ./website/src/assets/icons/scatterplot-red.png + + - path: /icons + selector: '#parallel-coordinates-grey' + output: ./website/src/assets/icons/parallel-coordinates-grey.png + + - path: /icons + selector: '#parallel-coordinates-red' + output: ./website/src/assets/icons/parallel-coordinates-red.png diff --git a/package.json b/package.json index abbf61c6a..6a1acccb9 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "rollup-plugin-node-resolve": "^3.3.0", "rollup-plugin-prettier": "^0.4.0", "rollup-plugin-strip-banner": "^0.2.0", + "serve": "^10.1.1", "tslint": "^5.11.0", "typescript": "^3.0.1" }, diff --git a/packages/bar/doc/bar-canvas.png b/packages/bar/doc/bar-canvas.png index 3089b7bf1..5f1a83ed2 100644 Binary files a/packages/bar/doc/bar-canvas.png and b/packages/bar/doc/bar-canvas.png differ diff --git a/packages/bar/doc/bar.png b/packages/bar/doc/bar.png index ff89dad93..5b0ab7205 100644 Binary files a/packages/bar/doc/bar.png and b/packages/bar/doc/bar.png differ diff --git a/packages/bullet/doc/bullet.png b/packages/bullet/doc/bullet.png index 00faedb7f..dbc9e7fa5 100644 Binary files a/packages/bullet/doc/bullet.png and b/packages/bullet/doc/bullet.png differ diff --git a/packages/calendar/doc/calendar.png b/packages/calendar/doc/calendar.png index 526bb9ccf..f351ac2ca 100644 Binary files a/packages/calendar/doc/calendar.png and b/packages/calendar/doc/calendar.png differ diff --git a/packages/chord/doc/chord-canvas.png b/packages/chord/doc/chord-canvas.png index 5ef9005f3..f337c8f57 100644 Binary files a/packages/chord/doc/chord-canvas.png and b/packages/chord/doc/chord-canvas.png differ diff --git a/packages/chord/doc/chord.png b/packages/chord/doc/chord.png index 6b57d6142..2494801cc 100644 Binary files a/packages/chord/doc/chord.png and b/packages/chord/doc/chord.png differ diff --git a/packages/circle-packing/doc/bubble-canvas.png b/packages/circle-packing/doc/bubble-canvas.png index a402cd6c5..e100a4c24 100644 Binary files a/packages/circle-packing/doc/bubble-canvas.png and b/packages/circle-packing/doc/bubble-canvas.png differ diff --git a/packages/circle-packing/doc/bubble-html.png b/packages/circle-packing/doc/bubble-html.png index c287750b4..6134b20ef 100644 Binary files a/packages/circle-packing/doc/bubble-html.png and b/packages/circle-packing/doc/bubble-html.png differ diff --git a/packages/circle-packing/doc/bubble.png b/packages/circle-packing/doc/bubble.png index 809bde202..163bb9b72 100644 Binary files a/packages/circle-packing/doc/bubble.png and b/packages/circle-packing/doc/bubble.png differ diff --git a/packages/heatmap/doc/heatmap-canvas.png b/packages/heatmap/doc/heatmap-canvas.png index c6a7bb7d0..d88c1832c 100644 Binary files a/packages/heatmap/doc/heatmap-canvas.png and b/packages/heatmap/doc/heatmap-canvas.png differ diff --git a/packages/heatmap/doc/heatmap.png b/packages/heatmap/doc/heatmap.png index e60a3fa1d..0d5c2e521 100644 Binary files a/packages/heatmap/doc/heatmap.png and b/packages/heatmap/doc/heatmap.png differ diff --git a/packages/line/doc/line.png b/packages/line/doc/line.png index fa6209114..8ae9aa704 100644 Binary files a/packages/line/doc/line.png and b/packages/line/doc/line.png differ diff --git a/packages/parallel-coordinates/doc/parallel-coordinates-canvas.png b/packages/parallel-coordinates/doc/parallel-coordinates-canvas.png index a95eb1542..cc16ad679 100644 Binary files a/packages/parallel-coordinates/doc/parallel-coordinates-canvas.png and b/packages/parallel-coordinates/doc/parallel-coordinates-canvas.png differ diff --git a/packages/parallel-coordinates/doc/parallel-coordinates.png b/packages/parallel-coordinates/doc/parallel-coordinates.png index 651b513fe..f12396a68 100644 Binary files a/packages/parallel-coordinates/doc/parallel-coordinates.png and b/packages/parallel-coordinates/doc/parallel-coordinates.png differ diff --git a/packages/pie/doc/pie.png b/packages/pie/doc/pie.png index d0d6118b7..59d40a3c4 100644 Binary files a/packages/pie/doc/pie.png and b/packages/pie/doc/pie.png differ diff --git a/packages/radar/doc/radar.png b/packages/radar/doc/radar.png index 9943365c1..0d2e3a843 100644 Binary files a/packages/radar/doc/radar.png and b/packages/radar/doc/radar.png differ diff --git a/packages/sankey/doc/sankey.png b/packages/sankey/doc/sankey.png index 428ab45a3..c3ddd8f0e 100644 Binary files a/packages/sankey/doc/sankey.png and b/packages/sankey/doc/sankey.png differ diff --git a/packages/scatterplot/doc/scatterplot-canvas.png b/packages/scatterplot/doc/scatterplot-canvas.png index cc88f3824..836ce2ee9 100644 Binary files a/packages/scatterplot/doc/scatterplot-canvas.png and b/packages/scatterplot/doc/scatterplot-canvas.png differ diff --git a/packages/scatterplot/doc/scatterplot.png b/packages/scatterplot/doc/scatterplot.png index effc45c13..93e0969fd 100644 Binary files a/packages/scatterplot/doc/scatterplot.png and b/packages/scatterplot/doc/scatterplot.png differ diff --git a/packages/stream/doc/stream.png b/packages/stream/doc/stream.png index ada8ec136..a542b94ad 100644 Binary files a/packages/stream/doc/stream.png and b/packages/stream/doc/stream.png differ diff --git a/packages/sunburst/doc/sunburst.png b/packages/sunburst/doc/sunburst.png index 0511490b0..87d93db5e 100644 Binary files a/packages/sunburst/doc/sunburst.png and b/packages/sunburst/doc/sunburst.png differ diff --git a/packages/treemap/doc/treemap-canvas.png b/packages/treemap/doc/treemap-canvas.png index 90f2f0f11..afe2490b4 100644 Binary files a/packages/treemap/doc/treemap-canvas.png and b/packages/treemap/doc/treemap-canvas.png differ diff --git a/packages/treemap/doc/treemap-html.png b/packages/treemap/doc/treemap-html.png index e5d3676a6..3fc8932a3 100644 Binary files a/packages/treemap/doc/treemap-html.png and b/packages/treemap/doc/treemap-html.png differ diff --git a/packages/treemap/doc/treemap.png b/packages/treemap/doc/treemap.png index ed0e53b1a..a1dcf0d17 100644 Binary files a/packages/treemap/doc/treemap.png and b/packages/treemap/doc/treemap.png differ diff --git a/packages/voronoi/doc/voronoi.png b/packages/voronoi/doc/voronoi.png index 3f4717a69..763893c8c 100644 Binary files a/packages/voronoi/doc/voronoi.png and b/packages/voronoi/doc/voronoi.png differ diff --git a/packages/waffle/doc/waffle-canvas.png b/packages/waffle/doc/waffle-canvas.png index 3d6610f0b..b3806edce 100644 Binary files a/packages/waffle/doc/waffle-canvas.png and b/packages/waffle/doc/waffle-canvas.png differ diff --git a/packages/waffle/doc/waffle-html.png b/packages/waffle/doc/waffle-html.png index b5bd06faa..95f3ddc5a 100644 Binary files a/packages/waffle/doc/waffle-html.png and b/packages/waffle/doc/waffle-html.png differ diff --git a/packages/waffle/doc/waffle.png b/packages/waffle/doc/waffle.png index 85f04ac57..8749fe597 100644 Binary files a/packages/waffle/doc/waffle.png and b/packages/waffle/doc/waffle.png differ diff --git a/scripts/capture.js b/scripts/capture.js index 1401dbb87..403484de5 100644 --- a/scripts/capture.js +++ b/scripts/capture.js @@ -3,7 +3,7 @@ const chalk = require('chalk') const config = require('@ekino/config') const capture = async (browser, baseUrl, { path, selector, output }) => { - const url = `${baseUrl}${path}` + const url = `${baseUrl}${path}?capture=1` const page = await browser.newPage() await page.setViewport({ width: 1400, height: 4000 }) @@ -22,6 +22,7 @@ const capture = async (browser, baseUrl, { path, selector, output }) => { await page.screenshot({ path: output, clip, + omitBackground: true, }) console.log(chalk` {green saved to {white ${output}}}`) diff --git a/website/src/SiteMap.js b/website/src/SiteMap.js index 1e01eec3c..6f79e836d 100644 --- a/website/src/SiteMap.js +++ b/website/src/SiteMap.js @@ -73,6 +73,7 @@ import Gradients from './components/guides/gradients/Gradients' import Patterns from './components/guides/patterns/Patterns' import About from './components/pages/About' import Faq from './components/pages/Faq' +import Icons from './components/icons/Icons' import Components from './components/components/Components' const SITEMAP = [ @@ -110,7 +111,7 @@ const SITEMAP = [ ], }, { - className: 'bubble', + className: 'circle-packing', path: '/bubble', label: 'Bubble', component: BubblePage, @@ -667,6 +668,8 @@ export const getRoutes = () => { } }) + routes.push() + return routes } diff --git a/website/src/assets/icons.png b/website/src/assets/icons.png index b891a7cf5..a26ac3cde 100644 Binary files a/website/src/assets/icons.png and b/website/src/assets/icons.png differ diff --git a/website/src/assets/icons/bar-grey.png b/website/src/assets/icons/bar-grey.png index 85e513d9f..10d6cd0cd 100644 Binary files a/website/src/assets/icons/bar-grey.png and b/website/src/assets/icons/bar-grey.png differ diff --git a/website/src/assets/icons/bar-red.png b/website/src/assets/icons/bar-red.png index 96b1cbf88..8dcb2c882 100644 Binary files a/website/src/assets/icons/bar-red.png and b/website/src/assets/icons/bar-red.png differ diff --git a/website/src/assets/icons/bubble-grey.png b/website/src/assets/icons/bubble-grey.png deleted file mode 100644 index 88b6d3652..000000000 Binary files a/website/src/assets/icons/bubble-grey.png and /dev/null differ diff --git a/website/src/assets/icons/bubble-red.png b/website/src/assets/icons/bubble-red.png deleted file mode 100644 index ef36fbda8..000000000 Binary files a/website/src/assets/icons/bubble-red.png and /dev/null differ diff --git a/website/src/assets/icons/bullet-grey.png b/website/src/assets/icons/bullet-grey.png index f2fef774f..2940d3b50 100644 Binary files a/website/src/assets/icons/bullet-grey.png and b/website/src/assets/icons/bullet-grey.png differ diff --git a/website/src/assets/icons/bullet-red.png b/website/src/assets/icons/bullet-red.png index e0db7c65d..a92300070 100644 Binary files a/website/src/assets/icons/bullet-red.png and b/website/src/assets/icons/bullet-red.png differ diff --git a/website/src/assets/icons/circle-packing-grey.png b/website/src/assets/icons/circle-packing-grey.png new file mode 100644 index 000000000..b7e224a6a Binary files /dev/null and b/website/src/assets/icons/circle-packing-grey.png differ diff --git a/website/src/assets/icons/circle-packing-red.png b/website/src/assets/icons/circle-packing-red.png new file mode 100644 index 000000000..7371eba49 Binary files /dev/null and b/website/src/assets/icons/circle-packing-red.png differ diff --git a/website/src/assets/icons/heatmap-grey.png b/website/src/assets/icons/heatmap-grey.png index 675c44b2e..00746296b 100644 Binary files a/website/src/assets/icons/heatmap-grey.png and b/website/src/assets/icons/heatmap-grey.png differ diff --git a/website/src/assets/icons/heatmap-red.png b/website/src/assets/icons/heatmap-red.png index abd950a5c..6bfe2d0e3 100644 Binary files a/website/src/assets/icons/heatmap-red.png and b/website/src/assets/icons/heatmap-red.png differ diff --git a/website/src/assets/icons/line-grey.png b/website/src/assets/icons/line-grey.png index ee4c23777..258d99415 100644 Binary files a/website/src/assets/icons/line-grey.png and b/website/src/assets/icons/line-grey.png differ diff --git a/website/src/assets/icons/line-red.png b/website/src/assets/icons/line-red.png index e939660ed..5286f1831 100644 Binary files a/website/src/assets/icons/line-red.png and b/website/src/assets/icons/line-red.png differ diff --git a/website/src/assets/icons/parallel-coordinates-grey.png b/website/src/assets/icons/parallel-coordinates-grey.png index ec45f19db..f805e6107 100644 Binary files a/website/src/assets/icons/parallel-coordinates-grey.png and b/website/src/assets/icons/parallel-coordinates-grey.png differ diff --git a/website/src/assets/icons/parallel-coordinates-red.png b/website/src/assets/icons/parallel-coordinates-red.png index 07b859906..c83c295e5 100644 Binary files a/website/src/assets/icons/parallel-coordinates-red.png and b/website/src/assets/icons/parallel-coordinates-red.png differ diff --git a/website/src/assets/icons/pie-grey.png b/website/src/assets/icons/pie-grey.png index 3bff58bb8..01015749a 100644 Binary files a/website/src/assets/icons/pie-grey.png and b/website/src/assets/icons/pie-grey.png differ diff --git a/website/src/assets/icons/pie-red.png b/website/src/assets/icons/pie-red.png index 9d077e1fe..e2a8e34c0 100644 Binary files a/website/src/assets/icons/pie-red.png and b/website/src/assets/icons/pie-red.png differ diff --git a/website/src/assets/icons/placeholders-grey.png b/website/src/assets/icons/placeholders-grey.png deleted file mode 100644 index d172043b8..000000000 Binary files a/website/src/assets/icons/placeholders-grey.png and /dev/null differ diff --git a/website/src/assets/icons/placeholders-red.png b/website/src/assets/icons/placeholders-red.png deleted file mode 100644 index deb9ba893..000000000 Binary files a/website/src/assets/icons/placeholders-red.png and /dev/null differ diff --git a/website/src/assets/icons/scatterplot-grey.png b/website/src/assets/icons/scatterplot-grey.png index 3ed0d552a..f3bad4cf0 100644 Binary files a/website/src/assets/icons/scatterplot-grey.png and b/website/src/assets/icons/scatterplot-grey.png differ diff --git a/website/src/assets/icons/scatterplot-red.png b/website/src/assets/icons/scatterplot-red.png index 3723e188f..e37aeab69 100644 Binary files a/website/src/assets/icons/scatterplot-red.png and b/website/src/assets/icons/scatterplot-red.png differ diff --git a/website/src/assets/icons/stream-grey.png b/website/src/assets/icons/stream-grey.png index 5afd5efec..f5742b859 100644 Binary files a/website/src/assets/icons/stream-grey.png and b/website/src/assets/icons/stream-grey.png differ diff --git a/website/src/assets/icons/stream-red.png b/website/src/assets/icons/stream-red.png index c9110870e..a47277033 100644 Binary files a/website/src/assets/icons/stream-red.png and b/website/src/assets/icons/stream-red.png differ diff --git a/website/src/assets/icons/waffle-grey.png b/website/src/assets/icons/waffle-grey.png index 218813c67..629d8859e 100644 Binary files a/website/src/assets/icons/waffle-grey.png and b/website/src/assets/icons/waffle-grey.png differ diff --git a/website/src/assets/icons/waffle-red.png b/website/src/assets/icons/waffle-red.png index 49f7e1455..884112346 100644 Binary files a/website/src/assets/icons/waffle-red.png and b/website/src/assets/icons/waffle-red.png differ diff --git a/website/src/assets/icons@2x.png b/website/src/assets/icons@2x.png index 6809cdd0b..9b95c81e5 100644 Binary files a/website/src/assets/icons@2x.png and b/website/src/assets/icons@2x.png differ diff --git a/website/src/components/charts/bubble/Bubble.js b/website/src/components/charts/bubble/Bubble.js index bd01898f5..004457726 100644 --- a/website/src/components/charts/bubble/Bubble.js +++ b/website/src/components/charts/bubble/Bubble.js @@ -158,7 +158,12 @@ export default class Bubble extends Component { {header} {description} - + - + ( + + + + + + + + + + +) + +export default BarIcon diff --git a/website/src/components/icons/BulletIcon.js b/website/src/components/icons/BulletIcon.js new file mode 100644 index 000000000..612039a76 --- /dev/null +++ b/website/src/components/icons/BulletIcon.js @@ -0,0 +1,119 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { Bullet } from '@nivo/bullet' +import bulletGreyImg from '../../assets/icons/bullet-grey.png' +import bulletRedImg from '../../assets/icons/bullet-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = { + data: [ + { + id: 'A', + ranges: [36, 100], + measures: [56], + markers: [76], + }, + { + id: 'B', + ranges: [60, 100], + measures: [76], + markers: [88], + }, + { + id: 'C', + ranges: [50, 100], + measures: [60], + markers: [74], + }, + ], + margin: { + top: 8, + bottom: 8, + }, + titleOffsetX: -300, + spacing: 8, + isInteractive: false, + markerSize: 0.4, +} + +const Range = colors => d => { + const color = d.data.v1 === 100 ? colors[1] : colors[0] + + return +} + +const Measure = color => d => ( + +) + +const Marker = color => d => ( + +) + +const BulletIcon = () => ( + + + + + + + + + + +) + +export default BulletIcon diff --git a/website/src/components/icons/CirclePackingIcon.js b/website/src/components/icons/CirclePackingIcon.js new file mode 100644 index 000000000..6e26ab9d9 --- /dev/null +++ b/website/src/components/icons/CirclePackingIcon.js @@ -0,0 +1,74 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { Bubble } from '@nivo/circle-packing' +import circlePackingGreyImg from '../../assets/icons/circle-packing-grey.png' +import circlePackingRedImg from '../../assets/icons/circle-packing-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = colors => ({ + root: { + id: 'root', + children: [ + { id: 'v', value: 0.1, color: colors[1] }, + { id: 'a', value: 3.4, color: colors[1] }, + { id: 'b', value: 2.6, color: colors[1] }, + { id: 'd', value: 1, color: colors[1] }, + { id: 'u', value: 0.1, color: colors[1] }, + { id: 'c', value: 0.1, color: colors[1] }, + { id: 'q', value: 0.7, color: colors[1] }, + { id: 's', value: 2, color: colors[1] }, + { id: 't', value: 0.1, color: colors[1] }, + { id: 'j', value: 0.2, color: colors[1] }, + { id: 'l', value: 0.7, color: colors[1] }, + { id: 'k', value: 2.6, color: colors[1] }, + { id: 'h', value: 0.4, color: colors[0] }, + { id: 'w', value: 0.1, color: colors[0] }, + { id: 'x', value: 1, color: colors[1] }, + { id: 'y', value: 0.1, color: colors[0] }, + { id: 'g', value: 0.4, color: colors[1] }, + { id: 'z', value: 0.1, color: colors[1] }, + { id: 'e', value: 1, color: colors[0] }, + { id: 'f', value: 1, color: colors[0] }, + { id: 'n', value: 0.4, color: colors[0] }, + { id: 'o', value: 0.2, color: colors[0] }, + { id: 'p', value: 0.4, color: colors[0] }, + { id: 'i', value: 0.2, color: colors[0] }, + { id: 'm', value: 0.2, color: colors[0] }, + ], + }, + colorBy: d => d.color, + padding: 2, + enableLabel: false, + leavesOnly: true, + isInteractive: false, +}) + +const CirclePackingIcon = () => ( + + + + + + + + + + +) + +export default CirclePackingIcon diff --git a/website/src/components/icons/HeatMapIcon.js b/website/src/components/icons/HeatMapIcon.js new file mode 100644 index 000000000..e915543c2 --- /dev/null +++ b/website/src/components/icons/HeatMapIcon.js @@ -0,0 +1,68 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { HeatMap } from '@nivo/heatmap' +import heatmapGreyImg from '../../assets/icons/heatmap-grey.png' +import heatmapRedImg from '../../assets/icons/heatmap-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = { + indexBy: 'id', + keys: ['A', 'B', 'C'], + data: [ + { id: '0', A: 4, B: 3, C: 2 }, + { id: '1', A: 3, B: 2, C: 1 }, + { id: '2', A: 2, B: 1, C: 0 }, + ], + margin: { + top: 8, + right: 8, + bottom: 8, + left: 8, + }, + axisTop: null, + axisLeft: null, + enableLabels: false, + padding: 4, + cellOpacity: 1, + isInteractive: false, +} + +const HeatMapIcon = () => ( + + + + + + + + + + +) + +export default HeatMapIcon diff --git a/website/src/components/icons/Icons.js b/website/src/components/icons/Icons.js new file mode 100644 index 000000000..1787d9d2a --- /dev/null +++ b/website/src/components/icons/Icons.js @@ -0,0 +1,39 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React from 'react' +import { Container } from './styled' +import BarIcon from './BarIcon' +import BulletIcon from './BulletIcon' +import CirclePackingIcon from './CirclePackingIcon' +import HeatMapIcon from './HeatMapIcon' +import LineIcon from './LineIcon' +import PieIcon from './PieIcon' +import RadarIcon from './RadarIcon' +import ScatterPlotIcon from './ScatterPlotIcon' +import StreamIcon from './StreamIcon' +import WaffleIcon from './WaffleIcon' +import ParallelCoordinatesIcon from './ParallelCoordinatesIcon' + +const Icons = () => ( + + + + + + + + + + + + + +) + +export default Icons diff --git a/website/src/components/icons/LineIcon.js b/website/src/components/icons/LineIcon.js new file mode 100644 index 000000000..a49d137c1 --- /dev/null +++ b/website/src/components/icons/LineIcon.js @@ -0,0 +1,117 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { Line } from '@nivo/line' +import lineGreyImg from '../../assets/icons/line-grey.png' +import lineRedImg from '../../assets/icons/line-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = { + margin: { + top: 24, + right: 5, + bottom: 12, + left: 5, + }, + yScale: { + type: 'linear', + min: 0, + max: 100, + }, + enableGridX: false, + enableGridY: false, + lineWidth: 5, + dotSize: 10, + data: [ + { + id: 'A', + data: [ + { x: 0, y: 60 }, + { x: 1, y: 34 }, + { x: 2, y: 56 }, + { x: 3, y: 28 }, + { x: 4, y: 40 }, + ], + }, + { + id: 'B', + data: [ + { x: 0, y: 16 }, + { x: 1, y: 74 }, + { x: 2, y: 26 }, + { x: 3, y: 88 }, + { x: 4, y: 100 }, + ], + }, + ], + isInteractive: false, + axisLeft: { + tickSize: 0, + tickPadding: 100, + }, + axisBottom: { + tickSize: 0, + tickPadding: 100, + }, +} + +const LineIcon = () => ( + + + + + + + + + + +) + +export default LineIcon diff --git a/website/src/components/icons/ParallelCoordinatesIcon.js b/website/src/components/icons/ParallelCoordinatesIcon.js new file mode 100644 index 000000000..a0ccc9696 --- /dev/null +++ b/website/src/components/icons/ParallelCoordinatesIcon.js @@ -0,0 +1,130 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { ParallelCoordinates } from '@nivo/parallel-coordinates' +import parallelCoordinatesGreyImg from '../../assets/icons/parallel-coordinates-grey.png' +import parallelCoordinatesRedImg from '../../assets/icons/parallel-coordinates-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = (lineColor, axisColor) => ({ + width: ICON_SIZE, + height: ICON_SIZE, + colors: [lineColor], + theme: { + axis: { + domain: { + line: { + stroke: axisColor, + strokeWidth: 8, + }, + }, + ticks: { + line: { + strokeWidth: 0, + }, + text: { + fill: 'transparent', + }, + }, + }, + }, + margin: { + top: 8, + right: 4, + bottom: 8, + left: 4, + }, + strokeWidth: 2, + lineOpacity: 1, + variables: [ + { + key: 'A', + type: 'linear', + min: 0, + max: 100, + }, + { + key: 'B', + type: 'linear', + min: 0, + max: 100, + }, + { + key: 'C', + type: 'linear', + min: 0, + max: 100, + }, + { + key: 'D', + type: 'linear', + min: 0, + max: 100, + }, + ], + data: [ + { + A: 8, + B: 8, + C: 36, + D: 36, + }, + { + A: 23, + B: 23, + C: 8, + D: 8, + }, + { + A: 28, + B: 28, + C: 52, + D: 52, + }, + { + A: 50, + B: 50, + C: 82, + D: 82, + }, + { + A: 92, + B: 92, + C: 46, + D: 46, + }, + ], + isInteractive: false, +}) + +const greyProps = chartProps('#b6b4b5', '#686868') +const redProps = chartProps('#ff7d67', '#e54127') + +const ParallelCoordinatesIcon = () => ( + + + + + + + + + + +) + +export default ParallelCoordinatesIcon diff --git a/website/src/components/icons/PieIcon.js b/website/src/components/icons/PieIcon.js new file mode 100644 index 000000000..8be525daf --- /dev/null +++ b/website/src/components/icons/PieIcon.js @@ -0,0 +1,65 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { Pie } from '@nivo/pie' +import pieGreyImg from '../../assets/icons/pie-grey.png' +import pieRedImg from '../../assets/icons/pie-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = { + data: [ + { id: '0', label: '0', value: 45 }, + { id: '1', label: '1', value: 90 }, + { id: '2', label: '2', value: 225 }, + ], + margin: { + top: 3, + right: 3, + bottom: 3, + left: 3, + }, + innerRadius: 0.6, + padAngle: 2.5, + enableRadialLabels: false, + enableSlicesLabels: false, + isInteractive: false, +} + +const PieIcon = () => ( + + + + + + + + + + +) + +export default PieIcon diff --git a/website/src/components/icons/RadarIcon.js b/website/src/components/icons/RadarIcon.js new file mode 100644 index 000000000..720739001 --- /dev/null +++ b/website/src/components/icons/RadarIcon.js @@ -0,0 +1,81 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { Radar } from '@nivo/radar' +import radarGreyImg from '../../assets/icons/radar-grey.png' +import radarRedImg from '../../assets/icons/radar-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = { + data: [ + { id: '0', A: 33, B: 52, C: 76 }, + { id: '1', A: 30, B: 42, C: 83 }, + { id: '2', A: 25, B: 38, C: 62 }, + { id: '3', A: 20, B: 50, C: 82 }, + { id: '4', A: 30, B: 50, C: 64 }, + ], + keys: ['C', 'B', 'A'], + indexBy: 'id', + maxValue: 100, + margin: { + top: 3, + right: 3, + bottom: -4, + left: 3, + }, + enableDots: false, + curve: 'linearClosed', + fillOpacity: 1, + gridLevels: 1, + gridShape: 'linear', + isInteractive: false, +} + +const RadarIcon = () => ( + + + + + + + + + + +) + +export default RadarIcon diff --git a/website/src/components/icons/ScatterPlotIcon.js b/website/src/components/icons/ScatterPlotIcon.js new file mode 100644 index 000000000..b220dff69 --- /dev/null +++ b/website/src/components/icons/ScatterPlotIcon.js @@ -0,0 +1,141 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { ScatterPlot } from '@nivo/scatterplot' +import scatterPlotGreyImg from '../../assets/icons/scatterplot-grey.png' +import scatterPlotRedImg from '../../assets/icons/scatterplot-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = { + margin: { + top: 24, + right: 5, + bottom: 12, + left: 5, + }, + xScale: { + type: 'linear', + min: 0, + max: 9, + }, + yScale: { + type: 'linear', + min: 0, + max: 100, + }, + enableGridX: false, + enableGridY: false, + lineWidth: 5, + dotSize: 10, + data: [ + { + id: 'A', + data: [ + { x: 1, y: 30 }, + { x: 2, y: 56 }, + { x: 3, y: 64 }, + { x: 4, y: 58 }, + { x: 5, y: 34 }, + { x: 6, y: 60 }, + { x: 7, y: 90 }, + { x: 8, y: 98 }, + ], + }, + { + id: 'B', + data: [ + { x: 1, y: 13 }, + { x: 2, y: 42 }, + { x: 3, y: 47 }, + { x: 4, y: 43 }, + { x: 5, y: 50 }, + { x: 6, y: 74 }, + { x: 7, y: 77 }, + { x: 8, y: 86 }, + ], + }, + { + id: 'C', + data: [ + { x: 2, y: 29 }, + { x: 3, y: 26 }, + { x: 4, y: 73 }, + { x: 5, y: 64 }, + { x: 6, y: 46 }, + { x: 7, y: 54 }, + { x: 8, y: 72 }, + ], + }, + ], + isInteractive: false, + axisLeft: { + tickSize: 0, + tickPadding: 100, + }, + axisBottom: { + tickSize: 0, + tickPadding: 100, + }, + symbolSize: 7, +} + +const ScatterPlotIcon = () => ( + + + + + + + + + + +) + +export default ScatterPlotIcon diff --git a/website/src/components/icons/StreamIcon.js b/website/src/components/icons/StreamIcon.js new file mode 100644 index 000000000..2950d6ade --- /dev/null +++ b/website/src/components/icons/StreamIcon.js @@ -0,0 +1,69 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { Stream } from '@nivo/stream' +import streamGreyImg from '../../assets/icons/stream-grey.png' +import streamRedImg from '../../assets/icons/stream-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = { + keys: ['A', 'B', 'C'], + margin: { + top: 12, + bottom: 16, + }, + enableGridX: false, + enableGridY: false, + axisBottom: null, + axisLeft: null, + offsetType: 'none', + data: [ + { A: 1, B: 2, C: 1.2 }, + { A: 2.4, B: 1.3, C: 1.2 }, + { A: 0.8, B: 0.6, C: 3 }, + { A: 1, B: 3, C: 3.6 }, + { A: 3.8, B: 1, C: 3 }, + { A: 5.8, B: 2.6, C: 1.6 }, + { A: 5, B: 1.8, C: 1.4 }, + ], + isInteractive: false, +} + +const StreamIcon = () => ( + + + + + + + + + + +) + +export default StreamIcon diff --git a/website/src/components/icons/WaffleIcon.js b/website/src/components/icons/WaffleIcon.js new file mode 100644 index 000000000..9661fd888 --- /dev/null +++ b/website/src/components/icons/WaffleIcon.js @@ -0,0 +1,59 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import React, { Fragment } from 'react' +import { Waffle } from '@nivo/waffle' +import waffleGreyImg from '../../assets/icons/waffle-grey.png' +import waffleRedImg from '../../assets/icons/waffle-red.png' +import { ICON_SIZE, Icon } from './styled' + +const chartProps = { + total: 12, + columns: 3, + rows: 4, + margin: { + top: 5, + bottom: 5, + }, + padding: 2, + data: [{ id: 'A', label: 'A', value: 8 }, { id: 'B', label: 'B', value: 4 }], + isInteractive: false, +} + +const WaffleIcon = () => ( + + + + + + + + + + +) + +export default WaffleIcon diff --git a/website/src/components/icons/styled.js b/website/src/components/icons/styled.js new file mode 100644 index 000000000..7cbf0cc1d --- /dev/null +++ b/website/src/components/icons/styled.js @@ -0,0 +1,27 @@ +/* + * This file is part of the nivo project. + * + * (c) 2016 Raphaël Benitte + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ +import styled from 'styled-components' + +export const ICON_SIZE = 104 + +export const Container = styled.div` + padding: 20px; + display: grid; + grid-template-columns: repeat(8, ${ICON_SIZE}px); + grid-column-gap: 16px; + grid-row-gap: 16px; + // background: black; +` + +export const Icon = styled.div` + width: ${ICON_SIZE}px; + height: ${ICON_SIZE}px; + background-repeat: no-repeat; + background-size: ${ICON_SIZE}px ${ICON_SIZE}px; +` diff --git a/website/src/index.js b/website/src/index.js index 6b0e837f4..b7d46da14 100644 --- a/website/src/index.js +++ b/website/src/index.js @@ -42,8 +42,11 @@ class App extends Component { const { location } = this.props const { nav } = this.state + const rootClass = + location !== undefined && location.search.indexOf('capture') !== -1 ? 'isCapturing' : '' + return ( -
+
diff --git a/website/src/styles/icons.css b/website/src/styles/icons.css index c8e560b26..b79d5d22d 100644 --- a/website/src/styles/icons.css +++ b/website/src/styles/icons.css @@ -1,4 +1,4 @@ -/* glue: 0.13 hash: 1810c58904 */ +/* glue: 0.13 hash: f11e667781 */ .sprite-icons-waffle-red, .sprite-icons-waffle-grey, .sprite-icons-voronoi-red, @@ -17,8 +17,6 @@ .sprite-icons-react-grey, .sprite-icons-radar-red, .sprite-icons-radar-grey, -.sprite-icons-placeholders-red, -.sprite-icons-placeholders-grey, .sprite-icons-pie-red, .sprite-icons-pie-grey, .sprite-icons-parallel-coordinates-red, @@ -38,6 +36,8 @@ .sprite-icons-colors-grey, .sprite-icons-code-red, .sprite-icons-code-grey, +.sprite-icons-circle-packing-red, +.sprite-icons-circle-packing-grey, .sprite-icons-chord-red, .sprite-icons-chord-grey, .sprite-icons-canvas-red, @@ -46,8 +46,6 @@ .sprite-icons-calendar-grey, .sprite-icons-bullet-red, .sprite-icons-bullet-grey, -.sprite-icons-bubble-red, -.sprite-icons-bubble-grey, .sprite-icons-bar-red, .sprite-icons-bar-grey, .sprite-icons-api-red, @@ -164,127 +162,127 @@ height: 52px; } -.sprite-icons-placeholders-red { +.sprite-icons-pie-red { background-position: -244px -124px; width: 52px; height: 52px; } -.sprite-icons-placeholders-grey { +.sprite-icons-pie-grey { background-position: -244px -184px; width: 52px; height: 52px; } -.sprite-icons-pie-red { +.sprite-icons-parallel-coordinates-red { background-position: -4px -244px; width: 52px; height: 52px; } -.sprite-icons-pie-grey { +.sprite-icons-parallel-coordinates-grey { background-position: -64px -244px; width: 52px; height: 52px; } -.sprite-icons-parallel-coordinates-red { +.sprite-icons-nivo-logo { background-position: -124px -244px; width: 52px; height: 52px; } -.sprite-icons-parallel-coordinates-grey { +.sprite-icons-nav-back-red { background-position: -184px -244px; width: 52px; height: 52px; } -.sprite-icons-nivo-logo { +.sprite-icons-nav-back-grey { background-position: -244px -244px; width: 52px; height: 52px; } -.sprite-icons-nav-back-red { +.sprite-icons-line-red { background-position: -304px -4px; width: 52px; height: 52px; } -.sprite-icons-nav-back-grey { +.sprite-icons-line-grey { background-position: -304px -64px; width: 52px; height: 52px; } -.sprite-icons-line-red { +.sprite-icons-html-red { background-position: -304px -124px; width: 52px; height: 52px; } -.sprite-icons-line-grey { +.sprite-icons-html-grey { background-position: -304px -184px; width: 52px; height: 52px; } -.sprite-icons-html-red { +.sprite-icons-heatmap-red { background-position: -304px -244px; width: 52px; height: 52px; } -.sprite-icons-html-grey { +.sprite-icons-heatmap-grey { background-position: -4px -304px; width: 52px; height: 52px; } -.sprite-icons-heatmap-red { +.sprite-icons-data-red { background-position: -64px -304px; width: 52px; height: 52px; } -.sprite-icons-heatmap-grey { +.sprite-icons-data-grey { background-position: -124px -304px; width: 52px; height: 52px; } -.sprite-icons-data-red { +.sprite-icons-colors-red { background-position: -184px -304px; width: 52px; height: 52px; } -.sprite-icons-data-grey { +.sprite-icons-colors-grey { background-position: -244px -304px; width: 52px; height: 52px; } -.sprite-icons-colors-red { +.sprite-icons-code-red { background-position: -304px -304px; width: 52px; height: 52px; } -.sprite-icons-colors-grey { +.sprite-icons-code-grey { background-position: -364px -4px; width: 52px; height: 52px; } -.sprite-icons-code-red { +.sprite-icons-circle-packing-red { background-position: -364px -64px; width: 52px; height: 52px; } -.sprite-icons-code-grey { +.sprite-icons-circle-packing-grey { background-position: -364px -124px; width: 52px; height: 52px; @@ -338,38 +336,26 @@ height: 52px; } -.sprite-icons-bubble-red { - background-position: -304px -364px; - width: 52px; - height: 52px; -} - -.sprite-icons-bubble-grey { - background-position: -364px -364px; - width: 52px; - height: 52px; -} - .sprite-icons-bar-red { - background-position: -424px -4px; + background-position: -304px -364px; width: 52px; height: 52px; } .sprite-icons-bar-grey { - background-position: -424px -64px; + background-position: -364px -364px; width: 52px; height: 52px; } .sprite-icons-api-red { - background-position: -424px -124px; + background-position: -424px -4px; width: 52px; height: 52px; } .sprite-icons-api-grey { - background-position: -424px -184px; + background-position: -424px -64px; width: 52px; height: 52px; } @@ -397,8 +383,6 @@ .sprite-icons-react-grey, .sprite-icons-radar-red, .sprite-icons-radar-grey, - .sprite-icons-placeholders-red, - .sprite-icons-placeholders-grey, .sprite-icons-pie-red, .sprite-icons-pie-grey, .sprite-icons-parallel-coordinates-red, @@ -418,6 +402,8 @@ .sprite-icons-colors-grey, .sprite-icons-code-red, .sprite-icons-code-grey, + .sprite-icons-circle-packing-red, + .sprite-icons-circle-packing-grey, .sprite-icons-chord-red, .sprite-icons-chord-grey, .sprite-icons-canvas-red, @@ -426,8 +412,6 @@ .sprite-icons-calendar-grey, .sprite-icons-bullet-red, .sprite-icons-bullet-grey, - .sprite-icons-bubble-red, - .sprite-icons-bubble-grey, .sprite-icons-bar-red, .sprite-icons-bar-grey, .sprite-icons-api-red, @@ -462,8 +446,6 @@ .sprite-icons-react-grey, .sprite-icons-radar-red, .sprite-icons-radar-grey, - .sprite-icons-placeholders-red, - .sprite-icons-placeholders-grey, .sprite-icons-pie-red, .sprite-icons-pie-grey, .sprite-icons-parallel-coordinates-red, @@ -483,6 +465,8 @@ .sprite-icons-colors-grey, .sprite-icons-code-red, .sprite-icons-code-grey, + .sprite-icons-circle-packing-red, + .sprite-icons-circle-packing-grey, .sprite-icons-chord-red, .sprite-icons-chord-grey, .sprite-icons-canvas-red, @@ -491,8 +475,6 @@ .sprite-icons-calendar-grey, .sprite-icons-bullet-red, .sprite-icons-bullet-grey, - .sprite-icons-bubble-red, - .sprite-icons-bubble-grey, .sprite-icons-bar-red, .sprite-icons-bar-grey, .sprite-icons-api-red, diff --git a/website/src/styles/index.css b/website/src/styles/index.css index 192086f60..05858f3a1 100644 --- a/website/src/styles/index.css +++ b/website/src/styles/index.css @@ -35,7 +35,6 @@ svg { html, body { margin: 0; - background: var(--main-background-color); color: var(--main-text-color); font-size: 16px; line-height: 1.6em; diff --git a/website/src/styles/layout.css b/website/src/styles/layout.css index 7aed9b4e2..1846c85e3 100644 --- a/website/src/styles/layout.css +++ b/website/src/styles/layout.css @@ -11,6 +11,11 @@ margin-top: var(--header-height); margin-left: var(--mini-nav-width); overflow-x: hidden; + background: var(--main-background-color); +} + +.isCapturing .content { + background: transparent; } .page_content { diff --git a/yarn.lock b/yarn.lock index 08f92d4c0..094e6605c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -898,6 +898,11 @@ dependencies: csstype "^2.2.0" +"@zeit/schemas@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@zeit/schemas/-/schemas-2.6.0.tgz#004e8e553b4cd53d538bd38eac7bcbf58a867fe3" + integrity sha512-uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg== + JSONStream@^1.0.4: version "1.3.1" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a" @@ -1020,6 +1025,15 @@ ajv-keywords@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be" +ajv@6.5.3, ajv@^6.0.1, ajv@^6.5.0: + version "6.5.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9" + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + ajv@^4.9.1: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -1036,15 +1050,6 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.0.1, ajv@^6.5.0: - version "6.5.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9" - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - ajv@^6.1.0: version "6.2.1" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.1.tgz#28a6abc493a2abe0fb4c8507acaedb43fa550671" @@ -1137,6 +1142,11 @@ aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" +arch@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e" + integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg== + are-we-there-yet@~1.1.2: version "1.1.4" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" @@ -1144,6 +1154,11 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" +arg@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/arg/-/arg-2.0.0.tgz#c06e7ff69ab05b3a4a03ebe0407fac4cba657545" + integrity sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w== + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -2523,7 +2538,7 @@ bowser@^1.7.3: version "1.9.3" resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.3.tgz#6643ae4d783f31683f6d23156976b74183862162" -boxen@^1.2.1: +boxen@1.3.0, boxen@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw== @@ -2863,6 +2878,14 @@ chalk@1.1.3, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@2.4.1, chalk@^2.3.2, chalk@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" @@ -2879,14 +2902,6 @@ chalk@^2.3.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^2.3.2, chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f" @@ -3032,6 +3047,14 @@ cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" +clipboardy@1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-1.2.3.tgz#0526361bf78724c1f20be248d428e365433c07ef" + integrity sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA== + dependencies: + arch "^2.1.0" + execa "^0.8.0" + cliui@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" @@ -3210,7 +3233,7 @@ compressible@~2.0.14: dependencies: mime-db ">= 1.36.0 < 2" -compression@^1.7.0: +compression@1.7.3, compression@^1.7.0: version "1.7.3" resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db" integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg== @@ -4572,6 +4595,19 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" + integrity sha1-2NdrvBtVIX7RkP1t1J08d07PyNo= + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + exenv@^1.2.0, exenv@^1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d" @@ -4808,6 +4844,13 @@ fast-memoize@^2.2.7: version "2.5.1" resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.1.tgz#c3519241e80552ce395e1a32dcdde8d1fd680f5d" +fast-url-parser@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" + integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= + dependencies: + punycode "^1.3.2" + fastparse@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8" @@ -7397,7 +7440,7 @@ mime-db@~1.35.0: version "1.35.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47" -mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7: +mime-types@2.1.18, mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7: version "2.1.18" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" dependencies: @@ -7441,7 +7484,7 @@ minimatch@3.0.3: dependencies: brace-expansion "^1.0.0" -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -8329,7 +8372,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" -path-is-inside@^1.0.1, path-is-inside@^1.0.2: +path-is-inside@1.0.2, path-is-inside@^1.0.1, path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" @@ -8345,6 +8388,11 @@ path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" +path-to-regexp@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" + integrity sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ== + path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" @@ -8904,7 +8952,7 @@ punycode@2.x.x: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -punycode@^1.2.4, punycode@^1.4.1: +punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" @@ -9010,7 +9058,7 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -range-parser@^1.0.3, range-parser@~1.2.0: +range-parser@1.2.0, range-parser@^1.0.3, range-parser@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" @@ -9569,7 +9617,7 @@ regexpu-core@^2.0.0: regjsgen "^0.2.0" regjsparser "^0.1.4" -registry-auth-token@^3.0.1: +registry-auth-token@3.3.2, registry-auth-token@^3.0.1: version "3.3.2" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ== @@ -9577,7 +9625,7 @@ registry-auth-token@^3.0.1: rc "^1.1.6" safe-buffer "^5.0.1" -registry-url@^3.0.3: +registry-url@3.1.0, registry-url@^3.0.3: version "3.1.0" resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI= @@ -10024,6 +10072,20 @@ serve-favicon@^2.4.5: parseurl "~1.3.2" safe-buffer "5.1.1" +serve-handler@5.0.7: + version "5.0.7" + resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-5.0.7.tgz#317877420925913e99e4dc228e67f6e5774e5387" + integrity sha512-PuLoJHAO2jj3p1fYWfXVHsEqNesx1+h+6qj0FIWrCe526ZtpDqeYuKA4knE5pjK9xoOVShoB+qGOP93EY46xEw== + dependencies: + bytes "3.0.0" + content-disposition "0.5.2" + fast-url-parser "1.1.3" + mime-types "2.1.18" + minimatch "3.0.4" + path-is-inside "1.0.2" + path-to-regexp "2.2.1" + range-parser "1.2.0" + serve-static@1.13.2: version "1.13.2" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1" @@ -10033,6 +10095,21 @@ serve-static@1.13.2: parseurl "~1.3.2" send "0.16.2" +serve@^10.1.1: + version "10.1.1" + resolved "https://registry.yarnpkg.com/serve/-/serve-10.1.1.tgz#29a0210fc6fc2d9bbd67e977a0e487deb0e86789" + integrity sha512-B1ca73zGFRS/bYQkbDw6BVEpRiUKdtnkwtvkMjx598jU5tyieua9lHyqdwUoup4/ek20I74EzncTC0gZuYng4Q== + dependencies: + "@zeit/schemas" "2.6.0" + ajv "6.5.3" + arg "2.0.0" + boxen "1.3.0" + chalk "2.4.1" + clipboardy "1.2.3" + compression "1.7.3" + serve-handler "5.0.7" + update-check "1.5.2" + set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -11045,6 +11122,14 @@ upath@^1.0.5: resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw== +update-check@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/update-check/-/update-check-1.5.2.tgz#2fe09f725c543440b3d7dabe8971f2d5caaedc28" + integrity sha512-1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ== + dependencies: + registry-auth-token "3.3.2" + registry-url "3.1.0" + update-notifier@^2.3.0: version "2.5.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"