Merge pull request #125 from capstone-five-ai/develop

v0.1.7
capstone-five-ai · Jun 15, 2024 · 1633066 · 1633066
2 parents 1cff1c9 + d94da3d
commit 1633066
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/src/components/Form/QuizGenerationForm.tsx b/src/components/Form/QuizGenerationForm.tsx
@@ -25,15 +25,16 @@ function QuizGenerationForm({
   setQuizContent,
   showWarning = false,
 }: QuizFormProps) {
-  const [isCommentOpen, setIsCommentOpen] = useState(false);
+  const [isCommentOpen, setIsCommentOpen] = useState(true);
   const { fireToast } = useToast();
 
   useEffect(() => {
-    setIsCommentOpen(false);
+    setIsCommentOpen(true);
   }, [quizType]);
 
   useEffect(() => {
-    if (quizContent.problemCommentary === '') setIsCommentOpen(true);
+    if (showWarning && quizContent.problemCommentary === '')
+      setIsCommentOpen(true);
   }, [showWarning]);
 
   const handleChangeQuestion = (

diff --git a/src/components/InputField/CategoryInputFieldContainer.tsx b/src/components/InputField/CategoryInputFieldContainer.tsx
@@ -8,18 +8,23 @@ interface NewCategoryInputFieldProps
   initialOpen?: boolean;
   handleSubmit: () => void;
   isError?: boolean;
+  disabledButton?: boolean;
 }
 
 function CategoryInputFieldContainer({
   initialOpen = true,
   handleSubmit,
   isError = false,
+  disabledButton = false,
   ...props
 }: NewCategoryInputFieldProps) {
   const [openInput, setOpenInput] = useState(initialOpen);
   return (
     <StyledContainer>
-      <StyledAddButton onClick={() => setOpenInput((prev) => !prev)}>
+      <StyledAddButton
+        onClick={() => setOpenInput((prev) => !prev)}
+        disabled={disabledButton}
+      >
         <AddIcon />
         <span>카테고리 추가</span>
       </StyledAddButton>

diff --git a/src/components/Modal/NewCategoryModal.tsx b/src/components/Modal/NewCategoryModal.tsx
@@ -45,6 +45,7 @@ function NewCategoryModal({
           initialOpen
           handleSubmit={handleGenerateNewCategory}
           isError={showWarn}
+          disabledButton
         />
       </StyledModalContentContainer>
     </DefaultModal>

diff --git a/src/containers/QuizAIPage/GenerateSection.tsx b/src/containers/QuizAIPage/GenerateSection.tsx
@@ -182,5 +182,4 @@ const StyledUploadContent = styled(StyledContent)`
 
 const StyledTextContent = styled(StyledContent)`
   padding: 24px 36px;
-  padding-right: 20px;
 `;
diff --git a/src/containers/SummaryAIPage/GenerateSection.tsx b/src/containers/SummaryAIPage/GenerateSection.tsx
@@ -184,5 +184,4 @@ const StyledUploadContent = styled(StyledContent)`
 
 const StyledTextContent = styled(StyledContent)`
   padding: 24px 36px;
-  padding-right: 20px;
 `;
diff --git a/src/containers/SummaryUserPage/GenerateSection.tsx b/src/containers/SummaryUserPage/GenerateSection.tsx
@@ -75,5 +75,4 @@ export default GenerateSection;
 const StyledContent = styled.div`
   flex: 1;
   padding: 24px 36px;
-  padding-right: 20px;
 `;