Skip to content

Commit 9f22485

Browse files
committed
✨[FEAT] : #139 이메일 회원가입까지 연결
1 parent d453f0c commit 9f22485

File tree

4 files changed

+32
-37
lines changed

4 files changed

+32
-37
lines changed

ChaRo-iOS/ChaRo-iOS/Resource/Storyboards/SignScene/Join.storyboard

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3+
<device id="retina6_1" orientation="portrait" appearance="light"/>
34
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17122"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
56
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
67
<capability name="System colors in document resources" minToolsVersion="11.0"/>
78
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
89
</dependencies>
910
<scenes>
10-
<!--View Controller-->
11+
<!--JoinVC-->
1112
<scene sceneID="s0d-6b-0kx">
1213
<objects>
13-
<viewController id="Y6W-OH-hqX" sceneMemberID="viewController">
14+
<viewController storyboardIdentifier="JoinVC" id="Y6W-OH-hqX" customClass="JoinVC" customModule="ChaRo_iOS" customModuleProvider="target" sceneMemberID="viewController">
1415
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
1516
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
1617
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -20,6 +21,7 @@
2021
</viewController>
2122
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
2223
</objects>
24+
<point key="canvasLocation" x="26" y="84"/>
2325
</scene>
2426
</scenes>
2527
<resources>

ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,22 @@ import UIKit
99

1010
class JoinVC: UIViewController {
1111

12+
static let identifier = "JoinVC"
13+
1214
override func viewDidLoad() {
1315
super.viewDidLoad()
1416

1517
}
1618

19+
override func viewWillAppear(_ animated: Bool) {
20+
configureNavigationConrtroller()
21+
}
22+
23+
private func configureNavigationConrtroller() {
24+
self.navigationController?.setNavigationBarHidden(false, animated: true)
25+
//타이틀 지정해주기
26+
}
27+
1728

1829

1930

ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/LoginVC.swift

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,14 @@ class LoginVC: UIViewController {
3434
setNotificationCenter()
3535
}
3636

37-
3837
override func viewDidDisappear(_ animated: Bool) {
3938
removeObservers()
4039
}
4140

41+
override func viewWillAppear(_ animated: Bool) {
42+
self.navigationController?.setNavigationBarHidden(true, animated: false)
43+
}
44+
4245

4346
func setLoginButtonUI() {
4447
titleLabel.font = .notoSansMediumFont(ofSize: 17)
@@ -148,37 +151,6 @@ extension LoginVC {
148151
}
149152

150153

151-
// view.addSubview(CharoimageView)
152-
// view.addSubview(idBackground)
153-
// view.addSubview(pwdBackground)
154-
//
155-
// view.addSubviews([CharoimageView,
156-
// idBackground,
157-
// pwdBackground,
158-
// idTextField,
159-
// pwdTextField,
160-
// joinButton])
161-
//
162-
// CharoimageView.snp.makeConstraints {
163-
// $0.top.leading.trailing.equalToSuperview()
164-
// $0.height.equalTo(464 * factor)
165-
// }
166-
//
167-
// idBackground.snp.makeConstraints {
168-
// $0.top.equalTo(CharoimageView.snp.bottom).offset(13)
169-
// $0.leading.equalToSuperview().offset(14)
170-
// $0.trailing.equalToSuperview().offset(-10)
171-
// $0.height.equalTo(64)
172-
// }
173-
//
174-
// idBackground.snp.makeConstraints {
175-
// $0.top.equalTo(idBackground.snp.bottom).offset(-5)
176-
// $0.leading.equalToSuperview().offset(14)
177-
// $0.trailing.equalToSuperview().offset(-10)
178-
// $0.height.equalTo(64)
179-
// }
180-
181-
182154

183155

184156

ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ class SNSLoginVC: UIViewController {
2020

2121
}
2222

23+
override func viewWillAppear(_ animated: Bool) {
24+
self.navigationController?.setNavigationBarHidden(true, animated: false)
25+
}
26+
27+
28+
2329
let lookAroundBtn = UIButton().then {
2430
$0.setTitle("둘러보기", for: .normal)
2531
$0.titleLabel?.font = .notoSansMediumFont(ofSize: 14)
@@ -87,6 +93,7 @@ class SNSLoginVC: UIViewController {
8793
$0.setTitle("이메일로 가입", for: .normal)
8894
$0.setTitleColor(.gray30, for: .normal)
8995
$0.titleLabel?.font = UIFont.notoSansMediumFont(ofSize: 14)
96+
$0.addTarget(self, action: #selector(goToEmailJoinVC), for: .touchUpInside)
9097
}
9198

9299

@@ -95,9 +102,12 @@ class SNSLoginVC: UIViewController {
95102
let vc = storyboard.instantiateViewController(withIdentifier: LoginVC.identifier)
96103
self.navigationController?.pushViewController(vc, animated: true)
97104
}
105+
98106

99107
@objc func goToEmailJoinVC() {
100-
108+
let storyboard = UIStoryboard(name: "Join", bundle: nil)
109+
let vc = storyboard.instantiateViewController(withIdentifier: JoinVC.identifier)
110+
self.navigationController?.pushViewController(vc, animated: true)
101111
}
102112

103113
private func configureNavigationController() {

0 commit comments

Comments
 (0)