From 9f2248592f592e96f251d5a08724eb531d9660bc Mon Sep 17 00:00:00 2001
From: Jen <wonee0321@gmail.com>
Date: Tue, 14 Sep 2021 15:55:02 +0900
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8[FEAT]=20:=20#139=20=EC=9D=B4=EB=A9=94?=
 =?UTF-8?q?=EC=9D=BC=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=EA=B9=8C?=
 =?UTF-8?q?=EC=A7=80=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Storyboards/SignScene/Join.storyboard     | 10 +++---
 .../Source/Views/VCs/SignScene/JoinVC.swift   | 11 ++++++
 .../Source/Views/VCs/SignScene/LoginVC.swift  | 36 +++----------------
 .../Views/VCs/SignScene/SNSLoginVC.swift      | 12 ++++++-
 4 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/ChaRo-iOS/ChaRo-iOS/Resource/Storyboards/SignScene/Join.storyboard b/ChaRo-iOS/ChaRo-iOS/Resource/Storyboards/SignScene/Join.storyboard
index dd79351e..076df02d 100644
--- a/ChaRo-iOS/ChaRo-iOS/Resource/Storyboards/SignScene/Join.storyboard
+++ b/ChaRo-iOS/ChaRo-iOS/Resource/Storyboards/SignScene/Join.storyboard
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17122"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--View Controller-->
+        <!--JoinVC-->
         <scene sceneID="s0d-6b-0kx">
             <objects>
-                <viewController id="Y6W-OH-hqX" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="JoinVC" id="Y6W-OH-hqX" customClass="JoinVC" customModule="ChaRo_iOS" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -20,6 +21,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="26" y="84"/>
         </scene>
     </scenes>
     <resources>
diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift
index f2e772f6..12804522 100644
--- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift
+++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift
@@ -9,11 +9,22 @@ import UIKit
 
 class JoinVC: UIViewController {
 
+    static let identifier = "JoinVC"
+    
     override func viewDidLoad() {
         super.viewDidLoad()
 
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        configureNavigationConrtroller()
+    }
+    
+    private func configureNavigationConrtroller() {
+        self.navigationController?.setNavigationBarHidden(false, animated: true)
+        //타이틀 지정해주기
+    }
+    
 
     
 
diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/LoginVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/LoginVC.swift
index b505e7bb..b118a51f 100644
--- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/LoginVC.swift
+++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/LoginVC.swift
@@ -34,11 +34,14 @@ class LoginVC: UIViewController {
         setNotificationCenter()
     }
     
-    
     override func viewDidDisappear(_ animated: Bool) {
         removeObservers()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        self.navigationController?.setNavigationBarHidden(true, animated: false)
+    }
+    
     
     func setLoginButtonUI() {
         titleLabel.font = .notoSansMediumFont(ofSize: 17)
@@ -148,37 +151,6 @@ extension LoginVC {
         }
         
         
-//        view.addSubview(CharoimageView)
-//        view.addSubview(idBackground)
-//        view.addSubview(pwdBackground)
-//
-//        view.addSubviews([CharoimageView,
-//                          idBackground,
-//                          pwdBackground,
-//                          idTextField,
-//                          pwdTextField,
-//                          joinButton])
-//
-//        CharoimageView.snp.makeConstraints {
-//            $0.top.leading.trailing.equalToSuperview()
-//            $0.height.equalTo(464 * factor)
-//        }
-//
-//        idBackground.snp.makeConstraints {
-//            $0.top.equalTo(CharoimageView.snp.bottom).offset(13)
-//            $0.leading.equalToSuperview().offset(14)
-//            $0.trailing.equalToSuperview().offset(-10)
-//            $0.height.equalTo(64)
-//        }
-//
-//        idBackground.snp.makeConstraints {
-//            $0.top.equalTo(idBackground.snp.bottom).offset(-5)
-//            $0.leading.equalToSuperview().offset(14)
-//            $0.trailing.equalToSuperview().offset(-10)
-//            $0.height.equalTo(64)
-//        }
-        
-        
         
         
         
diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift
index 187a52c8..7ff1f71b 100644
--- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift
+++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift
@@ -20,6 +20,12 @@ class SNSLoginVC: UIViewController {
         
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        self.navigationController?.setNavigationBarHidden(true, animated: false)
+    }
+    
+    
+    
     let lookAroundBtn = UIButton().then {
         $0.setTitle("둘러보기", for: .normal)
         $0.titleLabel?.font = .notoSansMediumFont(ofSize: 14)
@@ -87,6 +93,7 @@ class SNSLoginVC: UIViewController {
         $0.setTitle("이메일로 가입", for: .normal)
         $0.setTitleColor(.gray30, for: .normal)
         $0.titleLabel?.font = UIFont.notoSansMediumFont(ofSize: 14)
+        $0.addTarget(self, action: #selector(goToEmailJoinVC), for: .touchUpInside)
     }
     
     
@@ -95,9 +102,12 @@ class SNSLoginVC: UIViewController {
         let vc = storyboard.instantiateViewController(withIdentifier: LoginVC.identifier)
         self.navigationController?.pushViewController(vc, animated: true)
     }
+
     
     @objc func goToEmailJoinVC() {
-        
+        let storyboard = UIStoryboard(name: "Join", bundle: nil)
+        let vc = storyboard.instantiateViewController(withIdentifier: JoinVC.identifier)
+        self.navigationController?.pushViewController(vc, animated: true)
     }
     
     private func configureNavigationController() {