From 62bb6c05d48344f8da00bef633da12c6f1386d0c Mon Sep 17 00:00:00 2001 From: ujcheon Date: Mon, 23 Dec 2019 19:18:23 +0900 Subject: [PATCH 1/8] yj --- Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj | 8 ++++ .../Resources/Storyboards/SignIn.storyboard | 40 +++++++++++++++++++ .../SignInViewController.swift | 30 ++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignIn.storyboard create mode 100644 Mobo_iOS/Mobo_iOS/Sources/ViewControllers/SignInViewController.swift diff --git a/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj b/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj index dd6fafe..911bb12 100644 --- a/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj +++ b/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj @@ -19,6 +19,8 @@ 398522DB23B064DD009C9AE3 /* Extensions+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398522D623B064DD009C9AE3 /* Extensions+UIView.swift */; }; 398522DC23B064DD009C9AE3 /* Extension+CALayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398522D723B064DD009C9AE3 /* Extension+CALayer.swift */; }; 398522DD23B064DD009C9AE3 /* Extension+UITextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398522D823B064DD009C9AE3 /* Extension+UITextField.swift */; }; + EA740D8A23B06BEF00D9E9BC /* SignIn.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA740D8923B06BEF00D9E9BC /* SignIn.storyboard */; }; + EA740D8C23B06C4700D9E9BC /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA740D8B23B06C4700D9E9BC /* SignInViewController.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -36,6 +38,8 @@ 398522D623B064DD009C9AE3 /* Extensions+UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Extensions+UIView.swift"; sourceTree = ""; }; 398522D723B064DD009C9AE3 /* Extension+CALayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Extension+CALayer.swift"; sourceTree = ""; }; 398522D823B064DD009C9AE3 /* Extension+UITextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Extension+UITextField.swift"; sourceTree = ""; }; + EA740D8923B06BEF00D9E9BC /* SignIn.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignIn.storyboard; sourceTree = ""; }; + EA740D8B23B06C4700D9E9BC /* SignInViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -121,6 +125,7 @@ children = ( 398522BD23B05F8D009C9AE3 /* Main.storyboard */, 398522C523B05F8F009C9AE3 /* LaunchScreen.storyboard */, + EA740D8923B06BEF00D9E9BC /* SignIn.storyboard */, ); path = Storyboards; sourceTree = ""; @@ -129,6 +134,7 @@ isa = PBXGroup; children = ( 398522BB23B05F8D009C9AE3 /* ViewController.swift */, + EA740D8B23B06C4700D9E9BC /* SignInViewController.swift */, ); path = ViewControllers; sourceTree = ""; @@ -191,6 +197,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + EA740D8A23B06BEF00D9E9BC /* SignIn.storyboard in Resources */, 398522C723B05F8F009C9AE3 /* LaunchScreen.storyboard in Resources */, 398522C423B05F8F009C9AE3 /* Assets.xcassets in Resources */, 398522BF23B05F8D009C9AE3 /* Main.storyboard in Resources */, @@ -212,6 +219,7 @@ 398522DA23B064DD009C9AE3 /* Extension+GIF.swift in Sources */, 398522BC23B05F8D009C9AE3 /* ViewController.swift in Sources */, 398522B823B05F8D009C9AE3 /* AppDelegate.swift in Sources */, + EA740D8C23B06C4700D9E9BC /* SignInViewController.swift in Sources */, 398522BA23B05F8D009C9AE3 /* SceneDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignIn.storyboard b/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignIn.storyboard new file mode 100644 index 0000000..29f4b5b --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignIn.storyboard @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/SignInViewController.swift b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/SignInViewController.swift new file mode 100644 index 0000000..ef6a62e --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/SignInViewController.swift @@ -0,0 +1,30 @@ +// +// SignInViewController.swift +// Mobo_iOS +// +// Created by 천유정 on 23/12/2019. +// Copyright © 2019 조경진. All rights reserved. +// + +import UIKit + +class SignInViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} From de235ae241d7c4812856f28f8aff23b25bca530c Mon Sep 17 00:00:00 2001 From: ujcheon Date: Tue, 24 Dec 2019 04:34:32 +0900 Subject: [PATCH 2/8] YJ --- Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj | 147 ++++++++++++++++++ .../APIServices/Sign/APIConstants.swift | 19 +++ .../APIServices/Sign/APIService.swift | 17 ++ .../APIServices/Sign/ResponseString.swift | 21 +++ .../APIServices/Sign/SignInService.swift | 85 ++++++++++ .../APIServices/Sign/SignUpService.swift | 9 ++ .../Storyboards/SignInStoryboard.storyboard | 60 +++++++ .../Storyboards/StartHome.storyboard | 33 ++++ .../MovieTimeTableViewController.swift | 114 ++++++++++++++ .../Sign/SignInViewController.swift | 71 +++++++++ .../Sign/SignUpViewController.swift | 30 ++++ 11 files changed, 606 insertions(+) create mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIConstants.swift create mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIService.swift create mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/ResponseString.swift create mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignInService.swift create mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignUpService.swift create mode 100644 Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignInStoryboard.storyboard create mode 100644 Mobo_iOS/Mobo_iOS/Resources/Storyboards/StartHome.storyboard create mode 100644 Mobo_iOS/Mobo_iOS/Sources/ViewControllers/MovieTimeTable/MovieTimeTableViewController.swift create mode 100644 Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignInViewController.swift create mode 100644 Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignUpViewController.swift diff --git a/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj b/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj index 911bb12..c86fb79 100644 --- a/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj +++ b/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj @@ -19,8 +19,25 @@ 398522DB23B064DD009C9AE3 /* Extensions+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398522D623B064DD009C9AE3 /* Extensions+UIView.swift */; }; 398522DC23B064DD009C9AE3 /* Extension+CALayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398522D723B064DD009C9AE3 /* Extension+CALayer.swift */; }; 398522DD23B064DD009C9AE3 /* Extension+UITextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398522D823B064DD009C9AE3 /* Extension+UITextField.swift */; }; +<<<<<<< Updated upstream EA740D8A23B06BEF00D9E9BC /* SignIn.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA740D8923B06BEF00D9E9BC /* SignIn.storyboard */; }; EA740D8C23B06C4700D9E9BC /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA740D8B23B06C4700D9E9BC /* SignInViewController.swift */; }; +======= + 39C84F4823B0A244000130B4 /* MovieTimeTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C84F4723B0A244000130B4 /* MovieTimeTableViewController.swift */; }; + 39C84F4C23B0BD2E000130B4 /* loader.json in Resources */ = {isa = PBXBuildFile; fileRef = 39C84F4B23B0BD2E000130B4 /* loader.json */; }; + 39C84F4E23B0C2A4000130B4 /* PopUpScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39C84F4D23B0C2A4000130B4 /* PopUpScreen.storyboard */; }; + 39C84F5323B0C49A000130B4 /* PopupInventoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C84F5223B0C49A000130B4 /* PopupInventoryViewController.swift */; }; + 9FAE6A60C01378860FA901C8 /* Pods_Mobo_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02DE58E89F1AFEA60CB7A16B /* Pods_Mobo_iOS.framework */; }; + EAE23E6023B13241007615CD /* SignInStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EAE23E5F23B13241007615CD /* SignInStoryboard.storyboard */; }; + EAE23E6323B132A8007615CD /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6223B132A8007615CD /* SignInViewController.swift */; }; + EAE23E6523B132B4007615CD /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6423B132B4007615CD /* SignUpViewController.swift */; }; + EAE23E6823B13DE4007615CD /* APIService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6723B13DE4007615CD /* APIService.swift */; }; + EAE23E6A23B13E0B007615CD /* APIConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6923B13E0B007615CD /* APIConstants.swift */; }; + EAE23E6C23B13E9F007615CD /* ResponseString.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6B23B13E9F007615CD /* ResponseString.swift */; }; + EAE23E6E23B13EDA007615CD /* SignInService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6D23B13EDA007615CD /* SignInService.swift */; }; + EAE23E7023B13F28007615CD /* SignUpService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6F23B13F28007615CD /* SignUpService.swift */; }; + EAE23E7223B14B96007615CD /* StartHome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EAE23E7123B14B96007615CD /* StartHome.storyboard */; }; +>>>>>>> Stashed changes /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -38,8 +55,25 @@ 398522D623B064DD009C9AE3 /* Extensions+UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Extensions+UIView.swift"; sourceTree = ""; }; 398522D723B064DD009C9AE3 /* Extension+CALayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Extension+CALayer.swift"; sourceTree = ""; }; 398522D823B064DD009C9AE3 /* Extension+UITextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Extension+UITextField.swift"; sourceTree = ""; }; +<<<<<<< Updated upstream EA740D8923B06BEF00D9E9BC /* SignIn.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignIn.storyboard; sourceTree = ""; }; EA740D8B23B06C4700D9E9BC /* SignInViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewController.swift; sourceTree = ""; }; +======= + 39C84F4723B0A244000130B4 /* MovieTimeTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieTimeTableViewController.swift; sourceTree = ""; }; + 39C84F4B23B0BD2E000130B4 /* loader.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = loader.json; sourceTree = ""; }; + 39C84F4D23B0C2A4000130B4 /* PopUpScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = PopUpScreen.storyboard; sourceTree = ""; }; + 39C84F5223B0C49A000130B4 /* PopupInventoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupInventoryViewController.swift; sourceTree = ""; }; + 47EA4ECB84A67FB1A51C107C /* Pods-Mobo_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mobo_iOS.release.xcconfig"; path = "Target Support Files/Pods-Mobo_iOS/Pods-Mobo_iOS.release.xcconfig"; sourceTree = ""; }; + EAE23E5F23B13241007615CD /* SignInStoryboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignInStoryboard.storyboard; sourceTree = ""; }; + EAE23E6223B132A8007615CD /* SignInViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewController.swift; sourceTree = ""; }; + EAE23E6423B132B4007615CD /* SignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewController.swift; sourceTree = ""; }; + EAE23E6723B13DE4007615CD /* APIService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIService.swift; sourceTree = ""; }; + EAE23E6923B13E0B007615CD /* APIConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIConstants.swift; sourceTree = ""; }; + EAE23E6B23B13E9F007615CD /* ResponseString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseString.swift; sourceTree = ""; }; + EAE23E6D23B13EDA007615CD /* SignInService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInService.swift; sourceTree = ""; }; + EAE23E6F23B13F28007615CD /* SignUpService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpService.swift; sourceTree = ""; }; + EAE23E7123B14B96007615CD /* StartHome.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = StartHome.storyboard; sourceTree = ""; }; +>>>>>>> Stashed changes /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -115,6 +149,11 @@ 398522D123B06467009C9AE3 /* APIServices */ = { isa = PBXGroup; children = ( +<<<<<<< Updated upstream +======= + EAE23E6623B13D75007615CD /* Sign */, + 390BD68523B08AEF00FF7E68 /* Model */, +>>>>>>> Stashed changes 398522C323B05F8F009C9AE3 /* Assets.xcassets */, ); path = APIServices; @@ -125,7 +164,15 @@ children = ( 398522BD23B05F8D009C9AE3 /* Main.storyboard */, 398522C523B05F8F009C9AE3 /* LaunchScreen.storyboard */, +<<<<<<< Updated upstream EA740D8923B06BEF00D9E9BC /* SignIn.storyboard */, +======= + 390BD67B23B06AEB00FF7E68 /* MovieTabScreen.storyboard */, + 39C84F4D23B0C2A4000130B4 /* PopUpScreen.storyboard */, + 391CEEBE23B0DD9C00E4C71D /* FriendScreen.storyboard */, + EAE23E5F23B13241007615CD /* SignInStoryboard.storyboard */, + EAE23E7123B14B96007615CD /* StartHome.storyboard */, +>>>>>>> Stashed changes ); path = Storyboards; sourceTree = ""; @@ -133,12 +180,80 @@ 398522D323B06482009C9AE3 /* ViewControllers */ = { isa = PBXGroup; children = ( + EAE23E6123B1327F007615CD /* Sign */, 398522BB23B05F8D009C9AE3 /* ViewController.swift */, EA740D8B23B06C4700D9E9BC /* SignInViewController.swift */, ); path = ViewControllers; sourceTree = ""; }; +<<<<<<< Updated upstream +======= + 39C84F4F23B0C415000130B4 /* PopUp */ = { + isa = PBXGroup; + children = ( + 39C84F5223B0C49A000130B4 /* PopupInventoryViewController.swift */, + ); + path = PopUp; + sourceTree = ""; + }; + 39C84F5023B0C422000130B4 /* MovieTimeTable */ = { + isa = PBXGroup; + children = ( + 39C84F4723B0A244000130B4 /* MovieTimeTableViewController.swift */, + ); + path = MovieTimeTable; + sourceTree = ""; + }; + 39C84F5123B0C43F000130B4 /* MovieCollection */ = { + isa = PBXGroup; + children = ( + 390BD67923B06ACB00FF7E68 /* MovieTabViewController.swift */, + 390BD67D23B06B3300FF7E68 /* MovieTabOneViewController.swift */, + 390BD67F23B070FC00FF7E68 /* MovieTabTwoViewController.swift */, + ); + path = MovieCollection; + sourceTree = ""; + }; + 98EFE733EC63355B60E93E37 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 02DE58E89F1AFEA60CB7A16B /* Pods_Mobo_iOS.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + EAE23E6123B1327F007615CD /* Sign */ = { + isa = PBXGroup; + children = ( + EAE23E6223B132A8007615CD /* SignInViewController.swift */, + EAE23E6423B132B4007615CD /* SignUpViewController.swift */, + ); + path = Sign; + sourceTree = ""; + }; + EAE23E6623B13D75007615CD /* Sign */ = { + isa = PBXGroup; + children = ( + EAE23E6723B13DE4007615CD /* APIService.swift */, + EAE23E6923B13E0B007615CD /* APIConstants.swift */, + EAE23E6B23B13E9F007615CD /* ResponseString.swift */, + EAE23E6D23B13EDA007615CD /* SignInService.swift */, + EAE23E6F23B13F28007615CD /* SignUpService.swift */, + ); + path = Sign; + sourceTree = ""; + }; + F52E4EFEF420A286635EEC3C /* Pods */ = { + isa = PBXGroup; + children = ( + 0264162D43B295069FF65561 /* Pods-Mobo_iOS.debug.xcconfig */, + 47EA4ECB84A67FB1A51C107C /* Pods-Mobo_iOS.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; +>>>>>>> Stashed changes /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -197,9 +312,15 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( +<<<<<<< Updated upstream EA740D8A23B06BEF00D9E9BC /* SignIn.storyboard in Resources */, +======= + 391CEEBF23B0DD9C00E4C71D /* FriendScreen.storyboard in Resources */, + EAE23E7223B14B96007615CD /* StartHome.storyboard in Resources */, +>>>>>>> Stashed changes 398522C723B05F8F009C9AE3 /* LaunchScreen.storyboard in Resources */, 398522C423B05F8F009C9AE3 /* Assets.xcassets in Resources */, + EAE23E6023B13241007615CD /* SignInStoryboard.storyboard in Resources */, 398522BF23B05F8D009C9AE3 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -211,16 +332,42 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( +<<<<<<< Updated upstream +======= + EAE23E6523B132B4007615CD /* SignUpViewController.swift in Sources */, + 390BD68723B08AF800FF7E68 /* Movie.swift in Sources */, + 390BD68D23B09D2B00FF7E68 /* Extensions+UIColor.swift in Sources */, + 390BD68B23B08B9300FF7E68 /* DataManager.swift in Sources */, +>>>>>>> Stashed changes 398522DB23B064DD009C9AE3 /* Extensions+UIView.swift in Sources */, 398522DD23B064DD009C9AE3 /* Extension+UITextField.swift in Sources */, +<<<<<<< Updated upstream +======= + 390BD67A23B06ACB00FF7E68 /* MovieTabViewController.swift in Sources */, + EAE23E6E23B13EDA007615CD /* SignInService.swift in Sources */, +>>>>>>> Stashed changes 398522D923B064DD009C9AE3 /* Extension+Font.swift in Sources */, 398522C223B05F8D009C9AE3 /* Mobo_iOS.xcdatamodeld in Sources */, 398522DC23B064DD009C9AE3 /* Extension+CALayer.swift in Sources */, 398522DA23B064DD009C9AE3 /* Extension+GIF.swift in Sources */, + EAE23E7023B13F28007615CD /* SignUpService.swift in Sources */, + EAE23E6323B132A8007615CD /* SignInViewController.swift in Sources */, 398522BC23B05F8D009C9AE3 /* ViewController.swift in Sources */, +<<<<<<< Updated upstream +======= + 39C84F5323B0C49A000130B4 /* PopupInventoryViewController.swift in Sources */, + EAE23E6823B13DE4007615CD /* APIService.swift in Sources */, + 390BD68923B08B1500FF7E68 /* ServerURLs.swift in Sources */, + EAE23E6A23B13E0B007615CD /* APIConstants.swift in Sources */, +>>>>>>> Stashed changes 398522B823B05F8D009C9AE3 /* AppDelegate.swift in Sources */, EA740D8C23B06C4700D9E9BC /* SignInViewController.swift in Sources */, 398522BA23B05F8D009C9AE3 /* SceneDelegate.swift in Sources */, +<<<<<<< Updated upstream +======= + EAE23E6C23B13E9F007615CD /* ResponseString.swift in Sources */, + 39C84F4823B0A244000130B4 /* MovieTimeTableViewController.swift in Sources */, +>>>>>>> Stashed changes ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIConstants.swift b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIConstants.swift new file mode 100644 index 0000000..740c92d --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIConstants.swift @@ -0,0 +1,19 @@ +// +// APIConstants.swift +// Mobo_iOS +// +// Created by 천유정 on 24/12/2019. +// Copyright © 2019 조경진. All rights reserved. +// + +import Foundation + +struct APIConstants { + + // 전역 변수로 사용할 수 있게 APIConstants 선언하여 사용 + static let BaseURL = "http://106.10.59.71:3000/users" + + /* 유저(User) */ + static let LoginURL = BaseURL + "/signin" // 로그인 + static let SignupURL = BaseURL + "/signup" // 회원가입 +} diff --git a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIService.swift b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIService.swift new file mode 100644 index 0000000..67cfba5 --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIService.swift @@ -0,0 +1,17 @@ +// +// APIService.swift +// Mobo_iOS +// +// Created by 천유정 on 24/12/2019. +// Copyright © 2019 조경진. All rights reserved. +// + +import Foundation + +enum NetworkResult { + case success(T) + case requestErr(T) + case pathErr + case serverErr + case networkFail +} diff --git a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/ResponseString.swift b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/ResponseString.swift new file mode 100644 index 0000000..46de0be --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/ResponseString.swift @@ -0,0 +1,21 @@ +// +// ResponseString.swift +// Mobo_iOS +// +// Created by 천유정 on 24/12/2019. +// Copyright © 2019 조경진. All rights reserved. +// + +import Foundation + +// MARK: - ResponseString // 성공했을 때 response body +struct ResponseString: Codable { + let success: Bool + let message: String + let data: DataClass? +} +// MARK: - DataClass +struct DataClass: Codable { + let userIdx: Int + let id, password : String +} diff --git a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignInService.swift b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignInService.swift new file mode 100644 index 0000000..ef80fd6 --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignInService.swift @@ -0,0 +1,85 @@ +// +// SignInService.swift +// Mobo_iOS +// +// Created by 천유정 on 24/12/2019. +// Copyright © 2019 조경진. All rights reserved. +// + +import Foundation +import Alamofire + +class SignInService { + + static let shared = SignInService() + + func SignIn(_ userid: String, _ userpwd: String, completion: @escaping (NetworkResult) -> Void) { + + let header: HTTPHeaders = [ + "Content-Type" : "application/json" + ] + + let body: Parameters = [ + "id": userid, + "pwd": userpwd + ] + + Alamofire.request(APIConstants.LoginURL, method: .post, parameters: body, encoding: JSONEncoding.default, headers: header) + .responseData { response in + + // print("request", response.request) + // print("response", response.response) + // print("data", response.data) + // print("result", response.result) + + // parameter 위치 + switch response.result { + + // 통신 성공 - 네트워크 연결 + case .success: + if let value = response.result.value { + + if let status = response.response?.statusCode { + + switch status { + case 200: + do { + let decoder = JSONDecoder() + print("value", value) + let result = try decoder.decode(ResponseString.self, from: value) + + // ResponseString에 있는 success로 분기 처리 + switch result.success { + + case true: + print("success") + completion(.success(result.data as Any)) + case false: + completion(.requestErr(result.message)) + } + } + catch { + completion(.pathErr) + print(error.localizedDescription) + print(APIConstants.LoginURL) + } + case 400: + completion(.pathErr) + case 500: + completion(.serverErr) + default: + break + }// switch + }// iflet + } + break + // 통신 실패 - 네트워크 연결 + case .failure(let err): + print(err.localizedDescription) + completion(.networkFail) + // .networkFail이라는 반환 값이 넘어감 + break + } // response.result switch + } // alamofire.request + } // func login + } // struct diff --git a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignUpService.swift b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignUpService.swift new file mode 100644 index 0000000..6422e28 --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignUpService.swift @@ -0,0 +1,9 @@ +// +// SignUpService.swift +// Mobo_iOS +// +// Created by 천유정 on 24/12/2019. +// Copyright © 2019 조경진. All rights reserved. +// + +import Foundation diff --git a/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignInStoryboard.storyboard b/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignInStoryboard.storyboard new file mode 100644 index 0000000..c5ff466 --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignInStoryboard.storyboard @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mobo_iOS/Mobo_iOS/Resources/Storyboards/StartHome.storyboard b/Mobo_iOS/Mobo_iOS/Resources/Storyboards/StartHome.storyboard new file mode 100644 index 0000000..b2ff961 --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Resources/Storyboards/StartHome.storyboard @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/MovieTimeTable/MovieTimeTableViewController.swift b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/MovieTimeTable/MovieTimeTableViewController.swift new file mode 100644 index 0000000..1b3fc59 --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/MovieTimeTable/MovieTimeTableViewController.swift @@ -0,0 +1,114 @@ +// +// MoviewTabOne.swift +// Mobo_iOS +// +// Created by 조경진 on 2019/12/23. +// Copyright © 2019 조경진. All rights reserved. +// + +import UIKit + +class MovieTimeTableViewController: UIViewController { + + + //IBOutlets.. + @IBOutlet weak var FindBtn: UIButton! + @IBOutlet weak var lastweekBtn: UIButton! + @IBOutlet weak var nextweekBtn: UIButton! + + @IBOutlet weak var lastView: UIView! + @IBOutlet weak var nextView: UIView! + @IBOutlet weak var TableView: UIView! + + + + //Inits.. + + override func viewDidLoad() { + super.viewDidLoad() + //navigationSetup() + + FindBtn.backgroundColor = .mainOragne + view.backgroundColor = UIColor.init(red: 211/255, green: 211/255, blue: 211/255, alpha: 1) + +// nextView.backgroundColor = UIColor.init(red: 211/255, green: 211/255, blue: 211/255, alpha: 1) +// lastView.backgroundColor = UIColor.init(red: 211/255, green: 211/255, blue: 211/255, alpha: 1) +// TableView.backgroundColor = UIColor.init(red: 211/255, green: 211/255, blue: 211/255, alpha: 1) + + navigationSetup() + } + + func navigationSetup() { //네비게이션 투명색만들기 + + + self.navigationController?.navigationBar.barTintColor = UIColor.init(red: 255/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1.0) + self.navigationController?.navigationBar.backIndicatorImage = #imageLiteral(resourceName: "iconsDarkBack") + self.navigationController?.navigationBar.backIndicatorTransitionMaskImage = #imageLiteral(resourceName: "iconsDarkBack") + self.navigationItem.backBarButtonItem = UIBarButtonItem(title: "채팅대기", style: .done, target: nil, action: nil) + self.navigationItem.backBarButtonItem?.tintColor = .black + //투명하게 만드는 공식처럼 기억하기 + self.navigationController?.navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default) + //네비게이션바의 백그라운드색 지정. UIImage와 동일 + self.navigationController?.navigationBar.shadowImage = UIImage() + //shadowImage는 UIImage와 동일. 구분선 없애줌. + self.navigationController?.navigationBar.isTranslucent = true + //false면 반투명이다. + self.navigationController?.view.backgroundColor = UIColor.white.withAlphaComponent(0.0) + //뷰의 배경색 지정 + // self.navigationController?.navigationBar.topItem?.title = "Home" + // let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.init(red: 211/255.0, green: 211.0/255.0, blue: 211.0/255.0, alpha: 1.0)] + // navigationController?.navigationBar.titleTextAttributes = textAttributes + + } + + + @IBAction func lastBtnClick(_ sender: Any) { + + nextView.layer.shadowOpacity = 0.0 + + lastView.layer.shadowColor = UIColor.black.cgColor + TableView.layer.shadowColor = UIColor.black.cgColor + + lastView.layer.shadowOpacity = 0.5 + TableView.layer.shadowOpacity = 0.5 + + nextView.backgroundColor = UIColor.init(red: 211/255, green: 211/255, blue: 211/255, alpha: 1) + lastView.backgroundColor = UIColor.init(red: 255/255, green: 255/255, blue: 255/255, alpha: 1) + + + } + + @IBAction func nextBtnClick(_ sender: Any) { + + + lastView.layer.shadowOpacity = 0.0 + + nextView.layer.shadowColor = UIColor.black.cgColor + TableView.layer.shadowColor = UIColor.black.cgColor + + nextView.layer.shadowOpacity = 0.5 + TableView.layer.shadowOpacity = 0.5 + + lastView.backgroundColor = UIColor.init(red: 211/255, green: 211/255, blue: 211/255, alpha: 1) + nextView.backgroundColor = UIColor.init(red: 255/255, green: 255/255, blue: 255/255, alpha: 1) + + + } + + + @IBAction func FindFriendBtn(_ sender: Any) { + + + let storyboard = UIStoryboard(name: "FriendScreen", bundle: nil) + + let vc = storyboard.instantiateViewController(withIdentifier: "FriendVC") as! FindFriendViewController + vc.modalPresentationStyle = .fullScreen //or .overFullScreen for transparency + + self.show(vc, sender: nil) + + } + + + +} + diff --git a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignInViewController.swift b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignInViewController.swift new file mode 100644 index 0000000..1b4eef7 --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignInViewController.swift @@ -0,0 +1,71 @@ +// +// SignInViewController.swift +// Mobo_iOS +// +// Created by 천유정 on 24/12/2019. +// Copyright © 2019 조경진. All rights reserved. +// + +import UIKit + +class SignInViewController: UIViewController { + + @IBOutlet weak var SignInUserId: UITextField! + @IBOutlet weak var SignInUserPwd: UITextField! + + @IBAction func SignUpButton(_ sender: Any) { + guard let main = self.storyboard?.instantiateViewController(withIdentifier: "StartHome") else {return} + } + override func viewDidLoad() { + super.viewDidLoad() + + + } + + @IBAction func SignInButton(_ sender: Any) { + guard let userid = SignInUserId.text else {return} + guard let userpwd = SignInUserPwd.text else {return} + + SignInService.shared.login(userid, userpwd) { + data in + + switch data { + + case .success(let data): + + // DataClass 에서 받은 유저 정보 반환 + let user_data = data as! DataClass + + // 사용자의 토큰, 이름, 이메일, 전화번호 받아오기 + // 비밀번호는 안 받아와도 됨 + UserDefaults.standard.set(user_data.userIdx, forKey: "token") + UserDefaults.standard.set(user_data.name, forKey: "name") + + + guard let main = self.storyboard?.instantiateViewController(withIdentifier: "StartHome") else {return} + + self.present(main, animated: true) + + case .requestErr(let message): + self.simpleAlert(title: "로그인 실패", message: "\(message)", type: 0) + + case .pathErr: + print(".pathErr") + + case .serverErr: + print(".serverErr") + + case .networkFail: + self.simpleAlert(title: "로그인 실패", message: "네트워크 상태를 확인해주세요.", type: 0) + } + + } + } + + + + + override func touchesBegan(_ touches: Set, with event: UIEvent?){ + self.view.endEditing(true) + } +} diff --git a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignUpViewController.swift b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignUpViewController.swift new file mode 100644 index 0000000..080f39f --- /dev/null +++ b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignUpViewController.swift @@ -0,0 +1,30 @@ +// +// SignUpViewController.swift +// Mobo_iOS +// +// Created by 천유정 on 24/12/2019. +// Copyright © 2019 조경진. All rights reserved. +// + +import UIKit + +class SignUpViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} From 2337649df7aa7dfa9a74460471fe9f57aa03e7f8 Mon Sep 17 00:00:00 2001 From: ujcheon Date: Tue, 24 Dec 2019 05:02:52 +0900 Subject: [PATCH 3/8] 2 --- .DS_Store | Bin 6148 -> 6148 bytes Mobo_iOS/.DS_Store | Bin 6148 -> 6148 bytes .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ Mobo_iOS/Mobo_iOS/.DS_Store | Bin 8196 -> 8196 bytes 4 files changed, 8 insertions(+) create mode 100644 Mobo_iOS/Mobo_iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.DS_Store b/.DS_Store index 6e0eb7a85954ddb7e5b3cfabef585169e5bb5eed..6ad8e5e84e1c4f7681dc9f2915146051ec5559c6 100644 GIT binary patch delta 224 zcmZoMXfc=|#>B!ku~2NHo}wrR0|Nsi1A_pAXHI@{QcivnkT0;gk$E|@DM*TiL60Gw zA(Np5SsJKA94M#p9}IvjBz2Pmm?pBB=qMPQ7*BrAB)qu~2NHo}wrV0|Nsi1A_nqLp(z!gFi#CXHI_d#=_-{j4YEAS+BC0 v>L?hS7;Uy;JI%PUA(VMDI|n}pQ1@m*j_=Hq`9&N#fcilOuxySHS;Gtf=r9zt diff --git a/Mobo_iOS/.DS_Store b/Mobo_iOS/.DS_Store index bd2106650355fea30e13756d64a542448ea20cca..2e3ecf5f23f5ccf901a9a4fd74329117f361a65e 100644 GIT binary patch literal 6148 zcmeHKO>Wab6n@hN>VzU9RH%|)9AqkvK1UsFJ=U5oA!Cl8)mzh1;W^ofn(7X12m zX{arT_r~c!$A9t$QJ4fD_j+;CdPkZjL@9Fvj z&ZA#-*LxTS<8F214v&X!7zc?Yhkk&NCy&C|=i?3^#eOQsaa4z8m928Ox;2?Jo2{DN zY&EAfd$PST z^afmgolp-#`V`QB64aiH%`hkCd+_pNE;UAU&~SSEXaFwk!!e4bc!PeP_eGF5 z&d7O;ToXE^6nVRtLr~0{ZGxN6d+BkCxqtlnJ2@=Ke~tE}zRz&fL~~ibp2>2(7>(a2 z0=q|tGqd|P!z*cCT8xuR;Z1HSfOdXO|Mjg)=XVMwbEAM!;14Mv_6Hj-u&psuD7Ow2 z@(KVfp;;R0;*&veY>jP=nL_lyn4$s|mFX)6Q*^Z3If^~^yP!;H#2=hVe;)5 z-4Xn~mz0V#tii~@gEfggAr*7*Pc delta 99 zcmZoMXfc=|#>B)qu~2NHo}wrd0|Nsi1A_nqLp(z!gFi!XQh9N~#=_-{lMO^zCfl + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Mobo_iOS/Mobo_iOS/.DS_Store b/Mobo_iOS/Mobo_iOS/.DS_Store index cd3ddde60f85fd6865d6dc25220ed7c266953298..c5bb46bab29fa3ad903a12e9c16fee60e65d96a8 100644 GIT binary patch delta 147 zcmZp1XmOa}&nUPtU^hRb;A9?wnUg07pPd{iAi8<8U@{Y%iH?G?iSc9^k?WI>ittZv z74By@u`mV-8c&uMagt_d2xiDw%FD^mOJ`tUVBA<}$F!MU;v384 MHNqLhYqDkn072L&H2?qr delta 231 zcmZp1XmOa}&&a#s+8P zmj{<5mXsDdB^JdC$OLDmq$VX6g=eOeWQ3&Vx#pynrRMn;`6QO4PQE7KnH~+&5Rh1s z0aV1H?2y0!2Amw6@d6Un)n*13ItoVSCbc>W)#l~~ItnJnX0^4P92}DBZb5OSO?|Uw zFIl>5`JuxQZH$Z%nn4gs!>A*h^98G!CTk12PZkjtp1fC-e{!%$$;L7f=FRL9-&i(Q HurmVy*!MmE From 83d510dae1916817ea6f0bfe5afe1adb735fbfa7 Mon Sep 17 00:00:00 2001 From: ujcheon Date: Tue, 24 Dec 2019 05:24:47 +0900 Subject: [PATCH 4/8] Update .DS_Store --- Mobo_iOS/.DS_Store | Bin 6148 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Mobo_iOS/.DS_Store b/Mobo_iOS/.DS_Store index 2e3ecf5f23f5ccf901a9a4fd74329117f361a65e..5f5ed20f81ad25270fa2f59815c2b6338f7d0765 100644 GIT binary patch delta 31 ncmZoMXfc@J&&ahgU^g=(*Jd7;4NQ}j*q=^pNZZWL@s}R}puGxs delta 127 zcmZoMXfc@J&&abeU^g=(&t@K$4NOVw3;_)J3@Hq044Di$45^+u`N>H+`AG~63<3-c qjIBUg<3AVxSquz3sHz$CfO_&7k{Pnm^nFIsH+cu!%gyW@fB6B44JDcY From 81b79931053f18eaff0972e1854f9ea78b4b3d1c Mon Sep 17 00:00:00 2001 From: ujcheon Date: Tue, 24 Dec 2019 05:27:24 +0900 Subject: [PATCH 5/8] Update --- .DS_Store | Bin 6148 -> 6148 bytes Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj | 27 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/.DS_Store b/.DS_Store index 6ad8e5e84e1c4f7681dc9f2915146051ec5559c6..2fa79c0b94d4beae2a52496d8b567cd6b315fe57 100644 GIT binary patch delta 21 ccmZoMXffDe!p320V6LNJY+|(8hV6tP06+%?ssI20 delta 16 XcmZoMXffDe!Z!Ili|6KAwst`PGnoa@ diff --git a/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj b/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj index c86fb79..91b57b2 100644 --- a/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj +++ b/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj @@ -37,6 +37,9 @@ EAE23E6E23B13EDA007615CD /* SignInService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6D23B13EDA007615CD /* SignInService.swift */; }; EAE23E7023B13F28007615CD /* SignUpService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6F23B13F28007615CD /* SignUpService.swift */; }; EAE23E7223B14B96007615CD /* StartHome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EAE23E7123B14B96007615CD /* StartHome.storyboard */; }; +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes /* End PBXBuildFile section */ @@ -73,6 +76,9 @@ EAE23E6D23B13EDA007615CD /* SignInService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInService.swift; sourceTree = ""; }; EAE23E6F23B13F28007615CD /* SignUpService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpService.swift; sourceTree = ""; }; EAE23E7123B14B96007615CD /* StartHome.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = StartHome.storyboard; sourceTree = ""; }; +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes /* End PBXFileReference section */ @@ -150,7 +156,10 @@ isa = PBXGroup; children = ( <<<<<<< Updated upstream +<<<<<<< Updated upstream ======= +======= +>>>>>>> Stashed changes EAE23E6623B13D75007615CD /* Sign */, 390BD68523B08AEF00FF7E68 /* Model */, >>>>>>> Stashed changes @@ -172,6 +181,9 @@ 391CEEBE23B0DD9C00E4C71D /* FriendScreen.storyboard */, EAE23E5F23B13241007615CD /* SignInStoryboard.storyboard */, EAE23E7123B14B96007615CD /* StartHome.storyboard */, +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes ); path = Storyboards; @@ -317,6 +329,9 @@ ======= 391CEEBF23B0DD9C00E4C71D /* FriendScreen.storyboard in Resources */, EAE23E7223B14B96007615CD /* StartHome.storyboard in Resources */, +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes 398522C723B05F8F009C9AE3 /* LaunchScreen.storyboard in Resources */, 398522C423B05F8F009C9AE3 /* Assets.xcassets in Resources */, @@ -333,7 +348,10 @@ buildActionMask = 2147483647; files = ( <<<<<<< Updated upstream +<<<<<<< Updated upstream ======= +======= +>>>>>>> Stashed changes EAE23E6523B132B4007615CD /* SignUpViewController.swift in Sources */, 390BD68723B08AF800FF7E68 /* Movie.swift in Sources */, 390BD68D23B09D2B00FF7E68 /* Extensions+UIColor.swift in Sources */, @@ -345,6 +363,9 @@ ======= 390BD67A23B06ACB00FF7E68 /* MovieTabViewController.swift in Sources */, EAE23E6E23B13EDA007615CD /* SignInService.swift in Sources */, +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes 398522D923B064DD009C9AE3 /* Extension+Font.swift in Sources */, 398522C223B05F8D009C9AE3 /* Mobo_iOS.xcdatamodeld in Sources */, @@ -359,12 +380,18 @@ EAE23E6823B13DE4007615CD /* APIService.swift in Sources */, 390BD68923B08B1500FF7E68 /* ServerURLs.swift in Sources */, EAE23E6A23B13E0B007615CD /* APIConstants.swift in Sources */, +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes 398522B823B05F8D009C9AE3 /* AppDelegate.swift in Sources */, EA740D8C23B06C4700D9E9BC /* SignInViewController.swift in Sources */, 398522BA23B05F8D009C9AE3 /* SceneDelegate.swift in Sources */, <<<<<<< Updated upstream +<<<<<<< Updated upstream +======= ======= +>>>>>>> Stashed changes EAE23E6C23B13E9F007615CD /* ResponseString.swift in Sources */, 39C84F4823B0A244000130B4 /* MovieTimeTableViewController.swift in Sources */, >>>>>>> Stashed changes From cb4a14838cabe3220846e45d9c98926cf5fd9457 Mon Sep 17 00:00:00 2001 From: ujcheon Date: Tue, 24 Dec 2019 05:38:42 +0900 Subject: [PATCH 6/8] Update --- Mobo_iOS/.DS_Store | Bin 6148 -> 6148 bytes Mobo_iOS/Mobo_iOS/.DS_Store | Bin 8196 -> 8196 bytes Mobo_iOS/Mobo_iOS/Resources/.DS_Store | Bin 6148 -> 6148 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Mobo_iOS/.DS_Store b/Mobo_iOS/.DS_Store index 5f5ed20f81ad25270fa2f59815c2b6338f7d0765..14eef1653830a32e513e2bf07b71f38d80eef053 100644 GIT binary patch delta 173 zcmZoMXfc@J&&azmU^g=(?_?g9%N(Xg<~j<-Mn;>Tvs`7I{D)PuzAU&XFDE}Qoq>UY z5s29t0vPfcQW(-0G8u9hQay9>laq4tlYlY;Kn1NpTH`+$09gzSJgBM}^niNu8Il>Y Y(e!;r)5ikUSL`|Y7~A5_>>Pjj0Xkn+a delta 44 zcmZoMXfc@J&&ahgU^g=(*JK`+%N)kWCOQhnCdQkevs`7I9L2tNV#B=6>>Pjj0Wt~> AtpET3 diff --git a/Mobo_iOS/Mobo_iOS/.DS_Store b/Mobo_iOS/Mobo_iOS/.DS_Store index c5bb46bab29fa3ad903a12e9c16fee60e65d96a8..0f3e3f4f3f7053b76e4b388bfa2d51345678b1ab 100644 GIT binary patch delta 66 zcmZp1XmQx^LYUpu$XrLk*l4nWpwna#Vd2SpMfo=eiwH3yOKe^zx}6^P$5*`2m diff --git a/Mobo_iOS/Mobo_iOS/Resources/.DS_Store b/Mobo_iOS/Mobo_iOS/Resources/.DS_Store index 318a2dc33021b20d5109fa28371312c59933d8eb..7cdd3e57e20bdfd02dda20cf5570c170c8f34b72 100644 GIT binary patch delta 155 zcmZoMXffC@m&x#CQbA5;afyM!bw(y;7FITP4h}93E?%zK;Eeq8;F83W(qgB?qG%8= zAh9GPDRJ^+CeHv44o(ivcmav(YEvU~9R*_}qgow>YIAb~9R(9(v)Wot4slgOThD~t l%Bt#`+PawxV8F--p&9t0G>n?Hc`|be%ftqq&Fmb1`2oq_C4B$@ delta 220 zcmZoMXffC@m&xsGQbA5;afyM!4Mrwr7FITP4o)s^PHsMK&e-6L{PN(E#FEltr^KRo z0h!>;l+>ieqVUX=l8lhlJlCAmveZ2PBA>*P)XC?VJnN%D8UhkaGJuLWlpWF)7(jrN zgEL-0qPp7H*i=Ws*u+(1Xc#MrF1mXm`+Qr#^muC%Fd*6bxqmn}bZ7_5td skr6^O2tsKXbp*)ZW(Z~|VaR7FVyI+D0@8^>Pjj0sfIVBLDyZ From f2517108d3e546c8d6a6b908b4f26f6e0ad4fbb9 Mon Sep 17 00:00:00 2001 From: ujcheon Date: Tue, 24 Dec 2019 06:02:41 +0900 Subject: [PATCH 7/8] t --- Mobo_iOS/.DS_Store | Bin 6148 -> 6148 bytes Mobo_iOS/Mobo_iOS/.DS_Store | Bin 8196 -> 8196 bytes Mobo_iOS/Mobo_iOS/Resources/.DS_Store | Bin 6148 -> 6148 bytes .../Mobo_iOS/Resources/APIServices/.DS_Store | Bin 0 -> 6148 bytes Mobo_iOS/Mobo_iOS/Sources/.DS_Store | Bin 0 -> 6148 bytes .../Sources/ViewControllers/.DS_Store | Bin 0 -> 6148 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/.DS_Store create mode 100644 Mobo_iOS/Mobo_iOS/Sources/.DS_Store create mode 100644 Mobo_iOS/Mobo_iOS/Sources/ViewControllers/.DS_Store diff --git a/Mobo_iOS/.DS_Store b/Mobo_iOS/.DS_Store index 14eef1653830a32e513e2bf07b71f38d80eef053..472f99f2e9a4acfcca97360b3ea75122b2bccef6 100644 GIT binary patch delta 19 acmZoMXffFEfQ8M#Tt~s!Wb-o?Ibi@m;05ad delta 19 acmZoMXffFEfQ8M-Tt~s!X!A1`Ibi@m>ILfn diff --git a/Mobo_iOS/Mobo_iOS/.DS_Store b/Mobo_iOS/Mobo_iOS/.DS_Store index 0f3e3f4f3f7053b76e4b388bfa2d51345678b1ab..20268ac7b1af55f32f77fda66a7bd11b3a6490fa 100644 GIT binary patch delta 60 zcmZp1XmQw}DadSUV7^&La4!>+f%#+|LAS{w!orjHit=v`77=EIifvvex`Q3T4r2lU D{B#ho delta 72 zcmZp1XmQw}DadSWY`R%Ta4!>^k-3h7vC(7$L8r+g!orjHit=v`77=Dd65qT|bO$>s HKa2?gu~`z- diff --git a/Mobo_iOS/Mobo_iOS/Resources/.DS_Store b/Mobo_iOS/Mobo_iOS/Resources/.DS_Store index 7cdd3e57e20bdfd02dda20cf5570c170c8f34b72..976f0b775574a129fac2fbc48af509ab278ed1e5 100644 GIT binary patch delta 103 zcmZoMXfc=|#>B!ku~2NHo+2aL#(>?7ix)66F|tkOVX~eq$Rs*>64L}W19Ke(W0T1m z%q}1yp0ePgyqx^JbOr_n#?4Ml8<;k;bMSKjjoCbr`8)Guei26wMg|5Zpftng2$40+ E07>Q;UH||9 delta 75 zcmZoMXfc=|#>B)qu~2NHo+2a5#(>?7j4YE4S*0ecu_#WS#45VEkaZf<#s*R5&Fmcf d96+U;1v$PmPv#eKt|Z3t$f*)fj{(A=%TAMSx5HS67)i@yANAvJBWM8>!G{QX zko*((^jcgvOfOx3&*5bprCF`^OB5E0i%ZK=mSuUh{L??zLq7|$LD~%Z->LRF$j(D& zf6+Rg+Clg=>JHB;>qk1tf+*?sO>)%fV#tqgQPR=FrXD1n)b!)q1}RIjbXM6Mjdp8| zs;cj7kE?3bXw<4|r@l8Hm*mEWt%K9n#m(*LZhZe>h6)0gxsf%86L>^pO2n1lPhy?) z&^L*n#4$1h%m6bm7Yw+~Nv_Pr-|$Z`1I)lYF+lr+LM8MZ<`&J?frWVjAksC`2- zq#WhYbC_Gi78GGq5pAk)PYhwx(XU*b=P|1Xoc#tbk6?}`CYJob;9I3#zr&J2#uT7}v|C84<7;xq*fa};AN e9mSidM$oUwK=d5u7SV&k7Xd>97tFw$GVli%RcY=3 literal 0 HcmV?d00001 diff --git a/Mobo_iOS/Mobo_iOS/Sources/.DS_Store b/Mobo_iOS/Mobo_iOS/Sources/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8b0d1b43c059052bfd2790d9c7bef54263598724 GIT binary patch literal 6148 zcmeHK!EVz)5S>i}Y=Tg8K%&RJAaTecrG*?&B`Yn5-YOZD1EAI>5w&EzmF-|b2=Z^x zKk66oIrPo$rUDhz8wE5Y&A##M%-Z{G?RbbtP3F^0q5%XZJOH@k^GrFgFgE11lG0LX;Yns z?DO?i~#_7Kgt#bR>(Qr^3eATKcUGZ8QSRsAG%rrEqKhO)2FbB?jXXgAY^D#d=L?n8n!8%ckh$NKJYohsuu%Gpc zEZGru3SA?iT}tVg7@ar<90UJ51H5KpcbUj(+@g{;o!}fn_b&*dKIOEhS7AllSdlrEGz4b64q-i_f-3mm zQ#nhfSe+wt<(hRq&DBA7fyFLyd3%B9=%(fva130J0X`pmC}Uu;HmHvdH2Mhu^f0Ui zHvcAYj&CurSQ~@~B1|gKqze1Q5GEbtzKshk)&@;F3H$gE_RGS)P=x+E>iasJL}1Xh zjseHOECb7?+v5BG`S0KVvq`S!7;p?M6a&KB33qy!lD%86OpfnbA9?^~;keqMPC;X@ hV{PzNyav?*pU(y`uvi Date: Tue, 24 Dec 2019 13:16:27 +0900 Subject: [PATCH 8/8] Revert "yj" --- .DS_Store | Bin 6148 -> 6148 bytes Mobo_iOS/.DS_Store | Bin 6148 -> 6148 bytes Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj | 176 ------------------ Mobo_iOS/Mobo_iOS/.DS_Store | Bin 8196 -> 8196 bytes Mobo_iOS/Mobo_iOS/Resources/.DS_Store | Bin 6148 -> 6148 bytes .../Mobo_iOS/Resources/APIServices/.DS_Store | Bin 6148 -> 6148 bytes .../APIServices/Sign/APIConstants.swift | 19 -- .../APIServices/Sign/APIService.swift | 17 -- .../APIServices/Sign/ResponseString.swift | 21 --- .../APIServices/Sign/SignInService.swift | 85 --------- .../APIServices/Sign/SignUpService.swift | 9 - .../Resources/Storyboards/SignIn.storyboard | 40 ---- .../Storyboards/SignInStoryboard.storyboard | 60 ------ .../Storyboards/StartHome.storyboard | 33 ---- Mobo_iOS/Mobo_iOS/Sources/.DS_Store | Bin 6148 -> 6148 bytes .../Sources/ViewControllers/.DS_Store | Bin 6148 -> 0 bytes .../MovieTimeTableViewController.swift | 4 - .../Sign/SignInViewController.swift | 71 ------- .../Sign/SignUpViewController.swift | 30 --- .../SignInViewController.swift | 30 --- 20 files changed, 595 deletions(-) delete mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIConstants.swift delete mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/APIService.swift delete mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/ResponseString.swift delete mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignInService.swift delete mode 100644 Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignUpService.swift delete mode 100644 Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignIn.storyboard delete mode 100644 Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignInStoryboard.storyboard delete mode 100644 Mobo_iOS/Mobo_iOS/Resources/Storyboards/StartHome.storyboard delete mode 100644 Mobo_iOS/Mobo_iOS/Sources/ViewControllers/.DS_Store delete mode 100644 Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignInViewController.swift delete mode 100644 Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignUpViewController.swift delete mode 100644 Mobo_iOS/Mobo_iOS/Sources/ViewControllers/SignInViewController.swift diff --git a/.DS_Store b/.DS_Store index 2fa79c0b94d4beae2a52496d8b567cd6b315fe57..e62032cc8c4dd6824f38137cba643efa6dbb544c 100644 GIT binary patch delta 101 zcmZoMXfc=|#>B)qu~2NHo}wrd0|Nsi1A_nqLp(z!gFi!XQh9N~#=_-{lMO^zCQo5q zz+q-=q@!SLW<1%3Epf95hcL^;hC7?tIruq%hHMt(_|80;U&N6EXbi|4mdz0&YnTC~ CEf(bf delta 338 zcmZoMXfc=|#>B!ku~2NHo}wrR0|Nsi1A_pAXHI@{QcivnkT0-Vk$E|@DM*TiL60Gw zA(Np5SsJKA94M#p9}IvjBz2P&nEKg`jZJhEj7=tQV{)p8n@|>9l$VpAmkv}7w2*-d zW-`$9bcQ^Je1;;1R5V*!f$ETL;b8Cus!Iamc%UwShG10n4Az+HCkrvn+ z@^+>~T~3A|23H101{a`Vu0TiRGNhmxvl3y<#zI@h&Fmcf9Ka9*hRS#5$^0UY96Uju2VH3;>uFQWgLJ diff --git a/Mobo_iOS/.DS_Store b/Mobo_iOS/.DS_Store index 472f99f2e9a4acfcca97360b3ea75122b2bccef6..84f139a9c9206d57643b041d4c86aa09e84afd64 100644 GIT binary patch delta 172 zcmZoMXfc@JFUrZlz`)4BAi%&7&ydOB&k&qcURP+#vYIjjwF7Alp0ePgyqx^Jbf665WJfkDrZ4S4N@wy) qHeP;41)wMc3qt@yK0^va@#FxOeq@s!Md4D&rc5lnyP2KiFFybbu`68w delta 408 zcmZoMXfc@JFUrfnz`)4BAi%&7&ydOB&k*dHlb^g@24onL>Xj&}eOWao+p_X8tt*@C z%WBHb@Bt{xATl|SReZ7lo1g-!UPf_by~qkha?%Zhlk;;6K-w7?4t@d>FjM5vO|35r zF3QWv&r1g?0(zT)ogo0|w-kmnpyzWKQqk;e1*(Ai4#?&~Rn4FW)RWJU%#e+y?=zY{ b7O1{rPf64O0R`U-NbpT8?ApxE@s}R}f~0J< diff --git a/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj b/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj index d49bfe0..1527407 100644 --- a/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj +++ b/Mobo_iOS/Mobo_iOS.xcodeproj/project.pbxproj @@ -32,40 +32,16 @@ 398522DB23B064DD009C9AE3 /* Extensions+UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398522D623B064DD009C9AE3 /* Extensions+UIView.swift */; }; 398522DC23B064DD009C9AE3 /* Extension+CALayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398522D723B064DD009C9AE3 /* Extension+CALayer.swift */; }; 398522DD23B064DD009C9AE3 /* Extension+UITextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398522D823B064DD009C9AE3 /* Extension+UITextField.swift */; }; -<<<<<<< HEAD -<<<<<<< Updated upstream - EA740D8A23B06BEF00D9E9BC /* SignIn.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA740D8923B06BEF00D9E9BC /* SignIn.storyboard */; }; - EA740D8C23B06C4700D9E9BC /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA740D8B23B06C4700D9E9BC /* SignInViewController.swift */; }; -======= -======= ->>>>>>> master 39C84F4823B0A244000130B4 /* MovieTimeTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C84F4723B0A244000130B4 /* MovieTimeTableViewController.swift */; }; 39C84F4C23B0BD2E000130B4 /* loader.json in Resources */ = {isa = PBXBuildFile; fileRef = 39C84F4B23B0BD2E000130B4 /* loader.json */; }; 39C84F4E23B0C2A4000130B4 /* PopUpScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39C84F4D23B0C2A4000130B4 /* PopUpScreen.storyboard */; }; 39C84F5323B0C49A000130B4 /* PopupInventoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C84F5223B0C49A000130B4 /* PopupInventoryViewController.swift */; }; -<<<<<<< HEAD - 9FAE6A60C01378860FA901C8 /* Pods_Mobo_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02DE58E89F1AFEA60CB7A16B /* Pods_Mobo_iOS.framework */; }; - EAE23E6023B13241007615CD /* SignInStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EAE23E5F23B13241007615CD /* SignInStoryboard.storyboard */; }; - EAE23E6323B132A8007615CD /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6223B132A8007615CD /* SignInViewController.swift */; }; - EAE23E6523B132B4007615CD /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6423B132B4007615CD /* SignUpViewController.swift */; }; - EAE23E6823B13DE4007615CD /* APIService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6723B13DE4007615CD /* APIService.swift */; }; - EAE23E6A23B13E0B007615CD /* APIConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6923B13E0B007615CD /* APIConstants.swift */; }; - EAE23E6C23B13E9F007615CD /* ResponseString.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6B23B13E9F007615CD /* ResponseString.swift */; }; - EAE23E6E23B13EDA007615CD /* SignInService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6D23B13EDA007615CD /* SignInService.swift */; }; - EAE23E7023B13F28007615CD /* SignUpService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE23E6F23B13F28007615CD /* SignUpService.swift */; }; - EAE23E7223B14B96007615CD /* StartHome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EAE23E7123B14B96007615CD /* StartHome.storyboard */; }; -<<<<<<< Updated upstream ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes -======= 39CC509923B12B6400E24F95 /* RemoteConfigDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 39CC509823B12B6400E24F95 /* RemoteConfigDefaults.plist */; }; 39CC509B23B12C9700E24F95 /* ChattingScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39CC509A23B12C9700E24F95 /* ChattingScreen.storyboard */; }; 39CC509D23B1350A00E24F95 /* ChattingLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39CC509C23B1350A00E24F95 /* ChattingLoginViewController.swift */; }; 39CC509F23B1377700E24F95 /* ChattingSignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39CC509E23B1377700E24F95 /* ChattingSignUpViewController.swift */; }; 39CC50A123B14BE100E24F95 /* ChattingMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39CC50A023B14BE100E24F95 /* ChattingMainViewController.swift */; }; 9FAE6A60C01378860FA901C8 /* Pods_Mobo_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02DE58E89F1AFEA60CB7A16B /* Pods_Mobo_iOS.framework */; }; ->>>>>>> master /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -98,40 +74,16 @@ 398522D623B064DD009C9AE3 /* Extensions+UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Extensions+UIView.swift"; sourceTree = ""; }; 398522D723B064DD009C9AE3 /* Extension+CALayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Extension+CALayer.swift"; sourceTree = ""; }; 398522D823B064DD009C9AE3 /* Extension+UITextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Extension+UITextField.swift"; sourceTree = ""; }; -<<<<<<< HEAD -<<<<<<< Updated upstream - EA740D8923B06BEF00D9E9BC /* SignIn.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignIn.storyboard; sourceTree = ""; }; - EA740D8B23B06C4700D9E9BC /* SignInViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewController.swift; sourceTree = ""; }; -======= -======= ->>>>>>> master 39C84F4723B0A244000130B4 /* MovieTimeTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieTimeTableViewController.swift; sourceTree = ""; }; 39C84F4B23B0BD2E000130B4 /* loader.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = loader.json; sourceTree = ""; }; 39C84F4D23B0C2A4000130B4 /* PopUpScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = PopUpScreen.storyboard; sourceTree = ""; }; 39C84F5223B0C49A000130B4 /* PopupInventoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupInventoryViewController.swift; sourceTree = ""; }; -<<<<<<< HEAD - 47EA4ECB84A67FB1A51C107C /* Pods-Mobo_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mobo_iOS.release.xcconfig"; path = "Target Support Files/Pods-Mobo_iOS/Pods-Mobo_iOS.release.xcconfig"; sourceTree = ""; }; - EAE23E5F23B13241007615CD /* SignInStoryboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignInStoryboard.storyboard; sourceTree = ""; }; - EAE23E6223B132A8007615CD /* SignInViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewController.swift; sourceTree = ""; }; - EAE23E6423B132B4007615CD /* SignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewController.swift; sourceTree = ""; }; - EAE23E6723B13DE4007615CD /* APIService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIService.swift; sourceTree = ""; }; - EAE23E6923B13E0B007615CD /* APIConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIConstants.swift; sourceTree = ""; }; - EAE23E6B23B13E9F007615CD /* ResponseString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseString.swift; sourceTree = ""; }; - EAE23E6D23B13EDA007615CD /* SignInService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInService.swift; sourceTree = ""; }; - EAE23E6F23B13F28007615CD /* SignUpService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpService.swift; sourceTree = ""; }; - EAE23E7123B14B96007615CD /* StartHome.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = StartHome.storyboard; sourceTree = ""; }; -<<<<<<< Updated upstream ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes -======= 39CC509823B12B6400E24F95 /* RemoteConfigDefaults.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = RemoteConfigDefaults.plist; sourceTree = ""; }; 39CC509A23B12C9700E24F95 /* ChattingScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ChattingScreen.storyboard; sourceTree = ""; }; 39CC509C23B1350A00E24F95 /* ChattingLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChattingLoginViewController.swift; sourceTree = ""; }; 39CC509E23B1377700E24F95 /* ChattingSignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChattingSignUpViewController.swift; sourceTree = ""; }; 39CC50A023B14BE100E24F95 /* ChattingMainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChattingMainViewController.swift; sourceTree = ""; }; 47EA4ECB84A67FB1A51C107C /* Pods-Mobo_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mobo_iOS.release.xcconfig"; path = "Target Support Files/Pods-Mobo_iOS/Pods-Mobo_iOS.release.xcconfig"; sourceTree = ""; }; ->>>>>>> master /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -260,18 +212,7 @@ 398522D123B06467009C9AE3 /* APIServices */ = { isa = PBXGroup; children = ( -<<<<<<< HEAD -<<<<<<< Updated upstream -<<<<<<< Updated upstream -======= -======= ->>>>>>> Stashed changes - EAE23E6623B13D75007615CD /* Sign */, - 390BD68523B08AEF00FF7E68 /* Model */, ->>>>>>> Stashed changes -======= 390BD68523B08AEF00FF7E68 /* Model */, ->>>>>>> master 398522C323B05F8F009C9AE3 /* Assets.xcassets */, ); path = APIServices; @@ -282,25 +223,10 @@ children = ( 398522BD23B05F8D009C9AE3 /* Main.storyboard */, 398522C523B05F8F009C9AE3 /* LaunchScreen.storyboard */, -<<<<<<< HEAD -<<<<<<< Updated upstream - EA740D8923B06BEF00D9E9BC /* SignIn.storyboard */, -======= - 390BD67B23B06AEB00FF7E68 /* MovieTabScreen.storyboard */, - 39C84F4D23B0C2A4000130B4 /* PopUpScreen.storyboard */, - 391CEEBE23B0DD9C00E4C71D /* FriendScreen.storyboard */, - EAE23E5F23B13241007615CD /* SignInStoryboard.storyboard */, - EAE23E7123B14B96007615CD /* StartHome.storyboard */, -<<<<<<< Updated upstream ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes -======= 390BD67B23B06AEB00FF7E68 /* MovieTabScreen.storyboard */, 39C84F4D23B0C2A4000130B4 /* PopUpScreen.storyboard */, 391CEEBE23B0DD9C00E4C71D /* FriendScreen.storyboard */, 39CC509A23B12C9700E24F95 /* ChattingScreen.storyboard */, ->>>>>>> master ); path = Storyboards; sourceTree = ""; @@ -308,26 +234,16 @@ 398522D323B06482009C9AE3 /* ViewControllers */ = { isa = PBXGroup; children = ( - EAE23E6123B1327F007615CD /* Sign */, 398522BB23B05F8D009C9AE3 /* ViewController.swift */, -<<<<<<< HEAD - EA740D8B23B06C4700D9E9BC /* SignInViewController.swift */, -======= 3962D19723B12935004B11AB /* ChattingView */, 391CEEBB23B0DD5000E4C71D /* FindFriend */, 39C84F5123B0C43F000130B4 /* MovieCollection */, 39C84F5023B0C422000130B4 /* MovieTimeTable */, 39C84F4F23B0C415000130B4 /* PopUp */, ->>>>>>> master ); path = ViewControllers; sourceTree = ""; }; -<<<<<<< HEAD -<<<<<<< Updated upstream -======= -======= ->>>>>>> master 39C84F4F23B0C415000130B4 /* PopUp */ = { isa = PBXGroup; children = ( @@ -362,30 +278,6 @@ name = Frameworks; sourceTree = ""; }; -<<<<<<< HEAD - EAE23E6123B1327F007615CD /* Sign */ = { - isa = PBXGroup; - children = ( - EAE23E6223B132A8007615CD /* SignInViewController.swift */, - EAE23E6423B132B4007615CD /* SignUpViewController.swift */, - ); - path = Sign; - sourceTree = ""; - }; - EAE23E6623B13D75007615CD /* Sign */ = { - isa = PBXGroup; - children = ( - EAE23E6723B13DE4007615CD /* APIService.swift */, - EAE23E6923B13E0B007615CD /* APIConstants.swift */, - EAE23E6B23B13E9F007615CD /* ResponseString.swift */, - EAE23E6D23B13EDA007615CD /* SignInService.swift */, - EAE23E6F23B13F28007615CD /* SignUpService.swift */, - ); - path = Sign; - sourceTree = ""; - }; -======= ->>>>>>> master F52E4EFEF420A286635EEC3C /* Pods */ = { isa = PBXGroup; children = ( @@ -395,10 +287,6 @@ path = Pods; sourceTree = ""; }; -<<<<<<< HEAD ->>>>>>> Stashed changes -======= ->>>>>>> master /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -459,24 +347,11 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( -<<<<<<< HEAD -<<<<<<< Updated upstream - EA740D8A23B06BEF00D9E9BC /* SignIn.storyboard in Resources */, -======= - 391CEEBF23B0DD9C00E4C71D /* FriendScreen.storyboard in Resources */, - EAE23E7223B14B96007615CD /* StartHome.storyboard in Resources */, -<<<<<<< Updated upstream ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes -======= 391CEEBF23B0DD9C00E4C71D /* FriendScreen.storyboard in Resources */, 3962D19623B1254D004B11AB /* GoogleService-Info.plist in Resources */, 39CC509B23B12C9700E24F95 /* ChattingScreen.storyboard in Resources */, ->>>>>>> master 398522C723B05F8F009C9AE3 /* LaunchScreen.storyboard in Resources */, 398522C423B05F8F009C9AE3 /* Assets.xcassets in Resources */, - EAE23E6023B13241007615CD /* SignInStoryboard.storyboard in Resources */, 398522BF23B05F8D009C9AE3 /* Main.storyboard in Resources */, 390BD67C23B06AEB00FF7E68 /* MovieTabScreen.storyboard in Resources */, 39CC509923B12B6400E24F95 /* RemoteConfigDefaults.plist in Resources */, @@ -534,39 +409,15 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( -<<<<<<< HEAD -<<<<<<< Updated upstream -<<<<<<< Updated upstream -======= -======= ->>>>>>> Stashed changes - EAE23E6523B132B4007615CD /* SignUpViewController.swift in Sources */, - 390BD68723B08AF800FF7E68 /* Movie.swift in Sources */, - 390BD68D23B09D2B00FF7E68 /* Extensions+UIColor.swift in Sources */, - 390BD68B23B08B9300FF7E68 /* DataManager.swift in Sources */, ->>>>>>> Stashed changes -======= 390BD68723B08AF800FF7E68 /* Movie.swift in Sources */, 390BD68D23B09D2B00FF7E68 /* Extensions+UIColor.swift in Sources */, 390BD68B23B08B9300FF7E68 /* DataManager.swift in Sources */, 39CC509F23B1377700E24F95 /* ChattingSignUpViewController.swift in Sources */, ->>>>>>> master 398522DB23B064DD009C9AE3 /* Extensions+UIView.swift in Sources */, 390BD68423B08A4700FF7E68 /* MovieCollectionViewCell.swift in Sources */, 391CEEBD23B0DD6700E4C71D /* FindFriendViewController.swift in Sources */, 398522DD23B064DD009C9AE3 /* Extension+UITextField.swift in Sources */, -<<<<<<< HEAD -<<<<<<< Updated upstream -======= - 390BD67A23B06ACB00FF7E68 /* MovieTabViewController.swift in Sources */, - EAE23E6E23B13EDA007615CD /* SignInService.swift in Sources */, -<<<<<<< Updated upstream ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes -======= 390BD67A23B06ACB00FF7E68 /* MovieTabViewController.swift in Sources */, ->>>>>>> master 398522D923B064DD009C9AE3 /* Extension+Font.swift in Sources */, 39CC50A123B14BE100E24F95 /* ChattingMainViewController.swift in Sources */, 390BD67E23B06B3300FF7E68 /* MovieTabOneViewController.swift in Sources */, @@ -575,40 +426,13 @@ 39CC509D23B1350A00E24F95 /* ChattingLoginViewController.swift in Sources */, 398522DC23B064DD009C9AE3 /* Extension+CALayer.swift in Sources */, 398522DA23B064DD009C9AE3 /* Extension+GIF.swift in Sources */, - EAE23E7023B13F28007615CD /* SignUpService.swift in Sources */, - EAE23E6323B132A8007615CD /* SignInViewController.swift in Sources */, 398522BC23B05F8D009C9AE3 /* ViewController.swift in Sources */, -<<<<<<< HEAD -<<<<<<< Updated upstream -======= - 39C84F5323B0C49A000130B4 /* PopupInventoryViewController.swift in Sources */, - EAE23E6823B13DE4007615CD /* APIService.swift in Sources */, - 390BD68923B08B1500FF7E68 /* ServerURLs.swift in Sources */, - EAE23E6A23B13E0B007615CD /* APIConstants.swift in Sources */, -<<<<<<< Updated upstream ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes -======= 3962D19923B12947004B11AB /* ChattingViewController.swift in Sources */, 39C84F5323B0C49A000130B4 /* PopupInventoryViewController.swift in Sources */, 390BD68923B08B1500FF7E68 /* ServerURLs.swift in Sources */, ->>>>>>> master 398522B823B05F8D009C9AE3 /* AppDelegate.swift in Sources */, - EA740D8C23B06C4700D9E9BC /* SignInViewController.swift in Sources */, 398522BA23B05F8D009C9AE3 /* SceneDelegate.swift in Sources */, -<<<<<<< HEAD -<<<<<<< Updated upstream -<<<<<<< Updated upstream -======= -======= ->>>>>>> Stashed changes - EAE23E6C23B13E9F007615CD /* ResponseString.swift in Sources */, - 39C84F4823B0A244000130B4 /* MovieTimeTableViewController.swift in Sources */, ->>>>>>> Stashed changes -======= 39C84F4823B0A244000130B4 /* MovieTimeTableViewController.swift in Sources */, ->>>>>>> master ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Mobo_iOS/Mobo_iOS/.DS_Store b/Mobo_iOS/Mobo_iOS/.DS_Store index 20268ac7b1af55f32f77fda66a7bd11b3a6490fa..00ff1a8764d02925664408979c5f8d5060865065 100644 GIT binary patch delta 131 zcmZp1XmOa}FUrNhz`)4BAi%(o$570W$&e4CHx^D~pV+{=nVo}$gOO`;zM#b9SpxkW zCZ?u33MQtOlMMw^H;V`fGfs{a?&mNvump-47z0HeCyNLRPu?ra&&t-oc!dZoctu9YM@~Z)6qh)8cNv}4-LF7b_JvbR767Fla10E_vC761SM diff --git a/Mobo_iOS/Mobo_iOS/Resources/.DS_Store b/Mobo_iOS/Mobo_iOS/Resources/.DS_Store index 976f0b775574a129fac2fbc48af509ab278ed1e5..ef5ec071aedf239df5903d24ac38a534dad29963 100644 GIT binary patch delta 210 zcmZoMXffE3&f@kpsURn_xWvHV1|t(Q3o9Et2PYRdCpRBAXKZjretB?7Vo7PSQ({rP zfJ|^^N@`MKQFvxbNk&L&o@-8OS!$ktkxybt>f{+Lp6Ssb4FQQI89+rG$_@z(V8F@2 z880AFU2SAwsiR-EH>xGNvw<>Qk2+??Ee+?=t&8TsYGC5a`a#ZHMu@d7fznJKABiACX= zDJ2;psd=tBsb#5o{zX2CC8?8lF?rTUgERyrmSg}GaVR?^08Ix1P7cm^0g38rBLhnv z1rr0~S{;RIb8`bA+t{qOmXm`+Qr#^muC%Fd*6bxqmn}bZ7^004=npUugwinT2#|r~ dm9pTXyqx^JbOwganauN8CN`LDX6N|J4*>0HMg#x= delta 317 zcmZoMXfc@JFUrEez`)4BAi%&-!cfeh$56qL%#gU*k$E{|JxGe5!4W82%#eyKjS%t7 z$xlwo$xi~R1e(BL4a6G%!2rl&U|?YgX2@hnXUIcSw-T4Sr1IhdsCg$1k_vJ%i%Sd) zt}`+*v#_$Ub8v8RaPe}*2501#2bUz4lomTB7Da=20f{9UNr{uQnLJ}SI5;^t;{_zD zt4$5ebrg(EjB0fhs?E&}bQDaC&1!2oImA^BZ9NlmE32w&YU^f#-O0cR3<5CVhte== U7LWn=#b! { - case success(T) - case requestErr(T) - case pathErr - case serverErr - case networkFail -} diff --git a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/ResponseString.swift b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/ResponseString.swift deleted file mode 100644 index 46de0be..0000000 --- a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/ResponseString.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// ResponseString.swift -// Mobo_iOS -// -// Created by 천유정 on 24/12/2019. -// Copyright © 2019 조경진. All rights reserved. -// - -import Foundation - -// MARK: - ResponseString // 성공했을 때 response body -struct ResponseString: Codable { - let success: Bool - let message: String - let data: DataClass? -} -// MARK: - DataClass -struct DataClass: Codable { - let userIdx: Int - let id, password : String -} diff --git a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignInService.swift b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignInService.swift deleted file mode 100644 index ef80fd6..0000000 --- a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignInService.swift +++ /dev/null @@ -1,85 +0,0 @@ -// -// SignInService.swift -// Mobo_iOS -// -// Created by 천유정 on 24/12/2019. -// Copyright © 2019 조경진. All rights reserved. -// - -import Foundation -import Alamofire - -class SignInService { - - static let shared = SignInService() - - func SignIn(_ userid: String, _ userpwd: String, completion: @escaping (NetworkResult) -> Void) { - - let header: HTTPHeaders = [ - "Content-Type" : "application/json" - ] - - let body: Parameters = [ - "id": userid, - "pwd": userpwd - ] - - Alamofire.request(APIConstants.LoginURL, method: .post, parameters: body, encoding: JSONEncoding.default, headers: header) - .responseData { response in - - // print("request", response.request) - // print("response", response.response) - // print("data", response.data) - // print("result", response.result) - - // parameter 위치 - switch response.result { - - // 통신 성공 - 네트워크 연결 - case .success: - if let value = response.result.value { - - if let status = response.response?.statusCode { - - switch status { - case 200: - do { - let decoder = JSONDecoder() - print("value", value) - let result = try decoder.decode(ResponseString.self, from: value) - - // ResponseString에 있는 success로 분기 처리 - switch result.success { - - case true: - print("success") - completion(.success(result.data as Any)) - case false: - completion(.requestErr(result.message)) - } - } - catch { - completion(.pathErr) - print(error.localizedDescription) - print(APIConstants.LoginURL) - } - case 400: - completion(.pathErr) - case 500: - completion(.serverErr) - default: - break - }// switch - }// iflet - } - break - // 통신 실패 - 네트워크 연결 - case .failure(let err): - print(err.localizedDescription) - completion(.networkFail) - // .networkFail이라는 반환 값이 넘어감 - break - } // response.result switch - } // alamofire.request - } // func login - } // struct diff --git a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignUpService.swift b/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignUpService.swift deleted file mode 100644 index 6422e28..0000000 --- a/Mobo_iOS/Mobo_iOS/Resources/APIServices/Sign/SignUpService.swift +++ /dev/null @@ -1,9 +0,0 @@ -// -// SignUpService.swift -// Mobo_iOS -// -// Created by 천유정 on 24/12/2019. -// Copyright © 2019 조경진. All rights reserved. -// - -import Foundation diff --git a/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignIn.storyboard b/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignIn.storyboard deleted file mode 100644 index 29f4b5b..0000000 --- a/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignIn.storyboard +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignInStoryboard.storyboard b/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignInStoryboard.storyboard deleted file mode 100644 index c5ff466..0000000 --- a/Mobo_iOS/Mobo_iOS/Resources/Storyboards/SignInStoryboard.storyboard +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Mobo_iOS/Mobo_iOS/Resources/Storyboards/StartHome.storyboard b/Mobo_iOS/Mobo_iOS/Resources/Storyboards/StartHome.storyboard deleted file mode 100644 index b2ff961..0000000 --- a/Mobo_iOS/Mobo_iOS/Resources/Storyboards/StartHome.storyboard +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Mobo_iOS/Mobo_iOS/Sources/.DS_Store b/Mobo_iOS/Mobo_iOS/Sources/.DS_Store index 8b0d1b43c059052bfd2790d9c7bef54263598724..96750bd930db399f419085fdfb6a5fc86b45f7cb 100644 GIT binary patch delta 99 zcmZoMXfc@JFUrKgz`)4BAi$7RUR;orlb;0SpWIx?yqs~efd~sH3qu$~CPOMi`Q#j? sehzap6CDL(Bg4te%#NaPsj}dryqx^JbdX6vozqw*Hsow(=lIJH0Fnb3^#A|> delta 190 zcmZoMXfc@JFUrioz`)4BAi%)j%#hEJ$56sh#E`#Pka;;{B1np#A&eoDA(f#VS(+gS z2vdOyi#>Dllaq4tlYlCLCNNk7vBrNe0I~?`o-D!C&tYm{uA^XVVl;U@lcPKV>o)&n MTEeoKo#QV*04I7YoB#j- diff --git a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/.DS_Store b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/.DS_Store deleted file mode 100644 index 78bd6462a6dbf2e389967f8fcccf4b12cd1b9fef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK-D(p-6h70gI*F*cD71LBH-Z;IQd^q~5tg)GsAG%rrEqKhO)2FbB?jXXgAY^D#d=L?n8n!8%ckh$NKJYohsuu%Gpc zEZGru3SA?iT}tVg7@ar<90UJ51H5KpcbUj(+@g{;o!}fn_b&*dKIOEhS7AllSdlrEGz4b64q-i_f-3mm zQ#nhfSe+wt<(hRq&DBA7fyFLyd3%B9=%(fva130J0X`pmC}Uu;HmHvdH2Mhu^f0Ui zHvcAYj&CurSQ~@~B1|gKqze1Q5GEbtzKshk)&@;F3H$gE_RGS)P=x+E>iasJL}1Xh zjseHOECb7?+v5BG`S0KVvq`S!7;p?M6a&KB33qy!lD%86OpfnbA9?^~;keqMPC;X@ hV{PzNyav?*pU(y`uvi>>>>>> master self.navigationController?.navigationBar.barTintColor = UIColor.init(red: 255/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1.0) self.navigationController?.navigationBar.backIndicatorImage = #imageLiteral(resourceName: "iconsDarkBack") self.navigationController?.navigationBar.backIndicatorTransitionMaskImage = #imageLiteral(resourceName: "iconsDarkBack") diff --git a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignInViewController.swift b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignInViewController.swift deleted file mode 100644 index 1b4eef7..0000000 --- a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignInViewController.swift +++ /dev/null @@ -1,71 +0,0 @@ -// -// SignInViewController.swift -// Mobo_iOS -// -// Created by 천유정 on 24/12/2019. -// Copyright © 2019 조경진. All rights reserved. -// - -import UIKit - -class SignInViewController: UIViewController { - - @IBOutlet weak var SignInUserId: UITextField! - @IBOutlet weak var SignInUserPwd: UITextField! - - @IBAction func SignUpButton(_ sender: Any) { - guard let main = self.storyboard?.instantiateViewController(withIdentifier: "StartHome") else {return} - } - override func viewDidLoad() { - super.viewDidLoad() - - - } - - @IBAction func SignInButton(_ sender: Any) { - guard let userid = SignInUserId.text else {return} - guard let userpwd = SignInUserPwd.text else {return} - - SignInService.shared.login(userid, userpwd) { - data in - - switch data { - - case .success(let data): - - // DataClass 에서 받은 유저 정보 반환 - let user_data = data as! DataClass - - // 사용자의 토큰, 이름, 이메일, 전화번호 받아오기 - // 비밀번호는 안 받아와도 됨 - UserDefaults.standard.set(user_data.userIdx, forKey: "token") - UserDefaults.standard.set(user_data.name, forKey: "name") - - - guard let main = self.storyboard?.instantiateViewController(withIdentifier: "StartHome") else {return} - - self.present(main, animated: true) - - case .requestErr(let message): - self.simpleAlert(title: "로그인 실패", message: "\(message)", type: 0) - - case .pathErr: - print(".pathErr") - - case .serverErr: - print(".serverErr") - - case .networkFail: - self.simpleAlert(title: "로그인 실패", message: "네트워크 상태를 확인해주세요.", type: 0) - } - - } - } - - - - - override func touchesBegan(_ touches: Set, with event: UIEvent?){ - self.view.endEditing(true) - } -} diff --git a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignUpViewController.swift b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignUpViewController.swift deleted file mode 100644 index 080f39f..0000000 --- a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/Sign/SignUpViewController.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// SignUpViewController.swift -// Mobo_iOS -// -// Created by 천유정 on 24/12/2019. -// Copyright © 2019 조경진. All rights reserved. -// - -import UIKit - -class SignUpViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - -} diff --git a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/SignInViewController.swift b/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/SignInViewController.swift deleted file mode 100644 index ef6a62e..0000000 --- a/Mobo_iOS/Mobo_iOS/Sources/ViewControllers/SignInViewController.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// SignInViewController.swift -// Mobo_iOS -// -// Created by 천유정 on 23/12/2019. -// Copyright © 2019 조경진. All rights reserved. -// - -import UIKit - -class SignInViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - -}