Skip to content

Commit

Permalink
Chore: dev-ver2에서 dev 커밋 cherry-pick, 탐색 페이지 이슈 해결 시도 (#224)
Browse files Browse the repository at this point in the history
* Chore: 환경설정 커밋

* Fix: 댓글 폼 TextArea로 수정, 댓글/답글 관련 버그 수정 (#210)

* Fix: 답글 캐싱 문제 해결

* Fix: 답글 생성, 수정 관련 로직 수정

* Fix: 댓글 form input에서 textarea로 교체

* Fix: 댓글 작성 이후 자동으로 textarea 크기 바뀌게 수정

* Fix: intro 페이지 이미지 교체, 메이커스 이름 추가 (임시) (#213)

* Feat: 인트로 페이지 정적인 이미지 동영상으로 교체

* Feat: 인트로 페이지 이미지 교체

* Fix: 인트로 페이지 코드리뷰 반영

* Fix: 탐색 페이지 트렌딩 리스트 사파리에서 타이틀의 webkit 속성이 적용되지 않는 문제 해결
  • Loading branch information
Nahyun-Kang authored Apr 22, 2024
1 parent dc82044 commit 42ea573
Show file tree
Hide file tree
Showing 19 changed files with 220 additions and 44 deletions.
Binary file added public/images/section7_phone2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 32 additions & 1 deletion public/sw.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added public/videos/record_video.mp4
Binary file not shown.
Binary file added public/videos/video_section3.mp4
Binary file not shown.
3 changes: 2 additions & 1 deletion src/app/intro/_components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ function Footer() {
</div>
<div className={styles.policyWrapper}>
<p>{introLocale[language].privacy}</p>
<p>[email protected]</p>
<p>에잇(Eight)</p>
<p>Makers : 에잇(Eight, [email protected])</p>
<p>Copyright ©Listywave - All rights reserved</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/intro/_components/MotionWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function MotionWrapper({ children, delay, variantsType = 'vertical' }: MotionWra

const ref = useIntersectionObserver(() => {
controls.start('visible');
}, 0.5);
}, 0.4);

return (
<motion.div
Expand Down
19 changes: 17 additions & 2 deletions src/app/intro/_components/Section3.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@ import * as fonts from '@/styles/font.css';
export const background = style({
width: '100%',
height: '752px',
padding: '71px 30px 77px',
padding: '71px 0 77px',

backgroundColor: vars.color.white,
});

export const wrapper = style({
position: 'relative',
display: 'flex',
flexDirection: 'column',
});

export const recordWrapper = style({
position: 'relative',
padding: '0 30px',
display: 'flex',
alignItems: 'center',
gap: '7px',
Expand Down Expand Up @@ -43,6 +46,8 @@ export const recText = style([fonts.labelLarge, {}]);
export const contentsWrapper = style({
margin: '55.5px 0 46px',

position: 'relative',

display: 'flex',
flexDirection: 'column',
alignItems: 'center',
Expand Down Expand Up @@ -75,15 +80,25 @@ export const subTitleWrapper = style([
]);

export const imageWrapper = style({
width: '100%',
height: '400px',
position: 'relative',
});

export const video = style({
width: '100%',
height: 'auto',

border: 'none',
});

// blurbox이 검은색으로 바뀌는 이상 현상이 있어서 잠시 주석화
export const blurBox = style({
width: '100%',
height: '174px',

position: 'absolute',
bottom: -40,
bottom: -20,

background: 'linear-gradient(180deg, rgba(255, 255, 255, 0.00) -8.85%, #FFF 53.58%)',
});
7 changes: 1 addition & 6 deletions src/app/intro/_components/Section3.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@ function Section3() {
<span>{introLocale[language].section.message6}</span>
</div>
<div className={styles.imageWrapper}>
<Image
src={'/images/list_section3.png'}
alt={introLocale[language].section.createListImage}
width={300}
height={314}
/>
<video src={'/videos/video_section3.mp4'} autoPlay loop muted className={styles.video} />
<div className={styles.blurBox}></div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/intro/_components/Section7.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function Section7() {
<div className={styles.linkWrapper}>listywave.com/user/1</div>
</MotionWrapper>
<Image
src={'/images/section7_phone.png'}
src={'/images/section7_phone2.png'}
alt={introLocale[language].section.cellphoneImage}
width={255}
height={518}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export const commentContent = style({
fontWeight: 500,
lineHeight: 'normal',
letterSpacing: '-0.36px',
wordBreak: 'break-word',
});

export const deletedComment = style({
Expand Down
14 changes: 10 additions & 4 deletions src/app/list/[listId]/_components/ListDetailOuter/Comment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import timeDiff from '@/lib/utils/time-diff';
import { QUERY_KEYS } from '@/lib/constants/queryKeys';
import { CommentType } from '@/lib/types/commentType';
import { UserType } from '@/lib/types/userProfileType';
import { useCommentId } from '@/store/useComment';
import { useCommentId, useCommentStatus } from '@/store/useComment';
import { commentLocale } from '@/app/list/[listId]/locale';

import * as styles from './Comment.css';
Expand All @@ -25,9 +25,10 @@ import { useLanguage } from '@/store/useLanguage';
*/
interface CommentProps {
comment?: CommentType;
onUpdate: (userName?: string) => void;
setActiveNickname: (userName?: string) => void;
activeNickname?: string | null;
handleSetCommentId: (id: number | undefined) => void;
handleSetComment: (comment: string) => void;
listId?: number;
commentId?: number;
currentUserInfo?: UserType;
Expand All @@ -36,17 +37,18 @@ interface CommentProps {

function Comment({
comment,
onUpdate,
setActiveNickname: onUpdate,
handleSetCommentId,
handleSetComment,
listId,
commentId,
currentUserInfo,

handleEdit,
}: CommentProps) {
const { language } = useLanguage();
const queryClient = useQueryClient();
const { setCommentId } = useCommentId();
const { setStatusCreateReply, setStatusEdit } = useCommentStatus();

//현재 작성중인 답글의 원댓글 정보를 업데이트 하는 로직
const handleActiveNicknameAndIdUpdate = () => {
Expand All @@ -55,11 +57,15 @@ function Comment({
if (!currentUserName && !currentCommentId) {
return null;
}
handleSetComment('');
setStatusCreateReply();
onUpdate(currentUserName);
handleSetCommentId(currentCommentId);
};

//수정하기 버튼을 누르면 실행되는 함수
const handleEditButtonClick = (comment: string) => {
setStatusEdit();
handleEdit(comment);
setCommentId(commentId as number);
};
Expand Down
Loading

0 comments on commit 42ea573

Please sign in to comment.