[Feat] #194 - 코스 발견 페이지 UI 변경 하였습니다.

.gitignore

@@ -113,5 +113,12 @@ Gemfile.lock
 report.xml
 Runnect-iOS/fastlane/.env.default
 
-## dynamicLink
-Runnect-iOS/Runnect-iOS/GoogleService-Info.plist
+### Runniest project - git ignore setting ###
+Runnect-iOS/Runnect-iOS/Info.plist
+Runnect-iOS/Info.plist
+Info.plist
+
+### dynamicLink ###
+Runnect-iOS/Runnect-iOS/GoogleService-Info.plist
+Runnect-iOS/GoogleService-Info.plist
+GoogleService-Info.plist

Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj

@@ -15,7 +15,12 @@
 		23EE06D12AC2F44E00CB3FF8 /* TmapAddressSearchingResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23EE06D02AC2F44E00CB3FF8 /* TmapAddressSearchingResponseDto.swift */; };
 		712F661D2A7B7BAB00D9539B /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 712F661C2A7B7BAB00D9539B /* Config.swift */; };
 		7136BF8A2AF921A900679364 /* CustomBottomSheetVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7136BF892AF921A900679364 /* CustomBottomSheetVC.swift */; };
-		71717B072B063E14004EA8DA /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 71DBF23D2ABB255A0013415B /* GoogleService-Info.plist */; };
+		713BA40B2B218AF8009091A8 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 713BA40A2B218AF8009091A8 /* GoogleService-Info.plist */; };
+		717916DA2B13613B009CEF97 /* MarathonListResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 717916D92B13613B009CEF97 /* MarathonListResponseDto.swift */; };
+		717916DE2B137DC3009CEF97 /* TotalPageCountDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 717916DD2B137DC3009CEF97 /* TotalPageCountDto.swift */; };
+		71F7804E2B0893B600B53253 /* MarathonTitleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71F7804D2B0893B600B53253 /* MarathonTitleCollectionViewCell.swift */; };
+		71F780502B0893D700B53253 /* MarathonMapCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71F7804F2B0893D700B53253 /* MarathonMapCollectionViewCell.swift */; };
+		71F7BF072B0CDFE300B752B3 /* MarathonCourseListCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71F7BF062B0CDFE300B752B3 /* MarathonCourseListCVC.swift */; };
 		A3305A97296EF58C000B1A10 /* GoalRewardInfoDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3305A96296EF58C000B1A10 /* GoalRewardInfoDto.swift */; };
 		A3BC2F2B2962C3D500198261 /* GoalRewardInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */; };
 		A3BC2F2D2962C3F200198261 /* ActivityRecordInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */; };
@@ -177,7 +182,12 @@
 		7110A6032AA337DD009A7E99 /* Runnect-iOSDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Runnect-iOSDebug.entitlements"; sourceTree = "<group>"; };
 		712F661C2A7B7BAB00D9539B /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
 		7136BF892AF921A900679364 /* CustomBottomSheetVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomBottomSheetVC.swift; sourceTree = "<group>"; };
-		71DBF23D2ABB255A0013415B /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Runnect-iOS/Runnect-iOS/Runnect-iOS/GoogleService-Info.plist"; sourceTree = "<group>"; };
+		713BA40A2B218AF8009091A8 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		717916D92B13613B009CEF97 /* MarathonListResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarathonListResponseDto.swift; sourceTree = "<group>"; };
+		717916DD2B137DC3009CEF97 /* TotalPageCountDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TotalPageCountDto.swift; sourceTree = "<group>"; };
+		71F7804D2B0893B600B53253 /* MarathonTitleCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarathonTitleCollectionViewCell.swift; sourceTree = "<group>"; };
+		71F7804F2B0893D700B53253 /* MarathonMapCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarathonMapCollectionViewCell.swift; sourceTree = "<group>"; };
+		71F7BF062B0CDFE300B752B3 /* MarathonCourseListCVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarathonCourseListCVC.swift; sourceTree = "<group>"; };
 		A3305A96296EF58C000B1A10 /* GoalRewardInfoDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoDto.swift; sourceTree = "<group>"; };
 		A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalRewardInfoVC.swift; sourceTree = "<group>"; };
 		A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordInfoVC.swift; sourceTree = "<group>"; };
@@ -723,9 +733,11 @@
 		CE17F0442961C3D900E1DED0 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				DAD5A3DB296C6DB800C8166B /* MapCollectionViewCell.swift */,
-				DAD5A3D9296C6DA500C8166B /* TitleCollectionViewCell.swift */,
 				DAD5A3D7296C6D9600C8166B /* AdImageCollectionViewCell.swift */,
+				71F7804D2B0893B600B53253 /* MarathonTitleCollectionViewCell.swift */,
+				71F7804F2B0893D700B53253 /* MarathonMapCollectionViewCell.swift */,
+				DAD5A3D9296C6DA500C8166B /* TitleCollectionViewCell.swift */,
+				DAD5A3DB296C6DB800C8166B /* MapCollectionViewCell.swift */,
 				CE17F0432961C3D600E1DED0 /* VC */,
 			);
 			path = Views;
@@ -822,7 +834,7 @@
 				CE6655A9295D7FAA00C64E12 /* Network */,
 				CE6655A8295D7F7D00C64E12 /* Presentation */,
 				CE4545D6295D7AF5003201E1 /* Info.plist */,
-				71DBF23D2ABB255A0013415B /* GoogleService-Info.plist */,
+				713BA40A2B218AF8009091A8 /* GoogleService-Info.plist */,
 			);
 			path = "Runnect-iOS";
 			sourceTree = "<group>";
@@ -1156,6 +1168,7 @@
 			isa = PBXGroup;
 			children = (
 				CE6B63D2296725E6003F900F /* CourseListCVC.swift */,
+				71F7BF062B0CDFE300B752B3 /* MarathonCourseListCVC.swift */,
 			);
 			path = CVC;
 			sourceTree = "<group>";
@@ -1206,7 +1219,9 @@
 		DAD5A3E0296D4C2A00C8166B /* ResponseDto */ = {
 			isa = PBXGroup;
 			children = (
+				717916D92B13613B009CEF97 /* MarathonListResponseDto.swift */,
 				DAD5A3E1296D4C6500C8166B /* PickedMapListResponseDto.swift */,
+				717916DD2B137DC3009CEF97 /* TotalPageCountDto.swift */,
 			);
 			path = ResponseDto;
 			sourceTree = "<group>";
@@ -1274,7 +1289,7 @@
 			files = (
 				CE665615295D989A00C64E12 /* .swiftlint.yml in Resources */,
 				CE17F0342961BEF800E1DED0 /* Pretendard-Bold.otf in Resources */,
-				71717B072B063E14004EA8DA /* GoogleService-Info.plist in Resources */,
+				713BA40B2B218AF8009091A8 /* GoogleService-Info.plist in Resources */,
 				CE17F0352961BEF800E1DED0 /* Pretendard-SemiBold.otf in Resources */,
 				CE17F0332961BEF800E1DED0 /* Pretendard-Medium.otf in Resources */,
 				CE6655BF295D82E200C64E12 /* .gitkeep in Resources */,
@@ -1363,6 +1378,7 @@
 				CE4545CD295D7AF4003201E1 /* TaBarController.swift in Sources */,
 				A3305A97296EF58C000B1A10 /* GoalRewardInfoDto.swift in Sources */,
 				CE21C024299E5FE500F62AF5 /* UserRouter.swift in Sources */,
+				71F780502B0893D700B53253 /* MarathonMapCollectionViewCell.swift in Sources */,
 				CE6655F4295D898400C64E12 /* UIViewController+.swift in Sources */,
 				CE14677829658C7200DCEA1B /* Stopwatch.swift in Sources */,
 				CE21C026299E5FF300F62AF5 /* CourseRouter.swift in Sources */,
@@ -1410,6 +1426,7 @@
 				CEC2A6922962BE2900160BF7 /* DepartureSearchVC.swift in Sources */,
 				CE6655EE295D88E600C64E12 /* UITextField+.swift in Sources */,
 				CE40BB1C2967E4910030ABCA /* RunningWaitingVC.swift in Sources */,
+				71F7804E2B0893B600B53253 /* MarathonTitleCollectionViewCell.swift in Sources */,
 				CE6B63D6296731F9003F900F /* ScrapCourseListView.swift in Sources */,
 				CE6655F8295D90CF00C64E12 /* adjusted+.swift in Sources */,
 				A3C2CAD729E53B2900EC525B /* RNAlertVC.swift in Sources */,
@@ -1443,10 +1460,12 @@
 				A3D1A77E29CF09B600DD54EC /* SignInResponseDto.swift in Sources */,
 				CE21C028299E5FFC00F62AF5 /* PublicCourseRouter.swift in Sources */,
 				CE18E894296C79B900FEB569 /* CourseDrawingRequestDto.swift in Sources */,
+				71F7BF072B0CDFE300B752B3 /* MarathonCourseListCVC.swift in Sources */,
 				DA20D84E2966A9B300F1581F /* CourseSearchVC.swift in Sources */,
 				CE1006572968230800FD31FB /* DepartureLocationModel.swift in Sources */,
 				CECA695C296E61D6002AF05C /* PrivateCourseNotUploadedResponseDto.swift in Sources */,
 				CE6655EC295D88D000C64E12 /* UITableView+.swift in Sources */,
+				717916DE2B137DC3009CEF97 /* TotalPageCountDto.swift in Sources */,
 				CEEC6B3A2961C4F300D00E1E /* CourseDrawingHomeVC.swift in Sources */,
 				CEB0BCBC29D123350048CCD5 /* GuideView.swift in Sources */,
 				CEC2A6902962B06C00160BF7 /* convertLocationObject.swift in Sources */,
@@ -1474,6 +1493,7 @@
 				A3BC2F4129667A0D00198261 /* NicknameEditorVC.swift in Sources */,
 				CE0C23742966D62A00B45063 /* PagedView.swift in Sources */,
 				CE3A53C5296C6017003D518C /* KeychainManager.swift in Sources */,
+				717916DA2B13613B009CEF97 /* MarathonListResponseDto.swift in Sources */,
 				CEEC6B4B2961D89700D00E1E /* CustomNavigationBar.swift in Sources */,
 				CE09037D296E9ED900BEA710 /* ScrapCourseResponseDto.swift in Sources */,
 				CED791B32A2626AF001BFCFB /* ShadowView.swift in Sources */,

Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/ic_plus_button.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "plus.png",
+      "filename" : "Component 125.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "plus@2x.png",
+      "filename" : "Component 125@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "plus@3x.png",
+      "filename" : "Component 125@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Runnect-iOS/Runnect-iOS/Global/Utils/RNUtils/UserManager.swift

@@ -64,6 +64,16 @@ final class UserManager {
                 }
             case .failure(let error):
                 print(error.localizedDescription)
+                if let response = error.response {
+                    if let responseData = String(data: response.data, encoding: .utf8) {
+                        print("\n 🔥 SignIn 메세지 \(responseData)\n")   // 이 코드는 2차 업데이트 토큰 부분 디버깅 용으로 사용합니다. (업데이트 이후 제거)
+                    } else {
+                        print(error.localizedDescription)
+                    }
+                } else {
+                    print(error.localizedDescription)
+                }
+
                 completion(.failure(.networkFail))
             }
         }
@@ -93,6 +103,17 @@ final class UserManager {
                 }
             case .failure(let error):
                 print(error.localizedDescription)
+                // 아래 코드는 2차 업데이트 토큰 부분 디버깅 용으로 사용합니다. (업데이트 이후 제거)
+//                if let response = error.response {
+//                    if let responseData = String(data: response.data, encoding: .utf8) {
+//                        print("\n getNewToken 메세지 ‼️🔥\(responseData)\n")
+//                    } else {
+//                        print(error.localizedDescription)
+//                    }
+//                } else {
+//                    print(error.localizedDescription)
+//                }
+
                 completion(.failure(.networkFail))
             }
         }

Runnect-iOS/Runnect-iOS/Network/Dto/CourseDetailDto/ResponseDto/UploadedCourseDetailResponseDto.swift

@@ -18,7 +18,7 @@ struct UploadedCourseDetailResponseDto: Codable {
 
 struct UploadUser: Codable {
     let nickname: String
-    let level: String
+    let level: Int
     let image: String
     let isNowUser: Bool?
 }

Runnect-iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/MarathonListResponseDto.swift

@@ -0,0 +1,31 @@
+//
+//  MarathonListResponseDto.swift
+//  Runnect-iOS
+//
+//  Created by 이명진 on 11/26/23.
+//
+
+import Foundation
+
+// MARK: - MarathonListResponseDto
+
+struct MarathonListResponseDto: Codable {
+    let marathonPublicCourses: [marathonCourse]
+}
+
+// MARK: - PublicCourse
+
+struct marathonCourse: Codable {
+    let id, courseId: Int
+    let title: String
+    let image: String
+    let scrap: Bool?
+    let departure: Departure
+}
+
+// MARK: - CourseDiscoveryDeparture
+
+struct Departure: Codable {
+    let region: String
+    let city: String
+}

Runnect-iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/PickedMapListResponseDto.swift

@@ -10,6 +10,8 @@ import Foundation
 // MARK: - PickedMapListResponseDto
 
 struct PickedMapListResponseDto: Codable {
+    let totalPageSize: Int
+    let isEnd: Bool
     let publicCourses: [PublicCourse]
 }
 
@@ -19,7 +21,7 @@ struct PublicCourse: Codable {
     let id, courseId: Int
     let title: String
     let image: String
-    let scrap: Bool?
+    var scrap: Bool?
     let description: String?
     let distance: Float?
     let departure: CourseDiscoveryDeparture

Runnect-iOS/Runnect-iOS/Network/Dto/CourseDiscoveryDto/ResponseDto/TotalPageCountDto.swift

@@ -0,0 +1,14 @@
+//
+//  TotalPageCountDto.swift
+//  Runnect-iOS
+//
+//  Created by 이명진 on 11/26/23.
+//
+
+import Foundation
+
+// MARK: - TotalPageCountDto
+
+struct TotalPageCountDto: Codable {
+    let totalPageCount: Int
+}

Runnect-iOS/Runnect-iOS/Network/Router/PublicCourseRouter.swift

@@ -9,14 +9,16 @@ import Foundation
 import Moya
 
 enum PublicCourseRouter {
-    case getCourseData(pageNo: Int)
+    case getCourseData(pageNo: Int, sort: String)
     case getCourseSearchData(keyword: String)
+    case getMarathonCourseData
+    case getTotalPageCount
     case courseUploadingData(param: CourseUploadingRequestDto)
     case getUploadedCourseDetail(publicCourseId: Int)
     case getUploadedCourseInfo
     case updatePublicCourse(publicCourseId: Int, editCourseRequestDto: EditCourseRequestDto)
     case deleteUploadedCourse(publicCourseIdList: [Int])
-}     
+}
 
 extension PublicCourseRouter: TargetType {
 
@@ -31,8 +33,12 @@ extension PublicCourseRouter: TargetType {
         switch self {
         case .getCourseData, .courseUploadingData:
             return "/public-course"
+        case .getMarathonCourseData:
+            return "/public-course/marathon"
         case .getCourseSearchData:
             return "/public-course/search"
+        case .getTotalPageCount:
+            return "public-course/total-page-count"
         case .getUploadedCourseDetail(let publicCourseId):
             return "/public-course/detail/\(publicCourseId)"
         case .getUploadedCourseInfo:
@@ -46,7 +52,7 @@ extension PublicCourseRouter: TargetType {
 
     var method: Moya.Method {
         switch self {
-        case .getCourseData, .getCourseSearchData, .getUploadedCourseDetail, .getUploadedCourseInfo:
+        case .getCourseData, .getCourseSearchData, .getMarathonCourseData, .getUploadedCourseDetail, .getUploadedCourseInfo, .getTotalPageCount:
             return .get
         case .courseUploadingData:
             return .post
@@ -59,8 +65,9 @@ extension PublicCourseRouter: TargetType {
 
     var task: Moya.Task {
         switch self {
-        case .getCourseData(let pageNo):
-            return .requestParameters(parameters: ["pageNo": pageNo], encoding: URLEncoding.default)
+        case .getCourseData(let pageNo, let sort):
+            var parameters: [String: Any] = ["pageNo": pageNo, "sort": sort]
+            return .requestParameters(parameters: parameters, encoding: URLEncoding.default)
         case .getCourseSearchData(let keyword):
             return .requestParameters(parameters: ["keyword": keyword], encoding: URLEncoding.default)
         case .courseUploadingData(param: let param):
@@ -75,7 +82,7 @@ extension PublicCourseRouter: TargetType {
                 fatalError("Encoding 실패")}
         case .deleteUploadedCourse(let publicCourseIdList):
             return .requestParameters(parameters: ["publicCourseIdList": publicCourseIdList], encoding: JSONEncoding.default)
-        case .getUploadedCourseDetail, .getUploadedCourseInfo:
+        case .getMarathonCourseData, .getTotalPageCount, .getUploadedCourseDetail, .getUploadedCourseInfo:
             return .requestPlain
         }
     }

Runnect-iOS/Runnect-iOS/Network/Service/AuthInterceptor.swift

@@ -23,7 +23,7 @@ final class AuthInterceptor: RequestInterceptor {
         // 방문자일 경우
         if UserManager.shared.userType == .visitor && urlRequest.url?.absoluteString.hasPrefix(Config.baseURL) == true {
             urlRequest.setValue("visitor", forHTTPHeaderField: "accessToken")
-            urlRequest.setValue("null", forHTTPHeaderField: "refreshToken")
+            urlRequest.setValue("visitor", forHTTPHeaderField: "refreshToken")
             completion(.success(urlRequest))
             return
         }