🔀 :: 정보입력 - 프로젝트 페이지

Plugin/DependencyPlugin/ProjectDescriptionHelpers/Dependency+Target.swift

@@ -9,6 +9,14 @@ public extension TargetDependency {
 }
 
 public extension TargetDependency.Feature {
+    static let InputProjectInfoFeatureInterface = TargetDependency.project(
+        target: ModulePaths.Feature.InputProjectInfoFeature.targetName(type: .interface),
+        path: .relativeToFeature(ModulePaths.Feature.InputProjectInfoFeature.rawValue)
+    )
+    static let InputProjectInfoFeature = TargetDependency.project(
+        target: ModulePaths.Feature.InputProjectInfoFeature.targetName(type: .sources),
+        path: .relativeToFeature(ModulePaths.Feature.InputProjectInfoFeature.rawValue)
+    )
     static let SplashFeatureInterface = TargetDependency.project(
         target: ModulePaths.Feature.SplashFeature.targetName(type: .interface),
         path: .relativeToFeature(ModulePaths.Feature.SplashFeature.rawValue)

Plugin/DependencyPlugin/ProjectDescriptionHelpers/ModulePaths.swift

@@ -10,6 +10,7 @@ public enum ModulePaths {
 
 public extension ModulePaths {
     enum Feature: String {
+        case InputProjectInfoFeature
         case SplashFeature
         case MainFeature
         case TechStackAppendFeature

Projects/App/Project.swift

@@ -46,6 +46,7 @@ let targets: [Target] = [
             .Feature.InputMilitaryInfoFeature,
             .Feature.InputCertificateInfoFeature,
             .Feature.InputLanguageInfoFeature,
+            .Feature.InputProjectInfoFeature,
             .Feature.MainFeature,
             .Feature.SplashFeature,
             .Feature.TechStackAppendFeature,

Projects/App/Sources/Application/DI/AppComponent.swift

@@ -3,6 +3,8 @@ import AuthDomainInterface
 import BaseDomain
 import FileDomain
 import FileDomainInterface
+import FilterFeature
+import FilterFeatureInterface
 import InputCertificateInfoFeature
 import InputCertificateInfoFeatureInterface
 import InputInformationFeature
@@ -13,12 +15,12 @@ import InputMilitaryInfoFeature
 import InputMilitaryInfoFeatureInterface
 import InputProfileInfoFeature
 import InputProfileInfoFeatureInterface
+import InputProjectInfoFeature
+import InputProjectInfoFeatureInterface
 import InputSchoolLifeInfoFeature
 import InputSchoolLifeInfoFeatureInterface
 import InputWorkInfoFeature
 import InputWorkInfoFeatureInterface
-import FilterFeature
-import FilterFeatureInterface
 import JwtStore
 import JwtStoreInterface
 import KeychainModule
@@ -86,6 +88,10 @@ final class AppComponent: BootstrapComponent {
         InputLanguageInfoComponent(parent: self)
     }
 
+    var inputProjectInfoBuildable: any InputProjectInfoBuildable {
+        InputProjectInfoComponent(parent: self)
+    }
+
     var mainBuildable: any MainBuildable {
         MainComponent(parent: self)
     }

Projects/App/Sources/Application/NeedleGenerated.swift

@@ -19,6 +19,8 @@ import InputMilitaryInfoFeature
 import InputMilitaryInfoFeatureInterface
 import InputProfileInfoFeature
 import InputProfileInfoFeatureInterface
+import InputProjectInfoFeature
+import InputProjectInfoFeatureInterface
 import InputSchoolLifeInfoFeature
 import InputSchoolLifeInfoFeatureInterface
 import InputWorkInfoFeature
@@ -88,6 +90,19 @@ private class SplashDependencye0cb7136f2ec3edfd60aProvider: SplashDependency {
 private func factoryace9f05f51d68f4c0677f47b58f8f304c97af4d5(_ component: NeedleFoundation.Scope) -> AnyObject {
     return SplashDependencye0cb7136f2ec3edfd60aProvider(appComponent: parent1(component) as! AppComponent)
 }
+private class InputProjectInfoDependencye065c7f60c5c520999a0Provider: InputProjectInfoDependency {
+    var techStackAppendBuildable: any TechStackAppendBuildable {
+        return appComponent.techStackAppendBuildable
+    }
+    private let appComponent: AppComponent
+    init(appComponent: AppComponent) {
+        self.appComponent = appComponent
+    }
+}
+/// ^->AppComponent->InputProjectInfoComponent
+private func factory2378736e5949c5e8e9f4f47b58f8f304c97af4d5(_ component: NeedleFoundation.Scope) -> AnyObject {
+    return InputProjectInfoDependencye065c7f60c5c520999a0Provider(appComponent: parent1(component) as! AppComponent)
+}
 private class InputWorkInfoDependency74441f61366e4e5af9a2Provider: InputWorkInfoDependency {
 
 
@@ -142,6 +157,9 @@ private class FilterDependencya3adf5d0affb84ca15efProvider: FilterDependency {
     var majorDomainBuildable: any MajorDomainBuildable {
         return appComponent.majorDomainBuildable
     }
+    var userDomainBuildable: any UserDomainBuildable {
+        return appComponent.userDomainBuildable
+    }
     private let appComponent: AppComponent
     init(appComponent: AppComponent) {
         self.appComponent = appComponent
@@ -243,6 +261,9 @@ private class InputInformationDependency7b32a8e7e8a8f0ab5466Provider: InputInfor
     var inputLanguageInfoBuildable: any InputLanguageInfoBuildable {
         return appComponent.inputLanguageInfoBuildable
     }
+    var inputProjectInfoBuildable: any InputProjectInfoBuildable {
+        return appComponent.inputProjectInfoBuildable
+    }
     var fileDomainBuildable: any FileDomainBuildable {
         return appComponent.fileDomainBuildable
     }
@@ -402,6 +423,11 @@ extension SplashComponent: Registration {
         keyPathToName[\SplashDependency.authDomainBuildable] = "authDomainBuildable-any AuthDomainBuildable"
     }
 }
+extension InputProjectInfoComponent: Registration {
+    public func registerItems() {
+        keyPathToName[\InputProjectInfoDependency.techStackAppendBuildable] = "techStackAppendBuildable-any TechStackAppendBuildable"
+    }
+}
 extension InputWorkInfoComponent: Registration {
     public func registerItems() {
 
@@ -425,6 +451,7 @@ extension FilterComponent: Registration {
     public func registerItems() {
         keyPathToName[\FilterDependency.techStackAppendBuildable] = "techStackAppendBuildable-any TechStackAppendBuildable"
         keyPathToName[\FilterDependency.majorDomainBuildable] = "majorDomainBuildable-any MajorDomainBuildable"
+        keyPathToName[\FilterDependency.userDomainBuildable] = "userDomainBuildable-any UserDomainBuildable"
     }
 }
 extension RootComponent: Registration {
@@ -464,6 +491,7 @@ extension InputInformationComponent: Registration {
         keyPathToName[\InputInformationDependency.inputMilitaryInfoBuildable] = "inputMilitaryInfoBuildable-any InputMilitaryInfoBuildable"
         keyPathToName[\InputInformationDependency.inputCertificateInfoBuildable] = "inputCertificateInfoBuildable-any InputCertificateInfoBuildable"
         keyPathToName[\InputInformationDependency.inputLanguageInfoBuildable] = "inputLanguageInfoBuildable-any InputLanguageInfoBuildable"
+        keyPathToName[\InputInformationDependency.inputProjectInfoBuildable] = "inputProjectInfoBuildable-any InputProjectInfoBuildable"
         keyPathToName[\InputInformationDependency.fileDomainBuildable] = "fileDomainBuildable-any FileDomainBuildable"
         keyPathToName[\InputInformationDependency.studentDomainBuildable] = "studentDomainBuildable-any StudentDomainBuildable"
     }
@@ -535,6 +563,7 @@ private func registerProviderFactory(_ componentPath: String, _ factory: @escapi
     registerProviderFactory("^->AppComponent", factoryEmptyDependencyProvider)
     registerProviderFactory("^->AppComponent->KeychainComponent", factoryEmptyDependencyProvider)
     registerProviderFactory("^->AppComponent->SplashComponent", factoryace9f05f51d68f4c0677f47b58f8f304c97af4d5)
+    registerProviderFactory("^->AppComponent->InputProjectInfoComponent", factory2378736e5949c5e8e9f4f47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->InputWorkInfoComponent", factoryfff86bd7854b30412216e3b0c44298fc1c149afb)
     registerProviderFactory("^->AppComponent->MainComponent", factoryc9274e46e78e70f29c54f47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->InputSchoolLifeInfoComponent", factorydc1feebed8f042db375fe3b0c44298fc1c149afb)

Projects/Core/DesignSystem/Project.swift

@@ -11,7 +11,8 @@ let project = Project.makeModule(
         .SPM.Lottie
     ],
     internalDependencies: [
-        .Shared.ViewUtil
+        .Shared.ViewUtil,
+        .Shared.DateUtil
     ],
     resources: ["Resources/**"],
     resourceSynthesizers: .default + [

Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/Calendar.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Calendar.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/Core/DesignSystem/Resources/Icon/Icons.xcassets/WaterWave.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "WaterWave.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/Core/DesignSystem/Sources/DatePicker/BottomSheetYearMonthDatePickerView.swift

@@ -0,0 +1,73 @@
+import DateUtil
+import SwiftUI
+import ViewUtil
+
+public extension View {
+    func datePicker(
+        isShowing: Binding<Bool>,
+        completion: @escaping (Date) -> Void
+    ) -> some View {
+        self.smsBottomSheet(isShowing: isShowing) {
+            BottomSheetYearMonthDatePickerView(isShowing: isShowing, completion: completion)
+        }
+    }
+}
+
+public struct BottomSheetYearMonthDatePickerView: View {
+    @Binding var isShowing: Bool
+    @Environment(\.dismiss) var dismiss
+    @State var selectedYear = 0
+    @State var selectedMonth = 0
+    var completion: (Date) -> Void
+    var currentYear: Int {
+        Date().year
+    }
+
+    public init(
+        isShowing: Binding<Bool>,
+        completion: @escaping (Date) -> Void
+    ) {
+        self._isShowing = isShowing
+        self.completion = completion
+    }
+
+    public var body: some View {
+        VStack(spacing: 16) {
+            HStack {
+                SMSText("날짜선택", font: .title2)
+
+                Spacer()
+
+                SMSText("완료", font: .body2)
+                    .foregroundColor(.sms(.primary(.p2)))
+                    .buttonWrapper {
+                        let year = selectedYear + currentYear - 10
+                        let month = selectedMonth + 1
+                        guard let date = DateComponents(calendar: .current, year: year, month: month).date else { return }
+                        self.isShowing = false
+                        self.completion(date)
+                    }
+            }
+
+            HStack(spacing: 0) {
+                Picker(selection: $selectedYear) {
+                    ForEach(currentYear - 10 ..< currentYear + 1) { year in
+                        SMSText("\(year)", font: .title1)
+                    }
+                } label: {
+                    EmptyView()
+                }
+
+                Picker(selection: $selectedMonth) {
+                    ForEach(1..<13) { month in
+                        SMSText("\(month)", font: .title1)
+                    }
+                } label: {
+                    EmptyView()
+                }
+            }
+            .pickerStyle(.wheel)
+        }
+        .padding(.horizontal, 20)
+    }
+}

Projects/Core/DesignSystem/Sources/Icon/SMSIcon.swift

@@ -20,6 +20,7 @@ public struct SMSIcon: View {
 
     public enum Icon: CaseIterable {
         case book
+        case calendar
         case camera
         case check
         case checkmark
@@ -39,6 +40,7 @@ public struct SMSIcon: View {
         case smallPlus
         case upArrow
         case magnifyingglass
+        case waterWave
         case xmark
         case xmarkOutline
     }
@@ -56,6 +58,9 @@ public struct SMSIcon: View {
         case .book:
             return DesignSystemAsset.Icons.book.swiftUIImage
 
+        case .calendar:
+            return DesignSystemAsset.Icons.calendar.swiftUIImage
+
         case .camera:
             return DesignSystemAsset.Icons.camera.swiftUIImage
 
@@ -113,6 +118,9 @@ public struct SMSIcon: View {
         case .magnifyingglass:
             return DesignSystemAsset.Icons.magnifyingglass.swiftUIImage
 
+        case .waterWave:
+            return DesignSystemAsset.Icons.waterWave.swiftUIImage
+
         case .xmark:
             return DesignSystemAsset.Icons.xmark.swiftUIImage
 

Projects/Feature/FilterFeature/Sources/DI/FilterComponent.swift

@@ -1,13 +1,15 @@
-import SwiftUI
-import FilterFeatureInterface
-import TechStackAppendFeatureInterface
 import BaseFeature
+import FilterFeatureInterface
 import MajorDomainInterface
 import NeedleFoundation
+import SwiftUI
+import TechStackAppendFeatureInterface
+import UserDomainInterface
 
 public protocol FilterDependency: Dependency {
     var techStackAppendBuildable: any TechStackAppendBuildable { get }
     var majorDomainBuildable: any MajorDomainBuildable { get }
+    var userDomainBuildable: any UserDomainBuildable { get }
 }
 
 public final class FilterComponent: Component<FilterDependency>, FilterBuildable {
@@ -16,7 +18,8 @@ public final class FilterComponent: Component<FilterDependency>, FilterBuildable
         let intent = FilterIntent(
             model: model,
             filterDelegate: delegate,
-            fetchMajorListUseCase: dependency.majorDomainBuildable.fetchMajorListUseCase
+            fetchMajorListUseCase: dependency.majorDomainBuildable.fetchMajorListUseCase,
+            loadUserRoleUseCase: dependency.userDomainBuildable.loadUserRoleUseCase
         )
         let container = MVIContainer(
             intent: intent as FilterIntentProtocol,

Projects/Feature/FilterFeature/Sources/Intent/FilterIntent.swift

@@ -1,25 +1,31 @@
 import Combine
-import SwiftUI
 import FilterFeatureInterface
-import StudentDomainInterface
 import MajorDomainInterface
+import StudentDomainInterface
+import SwiftUI
+import UserDomainInterface
 
 final class FilterIntent: FilterIntentProtocol {
     private weak var model: (any FilterActionProtocol)?
     private weak var filterDelegate: (any FilterDelegate)?
     private let fetchMajorListUseCase: any FetchMajorListUseCase
+    private let loadUserRoleUseCase: any LoadUserRoleUseCase
 
     init(
         model: any FilterActionProtocol,
         filterDelegate: any FilterDelegate,
-        fetchMajorListUseCase: any FetchMajorListUseCase
+        fetchMajorListUseCase: any FetchMajorListUseCase,
+        loadUserRoleUseCase: any LoadUserRoleUseCase
     ) {
         self.filterDelegate = filterDelegate
         self.model = model
         self.fetchMajorListUseCase = fetchMajorListUseCase
+        self.loadUserRoleUseCase = loadUserRoleUseCase
     }
 
     func onAppear() {
+        let userRole = loadUserRoleUseCase.execute()
+        model?.updateUserRole(role: userRole)
         Task {
             let majorList = try await fetchMajorListUseCase.execute()
             model?.updpateMajorList(majorList: majorList)

Projects/Feature/FilterFeature/Sources/Scene/FilterView.swift

@@ -32,7 +32,7 @@ struct FilterView: View {
                         .padding(.bottom, 20)
 
                     VStack(alignment: .leading, spacing: 40) {
-                        ConditionView(state.userRole == .student) {
+                        ConditionView(state.userRole == .student || state.userRole == .teacher) {
                             gradeSection()
 
                             classSection()
@@ -42,7 +42,7 @@ struct FilterView: View {
 
                         majorSection()
 
-                        ConditionView(state.userRole == .student) {
+                        ConditionView(state.userRole == .student || state.userRole == .teacher) {
                             ConditionView(state.userRole == .teacher) {
                                 formOfEmploymentSetcion()
 

Projects/Feature/InputCertificateInfoFeature/Sources/Scene/InputCertificateInfoView.swift

@@ -20,7 +20,7 @@ struct InputCertificateInfoView: View {
                         InputInformationPageTitleView(
                             title: "자격증",
                             isRequired: false,
-                            pageCount: 6,
+                            pageCount: 7,
                             selectedPage: 4
                         )