Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Remove datepicker arrows on mobile
Uku Tahtd6662f1f69cf
diff --git a/assets/js/dashboard/datepicker-arrows.js b/assets/js/dashboard/datepicker-arrows.jsdeleted file mode 100644index 8d6ec9e985..0000000000--- 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 (- <div className="flex rounded shadow bg-white mr-4 cursor-pointer dark:bg-gray-800">- <QueryButton- to={{ date: prevDate }}- query={query}- className={leftClasses}- disabled={disabledLeft}- >- <svg- className="feather h-4 w-4"- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 24 24"- fill="none"- stroke="currentColor"- strokeWidth="2"- strokeLinecap="round"- strokeLinejoin="round"- >- <polyline points="15 18 9 12 15 6"></polyline>- </svg>- </QueryButton>- <QueryButton- to={{ date: nextDate }}- query={query}- className={rightClasses}- disabled={disabledRight}- >- <svg- className="feather h-4 w-4"- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 24 24"- fill="none"- stroke="currentColor"- strokeWidth="2"- strokeLinecap="round"- strokeLinejoin="round"- >- <polyline points="9 18 15 12 9 6"></polyline>- </svg>- </QueryButton>- </div>- );-}--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.jsindex f047d225af..51042f2945 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 (+ <div className="hidden md:flex rounded shadow bg-white mr-4 cursor-pointer dark:bg-gray-800">+ <QueryButton+ to={{ date: prevDate }}+ query={query}+ className={leftClasses}+ disabled={disabledLeft}+ >+ <svg+ className="feather h-4 w-4"+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ strokeWidth="2"+ strokeLinecap="round"+ strokeLinejoin="round"+ >+ <polyline points="15 18 9 12 15 6"></polyline>+ </svg>+ </QueryButton>+ <QueryButton+ to={{ date: nextDate }}+ query={query}+ className={rightClasses}+ disabled={disabledRight}+ >+ <svg+ className="feather h-4 w-4"+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ strokeWidth="2"+ strokeLinecap="round"+ strokeLinejoin="round"+ >+ <polyline points="9 18 15 12 9 6"></polyline>+ </svg>+ </QueryButton>+ </div>+ );+}++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 (<QueryLinkto={{from: false, to: false, period, ...opts}}- onClick={this.close.bind(this)}+ onClick={this.close}query={this.props.query}className={`${boldClass } px-4 py-2 text-sm leading-tight hover:bg-gray-100 hover:text-gray-900dark:hover:bg-gray-900 hover:text-gray-900 dark:hover:text-gray-100 flex items-center justify-between`}@@ -264,51 +377,17 @@ class DatePicker extends React.Component {animate: true}}ref={calendar => this.calendar = calendar}className="invisible"- onChange={this.setCustomDate.bind(this)}+ onChange={this.setCustomDate}/></div>)}}- 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 (<div- className={classNames('md:relative', this.props.className)}+ className="w-28 sm:w-36 md:w-44 md:relative"ref={(node) => (this.dropDownNode = node)}><div@@ -333,18 +412,27 @@ class DatePicker extends React.Component {<Transitionshow={this.state.open}as={Fragment}- enter="transition ease-out duration-100"- enterFrom="transform opacity-0 scale-95"- enterTo="transform opacity-100 scale-100"- leave="transition ease-in duration-75"- leaveFrom="transform opacity-100 scale-100"- leaveTo="transform opacity-0 scale-95"+ enter="transition ease-out duration-100"+ enterFrom="transform opacity-0 scale-95"+ enterTo="transform opacity-100 scale-100"+ leave="transition ease-in duration-75"+ leaveFrom="transform opacity-100 scale-100"+ leaveTo="transform opacity-0 scale-95">{this.renderDropDownContent()}</Transition></div>);}++ render() {+ return (+ <div className="flex ml-auto pl-2">+ <DatePickerArrows site={this.props.site} query={this.props.query} />+ {this.renderPicker()}+ </div>+ )+ }}export default withRouter(DatePicker);diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.jsindex 7bc021be76..fa4fdd02ee 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 {<CurrentVisitors timer={this.props.timer} site={this.props.site} query={this.props.query} /><Filters className="flex" site={this.props.site} query={this.props.query} history={this.props.history} /></div>- <div className="flex ml-auto pl-2">- <DatepickerArrows site={this.props.site} query={this.props.query} />- <Datepicker className="w-28 sm:w-36 md:w-44" site={this.props.site} query={this.props.query} />- </div>+ <Datepicker site={this.props.site} query={this.props.query} /></div></div><VisitorGraph site={this.props.site} query={this.props.query} />diff --git a/assets/js/dashboard/realtime.js b/assets/js/dashboard/realtime.jsindex de3dbd0c74..9b021bfe44 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 {<SiteSwitcher site={this.props.site} loggedIn={this.props.loggedIn} currentUserRole={this.props.currentUserRole} /><Filters className="flex" site={this.props.site} query={this.props.query} history={this.props.history} /></div>- <div className="flex ml-auto pl-2">- <DatepickerArrows site={this.props.site} query={this.props.query} />- <Datepicker className="w-28 sm:w-36 md:w-44" site={this.props.site} query={this.props.query} />- </div>+ <Datepicker site={this.props.site} query={this.props.query} /></div></div><VisitorGraph site={this.props.site} query={this.props.query} timer={this.props.timer} />