Skip to content
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

feat: add notification for filtered search with no results (fix #249) #250

Merged
merged 3 commits into from
Apr 1, 2020
Merged

feat: add notification for filtered search with no results (fix #249) #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14c5068
feat: add notification for filtered search with no results (fix #249)
greatislander Mar 31, 2020
1dbc82c
fix: use error instead of warning
greatislander Mar 31, 2020
9822edd
Merge branch 'dev' into fix/filtered-search
greatislander Mar 31, 2020
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
6 changes: 5 additions & 1 deletion resources/assets/scripts/routes/archive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ export default {

if (document.body.classList.contains('filtered')) {
const currentFilterCount = document.body.dataset.filters;
let msg = sprintf(_n('%s filter applied. Resource list updated.', '%s filters applied. Resource list updated.', parseInt(currentFilterCount), 'coop-library'), currentFilterCount);
if (document.body.classList.contains('search-no-results')) {
msg = sprintf(_n('%s filter applied. No resources found.', '%s filters applied. No resources found.', parseInt(currentFilterCount), 'coop-library'), currentFilterCount);
}
if ( currentFilterCount ) {
setTimeout(function() {
speak(sprintf(_n('%s filter applied. Resource list updated.', '%s filters applied. Resource list updated.', parseInt(currentFilterCount), 'coop-library'), currentFilterCount), 'assertive');
speak(msg, 'assertive');
}, 1000);
}
}
Expand Down
12 changes: 8 additions & 4 deletions resources/assets/styles/layouts/_pages.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
}
}

.search-results .notification {
.search-results .notification,
.search-no-results .notification {
margin-top: rem(30);
}

Expand All @@ -43,13 +44,15 @@
}

@include breakpoint-up(md) {
.search-results .notification {
.search-results .notification,
.search-no-results .notification {
@include grid-column-span(6, 8);
}
}

@include breakpoint-up(lg) {
.search-results .notification {
.search-results .notification,
.search-no-results .notification {
@include grid-column-span(8, 12, 5);

margin-top: rem(30);
Expand All @@ -66,7 +69,8 @@
}

@include breakpoint-up(xl) {
.search-results .notification {
.search-results .notification,
.search-no-results .notification {
@include grid-column-span(8, 16, 5);
}
}
2 changes: 2 additions & 0 deletions resources/views/partials/current-filters.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
@endforeach
@endforeach
</ul>
@if($found_posts > 0)
<p><em>{{ __('The resources shown match at least one of these filters.', 'coop-library') }}</em></p>
@endif
<p><a href="{{ get_post_type_archive_link('lc_resource') }}">{{ __('Clear all', 'coop-library') }}</a></p>
@endif
</div>
Expand Down
13 changes: 8 additions & 5 deletions resources/views/search.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,20 @@

@section('content')
@include('partials.page-header')

@if (!have_posts())
<div class="alert alert-warning">
{{ __('Sorry, no results were found.', 'coop-library') }}
</div>
@include('partials.search-form', ['placeholder' => __('Search resource name, publisher, or topic…')])
<div class="notification notification--error">
<button class="button button--borderless"><svg class="icon icon--close" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path id="close" d="m11.41 10 4.3-4.29a1 1 0 1 0 -1.42-1.42l-4.29 4.3-4.29-4.3a1 1 0 0 0 -1.42 1.42l4.3 4.29-4.3 4.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l4.29-4.3 4.29 4.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z" fill="currentColor"/></svg>
<span class="screen-reader-text">{{ __('Close notification', 'coop-library') }}</span></button>
<p class="notification__title"><svg class="icon icon--error" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><g id="error" fill="currentColor"><path d="m10.09 1a9 9 0 1 0 9 9 9 9 0 0 0 -9-9zm0 16a7 7 0 1 1 7-7 7 7 0 0 1 -7 7z"/><path d="m12.85 7.18a1 1 0 0 0 -1.41 0l-1.35 1.35-1.35-1.35a1 1 0 0 0 -1.41 0 1 1 0 0 0 0 1.42l1.35 1.4-1.35 1.29a1 1 0 0 0 1.41 1.42l1.35-1.35 1.35 1.35a1 1 0 0 0 1.41-1.42l-1.35-1.29 1.35-1.4a1 1 0 0 0 0-1.42z"/></g></svg> {{ __('No results for search', 'coop-library') }}</p>
<div class="notification__content">{{ __('Sorry, no results were found.', 'coop-library') }}</div>
</div>
@endif

@include('partials.filters')
@include('partials.sort')
@if (have_posts())
@include('partials.save-search')
@endif
@include('partials.current-filters')
<div class="resource-list">
<ul class="cards">
Expand Down