@ -2,47 +2,72 @@ import React from 'react';
import { withRouter } from 'react-router-dom'
import Chart from 'chart.js'
import { eventName , navigateToQuery } from '../query'
import numberFormatter , { durationFormatter } from '../number-formatter'
import numberFormatter , { durationFormatter } from '../number-formatter'
import * as api from '../api'
import { ThemeContext } from '../theme-context'
import { ThemeContext } from '../theme-context'
function buildDataSet ( plot , present _index , ctx , label ) {
function buildDataSet ( plot , present _index , ctx , label , isPrevious ) {
var gradient = ctx . createLinearGradient ( 0 , 0 , 0 , 300 ) ;
var prev _gradient = ctx . createLinearGradient ( 0 , 0 , 0 , 300 ) ;
gradient . addColorStop ( 0 , 'rgba(101,116,205, 0.2)' ) ;
gradient . addColorStop ( 1 , 'rgba(101,116,205, 0)' ) ;
prev _gradient . addColorStop ( 0 , 'rgba(101,116,205, 0.075)' ) ;
prev _gradient . addColorStop ( 1 , 'rgba(101,116,205, 0)' ) ;
if ( ! isPrevious ) {
if ( present _index ) {
var dashedPart = plot . slice ( present _index - 1 ) ;
var dashedPlot = ( new Array ( plot . length - dashedPart . length ) ) . concat ( dashedPart )
const _plot = [ ... plot ]
for ( var i = present _index ; i < _plot . length ; i ++ ) {
_plot [ i ] = undefined
}
if ( present _index ) {
var dashedPart = plot . slice ( present _index - 1 ) ;
var dashedPlot = ( new Array ( plot . length - dashedPart . length ) ) . concat ( dashedPart )
for ( var i = present _index ; i < plot . length ; i ++ ) {
plot [ i ] = undefined
}
return [ {
return [ {
label : label ,
data : plot ,
data : _plot ,
borderWidth : 3 ,
borderColor : 'rgba(101,116,205)' ,
pointBackgroundColor : 'rgba(101,116,205)' ,
pointHoverBackgroundColor : 'rgba(71, 87, 193)' ,
pointBorderColor : 'transparent' ,
pointHoverRadius : 4 ,
backgroundColor : gradient ,
} ,
{
label : label ,
data : dashedPlot ,
borderWidth : 3 ,
borderDash : [ 5, 10 ] ,
borderDash : [ 3, 3 ] ,
borderColor : 'rgba(101,116,205)' ,
pointBackgroundColor : 'rgba(101,116,205)' ,
pointHoverBackgroundColor : 'rgba(71, 87, 193)' ,
pointBorderColor : 'transparent' ,
pointHoverRadius : 4 ,
backgroundColor : gradient ,
} ]
} ]
} else {
return [ {
label : label ,
data : plot ,
borderWidth : 3 ,
borderColor : 'rgba(101,116,205)' ,
pointHoverBackgroundColor : 'rgba(71, 87, 193)' ,
pointBorderColor : 'transparent' ,
pointHoverRadius : 4 ,
backgroundColor : gradient ,
} ]
}
} else {
return [ {
label : label ,
data : plot ,
borderWidth : 3 ,
borderColor : 'rgba(101,116,205)' ,
pointBackgroundColor : 'rgba(101,116,205)' ,
backgroundColor : gradient ,
borderWidth : 2 ,
// borderDash: [10, 1],
borderColor : 'rgba(166,187,210,0.5)' ,
pointHoverBackgroundColor : 'rgba(166,187,210,0.8)' ,
pointBorderColor : 'transparent' ,
pointHoverBorderColor : 'transparent' ,
pointHoverRadius : 4 ,
backgroundColor : prev _gradient ,
} ]
}
}
@ -63,7 +88,7 @@ const DAYS_ABBREV = [
]
function dateFormatter ( interval , longForm ) {
return function ( isoDate ) {
return function ( isoDate ) {
let date = new Date ( isoDate )
if ( interval === 'month' ) {
@ -75,7 +100,7 @@ function dateFormatter(interval, longForm) {
return day + ', ' + date _ + ' ' + month ;
} else if ( interval === 'hour' ) {
const parts = isoDate . split ( /[^0-9]/ ) ;
date = new Date ( parts [ 0 ] , parts [ 1 ] - 1 , parts [ 2 ] , parts [ 3 ] , parts [ 4 ] , parts [ 5 ] )
date = new Date ( parts [ 0 ] , parts [ 1 ] - 1 , parts [ 2 ] , parts [ 3 ] , parts [ 4 ] , parts [ 5 ] )
var hours = date . getHours ( ) ; // Not sure why getUTCHours doesn't work here
var ampm = hours >= 12 ? 'pm' : 'am' ;
hours = hours % 12 ;
@ -99,61 +124,147 @@ class LineGraph extends React.Component {
}
regenerateChart ( ) {
const { graphData } = this . props
const { graphData } = this . props
this . ctx = document . getElementById ( "main-graph-canvas" ) . getContext ( '2d' ) ;
const label = this . props . query . filters . goal ? 'Converted visitors' : graphData . interval === 'minute' ? 'Pageviews' : 'Visitors'
const dataSet = buildDataSet ( graphData . plot , graphData . present _index , this . ctx , label )
const prev _dataSet = buildDataSet ( graphData . prev _plot , false , this . ctx , label , true )
return new Chart ( this . ctx , {
type : 'line' ,
data : {
labels : graphData . labels ,
datasets : dataSet
datasets : [ ... dataSet , ... prev _dataSet ]
} ,
options : {
animation : false ,
legend : { display : false } ,
legend : { display : false } ,
responsive : true ,
elements : { line : { tension : 0 } , point : { radius : 0 } } ,
elements : { line : { tension : 0.1 } , point : { radius : 0 } } ,
onClick : this . onClick . bind ( this ) ,
hover : {
mode : 'index' ,
intersect : false
} ,
tooltips : {
enabled : false ,
mode : 'index' ,
position : 'average' ,
intersect : false ,
xPadding : 10 ,
yPadding : 10 ,
titleFontSize : 18 ,
footerFontSize : 14 ,
bodyFontSize : 14 ,
backgroundColor : 'rgba(25, 30, 56)' ,
titleMarginBottom : 8 ,
bodySpacing : 6 ,
footerMarginTop : 8 ,
xPadding : 16 ,
yPadding : 12 ,
multiKeyBackground : 'none' ,
callbacks : {
title : function ( dataPoints ) {
const data = dataPoints [ 0 ]
return dateFormatter ( graphData . interval , true ) ( data . xLabel )
} ,
beforeBody : function ( ) {
this . drawnLabels = { }
} ,
label : function ( item ) {
const dataset = this . _data . datasets [ item . datasetIndex ]
if ( ! this . drawnLabels [ dataset . label ] ) {
this . drawnLabels [ dataset . label ] = true
const pluralizedLabel = item . yLabel === 1 ? dataset . label . slice ( 0 , - 1 ) : dataset . label
return ` ${ item . yLabel } ${ pluralizedLabel } `
custom : function ( tooltipModel ) {
// Canvas Offset from 0,0
const offset = this . _chart . canvas . getBoundingClientRect ( ) ;
// Tooltip Element
let tooltipEl = document . getElementById ( 'chartjs-tooltip' ) ;
// Create element on first render
if ( ! tooltipEl ) {
tooltipEl = document . createElement ( 'div' ) ;
tooltipEl . id = 'chartjs-tooltip' ;
document . body . appendChild ( tooltipEl ) ;
}
if ( tooltipEl && offset && window . innerWidth < 768 ) {
tooltipEl . style . top = offset . y + offset . height + window . pageYOffset + 'px'
tooltipEl . style . left = offset . x + window . pageXOffset + 'px'
}
// Stop if no tooltip showing
if ( tooltipModel . opacity === 0 ) {
tooltipEl . style . opacity = 0 ;
return ;
}
function getBody ( bodyItem ) {
return bodyItem . lines ;
}
// Set Tooltip Body
if ( tooltipModel . body ) {
var bodyLines = tooltipModel . body . map ( getBody ) ;
// Remove duplicated line on overlap between dashed and normal
if ( bodyLines . length == 3 ) {
bodyLines [ 1 ] = false
}
} ,
footer : function ( dataPoints ) {
if ( graphData . interval === 'month' ) {
return 'Click to view month'
} else if ( graphData . interval === 'date' ) {
return 'Click to view day'
// Don't render if we only have one dataset available (this means the point is in the future)
if ( bodyLines . length == 1 ) {
tooltipEl . style . opacity = 0 ;
return ;
}
const data = tooltipModel . dataPoints [ 0 ]
const prev _data = tooltipModel . dataPoints . slice ( - 1 ) [ 0 ]
const label = graphData . labels [ data . index ]
const prev _label = graphData . prev _labels [ prev _data . index ]
const point = data . yLabel || 0
const prev _point = prev _data . yLabel || 0
const pct _change = point === prev _point ? 0 : prev _point === 0 ? 100 : parseFloat ( ( ( point - prev _point ) / prev _point * 100 ) . toFixed ( 1 ) )
function renderLabel ( isPrevious ) {
const formattedLabel = dateFormatter ( graphData . interval , true ) ( label )
const prev _formattedLabel = dateFormatter ( graphData . interval , true ) ( prev _label )
if ( graphData . interval === 'month' ) {
return ! isPrevious ? ` ${ formattedLabel } ${ ( new Date ( label ) ) . getUTCFullYear ( ) } ` : ` ${ prev _formattedLabel } ${ ( new Date ( prev _label ) ) . getUTCFullYear ( ) } `
}
if ( graphData . interval === 'date' ) {
return ! isPrevious ? formattedLabel : prev _formattedLabel
}
if ( graphData . interval === 'hour' ) {
return ! isPrevious ? ` ${ dateFormatter ( "date" , true ) ( label ) } , ${ formattedLabel } ` : ` ${ dateFormatter ( "date" , true ) ( prev _label ) } , ${ dateFormatter ( graphData . interval , true ) ( prev _label ) } `
}
return ! isPrevious ? formattedLabel : prev _formattedLabel
}
function renderComparison ( change ) {
const formattedComparison = numberFormatter ( Math . abs ( change ) )
if ( change > 0 ) {
return ` <span class='text-green-500 font-bold'> ${ formattedComparison } %</span> `
}
if ( change < 0 ) {
return ` <span class='text-red-400 font-bold'> ${ formattedComparison } %</span> `
}
if ( change === 0 ) {
return ` <span class='font-bold'>0%</span> `
}
}
let innerHtml = `
< div class = 'text-gray-100 flex flex-col' >
< div class = 'flex justify-between items-center' >
< span class = 'font-bold mr-4 text-lg' > $ { bodyLines [ 0 ] [ 0 ] . split ( ':' ) [ 0 ] } < / s p a n >
$ { graphData . interval === 'minute' ? '' : renderComparison ( pct _change ) }
< / d i v >
< div class = 'flex flex-col' >
< div class = 'flex flex-row justify-between items-center' >
< span class = 'flex items-center mr-4' >
< div class = 'w-3 h-3 mr-1 rounded-full' style = 'background-color: rgba(101,116,205)' > < / d i v >
< span > $ { renderLabel ( ) } < / s p a n >
< / s p a n >
< span > $ { numberFormatter ( point ) } < / s p a n >
< / d i v >
$ { graphData . interval === 'minute' ? '' : `
< div class = 'flex flex-row justify-between items-center mt-1' >
< span class = 'flex items-center mr-4' >
< div class = 'w-3 h-3 mr-1 rounded-full' style = 'background-color: rgba(166,187,210,0.5)' > < / d i v >
< span > $ { renderLabel ( true ) } < / s p a n >
< / s p a n >
< span > $ { numberFormatter ( prev _point ) } < / s p a n >
< / d i v >
` }
< / d i v >
< span class = 'font-bold text-' > $ { graphData . interval === 'month' ? 'Click to view month' : graphData . interval === 'date' ? 'Click to view day' : '' } < / s p a n >
< / d i v >
` ;
tooltipEl . innerHTML = innerHtml ;
}
tooltipEl . style . opacity = 1 ;
}
} ,
scales : {
@ -186,20 +297,25 @@ class LineGraph extends React.Component {
} ) ;
}
repositionTooltip ( e ) {
const tooltipEl = document . getElementById ( 'chartjs-tooltip' ) ;
if ( tooltipEl && window . innerWidth >= 768 ) {
tooltipEl . style . top = e . clientY + window . pageYOffset + 'px'
tooltipEl . style . left = e . clientX + window . pageXOffset + 'px'
}
}
componentDidMount ( ) {
this . chart = this . regenerateChart ( ) ;
// Having the tooltip follow the mouse is much more intuitive
window . addEventListener ( 'mousemove' , this . repositionTooltip ) ;
}
componentDidUpdate ( prevProps ) {
if ( this . props . graphData !== prevProps . graphData ) {
const label = this . props . query . filters . goal ? 'Converted visitors' : this . props . graphData . interval === 'minute' ? 'Pageviews' : 'Visitors'
const newDataset = buildDataSet ( this . props . graphData . plot , this . props . graphData . present _index , this . ctx , label )
for ( let i = 0 ; i < newDataset [ 0 ] . data . length ; i ++ ) {
this . chart . data . datasets [ 0 ] . data [ i ] = newDataset [ 0 ] . data [ i ]
}
this . chart . update ( )
if ( JSON . stringify ( this . props . graphData ) !== JSON . stringify ( prevProps . graphData ) ) {
this . chart = this . regenerateChart ( ) ;
this . chart . update ( ) ;
}
if ( prevProps . darkTheme !== this . props . darkTheme ) {
@ -208,8 +324,17 @@ class LineGraph extends React.Component {
}
}
componentWillUnmount ( ) {
// Ensure that the tooltip doesn't hang around when we are loading more data
const tooltip = document . getElementById ( 'chartjs-tooltip' ) ;
if ( tooltip ) {
tooltip . style . opacity = 0 ;
}
window . removeEventListener ( 'mousemove' , this . repositionTooltip )
}
onClick ( e ) {
const element = this . chart . getElementsAtEventForMode ( e , 'index' , { intersect : false } ) [ 0 ]
const element = this . chart . getElementsAtEventForMode ( e , 'index' , { intersect : false } ) [ 0 ]
const date = element . _chart . config . data . labels [ element . _index ]
if ( this . props . graphData . interval === 'month' ) {
navigateToQuery (
@ -237,19 +362,21 @@ class LineGraph extends React.Component {
if ( comparison > 0 ) {
const color = name === 'Bounce rate' ? 'text-red-400' : 'text-green-500'
return < span className = "text-xs dark:text-gray-100" > < span className = { color + ' font-bold' } > & uarr ; < / s p a n > { f o r m a t t e d C o m p a r i s o n } % < / s p a n >
} else if ( comparison < 0 ) {
return < span className = 'text-sm flex dark:text-gray-300' > < div className = { color + ' transform -rotate-90' } > & # 10132 ; < / d i v > { f o r m a t t e d C o m p a r i s o n } % < / s p a n >
}
if ( comparison < 0 ) {
const color = name === 'Bounce rate' ? 'text-green-500' : 'text-red-400'
return < span className = "text-xs dark:text-gray-100" > < span className = { color + ' font-bold' } > & darr ; < / s p a n > { f o r m a t t e d C o m p a r i s o n } % < / s p a n >
} else if ( comparison === 0 ) {
return < span className = "text-xs text-gray-700 dark:text-gray-300" > & # 12336 ; N / A < / s p a n >
return < span className = 'text-sm flex dark:text-gray-300' > < div className = { color + ' transform rotate-90' } > & # 10132 ; < / d i v > { f o r m a t t e d C o m p a r i s o n } % < / s p a n >
}
if ( comparison === 0 ) {
return < span className = 'text-sm text-gray-700 dark:text-gray-300' > & # 12336 ; 0 % < / s p a n >
}
}
renderTopStatNumber ( stat ) {
if ( stat . name === 'Visit duration' ) {
return durationFormatter ( stat . count )
} else if ( typeof ( stat . count ) == 'number' ) {
} else if ( typeof ( stat . count ) == 'number' ) {
return numberFormatter ( stat . count )
} else {
return stat . percentage + '%'
@ -257,7 +384,7 @@ class LineGraph extends React.Component {
}
renderTopStats ( ) {
const { graphData } = this . props
const { graphData } = this . props
const stats = this . props . graphData . top _stats . map ( ( stat , index ) => {
let border = index > 0 ? 'lg:border-l border-gray-300' : ''
border = index % 2 === 0 ? border + ' border-r lg:border-r-0' : border
@ -266,7 +393,7 @@ class LineGraph extends React.Component {
< div className = { ` px-8 w-1/2 my-4 lg:w-auto ${ border } ` } key = { stat . name } >
< div className = "text-gray-500 dark:text-gray-400 text-xs font-bold tracking-wide uppercase" > { stat . name } < / d i v >
< div className = "my-1 flex justify-between items-center" >
< b className = "text-2xl mr-4 dark:text-gray-100" > { this . renderTopStatNumber ( stat ) } < / b >
< b className = "text-2xl mr-4 dark:text-gray-100" > { this . renderTopStatNumber ( stat ) } < / b >
{ this . renderComparison ( stat . name , stat . change ) }
< / d i v >
< / d i v >
@ -274,7 +401,7 @@ class LineGraph extends React.Component {
} )
if ( graphData . interval === 'minute' ) {
stats . push ( < div key = "dot" className = "block pulsating-circle" style = { { left : '125px' , top : '52px' } } > < / d i v > )
stats . push ( < div key = "dot" className = "block pulsating-circle" style = { { left : '125px' , top : '52px' } } > < / d i v > )
}
return stats
@ -285,7 +412,7 @@ class LineGraph extends React.Component {
return (
< a href = { endpoint } download >
< svg className = "feather w-4 h-5 absolute text-gray-700 dark:text-gray-300 " style = { { right : '2rem' , top : '-2rem' } } xmlns = "http://www.w3.org/2000/svg" viewBox = "0 0 24 24" fill = "none" stroke = "currentColor" strokeWidth = "2" strokeLinecap = "round" strokeLinejoin = "round" > < path d = "M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" > < / p a t h > < p o l y l i n e p o i n t s = " 7 1 0 1 2 1 5 1 7 1 0 " > < / p o l y l i n e > < l i n e x 1 = " 1 2 " y 1 = " 1 5 " x 2 = " 1 2 " y 2 = " 3 " > < / l i n e > < / s v g >
< svg className = "feather w-4 h-5 absolute text-gray-700 dark:text-gray-300 cursor-pointer " style = { { right : '2rem' , top : '-2rem' } } xmlns = "http://www.w3.org/2000/svg" viewBox = "0 0 24 24" fill = "none" stroke = "currentColor" strokeWidth = "2" strokeLinecap = "round" strokeLinejoin = "round" > < path d = "M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" > < / p a t h > < p o l y l i n e p o i n t s = " 7 1 0 1 2 1 5 1 7 1 0 " > < / p o l y l i n e > < l i n e x 1 = " 1 2 " y 1 = " 1 5 " x 2 = " 1 2 " y 2 = " 3 " > < / l i n e > < / s v g >
< / a >
)
}
@ -296,10 +423,10 @@ class LineGraph extends React.Component {
return (
< React . Fragment >
< div className = "flex flex-wrap" >
{ this . renderTopStats ( ) }
{ this . renderTopStats ( ) }
< / d i v >
< div className = "px-2 relative" >
{ this . downloadLink ( ) }
{ this . downloadLink ( ) }
< canvas id = "main-graph-canvas" className = { 'mt-4 ' + extraClass } width = "1054" height = "342" > < / c a n v a s >
< / d i v >
< / R e a c t . F r a g m e n t >
@ -312,7 +439,7 @@ LineGraph = withRouter(LineGraph)
export default class VisitorGraph extends React . Component {
constructor ( props ) {
super ( props )
this . state = { loading : true }
this . state = { loading : true }
}
componentDidMount ( ) {
@ -322,7 +449,7 @@ export default class VisitorGraph extends React.Component {
componentDidUpdate ( prevProps ) {
if ( this . props . query !== prevProps . query ) {
this . setState ( { loading : true , graphData : null } )
this . setState ( { loading : true , graphData : null } )
this . fetchGraphData ( )
}
}
@ -330,7 +457,7 @@ export default class VisitorGraph extends React.Component {
fetchGraphData ( ) {
api . get ( ` /api/stats/ ${ encodeURIComponent ( this . props . site . domain ) } /main-graph ` , this . props . query )
. then ( ( res ) => {
this . setState ( { loading : false , graphData : res } )
this . setState ( { loading : false , graphData : res } )
return res
} )
}
@ -340,7 +467,7 @@ export default class VisitorGraph extends React.Component {
return (
< ThemeContext . Consumer >
{ theme => (
< LineGraph graphData = { this . state . graphData } site = { this . props . site } query = { this . props . query } darkTheme = { theme } / >
< LineGraph graphData = { this . state . graphData } site = { this . props . site } query = { this . props . query } darkTheme = { theme } / >
) }
< / T h e m e C o n t e x t . C o n s u m e r >
)
@ -350,8 +477,8 @@ export default class VisitorGraph extends React.Component {
render ( ) {
return (
< div className = "w-full relative bg-white dark:bg-gray-825 shadow-xl rounded mt-6 main-graph" >
{ this . state . loading && < div className = "loading pt-24 sm:pt-32 md:pt-48 mx-auto" > < div > < / d i v > < / d i v > }
{ this . renderInner ( ) }
{ this . state . loading && < div className = "loading pt-24 sm:pt-32 md:pt-48 mx-auto" > < div > < / d i v > < / d i v > }
{ this . renderInner ( ) }
< / d i v >
)
}