From 4e9dbc9fe2bd64f93ead7c330ab96764c8785cd9 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Tue, 7 Dec 2021 19:55:06 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[FEAT]=20#114=20-=20=EC=8A=A4=ED=94=8C?= =?UTF-8?q?=EB=9E=98=EC=8B=9C=20=EB=B7=B0=20=EA=B5=AC=ED=98=84=20=EB=B0=8F?= =?UTF-8?q?=20=ED=8F=B4=EB=8D=94=EB=A7=81=20=EC=9C=84=EC=B9=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 46 ++++++++++++++++-- .../Resouces/Constants/Storyboard.swift | 1 + .../Resouces/Constants/ViewController.swift | 1 + .../Storyboards/{ => Login}/Login.storyboard | 0 .../{ => Main}/CardList.storyboard | 0 .../Storyboards/Splash/Splash.storyboard | 47 +++++++++++++++++++ .../{ => TabBar}/TabBar.storyboard | 0 .../Splash/SplashViewController.swift | 29 ++++++++++++ .../TabBar/TabBarViewController.swift | 23 ++++++--- 9 files changed, 138 insertions(+), 9 deletions(-) rename NADA-iOS-forRelease/Resouces/Storyboards/{ => Login}/Login.storyboard (100%) rename NADA-iOS-forRelease/Resouces/Storyboards/{ => Main}/CardList.storyboard (100%) create mode 100644 NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard rename NADA-iOS-forRelease/Resouces/Storyboards/{ => TabBar}/TabBar.storyboard (100%) create mode 100644 NADA-iOS-forRelease/Sources/ViewControllers/Splash/SplashViewController.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 95707b43..bb1941f1 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -23,6 +23,8 @@ 3936993E274A53E000684420 /* GroupEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3936993D274A53E000684420 /* GroupEditViewController.swift */; }; 39369944274A568900684420 /* GroupEditTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39369942274A568900684420 /* GroupEditTableViewCell.swift */; }; 39369945274A568900684420 /* GroupEditTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39369943274A568900684420 /* GroupEditTableViewCell.xib */; }; + 393E3345275F69EE00965BBF /* SplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 393E3344275F69EE00965BBF /* SplashViewController.swift */; }; + 393E334A275F6A6600965BBF /* Splash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 393E3349275F6A6600965BBF /* Splash.storyboard */; }; 39488E352706E17200BDC917 /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39488E342706E17200BDC917 /* UIAlertController+Extension.swift */; }; 394F314C27081B3A00C83291 /* FrontViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 394F314B27081B3A00C83291 /* FrontViewController.swift */; }; 394F314F27081B4C00C83291 /* Front.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 394F314E27081B4C00C83291 /* Front.storyboard */; }; @@ -134,6 +136,8 @@ 3936993D274A53E000684420 /* GroupEditViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditViewController.swift; sourceTree = ""; }; 39369942274A568900684420 /* GroupEditTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditTableViewCell.swift; sourceTree = ""; }; 39369943274A568900684420 /* GroupEditTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupEditTableViewCell.xib; sourceTree = ""; }; + 393E3344275F69EE00965BBF /* SplashViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashViewController.swift; sourceTree = ""; }; + 393E3349275F6A6600965BBF /* Splash.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Splash.storyboard; sourceTree = ""; }; 39488E342706E17200BDC917 /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = ""; }; 394F314B27081B3A00C83291 /* FrontViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontViewController.swift; sourceTree = ""; }; 394F314E27081B4C00C83291 /* Front.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Front.storyboard; sourceTree = ""; }; @@ -277,6 +281,38 @@ path = GroupEdit; sourceTree = ""; }; + 393E3343275F69DB00965BBF /* Splash */ = { + isa = PBXGroup; + children = ( + 393E3344275F69EE00965BBF /* SplashViewController.swift */, + ); + path = Splash; + sourceTree = ""; + }; + 393E3346275F6A1100965BBF /* Login */ = { + isa = PBXGroup; + children = ( + 3979709726FA0BF0003FB4F5 /* Login.storyboard */, + ); + path = Login; + sourceTree = ""; + }; + 393E3347275F6A5100965BBF /* TabBar */ = { + isa = PBXGroup; + children = ( + 39D88B632745FDD400A72164 /* TabBar.storyboard */, + ); + path = TabBar; + sourceTree = ""; + }; + 393E3348275F6A5D00965BBF /* Splash */ = { + isa = PBXGroup; + children = ( + 393E3349275F6A6600965BBF /* Splash.storyboard */, + ); + path = Splash; + sourceTree = ""; + }; 394F314A2708157500C83291 /* Main */ = { isa = PBXGroup; children = ( @@ -289,6 +325,7 @@ isa = PBXGroup; children = ( 394F314E27081B4C00C83291 /* Front.storyboard */, + 39523E0A270184B100536900 /* CardList.storyboard */, ); path = Main; sourceTree = ""; @@ -702,6 +739,7 @@ F8FC43A026C01F040033E151 /* ViewControllers */ = { isa = PBXGroup; children = ( + 393E3343275F69DB00965BBF /* Splash */, 3936993C274A53D300684420 /* GroupEdit */, 39D88B692746009B00A72164 /* BottomSheet */, 39D88B682745FE6C00A72164 /* TabBar */, @@ -727,14 +765,14 @@ F8FC43A226C01F2B0033E151 /* Storyboards */ = { isa = PBXGroup; children = ( + 393E3348275F6A5D00965BBF /* Splash */, + 393E3347275F6A5100965BBF /* TabBar */, + 393E3346275F6A1100965BBF /* Login */, 394F314D27081B4100C83291 /* Main */, 3958F23A270FFBC800B100B2 /* Group */, 39D88B602745FBA100A72164 /* More */, F84BAF9E26FDB425004CA335 /* CardCreation */, F8FC439026C01CDE0033E151 /* LaunchScreen.storyboard */, - 3979709726FA0BF0003FB4F5 /* Login.storyboard */, - 39523E0A270184B100536900 /* CardList.storyboard */, - 39D88B632745FDD400A72164 /* TabBar.storyboard */, ); path = Storyboards; sourceTree = ""; @@ -846,6 +884,7 @@ 39D88B642745FDD400A72164 /* TabBar.storyboard in Resources */, 7766A410274FEBE200714912 /* CardInGroupCollectionViewCell.xib in Resources */, 7705CF402752C844005195DF /* CardView.xib in Resources */, + 393E334A275F6A6600965BBF /* Splash.storyboard in Resources */, 39523E5C2701A48900536900 /* CardListTableViewCell.xib in Resources */, F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */, F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */, @@ -998,6 +1037,7 @@ F8915A22275728F20013D609 /* SelectBirthBottomViewController.swift in Sources */, F8FC438626C01CDD0033E151 /* AppDelegate.swift in Sources */, F8915A23275728F20013D609 /* SelectMBTIBottomViewController.swift in Sources */, + 393E3345275F69EE00965BBF /* SplashViewController.swift in Sources */, F8C83FB8272F9E3F0009DF0D /* UtilAPI.swift in Sources */, F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */, 39288E12273F52B20072F403 /* CardListLookUpRequest.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift b/NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift index d9f768ca..0c5069f9 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift @@ -21,6 +21,7 @@ extension Const { static let tabBar = "TabBar" static let cardCreationPreview = "CardCreationPreview" static let more = "More" + static let splash = "Splash" } } diff --git a/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift b/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift index ce79e155..d05ca2b6 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift @@ -26,6 +26,7 @@ extension Const { static let cardResultBottomSheetViewController = "CardResultBottomSheetViewController" static let selectGroupBottomSheetViewController = "SelectGroupBottomSheetViewController" static let moreViewController = "MoreViewController" + static let splashViewController = "SplashViewController" } } } diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Login/Login.storyboard similarity index 100% rename from NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard rename to NADA-iOS-forRelease/Resouces/Storyboards/Login/Login.storyboard diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Main/CardList.storyboard similarity index 100% rename from NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard rename to NADA-iOS-forRelease/Resouces/Storyboards/Main/CardList.storyboard diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard new file mode 100644 index 00000000..afaa9e9a --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/TabBar/TabBar.storyboard similarity index 100% rename from NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard rename to NADA-iOS-forRelease/Resouces/Storyboards/TabBar/TabBar.storyboard diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Splash/SplashViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Splash/SplashViewController.swift new file mode 100644 index 00000000..664dde7a --- /dev/null +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Splash/SplashViewController.swift @@ -0,0 +1,29 @@ +// +// SplashViewController.swift +// NADA-iOS-forRelease +// +// Created by 민 on 2021/12/07. +// + +import UIKit + +class SplashViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift index 37cb340a..bf8ef3a9 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift @@ -9,19 +9,30 @@ import UIKit class TabBarViewController: UITabBarController { - let appearance = UITabBarAppearance() - + // let appearance = UITabBarAppearance() + override func viewDidLoad() { super.viewDidLoad() - setupStyle() + setUI() } - func setupStyle() { + func setUI() { + self.tabBarController?.tabBar.layer.borderWidth = 1 + self.tabBarController?.tabBar.layer.borderColor = UIColor.textBox.cgColor + // self.tabBarController?.tabBar.clipsToBounds = false +// // set tabbar opacity // appearance.configureWithOpaqueBackground() +// +// // remove tabbar border line // appearance.shadowColor = UIColor.clear +// +// // set tabbar background color +// appearance.backgroundColor = .background +// // tabBar.standardAppearance = appearance // +// // 없으면 iOS15.0 부터는 탭바에 닿기전에는 탭바가 구분되지 않음(이것도 좀 신기해서 이쁘긴함 ㅋㅋ) // if #available(iOS 15.0, *) { // // set tabbar opacity // tabBar.scrollEdgeAppearance = tabBar.standardAppearance @@ -30,8 +41,8 @@ class TabBarViewController: UITabBarController { // // set tabbar shadow // tabBar.layer.masksToBounds = false // tabBar.layer.shadowColor = UIColor.textBox.cgColor -// tabBar.layer.shadowOpacity = 0.3 +// tabBar.layer.shadowOpacity = 0.5 // tabBar.layer.shadowOffset = CGSize(width: 0, height: 0) -// tabBar.layer.shadowRadius = 6 +// tabBar.layer.shadowRadius = 1 } } From 747e2790d39df3e4f7f9fb85f4b4759d43a55ec7 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Fri, 10 Dec 2021 16:26:23 +0900 Subject: [PATCH 2/5] #101: Auto stash before merge of "feature/#101" and "origin/feature/#101" --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 22 ++++++++++++++++--- .../Storyboards/{ => Login}/Login.storyboard | 0 .../{ => Main}/CardList.storyboard | 0 .../{ => TabBar}/TabBar.storyboard | 0 .../Sources/NetworkService/User/UserAPI.swift | 16 ++++++++++++++ .../NetworkService/User/UserSevice.swift | 9 ++++++-- .../Sources/SceneDelegate.swift | 3 ++- .../Login/LoginViewController.swift | 15 +++++++------ 8 files changed, 52 insertions(+), 13 deletions(-) rename NADA-iOS-forRelease/Resouces/Storyboards/{ => Login}/Login.storyboard (100%) rename NADA-iOS-forRelease/Resouces/Storyboards/{ => Main}/CardList.storyboard (100%) rename NADA-iOS-forRelease/Resouces/Storyboards/{ => TabBar}/TabBar.storyboard (100%) diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index bec52429..635a73e5 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -297,6 +297,7 @@ isa = PBXGroup; children = ( 394F314E27081B4C00C83291 /* Front.storyboard */, + 39523E0A270184B100536900 /* CardList.storyboard */, ); path = Main; sourceTree = ""; @@ -345,6 +346,22 @@ path = Group; sourceTree = ""; }; + 395FE2E127619B0800A9815E /* Login */ = { + isa = PBXGroup; + children = ( + 3979709726FA0BF0003FB4F5 /* Login.storyboard */, + ); + path = Login; + sourceTree = ""; + }; + 395FE2E227619B0F00A9815E /* TabBar */ = { + isa = PBXGroup; + children = ( + 39D88B632745FDD400A72164 /* TabBar.storyboard */, + ); + path = TabBar; + sourceTree = ""; + }; 3979709426FA0BD8003FB4F5 /* Login */ = { isa = PBXGroup; children = ( @@ -762,15 +779,14 @@ F8FC43A226C01F2B0033E151 /* Storyboards */ = { isa = PBXGroup; children = ( + 395FE2E227619B0F00A9815E /* TabBar */, + 395FE2E127619B0800A9815E /* Login */, F8518056275D041F006BD5ED /* Onboarding */, 394F314D27081B4100C83291 /* Main */, 3958F23A270FFBC800B100B2 /* Group */, 39D88B602745FBA100A72164 /* More */, F84BAF9E26FDB425004CA335 /* CardCreation */, F8FC439026C01CDE0033E151 /* LaunchScreen.storyboard */, - 3979709726FA0BF0003FB4F5 /* Login.storyboard */, - 39523E0A270184B100536900 /* CardList.storyboard */, - 39D88B632745FDD400A72164 /* TabBar.storyboard */, ); path = Storyboards; sourceTree = ""; diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Login/Login.storyboard similarity index 100% rename from NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard rename to NADA-iOS-forRelease/Resouces/Storyboards/Login/Login.storyboard diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Main/CardList.storyboard similarity index 100% rename from NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard rename to NADA-iOS-forRelease/Resouces/Storyboards/Main/CardList.storyboard diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/TabBar/TabBar.storyboard similarity index 100% rename from NADA-iOS-forRelease/Resouces/Storyboards/TabBar.storyboard rename to NADA-iOS-forRelease/Resouces/Storyboards/TabBar/TabBar.storyboard diff --git a/NADA-iOS-forRelease/Sources/NetworkService/User/UserAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/User/UserAPI.swift index ae23edda..54a78d40 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/User/UserAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/User/UserAPI.swift @@ -79,6 +79,22 @@ public class UserAPI { } } + func userSocialSignUp(request: User, completion: @escaping (NetworkResult) -> Void) { + userProvider.request(.userSignUp(request: request)) { (result) in + switch result { + case .success(let response): + let statusCode = response.statusCode + let data = response.data + + let networkResult = self.judgeUserTokenFetchStatus(by: statusCode, data) + completion(networkResult) + + case .failure(let err): + print(err) + } + } + } + private func judgeUserIDFetchStatus(by statusCode: Int, _ data: Data) -> NetworkResult { let decoder = JSONDecoder() diff --git a/NADA-iOS-forRelease/Sources/NetworkService/User/UserSevice.swift b/NADA-iOS-forRelease/Sources/NetworkService/User/UserSevice.swift index b60f6c80..95311475 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/User/UserSevice.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/User/UserSevice.swift @@ -13,6 +13,7 @@ enum UserSevice { case userTokenFetch(userID: String) case userSignUp(request: User) case userDelete(userID: String) + case userSocialSignUp(request: User) } extension UserSevice: TargetType { @@ -30,6 +31,8 @@ extension UserSevice: TargetType { return "/register" case .userDelete(let userID): return "/\(userID)" + case .userSocialSignUp: + return "auth/login" } } @@ -37,7 +40,7 @@ extension UserSevice: TargetType { switch self { case .userIDFetch, .userTokenFetch: return .get - case .userSignUp: + case .userSignUp, .userSocialSignUp: return .post case .userDelete: return .delete @@ -54,6 +57,8 @@ extension UserSevice: TargetType { return .requestPlain case .userSignUp(let request): return .requestJSONEncodable(request) + case .userSocialSignUp(let request): + return .requestJSONEncodable(request) } } @@ -61,7 +66,7 @@ extension UserSevice: TargetType { switch self { case .userIDFetch, .userTokenFetch, .userDelete: return .none - case .userSignUp: + case .userSignUp, .userSocialSignUp: return ["Content-Type": "application/json"] } } diff --git a/NADA-iOS-forRelease/Sources/SceneDelegate.swift b/NADA-iOS-forRelease/Sources/SceneDelegate.swift index 1c53549e..8c12e176 100644 --- a/NADA-iOS-forRelease/Sources/SceneDelegate.swift +++ b/NADA-iOS-forRelease/Sources/SceneDelegate.swift @@ -22,7 +22,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { window = UIWindow(frame: windowScene.coordinateSpace.bounds) window?.windowScene = windowScene - window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.tabBar, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.tabBarViewController) + // window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.tabBar, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.tabBarViewController) + window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.loginViewController) window?.makeKeyAndVisible() IQKeyboardManager.shared.enable = true diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift index e2f8bae2..27ec3cac 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift @@ -19,7 +19,6 @@ class LoginViewController: UIViewController { // FIXME: - 서버 연결 테스트, 추후 위치 수정 필요 // getUserIDFetchWithAPI(userID: "nada") // getUserTokenFetchWithAPI(userID: "nada") - // postUserSignUpWithAPI(request: User(userID: "nada3")) } override func viewWillAppear(_ animated: Bool) { @@ -79,9 +78,9 @@ extension LoginViewController { } else { // 로그인 성공했을 때 print("loginWithKakaoTalk() success.") self.getUserInfo() - _ = oauthToken // 어세스토큰 - let accessToken = oauthToken?.accessToken + // let accessToken = oauthToken?.accessToken + self.goToMain() } } @@ -93,9 +92,8 @@ extension LoginViewController { } else { // 로그인 성공했을 때 print("loginWithKakaoTalk() success.") self.getUserInfo() - _ = oauthToken // 어세스토큰 - let accessToken = oauthToken?.accessToken + // let accessToken = oauthToken?.accessToken self.goToMain() } } @@ -110,7 +108,9 @@ extension LoginViewController { print(error) } else { print("me() success.") + self.goToMain() let email = user?.kakaoAccount?.email // 이메일 정보 + } } } @@ -139,7 +139,7 @@ extension LoginViewController { } } } - + func getUserTokenFetchWithAPI(userID: String) { UserAPI.shared.userTokenFetch(userID: userID) { response in switch response { @@ -158,7 +158,7 @@ extension LoginViewController { } func postUserSignUpWithAPI(request: User) { - UserAPI.shared.userSignUp(request: request) { response in + UserAPI.shared.userSocialSignUp(request: request) { response in switch response { case .success: print("postUserSignUpWithAPI - success") @@ -173,4 +173,5 @@ extension LoginViewController { } } } + } From c736dcf29f5fb70139d324554a23c9608e6427e6 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Fri, 10 Dec 2021 17:14:02 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[FEAT]=20#101=20-=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EB=B7=B0=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 +- .../Login/LoginViewController.swift | 43 ++++++++----------- .../More/MoreViewController.swift | 3 +- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 635a73e5..525626ac 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -1198,7 +1198,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = T3VFJ764ZC; + DEVELOPMENT_TEAM = 4QG3GC35LA; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1218,7 +1218,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = T3VFJ764ZC; + DEVELOPMENT_TEAM = 4QG3GC35LA; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift index 27ec3cac..0ddcd09d 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift @@ -30,15 +30,12 @@ class LoginViewController: UIViewController { // MARK: - IBAction Properties // 카카오톡으로 로그인 버튼 클릭 시 @IBAction func kakaoLoginButton(_ sender: Any) { - // 유효한 토큰 검사 - if AuthApi.hasToken() { + if AuthApi.hasToken() { // 유효한 토큰 존재 UserApi.shared.accessTokenInfo { (_, error) in if let error = error { if let sdkError = error as? SdkError, sdkError.isInvalidTokenError() == true { // 로그인 필요 self.signUp() - } else { - // 기타 에러 } } else { // 토큰 유효성 체크 성공(필요 시 토큰 갱신됨) @@ -72,36 +69,30 @@ extension LoginViewController { // 카카오톡 설치 여부 확인 if UserApi.isKakaoTalkLoginAvailable() { // 카카오톡 로그인. api 호출 결과를 클로저로 전달. - UserApi.shared.loginWithKakaoTalk {(oauthToken, error) in - if let error = error { // 예외 처리 (로그인 취소 등) - print(error) - } else { // 로그인 성공했을 때 - print("loginWithKakaoTalk() success.") - self.getUserInfo() - // 어세스토큰 - // let accessToken = oauthToken?.accessToken - - self.goToMain() - } - } + login() } else { + print("카카오톡 미설치") // 만약, 카카오톡이 깔려있지 않을 경우에는 웹 브라우저로 카카오 로그인함. - UserApi.shared.loginWithKakaoTalk {(oauthToken, error) in - if let error = error { // 예외 처리 (로그인 취소 등) - print(error) - } else { // 로그인 성공했을 때 - print("loginWithKakaoTalk() success.") - self.getUserInfo() - // 어세스토큰 - // let accessToken = oauthToken?.accessToken - self.goToMain() + + } + } + + func login() { + UserApi.shared.loginWithKakaoTalk {(oauthToken, error) in + if let error = error { + print(error) + } else { + print("loginWithKakaoTalk() success.") + if let kakaoData = oauthToken { + } } } + } // 사용자 정보를 성공적으로 가져왔을 때, 화면전환하는 함수 - private func getUserInfo() { + func getUserInfo() { // 사용자 정보 가져오기 UserApi.shared.me() {(user, error) in if let error = error { diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift index 3e8777b5..6f8bcdb7 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift @@ -101,7 +101,7 @@ extension MoreViewController: UITableViewDelegate { case 2: print("회원탈퇴!") // TODO: - 회원탈퇴 서버 전, alert 창이나 별도의 알림 필요, 수정 요함 - // deleteUserWithAPI(userID: "nada3") + deleteUserWithAPI(userID: "2alswo7@naver.com") default: print("default!") } } @@ -146,7 +146,6 @@ extension MoreViewController: UITableViewDataSource { // MARK: - Network extension MoreViewController { - // FIXME: - 계정 탈퇴 네트워크 함수 추후 위치 수정 func deleteUserWithAPI(userID: String) { UserAPI.shared.userDelete(userID: userID) { response in switch response { From 38b371443cfe41750244ea37c5082b6e22f44e93 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Fri, 10 Dec 2021 17:29:43 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[FEAT]=20#114=20-=20=ED=83=AD=EB=B0=94=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=EC=84=A0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TabBar/TabBarViewController.swift | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift index bf8ef3a9..3af79a29 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift @@ -9,40 +9,39 @@ import UIKit class TabBarViewController: UITabBarController { - // let appearance = UITabBarAppearance() + // MARK: - Properties + private let borderLineView: UIView = { + let view = UIView() + view.backgroundColor = .textBox + + return view + }() + + // MARK: - View Life Cycle override func viewDidLoad() { super.viewDidLoad() - setUI() + setupUI() } - func setUI() { - self.tabBarController?.tabBar.layer.borderWidth = 1 - self.tabBarController?.tabBar.layer.borderColor = UIColor.textBox.cgColor - // self.tabBarController?.tabBar.clipsToBounds = false -// // set tabbar opacity -// appearance.configureWithOpaqueBackground() -// -// // remove tabbar border line -// appearance.shadowColor = UIColor.clear -// -// // set tabbar background color -// appearance.backgroundColor = .background -// -// tabBar.standardAppearance = appearance -// -// // 없으면 iOS15.0 부터는 탭바에 닿기전에는 탭바가 구분되지 않음(이것도 좀 신기해서 이쁘긴함 ㅋㅋ) -// if #available(iOS 15.0, *) { -// // set tabbar opacity -// tabBar.scrollEdgeAppearance = tabBar.standardAppearance -// } -// -// // set tabbar shadow -// tabBar.layer.masksToBounds = false -// tabBar.layer.shadowColor = UIColor.textBox.cgColor -// tabBar.layer.shadowOpacity = 0.5 -// tabBar.layer.shadowOffset = CGSize(width: 0, height: 0) -// tabBar.layer.shadowRadius = 1 + // MARK: - @Functions + // UI 세팅 작업 + private func setupUI() { + tabBar.addSubview(borderLineView) + + setupLayout() } + + // 레이아웃 세팅 + private func setupLayout() { + borderLineView.translatesAutoresizingMaskIntoConstraints = false + NSLayoutConstraint.activate([ + borderLineView.topAnchor.constraint(equalTo: tabBar.topAnchor), + borderLineView.leadingAnchor.constraint(equalTo: tabBar.leadingAnchor), + borderLineView.trailingAnchor.constraint(equalTo: tabBar.trailingAnchor), + borderLineView.heightAnchor.constraint(equalToConstant: 1) + ]) + } + } From b75b6ff4c50e78e7bbcfcc478aac2c06ac8cd272 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Fri, 10 Dec 2021 17:45:17 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[FEAT]=20#114=20-=20=EC=8A=A4=ED=94=8C?= =?UTF-8?q?=EB=9E=98=EC=8B=9C=20=EB=B7=B0=20=EB=8B=A4=ED=81=AC=EB=AA=A8?= =?UTF-8?q?=EB=93=9C=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 20 ++----------------- .../Storyboards/Splash/Splash.storyboard | 10 +++++----- .../Sources/SceneDelegate.swift | 4 ++-- 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 99ef1b24..345ce2b8 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -297,22 +297,6 @@ path = Splash; sourceTree = ""; }; - 393E3346275F6A1100965BBF /* Login */ = { - isa = PBXGroup; - children = ( - 3979709726FA0BF0003FB4F5 /* Login.storyboard */, - ); - path = Login; - sourceTree = ""; - }; - 393E3347275F6A5100965BBF /* TabBar */ = { - isa = PBXGroup; - children = ( - 39D88B632745FDD400A72164 /* TabBar.storyboard */, - ); - path = TabBar; - sourceTree = ""; - }; 393E3348275F6A5D00965BBF /* Splash */ = { isa = PBXGroup; children = ( @@ -1238,7 +1222,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 4QG3GC35LA; + DEVELOPMENT_TEAM = T3VFJ764ZC; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1258,7 +1242,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 4QG3GC35LA; + DEVELOPMENT_TEAM = T3VFJ764ZC; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard index afaa9e9a..6d9a1ca0 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard @@ -4,8 +4,8 @@ + - @@ -26,7 +26,7 @@ - + @@ -40,8 +40,8 @@ - - - + + + diff --git a/NADA-iOS-forRelease/Sources/SceneDelegate.swift b/NADA-iOS-forRelease/Sources/SceneDelegate.swift index 8c12e176..939b5c6b 100644 --- a/NADA-iOS-forRelease/Sources/SceneDelegate.swift +++ b/NADA-iOS-forRelease/Sources/SceneDelegate.swift @@ -22,8 +22,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { window = UIWindow(frame: windowScene.coordinateSpace.bounds) window?.windowScene = windowScene - // window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.tabBar, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.tabBarViewController) - window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.loginViewController) + window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.tabBar, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.tabBarViewController) + // window?.rootViewController = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.loginViewController) window?.makeKeyAndVisible() IQKeyboardManager.shared.enable = true