From 4e3f07f3378280a78037cea955d77c9ec1a9ef04 Mon Sep 17 00:00:00 2001 From: Bernt Christian Egeland Date: Sun, 12 Dec 2021 00:58:21 +0100 Subject: [PATCH] Hide filters on xs, Button to show --- web/src/components/DatePicker.jsx | 10 ++- web/src/routes/Events/components/filters.jsx | 83 +++++++++++--------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/web/src/components/DatePicker.jsx b/web/src/components/DatePicker.jsx index 14b9c8a45..b751128ae 100644 --- a/web/src/components/DatePicker.jsx +++ b/web/src/components/DatePicker.jsx @@ -59,7 +59,7 @@ export const DateFilterOptions = [ export default function DatePicker({ helpText, - keyboardType = 'date', + keyboardType = 'text', inputRef, label, leadingIcon: LeadingIcon, @@ -123,10 +123,15 @@ export default function DatePicker({ className="flex space-x-2 items-center" data-testid={`label-${label.toLowerCase().replace(/[^\w]+/g, '_')}`} > + {LeadingIcon ? ( +
+ +
+ ) : null}
+ {helpText ?
{helpText}
: null} ); } diff --git a/web/src/routes/Events/components/filters.jsx b/web/src/routes/Events/components/filters.jsx index 553eebb60..0f28ae6a3 100644 --- a/web/src/routes/Events/components/filters.jsx +++ b/web/src/routes/Events/components/filters.jsx @@ -1,10 +1,12 @@ import { h } from 'preact'; import Filter from './filter'; import { useConfig } from '../../../api'; -import { useMemo } from 'preact/hooks'; +import { useMemo, useState } from 'preact/hooks'; import { DateFilterOptions } from '../../../components/DatePicker'; +import Button from '../../../components/Button'; const Filters = ({ onChange, searchParams }) => { + const [viewFilters, setViewFilters] = useState(false); const { data } = useConfig(); const cameras = useMemo(() => Object.keys(data.cameras), [data]); @@ -27,41 +29,52 @@ const Filters = ({ onChange, searchParams }) => { }, data.objects?.track || []) .filter((value, i, self) => self.indexOf(value) === i); }, [data]); - return ( -
- - - - +
+ +
+ + + + + + + +
); };