Skip to content

Commit

Permalink
데벨업 v2.0.2 Release (#665)
Browse files Browse the repository at this point in the history
* 풀이 태그 버그 해결 (issue #661) (#663)

* fix: 미션 태그 버그 해결

* refactor: 사용하지 않는 코드 제거

* 런칭 직전 QA 이후 수정사항 반영 (#664)

* fix: 풀이 본문 마크다운 설정 및 카드 overflow ellipsis 적용

* fix: 미션 시작하기 클릭 시 모달이 뜨지 않도록 수정

---------

Co-authored-by: JEON TAEHEON <[email protected]>

---------

Co-authored-by: Minji <[email protected]>
Co-authored-by: JEON TAEHEON <[email protected]>
  • Loading branch information
3 people authored Oct 11, 2024
1 parent 6e5cc7e commit 52b7bc4
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
1 change: 0 additions & 1 deletion frontend/src/apis/solutions.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { develupAPIClient } from '@/apis/clients/develupClient';
import { PATH } from '@/apis/paths';
import { HASHTAGS } from '@/constants/hashTags';
import type { HashTag } from '@/types';
import type { Solution, SubmittedSolution } from '@/types/solution';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export default function MissionDetailButtons({
const [isMissionStarted, setIsMissionStarted] = useState(isStarted);

const handleStartMission = () => {
handleModalOpen();
setIsMissionStarted(true);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import styled from 'styled-components';
import javaIcon from '@/assets/images/java.svg';
import GithubLogo from '@/assets/images/githubLogo.svg';
import { Link } from 'react-router-dom';
import SanitizedMDPreview from '../common/SanitizedMDPreview';

export const SolutionDetailTitle = styled.h2`
margin: 4rem 0 2rem 0;
Expand Down Expand Up @@ -103,7 +104,7 @@ export const CodeViewButtonWrapper = styled.div`
margin: 3rem 0;
`;

export const SolutionDescription = styled.div`
export const SolutionDescription = styled(SanitizedMDPreview)`
margin-top: 3rem;
${({ theme }) => theme.font.body}
`;
Expand All @@ -120,4 +121,3 @@ export const SolutionDescriptionBottom = styled.div`
export const CodeViewButtonLink = styled(Link)`
display: contents;
`;

2 changes: 1 addition & 1 deletion frontend/src/components/SolutionDetail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default function SolutionSection({ solution }: SolutionDetailProps) {
</Button>
</S.CodeViewButtonLink>
</S.CodeViewButtonWrapper>
<S.SolutionDescription>{description}</S.SolutionDescription>
<S.SolutionDescription source={description} />
{userInfo?.id === solution.member.id && (
<SolutionDetailBottom missionId={mission.id} solutionId={solutionId} />
)}
Expand Down
12 changes: 11 additions & 1 deletion frontend/src/components/common/InfoCard/InfoCard.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,23 @@ export const TitleWrapper = styled.div`
`;

export const Title = styled.div`
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
${(props) => props.theme.font.bodyBold}
`;

export const Description = styled.div`
${(props) => props.theme.font.body}
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
color: ${(props) => props.theme.colors.grey500};
margin-top: 0.5rem;
${(props) => props.theme.font.body}
`;

export const TagWrapper = styled.ul`
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/SolutionListPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function SolutionListPage() {
const [selectedHashTag, setSelectedHashTag] = useState<{ id: number; name: string } | null>(null);

const { data: allHashTags } = useHashTags();
const { data: allMissions } = useMissions(selectedHashTag?.name);
const { data: allMissions } = useMissions();

return (
<S.SolutionListPageContainer>
Expand Down

0 comments on commit 52b7bc4

Please sign in to comment.