Skip to content

Commit

Permalink
Merge pull request #18 from meongmory/feature/3-auth-ui
Browse files Browse the repository at this point in the history 
[Feat, Fix] 이용약관/개인정보처리방침 URL 추가, iPages SPM 누락 처리
  • Loading branch information
@Nya128
Nya128 authored Aug 8, 2023
2 parents 501db95 + 3188b08 commit 96accb4
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 20 deletions.
67 changes: 49 additions & 18 deletions meongmory_iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 = "<group>"; };
731C3FA32A5FB8B800A5277A /* meongmory_iOSUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = meongmory_iOSUITestsLaunchTests.swift; sourceTree = "<group>"; };
A2AC24BE2A78B84D00D284A7 /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
A2AC24C02A78C27E00D284A7 /* ValidatePhoneNumView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidatePhoneNumView.swift; sourceTree = "<group>"; };
A2AC24C22A7CCBBF00D284A7 /* AgreeToTermsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgreeToTermsView.swift; sourceTree = "<group>"; };
A2AC24C42A7CCFD800D284A7 /* SetNicknameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetNicknameView.swift; sourceTree = "<group>"; };
A2AC24C62A7CD11D00D284A7 /* OnBoardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnBoardingView.swift; sourceTree = "<group>"; };
73600E0B2A809AB800F9FE87 /* MapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapView.swift; sourceTree = "<group>"; };
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 = "<group>"; };
73D279472A813BF800B12C0C /* MapTypeLazyGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTypeLazyGrid.swift; sourceTree = "<group>"; };
73D279492A8154AD00B12C0C /* MapInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapInfoView.swift; sourceTree = "<group>"; };
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 = "<group>"; };
A2AC24BE2A78B84D00D284A7 /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
A2AC24C02A78C27E00D284A7 /* ValidatePhoneNumView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidatePhoneNumView.swift; sourceTree = "<group>"; };
A2AC24C22A7CCBBF00D284A7 /* AgreeToTermsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgreeToTermsView.swift; sourceTree = "<group>"; };
A2AC24C42A7CCFD800D284A7 /* SetNicknameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetNicknameView.swift; sourceTree = "<group>"; };
A2AC24C62A7CD11D00D284A7 /* OnBoardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnBoardingView.swift; sourceTree = "<group>"; };
A2AC24CC2A801B1600D284A7 /* MyPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageView.swift; sourceTree = "<group>"; };
A2AC24D02A80316F00D284A7 /* SetNotificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetNotificationView.swift; sourceTree = "<group>"; };
A2AC24D22A80317E00D284A7 /* EditProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProfileView.swift; sourceTree = "<group>"; };
Expand All @@ -96,7 +102,6 @@
A2AC24E62A8262CF00D284A7 /* MypageMenuListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MypageMenuListView.swift; sourceTree = "<group>"; };
A2AC24E82A82631800D284A7 /* MypageMenuRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MypageMenuRow.swift; sourceTree = "<group>"; };
A2AC24EA2A82637000D284A7 /* UserProfilView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfilView.swift; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
Expand All @@ -108,6 +113,7 @@
buildActionMask = 2147483647;
files = (
1ABF99F4EE32574474638824 /* Pods_meongmory_iOS.framework in Frameworks */,
A2A211C82A829C160067D436 /* iPages in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -259,18 +265,6 @@
path = View;
sourceTree = "<group>";
};
A2AC24BD2A78B82000D284A7 /* Auth */ = {
isa = PBXGroup;
children = (
A2AC24BE2A78B84D00D284A7 /* LoginView.swift */,
A2AC24C02A78C27E00D284A7 /* ValidatePhoneNumView.swift */,
A2AC24C22A7CCBBF00D284A7 /* AgreeToTermsView.swift */,
A2AC24C42A7CCFD800D284A7 /* SetNicknameView.swift */,
A2AC24C62A7CD11D00D284A7 /* OnBoardingView.swift */,
);
path = Auth;
sourceTree = "<group>";
};
73600E0A2A809A4300F9FE87 /* Map */ = {
isa = PBXGroup;
children = (
Expand All @@ -294,6 +288,18 @@
path = Pods;
sourceTree = "<group>";
};
A2AC24BD2A78B82000D284A7 /* Auth */ = {
isa = PBXGroup;
children = (
A2AC24BE2A78B84D00D284A7 /* LoginView.swift */,
A2AC24C02A78C27E00D284A7 /* ValidatePhoneNumView.swift */,
A2AC24C22A7CCBBF00D284A7 /* AgreeToTermsView.swift */,
A2AC24C42A7CCFD800D284A7 /* SetNicknameView.swift */,
A2AC24C62A7CD11D00D284A7 /* OnBoardingView.swift */,
);
path = Auth;
sourceTree = "<group>";
};
A2AC24CB2A801B0B00D284A7 /* MyPage */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -422,6 +431,9 @@
Base,
);
mainGroup = 731C3F7A2A5FB8B600A5277A;
packageReferences = (
A2A211C62A829C160067D436 /* XCRemoteSwiftPackageReference "iPages" */,
);
productRefGroup = 731C3F842A5FB8B600A5277A /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -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 */;
}
4 changes: 2 additions & 2 deletions meongmory_iOS/Presentation/View/MyPage/MenuDetailView/TermWebView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import SwiftUI

enum TermType: String {
case term = "https://www.naver.com" // 임시 URL값
case privacyTerm = "https://www.google.com" // 임시 URL값
case term = "https://persistent-pumpkin-861.notion.site/3c7548bbc34440cabb8ee8446129f3b7?pvs=4"
case privacyTerm = "https://persistent-pumpkin-861.notion.site/bb768f6604154157bc2a84cc50852479?pvs=4"
}

struct TermWebView: View {
Expand Down

0 comments on commit 96accb4

Please sign in to comment.