Merge branch 'dev' into feature/searchForm

nbc-react-3rd-outsourcing-project-a5 · Dec 11, 2023 · 5e574ee · 5e574ee
2 parents 1fea482 + 674301e
commit 5e574ee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/components/FestivalRegistration/FestivalRegistrationForm.jsx b/src/components/FestivalRegistration/FestivalRegistrationForm.jsx
@@ -1,9 +1,9 @@
 import { ko } from 'date-fns/locale';
-import React, { useEffect } from 'react';
+import React from 'react';
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
 import styled from 'styled-components';
-import { useInput, useDate, useImageFile, useFestival, useAddress } from 'hooks';
+import { useInput, useDate, useImageFile, useFestival } from 'hooks';
 import uuid from 'react-uuid';
 import { uploadFiles } from 'utils/fireStorage';
 import { useSelector } from 'react-redux';
@@ -16,7 +16,6 @@ export default function FestivalRegistrationForm({ children }) {
 
   const [name, handleChangeName] = useInput();
   const [address, handleChangeAddress] = useInput();
-  // const [address, handleChangeInputText] = useAddress();
   const [description, handleChangeDescription] = useInput();
   const [startDate, handleChangeStartDate] = useDate();
   const [endDate, handleChangeEndDate] = useDate();

diff --git a/src/components/SearchForm/SearchForm.jsx b/src/components/SearchForm/SearchForm.jsx
@@ -17,8 +17,8 @@ export default function SearchForm() {
   const regionNameList = regionList.map((n) => n.name);
   const [startDate, handleChangeStartDate] = useDate();
   const [endDate, handleChangeEndDate] = useDate();
-  const { region, onSelectRegion, onResetRegion } = useInput(regionNameList[0]);
-  const { city, onSelectCity, onResetCity } = useInput();
+  const [region, onSelectRegion, onResetRegion] = useInput(regionNameList[0]);
+  const [city, onSelectCity, onResetCity] = useInput();
   const [searchResult, setSearchResult] = useState([]);
 
   const regionCityList = region && regionList.find((n) => n.name === region).city;

diff --git a/src/pages/Search/Search.jsx b/src/pages/Search/Search.jsx
@@ -12,6 +12,7 @@ function Search() {
   return (
     <>
       <StContainer>
+        <StTitle>내 주변 축제</StTitle>
         <StkakaoMap mapState={mapState} onClick={mapController.handleClickSetMarker} mapControl={true}>
           {markerController.showGeoLocationMarker()}
           {markerController.showFestivalMarkers()}
@@ -24,8 +25,15 @@ function Search() {
   );
 }
 
+const StTitle = styled.h1`
+  font-size: 2rem;
+  font-weight: bold;
+  margin: 1em 0;
+  padding-top: 3rem;
+`;
+
 const StkakaoMap = styled(KakaoMap)`
-  margin-top: 6rem;
+  margin-top: 3rem;
   margin-bottom: 3rem;
 `;