Merge remote-tracking branch 'origin/feat/#26-on-with-off' into feat/#25

-mypage
OnAndOff-UMC · Feb 18, 2024 · 5743c77 · 5743c77
2 parents 5a1e2be + 9533339
commit 5743c77
Show file tree

Hide file tree

Showing 43 changed files with 2,986 additions and 156 deletions.
diff --git a/On_off_iOS/On_off_iOS.xcodeproj/project.pbxproj b/On_off_iOS/On_off_iOS.xcodeproj/project.pbxproj
diff --git a/On_off_iOS/On_off_iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/On_off_iOS/On_off_iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Home/오늘의다짐뷰.imageset/Contents.json b/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Home/오늘의다짐뷰.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "오늘의다짐뷰.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Home/오늘의다짐뷰.imageset/오늘의다짐뷰.png b/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Home/오늘의다짐뷰.imageset/오늘의다짐뷰.png
diff --git a/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Onboarding/온보딩1.imageset/Contents.json b/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Onboarding/온보딩1.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "온보딩1@2x.png",
+      "filename" : "온보딩1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Onboarding/온보딩2.imageset/Contents.json b/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Onboarding/온보딩2.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "온보딩2@2x.png",
+      "filename" : "온보딩2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Onboarding/온보딩3.imageset/Contents.json b/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Onboarding/온보딩3.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "온보딩3@2x.png",
+      "filename" : "온보딩3@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Onboarding/온보딩시계.imageset/Contents.json b/On_off_iOS/On_off_iOS/Assets/Assets.xcassets/Onboarding/온보딩시계.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "온보딩시계@2x.png",
+      "filename" : "온보딩시계@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

diff --git a/On_off_iOS/On_off_iOS/Constants/API/Endpoint.swift b/On_off_iOS/On_off_iOS/Constants/API/Endpoint.swift
@@ -63,6 +63,16 @@ enum StatisticsPath: String {
     case nextMonth = "/stats/month/next"
 }
 
+enum WorklogPath: String {
+    case Worklog = "/on/worklog/worklogId" //체크,수정,삭제,내일로 미루기
+    case addWorklog = "/on/worklog/" //조회 및 추가
+
+}
+
+enum OnPath: String {
+    case On = "/on"
+}
+
 enum AlertPath: String {
     case alertStatus = "/users/pushNotification"
 }

diff --git a/On_off_iOS/On_off_iOS/Constants/CellIdentifier.swift b/On_off_iOS/On_off_iOS/Constants/CellIdentifier.swift
@@ -22,6 +22,11 @@ enum CellIdentifier: String {
     case ImageCollectionView
     case WorkLifeBalanceTableViewCell
 
+    // MARK: - On UIView
+    case WorkLogTableViewCell
+    case TodayResolutionTableViewCell
+
     // MARK: - Calendar
     case CalendarCell
+
 }
diff --git a/On_off_iOS/On_off_iOS/Home/Base/Service/HomeViewService.swift b/On_off_iOS/On_off_iOS/Home/Base/Service/HomeViewService.swift
@@ -14,7 +14,7 @@ final class HomeViewService {
 
     /// 일주일 날짜 초기 가져오기
     /// - Returns: Week Day
-    func weekDayInit() -> Observable<WeekDay> {
+    func weekDayInit() -> Observable<WeekDay?> {
         let url = Domain.RESTAPI + WeekDayPath.weekdayInit.rawValue
         let header = Header.header.getHeader()
         return Observable.create { observer in
@@ -26,7 +26,7 @@ final class HomeViewService {
                 print(#function, response)
                 switch response.result {
                 case .success(let data):
-                    observer.onNext(data.result)
+                    observer.onNext(data.result )
                 case .failure(let error):
                     observer.onError(error)
                 }
@@ -51,7 +51,7 @@ final class HomeViewService {
                 print(#function, response)
                 switch response.result {
                 case .success(let data):
-                    observer.onNext(data.result.nickname ?? "")
+                    observer.onNext(data.result?.nickname ?? "")
                 case .failure(let error):
                     observer.onError(error)
                 }
@@ -64,7 +64,7 @@ final class HomeViewService {
     /// 이전 일주일 날짜 가져오기
     /// - Returns: Week Day
     /// - Parameter date: 선택한 날짜
-    func movePrevWeek(date: String) -> Observable<WeekDay> {
+    func movePrevWeek(date: String) -> Observable<WeekDay?> {
         let url = Domain.RESTAPI + WeekDayPath.prevWeek.rawValue
         let parameters: Parameters = ["date": date]
         let header = Header.header.getHeader()
@@ -93,7 +93,7 @@ final class HomeViewService {
     /// 다음 일주일 날짜 가져오기
     /// - Returns: Week Day
     /// - Parameter date: 선택한 날짜
-    func moveNextWeek(date: String) -> Observable<WeekDay> {
+    func moveNextWeek(date: String) -> Observable<WeekDay?> {
         let url = Domain.RESTAPI + WeekDayPath.nextWeek.rawValue
         let parameters: Parameters = ["date": date]
         let header = Header.header.getHeader()