Fix/search group (#95)

* fix: search group parameters * fix: create group login redirect * remove: unused file
daodaoedu · Oct 10, 2024 · dcff94f · dcff94f
1 parent c420a58
commit dcff94f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/components/Group/Form/useGroupForm.jsx b/components/Group/Form/useGroupForm.jsx
@@ -143,7 +143,7 @@ export default function useGroupForm() {
   };
 
   useEffect(() => {
-    if (notLogin) openLoginWindow('/login');
+    if (notLogin) openLoginWindow();
   }, [notLogin]);
 
   return {

diff --git a/components/Group/SearchField/SearchInput.jsx b/components/Group/SearchField/SearchInput.jsx
@@ -54,7 +54,7 @@ const SearchInput = () => {
   const [getSearchParams, pushState] = useSearchParamsManager();
   const [keyword, setKeyword] = useState('');
   const [isSpeechMode, setIsSpeechMode] = useState(false);
-  const currentKeyword = getSearchParams('q').toString();
+  const currentKeyword = getSearchParams('search').toString();
 
   useEffect(() => {
     setKeyword(currentKeyword);
@@ -67,15 +67,15 @@ const SearchInput = () => {
   /** @type {(event: SubmitEvent) => void} */
   const handleSubmit = (event) => {
     event.preventDefault();
-    pushState('q', keyword);
+    pushState('search', keyword);
   };
 
   return (
     <SearchInputWrapper as="form" onSubmit={handleSubmit}>
       <InputBaseWrapper
         type="search"
         inputProps={{ 'aria-label': 'search group' }}
-        name="q"
+        name="search"
         value={keyword}
         placeholder="想尋找甚麼類型的揪團呢？"
         onChange={handleChange}

diff --git a/functions/hello.js b/functions/hello.js
diff --git a/redux/sagas/groupSaga.js b/redux/sagas/groupSaga.js
@@ -23,7 +23,7 @@ function* getGroupItems() {
     category: CATEGORIES,
     partnerEducationStep: EDUCATION_STEP,
     isGrouping: true,
-    q: true,
+    search: true,
   };
 
   Object.keys(searchParamsOptions).forEach((key) => {
@@ -33,10 +33,13 @@ function* getGroupItems() {
     if (!searchParam || !option) return;
 
     if (Array.isArray(option)) {
-      urlSearchParams.append(key, searchParam
-        .split(',')
-        .filter((item) => option.some((option) => option.label === item))
-        .join(','))
+      urlSearchParams.append(
+        key,
+        searchParam
+          .split(',')
+          .filter((item) => option.some((_option) => _option.label === item))
+          .join(','),
+      );
     } else {
       urlSearchParams.append(key, searchParam);
     }