Merge pull request #14 from AlexSciFier/links-window-fixes

Various fixes for links page
AlexSciFier · Nov 19, 2022 · f060de4 · f060de4
2 parents 43ed454 + df397dd
commit f060de4
Show file tree

Hide file tree

Showing 14 changed files with 281 additions and 114 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/context/bookmarkList.js b/frontend/src/context/bookmarkList.js
@@ -19,7 +19,13 @@ export function BookMarkListProvider({ children }) {
     abortController.current.abort();
   }
 
-  async function fetchBookmarks({ offset = 0, limit = 25, query, tag }) {
+  async function fetchBookmarks({
+    offset = 0,
+    limit = 25,
+    query,
+    tag,
+    category,
+  }) {
     setIsBookmarksLoading(true);
     setErrorBookmarks(undefined);
 
@@ -30,6 +36,7 @@ export function BookMarkListProvider({ children }) {
     searchParams.append("limit", limit);
     if (query) searchParams.append("q", query);
     if (tag) searchParams.append("tag", tag);
+    if (category) searchParams.append("category", category);
     let res = await getJSON(
       `/api/bookmarks/?${searchParams.toString()}`,
       abortController.current.signal

diff --git a/frontend/src/helpers/constants.js b/frontend/src/helpers/constants.js
@@ -1,5 +1,5 @@
 export const APP_NAME = "NeonLink";
-export const VERSION = "1.2.2";
+export const VERSION = "1.2.3";
 export const DEF_MAX_ITEMS = 20;
 export const DEF_COLUMNS = 3;
 export const CARD_HEADER_STYLE = [

diff --git a/frontend/src/pages/link/components/BookmarksHeader.jsx b/frontend/src/pages/link/components/BookmarksHeader.jsx
@@ -4,6 +4,7 @@ import { useBookMarkList } from "../../../context/bookmarkList";
 import { DEF_MAX_ITEMS } from "../../../helpers/constants";
 import { useLocalStorage } from "../../../hooks/useLocalStorage";
 import { useRef } from "react";
+import { useSearchParams } from "react-router-dom";
 
 export default function BookmarksHeader() {
   const [query, setQuery] = useState("");
@@ -13,6 +14,7 @@ export default function BookmarksHeader() {
 
   const { fetchBookmarks } = useBookMarkList();
   const [maxItemsInList] = useLocalStorage("maxItemsInList", DEF_MAX_ITEMS);
+  const [searchParams] = useSearchParams();
 
   const firstUpdate = useRef(true);
   useEffect(() => {
@@ -25,7 +27,10 @@ export default function BookmarksHeader() {
   }, [delayedQuery, query]);
 
   function updateBookmarkList() {
-    fetchBookmarks({ offset: 0, limit: maxItemsInList, query });
+    let tag = searchParams.get("tag");
+    let category = searchParams.get("category");
+
+    fetchBookmarks({ offset: 0, limit: maxItemsInList, query, tag, category });
   }
 
   return (

diff --git a/frontend/src/pages/link/components/BookmarksList.jsx b/frontend/src/pages/link/components/BookmarksList.jsx
@@ -27,8 +27,10 @@ export default function BookmarksList() {
     let offset = (page - 1) * limit;
 
     let tag = searchParams.get("tag");
-    if (tag) {
-      fetchBookmarks({ offset, limit, tag });
+    let category = searchParams.get("category")
+
+    if (tag || category) {
+      fetchBookmarks({ offset, limit, tag, category });
       return;
     }
     fetchBookmarks({ offset, limit });