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

v0.1.7
capstone-five-ai · Jun 15, 2024 · 17fec4e · 17fec4e
2 parents 1633066 + 88d4dbe
commit 17fec4e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 19 deletions.
diff --git a/src/components/Button/PlainButton.tsx b/src/components/Button/PlainButton.tsx
@@ -67,7 +67,7 @@ const getVariantStyle = ($variant: PlainButtonVariant) => {
 
         &:hover {
           color: ${({ theme }) => theme.colors.grayScale02};
-          box-shadow: 4px 2px 16px 0px rgba(142, 142, 142, 0.24);
+          box-shadow: 0px 2px 8px 0px rgba(142, 142, 142, 0.12);
         }
       `;
   }

diff --git a/src/components/Button/SaveToCategoryButton.tsx b/src/components/Button/SaveToCategoryButton.tsx
@@ -1,21 +1,13 @@
 import { ReactComponent as SaveIcon } from '@/assets/icons/save.svg';
 import PlainButton from '@/components/Button/PlainButton';
-import { CATEGORY_TYPE } from '@/constants';
-import { ServiceType } from '@/types/category.type';
 
-interface SaveToCategoryButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement> {
-  generateType: ServiceType;
-}
-
-function SaveToCategoryButton({
-  generateType,
-  ...props
-}: SaveToCategoryButtonProps) {
+function SaveToCategoryButton(
+  props: React.ButtonHTMLAttributes<HTMLButtonElement>
+) {
   return (
     <PlainButton {...props}>
       <SaveIcon />
-      카테고리에 {CATEGORY_TYPE[generateType]} 추가
+      카테고리에 저장
     </PlainButton>
   );
 }

diff --git a/src/containers/CategoryDetailPage/CategorySidebar.tsx b/src/containers/CategoryDetailPage/CategorySidebar.tsx
@@ -159,7 +159,6 @@ function CategorySidebar({
           <StyledButtonContainer>
             <ShareLinkButton link={window.location.href} />
             <SaveToCategoryButton
-              generateType={contentType}
               onClick={() => setShowAddCategoryModal(true)}
               disabled={!isAuthenticated}
             />

diff --git a/src/containers/QuizAIPage/ResultSection.tsx b/src/containers/QuizAIPage/ResultSection.tsx
@@ -85,7 +85,6 @@ function ResultSection() {
               )}
             </ContentInnerContainer>
             <SaveToCategoryButton
-              generateType="QUIZ"
               disabled={!isAuthenticated}
               onClick={() => setShowModal(true)}
             />

diff --git a/src/containers/QuizUserPage/ResultSection.tsx b/src/containers/QuizUserPage/ResultSection.tsx
@@ -50,7 +50,6 @@ function ResultSection() {
               <ShareLinkButton link={window.location.href} />
             </StyledButtonContainer>
             <SaveToCategoryButton
-              generateType="QUIZ"
               disabled={!isAuthenticated}
               onClick={() => setShowModal(true)}
             />

diff --git a/src/containers/SummaryAIPage/ResultSection.tsx b/src/containers/SummaryAIPage/ResultSection.tsx
@@ -64,7 +64,6 @@ function ResultSection() {
               )}
             </StyledButtonContainer>
             <SaveToCategoryButton
-              generateType="SUMMARY"
               disabled={!isAuthenticated}
               onClick={() => setShowModal(true)}
             />

diff --git a/src/containers/SummaryUserPage/ResultSection.tsx b/src/containers/SummaryUserPage/ResultSection.tsx
@@ -65,7 +65,6 @@ function ResultSection() {
               )}
             </StyledButtonContainer>
             <SaveToCategoryButton
-              generateType="SUMMARY"
               disabled={!isAuthenticated}
               onClick={() => setShowModal(true)}
             />

diff --git a/src/pages/CategorySummaryEditPage.tsx b/src/pages/CategorySummaryEditPage.tsx
@@ -81,7 +81,7 @@ export default CategorySummaryEditPage;
 
 const StyledContent = styled.div`
   flex: 1;
-  padding: 24px 20px 24px 40px;
+  padding: 24px 24px 40px;
 
   display: flex;
   flex-direction: column;