⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
changes to the searchbox
Danielc04c8e9a2e8a
diff --git a/components/Search.tsx b/components/Search.tsxindex 3c5d3d97..a5dcac94 100644--- a/components/Search.tsx+++ b/components/Search.tsx@@ -1,10 +1,13 @@+// Copyright (C) 2022-present Daniel31x13 <[email protected]>+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3.+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.+// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.+import { faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons";import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";import { useEffect, useState } from "react";-import ClickAwayHandler from "./ClickAwayHandler";import useSearchSettingsStore from "@/store/search";import { useRouter } from "next/router";-import Checkbox from "./Checkbox";export default function Search() {const router = useRouter();@@ -13,69 +16,47 @@ export default function Search() {false || router.pathname == "/search");- const { searchSettings, toggleCheckbox, setSearchQuery } =+ const { searchSettings, setSearchSettings, setSearchQuery } =useSearchSettingsStore();useEffect(() => {- if (router.pathname !== "/search") setSearchQuery("");+ if (router.pathname !== "/search")+ setSearchSettings({+ query: "",+ filter: {+ name: true,+ url: true,+ title: true,+ collection: true,+ tags: true,+ },+ });}, [router]);return (- <ClickAwayHandler onClickOutside={() => setSearchBox(false)}>- <div- className="flex items-center relative"- onClick={() => setSearchBox(true)}+ <div+ className="flex items-center relative"+ onClick={() => setSearchBox(true)}+ >+ <label+ htmlFor="search-box"+ className="inline-flex w-fit absolute right-0 pointer-events-none rounded-md p-1 text-sky-500">- <label- htmlFor="search-box"- className="inline-flex w-fit absolute right-0 pointer-events-none rounded-md p-1 text-sky-500"- >- <FontAwesomeIcon icon={faMagnifyingGlass} className="w-5 h-5" />- </label>+ <FontAwesomeIcon icon={faMagnifyingGlass} className="w-5 h-5" />+ </label>- <input- id="search-box"- type="text"- placeholder="Search for Links"- value={searchSettings.query}- onChange={(e) => setSearchQuery(e.target.value)}- onFocus={() => router.push("/search")}- autoFocus={searchBox}- className="border border-sky-100 rounded-md pr-6 w-60 focus:border-sky-500 sm:focus:w-80 hover:border-sky-500 duration-100 outline-none p-1"- />- {searchBox ? (- <div className="absolute top-9 left-0 shadow-md bg-gray-50 rounded-md p-2 z-20 border border-sky-100 w-60 sm:w-80">- <div className="grid grid-cols-2 gap-x-5 gap-y-2 w-fit mx-auto">- <p className="text-sky-900 font-semibold">Filter by</p>- <Checkbox- label="Name"- state={searchSettings.filter.name}- onClick={() => toggleCheckbox("name")}- />- <Checkbox- label="Link"- state={searchSettings.filter.url}- onClick={() => toggleCheckbox("url")}- />- <Checkbox- label="Title"- state={searchSettings.filter.title}- onClick={() => toggleCheckbox("title")}- />- <Checkbox- label="Collection"- state={searchSettings.filter.collection}- onClick={() => toggleCheckbox("collection")}- />- <Checkbox- label="Tags"- state={searchSettings.filter.tags}- onClick={() => toggleCheckbox("tags")}- />- </div>- </div>- ) : null}- </div>- </ClickAwayHandler>+ <input+ id="search-box"+ type="text"+ placeholder="Search for Links"+ value={searchSettings.query}+ onChange={(e) => {+ setSearchQuery(e.target.value);+ router.push("/search");+ }}+ autoFocus={searchBox}+ className="border border-sky-100 rounded-md pr-6 w-60 focus:border-sky-500 sm:focus:w-80 hover:border-sky-500 duration-100 outline-none p-1"+ />+ </div>);}diff --git a/pages/search.tsx b/pages/search.tsxindex 8bb25cbf..2d448e1c 100644--- a/pages/search.tsx+++ b/pages/search.tsx@@ -3,53 +3,208 @@// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.+import Checkbox from "@/components/Checkbox";+import ClickAwayHandler from "@/components/ClickAwayHandler";import LinkList from "@/components/LinkList";+import RadioButton from "@/components/RadioButton";import MainLayout from "@/layouts/MainLayout";import useLinkStore from "@/store/links";import useSearchSettingsStore from "@/store/search";-import { ExtendedLink } from "@/types/global";-import { faSearch } from "@fortawesome/free-solid-svg-icons";+import { faFilter, faSearch, faSort } from "@fortawesome/free-solid-svg-icons";import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";-import { useEffect, useState } from "react";+import { ChangeEvent, useEffect, useState } from "react";export default function Links() {const { links } = useLinkStore();- const [filteredLinks, setFilteredLinks] = useState<ExtendedLink[]>([]);+ const [filterDropdown, setFilterDropdown] = useState(false);+ const [sortDropdown, setSortDropdown] = useState(false);+ const [sortBy, setSortBy] = useState("Name (A-Z)");+ const [sortedLinks, setSortedLinks] = useState(links);+ const { searchSettings, toggleCheckbox, setSearchSettings, setSearchQuery } =+ useSearchSettingsStore();- const { searchSettings } = useSearchSettingsStore();+ const handleSortChange = (event: ChangeEvent<HTMLInputElement>) => {+ setSortBy(event.target.value);+ };- useEffect(() => {- const { name, url, title, collection, tags } = searchSettings.filter;+ const { name, url, title, collection, tags } = searchSettings.filter;- const filter = links.filter((link) => {- const query = searchSettings.query.toLowerCase();+ useEffect(() => {+ const linksArray = [+ ...links.filter((link) => {+ const query = searchSettings.query.toLowerCase();- if (- (name && link.name.toLowerCase().includes(query)) ||- (url && link.url.toLowerCase().includes(query)) ||- (title && link.title.toLowerCase().includes(query)) ||- (collection && link.collection.name.toLowerCase().includes(query)) ||- (tags &&- link.tags.some((tag) => tag.name.toLowerCase().includes(query)))- )- return true;- });+ if (+ (name && link.name.toLowerCase().includes(query)) ||+ (url && link.url.toLowerCase().includes(query)) ||+ (title && link.title.toLowerCase().includes(query)) ||+ (collection && link.collection.name.toLowerCase().includes(query)) ||+ (tags &&+ link.tags.some((tag) => tag.name.toLowerCase().includes(query)))+ )+ return true;+ }),+ ];- setFilteredLinks(filter);- }, [searchSettings, links]);+ if (sortBy === "Name (A-Z)")+ setSortedLinks(linksArray.sort((a, b) => a.name.localeCompare(b.name)));+ else if (sortBy === "Title (A-Z)")+ setSortedLinks(linksArray.sort((a, b) => a.title.localeCompare(b.title)));+ else if (sortBy === "Name (Z-A)")+ setSortedLinks(linksArray.sort((a, b) => b.name.localeCompare(a.name)));+ else if (sortBy === "Title (Z-A)")+ setSortedLinks(linksArray.sort((a, b) => b.title.localeCompare(a.title)));+ else if (sortBy === "Date (Newest First)")+ setSortedLinks(+ linksArray.sort(+ (a, b) =>+ new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()+ )+ );+ else if (sortBy === "Date (Oldest First)")+ setSortedLinks(+ linksArray.sort(+ (a, b) =>+ new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()+ )+ );+ }, [searchSettings, links, sortBy]);return (<MainLayout><div className="p-5 flex flex-col gap-5 w-full">- <div className="flex gap-3 items-center">+ <div className="flex gap-3 items-center justify-between"><div className="flex gap-2 items-center"><FontAwesomeIcon icon={faSearch} className="w-5 h-5 text-sky-300" /><p className="text-lg text-sky-900">Search Results</p></div>++ <div className="flex gap-3 items-center">+ <div className="relative">+ <div+ onClick={() => setFilterDropdown(!filterDropdown)}+ id="filter-dropdown"+ className="inline-flex rounded-md cursor-pointer hover:bg-white hover:border-sky-500 border-sky-100 border duration-100 p-1"+ >+ <FontAwesomeIcon+ icon={faFilter}+ id="filter-dropdown"+ className="w-5 h-5 text-gray-500"+ />+ </div>++ {filterDropdown ? (+ <ClickAwayHandler+ onClickOutside={(e: Event) => {+ const target = e.target as HTMLInputElement;+ if (target.id !== "filter-dropdown")+ setFilterDropdown(false);+ }}+ className="absolute top-8 right-0 shadow-md bg-gray-50 rounded-md p-2 z-20 border border-sky-100 w-40"+ >+ <p className="mb-2 text-sky-900 text-center font-semibold">+ Filter by+ </p>+ <div className="flex flex-col gap-2">+ <Checkbox+ label="Name"+ state={searchSettings.filter.name}+ onClick={() => toggleCheckbox("name")}+ />+ <Checkbox+ label="Link"+ state={searchSettings.filter.url}+ onClick={() => toggleCheckbox("url")}+ />+ <Checkbox+ label="Title"+ state={searchSettings.filter.title}+ onClick={() => toggleCheckbox("title")}+ />+ <Checkbox+ label="Collection"+ state={searchSettings.filter.collection}+ onClick={() => toggleCheckbox("collection")}+ />+ <Checkbox+ label="Tags"+ state={searchSettings.filter.tags}+ onClick={() => toggleCheckbox("tags")}+ />+ </div>+ </ClickAwayHandler>+ ) : null}+ </div>++ <div className="relative">+ <div+ onClick={() => setSortDropdown(!sortDropdown)}+ id="sort-dropdown"+ className="inline-flex rounded-md cursor-pointer hover:bg-white hover:border-sky-500 border-sky-100 border duration-100 p-1"+ >+ <FontAwesomeIcon+ icon={faSort}+ id="sort-dropdown"+ className="w-5 h-5 text-gray-500"+ />+ </div>++ {sortDropdown ? (+ <ClickAwayHandler+ onClickOutside={(e: Event) => {+ const target = e.target as HTMLInputElement;+ if (target.id !== "sort-dropdown") setSortDropdown(false);+ }}+ className="absolute top-8 right-0 shadow-md bg-gray-50 rounded-md p-2 z-10 border border-sky-100 w-48"+ >+ <p className="mb-2 text-sky-900 text-center font-semibold">+ Sort by+ </p>+ <div className="flex flex-col gap-2">+ <RadioButton+ label="Name (A-Z)"+ state={sortBy === "Name (A-Z)"}+ onClick={handleSortChange}+ />++ <RadioButton+ label="Name (Z-A)"+ state={sortBy === "Name (Z-A)"}+ onClick={handleSortChange}+ />++ <RadioButton+ label="Title (A-Z)"+ state={sortBy === "Title (A-Z)"}+ onClick={handleSortChange}+ />++ <RadioButton+ label="Title (Z-A)"+ state={sortBy === "Title (Z-A)"}+ onClick={handleSortChange}+ />++ <RadioButton+ label="Date (Newest First)"+ state={sortBy === "Date (Newest First)"}+ onClick={handleSortChange}+ />++ <RadioButton+ label="Date (Oldest First)"+ state={sortBy === "Date (Oldest First)"}+ onClick={handleSortChange}+ />+ </div>+ </ClickAwayHandler>+ ) : null}+ </div>+ </div></div>- {filteredLinks[0] ? (- filteredLinks.map((e, i) => {+ {sortedLinks[0] ? (+ sortedLinks.map((e, i) => {return <LinkList key={i} link={e} count={i} />;})) : (