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

Jump to bottom

[Team18] [FE] 배민찬 프로젝트 마무리 #68

Merged
merged 68 commits into from
May 4, 2021
Merged

[Team18] [FE] 배민찬 프로젝트 마무리 #68

merged 68 commits into from
May 4, 2021

Commits on Apr 19, 2021

  1. Update README.md

    @kyupid
    kyupid authored Apr 19, 2021
    Configuration menu
    Copy the full SHA
    57f3911 View commit details
    Browse the repository at this point in the history

  2. 리액트 개발환경 설정

    @17-sss
    17-sss committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    36c17e3 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @eve712
    eve712 authored Apr 19, 2021
    Configuration menu
    Copy the full SHA
    abd2b7d View commit details
    Browse the repository at this point in the history

  4. Style: 기본 레이아웃 생성

    @17-sss
    17-sss committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    5b219f2 View commit details
    Browse the repository at this point in the history

  5. Update README.md

    @eve712
    eve712 authored Apr 19, 2021
    Configuration menu
    Copy the full SHA
    17ab177 View commit details
    Browse the repository at this point in the history

  6. docs: README파일 이미지 업데이트

    @eve712
    eve712 authored Apr 19, 2021
    Configuration menu
    Copy the full SHA
    8c18172 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2021

  1. feat: [#1] 헤더 컴포넌트 작업중 (5 / 6) 

        - React-icons 모듈 사용
    - DropdownMenu 작업중..
    @17-sss
    17-sss committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    77eba2d View commit details
    Browse the repository at this point in the history

  2. 리액트 개발환경 설정

    @17-sss @eve712
    17-sss authored and eve712 committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    e3c66f5 View commit details
    Browse the repository at this point in the history

  3. Style: 기본 레이아웃 생성

    @17-sss @eve712
    17-sss authored and eve712 committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    dc3cda4 View commit details
    Browse the repository at this point in the history

  4. feat: Tag 컴포넌트 생성 

    * npm install하면서 package-lock.json 변경됨
    @eve712
    eve712 committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    7bc2b44 View commit details
    Browse the repository at this point in the history

  5. feat: Button 컴포넌트 생성

    @eve712
    eve712 committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    955ab06 View commit details
    Browse the repository at this point in the history

  6. feat: 헤더의 메뉴아이템에 마우스를 올리면 DropdownMenu 생성 

    - 헤더 완성 (1차)
    @17-sss
    17-sss committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    f23ad6e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #17 from kyu-kim-kr/team18_9 

    [#9] Tag, Button 컴포넌트 생성
    @eve712
    eve712 authored Apr 20, 2021
    Configuration menu
    Copy the full SHA
    ea80e6f View commit details
    Browse the repository at this point in the history

  8. chore: .gitignore 설정 변경 

    - .gitignore 설정 변경 및 git cached 초기화
    @17-sss
    17-sss committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    48295a2 View commit details
    Browse the repository at this point in the history

  9. chore: .gitignore 설정 변경 (issue #1) 

    - .gitignore 설정 변경 및 git cached 초기화
    @17-sss
    17-sss committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    ccd5625 View commit details
    Browse the repository at this point in the history

  10. fix: 삼항연산자로 텍스트 바뀌도록 수정

    @eve712
    eve712 committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    ae4165d View commit details
    Browse the repository at this point in the history

  11. Merge branch 'frontend' into team18_#1

    @17-sss
    17-sss authored Apr 20, 2021
    Configuration menu
    Copy the full SHA
    5ce6a59 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #20 from kyu-kim-kr/team18_#1 

    [#1] 헤더 관련 Component 만들기 (완성)
    @17-sss
    17-sss authored Apr 20, 2021
    Configuration menu
    Copy the full SHA
    5ac99eb View commit details
    Browse the repository at this point in the history

  13. Merge pull request #21 from kyu-kim-kr/team18_19 

    fix: 삼항연산자로 텍스트 바뀌도록 수정
    @eve712
    eve712 authored Apr 20, 2021
    Configuration menu
    Copy the full SHA
    d28dc83 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. fix: 스타일 컴포넌트 변수명 수정

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    b1e1730 View commit details
    Browse the repository at this point in the history

  2. feat: Title 컴포넌트 생성 

    * type 값에 따라서 타이틀 문자열 반환
    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    6b1406a View commit details
    Browse the repository at this point in the history

  3. feat: baseURL 담긴 객체 생성,

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    663037c View commit details
    Browse the repository at this point in the history

  4. style: 태그 간 간격 스타일 추가

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    7316493 View commit details
    Browse the repository at this point in the history

  5. feat: useFetch 커스텀 훅 작성

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    2f72ab4 View commit details
    Browse the repository at this point in the history

  6. feat: ProductCard 컴포넌트 생성

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    b3b10f6 View commit details
    Browse the repository at this point in the history

  7. fix: 스타일 컴포넌트를 컴포넌트 함수 밑으로 이동

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    1922be9 View commit details
    Browse the repository at this point in the history

  8. feat: hover에 따라 반투명박스 생기는 기능 구현

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    ec2c51a View commit details
    Browse the repository at this point in the history

  9. Merge pull request #30 from kyu-kim-kr/team18_19 

    [FE] ProductCard 컴포넌트 생성 완료
    @eve712
    eve712 authored Apr 21, 2021
    Configuration menu
    Copy the full SHA
    439f28d View commit details
    Browse the repository at this point in the history

  10. delete: 디렉토리 구조 변경하면서 이전 경로 파일 삭제

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    0006f34 View commit details
    Browse the repository at this point in the history

  11. refactor: 디렉토리 구조 변경

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    50063d9 View commit details
    Browse the repository at this point in the history

  12. refactor: 디렉토리 구조 변경

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    4bddb8f View commit details
    Browse the repository at this point in the history

  13. fix: themeProvider 스타일 추가, 피그마에 맞춰 키값 변경

    @eve712
    eve712 committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    42304d6 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #31 from kyu-kim-kr/team18_19 

    [FE] 디렉토리 구조 변경, theme 스타일 추가, 키값 변경
    @eve712
    eve712 authored Apr 21, 2021
    Configuration menu
    Copy the full SHA
    17e115b View commit details
    Browse the repository at this point in the history

  15. chore: 폴더명 변경 (Header 폴더 -> header)

    @17-sss
    17-sss committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    263b18a View commit details
    Browse the repository at this point in the history

  16. chore: import 관련 path 수정

    @17-sss
    17-sss committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    848e07c View commit details
    Browse the repository at this point in the history

  17. Merge pull request #33 from kyu-kim-kr/feat_fixPath 

    [FE] 디렉토리 구조 변경에 따른 import 설정 변경 및  theme 스타일 추가에 따른 스타일 변경
    @17-sss
    17-sss authored Apr 21, 2021
    Configuration menu
    Copy the full SHA
    0aba246 View commit details
    Browse the repository at this point in the history

  18. feat: 캐러셀 슬라이더 프로토타입 완성 

    - 추후 리팩토링 필요 (재사용성을 위함)
    @17-sss
    17-sss committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    8079c3b View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2021

  1. feat: 캐러셀 슬라이더 파일 분리 및 SubContents 완성 

    - SubContents 렌더 시, useFetch 사용하여 MOCK 데이터 Get후 렌더링
    @17-sss
    17-sss committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    7e93f7a View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. feat: 캐러셀 버튼 - 캐러셀의 위치정보에 따라 색상 변경

    @17-sss
    17-sss committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    3ddaac9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #39 from kyu-kim-kr/team18_24 

    [FE] SubContents 1차 완성 (Carousel Slider)
    @17-sss
    17-sss authored Apr 23, 2021
    Configuration menu
    Copy the full SHA
    19d1a74 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2021

  1. fix: 이미지 에러 시 나오는 이미지 변경, border-radius 추가

    @eve712
    eve712 committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    685a40c View commit details
    Browse the repository at this point in the history

  2. feat: Carousel을 재사용 할 수 있게 리팩토링 & 상세페이지 하단에도 쓰일 수 있게 변경

    @17-sss
    17-sss committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    164537c View commit details
    Browse the repository at this point in the history

  3. feat: Carousel - Default 설정 변경

    @17-sss
    17-sss committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    3df2f8f View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2021

  1. style: margin-bottom 추가

    @eve712
    eve712 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    e659e17 View commit details
    Browse the repository at this point in the history

  2. chore: Carousel 컴포넌트 폴더 위치 변경

    @17-sss
    17-sss committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    7ba505f View commit details
    Browse the repository at this point in the history

  3. feat: Title, TabList, MainContents를 감싸는 MainContentsContainer 컴포넌트 생성

    @eve712
    eve712 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    21b80fe View commit details
    Browse the repository at this point in the history

  4. feat: ProductCard를 감싸는 MainContents 컴포넌트 생성

    @eve712
    eve712 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    c69ff6d View commit details
    Browse the repository at this point in the history

  5. feat: 탭 요소 생성, 탭 기능 구현

    @eve712
    eve712 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    13d5c0f View commit details
    Browse the repository at this point in the history

  6. feat: loading 기능 구현, 에러처리 추가 필요

    @eve712
    eve712 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    ca36947 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #47 from kyu-kim-kr/team18_23 

    [FE] MainContents 부분 구현 완료
    @eve712
    eve712 authored Apr 27, 2021
    Configuration menu
    Copy the full SHA
    de63d94 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #51 from kyu-kim-kr/feat_FE/43 

    [FE] Carousel (Slider) 컴포넌트의 재사용성을 위해 리팩토링
    @17-sss
    17-sss authored Apr 27, 2021
    Configuration menu
    Copy the full SHA
    8f7ce22 View commit details
    Browse the repository at this point in the history

  9. feat: [#37] 상세정보 창 (Detail) 작업중.. 

    - Modal (틀, 재사용 가능한 컴포넌트) 완성
- 상세정보 창에서 쓰일 SideDishStore(context) 생성
    @17-sss
    17-sss committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    0599e70 View commit details
    Browse the repository at this point in the history

  10. feat: [#37] 상세정보 창 (Detail) 작업중.. 2 

    - DetailTop 1차 완성
    @17-sss
    17-sss committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    6dc61cf View commit details
    Browse the repository at this point in the history

  11. feat: [#37] 상세정보 창 (Detail) 작업중.. 3 

    - DetailTopGallery 동작 방식 변경
    @17-sss
    17-sss committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    4f624de View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2021

  1. feat: [#37] 상세정보 창 (Detail) 데이터 핸들링 테스트 중.. 1 

    - 버그 많음.. 수정 중
- customHook - useFetch 통합
    @17-sss
    17-sss committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    cc0f63c View commit details
    Browse the repository at this point in the history

  2. feat: [#37] 상세정보 창 (Detail) - DetailTop 1차 완성 

    - 이미지 제대로 안뜨던 버그 수정완료
    @17-sss
    17-sss committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    850a8ee View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2021

  1. feat: [#37] 상세정보 창 (1차 마무리) - DetailBottom 완성 

    - Detail 페이지 1차 완성
    @17-sss
    17-sss committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    72f3bc2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #56 from kyu-kim-kr/feat_FE/37 

    [FE] 상세정보 창 (Detail - Modal) 1차 완성
    @17-sss
    17-sss authored Apr 29, 2021
    Configuration menu
    Copy the full SHA
    3f5c949 View commit details
    Browse the repository at this point in the history

  3. feat: SubContents 카테고리 모두 보이기 / 가리기 기능 추가 및 리팩토링 

    - SubContents 컴포넌트 작동 방식 변경 (리팩토링)
- 카테고리 모두 보이기 / 가리기 기능 추가
    @17-sss
    17-sss committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    4a791c0 View commit details
    Browse the repository at this point in the history

  4. feat: [#57] 상세페이지 큰 이미지 업데이트 안되는 버그 수정 

    - DetailTopGallery의 Ref 관련 수정
    @17-sss
    17-sss committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    7a4918e View commit details
    Browse the repository at this point in the history

  5. fix: hover 버그 수정 

    * useRef로 classList 수정하는 방식에서 state변경하는 방식으로 변경
    @eve712
    eve712 committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    5f14b1b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #58 from kyu-kim-kr/hoverBug 

    fix: hover 버그 수정
    @eve712
    eve712 authored Apr 29, 2021
    Configuration menu
    Copy the full SHA
    c27b203 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #59 from kyu-kim-kr/feat_FE/57 

    [FE] 서브 콘텐츠, 상세 페이지 버그 수정
    @17-sss
    17-sss authored Apr 29, 2021
    Configuration menu
    Copy the full SHA
    08ce716 View commit details
    Browse the repository at this point in the history

  8. feat: Mock 데이터 제거 후 API 적용 (1차)

    @17-sss
    17-sss committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    ef6e43d View commit details
    Browse the repository at this point in the history

  9. fix: Detail & DetailBottom 페이지 렌더 방식 변경 

    - 이에 따라 페이지 초기 렌더시 SubContents에서
    비동기 통신 시 (데이터 가져올 시) 서브콘텐츠 (슬라이더) 데이터의 구조 변경
    @17-sss
    17-sss committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    633d958 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2021

  1. fix: DetailTopGallery -> top_image 데이터 핸들링하는 방식으로 변경 

    - DetailTopInfo의 volumne -> quantity로 변경
    @17-sss
    17-sss committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    34c3d2e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #60 from kyu-kim-kr/feat_FE/55 

    [FE] API 적용 완료
    @17-sss
    17-sss authored Apr 30, 2021
    Configuration menu
    Copy the full SHA
    27391ce View commit details
    Browse the repository at this point in the history

  3. feat: 주문하기 (프로토타입) 1차완성

    @17-sss
    17-sss committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    03ca8db View commit details
    Browse the repository at this point in the history