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.

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

[team-09][Lollo, ZG] 데이터 받아 테이블 뷰 표시하기 #14

Merged
merged 45 commits into from
Apr 26, 2021
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
7d2e076
Initial commit
Apr 19, 2021
de65da5
style: 메인 화면 UI 구성 (#8)
Settpark Apr 19, 2021
1ee08f0
feat: tableView의 customcell class 생성 (#8)
Settpark Apr 19, 2021
1fd22f1
feat: mainTableView DataSource 지정 (#8)
Settpark Apr 19, 2021
3f4c79f
feat: mainTableView의 Delegate 지정 (#8)
Settpark Apr 19, 2021
91f9db8
Merge pull request #13 from ghojeong/feature/mainviewUI
eeeesong Apr 20, 2021
cc12efd
style: subdetailview 구성 (#9)
Settpark Apr 20, 2021
3cad552
feat: SideDish Entity 생성
eeeesong Apr 20, 2021
03ebaf8
feat: SideDishes Entity 생성
eeeesong Apr 20, 2021
0f7440f
fix: 피드백 사항 개선 (#8)
Settpark Apr 20, 2021
4d33417
Merge pull request #19 from ghojeong/feature/subviewUI
eeeesong Apr 20, 2021
442d3c6
Merge branch 'feature/sidedishEntity' of https://github.com/ghojeong/…
Settpark Apr 20, 2021
527950e
feat: SideDishesCollection Entity 생성
eeeesong Apr 20, 2021
8e0f2c6
feat: SideDishes Entity 사용성 개선
eeeesong Apr 20, 2021
0a3d7c8
chore: MVVM에 기초하여 폴더 구성 수정함
Settpark Apr 21, 2021
1f505cc
Merge branch 'feature/sidedishEntity' of https://github.com/ghojeong/…
Settpark Apr 21, 2021
a245e16
chore: 데이터 형식 확정
Settpark Apr 21, 2021
8e59a4b
Merge pull request #21 from ghojeong/feature/sidedishEntity
Settpark Apr 21, 2021
5cd759a
feat: SideDish Entity 생성
eeeesong Apr 20, 2021
1f70676
feat: SideDishes Entity 생성
eeeesong Apr 20, 2021
068f932
chore: MVVM에 기초하여 폴더 구성 수정함
Settpark Apr 21, 2021
1b82775
feat: SideDishesCollection Entity 생성
eeeesong Apr 20, 2021
c6effa3
feat: SideDishes Entity 사용성 개선
eeeesong Apr 20, 2021
cd88b8f
chore: 데이터 형식 확정
Settpark Apr 21, 2021
716e573
feat: Network Model 생성 (#23)
eeeesong Apr 21, 2021
bd076d7
Merge branch 'feature/networkModel' of https://github.com/ghojeong/si…
Settpark Apr 21, 2021
5678b88
feat: ViewModel과 ViewController의 binding
Settpark Apr 22, 2021
5e22ae8
chore: 함수명 collection, dishes의 접근 수준 변경
Settpark Apr 22, 2021
7e19b6b
chore: Network 구조 개선
eeeesong Apr 22, 2021
484a216
Merge pull request #28 from ghojeong/feature/networkModel
Settpark Apr 22, 2021
3bc2438
feat: Toast 추가
Settpark Apr 22, 2021
677c232
feat: Toast 기능 개발 : MenuCategory 부분
Settpark Apr 22, 2021
665dcc5
feat: Toaster 기능 개발 Detail view 부분 (#10)
eeeesong Apr 22, 2021
6ba8fda
feat: Toast UI 개선
eeeesong Apr 22, 2021
ddf7564
fix : 피드백 반영 (#30)
Settpark Apr 23, 2021
36a32f3
fix : 피드백 반영 (#30)
Settpark Apr 23, 2021
938fafb
Merge branch 'feature/Toast' of https://github.com/ghojeong/sidedish …
Settpark Apr 23, 2021
c6808de
fix: PR 피드백 반영 (#30)
eeeesong Apr 23, 2021
7c06ce1
Merge pull request #35 from ghojeong/fix/firstPR
eeeesong Apr 23, 2021
ad81710
fix: API 수정하고 내부 구조 변경
Settpark Apr 23, 2021
b8b73e0
fix: 이미지까지 TableView에 로드 (#36)
Settpark Apr 23, 2021
11738bd
fix: 반찬Section GET 메소드 추가(#36)
eeeesong Apr 23, 2021
917f61f
refactor: PR 2차 피드백 반영 & 반찬 목록 GET 개선
eeeesong Apr 24, 2021
bfffa81
chore: 주석 삭제, 메소드 순서 변경
eeeesong Apr 25, 2021
211cb66
Merge pull request #40 from ghojeong/fix/ChangeAPI
Settpark Apr 25, 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
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
# sidedish
그룹프로젝트 #2

그룹 9

## 팀원

- Lollo (eeeesong)
- ZG (jhpark-ZG)
- Pyro (ghojeong)
- Bat (kjk402)
3 changes: 3 additions & 0 deletions backend/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Backend

백엔드를 위한 디렉토리
106 changes: 106 additions & 0 deletions ios/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@

# Created by https://www.toptal.com/developers/gitignore/api/swift,xcode
# Edit at https://www.toptal.com/developers/gitignore?templates=swift,xcode

### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings
xcuserdata/

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3

## Obj-C/Swift specific
*.hmap

## App packaging
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
# *.xcodeproj
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
# .swiftpm

.build/

# CocoaPods
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
# Pods/
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build/

# Add this lines if you are using Accio dependency management (Deprecated since Xcode 12)
# Dependencies/
# .accio/

# fastlane
# It is recommended to not store the screenshots in the git repo.
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

### Xcode ###
# Xcode
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore




## Gcc Patch
/*.gcno

### Xcode Patch ###
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
**/xcshareddata/WorkspaceSettings.xcsettings

# End of https://www.toptal.com/developers/gitignore/api/swift,xcode
3 changes: 3 additions & 0 deletions ios/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# IOS

ios 를 위한 디렉토리
Loading