Merge pull request #315 from Travel-in-nanaland/refactor/#313

수정사항 수정 및 공유하기 기능 수정 완료

NanaLand/NanaLand.xcodeproj/project.pbxproj

@@ -160,7 +160,6 @@
 		6D6D30902C61FAAF00002F77 /* report_complete.json in Resources */ = {isa = PBXBuildFile; fileRef = 6D6D308D2C61FAAF00002F77 /* report_complete.json */; };
 		6D6D30912C61FAAF00002F77 /* review_experience.json in Resources */ = {isa = PBXBuildFile; fileRef = 6D6D308E2C61FAAF00002F77 /* review_experience.json */; };
 		6D7756752C8F4E190085D747 /* SearchReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D7756742C8F4E190085D747 /* SearchReviewView.swift */; };
-		6D7DDEA82CD4757A003BE67B /* loading.json in Resources */ = {isa = PBXBuildFile; fileRef = 6D7DDEA72CD4757A003BE67B /* loading.json */; };
 		6D7F580E2C7A5F8700FA08A9 /* MenuModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D7F580D2C7A5F8700FA08A9 /* MenuModalView.swift */; };
 		6D9EDAD12C5B459A003A8DE5 /* secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D9EDAD02C5B459A003A8DE5 /* secret.swift */; };
 		6D9EDAD32C5B47B4003A8DE5 /* RestaurantKeywordView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D9EDAD22C5B47B4003A8DE5 /* RestaurantKeywordView.swift */; };
@@ -209,6 +208,7 @@
 		BF1611492BDB7870000340F2 /* ShopService.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1611482BDB7870000340F2 /* ShopService.swift */; };
 		BF16114B2BDB7881000340F2 /* ShopEndPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF16114A2BDB7881000340F2 /* ShopEndPoint.swift */; };
 		BF17B5FE2C5B261B0045B6E3 /* UserProfileMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF17B5FD2C5B261B0045B6E3 /* UserProfileMainView.swift */; };
+		BF1AA1CF2CDDD8A500B10E88 /* loading.json in Resources */ = {isa = PBXBuildFile; fileRef = BF1AA1CE2CDDD8A500B10E88 /* loading.json */; };
 		BF1AD4F72C60994200334E8F /* ReviewAllDetailMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1AD4F62C60994200334E8F /* ReviewAllDetailMainView.swift */; };
 		BF1AD4F92C60995100334E8F /* ReviewAllDetailMainViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1AD4F82C60995100334E8F /* ReviewAllDetailMainViewModel.swift */; };
 		BF22B8032C460F7D0059B380 /* ExperienceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF22B8022C460F7D0059B380 /* ExperienceService.swift */; };
@@ -482,7 +482,6 @@
 		6D6D308E2C61FAAF00002F77 /* review_experience.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = review_experience.json; sourceTree = "<group>"; };
 		6D7756742C8F4E190085D747 /* SearchReviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchReviewView.swift; sourceTree = "<group>"; };
 		6D7C3B892C7E1BA800F5A09E /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
-		6D7DDEA72CD4757A003BE67B /* loading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = loading.json; sourceTree = "<group>"; };
 		6D7F580D2C7A5F8700FA08A9 /* MenuModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuModalView.swift; sourceTree = "<group>"; };
 		6D9EDAD02C5B459A003A8DE5 /* secret.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = secret.swift; sourceTree = "<group>"; };
 		6D9EDAD22C5B47B4003A8DE5 /* RestaurantKeywordView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestaurantKeywordView.swift; sourceTree = "<group>"; };
@@ -524,6 +523,7 @@
 		BF1611482BDB7870000340F2 /* ShopService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopService.swift; sourceTree = "<group>"; };
 		BF16114A2BDB7881000340F2 /* ShopEndPoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopEndPoint.swift; sourceTree = "<group>"; };
 		BF17B5FD2C5B261B0045B6E3 /* UserProfileMainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileMainView.swift; sourceTree = "<group>"; };
+		BF1AA1CE2CDDD8A500B10E88 /* loading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = loading.json; path = ../../../../../../../../../Downloads/loading.json; sourceTree = "<group>"; };
 		BF1AD4F62C60994200334E8F /* ReviewAllDetailMainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewAllDetailMainView.swift; sourceTree = "<group>"; };
 		BF1AD4F82C60995100334E8F /* ReviewAllDetailMainViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewAllDetailMainViewModel.swift; sourceTree = "<group>"; };
 		BF22B8022C460F7D0059B380 /* ExperienceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExperienceService.swift; sourceTree = "<group>"; };
@@ -687,13 +687,13 @@
 		2C2D3D562C05993D002A38AA /* Lottie */ = {
 			isa = PBXGroup;
 			children = (
-				6D7DDEA72CD4757A003BE67B /* loading.json */,
 				6D4BC7BF2CA733E700ADA908 /* splash.gif */,
 				BF548BDB2C7CDA5300B34635 /* report_complete_comment.json */,
 				BF548BDA2C7CDA5300B34635 /* report_complete_megaphone.json */,
 				6DF18F072C6E25120021ED5B /* TestLoading.json */,
 				6D6D308D2C61FAAF00002F77 /* report_complete.json */,
 				6D6D308E2C61FAAF00002F77 /* review_experience.json */,
+				BF1AA1CE2CDDD8A500B10E88 /* loading.json */,
 				6D6D308C2C61FAAF00002F77 /* review_restaurant.json */,
 				2C2749862C0992AA00ECBA71 /* report_info_star.json */,
 				2C2749882C09950900ECBA71 /* loading_drink.json */,
@@ -1713,7 +1713,7 @@
 				2C1F31C52BCD01390066819F /* AppleSDGothicNeoH.ttf in Resources */,
 				2C2749872C0992AB00ECBA71 /* report_info_star.json in Resources */,
 				BF548BDC2C7CDA5400B34635 /* report_complete_megaphone.json in Resources */,
-				6D7DDEA82CD4757A003BE67B /* loading.json in Resources */,
+				BF1AA1CF2CDDD8A500B10E88 /* loading.json in Resources */,
 				BF548BDD2C7CDA5400B34635 /* report_complete_comment.json in Resources */,
 				6D0A43402C9F2E9300529D1E /* AuthKey_9JRUHFTK3L.p8 in Resources */,
 				6D4BC7C02CA733E700ADA908 /* splash.gif in Resources */,
@@ -2184,7 +2184,7 @@
 				CODE_SIGN_ENTITLEMENTS = NanaLand/NanaLand.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_ASSET_PATHS = "\"NanaLand/Preview Content\"";
 				DEVELOPMENT_TEAM = UM6P9H795G;
 				ENABLE_PREVIEWS = YES;
@@ -2223,7 +2223,7 @@
 				CODE_SIGN_ENTITLEMENTS = NanaLand/NanaLand.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_ASSET_PATHS = "\"NanaLand/Preview Content\"";
 				DEVELOPMENT_TEAM = UM6P9H795G;
 				ENABLE_PREVIEWS = YES;

NanaLand/NanaLand/App/NanaLandApp.swift

@@ -39,6 +39,7 @@ struct NanaLandApp: App {
 			NanaHome()
 				.environmentObject(localizationdManager)
 				.onOpenURL{ url in
+                    print("url: \(url)")
 					if url.scheme == "nanaland" {
 						DeepLinkManager.shared.handleDeepLink(url: url )
 					} else if (AuthApi.isKakaoTalkLoginUrl(url)) {

NanaLand/NanaLand/Common/Localizing/en.lproj/Localizable.strings

@@ -48,8 +48,8 @@
 "googleLogin" = "Sign in with Google";
 "nonMemeberLogin" = "Browse Without Logging In";
 "welcomeToNanaLand" = "Welcome to\nnanaland in Jeju";
-"enterNicknameAndProfile" = "Enter your name and\nselect a profile picture.";
-"nicknameTextFieldPlaceHolder" = "Please enter your name";
+"enterNicknameAndProfile" = "Enter your Nickname and\nselect a profile picture.";
+"nicknameTextFieldPlaceHolder" = "Please enter your Nickname";
 
 //MARK: - Terms
 "allAgree" = "Agree to All";
@@ -486,7 +486,7 @@ the market is the place!";
 "reportReasonValidation" = "Please write the reason for your report in at least 20 characters!"; // 신고 사유
 "reportCharacterPermission" = "Content can be written in 500 characters or less.";// 내용 500자 이하
 "reportResultEmail" = "Please enter your email address to receive the report results."; // 신고 결과 이메일
-"emailValidation " = "The email format is incorrect. Please enter again!";// 이메일 벨리 체크
+"emailValidation" = "The email format is incorrect. Please enter again!";// 이메일 벨리 체크
 "reportReason" = "Please tell us why you are reporting it!"; // 신고사유
 "reportWarning" = "Information reported without valid grounds must be confirmed by the administrator./nIt may not be reflected."; // 허위신고 주의문구
 "profitPromotionalPurpose" = "For profit / promotional purpose"; // 영리목적 / 홍보성

NanaLand/NanaLand/Common/Localizing/ko.lproj/Localizable.strings

@@ -48,8 +48,8 @@
 "googleLogin" = "Google 로그인";
 "nonMemeberLogin" = "로그인없이 둘러보기";
 "welcomeToNanaLand" = "nanaland in Jeju에\n오신 것을 환영합니다.";
-"enterNicknameAndProfile" = "사용할 이름을 작성 및\n프로필을 선택해 주세요.";
-"nicknameTextFieldPlaceHolder" = "이름을 입력해 주세요";
+"enterNicknameAndProfile" = "사용할 별명을 작성 및\n프로필을 선택해 주세요.";
+"nicknameTextFieldPlaceHolder" = "별명을 입력해 주세요";
 
 //MARK: - Terms
 "allAgree" = "전체 동의";
@@ -477,7 +477,7 @@
 "reportReasonValidation" = "신고사유는 20자 이상 작성해주세요."; // 신고 사유
 "reportCharacterPermission" = "내용은 500자 이하로 작성 가능합니다.";// 내용 500자 이하
 "reportResultEmail" = "신고 결과를 받을 이메일을 입력해주세요."; // 신고 결과 이메일
-"emailValidation " = "이메일 형식이 잘못 되었습니다. 다시 입력해 주세요!";// 이메일 벨리 체크
+"emailValidation" = "이메일 형식이 잘못 되었습니다. 다시 입력해 주세요!";// 이메일 벨리 체크
 "reportReason" = "신고하는 이유를 알려주세요!"; // 신고사유
 "reportWarning" = "타당한 근거 없이 신고된 내용은 관리자 확인 후/n반영되지 않을 수 있습니다."; // 허위신고 주의문구
 "profitPromotionalPurpose" = "영리목적 / 홍보성"; // 영리목적 / 홍보성

NanaLand/NanaLand/Common/Localizing/ms.lproj/Localizable.strings

@@ -485,7 +485,7 @@ mengembalikan sebarang hasil.";
 "reportReasonValidation" = "Sila tulis sebab laporan anda dalam sekurang-kurangnya 20 aksara!"; // 신고 사유
 "reportCharacterPermission" = "Kandungan boleh ditulis dalam 500 aksara atau kurang.";// 내용 500자 이하
 "reportResultEmail" = "Sila masukkan alamat e-mel anda untuk menerima keputusan laporan."; // 신고 결과 이메일
-"emailValidation " = "Format e-mel tidak betul. Sila masukkan semula!";// 이메일 벨리 체크
+"emailValidation" = "Format e-mel tidak betul. Sila masukkan semula!";// 이메일 벨리 체크
 "reportReason" = "Sila beritahu kami mengapa anda melaporkannya!"; // 신고사유
 "reportWarning" = "Maklumat yang dilaporkan tanpa alasan yang sah mesti disahkan oleh pentadbir./nIa mungkin tidak akan diterima."; // 허위신고 주의문구
 "profitPromotionalPurpose" = "Untuk tujuan keuntungan / promosi"; // 영리목적 / 홍보성

NanaLand/NanaLand/Common/Localizing/vi.lproj/Localizable.strings

@@ -48,8 +48,8 @@
 "googleLogin" = "Đăng nhập bằng Google";
 "nonMemeberLogin" = "Duyệt mà không cần đăng nhập";
 "welcomeToNanaLand" = "Welcome to\nnanaland in Jeju";
-"enterNicknameAndProfile" = "Enter your name and\nselect a profile picture.";
-"nicknameTextFieldPlaceHolder" = "Please enter your name";
+"enterNicknameAndProfile" = "Enter your Nickname and\nselect a profile picture.";
+"nicknameTextFieldPlaceHolder" = "Please enter your Nickname";
 
 //MARK: - Terms
 "allAgree" = "Agree to All";
@@ -493,7 +493,7 @@
 "reportReasonValidation" = "Vui lòng viết lý do báo cáo của bạn bằng ít nhất 20 ký tự!"; // 신고 사유
 "reportCharacterPermission" = "Nội dung có thể được viết bằng 500 ký tự hoặc ít hơn.";// 내용 500자 이하
 "reportResultEmail" = "Vui lòng nhập địa chỉ email của bạn để nhận kết quả báo cáo."; // 신고 결과 이메일
-"emailValidation " = "Định dạng email không đúng. Vui lòng nhập lại!";// 이메일 벨리 체크
+"emailValidation" = "Định dạng email không đúng. Vui lòng nhập lại!";// 이메일 벨리 체크
 "reportReason" = "Hãy cho chúng tôi biết lý do bạn báo cáo!"; // 신고사유
 "reportWarning" = "Thông tin báo cáo không có căn cứ hợp lệ phải được xác nhận bởi quản trị viên.Có thể sẽ không được phản ánh."; // 허위신고 주의문구
 "profitPromotionalPurpose" = "Vì mục đích lợi nhuận / quảng cáo"; // 영리목적 / 홍보성

NanaLand/NanaLand/Common/Localizing/zh-Hans.lproj/Localizable.strings

@@ -481,7 +481,7 @@
 "reportReasonValidation" = "请写下至少20个字符的举报理由！"; // 신고 사유
 "reportCharacterPermission" = "内容可以写在 500 个字符以内。";// 내용 500자 이하
 "reportResultEmail" = "请输入您的电子邮件地址以接收报告结果。"; // 신고 결과 이메일
-"emailValidation " = "电子邮件格式不正确。请重新输入！";// 이메일 벨리 체크
+"emailValidation" = "电子邮件格式不正确。请重新输入！";// 이메일 벨리 체크
 "reportReason" = "请告诉我们举报原因！"; // 신고사유
 "reportWarning" = "无有效理由的举报信息必须由管理员确认。可能不会反映。"; // 허위신고 주의문구
 "profitPromotionalPurpose" = "用于营利/推广目的"; // 영리목적 / 홍보성

NanaLand/NanaLand/Common/Util/AuthManager.swift

@@ -295,7 +295,7 @@ final class AuthManager: NSObject {
 	}
 
 	/// 회원탈퇴
-	func withdraw(withdrawalType: String) {
+	func withdraw(withdrawalType: String) async{
 		if provider == "KAKAO" {
 			kakaoWithdraw(withdrawalType: withdrawalType)
 		} else if provider == "GOOGLE" {
@@ -400,6 +400,7 @@ final class AuthManager: NSObject {
 			.responseData { response in
 				switch response.result {
 				case .success(let result):
+                    print(result)
 					let decoder = JSONDecoder()
 					if let decodedData = try? decoder.decode(AppleTokenResponse.self, from: result) {
 						print("애플 토큰 발급 성공 \(decodedData.refresh_token)")

NanaLand/NanaLand/Home/HomeMain/HomeMainView.swift

@@ -498,8 +498,9 @@ struct AdvertisementView: View {
         .navigationDestination(for: AdvertisementViewType.self) { viewType in
             switch viewType {
             case .ad1:
-                // 광고 클릭으로 들어간 경우
-                NatureMainView(isAdvertisement: true)
+                // TODO: - 광고 클릭으로 들어갈 경우 구현
+                // 광고 클릭으로 들어간 경우 추가해야함
+                NatureMainView()
             case .ad2:
                 NatureMainView()
             case .ad3: