diff --git a/build.gradle b/build.gradle index 3d0384b..613c70c 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { id 'org.springframework.boot' version '3.1.5' id 'io.spring.dependency-management' version '1.0.15.RELEASE' id 'java' - id 'com.vaadin' + id 'com.vaadin' version '24.4.3' id 'org.graalvm.buildtools.native' version '0.10.2' } @@ -20,6 +20,10 @@ repositories { maven { setUrl("https://maven.vaadin.com/vaadin-addons") } } +ext { + set('vaadinVersion', '24.4.3') +} + configurations { developmentOnly runtimeClasspath { @@ -28,11 +32,13 @@ configurations { } dependencies { - implementation('com.vaadin:vaadin-spring-boot-starter') + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'com.vaadin:vaadin-spring-boot-starter' developmentOnly 'org.springframework.boot:spring-boot-devtools' testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } dependencyManagement { @@ -41,7 +47,7 @@ dependencyManagement { } } -test{ +tasks.named('test') { useJUnitPlatform() } diff --git a/doc/dev_notes.md b/doc/dev_notes.md index 71c151d..f1fc34a 100644 --- a/doc/dev_notes.md +++ b/doc/dev_notes.md @@ -6,7 +6,7 @@ HowTo BUILD jar? Failed within local: ./gradle build java -jar build/libs/ModeratorElection.jar -> localhost:6333 "White Label..."-Error -=> ./gradlew clean build -Pvaadin.productionMode +=> ./gradlew clean build -Pvaadin.productionMode -x processTestAot ..in ide dev: ./gradlew clean vaadinPrepareFrontend ``` diff --git a/gradle.properties b/gradle.properties index 9740d77..2ecf910 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -vaadinVersion=24.3.13 +vaadinVersion=24.3.3 diff --git a/image/resources/install.sh b/image/resources/install.sh index 920f124..fe5615f 100755 --- a/image/resources/install.sh +++ b/image/resources/install.sh @@ -10,7 +10,7 @@ function main() mkdir /usr/local/src/ModeratorElection #change to main branch for production git clone --single-branch --branch MEapp-development https://repo.prod.meissa.de/meissa/ModeratorElection.git /usr/local/src/ModeratorElection - cp /tmp/MEMBERNAMES /usr/local/src/ModeratorElection + #cp /tmp/MEMBERNAMES /usr/local/src/ModeratorElection #download gradle #gradle_version="8.4" diff --git a/package.json b/package.json index c22e00a..3fb9470 100644 --- a/package.json +++ b/package.json @@ -4,248 +4,102 @@ "type": "module", "dependencies": { "@polymer/polymer": "3.5.1", - "@vaadin/a11y-base": "24.3.13", - "@vaadin/accordion": "24.3.13", - "@vaadin/app-layout": "24.3.13", - "@vaadin/avatar": "24.3.13", - "@vaadin/avatar-group": "24.3.13", - "@vaadin/bundles": "24.3.13", - "@vaadin/button": "24.3.13", - "@vaadin/checkbox": "24.3.13", - "@vaadin/checkbox-group": "24.3.13", - "@vaadin/combo-box": "24.3.13", + "@vaadin/bundles": "24.4.0", "@vaadin/common-frontend": "0.0.19", - "@vaadin/component-base": "24.3.13", - "@vaadin/confirm-dialog": "24.3.13", - "@vaadin/context-menu": "24.3.13", - "@vaadin/custom-field": "24.3.13", - "@vaadin/date-picker": "24.3.13", - "@vaadin/date-time-picker": "24.3.13", - "@vaadin/details": "24.3.13", - "@vaadin/dialog": "24.3.13", - "@vaadin/email-field": "24.3.13", - "@vaadin/field-base": "24.3.13", - "@vaadin/field-highlighter": "24.3.13", - "@vaadin/form-layout": "24.3.13", - "@vaadin/grid": "24.3.13", - "@vaadin/horizontal-layout": "24.3.13", - "@vaadin/icon": "24.3.13", - "@vaadin/icons": "24.3.13", - "@vaadin/input-container": "24.3.13", - "@vaadin/integer-field": "24.3.13", - "@vaadin/item": "24.3.13", - "@vaadin/list-box": "24.3.13", - "@vaadin/lit-renderer": "24.3.13", - "@vaadin/login": "24.3.13", - "@vaadin/menu-bar": "24.3.13", - "@vaadin/message-input": "24.3.13", - "@vaadin/message-list": "24.3.13", - "@vaadin/multi-select-combo-box": "24.3.13", - "@vaadin/notification": "24.3.13", - "@vaadin/number-field": "24.3.13", - "@vaadin/overlay": "24.3.13", - "@vaadin/password-field": "24.3.13", - "@vaadin/polymer-legacy-adapter": "24.3.13", - "@vaadin/progress-bar": "24.3.13", - "@vaadin/radio-group": "24.3.13", + "@vaadin/polymer-legacy-adapter": "24.4.0", + "@vaadin/react-components": "24.4.0", "@vaadin/router": "1.7.5", - "@vaadin/scroller": "24.3.13", - "@vaadin/select": "24.3.13", - "@vaadin/side-nav": "24.3.13", - "@vaadin/split-layout": "24.3.13", - "@vaadin/tabs": "24.3.13", - "@vaadin/tabsheet": "24.3.13", - "@vaadin/text-area": "24.3.13", - "@vaadin/text-field": "24.3.13", - "@vaadin/time-picker": "24.3.13", - "@vaadin/tooltip": "24.3.13", - "@vaadin/upload": "24.3.13", "@vaadin/vaadin-development-mode-detector": "2.0.7", - "@vaadin/vaadin-lumo-styles": "24.3.13", - "@vaadin/vaadin-material-styles": "24.3.13", - "@vaadin/vaadin-themable-mixin": "24.3.13", + "@vaadin/vaadin-lumo-styles": "24.4.0", + "@vaadin/vaadin-material-styles": "24.4.0", + "@vaadin/vaadin-themable-mixin": "24.4.0", "@vaadin/vaadin-usage-statistics": "2.1.2", - "@vaadin/vertical-layout": "24.3.13", - "@vaadin/virtual-list": "24.3.13", "construct-style-sheets-polyfill": "3.1.0", "date-fns": "2.29.3", - "lit": "3.1.2" + "lit": "3.1.4", + "react": "18.3.1", + "react-dom": "18.3.1", + "react-router-dom": "6.23.1" }, "devDependencies": { - "@rollup/plugin-replace": "5.0.5", + "@babel/preset-react": "7.24.7", + "@rollup/plugin-replace": "5.0.7", "@rollup/pluginutils": "5.1.0", - "@vitejs/plugin-react": "4.2.1", - "@vitejs/plugin-react-swc": "3.5.0", - "async": "3.2.4", - "glob": "10.3.3", + "@types/react": "18.3.3", + "@types/react-dom": "18.3.0", + "@vitejs/plugin-react": "4.3.1", + "async": "3.2.5", + "glob": "10.4.1", "rollup-plugin-brotli": "3.1.0", "rollup-plugin-visualizer": "5.12.0", "strip-css-comments": "5.0.0", "transform-ast": "2.4.4", - "typescript": "5.3.3", - "vite": "5.1.7", + "typescript": "5.4.5", + "vite": "5.3.1", "vite-plugin-checker": "0.6.4", - "workbox-build": "7.0.0", - "workbox-core": "7.0.0", - "workbox-precaching": "7.0.0" + "workbox-build": "7.1.1", + "workbox-core": "7.1.0", + "workbox-precaching": "7.1.0" }, "vaadin": { "dependencies": { "@polymer/polymer": "3.5.1", - "@vaadin/a11y-base": "24.3.13", - "@vaadin/accordion": "24.3.13", - "@vaadin/app-layout": "24.3.13", - "@vaadin/avatar": "24.3.13", - "@vaadin/avatar-group": "24.3.13", - "@vaadin/bundles": "24.3.13", - "@vaadin/button": "24.3.13", - "@vaadin/checkbox": "24.3.13", - "@vaadin/checkbox-group": "24.3.13", - "@vaadin/combo-box": "24.3.13", + "@vaadin/bundles": "24.4.0", "@vaadin/common-frontend": "0.0.19", - "@vaadin/component-base": "24.3.13", - "@vaadin/confirm-dialog": "24.3.13", - "@vaadin/context-menu": "24.3.13", - "@vaadin/custom-field": "24.3.13", - "@vaadin/date-picker": "24.3.13", - "@vaadin/date-time-picker": "24.3.13", - "@vaadin/details": "24.3.13", - "@vaadin/dialog": "24.3.13", - "@vaadin/email-field": "24.3.13", - "@vaadin/field-base": "24.3.13", - "@vaadin/field-highlighter": "24.3.13", - "@vaadin/form-layout": "24.3.13", - "@vaadin/grid": "24.3.13", - "@vaadin/horizontal-layout": "24.3.13", - "@vaadin/icon": "24.3.13", - "@vaadin/icons": "24.3.13", - "@vaadin/input-container": "24.3.13", - "@vaadin/integer-field": "24.3.13", - "@vaadin/item": "24.3.13", - "@vaadin/list-box": "24.3.13", - "@vaadin/lit-renderer": "24.3.13", - "@vaadin/login": "24.3.13", - "@vaadin/menu-bar": "24.3.13", - "@vaadin/message-input": "24.3.13", - "@vaadin/message-list": "24.3.13", - "@vaadin/multi-select-combo-box": "24.3.13", - "@vaadin/notification": "24.3.13", - "@vaadin/number-field": "24.3.13", - "@vaadin/overlay": "24.3.13", - "@vaadin/password-field": "24.3.13", - "@vaadin/polymer-legacy-adapter": "24.3.13", - "@vaadin/progress-bar": "24.3.13", - "@vaadin/radio-group": "24.3.13", + "@vaadin/polymer-legacy-adapter": "24.4.0", + "@vaadin/react-components": "24.4.0", "@vaadin/router": "1.7.5", - "@vaadin/scroller": "24.3.13", - "@vaadin/select": "24.3.13", - "@vaadin/side-nav": "24.3.13", - "@vaadin/split-layout": "24.3.13", - "@vaadin/tabs": "24.3.13", - "@vaadin/tabsheet": "24.3.13", - "@vaadin/text-area": "24.3.13", - "@vaadin/text-field": "24.3.13", - "@vaadin/time-picker": "24.3.13", - "@vaadin/tooltip": "24.3.13", - "@vaadin/upload": "24.3.13", "@vaadin/vaadin-development-mode-detector": "2.0.7", - "@vaadin/vaadin-lumo-styles": "24.3.13", - "@vaadin/vaadin-material-styles": "24.3.13", - "@vaadin/vaadin-themable-mixin": "24.3.13", + "@vaadin/vaadin-lumo-styles": "24.4.0", + "@vaadin/vaadin-material-styles": "24.4.0", + "@vaadin/vaadin-themable-mixin": "24.4.0", "@vaadin/vaadin-usage-statistics": "2.1.2", - "@vaadin/vertical-layout": "24.3.13", - "@vaadin/virtual-list": "24.3.13", "construct-style-sheets-polyfill": "3.1.0", "date-fns": "2.29.3", - "lit": "3.1.2" + "lit": "3.1.4", + "react": "18.3.1", + "react-dom": "18.3.1", + "react-router-dom": "6.23.1" }, "devDependencies": { - "@rollup/plugin-replace": "5.0.5", + "@babel/preset-react": "7.24.7", + "@rollup/plugin-replace": "5.0.7", "@rollup/pluginutils": "5.1.0", - "@vitejs/plugin-react": "4.2.1", - "@vitejs/plugin-react-swc": "3.5.0", - "async": "3.2.4", - "glob": "10.3.3", + "@types/react": "18.3.3", + "@types/react-dom": "18.3.0", + "@vitejs/plugin-react": "4.3.1", + "async": "3.2.5", + "glob": "10.4.1", "rollup-plugin-brotli": "3.1.0", "rollup-plugin-visualizer": "5.12.0", "strip-css-comments": "5.0.0", "transform-ast": "2.4.4", - "typescript": "5.3.3", - "vite": "5.1.7", + "typescript": "5.4.5", + "vite": "5.3.1", "vite-plugin-checker": "0.6.4", - "workbox-build": "7.0.0", - "workbox-core": "7.0.0", - "workbox-precaching": "7.0.0" + "workbox-build": "7.1.1", + "workbox-core": "7.1.0", + "workbox-precaching": "7.1.0" }, - "hash": "1b578191af08a883e68dfca9e08ad525b69d9824e0ec3e82a2689cdcf77b5ffe" + "hash": "a138b9347a25dacd61eb23a186fb55a3bff3993609bd58738beb6651e7993e01" }, "overrides": { "@vaadin/bundles": "$@vaadin/bundles", - "@vaadin/a11y-base": "$@vaadin/a11y-base", - "@vaadin/accordion": "$@vaadin/accordion", - "@vaadin/app-layout": "$@vaadin/app-layout", - "@vaadin/avatar": "$@vaadin/avatar", - "@vaadin/avatar-group": "$@vaadin/avatar-group", - "@vaadin/button": "$@vaadin/button", - "@vaadin/checkbox": "$@vaadin/checkbox", - "@vaadin/checkbox-group": "$@vaadin/checkbox-group", - "@vaadin/combo-box": "$@vaadin/combo-box", - "@vaadin/component-base": "$@vaadin/component-base", - "@vaadin/confirm-dialog": "$@vaadin/confirm-dialog", - "@vaadin/context-menu": "$@vaadin/context-menu", - "@vaadin/custom-field": "$@vaadin/custom-field", - "@vaadin/date-picker": "$@vaadin/date-picker", - "@vaadin/date-time-picker": "$@vaadin/date-time-picker", - "@vaadin/details": "$@vaadin/details", - "@vaadin/dialog": "$@vaadin/dialog", - "@vaadin/email-field": "$@vaadin/email-field", - "@vaadin/field-base": "$@vaadin/field-base", - "@vaadin/field-highlighter": "$@vaadin/field-highlighter", - "@vaadin/form-layout": "$@vaadin/form-layout", - "@vaadin/grid": "$@vaadin/grid", - "@vaadin/horizontal-layout": "$@vaadin/horizontal-layout", - "@vaadin/icon": "$@vaadin/icon", - "@vaadin/icons": "$@vaadin/icons", - "@vaadin/input-container": "$@vaadin/input-container", - "@vaadin/integer-field": "$@vaadin/integer-field", - "@vaadin/item": "$@vaadin/item", - "@vaadin/list-box": "$@vaadin/list-box", - "@vaadin/lit-renderer": "$@vaadin/lit-renderer", - "@vaadin/login": "$@vaadin/login", - "@vaadin/menu-bar": "$@vaadin/menu-bar", - "@vaadin/message-input": "$@vaadin/message-input", - "@vaadin/message-list": "$@vaadin/message-list", - "@vaadin/multi-select-combo-box": "$@vaadin/multi-select-combo-box", - "@vaadin/notification": "$@vaadin/notification", - "@vaadin/number-field": "$@vaadin/number-field", - "@vaadin/overlay": "$@vaadin/overlay", - "@vaadin/password-field": "$@vaadin/password-field", "@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter", - "@vaadin/progress-bar": "$@vaadin/progress-bar", - "@vaadin/radio-group": "$@vaadin/radio-group", - "@vaadin/scroller": "$@vaadin/scroller", - "@vaadin/select": "$@vaadin/select", - "@vaadin/side-nav": "$@vaadin/side-nav", - "@vaadin/split-layout": "$@vaadin/split-layout", - "@vaadin/tabs": "$@vaadin/tabs", - "@vaadin/tabsheet": "$@vaadin/tabsheet", - "@vaadin/text-area": "$@vaadin/text-area", - "@vaadin/text-field": "$@vaadin/text-field", - "@vaadin/time-picker": "$@vaadin/time-picker", - "@vaadin/tooltip": "$@vaadin/tooltip", - "@vaadin/upload": "$@vaadin/upload", "@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector", "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles", "@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles", "@vaadin/router": "$@vaadin/router", "@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics", - "@vaadin/vertical-layout": "$@vaadin/vertical-layout", - "@vaadin/virtual-list": "$@vaadin/virtual-list", "@vaadin/common-frontend": "$@vaadin/common-frontend", "construct-style-sheets-polyfill": "$construct-style-sheets-polyfill", "lit": "$lit", "@polymer/polymer": "$@polymer/polymer", "@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin", - "date-fns": "$date-fns" + "date-fns": "$date-fns", + "@vaadin/react-components": "$@vaadin/react-components", + "react-dom": "$react-dom", + "react-router-dom": "$react-router-dom", + "react": "$react" } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8f99fdd..8b93e58 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,8 @@ -server.port=${PORT:6333} +spring.application.name=ModeratorElection +spring.main.banner-mode=off + +server.port=${PORT:8080} + logging.level.org.atmosphere = warn spring.mustache.check-template-location = false @@ -6,6 +10,6 @@ spring.mustache.check-template-location = false vaadin.launch-browser=true # To improve the performance during development. # For more information https://vaadin.com/docs/latest/integrations/spring/configuration#special-configuration-parameters -vaadin.allowed-packages = com.vaadin,org.vaadin,dev.hilla,com.example.application +vaadin.allowed-packages = com.vaadin,org.vaadin,dev.hilla,com.ModeratorElection.MEApplication spring.jpa.defer-datasource-initialization = true -membernames=${MEMBERNAMES} +membernames=${MEMBERNAMES:Ali,Günter,Ulli,Andrea}