Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
748b9ce
feat: react hook form + zod 설정
Mimiminz Aug 12, 2025
a1c6893
refactor: profile-form 스키마 추가
Mimiminz Aug 12, 2025
e0ebd29
refactor: form 스키마 분리
Mimiminz Aug 12, 2025
3bf79a7
refactor: profile info 스키마 분리
Mimiminz Aug 12, 2025
afc9ef6
refactor: profile info 모달 수정
Mimiminz Aug 12, 2025
ce1a661
refactor: form field 리팩토링
Mimiminz Aug 12, 2025
c51493a
fix: event -> value 형식 변경
Mimiminz Aug 12, 2025
6938ee7
refactor: single dropdown value 기반 변경
Mimiminz Aug 13, 2025
077821e
fix: description, errorMsg 조정
Mimiminz Aug 13, 2025
7d248ca
refactor: multi dropdown
Mimiminz Aug 13, 2025
4ba2f17
refactor: 스터디 신청 버튼 디자인 수정
aken-you Aug 18, 2025
f1941c1
feat: 피드백 버튼 추가
aken-you Aug 18, 2025
7777017
refactor: 피드백 아이콘 가로길이 수정
aken-you Aug 18, 2025
7c52987
feat: 스터디 참여 목록 타입 정의
Mimiminz Aug 19, 2025
7662040
feat: background 컬러 토큰 추가
aken-you Aug 20, 2025
3a9b7d9
feat: 스터디원 후기 작성 모달에서 보여줄 아이콘 추가
aken-you Aug 20, 2025
82c1a5d
feat: success background 컬러 토큰 추가
aken-you Aug 20, 2025
5b19852
feat: 스터디 참여 목록 api 추가
Mimiminz Aug 19, 2025
845e74b
fix: 간단 자기소개 추가
Mimiminz Aug 19, 2025
074c827
style: 버튼 크기별 라운드 변경
Mimiminz Aug 19, 2025
be1ee08
feat: 신청 리스트 유저 카드
Mimiminz Aug 19, 2025
904a825
style: 네임 변경
Mimiminz Aug 19, 2025
06f0613
feat: 무한 스크롤 query 추가
Mimiminz Aug 20, 2025
ac40b4f
style: 백엔드와 네이밍 통일 (participation -> reservation)
Mimiminz Aug 20, 2025
9331b00
style: 자기소개 없는 경우 스타일 변경
Mimiminz Aug 20, 2025
9d4277a
refactor: entity로 변경
Mimiminz Aug 20, 2025
97cdf8b
refactor: 색상 변경 가능하게 svgr로 변경
Mimiminz Aug 20, 2025
e839c1d
feat: 신청 목록 추가 및 api 연결
Mimiminz Aug 20, 2025
80da665
style: 네이밍 변경
Mimiminz Aug 20, 2025
cfd197f
feat: checkbox 아이콘 파일 추가
aken-you Aug 21, 2025
3a0ff14
feat: 스터디 후기 모달에 보여줄 데이터 요청 커스텀훅 생성
aken-you Aug 21, 2025
e62a608
fix: Button 컴포넌트에서 cn 오타 수정
aken-you Aug 21, 2025
7e64701
refactor: rhf controller 분리
Mimiminz Aug 22, 2025
f7cb212
style: round 변경
Mimiminz Aug 22, 2025
b5d708e
refactor: feature -> entity 이동
Mimiminz Aug 22, 2025
3a043f7
refactor: profile info의 form field 및 UI 수정
Mimiminz Aug 22, 2025
597b35f
fix: 기본 이미지 렌더 오류 수정
Mimiminz Aug 22, 2025
969344f
fix: 기본 이미지로 변경값 수정
Mimiminz Aug 22, 2025
f979d6e
refactor: 토글 그룹 분리
Mimiminz Aug 23, 2025
074af24
style: 토글 버튼 사이즈 변경
Mimiminz Aug 23, 2025
de4bde2
fix: 프로필 카드 이름 변경
Mimiminz Aug 23, 2025
dac6f53
feat: 스터디 신청 스키마 추가
Mimiminz Aug 23, 2025
952a9bc
refactor: 스터디 신청 모달 변경
Mimiminz Aug 23, 2025
913982c
feat: 스터디 리뷰 후기 모달 생성
aken-you Aug 23, 2025
33e3985
refactor: 프로필 수정 변경
Mimiminz Aug 23, 2025
97e6c5b
feat: 스터디 신청 리스트 추가
Mimiminz Aug 23, 2025
d6db644
fix: field-control 사용
Mimiminz Aug 23, 2025
4a97b4d
feat: 스터디 리뷰 제출 api 커스텀 훅 생성
aken-you Aug 23, 2025
5cb4e66
feat: textarea onChange 핸들러 추가
aken-you Aug 23, 2025
0edb94b
feat: checkbox onToggle 핸들러 추가
aken-you Aug 23, 2025
24cb4da
refactor: checkbox border 굵기 수정
aken-you Aug 23, 2025
ecc5e08
refactor: 폼로직을 StudyReviewForm으로 분리
aken-you Aug 23, 2025
557993d
refactor: 등록하기 disabled 설정
aken-you Aug 23, 2025
3e63ea0
feat: 스터디 후기 추가되면, 안내 메세지 제공
aken-you Aug 23, 2025
d3f0f09
refactor: useSuspenseQuery로 변경하여 파트너 스터디 후기 쿼리 개선
aken-you Aug 23, 2025
da67164
refactor: 등록하기 disabled 수정
aken-you Aug 23, 2025
7e82581
refactor: 면접 관련 스키마 분리 및 rhf 적용
Mimiminz Aug 23, 2025
2f38734
feat: 유효 URL 확인용 공통 스키마 유틸 분리
Mimiminz Aug 23, 2025
f3dda4a
fix: undefined 확인 추가
Mimiminz Aug 23, 2025
be287e5
fix: 네이밍 변경
Mimiminz Aug 23, 2025
b5a36df
fix: 스키마 오류 수정
Mimiminz Aug 23, 2025
4e5e13f
feat: 스터디 현재 상태에 따른 UI 적용
Mimiminz Aug 23, 2025
b03ca1b
style: warning 제거
Mimiminz Aug 23, 2025
b5e426a
feat: 스터디 리뷰 페이지 view 완성
aken-you Aug 24, 2025
b1be385
refactor: user profile modal에서 사용자 정보를 입력하지 않았을 경우, 빈 문자열로 표시
aken-you Aug 24, 2025
3c7b1ff
refactor: 소셜 클라이언트 id 수정
aken-you Aug 24, 2025
f779706
refactor: isLocal localStorage에서 저장하는 로직 삭제
aken-you Aug 24, 2025
b63525f
style: 계정 설정 주석 처리
aken-you Aug 24, 2025
ed2e15a
feat: 긍정적 평가 키워드 api 요청 커스텀 훅 생성
aken-you Aug 24, 2025
fb2d5db
feat: 부정적 평가 키워드 api 요청 커스텀 훅 생성
aken-you Aug 24, 2025
64b7788
refactor: 긍정적 키워드 목록의 queryKey 네이밍 수정
aken-you Aug 24, 2025
e778671
refactor: 키워드 response 타입 수정
aken-you Aug 24, 2025
eeeec22
fix: 컨벤션에 맞게 네이밍 변경
Mimiminz Aug 24, 2025
547e1b5
Merge pull request #122 from code-zero-to-one/QNRR-463-조민주-스터디-신청-회원-…
Mimiminz Aug 24, 2025
f37d4e4
feat: 스터디 후기 조회 api 커스텀 훅 생성
aken-you Aug 24, 2025
8ca3a09
Merge branch 'develop' into refactor/client-id
aken-you Aug 24, 2025
3ae3a8b
refactor: 리뷰 border와 image 스타일 수정
aken-you Aug 24, 2025
b0eedf6
refactor: 한국 시간 포맷팅 함수 추가 및 사용 수정
aken-you Aug 24, 2025
addf349
refactor: ProfileInfoCard 레이어 widgets -> entities로 변경
aken-you Aug 24, 2025
1bd76b5
feat: 총 리뷰 받은 수 표시
aken-you Aug 24, 2025
59cecbe
refactor: KeywordReview 컴포넌트 entities 레이어로 이동
aken-you Aug 24, 2025
1ac1a71
refactor: UserProfileModal에 받은 평가 표시
aken-you Aug 24, 2025
6ebad6e
refactor: ProfileInfoCard와 ProfileInfoCard 도메인 변경
aken-you Aug 24, 2025
65b47c0
Merge branch 'develop' into feat/study-review
aken-you Aug 24, 2025
b61c8aa
Merge pull request #123 from code-zero-to-one/refactor/client-id
aken-you Aug 24, 2025
c4abb40
style: formatKoreaRelativeTime에서 1분 미만이면 "방금 전" 반환
aken-you Aug 24, 2025
747784b
refactor: features에 있는 UserProfileModal 삭제
aken-you Aug 25, 2025
2924fe5
chore: docker 버전 업데이트
Mimiminz Aug 25, 2025
509f4a5
Merge pull request #125 from code-zero-to-one/프론트엔드-배포-에러
seong-jin-jo Aug 25, 2025
1490341
Merge pull request #124 from code-zero-to-one/feat/study-review
aken-you Aug 26, 2025
19be66b
fix: 빌드 시 Node 힙 메모리를 4GB까지 허용
aken-you Aug 26, 2025
283e89a
Merge pull request #126 from code-zero-to-one/fix/build-502-error
Mimiminz Aug 27, 2025
b0e3c1f
fix: Textarea의 onChange 수정
aken-you Aug 28, 2025
d7642cc
Merge pull request #128 from code-zero-to-one/fix/textarea-onchange
aken-you Aug 28, 2025
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
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 운영환경(main branch)에서 사용하는 Dockerfile

# 1단계: build
FROM node:18-alpine AS builder
FROM node:20-alpine AS builder
WORKDIR /app

COPY . .
Expand All @@ -12,7 +12,7 @@ COPY .env .env
RUN yarn install && yarn build

# 2단계: production
FROM node:18-alpine AS runner
FROM node:20-alpine AS runner
WORKDIR /app

ENV NODE_ENV=production
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 운영환경(main branch)에서 사용하는 Dockerfile

# 1단계: build
FROM node:18-alpine AS builder
FROM node:20-alpine AS builder
WORKDIR /app

COPY . .
Expand All @@ -12,7 +12,7 @@ COPY .env .env
RUN yarn install && yarn build

# 2단계: production
FROM node:18-alpine AS runner
FROM node:20-alpine AS runner
WORKDIR /app

ENV NODE_ENV=production
Expand All @@ -26,6 +26,9 @@ COPY --from=builder /app/next.config.ts ./next.config.ts
# 런타임시점에도 .env 파일 복사
COPY --from=builder /app/.env .env

# 빌드 시 Node 힙 메모리를 4GB까지 허용 (4096 = 4GB)
ENV NODE_OPTIONS="--max-old-space-size=4096"

# devDependencies는 설치하지 않고 dependencies만 설치
RUN yarn install --production

Expand Down
7 changes: 5 additions & 2 deletions Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 운영환경(main branch)에서 사용하는 Dockerfile

# 1단계: build
FROM node:18-alpine AS builder
FROM node:20-alpine AS builder
WORKDIR /app

COPY . .
Expand All @@ -12,7 +12,7 @@ COPY .env .env
RUN yarn install && yarn build

# 2단계: production
FROM node:18-alpine AS runner
FROM node:20-alpine AS runner
WORKDIR /app

ENV NODE_ENV=production
Expand All @@ -26,6 +26,9 @@ COPY --from=builder /app/next.config.ts ./next.config.ts
# 런타임시점에도 .env 파일 복사
COPY --from=builder /app/.env .env

# 빌드 시 Node 힙 메모리를 4GB까지 허용 (4096 = 4GB)
ENV NODE_OPTIONS="--max-old-space-size=4096"

# devDependencies는 설치하지 않고 dependencies만 설치
RUN yarn install --production

Expand Down
212 changes: 212 additions & 0 deletions app/(my)/my-study-review/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
'use client';

import Image from 'next/image';
import { useState } from 'react';
import KeywordReview from '@/entities/user/ui/keyword-review';
import { MyReviewItem } from '@/features/study/api/types';
import {
useMyNegativeKeywordsQuery,
useMyReviewsInfinityQuery,
useUserPositiveKeywordsQuery,
} from '@/features/study/model/use-review-query';
import { formatKoreaRelativeTime } from '@/shared/lib/time';

export default function MyStudyReview() {
const { data: positiveKeywordsData } = useUserPositiveKeywordsQuery({
pageSize: 5,
});
const { data: negativeKeywordsData } = useMyNegativeKeywordsQuery({
pageSize: 5,
});
const {
data: myReviewsData,
fetchNextPage,
hasNextPage,
} = useMyReviewsInfinityQuery();

const positiveKeywords = positiveKeywordsData?.keywords || [];
const negativeKeywords = negativeKeywordsData?.keywords || [];

const positiveKeywordsCount = positiveKeywordsData?.totalCount || 0;
const negativeKeywordsCount = negativeKeywordsData?.totalCount || 0;

const totalKeywordsCount = positiveKeywordsCount + negativeKeywordsCount;

const myReviews = myReviewsData?.reviews || [];

return (
<>
<section>
<div className="mb-200">
<div className="flex items-center gap-100">
<div className="font-designer-20b text-text-default">받은 평가</div>
<div className="font-designer-20b text-text-default">
{totalKeywordsCount}
</div>
</div>

<span className="font-designer-14r text-text-subtle">
개선이 필요한 점은 나에게만 보여요
</span>
</div>

<div className="mb-400 grid grid-cols-2 gap-300">
<div className="rounded-100 border-border-subtle min-h-[280px] border p-200">
<div className="mb-200 flex justify-between">
<h3 className="font-designer-16b text-text-default">좋았던 점</h3>

{positiveKeywords.length > 5 && (
<button className="font-designer-12m text-text-subtlest cursor-pointer">
더보기
</button>
)}
</div>

<ul className="flex flex-col gap-50">
{positiveKeywords.length > 0 ? (
positiveKeywords.map((keyword) => (
<KeywordReview
key={keyword.id}
content={keyword.content}
count={keyword.count}
/>
))
) : (
<span className="text-text-subtle font-designer-14r text-center">
아직 받은 평가가 없습니다.
</span>
)}
</ul>
</div>

<div className="rounded-100 border-border-subtle min-h-[280px] border p-200">
<div className="mb-200 flex justify-between">
<h3 className="font-designer-16b text-text-default">
개선이 필요한 점
</h3>

{negativeKeywords.length > 5 && (
<button className="font-designer-12m text-text-subtlest cursor-pointer">
더보기
</button>
)}
</div>

<ul className="flex flex-col gap-50">
{negativeKeywords.length > 0 ? (
negativeKeywords.map((keyword) => (
<KeywordReview
key={keyword.id}
content={keyword.content}
count={keyword.count}
/>
))
) : (
<span className="text-text-subtle font-designer-14r text-center">
아직 받은 평가가 없습니다.
</span>
)}
</ul>
</div>
</div>
</section>

<section>
<div className="flex items-center gap-100">
<div className="font-designer-20b text-text-default">후기</div>
<div className="font-designer-20b text-text-default">
{myReviewsData?.totalCount || 0}
</div>
</div>

<span className="font-designer-14r text-text-subtle">
모든 후기는 나에게만 보여요
</span>

<ul>
{myReviews.length > 0 ? (
myReviews.map((review) => <Review key={review.id} data={review} />)
) : (
<div className="text-text-subtle font-designer-14r flex h-[200px] items-center justify-center text-center">
아직까지 받은 후기가 없습니다.
</div>
)}

{hasNextPage && (
<button
className="font-designer-14m text-text-subtle hover:bg-background-accent-gray-default rounded-50 flex w-full cursor-pointer items-center justify-center py-200"
onClick={() => fetchNextPage()}
>
<span>더보기</span>

<Image
src="/icons/arrow-down.svg"
width={20}
height={20}
alt="후기 더보기"
/>
</button>
)}
</ul>
</section>
</>
);
}

function Review({ data }: { data: MyReviewItem }) {
const [expanded, setExpanded] = useState(false);

return (
<li className="border-b-border-subtle flex flex-col gap-150 border-b py-250">
<div className="flex items-center gap-150">
<Image
src={data.writer.profileImageUrl || '/profile-default.svg'}
width={32}
height={32}
alt={`${data.writer.memberName} 프로필 이미지`}
className="rounded-full"
/>

<div>
<span className="font-designer-14b text-text-default mr-50">
{data.writer.memberName}
</span>
<span className="font-designer-14r text-text-subtle mr-50">·</span>
<span className="font-designer-14r text-text-subtle">
{formatKoreaRelativeTime(data.reviewedAt)}
</span>
</div>
</div>

<div>
<p
className={`text-text-default font-designer-15r ${expanded ? 'line-clamp-none' : 'line-clamp-3'}`}
>
{data.content}
</p>
<button
className="font-designer-14r text-text-subtlest cursor-pointer"
onClick={() => setExpanded(!expanded)}
>
{expanded ? '접기' : '더보기'}
</button>
</div>

<div>
<div className="text-text-subtle">
<span className="font-designer-14b mr-100">스터디 기간</span>
<span className="font-designer-13r">
{data.startDate.replace(/-/g, '.')} ~{' '}
{data.endDate.replace(/-/g, '.')}
</span>
</div>
<div className="text-text-subtle">
<span className="font-designer-14b mr-100">스터디 주제</span>
<span className="font-designer-13r">
{data.studySubjects.join(', ')}
</span>
</div>
</div>
</li>
);
}
8 changes: 8 additions & 0 deletions app/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ https://velog.io/@oneook/tailwindcss-4.0-%EB%AC%B4%EC%97%87%EC%9D%B4-%EB%8B%AC%E
--color-background-brand-default: var(--color-rose-500);
--color-background-brand-strong: var(--color-rose-700);

--color-background-neutral-subtle: var(--color-gray-200);
--color-background-neutral-default: var(--color-gray-500);
--color-background-neutral-strong: var(--color-gray-900);

--color-background-accent-blue-subtle: var(--color-blue-50);
--color-background-accent-blue-default: var(--color-blue-100);
--color-background-accent-blue-strong: var(--color-blue-600);
Expand Down Expand Up @@ -226,6 +230,10 @@ https://velog.io/@oneook/tailwindcss-4.0-%EB%AC%B4%EC%97%87%EC%9D%B4-%EB%8B%AC%E
--color-background-accent-yellow-default: var(--color-yellow-100);
--color-background-accent-yellow-strong: var(--color-yellow-600);

--color-background-success-subtle: var(--color-green-300);
--color-background-success-default: var(--color-green-500);
--color-background-success-strong: var(--color-green-700);

--color-fill-brand-default-default: var(--color-rose-500);
--color-fill-brand-default-hover: var(--color-rose-600);
--color-fill-brand-default-pressed: var(--color-rose-700);
Expand Down
5 changes: 5 additions & 0 deletions next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ const nextConfig: NextConfig = {
hostname: 'test-api.zeroone.it.kr',
pathname: '/profile-image/**',
},
{
protocol: 'https',
hostname: 'api.zeroone.it.kr',
pathname: '/profile-image/**',
},
{
protocol: 'https',
hostname: 'lh3.googleusercontent.com',
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"api:logs": "docker-compose -f ../study-platform-mvp/docker-compose.yml logs -f mvp-app"
},
"dependencies": {
"@hookform/resolvers": "^5.2.1",
"@next/third-parties": "^15.3.3",
"@radix-ui/react-avatar": "^1.1.9",
"@radix-ui/react-dialog": "^1.1.10",
Expand All @@ -37,10 +38,12 @@
"react": "^19.0.0",
"react-day-picker": "9.4.3",
"react-dom": "^19.0.0",
"react-hook-form": "^7.62.0",
"tailwind-merge": "^3.2.0",
"tailwindcss": "^4.0.6",
"tailwindcss-animate": "^1.0.7",
"tw-animate-css": "^1.2.5",
"zod": "^4.0.17",
"zustand": "^5.0.3"
},
"devDependencies": {
Expand Down
9 changes: 9 additions & 0 deletions public/apply-study.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/feedback.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/fine-review.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/good-review.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/icons/shame-review.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/shape.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/start-study.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/entities/user/ui/keyword-review.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export default function KeywordReview({
content,
count,
}: {
content: string;
count: number;
}) {
return (
<li className="bg-background-accent-gray-default text-text-default rounded-50 flex justify-between px-200 py-100">
<span className="font-designer-14r">{content}</span>
<span className="font-designer-14b">{count}</span>
</li>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interface Props {
export default function ProfileInfoCard({ title, content }: Props) {
return (
<div className="rounded-75 bg-background-alternative flex gap-400 p-250">
<div className="font-designer-16b text-text-default w-1/5 shrink-0">
<div className="font-designer-16b text-text-default w-[132px] shrink-0">
{title}
</div>
<div className="font-designer-15r text-text-default flex-1">
Expand Down
Loading