Skip to content

Adds list-based country report option #1381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ukutaht merged 6 commits into from
Oct 14, 2021
Merged

Adds list-based country report option #1381

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
baf570c
Adds list option for countries report
Vigasaurus Oct 8, 2021
f2061ab
Changelog
Vigasaurus Oct 8, 2021
32f8791
Merge branch 'master' into 1376-map-tabs
Vigasaurus Oct 11, 2021
fbcca9c
Renames Geo to Locations
Vigasaurus Oct 13, 2021
c83b6a1
Lint
Vigasaurus Oct 13, 2021
0a9e59a
Merge branch 'master' into 1376-map-tabs
ukutaht Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Renames Geo to Locations
  • Loading branch information
@Vigasaurus
Vigasaurus committed Oct 13, 2021
commit fbcca9c177bceae2d727b24b42e41afa1d57156e
4 changes: 2 additions & 2 deletions assets/js/dashboard/historical.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import CurrentVisitors from './stats/current-visitors'
import VisitorGraph from './stats/visitor-graph'
import Sources from './stats/sources'
import Pages from './stats/pages'
import Geo from './stats/geo';
import Locations from './stats/locations';
import Devices from './stats/devices'
import Conversions from './stats/conversions'
import { withPinnedHeader } from './pinned-header-hoc';
Expand Down Expand Up @@ -47,7 +47,7 @@ class Historical extends React.Component {
<Pages site={this.props.site} query={this.props.query} />
</div>
<div className="items-start justify-between block w-full md:flex">
<Geo site={this.props.site} query={this.props.query} />
<Locations site={this.props.site} query={this.props.query} />
<Devices site={this.props.site} query={this.props.query} />
</div>
{ this.renderConversions() }
Expand Down
4 changes: 2 additions & 2 deletions assets/js/dashboard/realtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Filters from './filters'
import VisitorGraph from './stats/visitor-graph'
import Sources from './stats/sources'
import Pages from './stats/pages'
import Geo from './stats/geo'
import Locations from './stats/locations'
import Devices from './stats/devices'
import Conversions from './stats/conversions'
import { withPinnedHeader } from './pinned-header-hoc';
Expand Down Expand Up @@ -45,7 +45,7 @@ class Realtime extends React.Component {
<Pages site={this.props.site} query={this.props.query} timer={this.props.timer} />
</div>
<div className="items-start justify-between block w-full md:flex">
<Geo site={this.props.site} query={this.props.query} timer={this.props.timer} />
<Locations site={this.props.site} query={this.props.query} timer={this.props.timer} />
<Devices site={this.props.site} query={this.props.query} timer={this.props.timer} />
</div>

Expand Down
0 assets/js/dashboard/stats/geo/countries.js → ...js/dashboard/stats/locations/countries.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions assets/js/dashboard/stats/geo/index.js → assets/js/dashboard/stats/locations/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const labelFor = {
'cities': 'Cities',
}

export default class Geo extends React.Component {
export default class Locations extends React.Component {
constructor(props) {
super(props)
this.tabKey = `geoTab__${ props.site.domain}`
Expand Down Expand Up @@ -71,7 +71,7 @@ export default class Geo extends React.Component {
>
<div className="w-full flex justify-between">
<h3 className="font-bold dark:text-gray-100">
{labelFor[this.state.mode] || 'Geolocation'}
{labelFor[this.state.mode] || 'Locations'}
</h3>
<ul className="flex font-medium text-xs text-gray-500 dark:text-gray-400 space-x-2">
{ this.renderPill('Map', 'map') }
Expand Down
0 assets/js/dashboard/stats/geo/map.js → assets/js/dashboard/stats/locations/map.js
View file
Open in desktop
File renamed without changes.