[Refactor/#517] vaadin 설정 web 모듈로 분리 (#518)

YAPP-Github · Jan 10, 2025 · 7b2ef4c · 7b2ef4c
1 parent af29cdc
commit 7b2ef4c
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 25 deletions.
diff --git a/domain/crm/build.gradle.kts b/domain/crm/build.gradle.kts
@@ -26,9 +26,6 @@ dependencies {
     implementation("io.awspring.cloud:spring-cloud-aws-starter-sqs:${DependencyVersion.AWS_SQS}")
 
     implementation("software.amazon.awssdk:scheduler:2.29.45")
-
-    /** vaadin */
-    implementation("com.vaadin:vaadin-spring-boot-starter")
 }
 
 vaadin {

diff --git a/domain/crm/src/main/kotlin/com/few/crm/config/CrmVaadinConfig.kt b/domain/crm/src/main/kotlin/com/few/crm/config/CrmVaadinConfig.kt
diff --git a/domain/crm/src/main/kotlin/com/few/crm/view/email/CrmEmailSendHistoryView.kt b/domain/crm/src/main/kotlin/com/few/crm/view/email/CrmEmailSendHistoryView.kt
@@ -2,7 +2,7 @@ package com.few.crm.view.email
 
 import com.few.crm.email.domain.EmailSendHistory
 import com.few.crm.email.repository.EmailSendHistoryRepository
-import com.few.crm.view.CommonVerticalLayout
+import web.view.CommonVerticalLayout
 import com.vaadin.flow.component.grid.Grid
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout
 import com.vaadin.flow.component.textfield.TextArea

diff --git a/domain/crm/src/main/kotlin/com/few/crm/view/email/CrmEmailSendView.kt b/domain/crm/src/main/kotlin/com/few/crm/view/email/CrmEmailSendView.kt
@@ -10,7 +10,7 @@ import com.few.crm.support.schedule.TaskView
 import com.few.crm.support.schedule.TimeOutEventTaskManager
 import com.few.crm.user.domain.User
 import com.few.crm.user.repository.UserRepository
-import com.few.crm.view.CommonVerticalLayout
+import web.view.CommonVerticalLayout
 import com.vaadin.flow.component.button.Button
 import com.vaadin.flow.component.checkbox.Checkbox
 import com.vaadin.flow.component.datepicker.DatePicker

diff --git a/domain/crm/src/main/kotlin/com/few/crm/view/email/CrmEmailTemplateView.kt b/domain/crm/src/main/kotlin/com/few/crm/view/email/CrmEmailTemplateView.kt
@@ -6,7 +6,7 @@ import com.few.crm.email.repository.EmailTemplateHistoryRepository
 import com.few.crm.email.repository.EmailTemplateRepository
 import com.few.crm.email.usecase.PostTemplateUseCase
 import com.few.crm.email.usecase.dto.PostTemplateUseCaseIn
-import com.few.crm.view.CommonVerticalLayout
+import web.view.CommonVerticalLayout
 import com.vaadin.flow.component.button.Button
 import com.vaadin.flow.component.dialog.Dialog
 import com.vaadin.flow.component.formlayout.FormLayout

diff --git a/domain/crm/src/main/kotlin/com/few/crm/view/user/CrmUserView.kt b/domain/crm/src/main/kotlin/com/few/crm/view/user/CrmUserView.kt
@@ -5,7 +5,7 @@ import com.few.crm.user.domain.User
 import com.few.crm.user.repository.UserRepository
 import com.few.crm.user.usecase.EnrollUserUseCase
 import com.few.crm.user.usecase.dto.EnrollUserUseCaseIn
-import com.few.crm.view.CommonVerticalLayout
+import web.view.CommonVerticalLayout
 import com.vaadin.flow.component.button.Button
 import com.vaadin.flow.component.dialog.Dialog
 import com.vaadin.flow.component.formlayout.FormLayout

diff --git a/domain/crm/src/main/resources/application-crm-local.yml b/domain/crm/src/main/resources/application-crm-local.yml
@@ -24,5 +24,3 @@ spring:
         properties:
             hibernate:
                 format_sql: true
-vaadin:
-    urlMapping: /view/*
diff --git a/domain/crm/src/main/resources/application-crm-prd.yml b/domain/crm/src/main/resources/application-crm-prd.yml
@@ -24,5 +24,3 @@ spring:
             properties:
                 hibernate:
                     format_sql: true
-vaadin:
-    urlMapping: /view/*
diff --git a/library/web/build.gradle.kts b/library/web/build.gradle.kts
@@ -22,4 +22,8 @@ dependencies {
     api("org.springframework.restdocs:spring-restdocs-mockmvc")
     api("org.springdoc:springdoc-openapi-ui:${DependencyVersion.SPRINGDOC}")
     api("com.epages:restdocs-api-spec-mockmvc:${DependencyVersion.EPAGES_REST_DOCS_API_SPEC}")
+
+
+    /** vaadin */
+    api("com.vaadin:vaadin-spring-boot-starter")
 }
diff --git a/library/web/src/main/kotlin/web/config/VaadinConfig.kt b/library/web/src/main/kotlin/web/config/VaadinConfig.kt
@@ -0,0 +1,14 @@
+package web.config
+import com.vaadin.flow.spring.annotation.EnableVaadin
+import com.vaadin.hilla.crud.CrudConfiguration
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+@EnableVaadin(value = ["com.few"])
+@EnableAutoConfiguration(
+    exclude =  [
+        CrudConfiguration::class,
+    ]
+)
+class VaadinConfig
diff --git a/.../com/few/crm/view/CommonVerticalLayout.kt → ...n/kotlin/web/view/CommonVerticalLayout.kt b/.../com/few/crm/view/CommonVerticalLayout.kt → ...n/kotlin/web/view/CommonVerticalLayout.kt
@@ -1,4 +1,4 @@
-package com.few.crm.view
+package web.view
 
 import com.vaadin.flow.component.UI
 import com.vaadin.flow.component.button.Button
@@ -19,11 +19,11 @@ abstract class CommonVerticalLayout : VerticalLayout() {
         val user = VaadinService.getCurrentRequest().wrappedSession.getAttribute("user")
         if (user == null || user == "") {
             UI.getCurrent().access {
-                UI.getCurrent().navigate("crm/login")
+                UI.getCurrent().navigate("login")
             }
         }
 
-        val logo = H1("FEW CRM")
+        val logo = H1("FEW")
         logo.addClassName("logo")
         val logout =
             Button("Logout") {

diff --git a/...n/kotlin/com/few/crm/view/CrmLoginView.kt → ...web/src/main/kotlin/web/view/LoginView.kt b/...n/kotlin/com/few/crm/view/CrmLoginView.kt → ...web/src/main/kotlin/web/view/LoginView.kt
@@ -1,4 +1,4 @@
-package com.few.crm.view
+package web.view
 
 import com.vaadin.flow.component.UI
 import com.vaadin.flow.component.html.H1
@@ -13,10 +13,10 @@ import com.vaadin.flow.server.VaadinService
 import com.vaadin.flow.server.auth.AnonymousAllowed
 import org.springframework.web.client.RestTemplate
 
-@Route("/crm/login")
+@Route("/login")
 @PageTitle("Login")
 @AnonymousAllowed
-class CrmLoginView :
+class LoginView :
     VerticalLayout(),
     BeforeEnterObserver {
     private val loginOverlay = LoginOverlay()

diff --git a/library/web/src/main/resources/application-web-local.yml b/library/web/src/main/resources/application-web-local.yml
@@ -21,3 +21,6 @@ web:
 
 webhook:
     discord: "localhost:8080/webhook/discord/unused"
+
+vaadin:
+    urlMapping: /view/*
diff --git a/library/web/src/main/resources/application-web-prd.yml b/library/web/src/main/resources/application-web-prd.yml
@@ -21,3 +21,6 @@ web:
 
 webhook:
     discord: ${WEBHOOK_DISCORD}
+
+vaadin:
+    urlMapping: /view/*