2 version of filtering and persist filter settings.
This commit is contained in:
Krzysztof Płaczek
114
index.html
114
index.html
@@ -13,8 +13,8 @@
|
||||
<body>
|
||||
|
||||
<div x-data="bookmeterList">
|
||||
<div x-data="{ advancedSearch: $persist(0).as('advanced-search')}" x-cloak>
|
||||
<form class="flex items-center m-4">
|
||||
<div x-cloak>
|
||||
<form class="flex items-center m-2" x-show="!advancedSearch">
|
||||
<div class="relative w-full d-block max-w-md ">
|
||||
<div class="absolute inset-y-0 start-0 flex items-center ps-3 pointer-events-none">
|
||||
<svg class="w-4 h-4 text-gray-500" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 21 21">
|
||||
@@ -30,18 +30,50 @@
|
||||
</button>
|
||||
</div>
|
||||
<div class="relative inline-block m-4 text-blue-400 inline cursor-pointer">
|
||||
<div @click="advancedSearch = !advancedSearch">advanced search toggle</div>
|
||||
<div @click="advancedSearch = true">zaawansowane filtrowanie</div>
|
||||
</div>
|
||||
</form>
|
||||
<div x-show="advancedSearch" class="flex m-4">
|
||||
<input x-model="username" placeholder="użytkownik" type="text" class="mr-2 max-w-xs bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:outline focus:outline-sky-500 block w-full p-2.5 px-4" />
|
||||
<input x-model="title" placeholder="tytuł" type="text" class="mr-2 max-w-xs bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:outline focus:outline-sky-500 block w-full p-2.5 px-4" />
|
||||
<input x-model="author" placeholder="autor" type="text" class="mr-2 max-w-xs bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:outline focus:outline-sky-500 block w-full p-2.5 px-4" />
|
||||
<input x-model="publisher" placeholder="wydawca" type="text" class="mr-2 max-w-xs bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:outline focus:outline-sky-500 block w-full p-2.5 px-4" />
|
||||
<div class="relative w-full d-block max-w-xs mr-2">
|
||||
<input x-model="username" placeholder="użytkownik" type="text" class="peer mr-2 max-w-xs bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:outline focus:outline-sky-500 block w-full p-2.5 px-4" />
|
||||
<button x-show="username.length" @click="username=''" type="button" class="absolute inset-y-0 end-0 flex items-center pe-3 invisible peer-valid:visible">
|
||||
<svg class="w-4 h-4 text-gray-500 " xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12"/>
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
<div class="relative w-full d-block max-w-xs mr-2">
|
||||
<input x-model="title" placeholder="tytuł" type="text" class="peer mr-2 max-w-xs bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:outline focus:outline-sky-500 block w-full p-2.5 px-4" />
|
||||
<button x-show="title.length" @click="title=''" type="button" class="absolute inset-y-0 end-0 flex items-center pe-3 invisible peer-valid:visible">
|
||||
<svg class="w-4 h-4 text-gray-500 " xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12"/>
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
<div class="relative w-full d-block max-w-xs mr-2">
|
||||
<input x-model="author" placeholder="autor" type="text" class="peer mr-2 max-w-xs bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:outline focus:outline-sky-500 block w-full p-2.5 px-4" />
|
||||
<button x-show="author.length" @click="author=''" type="button" class="absolute inset-y-0 end-0 flex items-center pe-3 invisible peer-valid:visible">
|
||||
<svg class="w-4 h-4 text-gray-500 " xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12"/>
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
<div class="relative w-full d-block max-w-xs mr-2">
|
||||
<input x-model="publisher" placeholder="wydawca" type="text" class="peer mr-2 max-w-xs bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:outline focus:outline-sky-500 block w-full p-2.5 px-4" />
|
||||
<button x-show="publisher.length" @click="author=''" type="button" class="absolute inset-y-0 end-0 flex items-center pe-3 invisible peer-valid:visible">
|
||||
<svg class="w-4 h-4 text-gray-500 " xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12"/>
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="inline-block m-2 text-blue-400 inline cursor-pointer">
|
||||
<div @click="advancedSearch = false">proste filtrowanie</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table class="table table-fixed w-full">
|
||||
<table class="table table-fixed w-full text-sm">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-right pl-1 w-[4rem]">#</th>
|
||||
@@ -49,26 +81,54 @@
|
||||
<th class="text-left pl-1">Tytuł</th>
|
||||
<th class="text-left pl-1">Autor</th>
|
||||
<th class="text-left pl-1">Wydawca</th>
|
||||
<th class="text-right pr-4 w-[5rem]">Stron</th>
|
||||
<th class="text-left pl-1">Format</th>
|
||||
<th class="text-right pr-4">Ocena</th>
|
||||
<th class="text-right pr-4">⚡</th>
|
||||
<th class="text-left pl-1">Link</th>
|
||||
<th class="text-right pr-4 w-[7rem]">Stron</th>
|
||||
<th class="text-left pl-1 w-[12rem]">Format</th>
|
||||
<th class="text-right w-[5rem]">Ocena</th>
|
||||
<th class="text-right pr-4 w-[5rem]">⚡</th>
|
||||
<th class="text-left pl-1 w-[5rem]">Link</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template x-for="(item, key) in filteredItems" :key="item.index">
|
||||
<tr class="text-base border-b border-slate-100 m-3 w-auto hover:bg-gray-100">
|
||||
<tr class="border-b border-slate-100 m-3 w-auto hover:bg-gray-100">
|
||||
<td class="pl-1 text-right" x-text="filteredItems.length-key"></td>
|
||||
<td class="pl-1 w-3 py-2"><a :href="'?filter=@'+item.username" x-text="item.username"></a></td>
|
||||
<td class="pl-1 w-12"><a :href="'?filter='+item.book.title" x-text="item.book.title"></a></td>
|
||||
<td class="pl-1 w-8"><a :href="'?filter='+item.book.author" x-text="item.book.author"></a></td>
|
||||
<td class="pl-1 w-8"><a :href="'?filter='+item.book.publisher" x-text="item.book.publisher"></a></td>
|
||||
<td class="pl-1 w-3 py-2">
|
||||
<template x-if="!advancedSearch">
|
||||
<a @click="nameFilter='@'+item.username" class="cursor-pointer" x-text="item.username"></a>
|
||||
</template>
|
||||
<template x-if="advancedSearch">
|
||||
<a @click="username=item.username" class="cursor-pointer" x-text="item.username"></a>
|
||||
</template>
|
||||
</td>
|
||||
<td class="pl-1 w-12">
|
||||
<template x-if="!advancedSearch">
|
||||
<a @click="nameFilter=item.book.title" class="cursor-pointer" x-text="item.book.title"></a>
|
||||
</template>
|
||||
<template x-if="advancedSearch">
|
||||
<a @click="title=item.book.title" class="cursor-pointer" x-text="item.book.title"></a>
|
||||
</template>
|
||||
</td>
|
||||
<td class="pl-1 w-8">
|
||||
<template x-if="!advancedSearch">
|
||||
<a @click="nameFilter=item.book.author" class="cursor-pointer" x-text="item.book.author"></a>
|
||||
</template>
|
||||
<template x-if="advancedSearch">
|
||||
<a @click="author=item.book.author" class="cursor-pointer" x-text="item.book.author"></a>
|
||||
</template>
|
||||
</td>
|
||||
<td class="pl-1 w-8">
|
||||
<template x-if="!advancedSearch">
|
||||
<a @click="nameFilter=item.book.publisher" class="cursor-pointer" x-text="item.book.publisher"></a>
|
||||
</template>
|
||||
<template x-if="advancedSearch">
|
||||
<a @click="publisher=item.book.publisher" class="cursor-pointer" x-text="item.book.publisher"></a>
|
||||
</template>
|
||||
</td>
|
||||
<td class="pr-4 text-right w-[5rem] w-[5rem]"><a :href="item.book.pages" x-text="item.book.pages"></a></td>
|
||||
<td class="pl-1 w-1"><a :href="item.book.format" x-text="item.book.format"></a></td>
|
||||
<td class="pr-4 w-1 text-right"><a :href="item.book.rating" x-text="item.book.rating"></a></td>
|
||||
<td class="pr-4 w-1 text-right"><a :href="item.book.likes" x-text="item.likes"></a></td>
|
||||
<td class="pl-1 w-1 py-2">
|
||||
<td class="pl-1"><a :href="item.book.format" x-text="item.book.format"></a></td>
|
||||
<td class="text-right"><a :href="item.book.rating" x-text="item.book.rating"></a></td>
|
||||
<td class="pr-4 text-right"><a :href="item.book.likes" x-text="item.likes"></a></td>
|
||||
<td class="pl-1 py-2">
|
||||
<a :href="'https://www.hejto.pl/wpis/'+item.slug">
|
||||
link
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4 text-gray-500 inline">
|
||||
@@ -82,8 +142,8 @@
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr x-show="filteredItems.length">
|
||||
<td colspan="5"></td>
|
||||
<td class="align-top">
|
||||
<td colspan="4"></td>
|
||||
<td class="align-top" colspan="2">
|
||||
<p class="text-right pr-4" x-text="'strony: '+stats().pages_total"></p>
|
||||
<p class="text-right pr-4" x-text="'strony śr: '+stats().pages_avg"></p>
|
||||
</td>
|
||||
@@ -93,11 +153,11 @@
|
||||
</template>
|
||||
</td>
|
||||
<td class="align-top">
|
||||
<p class="text-right pr-4" x-text="'ocena śr: '+stats().rating_avg"></p>
|
||||
<p class="text-right" x-text="'ocena śr: '+stats().rating_avg"></p>
|
||||
</td>
|
||||
<td>
|
||||
<p class="text-right pr-4" x-text="'⚡: '+stats().likes_total"></p>
|
||||
<p class="text-right pr-4" x-text="'⚡ śr: '+stats().likes_avg"></p>
|
||||
<p class="text-right" x-text="'⚡: '+stats().likes_total"></p>
|
||||
<p class="text-right" x-text="'⚡ śr: '+stats().likes_avg"></p>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
11
src/main.js
11
src/main.js
@@ -6,7 +6,8 @@ import persist from '@alpinejs/persist'
|
||||
window.Alpine = Alpine;
|
||||
Alpine.plugin(persist)
|
||||
|
||||
Alpine.data('bookmeterList', () => ({
|
||||
Alpine.data('bookmeterList', function () {
|
||||
return {
|
||||
items: [],
|
||||
filteredItems: [],
|
||||
username: '',
|
||||
@@ -14,6 +15,7 @@ Alpine.data('bookmeterList', () => ({
|
||||
title: '',
|
||||
author: '',
|
||||
nameFilter: '',
|
||||
advancedSearch: this.$persist(0).as('advanced-search'),
|
||||
async init() {
|
||||
this.$watch('nameFilter', () => this.updateFilter());
|
||||
this.$watch('username', () => this.updateFilter());
|
||||
@@ -46,17 +48,19 @@ Alpine.data('bookmeterList', () => ({
|
||||
let filter = this.nameFilter.toLowerCase();
|
||||
|
||||
this.filteredItems = this.items.filter(i => {
|
||||
|
||||
if(this.advancedSearch) {
|
||||
return (
|
||||
(!this.username || i.username.toLowerCase().includes(this.username.toLowerCase())) &&
|
||||
(!this.title || i.book.title.toLowerCase().includes(this.title.toLowerCase())) &&
|
||||
(!this.author || i.book.author.toLowerCase().includes(this.author.toLowerCase())) &&
|
||||
(!this.publisher || i.book.publisher.toLowerCase().includes(this.publisher.toLowerCase()))
|
||||
);
|
||||
} else {
|
||||
if(filter.startsWith('@') && i.username.toLowerCase().includes(filter.substring(1))) return true;
|
||||
if (i.username.toLowerCase().includes(filter) ||
|
||||
i.book.title.toLowerCase().includes(filter) || i.book.author.toLowerCase().includes(filter) || i.book.publisher.toLowerCase().includes(filter)) return true;
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
this.updateURL();
|
||||
@@ -67,5 +71,6 @@ Alpine.data('bookmeterList', () => ({
|
||||
|
||||
history.replaceState(null, null, "?"+qp.toString());
|
||||
}
|
||||
}))
|
||||
}
|
||||
})
|
||||
Alpine.start();
|
||||
|
||||
Reference in New Issue
Block a user