TeamNADA · mini-min · Dec 10, 2021 · Dec 7, 2021 · Dec 10, 2021 · Dec 10, 2021
diff --git 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 */; };
@@ -138,6 +140,8 @@
 		3936993D274A53E000684420 /* GroupEditViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditViewController.swift; sourceTree = "<group>"; };
 		39369942274A568900684420 /* GroupEditTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditTableViewCell.swift; sourceTree = "<group>"; };
 		39369943274A568900684420 /* GroupEditTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupEditTableViewCell.xib; sourceTree = "<group>"; };
+		393E3344275F69EE00965BBF /* SplashViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashViewController.swift; sourceTree = "<group>"; };
+		393E3349275F6A6600965BBF /* Splash.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Splash.storyboard; sourceTree = "<group>"; };
 		39488E342706E17200BDC917 /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = "<group>"; };
 		394F314B27081B3A00C83291 /* FrontViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontViewController.swift; sourceTree = "<group>"; };
 		394F314E27081B4C00C83291 /* Front.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Front.storyboard; sourceTree = "<group>"; };
@@ -285,6 +289,38 @@
 			path = GroupEdit;
 			sourceTree = "<group>";
 		};
+		393E3343275F69DB00965BBF /* Splash */ = {
+			isa = PBXGroup;
+			children = (
+				393E3344275F69EE00965BBF /* SplashViewController.swift */,
+			);
+			path = Splash;
+			sourceTree = "<group>";
+		};
+		393E3346275F6A1100965BBF /* Login */ = {
+			isa = PBXGroup;
+			children = (
+				3979709726FA0BF0003FB4F5 /* Login.storyboard */,
+			);
+			path = Login;
+			sourceTree = "<group>";
+		};
+		393E3347275F6A5100965BBF /* TabBar */ = {
+			isa = PBXGroup;
+			children = (
+				39D88B632745FDD400A72164 /* TabBar.storyboard */,
+			);
+			path = TabBar;
+			sourceTree = "<group>";
+		};
+		393E3348275F6A5D00965BBF /* Splash */ = {
+			isa = PBXGroup;
+			children = (
+				393E3349275F6A6600965BBF /* Splash.storyboard */,
+			);
+			path = Splash;
+			sourceTree = "<group>";
+		};
 		394F314A2708157500C83291 /* Main */ = {
 			isa = PBXGroup;
 			children = (
@@ -297,6 +333,7 @@
 			isa = PBXGroup;
 			children = (
 				394F314E27081B4C00C83291 /* Front.storyboard */,
+				39523E0A270184B100536900 /* CardList.storyboard */,
 			);
 			path = Main;
 			sourceTree = "<group>";
@@ -345,6 +382,22 @@
 			path = Group;
 			sourceTree = "<group>";
 		};
+		395FE2E127619B0800A9815E /* Login */ = {
+			isa = PBXGroup;
+			children = (
+				3979709726FA0BF0003FB4F5 /* Login.storyboard */,
+			);
+			path = Login;
+			sourceTree = "<group>";
+		};
+		395FE2E227619B0F00A9815E /* TabBar */ = {
+			isa = PBXGroup;
+			children = (
+				39D88B632745FDD400A72164 /* TabBar.storyboard */,
+			);
+			path = TabBar;
+			sourceTree = "<group>";
+		};
 		3979709426FA0BD8003FB4F5 /* Login */ = {
 			isa = PBXGroup;
 			children = (
@@ -737,6 +790,7 @@
 			isa = PBXGroup;
 			children = (
 				F8518059275D0468006BD5ED /* Onboarding */,
+				393E3343275F69DB00965BBF /* Splash */,
 				3936993C274A53D300684420 /* GroupEdit */,
 				39D88B692746009B00A72164 /* BottomSheet */,
 				39D88B682745FE6C00A72164 /* TabBar */,
@@ -762,15 +816,15 @@
 		F8FC43A226C01F2B0033E151 /* Storyboards */ = {
 			isa = PBXGroup;
 			children = (
+				393E3348275F6A5D00965BBF /* Splash */,
+				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 = "<group>";
@@ -883,6 +937,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 */,
@@ -1038,6 +1093,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 */,
@@ -1182,7 +1238,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)",
@@ -1202,7 +1258,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/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"
             static let onboarding = "Onboarding"
         }
 

diff --git 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"
             static let onboardingViewController = "OnboardingViewController"
         }
     }

diff --git a/...ase/Resouces/Storyboards/Login.storyboard → ...souces/Storyboards/Login/Login.storyboard b/...ase/Resouces/Storyboards/Login.storyboard → ...souces/Storyboards/Login/Login.storyboard
diff --git a/.../Resouces/Storyboards/CardList.storyboard → ...uces/Storyboards/Main/CardList.storyboard b/.../Resouces/Storyboards/CardList.storyboard → ...uces/Storyboards/Main/CardList.storyboard
diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Splash/Splash.storyboard
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <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>
+        <!--Splash View Controller-->
+        <scene sceneID="s0d-6b-0kx">
+            <objects>
+                <viewController storyboardIdentifier="SplashViewController" id="Y6W-OH-hqX" customClass="SplashViewController" customModule="NADA_iOS_forRelease" 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"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="frame74" translatesAutoresizingMaskIntoConstraints="NO" id="WjF-Ig-3Vu">
+                                <rect key="frame" x="120.5" y="421" width="173" height="64"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="64" id="e1U-oC-ESI"/>
+                                    <constraint firstAttribute="width" constant="173" id="gcg-a3-lLv"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="WjF-Ig-3Vu" firstAttribute="centerY" secondItem="vDu-zF-Fre" secondAttribute="centerY" id="Gkk-Bd-m01"/>
+                            <constraint firstItem="WjF-Ig-3Vu" firstAttribute="centerX" secondItem="vDu-zF-Fre" secondAttribute="centerX" id="bqI-Vm-zPH"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="64" y="42"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="frame74" width="173" height="64"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>
diff --git a/...se/Resouces/Storyboards/TabBar.storyboard → ...uces/Storyboards/TabBar/TabBar.storyboard b/...se/Resouces/Storyboards/TabBar.storyboard → ...uces/Storyboards/TabBar/TabBar.storyboard
diff --git 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<Any>) -> 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<Any> {
 
         let decoder = JSONDecoder()

diff --git 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,14 +31,16 @@ extension UserSevice: TargetType {
             return "/register"
         case .userDelete(let userID):
             return "/\(userID)"
+        case .userSocialSignUp:
+            return "auth/login"
         }
     }
 
     var method: Moya.Method {
         switch self {
         case .userIDFetch, .userTokenFetch:
             return .get
-        case .userSignUp:
+        case .userSignUp, .userSocialSignUp:
             return .post
         case .userDelete:
             return .delete
@@ -54,14 +57,16 @@ extension UserSevice: TargetType {
             return .requestPlain
         case .userSignUp(let request):
             return .requestJSONEncodable(request)
+        case .userSocialSignUp(let request):
+            return .requestJSONEncodable(request)
         }
     }
 
     var headers: [String: String]? {
         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
@@ -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