diff --git a/HelloThere_iOS/.DS_Store b/HelloThere_iOS/.DS_Store new file mode 100644 index 0000000..a9c8ff4 Binary files /dev/null and b/HelloThere_iOS/.DS_Store differ diff --git a/HelloThere_iOS/HelloThere_iOS.xcodeproj/project.pbxproj b/HelloThere_iOS/HelloThere_iOS.xcodeproj/project.pbxproj index 450f511..97e97b1 100644 --- a/HelloThere_iOS/HelloThere_iOS.xcodeproj/project.pbxproj +++ b/HelloThere_iOS/HelloThere_iOS.xcodeproj/project.pbxproj @@ -53,7 +53,7 @@ 4200395E2A81E02A00461FDA /* AddressVerification.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = AddressVerification.storyboard; sourceTree = ""; }; 420039602A81E03800461FDA /* AddressVerificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressVerificationViewController.swift; sourceTree = ""; }; 4248C7272A861006003234CA /* Manager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Manager.swift; sourceTree = ""; }; - 4248C7292A8615E0003234CA /* SetAlarm.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SetAlarm.storyboard; path = ../../../../../../.Trash/SetAlarm.storyboard; sourceTree = ""; }; + 4248C7292A8615E0003234CA /* SetAlarm.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SetAlarm.storyboard; sourceTree = ""; }; 42ADD80D2A80D9BB00925FE1 /* SignIn.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignIn.storyboard; sourceTree = ""; }; 42ADD80F2A80D9D900925FE1 /* SignInViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewController.swift; sourceTree = ""; }; 42ADD8122A80DDE500925FE1 /* SignUp.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SignUp.storyboard; sourceTree = ""; }; diff --git a/HelloThere_iOS/HelloThere_iOS.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist b/HelloThere_iOS/HelloThere_iOS.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist index b01c353..9aef784 100644 --- a/HelloThere_iOS/HelloThere_iOS.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/HelloThere_iOS/HelloThere_iOS.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ HelloThere_iOS.xcscheme_^#shared#^_ orderHint - 1 + 0 diff --git a/HelloThere_iOS/HelloThere_iOS.xcworkspace/xcuserdata/ujusuperstar.xcuserdatad/UserInterfaceState.xcuserstate b/HelloThere_iOS/HelloThere_iOS.xcworkspace/xcuserdata/ujusuperstar.xcuserdatad/UserInterfaceState.xcuserstate index e66b732..34caee3 100644 Binary files a/HelloThere_iOS/HelloThere_iOS.xcworkspace/xcuserdata/ujusuperstar.xcuserdatad/UserInterfaceState.xcuserstate and b/HelloThere_iOS/HelloThere_iOS.xcworkspace/xcuserdata/ujusuperstar.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/HelloThere_iOS/HelloThere_iOS/.DS_Store b/HelloThere_iOS/HelloThere_iOS/.DS_Store new file mode 100644 index 0000000..8275f8c Binary files /dev/null and b/HelloThere_iOS/HelloThere_iOS/.DS_Store differ diff --git a/HelloThere_iOS/HelloThere_iOS/MyDetailPages/.DS_Store b/HelloThere_iOS/HelloThere_iOS/MyDetailPages/.DS_Store new file mode 100644 index 0000000..e7b3317 Binary files /dev/null and b/HelloThere_iOS/HelloThere_iOS/MyDetailPages/.DS_Store differ diff --git a/HelloThere_iOS/HelloThere_iOS/MyDetailPages/pushAlarm/SetAlarm.storyboard b/HelloThere_iOS/HelloThere_iOS/MyDetailPages/pushAlarm/SetAlarm.storyboard new file mode 100644 index 0000000..4fb8d10 --- /dev/null +++ b/HelloThere_iOS/HelloThere_iOS/MyDetailPages/pushAlarm/SetAlarm.storyboard @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HelloThere_iOS/HelloThere_iOS/SignInPages/SignInPage/SignInViewController.swift b/HelloThere_iOS/HelloThere_iOS/SignInPages/SignInPage/SignInViewController.swift index 91009f5..5b1aa13 100644 --- a/HelloThere_iOS/HelloThere_iOS/SignInPages/SignInPage/SignInViewController.swift +++ b/HelloThere_iOS/HelloThere_iOS/SignInPages/SignInPage/SignInViewController.swift @@ -60,7 +60,7 @@ class SignInViewController: UIViewController { "password" : password ] - let url = "http://3.37.126.149:8080/users/log-in" + let url = "https://hello-there.shop/users/log-in" AF.request(url, method: .post, parameters: body, encoding: JSONEncoding.default).responseJSON { response in @@ -83,7 +83,7 @@ class SignInViewController: UIViewController { print(">>") print(json.result?.accessToken) defaults.set(json.result?.accessToken, forKey: "accessToken") - self.signInErrorMessageLabel.text = "성공✅" +// self.signInErrorMessageLabel.text = "성공✅" let nextStoryBoard = UIStoryboard(name: "Main", bundle: nil) let nextViewController = nextStoryBoard.instantiateViewController(identifier: "Main") diff --git a/HelloThere_iOS/HelloThere_iOS/SignInPages/SignUpPage/SignUpViewController.swift b/HelloThere_iOS/HelloThere_iOS/SignInPages/SignUpPage/SignUpViewController.swift index 2ee4c25..ae908ae 100644 --- a/HelloThere_iOS/HelloThere_iOS/SignInPages/SignUpPage/SignUpViewController.swift +++ b/HelloThere_iOS/HelloThere_iOS/SignInPages/SignUpPage/SignUpViewController.swift @@ -57,7 +57,7 @@ class SignUpViewController: UIViewController { let emailTest = NSPredicate(format: "SELF MATCHES %@", emailRegEx) let emailCheck = emailTest.evaluate(with: email) - let urlEmail = "http://3.37.126.149:8080/users/check-email?email=\(email)" + let urlEmail = "https://hello-there.shop/users/check-email?email=\(email)" if emailCheck { AF.request(urlEmail, method: .get).validate().responseJSON { response in @@ -72,8 +72,8 @@ class SignUpViewController: UIViewController { self.emailErrorMessage.textColor = UIColor(red: 43/255, green: 203/255, blue: 165/255, alpha: 1) }else { // print("사용불가능한 이메일") -// self.emailErrorMessage.text = "사용불가능한 이메일입니다" - self.emailErrorMessage.text = json["message"] as! String + self.emailErrorMessage.text = "사용불가능한 이메일입니다" +// self.emailErrorMessage.text = json["message"] as! String self.emailErrorMessage.textColor = UIColor.red } case .failure(let error): @@ -139,7 +139,7 @@ class SignUpViewController: UIViewController { } func isNicknameValidate(nickname: String) { - let urlNickname = "http://3.37.126.149:8080/users/check-nickname?nickName=\(nickname)" + let urlNickname = "https://hello-there.shop/users/check-nickname?nickName=\(nickname)" let encodedStr = urlNickname.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)! // 닉네임이 한국어로 들어가는 경우 let url = URL(string: encodedStr)! @@ -172,7 +172,7 @@ class SignUpViewController: UIViewController { } func isSignUpValidate(nickName:String, email:String, password:String, passwordChk:String){ - let url = "http://3.37.126.149:8080/users" + let url = "https://hello-there.shop/users" struct SignUpResult: Codable { let isSuccess: Bool let code: Int diff --git a/HelloThere_iOS/Pods/Pods.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist b/HelloThere_iOS/Pods/Pods.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist index 58209ba..05f4176 100644 --- a/HelloThere_iOS/Pods/Pods.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/HelloThere_iOS/Pods/Pods.xcodeproj/xcuserdata/ujusuperstar.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,27 +7,27 @@ Alamofire.xcscheme_^#shared#^_ orderHint - 0 + 5 NMapsGeometry.xcscheme_^#shared#^_ orderHint - 2 + 4 NMapsMap.xcscheme_^#shared#^_ orderHint - 3 + 2 Pods-HelloThere_iOS.xcscheme_^#shared#^_ orderHint - 4 + 3 SwiftyJSON.xcscheme_^#shared#^_ orderHint - 5 + 1