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

[iOS][Neo & JeJe] MainUI and NetworkRequest #8

Merged
merged 29 commits into from
Apr 30, 2021
Merged

[iOS][Neo & JeJe] MainUI and NetworkRequest #8

merged 29 commits into from
Apr 30, 2021

Commits on Apr 19, 2021

  1. feat : 프로젝트 생성

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

  2. Create: 컬렉션 뷰 생성

    @jung-yun
    jung-yun committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    455ea3d View commit details
    Browse the repository at this point in the history

  3. Create: FoodCardCell 생성-not completed

    @jung-yun
    jung-yun committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    6adfe30 View commit details
    Browse the repository at this point in the history

  4. feat: FoodCardCell UI 작성

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

  5. Update: 컬렉션뷰 스토리보드로 수정

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

  6. Create: 아이템 모델 생성

    @jung-yun
    jung-yun committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    104d23e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1 from HoonHaChoi/feat-2-side-dish_model 

    Feat 1, 2 (feat-1-Initial_UI) and (feat-2-side-dish_model)
    @HoonHaChoi
    HoonHaChoi authored Apr 19, 2021
    Configuration menu
    Copy the full SHA
    63d2844 View commit details
    Browse the repository at this point in the history

  8. Feat: Endpoint 추가 및 네트워크 통신 설정및 오류메세지 추가

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

Commits on Apr 20, 2021

  1. Update: Network FlatMap으로 변경

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

  2. Feat: DI 의존성 주입 추가 및 Network, UseCase 프로토콜 추가

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

  3. Update: UI Adjustment

    @jung-yun
    jung-yun committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    ee3a6cf View commit details
    Browse the repository at this point in the history

  4. Feat: ViewModel 데이터 바인딩 추가

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

  5. Merge pull request #6 from HoonHaChoi/feat-3-EndPoint 

    EndPoint Merge
    @jung-yun
    jung-yun authored Apr 20, 2021
    Configuration menu
    Copy the full SHA
    4a57969 View commit details
    Browse the repository at this point in the history

  6. Add: 파일추가

    @jung-yun
    jung-yun committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    c5e6b4c View commit details
    Browse the repository at this point in the history

  7. Fix: 병합 충돌

    @jung-yun
    jung-yun committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    e21dfab View commit details
    Browse the repository at this point in the history

  8. Fix: 병합 오류 수동 작업

    @jung-yun
    jung-yun committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    984abfe View commit details
    Browse the repository at this point in the history

  9. Feat: DiffableDataSource 추가

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

Commits on Apr 21, 2021

  1. Update: 제네렉으로 view hide, show 추가 , BagdeLabel 속성제거 및 @… 

    …IBInspectable 추가
    @HoonHaChoi
    HoonHaChoi committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    6b43467 View commit details
    Browse the repository at this point in the history

  2. Feat, Update: SideDishManager 추가 , SideDishViewmodel 네이밍 수정

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

  3. Feat: AlertController 추가

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

  4. Feat: FoodCardHeadView 생성

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

  5. Feat: FoodCardHeaderView 설정

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

  6. Feat, Update: ImageUseCase 추가, cell 이미지를 UseCase에서 하도록 ᄇ… 

    …ᅧᆫ경
    @HoonHaChoi
    HoonHaChoi committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    62f72b3 View commit details
    Browse the repository at this point in the history

  7. Feat: HeaderView 해당아이템 갯수 출력

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

  8. Merge pull request #8 from HoonHaChoi/feat-4-sidedishDataSource 

    Feat-4: Side Dish Data Source
    @jung-yun
    jung-yun authored Apr 21, 2021
    Configuration menu
    Copy the full SHA
    85cfa39 View commit details
    Browse the repository at this point in the history

  9. Delete: 불필요 파일 제거

    @jung-yun
    jung-yun committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    daf8ba3 View commit details
    Browse the repository at this point in the history

  10. Delete: 스토리보드 중복 제거

    @jung-yun
    jung-yun committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    767321d View commit details
    Browse the repository at this point in the history

  11. Update: print() 제거

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

  12. Merge pull request #9 from HoonHaChoi/feat-4-sidedishDataSource 

    Update: print() 제거
    @HoonHaChoi
    HoonHaChoi authored Apr 21, 2021
    Configuration menu
    Copy the full SHA
    60c3a38 View commit details
    Browse the repository at this point in the history