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

🔀 epic/FE-29 브랜치 최신화 #23

Merged
merged 27 commits into from
Jul 15, 2024
+1,198 −4
Merged

🔀 epic/FE-29 브랜치 최신화 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
28ed47f
FE-48 📰 공용 컴포넌트 face emoji svg 파일 생성
newjinlee Jul 10, 2024
676bdae
FE-48 :art: 감정 이모티콘 폴더 구조 변경
newjinlee Jul 10, 2024
90925cc
FE-48 :sparkles: 감정 이모티콘 카드 컴포넌트 ui 생성
newjinlee Jul 10, 2024
fbeab3c
FE-48 :sparkles: 감정 이모티콘 상태에 따른 클래스 설정
newjinlee Jul 10, 2024
400cfb5
FE-48 :lipstick: 감정 이모티콘 카드 컴포넌트 ui 수정
newjinlee Jul 10, 2024
830601e
FE-48 :sparkles: 감정 이모티콘 카드 클릭 이벤트 구현
newjinlee Jul 10, 2024
991b355
FE-48 📝 컴포넌트 이름 변경
newjinlee Jul 10, 2024
9819c6d
FE-48 :sparkles: 감정 이모티콘 상태 변화 동기화 구
newjinlee Jul 10, 2024
9986486
FE-48 :sparkles: EmotionSelector 컴포넌트 동적 크기 변경 구현
newjinlee Jul 10, 2024
14063df
FE-48 :fire: 출력 확인을 위한 테스트 컴포넌트 삭제
newjinlee Jul 10, 2024
cc00d3c
FE-48 :hammer: EmotionTypes 인터페이스 정의
newjinlee Jul 10, 2024
c362fcf
Merge pull request #9 from epigram5-9/feat/FE-48--emotion-component
newjinlee Jul 11, 2024
8d83f8e
FE-59 :sparkles: 에피그램 카드 ui 구현
newjinlee Jul 11, 2024
add618b
FE-59 :sparkles: 에피그램 카드 반응현 디자인 구현
newjinlee Jul 11, 2024
8381a05
FE-59 :lipstick: 에피그램 카드 글씨체 적용
newjinlee Jul 11, 2024
5e0f15a
FE-59 :fire: 에피그램 카드 테스트 코드 삭제
newjinlee Jul 11, 2024
929abb8
FE-59 :fire: 테스트 흔적 삭제
newjinlee Jul 11, 2024
d82c871
Merge branch 'epic/FE-46-common-components' into feat/FE-59--epigram-…
newjinlee Jul 11, 2024
87e0729
Merge pull request #16 from epigram5-9/feat/FE-59--epigram-card
newjinlee Jul 11, 2024
0d964a4
FE-58 :sparkles: 공용 컴포넌트 댓글 카드 기본 ui 구현
newjinlee Jul 11, 2024
1bba1ac
FE-58 :lipstick: 공용 컴포넌트 반응형 디자인 적용
newjinlee Jul 11, 2024
4b31636
FE-58 :fire: 댓글 카드 테스트 코드 삭제
newjinlee Jul 11, 2024
b0591d6
FE-58 :lips: 댓글 카드 관련 인터페이스, 스타일 분리
newjinlee Jul 11, 2024
c374a27
Merge pull request #17 from epigram5-9/feat/FE-58--comment-textbox
newjinlee Jul 11, 2024
09d3cb2
FE-50 ✨공용컴포넌트 헤더 구현 (#19)
imsoohyeok Jul 12, 2024
550de0e
Merge pull request #21 from epigram5-9/epic/FE-46-common-components
newjinlee Jul 13, 2024
3b7f965
:twisted_rightwards_arrows: Merge branch 'epic/FE-29' into merge/FE-29
jangmoonwon Jul 14, 2024
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
536 changes: 535 additions & 1 deletion package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"react": "^18",
"react-dom": "^18",
"react-hook-form": "^7.52.1",
"react-toastify": "^10.0.5",
"sharp": "^0.33.4",
"tailwind-merge": "^2.4.0",
"tailwindcss-animate": "^1.0.7",
"zod": "^3.23.8"
Expand Down
Binary file added public/ProfileTestImage.jpg
View file
Open in desktop
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/favicon.ico
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions public/icon/BW/AngryFaceBWIcon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/icon/BW/HeartFaceBWIcon.svg
View file
Open in desktop
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 public/icon/BW/SadFaceBWIcon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/icon/BW/SmileFaceBWIcon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/icon/BW/ThinkFaceBWIcon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions public/icon/Color/AngryFaceColorIcon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading