From b6831f901a35612bb7d1bcdb77c22a7eac7aef09 Mon Sep 17 00:00:00 2001 From: doyeonk429 <80318425+doyeonk429@users.noreply.github.com> Date: Sat, 17 Aug 2024 02:24:04 +0900 Subject: [PATCH] =?UTF-8?q?#42=20=EC=B7=A8=ED=96=A5=EC=B0=BE=EA=B8=B0=20AP?= =?UTF-8?q?I=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Drink-EG/Drink-EG/Resources/AppDelegate.swift | 1 - Drink-EG/Drink-EG/Resources/Constant.swift | 1 - Drink-EG/Drink-EG/Resources/SceneDelegate.swift | 2 +- .../Drink-EG/Sources/Datas/MemberInfoRequest.swift | 10 +++++----- .../APIResponseModels/APIResponseMemberResponse.swift | 5 +++-- .../Sources/VCs/Login/LoginViewController.swift | 3 +-- .../ThirdVarietyTasteTestViewController.swift | 7 +++---- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Drink-EG/Drink-EG/Resources/AppDelegate.swift b/Drink-EG/Drink-EG/Resources/AppDelegate.swift index 4355008..78537dc 100644 --- a/Drink-EG/Drink-EG/Resources/AppDelegate.swift +++ b/Drink-EG/Drink-EG/Resources/AppDelegate.swift @@ -29,6 +29,5 @@ import UIKit // Use this method to release any resources that were specific to the discarded scenes, as they will not return. } - } diff --git a/Drink-EG/Drink-EG/Resources/Constant.swift b/Drink-EG/Drink-EG/Resources/Constant.swift index e2ced73..bcd1b05 100644 --- a/Drink-EG/Drink-EG/Resources/Constant.swift +++ b/Drink-EG/Drink-EG/Resources/Constant.swift @@ -18,7 +18,6 @@ struct Constants { struct API { static let baseURL = "https://drinkeg.com" - } struct Design { diff --git a/Drink-EG/Drink-EG/Resources/SceneDelegate.swift b/Drink-EG/Drink-EG/Resources/SceneDelegate.swift index 98751bd..dbe1d33 100644 --- a/Drink-EG/Drink-EG/Resources/SceneDelegate.swift +++ b/Drink-EG/Drink-EG/Resources/SceneDelegate.swift @@ -20,7 +20,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { // 화면을 구성하는 UIWindow 인스턴스 생성 let window = UIWindow(windowScene: windowScene) // 실제 첫 화면이 되는 MainViewController 인스턴스 생성 - let vc = MainTabBarViewController() + let vc = EnterLoginViewController() // NavigationController을 사용할 경우, MainViewController를 rootViewController로 갖는 NavigationController을 생성해야한다. let navigationController = UINavigationController(rootViewController: vc) navigationController.isNavigationBarHidden = true diff --git a/Drink-EG/Drink-EG/Sources/Datas/MemberInfoRequest.swift b/Drink-EG/Drink-EG/Sources/Datas/MemberInfoRequest.swift index 6800b77..f4813a0 100644 --- a/Drink-EG/Drink-EG/Sources/Datas/MemberInfoRequest.swift +++ b/Drink-EG/Drink-EG/Sources/Datas/MemberInfoRequest.swift @@ -8,21 +8,21 @@ import Foundation struct MemberInfoRequest : Codable { - let userName : String + let name : String let isNewbie : Bool let monthPrice : Int let wineSort : [String] - let wineNation : [String] + let wineArea : [String] let wineVariety : [String] let region : String - init(isNewbie: Bool, monthPrice: Int, wineSort: [String], wineNation: [String], wineVariety: [String], region: String, userName: String) { + init(isNewbie: Bool, monthPrice: Int, wineSort: [String], wineArea: [String], wineVariety: [String], region: String, name: String) { self.isNewbie = isNewbie self.monthPrice = monthPrice self.wineSort = wineSort - self.wineNation = wineNation + self.wineArea = wineArea self.wineVariety = wineVariety self.region = region - self.userName = userName + self.name = name } } diff --git a/Drink-EG/Drink-EG/Sources/Models/APIResponseModels/APIResponseMemberResponse.swift b/Drink-EG/Drink-EG/Sources/Models/APIResponseModels/APIResponseMemberResponse.swift index 1acc589..516f53f 100644 --- a/Drink-EG/Drink-EG/Sources/Models/APIResponseModels/APIResponseMemberResponse.swift +++ b/Drink-EG/Drink-EG/Sources/Models/APIResponseModels/APIResponseMemberResponse.swift @@ -11,8 +11,9 @@ struct APIResponseMemberResponse : Codable { let isSuccess : Bool let code : String let message : String - let result : MemberResponse + let result : MemberResponse? } + struct MemberResponse : Codable { let id : Int let name : String @@ -21,7 +22,7 @@ struct MemberResponse : Codable { let isNewbie : Bool let monthPriceMax : Int let wineSort : [String] - let wineNation : [String] + let wineArea : [String] let wineVariety : [String] let region : String } diff --git a/Drink-EG/Drink-EG/Sources/VCs/Login/LoginViewController.swift b/Drink-EG/Drink-EG/Sources/VCs/Login/LoginViewController.swift index 46cd10c..a62709a 100644 --- a/Drink-EG/Drink-EG/Sources/VCs/Login/LoginViewController.swift +++ b/Drink-EG/Drink-EG/Sources/VCs/Login/LoginViewController.swift @@ -12,13 +12,12 @@ import Moya class LoginViewController: UIViewController, UITextFieldDelegate { - static var isFirstLogin : Bool = true + public static var isFirstLogin : Bool = true let provider = MoyaProvider() public var userID : String? public var userPW : String? var loginDTO : JoinNLoginRequest? - public static var isFirstLogin : Bool = false let loginButton = UIButton(type: .system) let joinButton = UIButton(type: .system) diff --git a/Drink-EG/Drink-EG/Sources/VCs/TasteTest/ThirdVarietyTasteTestViewController.swift b/Drink-EG/Drink-EG/Sources/VCs/TasteTest/ThirdVarietyTasteTestViewController.swift index cbf67f3..dcd650b 100644 --- a/Drink-EG/Drink-EG/Sources/VCs/TasteTest/ThirdVarietyTasteTestViewController.swift +++ b/Drink-EG/Drink-EG/Sources/VCs/TasteTest/ThirdVarietyTasteTestViewController.swift @@ -9,7 +9,6 @@ import UIKit import Moya class ThirdVarietyTasteTestViewController: UIViewController { - var variety: [String] = ["까베르네소비뇽", "샤도네이", "메를로", "까베르네프랑", "피노누아", "쉬라즈", "쇼비뇽 블랑", "그르나슈", "말벡", "산지오베제", "모스카토", "리슬링", "템프라니요", "네비올로", "블랜드", "쁘띠베르도", "무르베드르", "카르메너르", "기타"] var selectedIndexPaths: [IndexPath] = [] private var selectedVariety : [String] = [] @@ -158,10 +157,10 @@ class ThirdVarietyTasteTestViewController: UIViewController { isNewbie: selectionMng.isNewbie, monthPrice: selectionMng.monthPrice, wineSort: selectionMng.wineSort, - wineNation: selectionMng.wineNation, + wineArea: selectionMng.wineNation, wineVariety: selectionMng.wineVariety, region: selectionMng.userAddr, - userName: selectionMng.userName + name: selectionMng.userName ) } @@ -188,8 +187,8 @@ class ThirdVarietyTasteTestViewController: UIViewController { print("유저 선택 정보가 없습니다.") completion(false) } - } + } extension ThirdVarietyTasteTestViewController: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {