Chef view #4
Open
Chef view #4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- 쉐프, 소식받기 순위 완성 - header와 footer는 공통부분이어서 templates/layout/header, templates/layout/footer로 나눔 - 화면 확인을 위해 web/IndexController 추가
1. spring security, oauth2 때문에 곧 바로 로그인 창 뜸. 당장 필요없는 기능이므로 주석처리 2. flyway 세팅 되지 않아서 오류 발생. 주석처리
Contributor
|
확인했습니다. 그런데 충돌나는 내용이 있다고 뜨는데 그 부분만 해결되면 머지하시면 될 것 같습니다. |
Contributor
Author
|
충돌나는거 해결했습니다 ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
쉐프 화면 5가지 탭 작동 까지 완료했습니다
만개 레시피 페이지 : 5가지 다른 html -> 작성한코드 : 하나의 html, jquery로 탭이동 가능
탭마다 쉐프 리스트 뿌리는 javascript 함수 생성 (추후에 ajax로 서버에 api요청예정)
develop브랜치에 merge되면 해당 브랜치 삭제하고 feature아래에 브랜치 생성하겠습니다