Merge branch 'remove-api-refactor'

SpaceCowMedia · Jan 1, 2024 · 64992f6 · 64992f6
2 parents e16c558 + ca521eb
commit 64992f6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/src/components/advancedSearch/AutocompleteInput/AutocompleteInput.tsx b/src/components/advancedSearch/AutocompleteInput/AutocompleteInput.tsx
@@ -227,6 +227,11 @@ const AutocompleteInput: React.FC<Props> = ({
     );
   }, [localValue, active, autocompleteOptions])
 
+  useEffect(() => {
+    setFirstRender(true)
+    setLocalValue(value)
+  }, [value]  )
+
   return (
     <div className={styles.autocompleteContainer}>
       <label className="sr-only" aria-hidden htmlFor={inputId}>

diff --git a/src/components/advancedSearch/MultiSearchInput/MultiSearchInput.tsx b/src/components/advancedSearch/MultiSearchInput/MultiSearchInput.tsx
@@ -1,5 +1,5 @@
 import pluralize from "pluralize";
-import { useState } from "react";
+import {useEffect, useState} from "react";
 import styles from "./multiSearchInput.module.scss";
 import StyledSelect from "../../layout/StyledSelect/StyledSelect";
 import AutocompleteInput from "../AutocompleteInput/AutocompleteInput";

diff --git a/src/components/layout/StyledSelect/StyledSelect.tsx b/src/components/layout/StyledSelect/StyledSelect.tsx
@@ -1,4 +1,4 @@
-import { ChangeEvent, useState } from "react";
+import {ChangeEvent, useEffect, useState} from "react";
 import styles from "./styledSelect.module.scss";
 
 export type Option = { value: string; label: string };
@@ -31,6 +31,10 @@ const StyledSelect = ({
     onChange && onChange(event.target.value);
   };
 
+  useEffect(() => {
+    setLocalValue(value);
+  }, [value]);
+
   return (
     <div className={`${selectBackgroundClassName} rounded-l-sm relative`}>
       <label htmlFor={id} className="sr-only" aria-hidden="true">

diff --git a/src/pages/advanced-search.tsx b/src/pages/advanced-search.tsx
@@ -623,6 +623,8 @@ const AdvancedSearch = () => {
     });
   }, []);
 
+  console.log(cards)
+
   return (
     <>
       <SpellbookHead

diff --git a/src/pages/search.tsx b/src/pages/search.tsx
@@ -177,6 +177,7 @@ export default Search;
 export const getServerSideProps: GetServerSideProps = async (context) => {
   let query = `${context.query.q}`
   if (!query.includes('legal:') && !query.includes('banned:') && !query.includes('format:')) query = `${query} legal:commander`
+  query = encodeURIComponent(query)
   const requestService = new RequestService(context)
   const order = context.query.order || DEFAULT_ORDER
   const sort = context.query.sort || DEFAULT_SORT