Merge pull request #45 from Student-Center/feature/WEAV-135

[WEAV-135] 프로필, 이상형 정보 입력 Intro 뷰 생성

Projects/App/Sources/Debug/AuthInfoView.swift

@@ -155,6 +155,14 @@ struct AuthDebugInfoView: View {
                 dismissButton: .default(Text("확인"))
             )
         }
+        .toolbarRole(.navigationStack)
+        .toolbar {
+            ToolbarItem(placement: .topBarTrailing) {
+                Button("로그아웃", role: .destructive) {
+                    AppCoordinator.shared.logout()
+                }
+            }
+        }
     }
 
     // 클립보드에 복사하는 함수

Projects/App/Sources/Navigation/NavigationStack.swift

@@ -40,6 +40,9 @@ extension PathType {
             case .authAgreement(let input):
                 AuthAgreementView(input)
 
+            case .profileIntro(let input):
+                ProfileIntroView(input)
+
             case .authGreeting(let input):
                 AuthGreetingView(input)
             case .authProfileGender(let input):
@@ -55,6 +58,8 @@ extension PathType {
             case .authName(let input):
                 AuthNameInputView(input)
 
+            case .dreamPartnerIntro(let input):
+                DreamPartnerIntroView(input)
             case .dreamPartnerAgeRange(let input):
                 DreamPartnerAgeView(input)
             case .dreamPartnerJobOccupation(let input):

Projects/Core/CommonKit/Sources/AppCoordinator.swift

@@ -122,4 +122,11 @@ public final class AppCoordinator: ObservableObject {
             }
         }
     }
+
+    public func logout() {
+        TokenManager.accessToken = nil
+        TokenManager.refreshToken = nil
+        TokenManager.registerToken = nil
+        AuthState.change(.loggedOut)
+    }
 }

Projects/Core/CommonKit/Sources/Path/PathTypes.swift

@@ -52,6 +52,7 @@ public enum PathType: Hashable {
         .signUp(.authRegion(input: .mock)),
         .signUp(.authPhoneInput),
 
+        .signUp(.dreamPartnerIntro(input: .mock)),
         .signUp(.dreamPartnerAgeRange(input: .mock))
     ]
     #endif
@@ -69,6 +70,8 @@ public enum PathType: Hashable {
             case .authPhoneVerify: return "전화번호 인증"
             case .authAgreement: return "이용 약관"
 
+            case .profileIntro: return "프로필 입력 인트로"
+
             case .authGreeting: return "가입 후 환영"
             case .authProfileGender: return "성별 입력"
             case .authProfileAge: return "나이 입력"
@@ -77,6 +80,7 @@ public enum PathType: Hashable {
             case .authRegion: return "내 지역, 선호 지역 입력"
             case .authName: return "이름 입력"
 
+            case .dreamPartnerIntro: return "이상형 입력 인트로"
             case .dreamPartnerAgeRange: return "이상형 나이대"
             case .dreamPartnerJobOccupation: return "이상형 직업"
             case .dreamPartnerDistance: return "이상형과의 거리"
@@ -90,6 +94,7 @@ public enum SignUpSubViewType: Hashable {
     case authPhoneVerify(SMSSendResponse)
     case authAgreement(input: SignUpFormDomain)
 
+    case profileIntro(input: SignUpFormDomain)
     case authGreeting(input: SignUpFormDomain)
     case authProfileGender(input: SignUpFormDomain)
     case authProfileAge(input: SignUpFormDomain)
@@ -98,6 +103,7 @@ public enum SignUpSubViewType: Hashable {
     case authRegion(input: SignUpFormDomain)
     case authName(input: SignUpFormDomain)
 
+    case dreamPartnerIntro(input: SignUpFormDomain)
     case dreamPartnerAgeRange(input: SignUpFormDomain)
     case dreamPartnerJobOccupation(input: SignUpFormDomain)
     case dreamPartnerDistance(input: SignUpFormDomain)
@@ -108,6 +114,8 @@ public enum SignUpSubViewType: Hashable {
 
     public func hash(into hasher: inout Hasher) {
         switch self {
+        case .profileIntro:
+            hasher.combine(-1)
         case .authPhoneInput:
             hasher.combine(0)
         case .authPhoneVerify:
@@ -129,6 +137,8 @@ public enum SignUpSubViewType: Hashable {
         case .authName:
             hasher.combine(9)
 
+        case .dreamPartnerIntro:
+            hasher.combine(-2)
         case .dreamPartnerAgeRange:
             hasher.combine(10)
         case .dreamPartnerJobOccupation:

Projects/DesignSystem/DesignCore/Resources/Images/Images.xcassets/heart-with-arrow.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "heart-with-arrow.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "heart-with-arrow@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "heart-with-arrow@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/DesignSystem/DesignCore/Resources/Images/Images.xcassets/magnifying-glass.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "magnifying-glass.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "magnifying-glass@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "magnifying-glass@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/Features/SignUp/Sources/AuthSignUp/AuthAgreement/AuthAgreementIntent.swift

@@ -53,7 +53,7 @@ extension AuthAgreementIntent: AuthAgreementIntent.Intentable {
     func onTapNextButton() {
         Task {
             await AppCoordinator.shared.changeRootView(
-                .signUp(.authGreeting(input: input.input))
+                .signUp(.profileIntro(input: input.input))
             )
         }
     }

Projects/Features/SignUp/Sources/DreamPartnerInput/DreamPartnerAge/DreamPartnerAgeView.swift

@@ -137,7 +137,7 @@ public struct DreamPartnerAgeView: View {
         }
         .ignoresSafeArea(.keyboard)
         .textureBackground()
-        .setPopNavigation {
+        .setNavigation(showLeftBackButton: false) {
             AppCoordinator.shared.pop()
         }
         .setLoading(state.isLoading)

Projects/Features/SignUp/Sources/DreamPartnerInput/DreamPartnerIntro/DreamPartnerIntroIntent.swift

@@ -0,0 +1,66 @@
+//
+//  DreamPartnerIntroIntent.swift
+//  SignUp
+//
+//  Created by 김지수 on 11/21/24.
+//  Copyright © 2024 com.weave. All rights reserved.
+//
+
+import Foundation
+import CommonKit
+import CoreKit
+import Model
+
+//MARK: - Intent
+class DreamPartnerIntroIntent {
+    private weak var model: DreamPartnerIntroModelActionable?
+    private let input: DataModel
+
+    // MARK: Life cycle
+    init(
+        model: DreamPartnerIntroModelActionable,
+        input: DataModel
+    ) {
+        self.input = input
+        self.model = model
+
+        Task {
+            try? await Task.sleep(for: .milliseconds(2500))
+            await pushNextView()
+        }
+    }
+}
+
+//MARK: - Intentable
+extension DreamPartnerIntroIntent {
+    protocol Intentable {
+        // content
+        func pushNextView() async
+        func onTapNextButton()
+
+        // default
+        func onAppear()
+        func task() async
+    }
+
+    struct DataModel {
+        let input: SignUpFormDomain
+    }
+}
+
+//MARK: - Intentable
+extension DreamPartnerIntroIntent: DreamPartnerIntroIntent.Intentable {
+    // default
+    func onAppear() {}
+
+    func task() async {}
+
+    // content
+    @MainActor
+    func pushNextView() async {
+        AppCoordinator.shared.changeRootView(
+            .signUp(.dreamPartnerAgeRange(input: input.input))
+        )
+    }
+    func onTapNextButton() {}
+}

Projects/Features/SignUp/Sources/DreamPartnerInput/DreamPartnerIntro/DreamPartnerIntroModel.swift

@@ -0,0 +1,78 @@
+//
+//  DreamPartnerIntroModel.swift
+//  SignUp
+//
+//  Created by 김지수 on 11/21/24.
+//  Copyright © 2024 com.weave. All rights reserved.
+//
+
+import Foundation
+import CommonKit
+import CoreKit
+
+final class DreamPartnerIntroModel: ObservableObject {
+
+    //MARK: Stateful
+    protocol Stateful {
+        // content
+        var isValidated: Bool { get }
+
+        // default
+        var isLoading: Bool { get }
+
+        // error
+        var showErrorView: ErrorModel? { get }
+        var showErrorAlert: ErrorModel? { get }
+    }
+
+    //MARK: State Properties
+    // content
+    @Published var isValidated: Bool = false
+
+    // default
+    @Published var isLoading: Bool = false
+
+    // error
+    @Published var showErrorView: ErrorModel?
+    @Published var showErrorAlert: ErrorModel?
+}
+
+extension DreamPartnerIntroModel: DreamPartnerIntroModel.Stateful {}
+
+//MARK: - Actionable
+protocol DreamPartnerIntroModelActionable: AnyObject {
+    // content
+    func setValidation(value: Bool)
+
+    // default
+    func setLoading(status: Bool)
+
+    // error
+    func showErrorView(error: ErrorModel)
+    func showErrorAlert(error: ErrorModel)
+    func resetError()
+}
+
+extension DreamPartnerIntroModel: DreamPartnerIntroModelActionable {
+    // content
+    func setValidation(value: Bool) {
+        isValidated = value
+    }
+
+    // default
+    func setLoading(status: Bool) {
+        isLoading = status
+    }
+
+    // error
+    func showErrorView(error: ErrorModel) {
+        showErrorView = error
+    }
+    func showErrorAlert(error: ErrorModel) {
+        showErrorAlert = error
+    }
+    func resetError() {
+        showErrorView = nil
+        showErrorAlert = nil
+    }
+}