✨ Feat: #16 - 이메일 로그인 액션 추가

Central-MakeUs · Nov 15, 2023 · ef6882b · ef6882b
1 parent 7be72cd
commit ef6882b
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 17 deletions.
diff --git a/CMC/Sources/App/AppCoordinator.swift b/CMC/Sources/App/AppCoordinator.swift
@@ -39,16 +39,16 @@ class AppCoordinator: CoordinatorType {
 
 	func setState(){
 		self.userActionState
-			.subscribe(onNext: { [weak self] state in
-				guard let self = self else {return}
+			.withUnretained(self)
+			.subscribe(onNext: { owner, state in
 				switch state{
 				case .auth:
 					let authCoordinator = AuthCoordinator(
-						navigationController: self.navigationController
+						navigationController: owner.navigationController
 					)
-					authCoordinator.delegate = self
+					authCoordinator.delegate = owner
 					authCoordinator.start()
-					self.childCoordinators.append(authCoordinator)
+					owner.childCoordinators.append(authCoordinator)
 				case .tabBar:
 					print("🍎 여기 들어가면, 메인 탭 화면으로~ 🍎")
 				}

diff --git a/CMC/Sources/Presenter/Auth/Coordinators/AuthCoordinator.swift b/CMC/Sources/Presenter/Auth/Coordinators/AuthCoordinator.swift
@@ -39,8 +39,10 @@ class AuthCoordinator: CoordinatorType {
 
 	func setState() {
 		self.userActionState
+			.observe(on: MainScheduler.instance)
 			.subscribe(onNext: { [weak self] state in
 				guard let self = self else {return}
+				CMCIndecatorManager.shared.show()
 				switch state{
 				case .main:
 					let mainAuthViewController = MainAuthViewController(
@@ -52,6 +54,7 @@ class AuthCoordinator: CoordinatorType {
 						self.navigationController.popViewController(animated: true)
 					}else {
 						self.pushViewController(viewController: mainAuthViewController)
+						CMCIndecatorManager.shared.hide()
 					}
 				case .signUp:
 					let signUpViewController = SignUpViewController(
@@ -62,11 +65,10 @@ class AuthCoordinator: CoordinatorType {
 							)
 						)
 					)
-					if self.navigationController.viewControllers.contains(where: {$0 is SignUpViewController}) {
+					if self.navigationController.viewControllers.contains(where: {$0 is SignInViewController}) {
 						self.navigationController.popViewController(animated: true)
-					}else {
-						self.pushViewController(viewController: signUpViewController)
 					}
+					self.pushViewController(viewController: signUpViewController)
 				case .signIn:
 					let signInViewController = SignInViewController(
 						viewModel: SignInViewModel(
@@ -76,11 +78,11 @@ class AuthCoordinator: CoordinatorType {
 							)
 						)
 					)
-					if self.navigationController.viewControllers.contains(where: {$0 is SignInViewController}) {
+					if self.navigationController.viewControllers.contains(where: {$0 is SignUpViewController}) {
 						self.navigationController.popViewController(animated: true)
-					}else {
-						self.pushViewController(viewController: signInViewController)
 					}
+					self.pushViewController(viewController: signInViewController)
+					CMCIndecatorManager.shared.hide()
 				}
 			}).disposed(by: disposeBag)
 	}

diff --git a/CMC/Sources/Presenter/Auth/SignIn/SignInViewModel.swift b/CMC/Sources/Presenter/Auth/SignIn/SignInViewModel.swift
@@ -63,15 +63,35 @@ class SignInViewModel: ViewModelType{
 				case .success(let model):
 					UserDefaultManager.shared.save(model.accessToken, for: .accessToken)
 					UserDefaultManager.shared.save(model.refreshToken, for: .refreshToken)
-					print("🍎 발급받은 악세스토큰: \(model.accessToken) 🍎")
 					self?.coordinator?.finish()
-				case .failure(let error):
-					print("🍎 발생한 에러: \(error) 🍎")
-					CMCToastManager.shared.addToast(message: "😵‍💫 로그인에 실패했습니다 ㅜ..ㅜ 😵‍💫")
+				case .failure(_):
+					CMCBottomSheetManager.shared.showBottomSheet(
+						title: "존재하지 않는 계정이에요",
+						body: "아이디 또는 비밀번호를 확인해주세요!",
+						buttonTitle: "확인"
+					)
 				}
 			})
 			.disposed(by: disposeBag)
 
+		input.goSignUpButtonTapped
+			.withUnretained(self)
+			.subscribe(onNext: { owner, _ in
+				owner.coordinator?.userActionState.accept(.signUp)
+			})
+			.disposed(by: disposeBag)
+
+		input.forgetIDBtnTapped
+			.withUnretained(self)
+			.subscribe(onNext: { owner, _ in
+				CMCBottomSheetManager.shared.showBottomSheet(
+					title: "아이디 찾기는\n운영진에게 문의해주세요 :)",
+					body: nil,
+					buttonTitle: "확인"
+				)
+			})
+			.disposed(by: disposeBag)
+
 		input.backBtnTapped
 			.withUnretained(self)
 			.observe(on: MainScheduler.instance)

diff --git a/CMC/Sources/Presenter/Commons/Base/BaseViewController.swift b/CMC/Sources/Presenter/Commons/Base/BaseViewController.swift
@@ -28,6 +28,7 @@ class BaseViewController: UIViewController {
 		setAttribute()
 		setConstraint()
 		bind()
+		CMCIndecatorManager.shared.hide()
 	}
 
 	func setAddSubView() {}

diff --git a/CMC/Sources/Utils/Commons/CMCIndecatorManager.swift b/CMC/Sources/Utils/Commons/CMCIndecatorManager.swift
@@ -31,7 +31,7 @@ class CMCIndecatorManager {
 	}
 
 	// MARK: - Methods
-	func setup() {
+	private func setup() {
 
 		let scenes = UIApplication.shared.connectedScenes
 		let windowScene = scenes.first as? UIWindowScene

diff --git a/DesignSystem/Sources/CMCBottomSheet.swift b/DesignSystem/Sources/CMCBottomSheet.swift
@@ -22,8 +22,16 @@ public final class CMCBottomSheet: UIView{
 		let label = UILabel()
 		label.font = DesignSystemFontFamily.Pretendard.bold.font(size: 18)
 		label.textColor = DesignSystemAsset.gray50.color
-		label.text = title
 		label.numberOfLines = 0
+		let paragraphStyle = NSMutableParagraphStyle()
+		paragraphStyle.lineSpacing = 10
+		let attributedString = NSAttributedString(
+				string: title,
+				attributes: [
+						.paragraphStyle: paragraphStyle,
+				]
+		)
+		label.attributedText = attributedString
 		label.textAlignment = .center
 		return label
 	}()