🪛[chore]: 프로필 수정

DDD-Community · Dec 4, 2023 · b9feb23 · b9feb23
1 parent 6e2d73d
commit b9feb23
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/PingPong/Projects/Core/Authorization/Sources/ViewModel/AuthorizationViewModel.swift b/PingPong/Projects/Core/Authorization/Sources/ViewModel/AuthorizationViewModel.swift
@@ -358,7 +358,7 @@ public class AuthorizationViewModel: ObservableObject {
                     self?.signupToViewModel(model)
                     self?.userid = model.data?.id ?? .zero
                     print("로그인 실패", model)
-                    failLoginCompletion()
+                    succesCompletion(model)
                 }
             })
     }

diff --git a/PingPong/Projects/Core/Common/Sources/ViewModel/CommonViewViewModel.swift b/PingPong/Projects/Core/Common/Sources/ViewModel/CommonViewViewModel.swift
@@ -41,6 +41,7 @@ public class CommonViewViewModel: ObservableObject {
     @Published public var coreViewPath: [CoreViewState] = []
 
     @Published public var firstUserPOPUP: Bool = false
+    @Published public var showDeleteAuthPOPUP: Bool = false
 
     @Published public var selectedTab: Tab = .home
     @Published public var goToMainView: Bool = false

diff --git a/PingPong/Projects/Feature/Profile/Sources/UI/View/MainView/ProfileView.swift b/PingPong/Projects/Feature/Profile/Sources/UI/View/MainView/ProfileView.swift
@@ -104,9 +104,7 @@ public struct ProfileView: View {
         }
 
         .navigationDestination(isPresented: $profileViewModel.gotoOtherSettingView) {
-            OtherSettingView(viewModel: viewModel, appState: appState)
-                .environmentObject(appState)
-                .environmentObject(authViewModel)
+            OtherSettingView(viewModel: viewModel, appState: appState, authViewModel: authViewModel)
                 .navigationBarBackButtonHidden()
         }
 
@@ -491,8 +489,6 @@ public struct ProfileView: View {
                 viewModel.isLogin = false
                 viewModel.isLoginCheck = false
                 authViewModel.randomAuthNickName = ""
-                presentationMode.wrappedValue.dismiss()
-
             }
     }
 }
diff --git a/PingPong/Projects/Feature/Profile/Sources/UI/View/OtherSetting/OtherSettingView.swift b/PingPong/Projects/Feature/Profile/Sources/UI/View/OtherSetting/OtherSettingView.swift
@@ -17,13 +17,19 @@ public struct OtherSettingView: View {
     @StateObject private var appState: AppState
     @StateObject private var viewModel: CommonViewViewModel
     @StateObject private var profileViewModel: ProfileViewViewModel = ProfileViewViewModel()
-    @EnvironmentObject var authViewModel: AuthorizationViewModel
+    @StateObject var authViewModel: AuthorizationViewModel
 
     @Environment(\.presentationMode) var presentationMode
 
-    public init(viewModel: CommonViewViewModel, appState: AppState) {
+    public init(
+        viewModel: CommonViewViewModel,
+        appState: AppState,
+        authViewModel: AuthorizationViewModel
+
+    ) {
         self._appState = StateObject(wrappedValue: appState)
         self._viewModel = StateObject(wrappedValue: viewModel)
+        self._authViewModel = StateObject(wrappedValue: authViewModel)
     }
 
     public var body: some View {
@@ -125,7 +131,13 @@ public struct OtherSettingView: View {
     }
 
     @ViewBuilder
-    private func listItemView(showArrow: Bool, showLine: Bool, text: String, versionText: String ,goToDeatilView: @escaping () -> Void) -> some View {
+    private func listItemView(
+        showArrow: Bool,
+        showLine: Bool,
+        text: String,
+        versionText: String ,
+        goToDeatilView: @escaping () -> Void
+    ) -> some View {
         VStack(spacing: .zero) {
             Spacer()
                 .frame(height: 20)

diff --git a/PingPong/Projects/Feature/Profile/Sources/UI/View/WithDraw/WithDrawView.swift b/PingPong/Projects/Feature/Profile/Sources/UI/View/WithDraw/WithDrawView.swift
@@ -16,16 +16,16 @@ import PopupView
 
 struct WithDrawView: View {
     @StateObject private var profileViewModel: ProfileViewViewModel = ProfileViewViewModel()
-    @ObservedObject var viewModel: CommonViewViewModel
-    @ObservedObject var authViewModel: AuthorizationViewModel
+    @StateObject var viewModel: CommonViewViewModel
+    @StateObject var authViewModel: AuthorizationViewModel
     @Environment(\.presentationMode) var presentationMode
 
     public init(
         authViewModel: AuthorizationViewModel,
         viewModel: CommonViewViewModel
     ) {
-        self._authViewModel = ObservedObject(wrappedValue: authViewModel)
-        self._viewModel = ObservedObject(wrappedValue: viewModel)
+        self._authViewModel = StateObject(wrappedValue: authViewModel)
+        self._viewModel = StateObject(wrappedValue: viewModel)
     }
 
     var body: some View {