diff --git a/assets/.prettierrc.json b/assets/.prettierrc.json index a41b03441..d29fc41d0 100644 --- a/assets/.prettierrc.json +++ b/assets/.prettierrc.json @@ -1,5 +1,6 @@ { "singleQuote": true, "requirePragma": true, - "insertPragma": true + "trailingComma": "none", + "semi": false } diff --git a/assets/js/dashboard/components/search-select.js b/assets/js/dashboard/components/search-select.js index a1f28da31..3acf74c6a 100644 --- a/assets/js/dashboard/components/search-select.js +++ b/assets/js/dashboard/components/search-select.js @@ -3,7 +3,7 @@ import React, {useState, useCallback} from 'react' import {useCombobox} from 'downshift' import classNames from 'classnames' import debounce from 'debounce-promise' -import { ChevronDownIcon } from '@heroicons/react/solid' +import { ChevronDownIcon } from '@heroicons/react/20/solid' function selectInputText(e) { e.target.select() diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js index a9ef9409d..7ddd35be3 100644 --- a/assets/js/dashboard/datepicker.js +++ b/assets/js/dashboard/datepicker.js @@ -1,7 +1,7 @@ import React, { Fragment } from "react"; import { withRouter } from "react-router-dom"; import Flatpickr from "react-flatpickr"; -import { ChevronDownIcon } from '@heroicons/react/solid' +import { ChevronDownIcon } from '@heroicons/react/20/solid' import { Transition } from '@headlessui/react' import { shiftDays, diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js index 950744e8a..98413e60a 100644 --- a/assets/js/dashboard/filters.js +++ b/assets/js/dashboard/filters.js @@ -1,6 +1,6 @@ import React, { Fragment, useState } from 'react'; import { Link, withRouter } from 'react-router-dom' -import { AdjustmentsIcon, SearchIcon, XIcon, PencilIcon } from '@heroicons/react/solid' +import { AdjustmentsVerticalIcon, MagnifyingGlassIcon, XMarkIcon, PencilSquareIcon } from '@heroicons/react/20/solid' import classNames from 'classnames' import { Menu, Transition } from '@headlessui/react' @@ -95,10 +95,10 @@ function renderDropdownFilter(site, history, [key, value], query) { style={{width: 'calc(100% - 1.5rem)'}} > {filterText(key, value, query)} - + removeFilter(key, history, query)}> - + @@ -241,7 +241,7 @@ class Filters extends React.Component { {filterText(key, value, query)} removeFilter(key, history, query)}> - + ) @@ -252,7 +252,7 @@ class Filters extends React.Component { const filterCount = appliedFilters(this.props.query).length return ( <> -