Skip to content
Open
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
24a357b
Docs: Modify ReadMe.md (#none)
dahun-lee-daji Apr 19, 2021
731eb57
feat: 프로젝트 셋팅
HongzCloud Apr 19, 2021
a35ee98
chore: 프로젝트 셋팅 수정
HongzCloud Apr 20, 2021
ff82c47
Merge pull request #7 from dahun-lee-daji/iOS/feature/5/ProjectSetting
dahun-lee-daji Apr 20, 2021
498ad0a
Feature : DiffableDataSource를 사용하여 Section, Cell 추가
dahun-lee-daji Apr 20, 2021
22c4488
Feature : DishCard UI 재설정 및 title multiLIne 적용 (#6)
dahun-lee-daji Apr 20, 2021
67c533f
Refactor : Convert TableView to CollectionView (#6)
dahun-lee-daji Apr 21, 2021
227384a
Build: 코코아팟, Toaster 모듈 import (#11)
dahun-lee-daji Apr 21, 2021
a56e0e3
Merge pull request #10 from dahun-lee-daji/feature/6/initUI
HongzCloud Apr 21, 2021
9965d04
Chore: 자동적인 파일 변경 반영
dahun-lee-daji Apr 21, 2021
d8901d4
Merge branch 'Dev-iOS' into iOS/feature/11/SectionHeader
dahun-lee-daji Apr 21, 2021
efafca8
임시 커밋
HongzCloud Apr 21, 2021
cc3be4b
feat: Network연결
HongzCloud Apr 22, 2021
d840246
chore: 머지를 위한 커밋
HongzCloud Apr 22, 2021
b4243e9
Feature : 기본 Section Header 적용 (#11)
dahun-lee-daji Apr 22, 2021
34149bf
feature : 토스터 기능 추가 (#11)
dahun-lee-daji Apr 22, 2021
bdfa807
Merge remote-tracking branch 'origin/iOS/feature/9/Network' into Dev-iOS
dahun-lee-daji Apr 22, 2021
593666e
Merge branch 'Dev-iOS' into iOS/feature/11/SectionHeader
dahun-lee-daji Apr 22, 2021
989e153
Feature : localHost 연결을 통한 cell property 지정
dahun-lee-daji Apr 22, 2021
3b1a3f8
Feature : Toaster 기능 수정 (#11)
dahun-lee-daji Apr 22, 2021
456463f
Refactor : DiffableDataSource 생성 부분 분리
dahun-lee-daji Apr 22, 2021
f478fb9
Feature : 가격을 형식에 맞게 보이게 수정
dahun-lee-daji Apr 23, 2021
5dc8a1b
Refactor : 셀 크기 조절, 클린코드를 위한 리팩토링
dahun-lee-daji Apr 23, 2021
8b9bdec
Refactor : Toaster기능을 closer로 전달
dahun-lee-daji Apr 23, 2021
2a10f61
Merge pull request #14 from dahun-lee-daji/iOS/feature/11/SectionHeader
HongzCloud Apr 23, 2021
5fe0083
Refactor : 코드 리팩토링 (#none)
dahun-lee-daji Apr 23, 2021
66b136d
feat: Splash 기능 추가 (#13)
HongzCloud Apr 23, 2021
e002fb4
Refactor: cell을 nib 방식으로 초기화 (#15)
dahun-lee-daji Apr 26, 2021
962f4a5
chore: CoreData 테스트 (#17)
HongzCloud Apr 26, 2021
4b04ff4
feat: CoreData Persistence 기능 개발 테스트 (#17)
HongzCloud Apr 26, 2021
236d360
feat: CoreData Persistence 구조 완성 (#17)
HongzCloud Apr 27, 2021
6c69341
Merge pull request #16 from dahun-lee-daji/Refactor/15/CellRegistration
HongzCloud Apr 27, 2021
d7cdf6a
chore: Merge 충돌 수정 후 커밋 (#13)
HongzCloud Apr 27, 2021
fb70cc2
Merge pull request #21 from dahun-lee-daji/iOS/feature/13/Splash
HongzCloud Apr 27, 2021
3c5fd77
fix: 코어데이터로 저장된 데이터 없을 시 네트워크꺼 보여주도록 수정
HongzCloud Apr 28, 2021
2becbfa
chore: Merge 후 충돌 수정 커밋
HongzCloud Apr 28, 2021
7fa457a
Merge pull request #22 from dahun-lee-daji/iOS/feature/17/Persistence
dahun-lee-daji Apr 28, 2021
0d849bf
Test: MockNetwork클래스와 UnitTest작성 (#23)
dahun-lee-daji Apr 28, 2021
426785a
feat: LoadingViewController 생성 (#24)
HongzCloud Apr 28, 2021
de5f891
chore: 기존 LoadingView 삭제 (#24)
HongzCloud Apr 28, 2021
9e8d6b6
chore: print문 제거 (#24)
HongzCloud Apr 28, 2021
a69f740
Merge pull request #25 from dahun-lee-daji/iOS/feature/24/LoadingView…
dahun-lee-daji Apr 28, 2021
aa1a7c6
Merge branch 'Dev-iOS' into iOS/Test/23/MockNetwork
dahun-lee-daji Apr 28, 2021
0981bd5
Chore: 변경사항 적용 (#23)
dahun-lee-daji Apr 28, 2021
d1c66a5
Merge pull request #26 from dahun-lee-daji/iOS/Test/23/MockNetwork
HongzCloud Apr 28, 2021
f2b2e4a
feat: DetailView 구조 생성 (#32)
HongzCloud Apr 29, 2021
4f58d13
Merge branch 'Dev-iOS' into iOS/feature/32/DetailView
HongzCloud Apr 29, 2021
b4d81b1
chore: LoadingView 에서 네비게이션 컨트롤러로 가도록 수정 (#32)
HongzCloud Apr 29, 2021
9532e55
Merge pull request #33 from dahun-lee-daji/iOS/feature/32/DetailView
dahun-lee-daji Apr 30, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,38 @@
# sidedish
그룹프로젝트 #2
# 팀원 구성
|팀원|소속|자기소개|
|------|---|---|
|마르코🦝|BE|지브리 신작에 실망한 🥶|
|Bibi🤑|BE|현질에 맛을 느낀 😫|
|Hong🐶|iOS|현업 강아지 똥치우기💩|
|Downey🤖|iOS|모코코 캐는중🌱|

# 팀 규칙
## 스크럼 방식
10:00 ~ 10:30 Zoom 그룹 내에서 근황 공유 간단 스크럼😁
10:30 ~ 11:00 팀 내에서 자신의 진행 상황, 어려운 점 공유 및 오늘의 진행 할 내용 공유! 🤗

## 회의 시간
필요할 때 gather에서 회의 소집☠️

## 참여 시간
11:00 ~ 18:00 까지 팀 단위 모각코😇😈

## 코딩 스타일

### iOS
TDD 지향 : 각 함수의 Unit Test가 가능하도록 개발.😎
iOS UI 개발 방식 : Storyboard 위주 개발.😵
재사용 성을 최대한 고려한 개발.🤪

### BackEnd

## 할일 정리
1. 기획서 내용 분석
2. Epic - Story - Task 만들기
3. Task에 따른 Issue 발행
4. Issue에 따른 Branch 생성
5. 작업 완료 시 개발 브랜치에 PR
6. 리뷰어 : 같은 팀원, Label, Proj, MileStone 지정.
7. Issue에 PR Link
8. PR Merge
9. Issue Close 💩
Binary file added SideDishApp/.DS_Store
Binary file not shown.
12 changes: 12 additions & 0 deletions SideDishApp/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'

target 'SideDishApp' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!

# Pods for SideDishApp

pod 'Toast-Swift', '~> 5.0.1'

end
16 changes: 16 additions & 0 deletions SideDishApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
PODS:
- Toast-Swift (5.0.1)

DEPENDENCIES:
- Toast-Swift (~> 5.0.1)

SPEC REPOS:
trunk:
- Toast-Swift

SPEC CHECKSUMS:
Toast-Swift: 9b6a70f28b3bf0b96c40d46c0c4b9d6639846711

PODFILE CHECKSUM: bcdbceab1bc9b42ae0eb2250656ec728644ed17a

COCOAPODS: 1.10.1
16 changes: 16 additions & 0 deletions SideDishApp/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

610 changes: 610 additions & 0 deletions SideDishApp/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading