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.

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

Feat: create home #29

Merged
merged 36 commits into from
Jan 7, 2024
Merged

Feat: create home #29

merged 36 commits into from
Jan 7, 2024

Conversation

Yamyam-code
Copy link
Member

@Yamyam-code Yamyam-code commented Jan 5, 2024

개요

홈페이지 마크업
close #6

스크린샷

이미지1의_대체_텍스트 이미지2의_대체_텍스트

주요 내용

  • 홈페이지 마크업
  • 홈페이지 데이터 msw 연결

고민한 점, 질문거리

  • type 미확정으로 추후 수정 예정
  • api 엔드포인트 미확정으로 추후 수정 예정
  • 온보딩 모달 디자인 미완성으로 추후 추가 예정
  • 이후 슬라이드 구현 예정

@Yamyam-code Yamyam-code linked an issue Jan 5, 2024 that may be closed by this pull request
2 tasks
Copy link

vercel bot commented Jan 5, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
trip-vote ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 7, 2024 7:31am

@HOOOO98
Copy link
Contributor

HOOOO98 commented Jan 5, 2024

메인으로 pr이 생성돼서 한번 확인 부탁드려요~

@Yamyam-code Yamyam-code changed the base branch from main to dev January 5, 2024 12:45
@HOOOO98
Copy link
Contributor

HOOOO98 commented Jan 5, 2024

node_modules 디렉토리와 package-lock.json 파일 삭제 후 npm i 명령어를 입력하고 다시 push 해주세요🥲

HOOOO98
HOOOO98 previously approved these changes Jan 5, 2024
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아하! 잘 참고하겠습니다ㅎㅎ

Comment on lines +18 to +20
::-webkit-scrollbar {
display: none;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아..스크롤바도 지워야 하는군요
생각 못했네요 하하..

Copy link
Contributor

@HOOOO98 HOOOO98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Yamyam-code

냠냠코딩님 혹시 #25 pr 머지 될때 컨플릭트만 나오지 않았나요..?
너무 많아서 rebase 하셨나요?

@Yamyam-code
Copy link
Member Author

Yamyam-code commented Jan 6, 2024

@Yamyam-code

냠냠코딩님 혹시 #25 pr 머지 될때 컨플릭트만 나오지 않았나요..? 너무 많아서 rebase 하셨나요?

@HOOOO98
다른 사람이 pr 머지하면 로컬환경에서 dev pull 받고 다시 푸쉬하는게 제 루틴이었는데 성후님 dev pull 하실 때 rebase로 받으신다고 했던게 생각나서 무지성 rebase 저질러버렸습니다... rebase에 대해 좀 더 공부하고 사용할게요 ㅜㅜ

HOOOO98
HOOOO98 previously approved these changes Jan 7, 2024
@Yamyam-code Yamyam-code dismissed HOOOO98’s stale review January 7, 2024 05:04

The merge-base changed after approval.

SKY-PEY
SKY-PEY previously approved these changes Jan 7, 2024
@Yamyam-code Yamyam-code dismissed SKY-PEY’s stale review January 7, 2024 07:24

The merge-base changed after approval.

}),
];

// 추후 api폴더가 생기면 함수를 옮기겠습니다.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀

@Yamyam-code Yamyam-code merged commit 1ef500e into dev Jan 7, 2024
3 checks passed
@Yamyam-code Yamyam-code deleted the 6-feat-create-home branch January 7, 2024 07:40
HOOOO98 pushed a commit that referenced this pull request Jan 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Feat: create home
5 participants