Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix/#517] Vaadin 설정 수정 #519

Merged
merged 5 commits into from
Jan 10, 2025
Merged

[Fix/#517] Vaadin 설정 수정 #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c69ace
refactor: vaadin 설정 web 모듈로 분리
belljun3395 Jan 10, 2025
1c9daa8
chore: lint 적용
belljun3395 Jan 10, 2025
c5fdb51
fix: LoginView 포함 되도록 수정
belljun3395 Jan 10, 2025
40afebf
Merge branch 'dev' into refactor/#517_belljun3395
belljun3395 Jan 10, 2025
f4c4ceb
fix: LoginView 포함 되도록 수정
belljun3395 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion domain/crm/src/main/kotlin/com/few/crm/view/email/CrmEmailSendHistoryView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion domain/crm/src/main/kotlin/com/few/crm/view/email/CrmEmailSendView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion domain/crm/src/main/kotlin/com/few/crm/view/email/CrmEmailTemplateView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion domain/crm/src/main/kotlin/com/few/crm/view/user/CrmUserView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ 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
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(
Expand Down
1 change: 0 additions & 1 deletion library/web/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
11 changes: 8 additions & 3 deletions library/web/src/main/kotlin/web/config/VaadinConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading