From 9a683b15aa3199baaf85e346d40a0a1ce54ed9e1 Mon Sep 17 00:00:00 2001 From: seu11ee Date: Thu, 19 Nov 2020 12:37:11 +0900 Subject: [PATCH 01/11] [fix] remove reqErr toasst --- .../Contents.json | 23 ++++++++++++ .../searchResultThemeBtnBack.png | Bin 0 -> 315 bytes .../searchResultThemeBtnBack@2x.png | Bin 0 -> 450 bytes .../searchResultThemeBtnBack@3x.png | Bin 0 -> 691 bytes .../Storyboard/SearchTabMain.storyboard | 6 ++-- .../Storyboard/SearchTabResult.storyboard | 34 +++++++++--------- .../Source/VCs/SearchResultCuratorVC.swift | 3 +- .../Source/VCs/SearchResultSentenceVC.swift | 1 - .../Source/VCs/SearchResultThemeVC.swift | 1 - 9 files changed, 44 insertions(+), 24 deletions(-) create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/Contents.json create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/searchResultThemeBtnBack.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/searchResultThemeBtnBack@2x.png create mode 100644 Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/searchResultThemeBtnBack@3x.png diff --git a/Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/Contents.json b/Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/Contents.json new file mode 100644 index 0000000..09a03f4 --- /dev/null +++ b/Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "searchResultThemeBtnBack.png" + }, + { + "scale" : "2x", + "idiom" : "universal", + "filename" : "searchResultThemeBtnBack@2x.png" + }, + { + "idiom" : "universal", + "scale" : "3x", + "filename" : "searchResultThemeBtnBack@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/searchResultThemeBtnBack.png b/Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/searchResultThemeBtnBack.png new file mode 100644 index 0000000000000000000000000000000000000000..9289405b52756e1dbbf101969361e4cd0678f7c8 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^+(0bM!3HGVG{0W}QjEnx?oJHr&dIz4ax79KJkxxA z8MJ_G4hF{dOa>N^5+IfWVg?4L1x#=e?gh+nwlGNY)3YV@Kx(6>i(`m}Xz!(7-ev^> z)`Y&24Q2)o<{RcNSY6U=#G#Vc_MKxw)gRAAD{A~7%X;a$aXfswx4!9a+O&z?hIuz9 z$R#?&c~9uLSI{z9Mo21I#;4hR!$ISUL)sA^MLE_;)>W>nkF8_tE?Q7B|4+euM~T?1 z6W7cCoziFD9jqlAb!x8Gg~;q+;gm(!etIoP+LJ13@i273!Oafk*B7?bhaReP(+?3( mc4P_CZ`;ALV+p^^4toYCi!8wxW_IErPk6fexvXZ= literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/searchResultThemeBtnBack@2x.png b/Mongle/Mongle/Resource/Assets.xcassets/searchResultThemeBtnBack.imageset/searchResultThemeBtnBack@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..18041f0cefd8a035260a5bdb9efec59740a92bc2 GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^qCl+1!3HF?e_oghq!^2X+?^QKos)S9UX}qU~1JgYTnP1F*QwxJj zcCua4`oAKMF-0l$(@yq2+`y_nn&+f=Dl<{ul=F*+fM&N z?px0_|82>T-nX)k`^mKDKT8YqzZdaj`d7Go{2KRx=WEma0R9S5-`2$$TzfjB9>!i_ z>JHG=aWmb(HTBS|#VY5#Hws8?x>;t|dvMO#S5uR?4U|4GpFi_LWZ6&sRk^qS)pVu5 adn_MPZN@osLfcPJSbDnpxvXN^5+IfWVg?4L1x#=eg$2xTwk1gN(Y~!#KqZ=b)w`DoDJ1dH9yT_-?fPQ^rmyu*GS+0p06n$s?e8QZ6kM|d5wSL zlJ>8!6*%-xO86>p`z^ST*6WtM`)1C$H~)A3yMHm`3qz!E`MH2?%Pzm`DO)oJG|%k3I>4?KMP ze__ETZSEBZrm}`S^kTAl(8^kJkel;Gi#PX+HgC>^1FftZ9yl@0_z=UGV-bFU#U}WG zh)w7Ll^W**CN_!zY&EI@Vl|2ZYI8U&-j@C5`z362GGpabAGbAMj8<}B+4s2I zYOagq(a!1rwAbtWXZW$bB&?IW33^&M|CfS6uoUA-?v*vDZtLIc`MrCp}|6|GDqsX6>|VQ`)o{CoSdaY;lkjl4e?_ z8pP`3mBKY+(gUs;6HbU8m?j`}V2Xg)fk_jD4osLJc0o7L!(q8gB4ex&(32`tSVL5| zaIEmi5Z2I|7%n<_&!M%~U)MTTiXULz^JyJ_>pM~3RbM$TEMb}|`mU1kv&yDbxpzJ@ zeNvewwB(lG*!GXbYr}3YFHW|VNogr)xN6EK!upp{Sp7^V T-}}@Bpv2?p>gTe~DWM4fWQi7F literal 0 HcmV?d00001 diff --git a/Mongle/Mongle/Resource/Storyboard/SearchTabMain.storyboard b/Mongle/Mongle/Resource/Storyboard/SearchTabMain.storyboard index 252a8cd..83c4e54 100644 --- a/Mongle/Mongle/Resource/Storyboard/SearchTabMain.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/SearchTabMain.storyboard @@ -1,9 +1,9 @@ - + - + @@ -55,7 +55,7 @@ - @@ -252,6 +240,18 @@ + @@ -304,10 +304,10 @@ - + - + - @@ -107,7 +106,7 @@ - + diff --git a/Mongle/Mongle/Resource/Storyboard/CuratorTabMain.storyboard b/Mongle/Mongle/Resource/Storyboard/CuratorTabMain.storyboard index 30463ba..5e3768a 100644 --- a/Mongle/Mongle/Resource/Storyboard/CuratorTabMain.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/CuratorTabMain.storyboard @@ -1,9 +1,9 @@ - + - + @@ -251,7 +251,7 @@ - + @@ -259,19 +259,19 @@ - @@ -315,7 +314,7 @@ - + diff --git a/Mongle/Mongle/Resource/Storyboard/MySetting/MySetting.storyboard b/Mongle/Mongle/Resource/Storyboard/MySetting/MySetting.storyboard index a37422a..7348851 100644 --- a/Mongle/Mongle/Resource/Storyboard/MySetting/MySetting.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/MySetting/MySetting.storyboard @@ -1,9 +1,9 @@ - + - + @@ -55,6 +55,7 @@ + diff --git a/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard b/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard index 1c95908..df5f69b 100644 --- a/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard @@ -152,7 +152,7 @@ - + @@ -485,8 +487,7 @@ - - + @@ -542,6 +543,7 @@ + diff --git a/Mongle/Mongle/Resource/Storyboard/SearchTabMain.storyboard b/Mongle/Mongle/Resource/Storyboard/SearchTabMain.storyboard index 83c4e54..73fd63b 100644 --- a/Mongle/Mongle/Resource/Storyboard/SearchTabMain.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/SearchTabMain.storyboard @@ -24,13 +24,13 @@ - + - + @@ -38,13 +38,13 @@ - + @@ -112,13 +112,13 @@ - + @@ -131,7 +131,7 @@ - + @@ -162,7 +162,7 @@ + + + + + + + + - + @@ -302,12 +303,13 @@ + - + - + - - - @@ -262,6 +253,7 @@ + @@ -269,6 +261,8 @@ + + diff --git a/Mongle/Mongle/Source/VCs/SearchTabResultVC.swift b/Mongle/Mongle/Source/VCs/SearchTabResultVC.swift index 1a74d22..f124ee1 100644 --- a/Mongle/Mongle/Source/VCs/SearchTabResultVC.swift +++ b/Mongle/Mongle/Source/VCs/SearchTabResultVC.swift @@ -157,7 +157,7 @@ extension SearchTabResultVC: UICollectionViewDelegateFlowLayout { func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { - return CGSize(width: collectionView.frame.width / CGFloat(menuItem.count), height: collectionView.bounds.height) + return CGSize(width: UIScreen.main.bounds.width/CGFloat(menuItem.count), height: collectionView.bounds.height) } func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { From 7a0a593d35e4c5461d3f536b96638ee70db46c63 Mon Sep 17 00:00:00 2001 From: seu11ee Date: Thu, 19 Nov 2020 14:49:27 +0900 Subject: [PATCH 05/11] =?UTF-8?q?[fix]=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mongle/Mongle.xcodeproj/project.pbxproj | 4 ++ .../Resource/APIService/APIConstants.swift | 1 + .../APIService/PasswordChangeService.swift | 63 +++++++++++++++++++ .../Mongle/Source/VCs/PasswordChangeVC.swift | 2 +- 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 Mongle/Mongle/Resource/APIService/PasswordChangeService.swift diff --git a/Mongle/Mongle.xcodeproj/project.pbxproj b/Mongle/Mongle.xcodeproj/project.pbxproj index 4d06e4c..e3aa926 100644 --- a/Mongle/Mongle.xcodeproj/project.pbxproj +++ b/Mongle/Mongle.xcodeproj/project.pbxproj @@ -82,6 +82,7 @@ 7FFEA28724BF768D003D381A /* EditorPickData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FFEA28624BF768D003D381A /* EditorPickData.swift */; }; 7FFEA28924BF9C72003D381A /* TodaySentenceData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FFEA28824BF9C72003D381A /* TodaySentenceData.swift */; }; 7FFEA28B24BFAC77003D381A /* MainCuratorData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FFEA28A24BFAC77003D381A /* MainCuratorData.swift */; }; + B816185F25663D6500307B53 /* PasswordChangeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B816185E25663D6400307B53 /* PasswordChangeService.swift */; }; B8218AC9255F8289003AA1AA /* ServicePolicy.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B8218AC8255F8289003AA1AA /* ServicePolicy.storyboard */; }; B8218ACC255F82BD003AA1AA /* ServicePolicyVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8218ACB255F82BD003AA1AA /* ServicePolicyVC.swift */; }; B8218B1A256000E3003AA1AA /* OpenSource.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B8218B19256000E2003AA1AA /* OpenSource.storyboard */; }; @@ -308,6 +309,7 @@ 7FFEA28624BF768D003D381A /* EditorPickData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorPickData.swift; sourceTree = ""; }; 7FFEA28824BF9C72003D381A /* TodaySentenceData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodaySentenceData.swift; sourceTree = ""; }; 7FFEA28A24BFAC77003D381A /* MainCuratorData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainCuratorData.swift; sourceTree = ""; }; + B816185E25663D6400307B53 /* PasswordChangeService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordChangeService.swift; sourceTree = ""; }; B8218AC8255F8289003AA1AA /* ServicePolicy.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ServicePolicy.storyboard; sourceTree = ""; }; B8218ACB255F82BD003AA1AA /* ServicePolicyVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServicePolicyVC.swift; sourceTree = ""; }; B8218B19256000E2003AA1AA /* OpenSource.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = OpenSource.storyboard; sourceTree = ""; }; @@ -622,6 +624,7 @@ EC849310255BD99B003B4149 /* SignUpEmailService.swift */, EC84931C255D1892003B4149 /* SignUpDuplicateService.swift */, B8218B2F25610356003AA1AA /* WithdrawService.swift */, + B816185E25663D6400307B53 /* PasswordChangeService.swift */, ); path = APIService; sourceTree = ""; @@ -1063,6 +1066,7 @@ B8B48B3524BC676500551F5B /* CuratorTabInfoVC.swift in Sources */, B8E2E15924C0A71E00595752 /* SearchSentenceService.swift in Sources */, 7FFEA26A24BE3317003D381A /* MonglesVC.swift in Sources */, + B816185F25663D6500307B53 /* PasswordChangeService.swift in Sources */, 7F1E719D24B46E3C00D79516 /* MainPopularThemaCVC.swift in Sources */, 7FC5B4D324BB61A4007C1725 /* WritingSentenceInThemeVC.swift in Sources */, EC6E99CA2508C9D900B57284 /* SignUpAgreeVC.swift in Sources */, diff --git a/Mongle/Mongle/Resource/APIService/APIConstants.swift b/Mongle/Mongle/Resource/APIService/APIConstants.swift index 4da7ddf..9aaabc3 100644 --- a/Mongle/Mongle/Resource/APIService/APIConstants.swift +++ b/Mongle/Mongle/Resource/APIService/APIConstants.swift @@ -61,4 +61,5 @@ struct APIConstants { static let signupEmailURL = baseURL + "/users/auth" static let signupDuplicateURL = baseURL + "/users/duplicate" static let withdrawURL = baseURL + "/users/withdraw" + static let passwordChangeURL = baseURL + "/users/changePassword" } diff --git a/Mongle/Mongle/Resource/APIService/PasswordChangeService.swift b/Mongle/Mongle/Resource/APIService/PasswordChangeService.swift new file mode 100644 index 0000000..fd41559 --- /dev/null +++ b/Mongle/Mongle/Resource/APIService/PasswordChangeService.swift @@ -0,0 +1,63 @@ +// +// PasswordChangeService.swift +// Mongle +// +// Created by 이예슬 on 11/19/20. +// Copyright © 2020 이주혁. All rights reserved. +// + +import Foundation +import Alamofire +struct PasswordChangeService{ + static let shared = PasswordChangeService() + + private func makeParameter(_ password : String)-> Parameters{ + return ["password" : password] + } + + func putRequest(password:String, completion : @escaping (NetworkResult) -> Void){ + let header : HTTPHeaders = ["Content-Type" : "application/json", "token" : UserDefaults.standard.string(forKey: "token")!] + + let dataRequest = Alamofire.request(APIConstants.withdrawURL, + method: .delete, + parameters: makeParameter(password), + encoding: JSONEncoding.default, + headers: header) + + + dataRequest.responseData { dataResponse in + switch dataResponse.result { + case .success : + guard let statusCode = dataResponse.response?.statusCode else {return} + guard let data = dataResponse.value else {return} + let networkResult = self.judgePut(by: statusCode, data) + completion(networkResult) + + case .failure : + + completion(.networkFail) + + + } + } + } + private func judgePut( by statusCode:Int, _ data :Data) -> NetworkResult { + let decoder = JSONDecoder() + + guard let decodedData = try? decoder.decode(GenericResponse.self, from: data) + else { return .pathErr } + + switch statusCode{ + case 200 : + return .success(decodedData.message) + case 400_: + return .requestErr(decodedData.message) + case 600 : + return .serverErr + default : + return .networkFail + } + + } + +} diff --git a/Mongle/Mongle/Source/VCs/PasswordChangeVC.swift b/Mongle/Mongle/Source/VCs/PasswordChangeVC.swift index 9d766d4..4d166f6 100644 --- a/Mongle/Mongle/Source/VCs/PasswordChangeVC.swift +++ b/Mongle/Mongle/Source/VCs/PasswordChangeVC.swift @@ -25,7 +25,7 @@ class PasswordChangeVC: UIViewController { //MARK:- Custom Properties - let nowPassword = "testpw" + let nowPassword = UserDefaults.standard.string(forKey: "password") let heightRatio: CGFloat = UIScreen.main.bounds.height/812 let widthRatio: CGFloat = UIScreen.main.bounds.width/375 let blurImageView = UIImageView().then{ From 450870dd20d22e736f35c1441465369834b64210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=98=88=EC=8A=AC?= Date: Thu, 19 Nov 2020 20:28:24 +0900 Subject: [PATCH 06/11] =?UTF-8?q?[fix]=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mongle/Mongle.xcodeproj/project.pbxproj | 8 ++-- Mongle/Mongle/Info.plist | 4 +- .../APIService/PasswordChangeService.swift | 4 +- .../Mongle/Source/VCs/PasswordChangeVC.swift | 38 ++++++++++++++++--- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/Mongle/Mongle.xcodeproj/project.pbxproj b/Mongle/Mongle.xcodeproj/project.pbxproj index e3aa926..5472fa2 100644 --- a/Mongle/Mongle.xcodeproj/project.pbxproj +++ b/Mongle/Mongle.xcodeproj/project.pbxproj @@ -1307,13 +1307,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6ZTQ76LJPZ; + DEVELOPMENT_TEAM = 4YXV56BSN6; INFOPLIST_FILE = Mongle/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle3; + PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1326,13 +1326,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6ZTQ76LJPZ; + DEVELOPMENT_TEAM = 4YXV56BSN6; INFOPLIST_FILE = Mongle/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle3; + PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/Mongle/Mongle/Info.plist b/Mongle/Mongle/Info.plist index 358f928..dfc7a78 100644 --- a/Mongle/Mongle/Info.plist +++ b/Mongle/Mongle/Info.plist @@ -2,8 +2,6 @@ - UIUserInterfaceStyle - Light CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName @@ -78,5 +76,7 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UIUserInterfaceStyle + Light diff --git a/Mongle/Mongle/Resource/APIService/PasswordChangeService.swift b/Mongle/Mongle/Resource/APIService/PasswordChangeService.swift index fd41559..55bd537 100644 --- a/Mongle/Mongle/Resource/APIService/PasswordChangeService.swift +++ b/Mongle/Mongle/Resource/APIService/PasswordChangeService.swift @@ -18,8 +18,8 @@ struct PasswordChangeService{ func putRequest(password:String, completion : @escaping (NetworkResult) -> Void){ let header : HTTPHeaders = ["Content-Type" : "application/json", "token" : UserDefaults.standard.string(forKey: "token")!] - let dataRequest = Alamofire.request(APIConstants.withdrawURL, - method: .delete, + let dataRequest = Alamofire.request(APIConstants.passwordChangeURL, + method: .put, parameters: makeParameter(password), encoding: JSONEncoding.default, headers: header) diff --git a/Mongle/Mongle/Source/VCs/PasswordChangeVC.swift b/Mongle/Mongle/Source/VCs/PasswordChangeVC.swift index 4d166f6..a7d77e6 100644 --- a/Mongle/Mongle/Source/VCs/PasswordChangeVC.swift +++ b/Mongle/Mongle/Source/VCs/PasswordChangeVC.swift @@ -291,11 +291,39 @@ class PasswordChangeVC: UIViewController { @IBAction func touchUpComplete(_ sender: Any) { if checkAllPassword() == true { //비밀번호 변경 API 성공 - self.view.endEditing(true) - self.nowPasswordTextField.setBorder(borderColor: .softGreen, borderWidth: 1) - self.newPasswordTextField.setBorder(borderColor: .softGreen, borderWidth: 1) - self.newPasswordCheckTextField.setBorder(borderColor: .softGreen, borderWidth: 1) - showPopupView("비밀번호가 변경되었어요!", "변경된 비밀번호로\n재로그인을 해주세요!") + PasswordChangeService.shared.putRequest(password: self.newPasswordTextField.text!){ + networkResult in + switch networkResult{ + case .success(let message): + guard let message = message as? String else { return } + print(message) + UserDefaults.standard.setValue(self.newPasswordTextField.text!, forKey: "password") + self.view.endEditing(true) + self.nowPasswordTextField.setBorder(borderColor: .softGreen, borderWidth: 1) + self.newPasswordTextField.setBorder(borderColor: .softGreen, borderWidth: 1) + self.newPasswordCheckTextField.setBorder(borderColor: .softGreen, borderWidth: 1) + self.showPopupView("비밀번호가 변경되었어요!", "변경된 비밀번호로\n재로그인을 해주세요!") + + case .requestErr(let message): + + guard let message = message as? String else { return } + print(message) + self.showToast(text: message) + case .pathErr: + + print("path") + case .serverErr: + print("serverErr") + self.showToast(text: "서버 내부 오류") + case .networkFail: + print("networkFail") + self.showToast(text: "네트워크 실패") + } + + + + } + } } From 7a44543c76626f85c953ec42ac8e82cac41d5324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=98=88=EC=8A=AC?= Date: Thu, 19 Nov 2020 20:57:22 +0900 Subject: [PATCH 07/11] =?UTF-8?q?[fix]=20=EB=82=B4=EA=B0=80=20=EC=93=B4=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=A5=20=EB=8D=94=EB=B3=B4=EA=B8=B0=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mongle/Mongle/Resource/Storyboard/MyTab.storyboard | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard b/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard index df5f69b..5c5281c 100644 --- a/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/MyTab.storyboard @@ -286,7 +286,6 @@ - @@ -294,7 +293,6 @@ - @@ -303,6 +301,7 @@ + @@ -318,10 +317,10 @@ - + - +