From b3d1a2bba020b6f33e8f09f23acb6f0c4ffee4b6 Mon Sep 17 00:00:00 2001 From: jellie Date: Sat, 12 Jul 2025 21:54:31 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=EA=B3=B5=EC=A7=80=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EA=B5=90=EC=9C=A1=EA=B3=BC=EC=A0=95=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=ED=8E=B8=EC=9D=98=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/calendar/Calendar.tsx | 18 ++++++++++-------- .../calendar/SmallCalendarBottomEvent.tsx | 8 ++++++-- .../common/button/FavoriteButton.tsx | 2 +- .../common/dropdown/MultiSelectDropdown.tsx | 13 ++++++++----- .../common/dropdown/option/SelectOption.tsx | 12 +++++++++--- .../common/dropdown/select/SelectBox.tsx | 8 +++++++- src/components/common/input/LabeledSection.tsx | 4 ++-- src/components/common/modal/Alert.tsx | 2 +- .../notice/form/ControllerTargetCourses.tsx | 7 ++++--- .../notice/modal/SessionApplicationModal.tsx | 2 +- src/pages/trainee/ScrapedPostList.tsx | 17 +++++++++++------ src/services/post/loungeQueries.ts | 1 + src/types/serviceType.ts | 1 + 13 files changed, 62 insertions(+), 33 deletions(-) diff --git a/src/components/calendar/Calendar.tsx b/src/components/calendar/Calendar.tsx index 5b5b15e8..03955a77 100644 --- a/src/components/calendar/Calendar.tsx +++ b/src/components/calendar/Calendar.tsx @@ -119,14 +119,16 @@ export default function Calendar({ ((sideViewEvents as FullCalendarEvent[]).length !== 0 ? ( ) : ( diff --git a/src/components/calendar/SmallCalendarBottomEvent.tsx b/src/components/calendar/SmallCalendarBottomEvent.tsx index 7275eb9a..277a148d 100644 --- a/src/components/calendar/SmallCalendarBottomEvent.tsx +++ b/src/components/calendar/SmallCalendarBottomEvent.tsx @@ -1,16 +1,20 @@ +import { Link } from 'react-router-dom'; + interface SmallCalendarBottomEventProps { title: string; date: string; time: string; + to: string; } export default function SmallCalendarBottomEvent({ date, title, time, + to, }: SmallCalendarBottomEventProps) { return ( -
  • +
    {date} @@ -19,6 +23,6 @@ export default function SmallCalendarBottomEvent({
    | {title} -
    • + ); } diff --git a/src/components/common/button/FavoriteButton.tsx b/src/components/common/button/FavoriteButton.tsx index b81c1b9c..8a2c2af9 100644 --- a/src/components/common/button/FavoriteButton.tsx +++ b/src/components/common/button/FavoriteButton.tsx @@ -18,7 +18,7 @@ export default function FavoriteButton({ onClick, disabled, }: FavoriteButtonProps) { - const iconClassName = 'cursor-pointer text-mainGreen'; + const iconClassName = 'cursor-pointer mt-0.5 text-mainGreen mx-2 '; return ( + ); +} diff --git a/src/components/common/button/FavoriteButton.tsx b/src/components/common/button/FavoriteButton.tsx index 8a2c2af9..18d4a3ba 100644 --- a/src/components/common/button/FavoriteButton.tsx +++ b/src/components/common/button/FavoriteButton.tsx @@ -18,7 +18,7 @@ export default function FavoriteButton({ onClick, disabled, }: FavoriteButtonProps) { - const iconClassName = 'cursor-pointer mt-0.5 text-mainGreen mx-2 '; + const iconClassName = 'cursor-pointer mt-0.5 text-mainGreen'; return ( - )} + <> +
    + {!hideButton && ( + + )} - {headerContent} -
    - )} + {headerContent} + - {mainContent} + {mainContent} + + )} ); } diff --git a/src/components/common/dropdown/TechStackDropdown.tsx b/src/components/common/dropdown/TechStackDropdown.tsx index db719ba1..12d97c20 100644 --- a/src/components/common/dropdown/TechStackDropdown.tsx +++ b/src/components/common/dropdown/TechStackDropdown.tsx @@ -27,6 +27,7 @@ interface MultiSelectDropdownProps { isMarkTechStackList?: boolean; boxShape?: SelectBoxShape; selectBoxClassName?: string; + hasUnlimitOption?: boolean; } /** @@ -53,6 +54,7 @@ const TechStackDropdown = memo(function TechStackDropdown({ isMarkTechStackList = false, boxShape = 'inputShape', selectBoxClassName = '', + hasUnlimitOption, }: MultiSelectDropdownProps) { const [tabValue, setTabValue] = useState(defaultTabValue); const [open, setOpen] = useState(false); @@ -112,6 +114,8 @@ const TechStackDropdown = memo(function TechStackDropdown({ const handleSelectBoxClick = () => setOpen(prev => !prev); + const unlimitOption = { id: 0, name: '제한 없음' }; + return ( <> {isMarkTechStackList && value.length !== 0 && ( @@ -149,6 +153,7 @@ const TechStackDropdown = memo(function TechStackDropdown({ tabClassName="pb-[7px] px-3" className="px-5" /> + - + {hasUnlimitOption && ( + + )} ); diff --git a/src/components/common/input/SearchInput.tsx b/src/components/common/input/SearchInput.tsx index 89247518..7741bf59 100644 --- a/src/components/common/input/SearchInput.tsx +++ b/src/components/common/input/SearchInput.tsx @@ -47,7 +47,7 @@ const SearchInput = forwardRef( return (