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

[team-13 FE] 1주차 PR #29

Merged
merged 54 commits into from
Apr 26, 2021
Merged

[team-13 FE] 1주차 PR #29

merged 54 commits into from
Apr 26, 2021

Commits on Apr 19, 2021

  1. [ADD] FE First Push(CRA)

    @zel0rd
    zel0rd committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    2151864 View commit details
    Browse the repository at this point in the history

  2. [ADD] App.js Structure design

    @zel0rd
    zel0rd committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    efa3cb6 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2021

  1. [CHORE]: styled-components 패키지 추가 

    * 런타임 때 필요할 것 같지 않아, 일단 dependenciesDev에 추가돼 있는데, 추후에 변경 될 수도 있을 듯
    @cchoongh
    cchoongh committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    1bec34f View commit details
    Browse the repository at this point in the history

  2. [ADD]: 모달 초기 구현 

    * common/Modal 컴포넌트 추가. content 컴포넌트를 자식으로 둔 다음. content가 가운데 배치되도록 구현
* MenuDetailModal에서 common/Modal을 사용하고, content로 MenuDetail 컴포넌트를 사용하도록 구조를 짜봤음.
    @cchoongh
    cchoongh committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    1b04315 View commit details
    Browse the repository at this point in the history

  3. [ADD]: util디렉터리 생성 

    * 아직 거의 비어있음.
* 전역적으로 사용될 config들이 저장될 Global.js
* custom hook들이 있는 hooks 디렉터리
    @cchoongh
    cchoongh committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    42bcec1 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from zel0rd/fe/feature/MenuDetailModal 

    Fe/feature/menu detail modal
    @cchoongh
    cchoongh committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    298715f View commit details
    Browse the repository at this point in the history

  5. [ADD]: reset.css 적용 (index.css수정)

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

  6. [ADD]: 모달창 Preview 구현 

    * 스타일 적용
* 이미지가 5개 미만일 시, 회색으로 채워지도록
* 클릭 로직 구현
    @cchoongh
    cchoongh committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    5d7eb96 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2 from zel0rd/fe/feature/MenuDetailModal 

    Fe/feature/menu detail modal
    @cchoongh
    cchoongh committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    cc77697 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. [ADD]: 재사용 가능한 badge컴포넌트 추가 

    * common/badge.js
* 추가하고 싶은 뱃지 있으면 위 파일안에다가 구현후 export에 추가하기
    @cchoongh
    cchoongh committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    ff5bf4d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from zel0rd/fe/feature/MenuDetailModal 

    Fe/feature/menu detail modal, common한 벳지컴포넌트 추가
    @cchoongh
    cchoongh committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    da87ec2 View commit details
    Browse the repository at this point in the history

  3. [FIX]: 모달 크기 조정 

    * 'OrderInfo'쪽 구현 도중에 조정한거라, 해당 부분이 살짝 포함 되어있음..
    @cchoongh
    cchoongh committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    29d4755 View commit details
    Browse the repository at this point in the history

  4. [ADD] react-icons 추가

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

  5. [ADD] header style component로 변경

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

  6. [ADD] Header 구조 설계

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

  7. [ADD] header component 스타일 적용

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

  8. [ADD]: 모달에서 쓰이는 Counter컴포넌트 구현 

    * 추후에 'common/'으로 뺄 가능성 농후
    @cchoongh
    cchoongh committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    5d900ac View commit details
    Browse the repository at this point in the history

  9. [FIX] header style 작업중

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

Commits on Apr 22, 2021

  1. [ADD]: 모달 우상단 주문정보UI 구현 

    * 하위 구성요소 'OrderInfo', 'SmallInfoContainer' 컴포넌트 추가
* 수량 변화에 따른 총 주문가격 로직 구현
* 아직 '주문하기'버튼 클릭 로직은 미구현(백엔드에서 선처리 필요)
    @cchoongh
    cchoongh committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    010550c View commit details
    Browse the repository at this point in the history

  2. [FIX]: 이벤트뱃지 폰트사이즈 수정

    @cchoongh
    cchoongh committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    b94480a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from zel0rd/fe/feature/MenuDetailModal 

    Fe/feature/menu detail modal
    @cchoongh
    cchoongh committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    7127356 View commit details
    Browse the repository at this point in the history

  4. [ADD] header 제작 임시저장

    @zel0rd
    zel0rd committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    8d383f5 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/fe/dev' into fe/feature/Header

    @zel0rd
    zel0rd committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    123f3d8 View commit details
    Browse the repository at this point in the history

  6. [ADD] Header static resource component

    @zel0rd
    zel0rd committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    252730e View commit details
    Browse the repository at this point in the history

  7. [FIX] Header style

    @zel0rd
    zel0rd committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    30c4e03 View commit details
    Browse the repository at this point in the history

  8. [Fix] Dropdown Function

    @zel0rd
    zel0rd committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    96e14c9 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #5 from zel0rd/fe/feature/Header 

     Fe/feature/header nav button
    @zel0rd
    zel0rd committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    23645bc View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. [ADD] update MenuCard(large)

    @zel0rd
    zel0rd committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    1ff8f7a View commit details
    Browse the repository at this point in the history

  2. [ADD] update BestMenu temporal

    @zel0rd
    zel0rd committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    6f07b1f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/fe/dev' into fe/feature/BestMenu

    @zel0rd
    zel0rd committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    ce6a84f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6 from zel0rd/fe/feature/BestMenu 

    Fe/feature/best menu
    @zel0rd
    zel0rd committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    9a35bae View commit details
    Browse the repository at this point in the history

  5. [ADD] SmallCard Style updated

    @zel0rd
    zel0rd committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    a4c2aa2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #7 from zel0rd/fe/feature/BestMenu 

    [ADD] SmallCard Style updated
    @cchoongh
    cchoongh committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    532adeb View commit details
    Browse the repository at this point in the history

  7. [ADD]: 슬라이더 초기 구현 

    * 부모의 크기와, 아이템의 크기, 한 번에 보여질 아이템 개수에 따라 자동으로 배치하는 기능 구현
* 애니메이션 구현
* 왼쪽, 오른쪽 버튼을 커스터마이즈할 수 있는 기능 구현
    @cchoongh
    cchoongh committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    cd58499 View commit details
    Browse the repository at this point in the history

  8. [ADD]: RecommendSlider 초기 구현 

    * Slider 컴포넌트 적용
* 나머지 MenuDetail의 하위 컴포넌트의 마이너한 수정
    @cchoongh
    cchoongh committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    f6d3bd5 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #8 from zel0rd/fe/feature/Slider 

    [ADD]: 슬라이더 초기 구현
    @cchoongh
    cchoongh committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    ae3995e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #9 from zel0rd/fe/feature/MenuDetailModal 

    [ADD]: RecommendSlider 초기 구현
    @cchoongh
    cchoongh committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    de4346d View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2021

  1. [ADD]: Slider 끝부분 처리 

    * 전체의 아이템 개수가 화면에 보여질 아이템 개수로 딱 나눠 떨어지지 않을 때의 경우를 처리하는 로직 구현
    @cchoongh
    cchoongh committed Apr 24, 2021
    Configuration menu
    Copy the full SHA
    392c8d8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from zel0rd/fe/feature/Slider 

    [ADD]: Slider 끝부분 처리
    @cchoongh
    cchoongh committed Apr 24, 2021
    Configuration menu
    Copy the full SHA
    61db40e View commit details
    Browse the repository at this point in the history

  3. [ADD]: Slider 컨트롤 버튼 disabled기능 구현 

    * Slider쪽 코드도 같이 고침..
  * onSlide콜백을 받도록 수정
    @cchoongh
    cchoongh committed Apr 24, 2021
    Configuration menu
    Copy the full SHA
    c5cf716 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11 from zel0rd/fe/feature/MenuDetailModal 

    [ADD]: Slider 컨트롤 버튼 disabled기능 구현
    @cchoongh
    cchoongh committed Apr 24, 2021
    Configuration menu
    Copy the full SHA
    45f445d View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2021

  1. [FIX]: 통신관련 유틸 수정 

    * useFetch() => useFetchData() 이름 변경
* Global객체에 server url관련 함수 추가
    @cchoongh
    cchoongh committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    6ddee4a View commit details
    Browse the repository at this point in the history

  2. [ADD]: 왼쪽, 오른쪽 버튼 svg 추가

    @cchoongh
    cchoongh committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    43bfdb9 View commit details
    Browse the repository at this point in the history

  3. [FIX]: Slider 스타일 살짝 수정 

    * position속성 absolute => relative
    @cchoongh
    cchoongh committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    ffd5d0d View commit details
    Browse the repository at this point in the history

  4. [DELETE]: 불필요한 MOCK 이미지 파일들 삭제

    @cchoongh
    cchoongh committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    31e0d5a View commit details
    Browse the repository at this point in the history

  5. [ADD]: 아이템 상세 모달 완성도 높이기 

    * 추천 슬라이더 스타일 구현
* 추천 슬라이더 페이지 표시 구현
* 추천 슬라이더 버튼들 구현
* 전체적인 margin, padding 조정
    @cchoongh
    cchoongh committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    66beb47 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #12 from zel0rd/fe/feature/MenuDetailModal 

    Fe/feature/menu detail modal
    @cchoongh
    cchoongh committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    f7a1621 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2021

  1. [ADD] BestMenu Tab function added

    @zel0rd
    zel0rd committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    071b6f1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13 from zel0rd/fe/feature/BestMenu 

    [ADD] BestMenu Tab function added
    @zel0rd
    zel0rd committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    794c546 View commit details
    Browse the repository at this point in the history

  3. [UPDATE] 베스트 메뉴에서 할인 가격이 없는 경우 처리 

    LargeCard에서 할인가격이 없는 경우 render 정보 수정
    @zel0rd
    zel0rd committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    e7f889c View commit details
    Browse the repository at this point in the history

  4. [ADD] change LargeCard space-between

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

  5. Merge pull request #14 from zel0rd/fe/feature/BestMenu 

    Fe/feature/best menu
    @zel0rd
    zel0rd committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    79c00b9 View commit details
    Browse the repository at this point in the history

  6. [UPDATE] DELETE Margin Left,Right

    @zel0rd
    zel0rd committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    85396ba View commit details
    Browse the repository at this point in the history

  7. Merge pull request #15 from zel0rd/fe/feature/BestMenu 

    [UPDATE] DELETE Margin Left,Right
    @zel0rd
    zel0rd committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    1ca3c3c View commit details
    Browse the repository at this point in the history