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.

Sign up for GitHub

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

Refactor/#505 댓글 기능을 임시 중단하고 킬링파트 듣기 페이지의 디자인을 수정한다. #526

Merged
merged 3 commits into from
Oct 19, 2023
Merged

Refactor/#505 댓글 기능을 임시 중단하고 킬링파트 듣기 페이지의 디자인을 수정한다. #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
259ca6e
design: 반응형 디자인 수정
cruelladevil Oct 19, 2023
dd97a30
feat: 댓글 기능 임시적으로 중단
cruelladevil Oct 19, 2023
45ceb6c
Merge branch 'main' into refactor/#505
cruelladevil Oct 19, 2023
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
10 changes: 7 additions & 3 deletions frontend/src/features/songs/components/KillingPartInterface.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useRef, useState } from 'react';
import { styled } from 'styled-components';
import CommentList from '@/features/comments/components/CommentList';
// NOTE: 댓글 기능 임시 중단
// import CommentList from '@/features/comments/components/CommentList';
import useVideoPlayerContext from '@/features/youtube/hooks/useVideoPlayerContext';
import Flex from '@/shared/components/Flex/Flex';
import Spacing from '@/shared/components/Spacing';
Expand All @@ -19,6 +20,8 @@ const DEFAULT_PART_ID = -1;

const KillingPartInterface = ({ killingParts, songId, memberPart }: KillingPartInterfaceProps) => {
const [nowPlayingTrack, setNowPlayingTrack] = useState(DEFAULT_PART_ID);
// NOTE: 댓글 기능 임시 중단
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [commentsPartId, setCommentsPartId] = useState<KillingPart['id']>(DEFAULT_PART_ID);
const [isRepeat, setIsRepeat] = useState(false);
const { videoPlayer, playerState, seekTo, pause } = useVideoPlayerContext();
Expand Down Expand Up @@ -144,9 +147,10 @@ const KillingPartInterface = ({ killingParts, songId, memberPart }: KillingPartI
setNowPlayingTrack={setNowPlayingTrack}
setCommentsPartId={setCommentsPartId}
/>
{commentsPartId !== DEFAULT_PART_ID && (
{/* NOTE: 댓글 기능 임시 중단 */}
{/* {commentsPartId !== DEFAULT_PART_ID && (
<CommentList songId={songId} partId={commentsPartId} />
)}
)} */}
</Flex>
);
};
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/features/songs/components/KillingPartTrackList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ export const TrackList = styled.div`
display: flex;
flex-direction: column;
gap: 10px;
width: 314px;

@media (max-width: ${({ theme }) => theme.breakPoints.md}) {
width: 100%;
}
`;

const PartRegisterButton = styled.button`
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/features/songs/components/SongDetailItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const SongDetailItem = forwardRef<HTMLDivElement, SongDetailItemProps>(
<Flex
$gap={16}
$md={{ $direction: 'column' }}
$xs={{ $css: { padding: '8px' } }}
$css={{ padding: '16px', background: '#121212c8', borderRadius: '8px' }}
>
<Flex $direction="column" $css={{ flex: '3 1 0' }}>
Expand Down Expand Up @@ -82,6 +83,8 @@ export default SongDetailItem;
const Container = styled.div`
display: flex;
flex-direction: column;
justify-content: center;

height: 100vh;
padding-top: ${({ theme: { headerHeight } }) => headerHeight.desktop};

Expand Down