Merge pull request #133 from Sopt-Mongle/feature/#126

Feature/#126

Mongle/Mongle.xcodeproj/project.pbxproj

@@ -144,6 +144,7 @@
 		B8F4DDEA24AF22190075FDC1 /* SearchTabMain.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B8F4DDE924AF22190075FDC1 /* SearchTabMain.storyboard */; };
 		B8F4DDF624B20FD00075FDC1 /* SearchTabMainVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F4DDF524B20FD00075FDC1 /* SearchTabMainVC.swift */; };
 		B8F4DDF824B210000075FDC1 /* RecentSearchCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F4DDF724B210000075FDC1 /* RecentSearchCVC.swift */; };
+		EC0016B6255E2E9F009F4F90 /* EmailTimeEndView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0016B5255E2E9F009F4F90 /* EmailTimeEndView.swift */; };
 		EC148CF924BC67E7006925A0 /* 43-emoji-wink.json in Resources */ = {isa = PBXBuildFile; fileRef = EC148CF824BC67E7006925A0 /* 43-emoji-wink.json */; };
 		EC178CCC24BE26F5008CF514 /* SignUpEnd.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EC178CCB24BE26F5008CF514 /* SignUpEnd.storyboard */; };
 		EC178CCE24BE2719008CF514 /* SignUpEndVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC178CCD24BE2719008CF514 /* SignUpEndVC.swift */; };
@@ -360,6 +361,7 @@
 		B8F4DDF524B20FD00075FDC1 /* SearchTabMainVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchTabMainVC.swift; sourceTree = "<group>"; };
 		B8F4DDF724B210000075FDC1 /* RecentSearchCVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecentSearchCVC.swift; sourceTree = "<group>"; };
 		D8DC844C59312BAF341597F1 /* Pods-Mongle.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mongle.debug.xcconfig"; path = "Target Support Files/Pods-Mongle/Pods-Mongle.debug.xcconfig"; sourceTree = "<group>"; };
+		EC0016B5255E2E9F009F4F90 /* EmailTimeEndView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailTimeEndView.swift; sourceTree = "<group>"; };
 		EC148CF824BC67E7006925A0 /* 43-emoji-wink.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "43-emoji-wink.json"; sourceTree = "<group>"; };
 		EC178CCB24BE26F5008CF514 /* SignUpEnd.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignUpEnd.storyboard; sourceTree = "<group>"; };
 		EC178CCD24BE2719008CF514 /* SignUpEndVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpEndVC.swift; sourceTree = "<group>"; };
@@ -463,6 +465,7 @@
 				7FBFAB75255850CA0079FAC5 /* LoginRequestPopupView.swift */,
 				7FFEA28224BF4839003D381A /* ToastView.swift */,
 				EC265294255D91590043C629 /* SplashView.swift */,
+				EC0016B5255E2E9F009F4F90 /* EmailTimeEndView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -731,10 +734,10 @@
 				7FFEA26524BE1B54003D381A /* VersionInfoVC.swift */,
 				7FFEA26924BE3317003D381A /* MonglesVC.swift */,
 				B8E2E14624BEE07000595752 /* MyTabVC.swift */,
+				B8E2E14E24BEE0E900595752 /* MyTabCuratorVC.swift */,
 				B8E2E14824BEE08100595752 /* MyTabPageVC.swift */,
 				B8E2E14A24BEE0A000595752 /* MyTabThemeVC.swift */,
 				B8E2E14C24BEE0B000595752 /* MyTabSentenceVC.swift */,
-				B8E2E14E24BEE0E900595752 /* MyTabCuratorVC.swift */,
 				B85400A5255143D7004700B4 /* AccountEditVC.swift */,
 				EC6E99C92508C9D900B57284 /* SignUpAgreeVC.swift */,
 				EC523909250DF4ED0080BAF0 /* SignUpRuleVC.swift */,
@@ -1116,6 +1119,7 @@
 				B8E2E17724C29C9800595752 /* MyThemeService.swift in Sources */,
 				EC759C4624BF7219001D2F81 /* BookSearchForWritingService.swift in Sources */,
 				B8E2E15324C0586800595752 /* SearchMainService.swift in Sources */,
+				EC0016B6255E2E9F009F4F90 /* EmailTimeEndView.swift in Sources */,
 				B842A455255BBD4B00253275 /* MyProfileUploadData.swift in Sources */,
 				B8F4DDF824B210000075FDC1 /* RecentSearchCVC.swift in Sources */,
 				7FBFAB76255850CA0079FAC5 /* LoginRequestPopupView.swift in Sources */,

Mongle/Mongle/Resource/APIService/ThemeMakeService.swift

@@ -33,10 +33,12 @@ struct ThemeMakeService {
         dataRequest.responseData { dataResponse in
             switch dataResponse.result {
             case .success :
+                print("auto login")
                 guard let statusCode = dataResponse.response?.statusCode else {return}
                 guard let data = dataResponse.value else {return}
                 let networkResult = self.judge(by: statusCode, data)
                 completion(networkResult)
+
 
             case .failure :
                 completion(.networkFail)

Mongle/Mongle/Resource/Assets.xcassets/joinStep35IcWarning.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "joinStep35IcWarning.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "[email protected]"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mongle/Mongle/Resource/Assets.xcassets/joinStep3TimePopupBox.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "joinStep3TimePopupBox.png",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "[email protected]"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mongle/Mongle/Resource/Assets.xcassets/navigationBar1IcMy.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "navigationBar1IcMy.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "[email protected]"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mongle/Mongle/Resource/Assets.xcassets/navigationBar1IcMy_un.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "navigationBar1IcMy.png",
+      "scale" : "1x",
+      "idiom" : "universal"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "scale" : "3x",
+      "idiom" : "universal",
+      "filename" : "[email protected]"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mongle/Mongle/Resource/Storyboard/MainTabMain.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="j3y-77-Kqr">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="j3y-77-Kqr">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="collection view cell content view" minToolsVersion="11.0"/>

Mongle/Mongle/Resource/Storyboard/Onboarding.storyboard

@@ -69,7 +69,7 @@
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <state key="normal" title="건너뛰기"/>
                                 <connections>
-                                    <action selector="jumpButtonAction:" destination="HCh-c8-C0L" eventType="touchUpInside" id="e28-fe-hft"/>
+                                    <action selector="jumpButtonAction:" destination="HCh-c8-C0L" eventType="touchUpInside" id="nhi-Y1-4SR"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IWU-xI-lrY">

Mongle/Mongle/Resource/Storyboard/OnboardingFirst.storyboard

@@ -249,6 +249,9 @@
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <state key="normal" title="한 번 둘러보기"/>
+                                <connections>
+                                    <action selector="lookAroundButtonAction:" destination="Lsf-Sz-ZQr" eventType="touchUpInside" id="EFg-ol-Hie"/>
+                                </connections>
                             </button>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="0bW-QI-et2"/>

Mongle/Mongle/Resource/Storyboard/SignUpAgree.storyboard

@@ -12,7 +12,7 @@
         <!--Sign Up AgreeVC-->
         <scene sceneID="bPK-tz-jmb">
             <objects>
-                <viewController storyboardIdentifier="SignUpAgreeVC" id="ect-TA-kH3" customClass="SignUpAgreeVC" customModule="Mongle" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="ect-TA-kH3" customClass="SignUpAgreeVC" customModule="Mongle" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="TdM-3m-WeT">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -210,6 +210,7 @@
                             <constraint firstItem="tIM-pv-Lon" firstAttribute="leading" secondItem="wcK-s5-79n" secondAttribute="leading" constant="19" id="zXe-ur-L6y"/>
                         </constraints>
                     </view>
+                    <navigationItem key="navigationItem" id="W67-kC-8cJ"/>
                     <connections>
                         <outlet property="checkButton" destination="wvJ-X5-Az0" id="a18-Sb-TpO"/>
                         <outlet property="checkButton2" destination="t5R-5U-G2W" id="TrY-Tx-y90"/>
@@ -239,6 +240,23 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ktF-ny-3EV" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="1018.4" y="-235.71428571428572"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="XiC-6d-yZr">
+            <objects>
+                <navigationController storyboardIdentifier="SignUpAgreeVC" automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="9Lh-DO-NK1" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="C7T-Io-qQd">
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="ect-TA-kH3" kind="relationship" relationship="rootViewController" id="V7u-49-5Il"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="mdf-2v-T0f" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
             <point key="canvasLocation" x="76" y="-235.71428571428572"/>
         </scene>
     </scenes>