changes for #15

Author: phongnt

client/src/components/FiltersSideMenu/filters.js

@@ -22,7 +22,7 @@ import config from "../../config";
  * locations: the values for the location filter options
  * achievements: the values for the achievements filter options
  */
-export default function SearchTabFilters({ locations, achievements }) {
+export default function SearchTabFilters({ achievements }) {
   const search = useSearch();
   const [achievementsData, setAchievementsData] = useState(achievements);
 
@@ -50,7 +50,7 @@ export default function SearchTabFilters({ locations, achievements }) {
 
   useEffect(() => {
     setAchievementsData(achievements);
-  }, [locations, achievements]);
+  }, [achievements]);
 
   const filterData = (query, initialValues, property, setState) => {
     const q = query.toLowerCase();
@@ -355,7 +355,6 @@ export default function SearchTabFilters({ locations, achievements }) {
 }
 
 SearchTabFilters.propTypes = {
-  locations: PT.array,
   achievements: PT.array,
 };
 

client/src/components/FiltersSideMenu/index.jsx

@@ -4,15 +4,14 @@ import PT from "prop-types";
 import style from "./style.module.scss";
 import SearchTabFilters from "./filters";
 
-export default function FiltersSideMenu({ locations, achievements }) {
+export default function FiltersSideMenu({ achievements }) {
   return (
     <div className={style.container}>
-      <SearchTabFilters locations={locations} achievements={achievements} />
+      <SearchTabFilters achievements={achievements} />
     </div>
   );
 }
 
 FiltersSideMenu.propTypes = {
-  locations: PT.array.isRequired,
   achievements: PT.array.isRequired,
 };

client/src/pages/Search/Global.jsx

@@ -50,7 +50,6 @@ export default function SearchGlobal({ keyword }) {
   const apiClient = api();
   const searchContext = useSearch();
   const [isSearching, setIsSearching] = React.useState(false);
-  const [locations, setLocations] = React.useState([]);
   const [achievements, setAchievements] = React.useState([]);
   const [users, setUsers] = React.useState([]);
   const [page, setPage] = React.useState(1);
@@ -85,11 +84,9 @@ export default function SearchGlobal({ keyword }) {
     let isSubscribed = true;
 
     (async () => {
-      const locations = await staticData.getLocations();
       const achievements = await staticData.getAchievements();
 
       if (isSubscribed) {
-        setLocations(locations);
         setAchievements(achievements);
       }
     })();
@@ -302,7 +299,7 @@ export default function SearchGlobal({ keyword }) {
   return (
     <>
       <div className={style.sideMenu}>
-        <FiltersSideMenu locations={locations} achievements={achievements} />
+        <FiltersSideMenu achievements={achievements} />
       </div>
       {!isSearching && users.length > 0 && (
         <div className={style.rightSide}>

client/src/services/static-data.js

@@ -1,36 +1,3 @@
-async function getLocations() {
-  const mockLocationTags = [
-    { name: "London" },
-    { name: "New York" },
-    { name: "East Carmen" },
-    { name: "Savanahville" },
-    { name: "Lake Audra" },
-    { name: "Elainaville" },
-    { name: "Howellstad" },
-    { name: "West Reneefort" },
-    { name: "Vanside" },
-    { name: "East Jonatan" },
-    { name: "Gottliebton" },
-    { name: "Ervinchester" },
-    { name: "Matteoburgh" },
-    { name: "Curtmouth" },
-    { name: "North Raphaelleton" },
-    { name: "Laishaside" },
-    { name: "West Trystanmouth" },
-    { name: "West Torrey" },
-    { name: "Abernathystad" },
-    { name: "Danland" },
-    { name: "Lednertown" },
-    { name: "Athenamouth" },
-    { name: "North Abagailport" },
-    { name: "North Andres" },
-    { name: "New Herbert" },
-    { name: "Bergstrombury" },
-    { name: "West Santinoside" },
-  ];
-  return mockLocationTags;
-}
-
 async function getAchievements() {
   const mockAchievementsTags = [
     { name: "Informatika" },
@@ -42,6 +9,5 @@ async function getAchievements() {
 }
 
 export default {
-  getLocations,
   getAchievements,
 };