From 0f4dd3ecb5da1989d56a6e04665ca3740fb375da Mon Sep 17 00:00:00 2001 From: belljun3395 <195850@jnu.ac.kr> Date: Fri, 10 Jan 2025 19:05:20 +0900 Subject: [PATCH] =?UTF-8?q?=08[Fix/#517]=20Vaadin=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#519)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: vaadin 설정 web 모듈로 분리 * chore: lint 적용 * fix: LoginView 포함 되도록 수정 * fix: LoginView 포함 되도록 수정 --- .../com/few/crm/view/email/CrmEmailSendHistoryView.kt | 2 +- .../kotlin/com/few/crm/view/email/CrmEmailSendView.kt | 2 +- .../com/few/crm/view/email/CrmEmailTemplateView.kt | 2 +- .../main/kotlin/com/few/crm/view/user/CrmUserView.kt | 2 +- library/web/build.gradle.kts | 1 - .../web/src/main/kotlin/web/config/VaadinConfig.kt | 11 ++++++++--- 6 files changed, 12 insertions(+), 8 deletions(-) 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 index bc5aefece..c4d88d4ee 100644 --- 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,13 +2,13 @@ package com.few.crm.view.email import com.few.crm.email.domain.EmailSendHistory import com.few.crm.email.repository.EmailSendHistoryRepository -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 import com.vaadin.flow.component.textfield.TextField import com.vaadin.flow.router.Route import org.springframework.data.domain.Sort +import web.view.CommonVerticalLayout @Route("/crm/email/send/histories") class CrmEmailSendHistoryView( 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 index 52860440c..371df5e01 100644 --- 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,6 @@ 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 web.view.CommonVerticalLayout import com.vaadin.flow.component.button.Button import com.vaadin.flow.component.checkbox.Checkbox import com.vaadin.flow.component.datepicker.DatePicker @@ -26,6 +25,7 @@ import com.vaadin.flow.component.timepicker.TimePicker import com.vaadin.flow.router.Route import org.springframework.context.ApplicationEventPublisher import org.springframework.data.domain.Sort +import web.view.CommonVerticalLayout import java.time.* @Route("/crm/email/send") 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 index f089d3808..edd48c790 100644 --- 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,6 @@ 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 web.view.CommonVerticalLayout import com.vaadin.flow.component.button.Button import com.vaadin.flow.component.dialog.Dialog import com.vaadin.flow.component.formlayout.FormLayout @@ -17,6 +16,7 @@ import com.vaadin.flow.component.textfield.TextArea import com.vaadin.flow.component.textfield.TextField import com.vaadin.flow.router.Route import org.springframework.data.domain.Sort +import web.view.CommonVerticalLayout @Route("/crm/email/templates") class CrmEmailTemplateView( 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 index 13f8c86b8..74d75db26 100644 --- 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,6 @@ 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 web.view.CommonVerticalLayout import com.vaadin.flow.component.button.Button import com.vaadin.flow.component.dialog.Dialog import com.vaadin.flow.component.formlayout.FormLayout @@ -13,6 +12,7 @@ import com.vaadin.flow.component.grid.Grid import com.vaadin.flow.component.textfield.TextField import com.vaadin.flow.router.Route import org.springframework.web.client.RestTemplate +import web.view.CommonVerticalLayout @Route("/crm/users") class CrmUserView( diff --git a/library/web/build.gradle.kts b/library/web/build.gradle.kts index a67908df9..efaa55ce5 100644 --- a/library/web/build.gradle.kts +++ b/library/web/build.gradle.kts @@ -23,7 +23,6 @@ dependencies { 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") } \ No newline at end of file diff --git a/library/web/src/main/kotlin/web/config/VaadinConfig.kt b/library/web/src/main/kotlin/web/config/VaadinConfig.kt index 13a619561..2bc60ff6b 100644 --- a/library/web/src/main/kotlin/web/config/VaadinConfig.kt +++ b/library/web/src/main/kotlin/web/config/VaadinConfig.kt @@ -5,10 +5,15 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration import org.springframework.context.annotation.Configuration @Configuration -@EnableVaadin(value = ["com.few"]) +@EnableVaadin( + value = [ + "com.few", + "web.view", + ], +) @EnableAutoConfiguration( - exclude = [ + exclude = [ CrudConfiguration::class, - ] + ], ) class VaadinConfig \ No newline at end of file