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

Nari3 #18

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
994c532
Merge pull request #2 from chaeyeon-yang/samsic
chaeyeon-yang Jul 20, 2022
06a7114
Feat: add MypageCell
mal0070 Jul 20, 2022
2a5993b
Merge pull request #3 from chaeyeon-yang/nari
mal0070 Jul 20, 2022
178ec83
Fix: navigation custom 변경
mal0070 Jul 27, 2022
8fc83d5
Design: profileCell re-set
mal0070 Jul 27, 2022
a26d4d4
Feat: SegmentedControl
mal0070 Jul 28, 2022
e6952a9
Feat: PostCollectionViewCell add
mal0070 Jul 28, 2022
f22ffeb
Merge pull request #5 from chaeyeon-yang/nari
mal0070 Jul 28, 2022
899fda7
Merge branch 'samsic'
chaeyeon-yang Jul 28, 2022
e8b28e8
Merge pull request #6 from chaeyeon-yang/samsic
chaeyeon-yang Aug 2, 2022
8dfb288
Merge branch 'samsic'
chaeyeon-yang Aug 2, 2022
d4f13de
Merge branch 'main' of https://github.com/chaeyeon-yang/There-iOS
chaeyeon-yang Aug 2, 2022
4bc9eb8
Merge pull request #9 from chaeyeon-yang/samsic
chaeyeon-yang Aug 3, 2022
67fa0b4
Merge branch 'samsic'
chaeyeon-yang Aug 3, 2022
235afe6
Merge branch 'main' of https://github.com/chaeyeon-yang/There-iOS
chaeyeon-yang Aug 3, 2022
23fcc8e
Merge branch 'samsic' into new
chaeyeon-yang Aug 8, 2022
6814faf
Create README.md
chaeyeon-yang Aug 8, 2022
893b552
Merge branch 'samsic'
chaeyeon-yang Aug 10, 2022
2026210
Merge branch 'samsic'
chaeyeon-yang Aug 11, 2022
f38a308
Fix: nari2 update
mal0070 Aug 11, 2022
16b7fde
Feat: UserFeedGet API, UploadPost API
mal0070 Aug 11, 2022
35c8750
Fix: UploadViewController 중복 해결, Feat: UserFeed 조회 flow
mal0070 Aug 18, 2022
078d901
Fix: 프로필 서버연동코드 수정, pod파일 삭제 후 다시 추가
mal0070 Aug 20, 2022
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
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# There-iOS
re-start

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>There-iOS.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
</dict>
</plist>
8 changes: 8 additions & 0 deletions There-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "2ADE7DCC-C6C5-4B1E-B182-E868F109C586"
type = "0"
version = "2.0">
</Bucket>
Binary file added There-iOS/.DS_Store
Binary file not shown.
2 changes: 0 additions & 2 deletions There-iOS/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ target 'There-iOS' do

# Pods for There-iOS

pod 'SnapKit', '~> 5.6.0'
pod 'Then', '~> 3.0.0'
pod 'RxSwift', '~> 6.5.0'
pod 'RxCocoa', '~> 6.5.0'
pod 'Alamofire', '~> 5.6.0'
Expand Down
10 changes: 1 addition & 9 deletions There-iOS/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@ PODS:
- RxRelay (6.5.0):
- RxSwift (= 6.5.0)
- RxSwift (6.5.0)
- SnapKit (5.6.0)
- Then (3.0.0)

DEPENDENCIES:
- Alamofire (~> 5.6.0)
- Kingfisher (~> 7.0)
- RxCocoa (~> 6.5.0)
- RxSwift (~> 6.5.0)
- SnapKit (~> 5.6.0)
- Then (~> 3.0.0)

SPEC REPOS:
trunk:
Expand All @@ -25,18 +21,14 @@ SPEC REPOS:
- RxCocoa
- RxRelay
- RxSwift
- SnapKit
- Then

SPEC CHECKSUMS:
Alamofire: 87bd8c952f9a4454320fce00d9cc3de57bcadaf5
Kingfisher: 0086ad83719761ba9b2cdaf6ef4d5b4878cbae23
RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b
RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd
RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
Then: 844265ae87834bbe1147d91d5d41a404da2ec27d

PODFILE CHECKSUM: 2006427e6fc6daa4773c570268b7c6d0c672b015
PODFILE CHECKSUM: a5d4006e317cad406eb8c1fbda8593803bffb042

COCOAPODS: 1.11.3
10 changes: 1 addition & 9 deletions There-iOS/Pods/Manifest.lock

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

3,706 changes: 1,597 additions & 2,109 deletions There-iOS/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.

Loading