Merge pull request #2 from Ingrsso/rkddus

Projects/App/Project.swift

@@ -25,8 +25,9 @@ let project = Project(
                 ]
             ),
             sources: ["Sources/**"],
+            resources: ["Resources/**"],
             dependencies: [
-                .project(target: "Login", path: "../../Modules/Presentation/Login")
+                .project(target: "Presentation", path: "../Presentation")
             ]
         )
     ]

Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,35 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/App/Sources/SceneDelegate.swift

@@ -1,15 +1,14 @@
 import UIKit
-import Login
-import DesignSystem
-
+import Shared
+import Presentation
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         // MARK: - Tuist 디자인 시스템 폰트 등록 - 
-        FontRegistrar.registerFont()
+        Pretendard.registerFont()
 
         guard let windowScene = (scene as? UIWindowScene) else { return }
         window = UIWindow(frame: windowScene.coordinateSpace.bounds)

Modules/Domain/Auth/Project.swift → Projects/Data/Project.swift

@@ -1,14 +1,13 @@
 import ProjectDescription
 
 let project = Project(
-    name: "AuthDomain",
+    name: "Data",
     targets: [
         .target(
-            name: "AuthDomain",
+            name: "Data",
             destinations: .iOS,
             product: .staticFramework,
-
-            bundleId: "com.hereit.domain.auth",
+            bundleId: "com.hereit.data",
             infoPlist: .default,
             sources: ["Sources/**"],
             dependencies: []

Modules/Data/Auth/Project.swift → Projects/Domain/Project.swift

@@ -1,18 +1,16 @@
 import ProjectDescription
 
 let project = Project(
-    name: "AuthData",
+    name: "Domain",
     targets: [
         .target(
-            name: "AuthData",
+            name: "Domain",
             destinations: .iOS,
             product: .staticFramework,
-            bundleId: "com.hereit.data.auth",
+            bundleId: "com.hereit.domain",
             infoPlist: .default,
             sources: ["Sources/**"],
-            dependencies: [
-                .project(target: "AuthDomain", path: "../../Domain/Auth"),
-            ]
+            dependencies: []
         )
     ]
 )

Modules/Shared/UIComponents/Project.swift → Projects/Presentation/Project.swift

@@ -1,19 +1,20 @@
 import ProjectDescription
 
 let project = Project(
-    name: "UIComponents",
+    name: "Presentation",
     targets: [
         .target(
-            name: "UIComponents",
+            name: "Presentation",
             destinations: .iOS,
             product: .staticFramework,
-            bundleId: "com.hereit.shared.uicomponents",
+            bundleId: "com.hereit.presentation",
             infoPlist: .default,
             sources: ["Sources/**"],
-            resources: ["Resources/**"],
             dependencies: [
                 .external(name: "SnapKit"),
-                .project(target: "DesignSystem", path: "../DesignSystem")
+                .project(target: "Domain", path: "../Domain"),
+                .project(target: "Data", path: "../Data"),
+                .project(target: "Shared", path: "../Shared")
             ]
         )
     ]

Modules/Presentation/Login/Sources/Scene/LoginScene.swift → Projects/Presentation/Sources/Auth/Login/LoginScene.swift

@@ -2,7 +2,7 @@ import UIKit
 
 public enum LoginScene {
     public static func create() -> UIViewController {
-        let viewModel = AuthViewModel()
+        let viewModel = LoginViewModel()
         let viewController = LoginViewController(viewModel: viewModel)
         return viewController
     }

Modules/Presentation/Login/Sources/View/LoginViewController.swift → Projects/Presentation/Sources/Auth/Login/LoginViewController.swift

@@ -1,12 +1,11 @@
 import UIKit
-import UIComponents
-import DesignSystem
+import Shared
 
 final class LoginViewController: UIViewController {
 
     // MARK: - Properties
 
-    private let viewModel: AuthViewModel
+    private let viewModel: LoginViewModel
 
 
     private lazy var titleLabel: UILabel = {
@@ -172,7 +171,7 @@ final class LoginViewController: UIViewController {
 
     // MARK: - Init
 
-    init(viewModel: AuthViewModel) {
+    init(viewModel: LoginViewModel) {
         self.viewModel = viewModel
         super.init(nibName: nil, bundle: nil)
     }
@@ -225,6 +224,6 @@ final class LoginViewController: UIViewController {
 }
 
 #Preview {
-    FontRegistrar.registerFont()
-    return LoginViewController(viewModel: AuthViewModel())
+    Pretendard.registerFont()
+    return LoginViewController(viewModel: LoginViewModel())
 }

Modules/Presentation/Login/Sources/ViewModel/AuthViewModel.swift → Projects/Presentation/Sources/Auth/Login/LoginViewModel.swift

@@ -1,12 +1,10 @@
 import Foundation
 
-final class AuthViewModel {
+final class LoginViewModel {
     var email : String = ""
     func login(email: String, password: String) {
         self.email = email
         print("Logging in with email: \(email), password: \(password)")
     }
-    func signup(fullName: String,email: String, password: String) {
-        print("Logging in with fullName: \(fullName) email: \(email), password: \(password)")
-    }
+
 }

Modules/Presentation/Login/Sources/View/SignUpViewController.swift → Projects/Presentation/Sources/Auth/Register/Register/RegisterViewController.swift

@@ -1,12 +1,11 @@
 import UIKit
-import UIComponents
-import DesignSystem
+import Shared
 
-final class SignUpViewController: UIViewController {
+final class RegisterViewController: UIViewController {
 
     // MARK: - Properties
 
-    private let viewModel: AuthViewModel
+    private let viewModel: RegisterViewModel
 
 
     private lazy var titleLabel: UILabel = {
@@ -118,7 +117,7 @@ final class SignUpViewController: UIViewController {
 
     // MARK: - Init
 
-    init(viewModel: AuthViewModel) {
+    init(viewModel: RegisterViewModel) {
         self.viewModel = viewModel
         super.init(nibName: nil, bundle: nil)
     }
@@ -158,7 +157,7 @@ final class SignUpViewController: UIViewController {
         let email = emailField.getTextField().text ?? ""
         let password = passwordField.getTextField().text ?? ""
 
-        viewModel.signup(fullName: fullName, email: email, password: password)
+        viewModel.register(fullName: fullName, email: email, password: password)
     }
 
     @objc private func didTapForgotPassword() {
@@ -171,6 +170,6 @@ final class SignUpViewController: UIViewController {
 }
 
 #Preview {
-    FontRegistrar.registerFont()
-    return SignUpViewController(viewModel: AuthViewModel())
+    Pretendard.registerFont()
+    return RegisterViewController(viewModel: RegisterViewModel())
 }

Projects/Presentation/Sources/Auth/Register/Register/RegisterViewModel.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+final class RegisterViewModel {
+    var email : String = ""
+    var password : String = ""
+    var fullName : String = ""
+
+    func register(fullName: String, email: String, password: String) {
+        self.email = email
+        self.password = email
+        self.fullName = email
+        print("Logging in with email: \(email), password: \(password)")
+    }
+
+}