Back to results feature

src/components/elements/ReviewEventMainSection.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { Link } from 'react-router-dom';
 import { imageUrlForEvent } from 'utils/urls';
 import defaultThumbnail from 'assets/ui/thumbnail.png';
+import { useNavigate } from 'react-router-dom';
 
 const styleClasses = {
   mainSectionContainer: `
@@ -25,6 +25,7 @@ const styleClasses = {
 
 function ReviewEventMainSection({ evt, editEvent }) {
   const imageUrl = imageUrlForEvent(evt);
+  const navigate = useNavigate();
 
   const handleImageError = (event) => {
     event.target.src = defaultThumbnail;
@@ -34,7 +35,7 @@ function ReviewEventMainSection({ evt, editEvent }) {
     <section>
       <div className="mb-12">
         <p className="text-xl">
-          <Link to="/"> &#8592; Back to Results</Link>
+          <button onClick={() => navigate(-1)}>Back to Results</button>
         </p>
       </div>
 

src/components/elements/SearchForm.jsx

@@ -148,14 +148,14 @@ function SearchFormComponent({ clearFilters, setFieldValue, values }) {
  */
 export function mapPropsToValues (props) {
   return {
-    search: props.search || '',
+    search: props.search,
     startDate: props.startDate,
     endDate: props.endDate,
-    price: props.price || '',
-    eventType: props.eventType || '',
-    topic: props.topic || '',
-    language: props.language || '',
-    region: props.region || '',
+    price: props.price,
+    eventType: props.eventType,
+    topic: props.topic,
+    language: props.language,
+    region: props.region,
   }
 }
 

src/components/pages/HomePage.jsx

@@ -35,6 +35,12 @@ function HomePage() {
         clearFilters={clearFilters}
         startDate={searchFilters.startDate}
         endDate={searchFilters.endDate}
+        eventType={searchFilters.eventType}
+        search={searchFilters.search}
+        topic={searchFilters.topic}
+        language={searchFilters.language}
+        region={searchFilters.region}
+        price={searchFilters.price}
       />
       <SearchEvents
         events={results || []}

src/hooks/events.js

@@ -71,12 +71,24 @@ export function useSearchEvents() {
   const page = searchParams.get('page') || 1;
   const startDate = searchParams.get('startDate') || moment().subtract(2, 'weeks').format(DATE_PICKER_STRING_FORMAT);
   const endDate = searchParams.get('endDate') || moment().add(6, 'months').format(DATE_PICKER_STRING_FORMAT);
+  const search = searchParams.get('search')
+  const eventType = searchParams.get('eventType') 
+  const topic = searchParams.get('topic')
+  const language = searchParams.get('language')
+  const price = searchParams.get('price')
+  const region = searchParams.get('region')
+
   const [searchFilters, setSearchFilters] = useState({
     startDate,
     endDate,
-    search: '',
+    eventType,
     pageSize,
     page,
+    search,
+    topic,
+    language,
+    price,
+    region
   });
   const [searchResultEvents, setSearchResultEvents] = useState([]);
 
@@ -106,6 +118,12 @@ export function useSearchEvents() {
       startDate: moment().subtract(2, 'weeks').format(DATE_PICKER_STRING_FORMAT),
       endDate: moment().add(5, 'months').format(DATE_PICKER_STRING_FORMAT),
       search: '',
+      eventType: '',
+      topic: '',
+      language: '',
+      price: '',
+      region: '',
+
     }
 
     setSearchFilters({ ...clearedFilters });