Skip to content

Commit

Permalink
Merge pull request #102 from capstone-five-ai/hotfix/deploy-v011
Browse files Browse the repository at this point in the history
hotfix: 빌드 오류 해결
  • Loading branch information
AAminha authored Jun 3, 2024
2 parents 6538028 + 9012e59 commit a3dab3d
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ type Props = {
checked: boolean;
};

function CheckBox({ checked, ...props }: Props) {
function CheckBoxButton({ checked, ...props }: Props) {
return (
<Wrapper {...props} $checked={checked}>
{checked && <CheckIcon width="16px" height="16px" />}
Expand All @@ -28,4 +28,4 @@ const Wrapper = styled.div<{ $checked: boolean }>`
$checked ? theme.colors.mainMint : theme.colors.grayScale09};
`;

export default CheckBox;
export default CheckBoxButton;
2 changes: 1 addition & 1 deletion src/components/Modal/SaveToCategoryModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { postNewCategory } from '@/apis/categoryApi';
import { postQuizToCategory } from '@/apis/quizCategoryApi';
import { postSummaryToCategory } from '@/apis/summaryCategoryApi';
import { ReactComponent as SaveIcon } from '@/assets/icons/save.svg';
import CheckBox from '@/components/Button/CheckBoxButton';
import PlainButton from '@/components/Button/PlainButton';
import CheckBox from '@/components/CheckBox/CheckBox';
import NewCategoryInputField from '@/components/InputField/CategoryInputFieldContainer';
import DefaultModal from '@/components/Modal/DefaultModal';
import Scrollbar from '@/components/Scrollbar/Scrollbar';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import styled from 'styled-components';

interface SidebarProps {
interface DefaultSidebarProps {
children?: React.ReactNode;
className?: string;
}

function Sidebar({ children, className }: SidebarProps) {
function DefaultSidebar({ children, className }: DefaultSidebarProps) {
return <StyledContainer className={className}>{children}</StyledContainer>;
}

export default Sidebar;
export default DefaultSidebar;

const StyledContainer = styled.div`
width: 360px;
Expand Down
6 changes: 3 additions & 3 deletions src/components/SideBar/GenerateSidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import GenerateButton from '@/components/Button/GenerateButton';
import FileNameInputField from '@/components/InputField/FileNameInputField';
import RadioInputFieldContainer from '@/components/InputField/RadioInputFieldContainer';
import Sidebar from '@/components/Sidebar/Sidebar';
import DefaultSidebar from '@/components/Sidebar/DefaultSidebar';
import styled from 'styled-components';

interface GenerateSidebarProps<T> {
Expand All @@ -28,7 +28,7 @@ function GenerateSidebar<T extends object>({
inputFieldDisabled = false,
}: GenerateSidebarProps<T>) {
return (
<Sidebar>
<DefaultSidebar>
<StyledSidebarContentContainer>
<StyledOptionContainer>
{optionList.map((option) => (
Expand Down Expand Up @@ -59,7 +59,7 @@ function GenerateSidebar<T extends object>({
disabled={generateButtonDisabled}
/>
</StyledSidebarContentContainer>
</Sidebar>
</DefaultSidebar>
);
}

Expand Down
2 changes: 1 addition & 1 deletion src/containers/CategoryDetailPage/CategorySidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ShareLinkButton from '@/components/Button/ShareLinkButton';
import DeleteIcon from '@/components/Icon/DeleteIcon';
import DeleteItemModal from '@/components/Modal/DeleteItemModal';
import SaveToCategoryModal from '@/components/Modal/SaveToCategoryModal';
import Sidebar from '@/components/Sidebar/Sidebar';
import Sidebar from '@/components/Sidebar/DefaultSidebar';
import useToast from '@/hooks/useToast';
import { ServiceType } from '@/types/category.type';
import { CategoryQuizItem } from '@/types/quiz.type';
Expand Down
6 changes: 3 additions & 3 deletions src/containers/QuizAIPage/ResultSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import QuizCheckForm from '@/components/Form/QuizCheckForm';
import SaveToCategoryModal from '@/components/Modal/SaveToCategoryModal';
import NumberPanel from '@/components/NumberPanel/NumberPanel';
import Scrollbar from '@/components/Scrollbar/Scrollbar';
import Sidebar from '@/components/Sidebar/Sidebar';
import DefaultSidebar from '@/components/Sidebar/DefaultSidebar';
import { useGetAIQuizFile } from '@/hooks/useGetQuiz';
import useRedirect from '@/hooks/useRedirect';
import authState from '@/recoils/atoms/authState';
Expand Down Expand Up @@ -58,7 +58,7 @@ function ResultSection() {
<QuizCheckForm quiz={currentQuiz} />
</StyledInnerContent>
</StyledContent>
<Sidebar>
<DefaultSidebar>
<SidebarContentContainer>
<ContentInnerContainer>
<NumberPanel
Expand Down Expand Up @@ -89,7 +89,7 @@ function ResultSection() {
onClick={() => setShowModal(true)}
/>
</SidebarContentContainer>
</Sidebar>
</DefaultSidebar>
{showModal && (
<SaveToCategoryModal
categoryType="QUIZ"
Expand Down
6 changes: 3 additions & 3 deletions src/containers/QuizUserPage/ResultSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ShareLinkButton from '@/components/Button/ShareLinkButton';
import QuizCheckForm from '@/components/Form/QuizCheckForm';
import SaveToCategoryModal from '@/components/Modal/SaveToCategoryModal';
import Scrollbar from '@/components/Scrollbar/Scrollbar';
import Sidebar from '@/components/Sidebar/Sidebar';
import DefaultSidebar from '@/components/Sidebar/DefaultSidebar';
import { useGetUserQuizItem } from '@/hooks/useGetQuiz';
import useRedirect from '@/hooks/useRedirect';
import authState from '@/recoils/atoms/authState';
Expand Down Expand Up @@ -44,7 +44,7 @@ function ResultSection() {
<QuizCheckForm quiz={quiz} />
</StyledInnerContent>
</StyledContent>
<Sidebar>
<DefaultSidebar>
<SidebarContentContainer>
<StyledButtonContainer>
<ShareLinkButton link={window.location.href} />
Expand All @@ -54,7 +54,7 @@ function ResultSection() {
onClick={() => setShowModal(true)}
/>
</SidebarContentContainer>
</Sidebar>
</DefaultSidebar>
{showModal && (
<SaveToCategoryModal
categoryType="QUIZ"
Expand Down
6 changes: 3 additions & 3 deletions src/containers/SummaryAIPage/ResultSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import SaveToCategoryButton from '@/components/Button/SaveToCategoryButton';
import ShareLinkButton from '@/components/Button/ShareLinkButton';
import SummaryCheckForm from '@/components/Form/SummaryCheckForm';
import SaveToCategoryModal from '@/components/Modal/SaveToCategoryModal';
import Sidebar from '@/components/Sidebar/Sidebar';
import DefaultSidebar from '@/components/Sidebar/DefaultSidebar';
import { useGetAISummaryFile } from '@/hooks/useGetSummary';
import useRedirect from '@/hooks/useRedirect';
import authState from '@/recoils/atoms/authState';
Expand Down Expand Up @@ -49,7 +49,7 @@ function ResultSection() {
<StyledContent>
<SummaryCheckForm summary={summary} />
</StyledContent>
<Sidebar>
<DefaultSidebar>
<SidebarContentContainer>
<StyledButtonContainer>
<CopySummaryButton text={summary.summaryContent} />
Expand All @@ -68,7 +68,7 @@ function ResultSection() {
onClick={() => setShowModal(true)}
/>
</SidebarContentContainer>
</Sidebar>
</DefaultSidebar>
{showModal && (
<SaveToCategoryModal
categoryType="SUMMARY"
Expand Down
6 changes: 3 additions & 3 deletions src/containers/SummaryUserPage/ResultSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import SaveToCategoryButton from '@/components/Button/SaveToCategoryButton';
import ShareLinkButton from '@/components/Button/ShareLinkButton';
import SummaryCheckForm from '@/components/Form/SummaryCheckForm';
import SaveToCategoryModal from '@/components/Modal/SaveToCategoryModal';
import Sidebar from '@/components/Sidebar/Sidebar';
import DefaultSidebar from '@/components/Sidebar/DefaultSidebar';
import { useGetUserSummaryItem } from '@/hooks/useGetSummary';
import useRedirect from '@/hooks/useRedirect';
import authState from '@/recoils/atoms/authState';
Expand Down Expand Up @@ -49,7 +49,7 @@ function ResultSection() {
<StyledContent>
<SummaryCheckForm summary={summary} />
</StyledContent>
<Sidebar>
<DefaultSidebar>
<SidebarContentContainer>
<StyledButtonContainer>
<CopySummaryButton text={summary.summaryContent} />
Expand All @@ -69,7 +69,7 @@ function ResultSection() {
onClick={() => setShowModal(true)}
/>
</SidebarContentContainer>
</Sidebar>
</DefaultSidebar>
{showModal && (
<SaveToCategoryModal
categoryType="SUMMARY"
Expand Down
4 changes: 2 additions & 2 deletions src/pages/CategoryQuizEditPage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { editQuizToCategory } from '@/apis/quizCategoryApi';
import QuizGenerationForm from '@/components/Form/QuizGenerationForm';
import Scrollbar from '@/components/Scrollbar/Scrollbar';
import Sidebar from '@/components/Sidebar/Sidebar';
import DefaultSidebar from '@/components/Sidebar/DefaultSidebar';
import ContentWrapper from '@/components/Wrapper/ContentWrapper';
import TopButtonBar from '@/containers/CategoryDetailPage/TopButtonBar';
import useRedirect from '@/hooks/useRedirect';
Expand Down Expand Up @@ -86,7 +86,7 @@ function CategoryQuizEditPage() {
/>
</StyledInnerContainer>
</StyledContent>
<Sidebar />
<DefaultSidebar />
</ContentWrapper>
);
}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/CategorySummaryEditPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { editSummaryToCategory } from '@/apis/summaryCategoryApi';
import FileNameInputField from '@/components/InputField/FileNameInputField';
import Sidebar from '@/components/Sidebar/Sidebar';
import DefaultSidebar from '@/components/Sidebar/DefaultSidebar';
import ContentWrapper from '@/components/Wrapper/ContentWrapper';
import TopButtonBar from '@/containers/CategoryDetailPage/TopButtonBar';
import GenerateTextWrapper from '@/containers/QuizAIPage/GenerateTextWrapper';
Expand Down Expand Up @@ -67,12 +67,12 @@ function CategorySummaryEditPage() {
setInputText={setSummaryContent}
/>
</StyledContent>
<Sidebar>
<DefaultSidebar>
<FileNameInputField
value={fileName}
onChange={(e) => setFileName(e.target.value)}
/>
</Sidebar>
</DefaultSidebar>
</ContentWrapper>
);
}
Expand Down

0 comments on commit a3dab3d

Please sign in to comment.