Skip to content

Commit

Permalink
feat(website): add TimeRange icon
Browse files Browse the repository at this point in the history
  • Loading branch information
wyze committed Jun 10, 2021
1 parent fec51a1 commit 9c69a5f
Show file tree
Hide file tree
Showing 12 changed files with 860 additions and 742 deletions.
25 changes: 19 additions & 6 deletions conf/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ capture:
# selector: '#chart'
# output: ./packages/funnel/doc/funnel.png

- path: /marimekko
selector: '#chart'
output: ./packages/marimekko/doc/marimekko.png
# - path: /marimekko
# selector: '#chart'
# output: ./packages/marimekko/doc/marimekko.png

#########################################################################
#
Expand Down Expand Up @@ -204,7 +204,7 @@ capture:
# - path: /internal/icons/
# selector: '#bar-darkColored'
# output: ./website/src/assets/icons/bar-dark-colored.png

# - path: /internal/icons/
# selector: '#bullet-lightNeutral'
# output: ./website/src/assets/icons/bullet-light-neutral.png
Expand Down Expand Up @@ -256,7 +256,7 @@ capture:
# - path: /internal/icons/
# selector: '#choropleth-darkColored'
# output: ./website/src/assets/icons/choropleth-dark-colored.png

# - path: /internal/icons/
# selector: '#heatmap-lightNeutral'
# output: ./website/src/assets/icons/heatmap-light-neutral.png
Expand Down Expand Up @@ -515,4 +515,17 @@ capture:
# output: ./website/src/assets/icons/marimekko-dark-neutral.png
# - path: /internal/icons/
# selector: '#marimekko-darkColored'
# output: ./website/src/assets/icons/marimekko-dark-colored.png
# output: ./website/src/assets/icons/marimekko-dark-colored.png

- path: /internal/icons/
selector: '#time-range-lightNeutral'
output: ./website/src/assets/icons/time-range-light-neutral.png
- path: /internal/icons/
selector: '#time-range-lightColored'
output: ./website/src/assets/icons/time-range-light-colored.png
- path: /internal/icons/
selector: '#time-range-darkNeutral'
output: ./website/src/assets/icons/time-range-dark-neutral.png
- path: /internal/icons/
selector: '#time-range-darkColored'
output: ./website/src/assets/icons/time-range-dark-colored.png
Binary file modified website/src/assets/icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/src/assets/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions website/src/components/icons/Icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import ScatterPlotIcon from './ScatterPlotIcon'
import StreamIcon from './StreamIcon'
import SunburstIcon from './SunburstIcon'
import SwarmPlotIcon from './SwarmPlotIcon'
import TimeRangeIcon from './TimeRangeIcon'
import TreeMapIcon from './TreeMapIcon'
import WaffleIcon from './WaffleIcon'
import ParallelCoordinatesIcon from './ParallelCoordinatesIcon'
Expand Down Expand Up @@ -84,6 +85,7 @@ const Icons = () => (
<StreamIcon />
<SunburstIcon />
<SwarmPlotIcon />
<TimeRangeIcon />
<TreeMapIcon />
<VoronoiIcon />
<WaffleIcon />
Expand Down
75 changes: 75 additions & 0 deletions website/src/components/icons/TimeRangeIcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
* 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 { TimeRange } from '@nivo/calendar'
import timeRangeLightNeutralImg from '../../assets/icons/time-range-light-neutral.png'
import timeRangeLightColoredImg from '../../assets/icons/time-range-light-colored.png'
import timeRangeDarkNeutralImg from '../../assets/icons/time-range-dark-neutral.png'
import timeRangeDarkColoredImg from '../../assets/icons/time-range-dark-colored.png'
import { ICON_SIZE, Icon, colors, IconImg } from './styled'

const pad = value => `0${value}`.slice(-2)
const data = Array(21)
.fill('')
.map((_, index) => ({
day: `2021-06-${pad(index + 2)}`,
value: Math.round(Math.random() * 400),
}))

const chartProps = {
width: ICON_SIZE,
height: ICON_SIZE,
data,
margin: {
top: 6,
right: 14,
bottom: 6,
left: 14,
},
dayRadius: 3,
daySpacing: 2,
square: false,
weekdayLegendOffset: 0,
}

const TimeRangeIconItem = ({ type }) => {
const currentColors = colors[type].colors

return (
<Icon id={`time-range-${type}`} type={type}>
<TimeRange
{...chartProps}
colors={[currentColors[4], currentColors[2], currentColors[1]]}
dayBorderColor="none"
theme={{
labels: {
text: {
fill: 'none',
},
},
}}
/>
</Icon>
)
}

const TimeRangeIcon = () => (
<>
<TimeRangeIconItem type="lightNeutral" />
<IconImg url={timeRangeLightNeutralImg} />
<TimeRangeIconItem type="lightColored" />
<IconImg url={timeRangeLightColoredImg} />
<TimeRangeIconItem type="darkNeutral" />
<IconImg url={timeRangeDarkNeutralImg} />
<TimeRangeIconItem type="darkColored" />
<IconImg url={timeRangeDarkColoredImg} />
</>
)

export default TimeRangeIcon
2 changes: 1 addition & 1 deletion website/src/data/nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export const components = [
{
label: 'TimeRange',
path: '/time-range/',
icon: 'calendar',
icon: 'time-range',
tags: timeRange.TimeRange.tags,
},
{
Expand Down
3 changes: 1 addition & 2 deletions website/src/pages/time-range/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,11 @@ const initialProperties = {
}

const TimeRange = () => {
console.log('m', mapper)
return (
<ComponentTemplate
name="TimeRange"
meta={meta.TimeRange}
icon="calendar"
icon="time-range"
flavors={meta.flavors}
currentFlavor="svg"
properties={groups}
Expand Down
Loading

0 comments on commit 9c69a5f

Please sign in to comment.