From cb957109b5e3040d4f05d507e1f11384addc6d7f Mon Sep 17 00:00:00 2001 From: ryr0121 Date: Wed, 9 Aug 2023 01:28:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat,=20fix:=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EC=B2=98=EB=A6=AC=EB=B0=A9=EC=B9=A8=20url=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20iPages=20SPM=20=EB=88=84=EB=9D=BD=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meongmory_iOS.xcodeproj/project.pbxproj | 67 ++++++++++++++----- .../MyPage/MenuDetailView/TermWebView.swift | 2 +- 2 files changed, 50 insertions(+), 19 deletions(-) diff --git a/meongmory_iOS.xcodeproj/project.pbxproj b/meongmory_iOS.xcodeproj/project.pbxproj index dace8e2..8e1db8c 100644 --- a/meongmory_iOS.xcodeproj/project.pbxproj +++ b/meongmory_iOS.xcodeproj/project.pbxproj @@ -26,6 +26,12 @@ 73D279482A813BF800B12C0C /* MapTypeLazyGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73D279472A813BF800B12C0C /* MapTypeLazyGrid.swift */; }; 73D2794A2A8154AD00B12C0C /* MapInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73D279492A8154AD00B12C0C /* MapInfoView.swift */; }; 768BC0BAACFC50EE43CEE161 /* Pods_meongmory_iOSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38D318894BA7CDB8D4A30853 /* Pods_meongmory_iOSTests.framework */; }; + A2A211C82A829C160067D436 /* iPages in Frameworks */ = {isa = PBXBuildFile; productRef = A2A211C72A829C160067D436 /* iPages */; }; + A2AC24BF2A78B84D00D284A7 /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2AC24BE2A78B84D00D284A7 /* LoginView.swift */; }; + A2AC24C12A78C27E00D284A7 /* ValidatePhoneNumView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2AC24C02A78C27E00D284A7 /* ValidatePhoneNumView.swift */; }; + A2AC24C32A7CCBBF00D284A7 /* AgreeToTermsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2AC24C22A7CCBBF00D284A7 /* AgreeToTermsView.swift */; }; + A2AC24C52A7CCFD800D284A7 /* SetNicknameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2AC24C42A7CCFD800D284A7 /* SetNicknameView.swift */; }; + A2AC24C72A7CD11D00D284A7 /* OnBoardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2AC24C62A7CD11D00D284A7 /* OnBoardingView.swift */; }; A2AC24CD2A801B1600D284A7 /* MyPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2AC24CC2A801B1600D284A7 /* MyPageView.swift */; }; A2AC24D12A80316F00D284A7 /* SetNotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2AC24D02A80316F00D284A7 /* SetNotificationView.swift */; }; A2AC24D32A80317E00D284A7 /* EditProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2AC24D22A80317E00D284A7 /* EditProfileView.swift */; }; @@ -74,17 +80,17 @@ 731C3F9D2A5FB8B800A5277A /* meongmory_iOSUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = meongmory_iOSUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 731C3FA12A5FB8B800A5277A /* meongmory_iOSUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = meongmory_iOSUITests.swift; sourceTree = ""; }; 731C3FA32A5FB8B800A5277A /* meongmory_iOSUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = meongmory_iOSUITestsLaunchTests.swift; sourceTree = ""; }; - A2AC24BE2A78B84D00D284A7 /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = ""; }; - A2AC24C02A78C27E00D284A7 /* ValidatePhoneNumView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidatePhoneNumView.swift; sourceTree = ""; }; - A2AC24C22A7CCBBF00D284A7 /* AgreeToTermsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgreeToTermsView.swift; sourceTree = ""; }; - A2AC24C42A7CCFD800D284A7 /* SetNicknameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetNicknameView.swift; sourceTree = ""; }; - A2AC24C62A7CD11D00D284A7 /* OnBoardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnBoardingView.swift; sourceTree = ""; }; 73600E0B2A809AB800F9FE87 /* MapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapView.swift; sourceTree = ""; }; 73600E0D2A80FB4B00F9FE87 /* meongmory-iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "meongmory-iOS-Info.plist"; sourceTree = SOURCE_ROOT; }; 73600E0E2A80FBC600F9FE87 /* LocationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationService.swift; sourceTree = ""; }; 73D279472A813BF800B12C0C /* MapTypeLazyGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTypeLazyGrid.swift; sourceTree = ""; }; 73D279492A8154AD00B12C0C /* MapInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapInfoView.swift; sourceTree = ""; }; 9E86AAB6E73640C35049F8A8 /* Pods-meongmory_iOS-meongmory_iOSUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meongmory_iOS-meongmory_iOSUITests.release.xcconfig"; path = "Target Support Files/Pods-meongmory_iOS-meongmory_iOSUITests/Pods-meongmory_iOS-meongmory_iOSUITests.release.xcconfig"; sourceTree = ""; }; + A2AC24BE2A78B84D00D284A7 /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = ""; }; + A2AC24C02A78C27E00D284A7 /* ValidatePhoneNumView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidatePhoneNumView.swift; sourceTree = ""; }; + A2AC24C22A7CCBBF00D284A7 /* AgreeToTermsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgreeToTermsView.swift; sourceTree = ""; }; + A2AC24C42A7CCFD800D284A7 /* SetNicknameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetNicknameView.swift; sourceTree = ""; }; + A2AC24C62A7CD11D00D284A7 /* OnBoardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnBoardingView.swift; sourceTree = ""; }; A2AC24CC2A801B1600D284A7 /* MyPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageView.swift; sourceTree = ""; }; A2AC24D02A80316F00D284A7 /* SetNotificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetNotificationView.swift; sourceTree = ""; }; A2AC24D22A80317E00D284A7 /* EditProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProfileView.swift; sourceTree = ""; }; @@ -96,7 +102,6 @@ A2AC24E62A8262CF00D284A7 /* MypageMenuListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MypageMenuListView.swift; sourceTree = ""; }; A2AC24E82A82631800D284A7 /* MypageMenuRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MypageMenuRow.swift; sourceTree = ""; }; A2AC24EA2A82637000D284A7 /* UserProfilView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfilView.swift; sourceTree = ""; }; - A2AC24EC2A82829900D284A7 /* meongmory-iOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "meongmory-iOS-Info.plist"; sourceTree = SOURCE_ROOT; }; A2AC25092A828C5900D284A7 /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = ""; }; A4478C4D4BA51E86ED736D87 /* Pods-meongmory_iOS-meongmory_iOSUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meongmory_iOS-meongmory_iOSUITests.debug.xcconfig"; path = "Target Support Files/Pods-meongmory_iOS-meongmory_iOSUITests/Pods-meongmory_iOS-meongmory_iOSUITests.debug.xcconfig"; sourceTree = ""; }; DFD7AC8A79D99A7B9653B1F2 /* Pods-meongmory_iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meongmory_iOS.release.xcconfig"; path = "Target Support Files/Pods-meongmory_iOS/Pods-meongmory_iOS.release.xcconfig"; sourceTree = ""; }; @@ -108,6 +113,7 @@ buildActionMask = 2147483647; files = ( 1ABF99F4EE32574474638824 /* Pods_meongmory_iOS.framework in Frameworks */, + A2A211C82A829C160067D436 /* iPages in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -259,18 +265,6 @@ path = View; sourceTree = ""; }; - A2AC24BD2A78B82000D284A7 /* Auth */ = { - isa = PBXGroup; - children = ( - A2AC24BE2A78B84D00D284A7 /* LoginView.swift */, - A2AC24C02A78C27E00D284A7 /* ValidatePhoneNumView.swift */, - A2AC24C22A7CCBBF00D284A7 /* AgreeToTermsView.swift */, - A2AC24C42A7CCFD800D284A7 /* SetNicknameView.swift */, - A2AC24C62A7CD11D00D284A7 /* OnBoardingView.swift */, - ); - path = Auth; - sourceTree = ""; - }; 73600E0A2A809A4300F9FE87 /* Map */ = { isa = PBXGroup; children = ( @@ -294,6 +288,18 @@ path = Pods; sourceTree = ""; }; + A2AC24BD2A78B82000D284A7 /* Auth */ = { + isa = PBXGroup; + children = ( + A2AC24BE2A78B84D00D284A7 /* LoginView.swift */, + A2AC24C02A78C27E00D284A7 /* ValidatePhoneNumView.swift */, + A2AC24C22A7CCBBF00D284A7 /* AgreeToTermsView.swift */, + A2AC24C42A7CCFD800D284A7 /* SetNicknameView.swift */, + A2AC24C62A7CD11D00D284A7 /* OnBoardingView.swift */, + ); + path = Auth; + sourceTree = ""; + }; A2AC24CB2A801B0B00D284A7 /* MyPage */ = { isa = PBXGroup; children = ( @@ -347,6 +353,9 @@ dependencies = ( ); name = meongmory_iOS; + packageProductDependencies = ( + A2A211C72A829C160067D436 /* iPages */, + ); productName = meongmory_iOS; productReference = 731C3F832A5FB8B600A5277A /* meongmory_iOS.app */; productType = "com.apple.product-type.application"; @@ -422,6 +431,9 @@ Base, ); mainGroup = 731C3F7A2A5FB8B600A5277A; + packageReferences = ( + A2A211C62A829C160067D436 /* XCRemoteSwiftPackageReference "iPages" */, + ); productRefGroup = 731C3F842A5FB8B600A5277A /* Products */; projectDirPath = ""; projectRoot = ""; @@ -935,6 +947,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + A2A211C62A829C160067D436 /* XCRemoteSwiftPackageReference "iPages" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/benjaminsage/iPages"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.0.9; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + A2A211C72A829C160067D436 /* iPages */ = { + isa = XCSwiftPackageProductDependency; + package = A2A211C62A829C160067D436 /* XCRemoteSwiftPackageReference "iPages" */; + productName = iPages; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 731C3F7B2A5FB8B600A5277A /* Project object */; } diff --git a/meongmory_iOS/Presentation/View/MyPage/MenuDetailView/TermWebView.swift b/meongmory_iOS/Presentation/View/MyPage/MenuDetailView/TermWebView.swift index f5a41e0..13c9615 100644 --- a/meongmory_iOS/Presentation/View/MyPage/MenuDetailView/TermWebView.swift +++ b/meongmory_iOS/Presentation/View/MyPage/MenuDetailView/TermWebView.swift @@ -9,7 +9,7 @@ import SwiftUI enum TermType: String { case term = "https://www.naver.com" // 임시 URL값 - case privacyTerm = "https://www.google.com" // 임시 URL값 + case privacyTerm = "https://persistent-pumpkin-861.notion.site/bb768f6604154157bc2a84cc50852479?pvs=4" } struct TermWebView: View { From 3188b087a118f36914cd16115e0eac4ffc72775e Mon Sep 17 00:00:00 2001 From: ryr0121 Date: Wed, 9 Aug 2023 01:42:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EC=9D=B4=EC=9A=A9=EC=95=BD?= =?UTF-8?q?=EA=B4=80=20url=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/View/MyPage/MenuDetailView/TermWebView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meongmory_iOS/Presentation/View/MyPage/MenuDetailView/TermWebView.swift b/meongmory_iOS/Presentation/View/MyPage/MenuDetailView/TermWebView.swift index 13c9615..1723518 100644 --- a/meongmory_iOS/Presentation/View/MyPage/MenuDetailView/TermWebView.swift +++ b/meongmory_iOS/Presentation/View/MyPage/MenuDetailView/TermWebView.swift @@ -8,7 +8,7 @@ import SwiftUI enum TermType: String { - case term = "https://www.naver.com" // 임시 URL값 + case term = "https://persistent-pumpkin-861.notion.site/3c7548bbc34440cabb8ee8446129f3b7?pvs=4" case privacyTerm = "https://persistent-pumpkin-861.notion.site/bb768f6604154157bc2a84cc50852479?pvs=4" }