Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FE] feat : 리뷰 작성 내용 확인 에서 쓰지 않은 서술형에서 답변을 작성하지 않았다는 문구 띄어주기 #466

Merged
merged 3 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions frontend/src/components/common/LongReviewItem/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,11 @@ export const Textarea = styled.textarea<TextareaProps>`
height: 15rem;
padding: 1.6rem;

font-weight: ${({ theme }) => theme.fontWeight.medium};
overflow-wrap: break-word;

border: 0.1rem solid ${({ $isError, theme }) => ($isError ? theme.colors.red : theme.colors.black)};
border-radius: 0.8rem;

&::placeholder {
font-weight: ${({ theme }) => theme.fontWeight.medium};
}

${({ $style }) => $style && { ...$style }};
`;

Expand Down
1 change: 0 additions & 1 deletion frontend/src/components/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export * from './layouts';
export * from './common';
export * from './error';
export { default as AnswerListRecheckModal } from './AnswerListRecheckModal';
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { EssentialPropsWithChildren } from '@/types';

import * as S from './styles';

interface ReviewWritingCardProps {
interface ReviewCardProps {
title: string;
}

const ReviewWritingCard = ({ title, children }: EssentialPropsWithChildren<ReviewWritingCardProps>) => {
const ReviewCard = ({ title, children }: EssentialPropsWithChildren<ReviewCardProps>) => {
return (
<S.Container>
<S.Header>
Expand All @@ -17,4 +17,4 @@ const ReviewWritingCard = ({ title, children }: EssentialPropsWithChildren<Revie
);
};

export default ReviewWritingCard;
export default ReviewCard;
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { Fragment } from 'react';

import { MultilineTextViewer } from '@/components';
import { CheckboxItem, MultilineTextViewer } from '@/components';
import ContentModal from '@/components/common/modals/ContentModal';
import { ReviewWritingAnswer, ReviewWritingCardSection } from '@/types';

import CheckboxItem from '../common/CheckboxItem';
import ContentModal from '../common/modals/ContentModal';

import QuestionCard from './components/QuestionCard';
import ReviewWritingCard from './components/ReviewWritingCard';
import ReviewCard from './components/ReviewCard';
import * as S from './styles';

interface AnswerListRecheckModalProps {
Expand All @@ -34,8 +32,8 @@ const AnswerListRecheckModal = ({ questionSectionList, answerMap, closeModal }:
<S.AnswerListContainer>
<S.CardLayout>
{questionSectionList.map((section) => (
<S.ReviewWritingCardWrapper key={section.sectionId}>
<ReviewWritingCard title={section.header}>
<S.ReviewCardWrapper key={section.sectionId}>
<ReviewCard title={section.header}>
{section.questions.map((question) => (
<Fragment key={question.questionId}>
<QuestionCard questionType="normal" question={question.content} />
Expand All @@ -55,14 +53,20 @@ const AnswerListRecheckModal = ({ questionSectionList, answerMap, closeModal }:
))}
</div>
)}
{<S.TextAnswerWrapper>{question.questionType === 'TEXT'}</S.TextAnswerWrapper> && (
<MultilineTextViewer text={findTextAnswer(question.questionId) || ''} />
{question.questionType === 'TEXT' && (
<S.TextAnswerWrapper>
{findTextAnswer(question.questionId) ? (
<MultilineTextViewer text={findTextAnswer(question.questionId) as string} />
) : (
<S.EmptyTextAnswer>작성한 답변이 없어요</S.EmptyTextAnswer>
)}
</S.TextAnswerWrapper>
)}
</S.ContentContainer>
</Fragment>
))}
</ReviewWritingCard>
</S.ReviewWritingCardWrapper>
</ReviewCard>
</S.ReviewCardWrapper>
))}
</S.CardLayout>
</S.AnswerListContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const ContentContainer = styled.div`
flex-direction: column;
`;

export const ReviewWritingCardWrapper = styled.div`
export const ReviewCardWrapper = styled.div`
overflow: hidden;
border: 0.2rem solid ${({ theme }) => theme.colors.lightPurple};
border-radius: ${({ theme }) => theme.borderRadius.basic};
Expand All @@ -27,3 +27,8 @@ export const ReviewWritingCardWrapper = styled.div`
export const TextAnswerWrapper = styled.div`
margin-top: 1rem;
`;

export const EmptyTextAnswer = styled.p`
width: 100%;
color: ${({ theme }) => theme.colors.gray};
`;
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useEffect, useState } from 'react';
import { useEffect } from 'react';
import { useNavigate } from 'react-router';
import { useRecoilState, useRecoilValue } from 'recoil';

import { ConfirmModal, AnswerListRecheckModal } from '@/components';
import { ConfirmModal } from '@/components';
import {
useCurrentCardIndex,
useGetDataToWrite,
Expand All @@ -14,12 +14,10 @@ import {
useUpdateDefaultAnswers,
} from '@/hooks';
import useModals from '@/hooks/useModals';
import { AnswerListRecheckModal, ProgressBar, ReviewWritingCard } from '@/pages/ReviewWritingCardFromPage/components';
import { answerMapAtom, answerValidationMapAtom, visitedCardListAtom } from '@/recoil';
import { ReviewWritingFormResult } from '@/types';

import ProgressBar from '../ProgressBar';
import ReviewWritingCard from '../ReviewWritingCard';

import * as S from './styles';

// const PROJECT_IMAGE_SIZE = '5rem';
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export { default as AnswerListRecheckModal } from './AnswerListRecheckModal';
export { default as CardForm } from './CardForm';
export { default as CardSliderController } from './CardSliderController';
export { default as MultipleChoiceQuestion } from './MultipleChoiceQuestion';
export { default as ProgressBar } from './ProgressBar';
export { default as QnABox } from './QnABox';
export { default as ReviewWritingCard } from './ReviewWritingCard';