Skip to content

Fix lint search mobile #903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix lint search mobile #903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions frontend/src/components/navigation/SearchMobile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@
import { campRoute } from '@/router'
import ActivityList from '@/components/camp/ActivityList'

const anyOf = function (terms) {
if (!Array.isArray(terms)) {
throw new Error('terms must be used with an array')
}
return {
matches (filter) {
return terms.map(term => term.toLowerCase()).some(term => term.includes(filter.toLowerCase()))
}
}
}

export default {
name: 'SearchMobile',
components: { ActivityList },
Expand All @@ -91,23 +102,24 @@ export default {
},
filteredCamps () {
return this.filter
? this.camps.items.filter((camp) => {
return camp.title.toLowerCase().includes(this.filter.toLowerCase()) || camp.name.toLowerCase().includes(this.filter.toLowerCase()) || camp.motto.toLowerCase().includes(this.filter.toLowerCase())
}).slice(0, 3)
? this.camps.items
.filter((camp) => anyOf([camp.title, camp.name, camp.motto]).matches(this.filter))
.slice(0, 3)
: this.camps.items.slice(0, 3)
},
scheduleEntries () {
return this.period().scheduleEntries()
},
filteredScheduleEntries () {
return this.filter
? this.scheduleEntries.items.filter((scheduleEntry) => {
return scheduleEntry.number.toLowerCase().includes(this.filter.toLowerCase()) ||
scheduleEntry.activity().title.toLowerCase().includes(this.filter.toLowerCase()) ||
scheduleEntry.activity().activityCategory().name.toLowerCase().includes(this.filter.toLowerCase()) ||
scheduleEntry.activity().activityCategory().short.toLowerCase().includes(this.filter.toLowerCase()) ||
scheduleEntry.activity().activityCategory().short.toLowerCase().includes(this.filter.toLowerCase())
}).slice(0, 3)
? this.scheduleEntries.items
.filter((scheduleEntry) => anyOf([
scheduleEntry.number,
scheduleEntry.activity().title,
scheduleEntry.activity().activityCategory().name,
scheduleEntry.activity().activityCategory().short
]).matches(this.filter))
.slice(0, 3)
: this.scheduleEntries.items.slice(0, 3)
}
},
Expand Down