From 1f4f307f0dc68d985cf740e4564ab4d64c50bfec Mon Sep 17 00:00:00 2001 From: Sol Date: Tue, 4 Aug 2020 19:31:50 +0100 Subject: [PATCH] lint fixes --- src/components/Layout.js | 2 +- src/components/Search.jsx | 100 +++++++++++++++++------------------ src/components/SearchRow.jsx | 58 ++++++++++---------- 3 files changed, 80 insertions(+), 80 deletions(-) diff --git a/src/components/Layout.js b/src/components/Layout.js index 93936ad..38c855d 100644 --- a/src/components/Layout.js +++ b/src/components/Layout.js @@ -243,7 +243,7 @@ class Dashboard extends React.Component { } updateSearchQuery (e) { - let queryString = e.target.value; + let queryString = e.target.value this.props.actions.updateSearchQuery(queryString) } render () { diff --git a/src/components/Search.jsx b/src/components/Search.jsx index dcc6498..cd11be6 100644 --- a/src/components/Search.jsx +++ b/src/components/Search.jsx @@ -5,63 +5,63 @@ import '../scss/search.scss' import SearchRow from './SearchRow.jsx' class Search extends React.Component { - constructor(props) { - super(props) - this.state = { - isFolded : true, - searchResults: [], - queryString: '' - } - this.onButtonClick = this.onButtonClick.bind(this) - this.updateSearchQueryResults = this.updateSearchQueryResults.bind(this) + constructor(props) { + super(props) + this.state = { + isFolded : true, + searchResults: [], + queryString: '' } + this.onButtonClick = this.onButtonClick.bind(this) + this.updateSearchQueryResults = this.updateSearchQueryResults.bind(this) + } - componentDidUpdate (prevProps, prevState) { - if (prevProps.queryString !== this.props.queryString) { - this.updateSearchQueryResults (this.props.queryString) - } + componentDidUpdate (prevProps, prevState) { + if (prevProps.queryString !== this.props.queryString) { + this.updateSearchQueryResults(this.props.queryString) } + } - onButtonClick () { - this.setState(prevState => { - return { isFolded : !prevState.isFolded } - }) - } + onButtonClick () { + this.setState(prevState => { + return { isFolded: !prevState.isFolded } + }) + } - updateSearchQueryResults (queryString) { - let searchResults - if (queryString === '') { - searchResults = [] - } else { - searchResults = this.props.events.filter(event => - event.description.toLowerCase().includes(queryString.toLowerCase()) || event.location.includes(queryString) || event.category.includes(queryString) - ) - } - this.setState({ - searchResults: searchResults - }) + updateSearchQueryResults (queryString) { + let searchResults + if (queryString === '') { + searchResults = [] + } else { + searchResults = this.props.events.filter(event => + event.description.toLowerCase().includes(queryString.toLowerCase()) || event.location.includes(queryString) || event.category.includes(queryString) + ) } + this.setState({ + searchResults: searchResults + }) + } - render () { - return ( -
-
- search -
-
-
- - close -
-
- {this.state.searchResults.map(result => { - return - })} -
-
-
- ) - } + render () { + return ( +
+
+ search +
+
+
+ + close +
+
+ {this.state.searchResults.map(result => { + return + })} +
+
+
+ ) + } } export default Search; diff --git a/src/components/SearchRow.jsx b/src/components/SearchRow.jsx index b5018f8..54808fe 100644 --- a/src/components/SearchRow.jsx +++ b/src/components/SearchRow.jsx @@ -1,39 +1,39 @@ import React from 'react' const SearchRow = ({ description, category, location, date, query }) => { - function getHighlightedText(text, highlight) { - // Split text on highlight term, include term itself into parts, ignore case - const parts = text.split(new RegExp(`(${highlight})`, 'gi')); - return {parts.map(part => part.toLowerCase() === highlight.toLowerCase() ? {part} : part)}; - } + function getHighlightedText(text, highlight) { + // Split text on highlight term, include term itself into parts, ignore case + const parts = text.split(new RegExp(`(${highlight})`, 'gi')); + return { parts.map(part => part.toLowerCase() === highlight.toLowerCase() ? {part} : part) } + } - function getShortDescription(text, searchQuery) { - var regexp = new RegExp(`(([^ ]* ){0,6}[a-zA-Z]*${searchQuery.toLowerCase()}[a-zA-Z]*( [^ ]*){0,5})`, 'gm') - let parts = text.toLowerCase().match(regexp) - for (var x=0; x < (parts ? parts.length : 0); x++) { - parts[x] = '...'+parts[x] - } - const firstLine = [text.match('(([^ ]* ){0,10})', 'm')[0]] - return parts || firstLine; + function getShortDescription (text, searchQuery) { + var regexp = new RegExp(`(([^ ]* ){0,6}[a-zA-Z]*${searchQuery.toLowerCase()}[a-zA-Z]*( [^ ]*){0,5})`, 'gm') + let parts = text.toLowerCase().match(regexp) + for (var x = 0; x < (parts ? parts.length : 0); x++) { + parts[x] = '...' + parts[x] } + const firstLine = [text.match('(([^ ]* ){0,10})', 'm')[0]] + return parts || firstLine + } - return ( -
-
-
- location_on -

{getHighlightedText(location, query)}

-
-
- event -

{getHighlightedText(date, query)}

-
-
-

{getShortDescription(description, query).map(match => { - return {getHighlightedText(match, query)}...

- })}

+ return ( +
+
+
+ location_on +

{getHighlightedText(location, query)}

- ) +
+ event +

{getHighlightedText(date, query)}

+
+
+

{getShortDescription(description, query).map(match => { + return {getHighlightedText(match, query)}...
+ })}

+
+ ) } export default SearchRow