diff --git a/src/hooks/use-preset-button.hooks.ts b/src/hooks/use-preset-button.hooks.ts index 9d21f8d..b563dff 100644 --- a/src/hooks/use-preset-button.hooks.ts +++ b/src/hooks/use-preset-button.hooks.ts @@ -8,7 +8,8 @@ const usePresetButton = () => { const handleReferenceButtonClick = (references: referenceState[]) => { let content = '답변 출처를 알려드릴게요!\n'; - if (references === undefined || references.length === 0) { + // references가 null, undefined, 또는 길이가 0인 경우 체크 + if (!references || references.length === 0) { addMessage({ content: '출처 정보가 없습니다.', role: 'system' }); return; } diff --git a/src/ui/components/atom/chat-card/chat-card.tsx b/src/ui/components/atom/chat-card/chat-card.tsx index bcf4079..a709941 100644 --- a/src/ui/components/atom/chat-card/chat-card.tsx +++ b/src/ui/components/atom/chat-card/chat-card.tsx @@ -21,10 +21,10 @@ const ChatCard = ({ content, role }: ChatCardProps) => {
-
+
{content === 'loading' ? : {content}}
diff --git a/src/ui/components/atom/preset/preset-button.tsx b/src/ui/components/atom/preset/preset-button.tsx index 884cbb2..e085fb5 100644 --- a/src/ui/components/atom/preset/preset-button.tsx +++ b/src/ui/components/atom/preset/preset-button.tsx @@ -10,9 +10,13 @@ interface PresetButtonProps { const PresetButton = ({ onClick, isSelected, disabled, children }: PresetButtonProps) => { const buttonClasses = cn( - 'cursor-pointer rounded-full border border-gray text-black bg-white px-4 py-2 ', - isSelected ? 'bg-primary-blue text-white border-primary-blue' : 'bg-white text-black', - disabled ? 'bg-border-gray cursor-not-allowed text-border-gray bg-text-white' : '', + 'cursor-pointer text-base rounded-full border border-gray text-black bg-white px-4 py-2 transition-colors duration-200', + isSelected + ? 'bg-primary-blue text-white border-gray' + : 'bg-white text-black hover:bg-primary-blue hover:text-white', + disabled + ? 'bg-border-gray cursor-not-allowed text-border-gray bg-text-white hover:text-border-gray hover:bg-text-white' + : '', ); return ( diff --git a/src/ui/components/molecule/chat-section/chat-section.tsx b/src/ui/components/molecule/chat-section/chat-section.tsx index fa6c4bd..6bb90a8 100644 --- a/src/ui/components/molecule/chat-section/chat-section.tsx +++ b/src/ui/components/molecule/chat-section/chat-section.tsx @@ -38,19 +38,19 @@ const ChatSection: React.FC = () => { const showCategoryStatus = () => { let contentMessage = ''; if (!activeSusi && !activeJeongsi && !activePyeonip) { - contentMessage = '현재 모든 카테고리 이용이 가능합니다.'; + contentMessage = '현재는 모든 카테고리 이용이 가능해요.'; } else if (!activeSusi && activeJeongsi && activePyeonip) { - contentMessage = '현재 수시 카테고리만 이용 가능합니다.'; + contentMessage = '현재는 수시 카테고리만 이용 가능해요.'; } else if (activeSusi && !activeJeongsi && activePyeonip) { - contentMessage = '현재 정시 카테고리만 이용 가능합니다.'; + contentMessage = '현재는 정시 카테고리만 이용 가능해요.'; } else if (activeSusi && activeJeongsi && !activePyeonip) { - contentMessage = '현재 편입 카테고리만 이용 가능합니다.'; + contentMessage = '현재는 편입 카테고리만 이용 가능해요.'; } else if (!activeSusi && !activeJeongsi && activePyeonip) { - contentMessage = '현재 수시, 정시 카테고리만 이용 가능합니다.'; + contentMessage = '현재는 수시, 정시 카테고리만 이용 가능해요.'; } else if (!activeSusi && activeJeongsi && !activePyeonip) { - contentMessage = '현재 수시, 편입 카테고리만 이용 가능합니다.'; + contentMessage = '현재는 수시, 편입 카테고리만 이용 가능해요'; } else if (activeSusi && !activeJeongsi && !activePyeonip) { - contentMessage = '현재 정시, 편입 카테고리만 이용 가능합니다.'; + contentMessage = '현재는 정시, 편입 카테고리만 이용 가능해요.'; } if (contentMessage) { @@ -101,16 +101,24 @@ const ChatSection: React.FC = () => {
{contextHolder} {type && } {type && ( <> - + )} @@ -127,7 +135,18 @@ const ChatSection: React.FC = () => { /> )} {type && category && ( - + )} {messages.map((msg, index) => ( diff --git a/src/ui/components/molecule/menu-drawer/menu-drawer.tsx b/src/ui/components/molecule/menu-drawer/menu-drawer.tsx index c823ae0..26c0703 100644 --- a/src/ui/components/molecule/menu-drawer/menu-drawer.tsx +++ b/src/ui/components/molecule/menu-drawer/menu-drawer.tsx @@ -57,7 +57,7 @@ const MenuDrawer = ({ open, onClose }: MenuDrawerProps) => { closable={false} open={open} onClose={onClose} - height="260px" + height="300px" rootClassName="absolute mx-auto my-auto desktop:max-w-[390px] desktop:max-h-[780px] desktop:rounded-t-3xl desktop:rounded-b-3xl mobile:max-w-full mobile:max-h-full mobile:rounded-none mobile:shadow-none" rootStyle={{ width: '100%', overflow: 'hidden' }} > @@ -81,19 +81,19 @@ const MenuDrawer = ({ open, onClose }: MenuDrawerProps) => {
window.open(FAQUrl, '_blank', 'noopener, noreferrer')} - className="w-full cursor-pointer p-2 text-start font-pretendard text-sm hover:rounded-lg hover:bg-[#F4F4F4]" + className="w-full cursor-pointer p-2 text-start font-pretendard text-base hover:rounded-lg hover:bg-[#F4F4F4]" > {selectedButton === 'PYEONIP' ? '편입' : selectedButton === 'JEONGSI' ? '정시' : '수시'} FAQ 바로가기
window.open(admissionResultsUrl, '_blank', 'noopener, noreferrer')} - className="w-full cursor-pointer p-2 text-start font-pretendard text-sm hover:rounded-lg hover:bg-[#F4F4F4]" + className="w-full cursor-pointer p-2 text-start font-pretendard text-base hover:rounded-lg hover:bg-[#F4F4F4]" > {selectedButton === 'PYEONIP' ? '편입' : selectedButton === 'JEONGSI' ? '정시' : '수시'} 입시결과 바로가기
window.open(admissionGuideUrl, '_blank', 'noopener, noreferrer')} - className="w-full cursor-pointer p-2 text-start font-pretendard text-sm hover:rounded-lg hover:bg-[#F4F4F4]" + className="w-full cursor-pointer p-2 text-start font-pretendard text-base hover:rounded-lg hover:bg-[#F4F4F4]" > {selectedButton === 'PYEONIP' ? '편입' : selectedButton === 'JEONGSI' ? '정시' : '수시'} 모집요강 바로가기
diff --git a/src/ui/components/user-domain/question-preset-buttons.tsx b/src/ui/components/user-domain/question-preset-buttons.tsx index bc165ab..0f45abc 100644 --- a/src/ui/components/user-domain/question-preset-buttons.tsx +++ b/src/ui/components/user-domain/question-preset-buttons.tsx @@ -8,7 +8,7 @@ export const QuestionPresetButtons = () => { const { handleReferenceButtonClick, handleButtonClick } = usePresetButton(); return ( -
+
{!referenceButtonDisabled && ( handleReferenceButtonClick(lastReference)}>👆 출처를 알고싶어요 )}