Skip to content

배포 전 충돌 해결 및 사용하지 않는 파일 정리#89

Merged
kimnamheeee merged 3 commits intodevfrom
dev-fix-main-conflict
Jan 30, 2026
Merged

배포 전 충돌 해결 및 사용하지 않는 파일 정리#89
kimnamheeee merged 3 commits intodevfrom
dev-fix-main-conflict

Conversation

@kimnamheeee
Copy link
Collaborator

No description provided.

kimnamheeee and others added 3 commits January 27, 2026 14:57
* 🧹 chore: add tanstack router plugins

* ✨ feat(routes): integrate tanstack router

* ✨ feat(routes): add basic routes

profile, explore, login

* 🧹 chore(eslint): add ignore for shared/ui

* ✨ feat(components): add sidebar component

* 🧹 chore(asset): add instagram logo

* 💎 style(index): initialize style

* ✨ feat(route): add /me to route

* ✨ feat(provider): add sidebar provider

* ✨ feat(route): configure provider

* ✨ feat(components): add sidebar navigation item component

* ✨ feat(component): add sidebar component

* ✨ feat(routes): separate homepage component

* ✨ feat(components): add drawer component

* ✨ feat(components): add dialog component

* ✨ feat(components): add action, type to navItems

* ✨ feat(components): add app level modal, drawer

* ✨ feat(components): open drawer on search click, open modal on create click

* 로그인 페이지 UI 구현

* 비밀번호 찾기 화면 구현

* 계정 생성 UI 및 비밀번호 생성 로직 구현

* 로그인 메인화면 가입하기 버튼 버그 수정

* ✨ feat(components): add create post modal component

* package-lock.json 삭제

* ✨ feat(components): add sonner

* ✨ feat(provider): integrate toaster

* ✨ feat(components): add dropzone component

* ✨ feat(components): integrate drag and drop to createmodal

* ♻️ refactor(components): separate logic using custom hook

* ♻️ refactor(components): separate ui components

* ✨ feat(components): add post details pane

* ✨ feat(components): add double modal on exit

* 🧹 chore: add testing library

* 🧪 test(createmodal): add create post modal related tests

* ✨ feat(components): add profile header

* ✨ feat(api): initialize ky instance

* ✨ feat(components): add tabs

* ✨ feat(routes): separate app route layer

* ✨ feat(routes): update route tree

* ✨ feat(components): add fallback image

* ✨ feat(profile-posts): add grid ui

* ✨ feat(profilepage): add posts grid ui

* 🧹 chore(homepage): remove duplicate navigation shell

* ♻️ refactor(profilepage): add common style container component

* ✨ feat(profile): add profile page component

* ✨ feat(navigation): add useNavController hook

* 🧹 chore: rerun yarn install

* ✨ feat(msw): msw 기본 설정

* ✨ feat(components): add carousel

* ♻️ refactor(sidebar): collapse sidebar below xl

* ✨ feat(components): add stories field

* ✨ feat(stories): add link to story route

* ✨ feat: msw 구조 수정

* ✨ feat: msw post db 업데이트 및 기본 레이아웃 구현

* ✨ feat: 사진 기본 ui 구현

* ✨ feat: 하트 색깔 및 불투명도 수정

* ✨ feat: 하트 올라가는 애니메이션 구현

* ✨ feat: 하트 애니메이션 구체화 및 버그 수정

* ✨ feat(msw): add common response type

* 🐛 fix(msw): fix common response type field name

* ✨ feat(msw): add mock users

* ✨ feat(msw): add follow handlers

* 💎 style(sidebar): add padding

* ✨ feat(components): add follow list modal component

needs to be fixed based on real api

* ✨ feat(components): add mock data / match data type

* 💎 style(search): adjust search drawer style

* ✨ feat: ... (설정) 화면 모달 구현

* ✨ feat(search): apply debounce to input value

* ✨ feat: msw 구현 (comment)

* 🧹 chore: remove duplicate key

* ✨ feat: 댓글 ui

* ✨ feat: 댓글 설정창(...) ui 구현

* ✨ feat: ... 모달 로직 수정

* ✨ feat: 글 본문 및 프로필 ui 수정 (여백 정리)

* ✨ feat(msw): warn unhandled requests for debugging

* ✨ feat(gitignore): add env

* ✨ feat(providers): add query client provider

* ✨ feat(api): add test (health check) handler

* ✨ feat(route): add test route for api connection test

* ✨ feat: 액션 바 (상호작용) ui 구현

* ✨ feat: env 삭제

* 💎 style(sidebar): update layout stability

* ✨ feat(sidebar): updage search drawer toggle logic

* ✨ feat(sidebar): remain page width when opening search drawer

* ✨ feat(components): add pagination

* ✨ feat(components): add shared components

lazyimage / card

* ✨ feat(msw): add post mock data

* ✨ feat(api): add feed schema / types

* ✨ feat(api): add handler / api function

* ✨ feat(home): add feed ui

* ✨ feat(actions): add env variable on cd workflow

* 💎 style(sidebar): collapse sidebar on search drawer toggle

* 🐛 fix(route): update route from profile_id to post_id

* ✨ feat(feed): link to post detail on click

* ✨ feat(components): add dropdown

* ✨ feat(msw): add album handler

* ✨ feat(api): add album api call functions

* ✨ feat(api): add album api call function

* 🐛 fix(msw): adjust handler order

* 💎 style(dropdown): remove circle icon

* ✨ feat(album): add album dropdown

* 🧪 test(album): add album dropdown tests

* 🐛 fix(actions): apply secrets

* 🧹 chore: update test:ci command option

* ✨ feat(msw): add bookmarks handler

* ✨ feat(bookmarks): add bookmarked posts ui

* ✨ feat(postdetail): return to previous page when closing page

* ✨ feat(postdetail): validate search params with zod

* ✨ feat: 하단 푸터 - 위치 화면 구현

* ✨ feat: 하단 푸터 수정 (Instagram Lite 추가)

* ✨ feat: 푸터 완성

* ✨ feat: 푸터 ui, 기능, 경로 설정 완성

* ✨ feat: 로그인 msw 설정

* ✨ feat: 로그인 검사 로직 추가 및 카카오톡 로그인 ui 구현

---------

Co-authored-by: c0912jy <c0912jy@gmail.com>
@kimnamheeee kimnamheeee requested a review from c0912jy as a code owner January 30, 2026 07:42
@github-actions
Copy link

CI 통과했습니다!

  • Lint / Type / Test / Build 모두 성공
  • dev 브랜치로 머지 가능합니다 🚀

@kimnamheeee kimnamheeee reopened this Jan 30, 2026
@github-actions
Copy link

CI 통과했습니다!

  • Lint / Type / Test / Build 모두 성공
  • dev 브랜치로 머지 가능합니다 🚀

@kimnamheeee kimnamheeee merged commit f27984c into dev Jan 30, 2026
2 checks passed
@kimnamheeee kimnamheeee deleted the dev-fix-main-conflict branch January 31, 2026 03:05
@kimnamheeee kimnamheeee self-assigned this Feb 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant