Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ba88b2f
탭 바 연결 수정 및 View의 배경색상 설정
jakkujakku Aug 29, 2023
8200224
Git Convention 내용 반영
jakkujakku Aug 29, 2023
f716405
[FEAT]: feature/DiaryList-Page 브랜치 생성
jakkujakku Aug 29, 2023
6e8bbbc
[FEAT]: feature/home-Page 브런치 병합
jakkujakku Aug 29, 2023
86bb7de
[STYLE]: 콜렉션뷰 레이아웃 코드 변경
jakkujakku Aug 29, 2023
91697bb
[STYLE]: 코드 수정 없음
jakkujakku Aug 30, 2023
5765151
[FEAT]: Snapkit 패키지 추가가
jakkujakku Aug 30, 2023
c36bda3
[CONFLICT]: 병합 시 충돌 해결
jakkujakku Aug 30, 2023
29e09f6
[STYLE]: 코드 레이아웃 Snapkit으로 변경
jakkujakku Aug 30, 2023
42e2248
[FEAT]: 프로그래스바 & 콜렉션뷰 추가
jakkujakku Aug 30, 2023
46195f1
[FEAT]: Diary-Progress-Page 브런치 생성
jakkujakku Aug 30, 2023
52e45b5
[FEAT]: DiaryProgressCell 생성
jakkujakku Aug 30, 2023
681413b
[STYLE]: 작업 내역 저장
jakkujakku Aug 30, 2023
70454b6
FEAT]: 프로그래스바 UI 구현
jakkujakku Aug 30, 2023
2a6ba11
[STYLE]: 코드 수정이 없음
jakkujakku Aug 30, 2023
a796400
[MERGE] : 병합
jakkujakku Aug 30, 2023
1472db4
[MERGE] : 병합
jakkujakku Aug 30, 2023
dcef2d0
[MERGE] : 병합
jakkujakku Aug 30, 2023
1431699
[STYLE]: 탭바컨트롤러 아이콘표현 코드 포맷 변경
jakkujakku Aug 30, 2023
510df13
[MERGE] : 병합
jakkujakku Aug 30, 2023
c4faefa
[STYLE]: 코드 수정이 없음
jakkujakku Aug 30, 2023
bdf3c91
[FIX] 병합 오류 해결 중
jakkujakku Aug 30, 2023
5225cac
Update project.pbxproj
jakkujakku Aug 30, 2023
40a991b
[FIX] : Git Pull Merge Conflict 해결
jakkujakku Aug 30, 2023
8930679
[FEAT] : feature/Progress-List-Page 브런치 생성
jakkujakku Aug 31, 2023
a06054b
[FEAT] : DiaryListViewController -> ProgressListViewController 네비게이션 …
jakkujakku Aug 31, 2023
cd6d5b9
[FEAT]: ProgressListCell 생성 기능 추가
jakkujakku Aug 31, 2023
59834cd
[FEAT]: ProgressTageCell 생성 & 기능 구현
jakkujakku Aug 31, 2023
4e1582c
[FEAT]: DiaryProgressViewController -> ProgressListViewController 네비게…
jakkujakku Aug 31, 2023
e09690a
[FEAT]: Snapkit 패키지 추가가
jakkujakku Aug 30, 2023
7666d25
[MERGE]: Develop 병합
jakkujakku Aug 31, 2023
2fce643
[MERGE]: Develop 병합
jakkujakku Aug 31, 2023
a7953ad
Merge remote-tracking branch 'refs/remotes/origin/develop'
pinocchio22 Aug 31, 2023
63972b7
[MERGE] feature/DiaryCalendar 병합
pinocchio22 Aug 31, 2023
f601827
[FEAT]: *.pbxproj Avoid Merge Conflict 추가
jakkujakku Sep 1, 2023
1da1b00
[STYLE]: Nslayout 코드 -> Snapkit으로 변경
jakkujakku Sep 1, 2023
a873dd0
[FEAT]: 파이어베이스 임포트
jakkujakku Sep 1, 2023
116ea1b
[FEAT]: 파이어베이스 연동 확인
jakkujakku Sep 1, 2023
99fc0d1
[MERGE]: Feature/NewDiaryVC 병합
jakkujakku Sep 1, 2023
616ba0c
[REMOVE]: DirayCalenderViewController 삭제
jakkujakku Sep 1, 2023
5ca7289
[FEAT] : created FirestoreManager
pinocchio22 Sep 1, 2023
33f5e02
날씨 ui구현
zzangzzangguy Sep 3, 2023
e91a0dc
[FIX] pod file remove
zzangzzangguy Sep 3, 2023
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.pbxproj binary merge=union

241 changes: 222 additions & 19 deletions DiaryApp.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.

10 changes: 10 additions & 0 deletions DiaryApp.xcworkspace/contents.xcworkspacedata

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

8 changes: 8 additions & 0 deletions DiaryApp.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>
122 changes: 122 additions & 0 deletions DiaryApp.xcworkspace/xcshareddata/swiftpm/Package.resolved

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

1 change: 1 addition & 0 deletions DiaryApp/Controllers/DetailDiaryViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ import UIKit
class DetailDiaryViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = .systemBackground
}
}
Loading