diff --git a/assets/js/dashboard/datepicker-arrows.js b/assets/js/dashboard/datepicker-arrows.js
deleted file mode 100644
index 8d6ec9e98..000000000
--- a/assets/js/dashboard/datepicker-arrows.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import React from "react";
-import {
- shiftDays,
- shiftMonths,
- formatISO,
- nowForSite,
- parseUTCDate,
- isBefore,
- isAfter,
-} from "./date";
-import { QueryButton } from "./query";
-
-function renderArrow(query, site, period, prevDate, nextDate) {
- const insertionDate = parseUTCDate(site.insertedAt);
- const disabledLeft = isBefore(
- parseUTCDate(prevDate),
- insertionDate,
- period
- );
- const disabledRight = isAfter(
- parseUTCDate(nextDate),
- nowForSite(site),
- period
- );
-
- const leftClasses = `flex items-center px-2 border-r border-gray-300 rounded-l
- dark:border-gray-500 dark:text-gray-100 ${
- disabledLeft ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-100 dark:hover:bg-gray-900"
- }`;
- const rightClasses = `flex items-center px-2 rounded-r dark:text-gray-100 ${
- disabledRight ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-100 dark:hover:bg-gray-900"
- }`;
- return (
-
- );
-}
-
-export default function DatePickerArrows({site, query}) {
- if (query.period === "month") {
- const prevDate = formatISO(shiftMonths(query.date, -1));
- const nextDate = formatISO(shiftMonths(query.date, 1));
-
- return renderArrow(query, site, "month", prevDate, nextDate);
- } if (query.period === "day") {
- const prevDate = formatISO(shiftDays(query.date, -1));
- const nextDate = formatISO(shiftDays(query.date, 1));
-
- return renderArrow(query, site, "day", prevDate, nextDate);
- }
-
- return null
-}
diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js
index f047d225a..51042f294 100644
--- a/assets/js/dashboard/datepicker.js
+++ b/assets/js/dashboard/datepicker.js
@@ -1,8 +1,8 @@
import React, { Fragment } from "react";
import { withRouter } from "react-router-dom";
import Flatpickr from "react-flatpickr";
-import classNames from 'classnames'
import { ChevronDownIcon } from '@heroicons/react/solid'
+import { Transition } from '@headlessui/react'
import {
shiftDays,
shiftMonths,
@@ -19,15 +19,96 @@ import {
isBefore,
isAfter,
} from "./date";
-import { Transition } from '@headlessui/react'
import { navigateToQuery, QueryLink, QueryButton } from "./query";
+function renderArrow(query, site, period, prevDate, nextDate) {
+ const insertionDate = parseUTCDate(site.insertedAt);
+ const disabledLeft = isBefore(
+ parseUTCDate(prevDate),
+ insertionDate,
+ period
+ );
+ const disabledRight = isAfter(
+ parseUTCDate(nextDate),
+ nowForSite(site),
+ period
+ );
+
+ const leftClasses = `flex items-center px-2 border-r border-gray-300 rounded-l
+ dark:border-gray-500 dark:text-gray-100 ${
+ disabledLeft ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-100 dark:hover:bg-gray-900"
+ }`;
+ const rightClasses = `flex items-center px-2 rounded-r dark:text-gray-100 ${
+ disabledRight ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-100 dark:hover:bg-gray-900"
+ }`;
+ return (
+
+ );
+}
+
+function DatePickerArrows({site, query}) {
+ if (query.period === "month") {
+ const prevDate = formatISO(shiftMonths(query.date, -1));
+ const nextDate = formatISO(shiftMonths(query.date, 1));
+
+ return renderArrow(query, site, "month", prevDate, nextDate);
+ } if (query.period === "day") {
+ const prevDate = formatISO(shiftDays(query.date, -1));
+ const nextDate = formatISO(shiftDays(query.date, 1));
+
+ return renderArrow(query, site, "day", prevDate, nextDate);
+ }
+
+ return null
+}
+
class DatePicker extends React.Component {
constructor(props) {
super(props);
this.handleKeydown = this.handleKeydown.bind(this);
this.handleClick = this.handleClick.bind(this);
+ this.setCustomDate = this.setCustomDate.bind(this);
this.openCalendar = this.openCalendar.bind(this);
+ this.close = this.close.bind(this);
this.toggle = this.toggle.bind(this);
this.state = { mode: "menu", open: false };
}
@@ -46,7 +127,7 @@ class DatePicker extends React.Component {
const { query, history } = this.props;
if (e.target.tagName === 'INPUT') return true;
- if (e.ctrlKey || e.metaKey || e.altKey || e.isComposing || e.keyCode === 229) return;
+ if (e.ctrlKey || e.metaKey || e.altKey || e.isComposing || e.keyCode === 229) return true;
const newSearch = {
period: false,
@@ -108,8 +189,6 @@ class DatePicker extends React.Component {
if (keys.includes(e.key.toLowerCase())) {
navigateToQuery(history, query, {...newSearch, ...(redirects[keys.indexOf(e.key.toLowerCase())])});
- } else if (e.key.toLowerCase() === 'f') {
- return history.push({pathname: `/${encodeURIComponent(this.props.site.domain)}/filter`, search: window.location.search})
} else if (e.key.toLowerCase() === 'c') {
this.setState({mode: 'calendar', open: true}, this.openCalendar);
} else if (newSearch.date) {
@@ -123,6 +202,36 @@ class DatePicker extends React.Component {
this.setState({ open: false });
}
+ setCustomDate(dates) {
+ if (dates.length === 2) {
+ const [from, to] = dates
+ if (formatISO(from) === formatISO(to)) {
+ navigateToQuery(
+ this.props.history,
+ this.props.query,
+ {
+ period: 'day',
+ date: formatISO(from),
+ from: false,
+ to: false,
+ }
+ )
+ } else {
+ navigateToQuery(
+ this.props.history,
+ this.props.query,
+ {
+ period: 'custom',
+ date: false,
+ from: formatISO(from),
+ to: formatISO(to),
+ }
+ )
+ }
+ this.close()
+ }
+ }
+
timeFrameText() {
const { query, site } = this.props;
@@ -152,13 +261,17 @@ class DatePicker extends React.Component {
toggle() {
const newMode = this.state.mode === 'calendar' && !this.state.open ? 'menu' : this.state.mode
- this.setState({ mode: newMode, open: !this.state.open });
+ this.setState(prevState => ({ mode: newMode, open: !prevState.open }));
}
close() {
this.setState({ open: false });
}
+ openCalendar() {
+ this.calendar && this.calendar.flatpickr.open();
+ }
+
renderLink(period, text, opts = {}) {
const { query, site } = this.props;
let boldClass;
@@ -186,7 +299,7 @@ class DatePicker extends React.Component {
return (
this.calendar = calendar}
className="invisible"
- onChange={this.setCustomDate.bind(this)}
+ onChange={this.setCustomDate}
/>
)
}
}
- setCustomDate(dates) {
- if (dates.length === 2) {
- const [from, to] = dates
- if (formatISO(from) === formatISO(to)) {
- navigateToQuery(
- this.props.history,
- this.props.query,
- {
- period: 'day',
- date: formatISO(from),
- from: false,
- to: false,
- }
- )
- } else {
- navigateToQuery(
- this.props.history,
- this.props.query,
- {
- period: 'custom',
- date: false,
- from: formatISO(from),
- to: formatISO(to),
- }
- )
- }
- this.close()
- }
- }
-
- openCalendar() {
- this.calendar && this.calendar.flatpickr.open();
- }
-
- render() {
+ renderPicker() {
return (
(this.dropDownNode = node)}
>
{this.renderDropDownContent()}
);
}
+
+ render() {
+ return (
+
+
+ {this.renderPicker()}
+
+ )
+ }
}
export default withRouter(DatePicker);
diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.js
index 7bc021be7..fa4fdd02e 100644
--- a/assets/js/dashboard/historical.js
+++ b/assets/js/dashboard/historical.js
@@ -1,7 +1,6 @@
import React from 'react';
import Datepicker from './datepicker'
-import DatepickerArrows from './datepicker-arrows'
import SiteSwitcher from './site-switcher'
import Filters from './filters'
import CurrentVisitors from './stats/current-visitors'
@@ -39,10 +38,7 @@ class Historical extends React.Component {
-
-
-
-
+
diff --git a/assets/js/dashboard/realtime.js b/assets/js/dashboard/realtime.js
index de3dbd0c7..9b021bfe4 100644
--- a/assets/js/dashboard/realtime.js
+++ b/assets/js/dashboard/realtime.js
@@ -1,7 +1,6 @@
import React from 'react';
import Datepicker from './datepicker'
-import DatepickerArrows from './datepicker-arrows'
import SiteSwitcher from './site-switcher'
import Filters from './filters'
import VisitorGraph from './stats/visitor-graph'
@@ -37,10 +36,7 @@ class Realtime extends React.Component {
-
-
-
-
+