WIP: New UI updates (#19)

* WIP: New UI idea

* Remove hover styling if things are not clickable

* Improve mobile view

* Remove dead code

* Fade in tabs

* Update landing page with new style

* Fix countries test

* Fix alignment in conversions report
pull/32/head
Uku Taht 7 years ago committed by GitHub
parent 10f7beb1e0
commit 8a4d0a91d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -81,7 +81,7 @@ blockquote {
@screen xl {
.main-graph {
height: 480px;
height: 460px;
}
}
@ -97,29 +97,6 @@ a {
transition: all .1s ease-in;
}
.truncated-label {
@apply no-underline text-grey-darkest;
white-space: nowrap;
width: calc(100% - 40px);
overflow: hidden;
text-overflow: ellipsis;
text-align: left;
}
.bar {
height: 4px;
width: 100%;
background-color: #f5f6f7;
border-radius: 4px;
margin-top: 8px;
margin-bottom: 24px;
}
.bar__fill {
height: 100%;
border-radius: 4px;
}
.pulsating-circle {
position: absolute;
left: 50%;
@ -248,3 +225,33 @@ a {
.tweet-text a:hover {
text-decoration: underline;
}
.stats-item {
@apply mt-6;
width: 100%;
}
@screen md {
.stats-item {
margin-left: 6px;
margin-right: 6px;
width: calc(50% - 6px);
position: relative;
}
}
.stats-item:first-child {
margin-left: 0;
}
.stats-item:last-child {
margin-right: 0;
}
.fade-enter {
opacity: 0;
}
.fade-enter-active {
opacity: 1;
transition: opacity 200ms ease-in;
}

@ -8,9 +8,7 @@ import VisitorGraph from './stats/visitor-graph'
import Referrers from './stats/referrers'
import Pages from './stats/pages'
import Countries from './stats/countries'
import Browsers from './stats/browsers'
import OperatingSystems from './stats/operating-systems'
import ScreenSizes from './stats/screen-sizes'
import Devices from './stats/devices'
import Conversions from './stats/conversions'
import {parseQuery} from './query'
@ -36,6 +34,14 @@ class Stats extends React.Component {
}
}
forgotten() {
return (
<div>
<OperatingSystems site={this.props.site} query={this.state.query} />
</div>
)
}
render() {
return (
<div className="mb-12">
@ -48,17 +54,14 @@ class Stats extends React.Component {
</div>
<Filters query={this.state.query} history={this.props.history} />
<VisitorGraph site={this.props.site} query={this.state.query} />
<div className="w-full block md:flex items-start justify-between mt-6">
<div className="w-full block md:flex items-start justify-between">
<Referrers site={this.props.site} query={this.state.query} />
<Pages site={this.props.site} query={this.state.query} />
<Countries site={this.props.site} query={this.state.query} />
</div>
<div className="w-full block md:flex items-start justify-between mt-6">
<Browsers site={this.props.site} query={this.state.query} />
<OperatingSystems site={this.props.site} query={this.state.query} />
<ScreenSizes site={this.props.site} query={this.state.query} />
<div className="w-full block md:flex items-start justify-between">
<Countries site={this.props.site} query={this.state.query} />
<Devices site={this.props.site} query={this.state.query} />
</div>
{ this.renderConversions() }
</div>
)

@ -6,8 +6,6 @@ import ReferrersDrilldownModal from './stats/modals/referrer-drilldown'
import GoogleKeywordsModal from './stats/modals/google-keywords'
import PagesModal from './stats/modals/pages'
import CountriesModal from './stats/modals/countries'
import BrowsersModal from './stats/modals/browsers'
import OperatingSystemsModal from './stats/modals/operating-systems'
import {BrowserRouter, Switch, Route, useLocation} from "react-router-dom";
@ -45,12 +43,6 @@ export default function Router({site}) {
<Route path="/:domain/countries">
<CountriesModal site={site} />
</Route>
<Route path="/:domain/browsers">
<BrowsersModal site={site} />
</Route>
<Route path="/:domain/operating-systems">
<OperatingSystemsModal site={site} />
</Route>
</Switch>
</Route>
</BrowserRouter>

@ -15,8 +15,7 @@ export default function Bar({count, all, color}) {
const width = barWidth(count, all)
return (
<div className="bar">
<div className={`bar__fill bg-${color}`} style={{width: width + '%'}}></div>
<div className={`bg-${color}-lightest`} style={{width: width + '%', height: '30px'}}>
</div>
)
}

@ -1,64 +0,0 @@
import React from 'react';
import Bar from './bar'
import MoreLink from './more-link'
import * as api from '../api'
export default class Browsers extends React.Component {
constructor(props) {
super(props)
this.state = {loading: true}
}
componentDidMount() {
this.fetchBrowsers()
}
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
this.setState({loading: true, browsers: null})
this.fetchBrowsers()
}
}
fetchBrowsers() {
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/browsers`, this.props.query)
.then((res) => this.setState({loading: false, browsers: res}))
}
renderBrowser(browser) {
return (
<React.Fragment key={browser.name}>
<div className="flex items-center justify-between my-2">
<span className="truncate" style={{maxWidth: '80%'}}>{browser.name}</span>
<span tooltip={`${browser.count} visitors`}>{browser.percentage}%</span>
</div>
<Bar count={browser.count} all={this.state.browsers} color="red" />
</React.Fragment>
)
}
render() {
if (this.state.loading) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="loading my-32 mx-auto"><div></div></div>
</div>
)
} else if (this.state.browsers) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="text-center">
<h2>Browsers</h2>
<div className="text-grey-darker mt-1">by visitors</div>
</div>
<div className="mt-8">
{ this.state.browsers.map(this.renderBrowser.bind(this)) }
</div>
<MoreLink site={this.props.site} endpoint="browsers" />
</div>
)
}
}
}

@ -33,34 +33,33 @@ export default class Conversions extends React.Component {
query.set('goal', goal.name)
return (
<React.Fragment key={goal.name}>
<div className="flex items-center justify-between my-2">
<Link to={{search: query.toString(), state: {scrollTop: true}}} className="truncate hover:underline" style={{maxWidth: '80%'}}>{ goal.name }</Link>
<span>{numberFormatter(goal.count)}</span>
<div className="flex items-center justify-between my-2 text-sm" key={goal.name}>
<div className="w-full h-8" style={{maxWidth: 'calc(100% - 6rem)'}}>
<Bar count={goal.count} all={this.state.goals} color="red" />
<Link to={{search: query.toString(), state: {scrollTop: true}}} style={{marginTop: '-23px'}} className="hover:underline block px-2">{ goal.name }</Link>
</div>
<Bar count={goal.count} all={this.state.goals} color="indigo" />
</React.Fragment>
<span className="font-medium">{numberFormatter(goal.count)}</span>
</div>
)
}
render() {
if (this.state.loading) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4">
<div className="w-full bg-white shadow-xl rounded p-4">
<div className="loading my-32 mx-auto"><div></div></div>
</div>
)
} else if (this.state.goals) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4">
<div className="text-center">
<h2>Goal Conversions</h2>
<div className="text-grey-darker mt-1">by visitors</div>
<div className="w-full bg-white shadow-xl rounded p-4">
<h3>Goal Conversions</h3>
<div className="flex items-center mt-6 mb-3 justify-between text-grey-dark text-xs font-bold tracking-wide">
<span>Goal</span>
<span>Conversions</span>
</div>
<div className="mt-8">
{ this.state.goals.map(this.renderGoal.bind(this)) }
</div>
{ this.state.goals.map(this.renderGoal.bind(this)) }
</div>
)
}

@ -1,4 +1,5 @@
import React from 'react';
import Datamap from 'datamaps'
import Bar from './bar'
import MoreLink from './more-link'
@ -7,6 +8,7 @@ import * as api from '../api'
export default class Countries extends React.Component {
constructor(props) {
super(props)
this.resizeMap = this.resizeMap.bind(this)
this.state = {
loading: true
}
@ -14,6 +16,11 @@ export default class Countries extends React.Component {
componentDidMount() {
this.fetchCountries()
window.addEventListener('resize', this.resizeMap);
}
componentWillUnmount() {
window.removeEventListener('resize', this.resizeMap);
}
componentDidUpdate(prevProps) {
@ -26,39 +33,65 @@ export default class Countries extends React.Component {
fetchCountries() {
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/countries`, this.props.query)
.then((res) => this.setState({loading: false, countries: res}))
.then(() => this.drawMap())
}
renderCountry(country) {
return (
<React.Fragment key={country.name}>
<div className="flex items-center justify-between my-2">
<span className="truncate" style={{maxWidth: '80%'}}>{country.name}</span>
<span tooltip={`${country.count} visitors`}>{country.percentage}%</span>
</div>
<Bar count={country.count} all={this.state.countries} color="indigo" />
</React.Fragment>
)
resizeMap() {
this.map && this.map.resize()
}
drawMap() {
var dataset = {};
var onlyValues = this.state.countries.map(function(obj){ return obj.count });
var minValue = Math.min.apply(null, onlyValues),
maxValue = Math.max.apply(null, onlyValues);
var paletteScale = d3.scale.linear()
.domain([minValue,maxValue])
.range(["#f3ebff","#a779e9"]);
this.state.countries.forEach(function(item){
dataset[item.name] = {numberOfThings: item.count, fillColor: paletteScale(item.count)};
});
this.map = new Datamap({
element: document.getElementById('map-container'),
responsive: true,
projection: 'mercator',
fills: { defaultFill: '#f8fafc' },
data: dataset,
geographyConfig: {
borderColor: '#dae1e7',
highlightBorderWidth: 2,
highlightFillColor: function(geo) {
return geo['fillColor'] || '#F5F5F5';
},
highlightBorderColor: '#a779e9',
popupTemplate: function(geo, data) {
if (!data) { return ; }
return ['<div class="hoverinfo">',
'<strong>', geo.properties.name, '</strong>',
'<br><strong>', data.numberOfThings, '</strong> Visitors',
'</div>'].join('');
}
}
});
}
render() {
if (this.state.loading) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="stats-item bg-white shadow-xl rounded p-4" style={{height: '436px'}}>
<div className="loading my-32 mx-auto"><div></div></div>
</div>
)
} else if (this.state.countries) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="text-center">
<h2>Top Countries</h2>
<div className="text-grey-darker mt-1">by visitors</div>
</div>
<div className="mt-8">
{ this.state.countries.map(this.renderCountry.bind(this)) }
</div>
<MoreLink site={this.props.site} endpoint="countries" />
<div className="stats-item bg-white shadow-xl rounded p-4" style={{height: '436px'}}>
<h3>Countries</h3>
<div className="mt-6 mx-auto" style={{width: '100%', maxWidth: '475px', height: '320px'}} id="map-container"></div>
<MoreLink site={this.props.site} list={this.state.countries} endpoint="countries" />
</div>
)
}

@ -27,11 +27,11 @@ export default class CurrentVisitors extends React.Component {
render() {
if (this.state.currentVisitors !== null) {
return (
<div className="text-sm font-bold text-grey-darker mt-2 mt-0">
<div className="text-sm font-bold text-grey-darker mt-1">
<svg className="w-2 mr-1 fill-current text-green" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
<circle cx="8" cy="8" r="8"/>
</svg>
<span> {this.state.currentVisitors}</span> current visitors
{this.state.currentVisitors} current visitors
</div>
)
} else {

@ -0,0 +1,239 @@
import React from 'react';
import Bar from './bar'
import MoreLink from './more-link'
import * as api from '../api'
function FadeIn({show, children}) {
const className = show ? "fade-enter-active" : "fade-enter"
return <div className={className}>{children}</div>
}
const EXPLANATION = {
'Mobile': 'up to 576px',
'Tablet': '576px to 992px',
'Laptop': '992px to 1440px',
'Desktop': 'above 1440px',
}
function iconFor(screenSize) {
if (screenSize === 'Mobile') {
return (
<svg width="16px" height="16px" style={{transform: 'translateY(3px)'}} xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="feather feather-smartphone"><rect x="5" y="2" width="14" height="20" rx="2" ry="2"/><line x1="12" y1="18" x2="12" y2="18"/></svg>
)
} else if (screenSize === 'Tablet') {
return (
<svg width="16px" height="16px" style={{transform: 'translateY(3px)'}} xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="feather feather-tablet"><rect x="4" y="2" width="16" height="20" rx="2" ry="2" transform="rotate(180 12 12)"/><line x1="12" y1="18" x2="12" y2="18"/></svg>
)
} else if (screenSize === 'Laptop') {
return (
<svg width="16px" height="16px" style={{transform: 'translateY(3px)'}} xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="feather feather-laptop"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><line x1="2" y1="20" x2="22" y2="20"/></svg>
)
} else if (screenSize === 'Desktop') {
return (
<svg width="16px" height="16px" style={{transform: 'translateY(3px)'}} xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="feather feather-monitor"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><line x1="8" y1="21" x2="16" y2="21"/><line x1="12" y1="17" x2="12" y2="21"/></svg>
)
}
}
class ScreenSizes extends React.Component {
constructor(props) {
super(props)
this.state = {loading: true}
}
componentDidMount() {
this.fetchScreenSizes()
}
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
this.setState({loading: true, sizes: null})
this.fetchScreenSizes()
}
}
fetchScreenSizes() {
api.get(`/api/stats/${this.props.site.domain}/screen-sizes`, this.props.query)
.then((res) => this.setState({loading: false, sizes: res}))
}
renderScreenSize(size) {
return (
<div className="flex items-center justify-between my-1 text-sm" key={size.name}>
<div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>
<Bar count={size.count} all={this.state.sizes} color="green" />
<span className="block px-2" style={{marginTop: '-23px'}}>{iconFor(size.name)} {size.name}</span>
</div>
<span className="font-medium">{size.percentage}%</span>
</div>
)
}
render() {
return (
<FadeIn show={!this.state.loading}>
<React.Fragment>
<div className="flex items-center mt-4 mb-2 justify-between text-grey-dark text-xs font-bold tracking-wide">
<span>Screen size</span>
<span>Visitors</span>
</div>
{ this.state.sizes && this.state.sizes.map(this.renderScreenSize.bind(this)) }
</React.Fragment>
</FadeIn>
)
}
}
class Browsers extends React.Component {
constructor(props) {
super(props)
this.state = {loading: true}
}
componentDidMount() {
this.fetchBrowsers()
}
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
this.setState({loading: true, browsers: null})
this.fetchBrowsers()
}
}
fetchBrowsers() {
api.get(`/api/stats/${this.props.site.domain}/browsers`, this.props.query)
.then((res) => this.setState({loading: false, browsers: res}))
}
renderBrowser(browser) {
return (
<div className="flex items-center justify-between my-1 text-sm" key={browser.name}>
<div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>
<Bar count={browser.count} all={this.state.browsers} color="green" />
<span className="block px-2" style={{marginTop: '-23px'}}>{browser.name}</span>
</div>
<span className="font-medium">{browser.percentage}%</span>
</div>
)
}
render() {
return (
<FadeIn show={!this.state.loading}>
<div>
<div className="flex items-center mt-4 mb-2 justify-between text-grey-dark text-xs font-bold tracking-wide">
<span>Browser</span>
<span>Visitors</span>
</div>
{ this.state.browsers && this.state.browsers.map(this.renderBrowser.bind(this)) }
</div>
</FadeIn>
)
}
}
class OperatingSystems extends React.Component {
constructor(props) {
super(props)
this.state = {loading: true}
}
componentDidMount() {
this.fetchOperatingSystems()
}
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
this.setState({loading: true, operatingSystems: null})
this.fetchOperatingSystems()
}
}
fetchOperatingSystems() {
api.get(`/api/stats/${this.props.site.domain}/operating-systems`, this.props.query)
.then((res) => this.setState({loading: false, operatingSystems: res}))
}
renderOperatingSystem(os) {
return (
<div className="flex items-center justify-between my-1 text-sm" key={os.name}>
<div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>
<Bar count={os.count} all={this.state.operatingSystems} color="green" />
<span className="block px-2" style={{marginTop: '-23px'}}>{os.name}</span>
</div>
<span className="font-medium">{os.percentage}%</span>
</div>
)
}
render() {
return (
<FadeIn show={!this.state.loading}>
<React.Fragment>
<div className="flex items-center mt-4 mb-2 justify-between text-grey-dark text-xs font-bold tracking-wide">
<span>Operating system</span>
<span>Visitors</span>
</div>
{ this.state.operatingSystems && this.state.operatingSystems.map(this.renderOperatingSystem.bind(this)) }
</React.Fragment>
</FadeIn>
)
}
}
export default class Devices extends React.Component {
constructor(props) {
super(props)
this.state = {mode: 'size'}
}
renderContent() {
if (this.state.mode === 'size') {
return <ScreenSizes site={this.props.site} query={this.props.query} />
} else if (this.state.mode === 'browser') {
return <Browsers site={this.props.site} query={this.props.query} />
} else if (this.state.mode === 'os') {
return <OperatingSystems site={this.props.site} query={this.props.query} />
}
}
setMode(mode) {
return () => {
this.setState({mode})
}
}
renderPill(name, mode) {
const isActive = this.state.mode === mode
const extraClass = name === 'OS' ? '' : ' border-r border-grey-light'
if (isActive) {
return <span className={"inline-block shadow-inner text-sm font-bold py-1 px-4" + extraClass}>{name}</span>
} else {
return <span className={"inline-block cursor-pointer bg-grey-lighter text-sm font-bold py-1 px-4" + extraClass} onClick={this.setMode(mode)}>{name}</span>
}
}
render() {
return (
<div className="stats-item">
<div className="bg-white shadow-xl rounded p-4 relative" style={{height: '436px'}}>
<h3>Devices</h3>
<div className="rounded border border-grey-light absolute" style={{top: '1rem', right: '1rem'}}>
{ this.renderPill('Size', 'size') }
{ this.renderPill('Browser', 'browser') }
{ this.renderPill('OS', 'os') }
</div>
{ this.renderContent() }
</div>
</div>
)
}
}

@ -1,68 +0,0 @@
import React from "react";
import { withRouter } from 'react-router-dom'
import Modal from './modal'
import * as api from '../../api'
import numberFormatter from '../../number-formatter'
import Bar from '../bar'
import {parseQuery} from '../../query'
class BrowsersModal extends React.Component {
constructor(props) {
super(props)
this.state = {loading: true}
}
componentDidMount() {
const query = parseQuery(this.props.location.search, this.props.site)
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/browsers`, query, {limit: 100})
.then((res) => this.setState({loading: false, browsers: res}))
}
renderBrowser(browser) {
return (
<React.Fragment key={browser.name}>
<div className="flex items-center justify-between my-2">
<span>{browser.name}</span>
<span>{browser.percentage}%</span>
</div>
<Bar count={browser.count} all={this.state.browsers} color="red" />
</React.Fragment>
)
}
renderBody() {
if (this.state.loading) {
return (
<div className="loading my-32 mx-auto"><div></div></div>
)
} else if (this.state.browsers) {
return (
<React.Fragment>
<header className="modal__header">
<h1>Top browsers</h1>
</header>
<div className="text-grey-darker text-lg ml-1 mt-1">by visitors</div>
<div className="my-4 border-b border-grey-light"></div>
<main className="modal__content">
<div className="mt-8">
{ this.state.browsers.map(this.renderBrowser.bind(this)) }
</div>
</main>
</React.Fragment>
)
}
}
render() {
return (
<Modal site={this.props.site}>
{ this.renderBody() }
</Modal>
)
}
}
export default withRouter(BrowsersModal)

@ -22,13 +22,10 @@ class CountriesModal extends React.Component {
renderCountry(country) {
return (
<React.Fragment key={country.name}>
<div className="flex items-center justify-between my-2">
<span>{country.name}</span>
<span tooltip={`${country.count} visitors`}>{country.percentage}%</span>
</div>
<Bar count={country.count} all={this.state.countries} color="indigo" />
</React.Fragment>
<tr className="text-sm" key={country.name}>
<td className="p-2">{country.full_country_name}</td>
<td className="p-2 w-32 font-medium" align="right">{numberFormatter(country.percentage)}%</td>
</tr>
)
}
@ -47,9 +44,17 @@ class CountriesModal extends React.Component {
<div className="my-4 border-b border-grey-light"></div>
<main className="modal__content">
<div className="mt-8">
{ this.state.countries.map(this.renderCountry.bind(this)) }
</div>
<table className="w-full table-striped table-fixed">
<thead>
<tr>
<th className="p-2 text-xs tracking-wide font-bold text-grey-dark" align="left">Country</th>
<th className="p-2 w-32 text-xs tracking-wide font-bold text-grey-dark" align="right">Visitors</th>
</tr>
</thead>
<tbody>
{ this.state.countries.map(this.renderCountry.bind(this)) }
</tbody>
</table>
</main>
</React.Fragment>
)

@ -1,68 +0,0 @@
import React from "react";
import { withRouter } from 'react-router-dom'
import Modal from './modal'
import * as api from '../../api'
import numberFormatter from '../../number-formatter'
import Bar from '../bar'
import {parseQuery} from '../../query'
class OperatingSystemsModal extends React.Component {
constructor(props) {
super(props)
this.state = {loading: true}
}
componentDidMount() {
const query = parseQuery(this.props.location.search, this.props.site)
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/operating-systems`, query, {limit: 100})
.then((res) => this.setState({loading: false, systems: res}))
}
renderSystem(system) {
return (
<React.Fragment key={system.name}>
<div className="flex items-center justify-between my-2">
<span>{system.name}</span>
<span>{system.percentage}%</span>
</div>
<Bar count={system.count} all={this.state.systems} color="blue" />
</React.Fragment>
)
}
renderBody() {
if (this.state.loading) {
return (
<div className="loading my-32 mx-auto"><div></div></div>
)
} else if (this.state.systems) {
return (
<React.Fragment>
<header className="modal__header">
<h1>Operating Systems</h1>
</header>
<div className="text-grey-darker text-lg ml-1 mt-1">by visitors</div>
<div className="my-4 border-b border-grey-light"></div>
<main className="modal__content">
<div className="mt-8">
{ this.state.systems.map(this.renderSystem.bind(this)) }
</div>
</main>
</React.Fragment>
)
}
}
render() {
return (
<Modal site={this.props.site}>
{ this.renderBody() }
</Modal>
)
}
}
export default withRouter(OperatingSystemsModal)

@ -1,64 +0,0 @@
import React from 'react';
import Bar from './bar'
import MoreLink from './more-link'
import * as api from '../api'
export default class OperatingSystems extends React.Component {
constructor(props) {
super(props)
this.state = {loading: true}
}
componentDidMount() {
this.fetchOperatingSystems()
}
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
this.setState({loading: true, systems: null})
this.fetchOperatingSystems()
}
}
fetchOperatingSystems() {
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/operating-systems`, this.props.query)
.then((res) => this.setState({loading: false, systems: res}))
}
renderSystem(system) {
return (
<React.Fragment key={system.name}>
<div className="flex items-center justify-between my-2">
<span className="truncate" style={{maxWidth: '80%'}}>{system.name}</span>
<span tooltip={`${system.count} visitors`}>{system.percentage}%</span>
</div>
<Bar count={system.count} all={this.state.systems} color="blue" />
</React.Fragment>
)
}
render() {
if (this.state.loading) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="loading my-32 mx-auto"><div></div></div>
</div>
)
} else if (this.state.systems) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="text-center">
<h2>Operating Systems</h2>
<div className="text-grey-darker mt-1">by visitors</div>
</div>
<div className="mt-8">
{ this.state.systems.map(this.renderSystem.bind(this)) }
</div>
<MoreLink site={this.props.site} endpoint="operating-systems" />
</div>
)
}
}
}

@ -32,35 +32,35 @@ export default class Pages extends React.Component {
renderPage(page) {
return (
<React.Fragment key={page.name}>
<div className="flex items-center justify-between my-2">
<span className="truncate" style={{maxWidth: '80%'}}>{page.name}</span>
<span>{numberFormatter(page.count)}</span>
<div className="flex items-center justify-between my-1 text-sm" key={page.name}>
<div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>
<Bar count={page.count} all={this.state.pages} color="orange" />
<span className="block px-2" style={{marginTop: '-23px'}}>{page.name}</span>
</div>
<Bar count={page.count} all={this.state.pages} color="orange" />
</React.Fragment>
<span className="font-medium">{numberFormatter(page.count)}</span>
</div>
)
}
render() {
if (this.state.loading) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="stats-item bg-white shadow-xl rounded p-4" style={{height: '436px'}}>
<div className="loading my-32 mx-auto"><div></div></div>
</div>
)
} else if (this.state.pages) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="text-center">
<h2>Top Pages</h2>
<div className="text-grey-darker mt-1">by {eventName(this.props.query)}</div>
</div>
<div className="stats-item bg-white shadow-xl rounded p-4" style={{height: '436px'}}>
<h3>Top Pages</h3>
<div className="mt-8">
{ this.state.pages.map(this.renderPage.bind(this)) }
<div className="flex items-center mt-4 mb-2 justify-between text-grey-dark text-xs font-bold tracking-wide">
<span>Page url</span>
<span>Pageviews</span>
</div>
<MoreLink site={this.props.site} endpoint="pages" />
{ this.state.pages.map(this.renderPage.bind(this)) }
<MoreLink site={this.props.site} list={this.state.pages} endpoint="pages" />
</div>
)
}

@ -35,37 +35,41 @@ export default class Referrers extends React.Component {
renderReferrer(referrer) {
return (
<React.Fragment key={referrer.name}>
<div className="flex items-center justify-between my-2">
<Link className="hover:underline truncate" style={{maxWidth: '80%'}} to={`/${encodeURIComponent(this.props.site.domain)}/referrers/${referrer.name}${window.location.search}`}>{ referrer.name }</Link>
<span>{numberFormatter(referrer.count)}</span>
<div className="flex items-center justify-between my-1 text-sm" key={referrer.name}>
<div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>
<Bar count={referrer.count} all={this.state.referrers} color="blue" />
<Link className="hover:underline block px-2" style={{marginTop: '-23px'}} to={`/${encodeURIComponent(this.props.site.domain)}/referrers/${referrer.name}${window.location.search}`}>{ referrer.name }</Link>
</div>
<Bar count={referrer.count} all={this.state.referrers} color="blue" />
</React.Fragment>
<span className="font-medium">{numberFormatter(referrer.count)}</span>
</div>
)
}
render() {
renderContent() {
if (this.state.loading) {
return <div className="loading my-32 mx-auto"><div></div></div>
} else {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="loading my-32 mx-auto"><div></div></div>
</div>
)
} else if (this.state.referrers) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4 relative" style={{height: '405px'}}>
<div className="text-center">
<h2>Top Referrers</h2>
<div className="text-grey-darker mt-1">by visitors</div>
</div>
<React.Fragment>
<div className="mt-8">
{ this.state.referrers.map(this.renderReferrer.bind(this)) }
<div className="flex items-center mt-4 mb-2 justify-between text-grey-dark text-xs font-bold tracking-wide">
<span>Referrer</span>
<span>Visitors</span>
</div>
<MoreLink site={this.props.site} endpoint="referrers" />
</div>
{ this.state.referrers.map(this.renderReferrer.bind(this)) }
<MoreLink site={this.props.site} list={this.state.referrers} endpoint="referrers" />
</React.Fragment>
)
}
}
render() {
return (
<div className="stats-item bg-white shadow-xl rounded p-4" style={{height: '436px'}}>
<h3>Top Referrers</h3>
{ this.renderContent() }
</div>
)
}
}

@ -1,92 +0,0 @@
import React from 'react';
import Bar from './bar'
import * as api from '../api'
const EXPLANATION = {
'Mobile': 'up to 576px',
'Tablet': '576px to 992px',
'Laptop': '992px to 1440px',
'Desktop': 'above 1440px',
}
function iconFor(screenSize) {
if (screenSize === 'Mobile') {
return (
<svg width="16px" height="16px" style={{transform: 'translateY(3px)'}} xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="feather feather-smartphone"><rect x="5" y="2" width="14" height="20" rx="2" ry="2"/><line x1="12" y1="18" x2="12" y2="18"/></svg>
)
} else if (screenSize === 'Tablet') {
return (
<svg width="16px" height="16px" style={{transform: 'translateY(3px)'}} xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="feather feather-tablet"><rect x="4" y="2" width="16" height="20" rx="2" ry="2" transform="rotate(180 12 12)"/><line x1="12" y1="18" x2="12" y2="18"/></svg>
)
} else if (screenSize === 'Laptop') {
return (
<svg width="16px" height="16px" style={{transform: 'translateY(3px)'}} xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="feather feather-laptop"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><line x1="2" y1="20" x2="22" y2="20"/></svg>
)
} else if (screenSize === 'Desktop') {
return (
<svg width="16px" height="16px" style={{transform: 'translateY(3px)'}} xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="feather feather-monitor"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><line x1="8" y1="21" x2="16" y2="21"/><line x1="12" y1="17" x2="12" y2="21"/></svg>
)
}
}
export default class ScreenSizes extends React.Component {
constructor(props) {
super(props)
this.state = {loading: true}
}
componentDidMount() {
this.fetchScreenSizes()
}
componentDidUpdate(prevProps) {
if (this.props.query !== prevProps.query) {
this.setState({loading: true, sizes: null})
this.fetchScreenSizes()
}
}
fetchScreenSizes() {
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/screen-sizes`, this.props.query)
.then((res) => this.setState({loading: false, sizes: res}))
}
renderScreenSize(size) {
return (
<React.Fragment key={size.name}>
<div className="flex items-center justify-between my-2">
<span tooltip={EXPLANATION[size.name]}>
{ iconFor(size.name) }
<span className="ml-1">{size.name}</span>
</span>
<span tooltip={`${size.count} visitors`}>{size.percentage}%</span>
</div>
<Bar count={size.count} all={this.state.sizes} color="teal" />
</React.Fragment>
)
}
render() {
if (this.state.loading) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4" style={{height: '405px'}}>
<div className="loading my-32 mx-auto"><div></div></div>
</div>
)
} else if (this.state.sizes) {
return (
<div className="w-full md:w-31percent bg-white shadow-md rounded mt-4 p-4" style={{height: '405px'}}>
<div className="text-center">
<h2>Screen Sizes</h2>
<div className="text-grey-darker mt-1">by visitors</div>
</div>
<div className="mt-8">
{ this.state.sizes.map(this.renderScreenSize.bind(this)) }
</div>
</div>
)
}
}
}

@ -123,16 +123,6 @@ function dateFormatter(graphData) {
}
}
function formatStat(stat) {
if (typeof(stat.count) === 'number') {
return numberFormatter(stat.count)
} else if (typeof(stat.duration) === 'number') {
return new Date(stat.duration * 1000).toISOString().substr(14, 5)
} else if (typeof(stat.percentage) === 'number') {
return stat.percentage + '%'
}
}
class LineGraph extends React.Component {
componentDidMount() {
const {graphData} = this.props
@ -260,13 +250,13 @@ class LineGraph extends React.Component {
const formattedComparison = numberFormatter(Math.abs(comparison))
if (comparison > 0) {
const color = name === 'Bounce rate' ? 'text-red-light' : 'text-green-dark'
return <span className="py-1 text-xs text-grey-darker"><span className={color}>&uarr;</span> {formattedComparison}% from {this.comparisonTimeframe()}</span>
const color = name === 'Bounce rate' ? 'text-red-light' : 'text-green'
return <span className="text-xs"><span className={color + ' font-bold'}>&uarr;</span> {formattedComparison}%</span>
} else if (comparison < 0) {
const color = name === 'Bounce rate' ? 'text-green-dark' : 'text-red-light'
return <span className="py-1 text-xs text-grey-darker"><span className={color}>&darr;</span> {formattedComparison}% from {this.comparisonTimeframe()}</span>
const color = name === 'Bounce rate' ? 'text-green' : 'text-red-light'
return <span className="text-xs"><span className={color + ' font-bold'}>&darr;</span> {formattedComparison}%</span>
} else if (comparison === 0) {
return <span className="py-1 text-xs text-grey-darker">&#12336; same as {this.comparisonTimeframe()}</span>
return <span className="text-xs text-grey-darker">&#12336; N/A</span>
}
}
@ -277,12 +267,12 @@ class LineGraph extends React.Component {
border = index % 2 === 0 ? border + ' border-r lg:border-r-0' : border
return (
<div className={`pl-8 w-1/2 my-4 lg:w-52 ${border}`} key={stat.name}>
<div className={`px-8 w-1/2 my-4 lg:w-auto ${border}`} key={stat.name}>
<div className="text-grey-dark text-xs font-bold tracking-wide uppercase">{stat.name}</div>
<div className="my-1 flex items-end justify-between">
<b className="text-2xl">{formatStat(stat)}</b>
<div className="my-1 flex justify-between items-center">
<b className="text-2xl mr-4">{ typeof(stat.count) == 'number' ? numberFormatter(stat.count) : stat.percentage + '%' }</b>
{this.renderComparison(stat.name, stat.change)}
</div>
{this.renderComparison(stat.name, stat.change)}
</div>
)
})
@ -356,7 +346,7 @@ export default class VisitorGraph extends React.Component {
render() {
return (
<div className="w-full bg-white shadow-md rounded mt-6 main-graph">
<div className="w-full bg-white shadow-xl rounded mt-6 main-graph">
{ this.renderInner() }
</div>
)

File diff suppressed because it is too large Load Diff

@ -8,6 +8,7 @@
"dependencies": {
"autoprefixer": "^9.7.4",
"chart.js": "^2.9.3",
"datamaps": "^0.5.9",
"phoenix": "file:../deps/phoenix",
"phoenix_html": "file:../deps/phoenix_html",
"react": "^16.12.0",

@ -756,6 +756,7 @@ module.exports = {
default: '0 2px 4px 0 rgba(0,0,0,0.10)',
'md': '0 4px 8px 0 rgba(0,0,0,0.12), 0 2px 4px 0 rgba(0,0,0,0.08)',
'lg': '0 15px 30px 0 rgba(0,0,0,0.11), 0 5px 15px 0 rgba(0,0,0,0.08)',
'xl': '8px 14px 38px rgba(39,44,49,.06),1px 3px 8px rgba(39,44,49,.03);',
'inner': 'inset 0 2px 4px 0 rgba(0,0,0,0.06)',
'outline': '0 0 0 3px rgba(52,144,220,0.5)',
'none': 'none',

@ -154,7 +154,6 @@ defmodule Plausible.Stats.CountryName do
"NR" => "Nauru",
"NP" => "Nepal",
"NL" => "Netherlands",
"AN" => "Netherlands Antilles",
"NC" => "New Caledonia",
"NZ" => "New Zealand",
"NI" => "Nicaragua",
@ -247,6 +246,257 @@ defmodule Plausible.Stats.CountryName do
"ZW" => "Zimbabwe"
}
@alpha3_codes %{
"SL" => "SLE",
"VA" => "VAT",
"SM" => "SMR",
"TV" => "TUV",
"KZ" => "KAZ",
"PE" => "PER",
"CD" => "COD",
"SN" => "SEN",
"BA" => "BIH",
"VC" => "VCT",
"TW" => "TWN",
"NP" => "NPL",
"UZ" => "UZB",
"MY" => "MYS",
"GM" => "GMB",
"GA" => "GAB",
"PW" => "PLW",
"TH" => "THA",
"NR" => "NRU",
"KW" => "KWT",
"MU" => "MUS",
"GI" => "GIB",
"BJ" => "BEN",
"AR" => "ARG",
"SA" => "SAU",
"GW" => "GNB",
"AT" => "AUT",
"AW" => "ABW",
"MZ" => "MOZ",
"IT" => "ITA",
"BI" => "BDI",
"GR" => "GRC",
"FO" => "FRO",
"SD" => "SDN",
"PS" => "PSE",
"SB" => "SLB",
"KR" => "KOR",
"TR" => "TUR",
"ST" => "STP",
"JP" => "JPN",
"TG" => "TGO",
"GQ" => "GNQ",
"PH" => "PHL",
"LS" => "LSO",
"LT" => "LTU",
"JM" => "JAM",
"GF" => "GUF",
"AZ" => "AZE",
"LA" => "LAO",
"TM" => "TKM",
"MH" => "MHL",
"TJ" => "TJK",
"FR" => "FRA",
"GG" => "GGY",
"WF" => "WLF",
"BZ" => "BLZ",
"VN" => "VNM",
"SC" => "SYC",
"PN" => "PCN",
"GL" => "GRL",
"RS" => "SRB",
"CV" => "CPV",
"BM" => "BMU",
"DJ" => "DJI",
"BV" => "BVT",
"CK" => "COK",
"NA" => "NAM",
"BS" => "BHS",
"PL" => "POL",
"HN" => "HND",
"BF" => "BFA",
"PF" => "PYF",
"BR" => "BRA",
"ER" => "ERI",
"UG" => "UGA",
"NE" => "NER",
"NL" => "NLD",
"NG" => "NGA",
"IQ" => "IRQ",
"BB" => "BRB",
"PY" => "PRY",
"IR" => "IRN",
"CH" => "CHE",
"UM" => "UMI",
"TK" => "TKL",
"TL" => "TLS",
"YT" => "MYT",
"CI" => "CIV",
"SK" => "SVK",
"WS" => "WSM",
"AQ" => "ATA",
"MG" => "MDG",
"TT" => "TTO",
"PM" => "SPM",
"ZW" => "ZWE",
"DM" => "DMA",
"RE" => "REU",
"CM" => "CMR",
"CC" => "CCK",
"SZ" => "SWZ",
"MR" => "MRT",
"HM" => "HMD",
"RW" => "RWA",
"FM" => "FSM",
"MP" => "MNP",
"PK" => "PAK",
"MW" => "MWI",
"VE" => "VEN",
"KY" => "CYM",
"CN" => "CHN",
"DZ" => "DZA",
"KM" => "COM",
"NU" => "NIU",
"PT" => "PRT",
"US" => "USA",
"MS" => "MSR",
"SO" => "SOM",
"ES" => "ESP",
"AM" => "ARM",
"ML" => "MLI",
"TC" => "TCA",
"MM" => "MMR",
"JE" => "JEY",
"AO" => "AGO",
"LV" => "LVA",
"FJ" => "FJI",
"UA" => "UKR",
"BH" => "BHR",
"EG" => "EGY",
"ME" => "MNE",
"AX" => "ALA",
"MQ" => "MTQ",
"MX" => "MEX",
"CX" => "CXR",
"KH" => "KHM",
"SV" => "SLV",
"AS" => "ASM",
"IN" => "IND",
"GB" => "GBR",
"LU" => "LUX",
"HT" => "HTI",
"DE" => "DEU",
"VI" => "VIR",
"NI" => "NIC",
"CG" => "COG",
"ET" => "ETH",
"CZ" => "CZE",
"HR" => "HRV",
"CY" => "CYP",
"KG" => "KGZ",
"BO" => "BOL",
"PG" => "PNG",
"ZA" => "ZAF",
"MO" => "MAC",
"FI" => "FIN",
"PR" => "PRI",
"SR" => "SUR",
"GN" => "GIN",
"TD" => "TCD",
"MF" => "MAF",
"VG" => "VGB",
"NF" => "NFK",
"IL" => "ISR",
"GH" => "GHA",
"TZ" => "TZA",
"SH" => "SHN",
"JO" => "JOR",
"MV" => "MDV",
"BE" => "BEL",
"NC" => "NCL",
"DK" => "DNK",
"GS" => "SGS",
"LB" => "LBN",
"AI" => "AIA",
"LI" => "LIE",
"OM" => "OMN",
"UY" => "URY",
"KN" => "KNA",
"HU" => "HUN",
"BT" => "BTN",
"EC" => "ECU",
"TO" => "TON",
"NO" => "NOR",
"RU" => "RUS",
"MD" => "MDA",
"SY" => "SYR",
"DO" => "DOM",
"MA" => "MAR",
"HK" => "HKG",
"SJ" => "SJM",
"BW" => "BWA",
"IO" => "IOT",
"LY" => "LBY",
"CA" => "CAN",
"LK" => "LKA",
"LC" => "LCA",
"AG" => "ATG",
"SI" => "SVN",
"GP" => "GLP",
"BN" => "BRN",
"IM" => "IMN",
"SE" => "SWE",
"BD" => "BGD",
"VU" => "VUT",
"KI" => "KIR",
"AL" => "ALB",
"MT" => "MLT",
"KE" => "KEN",
"BG" => "BGR",
"GE" => "GEO",
"IE" => "IRL",
"PA" => "PAN",
"ID" => "IDN",
"AE" => "ARE",
"RO" => "ROU",
"NZ" => "NZL",
"MN" => "MNG",
"GY" => "GUY",
"BL" => "BLM",
"EE" => "EST",
"LR" => "LBR",
"CO" => "COL",
"CF" => "CAF",
"MC" => "MCO",
"CR" => "CRI",
"AU" => "AUS",
"ZM" => "ZMB",
"GT" => "GTM",
"AF" => "AFG",
"MK" => "MKD",
"GD" => "GRD",
"FK" => "FLK",
"AD" => "AND",
"SG" => "SGP",
"QA" => "QAT",
"CL" => "CHL",
"GU" => "GUM",
"TN" => "TUN",
"YE" => "YEM",
"BY" => "BLR",
"IS" => "ISL",
"CU" => "CUB",
"TF" => "ATF",
"EH" => "ESH"
}
def to_alpha3(code) do
Map.get(@alpha3_codes, code, code)
end
def from_iso3166(code) do
Map.get(@country_codes_to_names, code, code)
end

@ -386,15 +386,22 @@ defmodule Plausible.Stats do
end)
end
defp add_percentages(stat_list) do
total = Enum.reduce(stat_list, 0, fn %{count: count}, total -> total + count end)
Enum.map(stat_list, fn stat ->
Map.put(stat, :percentage, round(stat[:count] / total * 100))
end)
end
@available_screen_sizes ["Desktop", "Laptop", "Tablet", "Mobile"]
def top_screen_sizes(site, query) do
Repo.all(from e in base_query(site, query),
select: {e.screen_size, count(e.user_id, :distinct)},
select: %{name: e.screen_size, count: count(e.user_id, :distinct)},
group_by: e.screen_size,
where: not is_nil(e.screen_size)
)
|> Enum.sort(fn {screen_size1, _}, {screen_size2, _} ->
|> Enum.sort(fn %{name: screen_size1}, %{name: screen_size2} ->
index1 = Enum.find_index(@available_screen_sizes, fn s -> s == screen_size1 end)
index2 = Enum.find_index(@available_screen_sizes, fn s -> s == screen_size2 end)
index2 > index1
@ -402,34 +409,25 @@ defmodule Plausible.Stats do
|> add_percentages
end
defp add_percentages(stat_list) do
total = Enum.reduce(stat_list, 0, fn {_, count}, total -> total + count end)
Enum.map(stat_list, fn {stat, count} ->
%{
name: stat,
count: count,
percentage: round(count / total * 100)
}
end)
end
def countries(site, query, limit \\ 5) do
def countries(site, query) do
Repo.all(from e in base_query(site, query),
select: {e.country_code, count(e.user_id, :distinct)},
select: %{name: e.country_code, count: count(e.user_id, :distinct)},
group_by: e.country_code,
where: not is_nil(e.country_code),
order_by: [desc: 2]
)
|> Enum.map(fn {country_code, count} ->
{Plausible.Stats.CountryName.from_iso3166(country_code), count}
|> Enum.map(fn stat ->
two_letter_code = stat[:name]
stat
|> Map.put(:name, Plausible.Stats.CountryName.to_alpha3(two_letter_code))
|> Map.put(:full_country_name, Plausible.Stats.CountryName.from_iso3166(two_letter_code))
end)
|> add_percentages
|> Enum.take(limit)
end
def browsers(site, query, limit \\ 5) do
Repo.all(from e in base_query(site, query),
select: {e.browser, count(e.user_id, :distinct)},
select: %{name: e.browser, count: count(e.user_id, :distinct)},
group_by: e.browser,
where: not is_nil(e.browser),
order_by: [desc: 2]
@ -440,7 +438,7 @@ defmodule Plausible.Stats do
def operating_systems(site, query, limit \\ 5) do
Repo.all(from e in base_query(site, query),
select: {e.operating_system, count(e.user_id, :distinct)},
select: %{name: e.operating_system, count: count(e.user_id, :distinct)},
group_by: e.operating_system,
where: not is_nil(e.operating_system),
order_by: [desc: 2]

@ -70,7 +70,7 @@ defmodule PlausibleWeb.Api.StatsController do
query = Stats.Query.from(site.timezone, params)
include = if params["include"], do: String.split(params["include"], ","), else: []
json(conn, Stats.top_referrers(site, query, params["limit"] || 5, include))
json(conn, Stats.top_referrers(site, query, params["limit"] || 9, include))
end
def referrers_for_goal(conn, params) do
@ -129,28 +129,28 @@ defmodule PlausibleWeb.Api.StatsController do
query = Stats.Query.from(site.timezone, params)
include = if params["include"], do: String.split(params["include"], ","), else: []
json(conn, Stats.top_pages(site, query, params["limit"] || 5, include))
json(conn, Stats.top_pages(site, query, params["limit"] || 9, include))
end
def countries(conn, params) do
site = conn.assigns[:site]
query = Stats.Query.from(site.timezone, params)
json(conn, Stats.countries(site, query, parse_integer(params["limit"]) || 5))
json(conn, Stats.countries(site, query))
end
def browsers(conn, params) do
site = conn.assigns[:site]
query = Stats.Query.from(site.timezone, params)
json(conn, Stats.browsers(site, query, parse_integer(params["limit"]) || 5))
json(conn, Stats.browsers(site, query, parse_integer(params["limit"]) || 9))
end
def operating_systems(conn, params) do
site = conn.assigns[:site]
query = Stats.Query.from(site.timezone, params)
json(conn, Stats.operating_systems(site, query, parse_integer(params["limit"]) || 5))
json(conn, Stats.operating_systems(site, query, parse_integer(params["limit"]) || 9))
end
def screen_sizes(conn, params) do

@ -3,19 +3,23 @@ defmodule PlausibleWeb.PageController do
use Plausible.Repo
@demo_referrers [
{"indiehackers.com", 30},
{"indiehackers.com", 56},
{"Github", 23},
{"Twitter", 17},
{"Reddit", 8},
{"Google", 6},
{"DuckDuckGo", 4},
{"Bing", 2},
]
@demo_countries [
{"United Kingdom", 41},
{"United States", 38},
{"France", 13},
{"India", 7},
{"Netherlands", 6},
@demo_pages [
{"/", 140},
{"/plausible.io", 63},
{"/blog", 41},
{"/register", 13},
{"/login", 7},
{"/blog/google-analytics-and-privacy", 4},
{"/blog/launching-plausible", 2}
]
def index(conn, _params) do
@ -23,7 +27,7 @@ defmodule PlausibleWeb.PageController do
user = conn.assigns[:current_user] |> Repo.preload(:sites)
render(conn, "sites.html", sites: user.sites)
else
render(conn, "index.html", demo_referrers: @demo_referrers, demo_countries: @demo_countries, landing_nav: true)
render(conn, "index.html", demo_referrers: @demo_referrers, demo_pages: @demo_pages, landing_nav: true)
end
end

@ -9,33 +9,39 @@
<circle cx="200" cy="200" r="200" fill="#b2b7ff" />
</svg>
<div class="w-3/4 bg-white shadow-lg rounded m-4 p-4 text-center absolute z-10" style="left: 75px;">
<h2>Top Referrers</h2>
<div class="text-grey-darker mt-1">by visitors</div>
<div class="mt-8">
<%= for {referrer, count} <- @demo_referrers do %>
<div class="flex items-center justify-between my-2">
<span><%= referrer %></span>
<span><%= count %></span>
</div>
<%= PlausibleWeb.StatsView.bar(count, @demo_referrers) %>
<% end %>
<div class="w-3/4 bg-white shadow-xl rounded m-4 p-4 absolute z-10" style="left: 75px;">
<h3>Top Referrers</h3>
<div class="flex items-center mt-4 mb-2 justify-between text-grey-dark text-xs font-bold tracking-wide">
<span>Referrer</span>
<span>Visitors</span>
</div>
</div>
<div class="w-3/4 bg-white shadow-lg rounded m-4 p-4 text-center absolute" style="left: calc(75%); top: 50px;">
<h2>Top Countries</h2>
<div class="text-grey-darker mt-1">by visitors</div>
<div class="mt-8">
<%= for {country, count} <- @demo_countries do %>
<div class="flex items-center justify-between my-2">
<span><%= Plausible.Stats.CountryName.from_iso3166(country) %></span>
<span><%= count %></span>
<%= for {referrer, count} <- @demo_referrers do %>
<div class="flex items-center justify-between my-1 text-sm">
<div class="w-full h-8" style="max-width: calc(100% - 3rem)">
<%= PlausibleWeb.StatsView.bar(count, @demo_referrers, :blue) %>
<span class="block px-2" style="margin-top: -23px"><%= referrer %></span>
</div>
<%= PlausibleWeb.StatsView.bar(count, @demo_countries, :orange) %>
<% end %>
<span className="font-medium"><%= count %></span>
</div>
<% end %>
</div>
<div class="w-3/4 bg-white shadow-xl rounded m-4 p-4 absolute" style="left: calc(75%); top: 50px;">
<h3>Top Pages</h3>
<div class="flex items-center mt-4 mb-2 justify-between text-grey-dark text-xs font-bold tracking-wide">
<span>Page</span>
<span>Visitors</span>
</div>
<%= for {country, count} <- @demo_pages do %>
<div class="flex items-center justify-between my-1 text-sm">
<div class="w-full h-8" style="max-width: calc(100% - 3rem)">
<%= PlausibleWeb.StatsView.bar(count, @demo_pages, :orange) %>
<span class="block px-2" style="margin-top: -23px"><%= Plausible.Stats.CountryName.from_iso3166(country) %></span>
</div>
<span className="font-medium"><%= count %></span>
</div>
<% end %>
</div>
</section>
<section class="w-full text-center lg:text-left lg:w-3/5">

@ -4,8 +4,10 @@
<%= link("Click here to enable weekly email reports →", to: "/#{URI.encode_www_form(@site.domain)}/settings#email-reports", class: "py-2 block") %>
</div>
<% end %>
<div class="pt-12"></div>
<div class="pt-6"></div>
<div id="stats-react-container" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>"></div>
<div id="modal_root"></div>
<script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.5.3/d3.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/topojson/1.6.9/topojson.min.js"></script>
<script type="text/javascript" src="<%= Routes.static_path(@conn, "/js/dashboard.js") %>"></script>
</div>

@ -24,9 +24,7 @@ defmodule PlausibleWeb.StatsView do
def bar(count, all, color \\ :blue) do
~E"""
<div class="bar">
<div class="bar__fill bg-<%= color %>" style="width: <%= bar_width(count, all) %>%;"></div>
</div>
<div class="bg-<%= color %>-lightest" style="width: <%= bar_width(count, all) %>%; height: 30px"></div>
"""
end

@ -13,8 +13,8 @@ defmodule PlausibleWeb.Api.StatsController.CountriesTest do
conn = get(conn, "/api/stats/#{site.domain}/countries?period=day&date=2019-01-01")
assert json_response(conn, 200) == [
%{"name" => "Estonia", "count" => 2, "percentage" => 67},
%{"name" => "United Kingdom", "count" => 1, "percentage" => 33},
%{"name" => "EST", "full_country_name" => "Estonia", "count" => 2, "percentage" => 67},
%{"name" => "GBR", "full_country_name" => "United Kingdom", "count" => 1, "percentage" => 33},
]
end
end

Loading…
Cancel
Save