Skip to content

Commit de368ca

Browse files
authored
πŸ”€ [MERGE] feat/guestbook -> develop
πŸ› [FIX] λ°©λͺ…둝 검색 였λ₯˜ ν•΄κ²°
2 parents a71ee64 + 4510e60 commit de368ca

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

β€Žsrc/components/guestbook/GuestBookWrite.tsxβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const GuestBookWrite = ({ onSubmitted }: Props) => {
4949
<div className="relative flex flex-col w-[82%] max-w-[280px] p-[18px]">
5050
{/* To */}
5151
<div className="flex gap-[4px] items-center">
52-
<p className="text-[20px]">To.</p>
52+
<p className="text-[20px] font-['Butler'] ">To.</p>
5353
<input
5454
type="text"
5555
placeholder="λ°›λŠ” μ‚¬λžŒ"
@@ -72,7 +72,9 @@ const GuestBookWrite = ({ onSubmitted }: Props) => {
7272
{/* From */}
7373
<div className="flex items-center w-full box-border">
7474
<div className="flex items-center gap-[4px] flex-1 min-w-0">
75-
<p className="text-[20px] whitespace-nowrap">From.</p>
75+
<p className="text-[20px] font-['Butler'] whitespace-nowrap">
76+
From.
77+
</p>
7678
<input
7779
type="text"
7880
placeholder="λ³΄λ‚΄λŠ” μ‚¬λžŒ"
@@ -92,7 +94,7 @@ const GuestBookWrite = ({ onSubmitted }: Props) => {
9294

9395
<button
9496
onClick={handleSubmit}
95-
className={`w-full max-w-[328px] h-[48px] rounded-[40px] text-[#FFF] text-center text-[20px] font-bold ${isFilled ? 'bg-[#56493A] cursor-pointer' : 'bg-[#DDD]'}`}
97+
className={`w-full max-w-[328px] h-[48px] rounded-[40px] text-[#FFF] text-center text-[20px] font-['Butler'] font-bold ${isFilled ? 'bg-[#56493A] cursor-pointer' : 'bg-[#DDD]'}`}
9698
>
9799
Send
98100
</button>

β€Žsrc/pages/GuestBookPage.tsxβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const GuestBookPage = () => {
2424
const [showModal, setShowModal] = useState(false)
2525
const [modalContent, setModalContent] = useState('')
2626

27-
const { items, totalPages, reload } = useGuestbook({
27+
const { items, totalPages } = useGuestbook({
2828
page: currentPage,
2929
size: PAGE_SIZE,
3030
keyword,
@@ -33,14 +33,12 @@ const GuestBookPage = () => {
3333
const handleSubmitted = (fromName: string) => {
3434
setKeyword('')
3535
setCurrentPage(1)
36-
reload()
3736
setModalContent(`${fromName} ν•™μƒμ—κ²Œ\nμ†Œμ€‘ν•œ 마음이 μ „λ‹¬λμŠ΅λ‹ˆλ‹€.`)
3837
setShowModal(true)
3938
}
4039

4140
const triggerSearch = () => {
4241
setCurrentPage(1)
43-
reload()
4442
}
4543

4644
const closeModal = useCallback(() => setSelected(null), [])
@@ -61,6 +59,10 @@ const GuestBookPage = () => {
6159
}
6260
}, [selected, closeModal])
6361

62+
useEffect(() => {
63+
setCurrentPage(1)
64+
}, [keyword])
65+
6466
return (
6567
<div className="flex flex-col">
6668
<GuestBookWrite onSubmitted={handleSubmitted} />

0 commit comments

Comments
Β (0)