frontend/routes.ts

@@ -1,14 +1,9 @@
-import { Flow } from "@vaadin/flow-frontend";
 import { Route } from '@vaadin/router';
 import Role from './generated/com/cubetiqs/fusion/data/Role';
 import { appStore } from './stores/app-store';
 import './views/home/home-view';
 import './views/main-layout';
 
-const { serverSideRoutes } = new Flow({
-  imports: () => import('../target/frontend/generated-flow-imports'),
-});
-
 export type ViewRoute = Route & {
   title?: string;
   icon?: string;
@@ -70,11 +65,7 @@ export const routes: ViewRoute[] = [
   {
     path: '',
     component: 'main-layout',
-    children: [
+    children: [...views],
-        ...views,
-      // for server-side, the next magic line sends all unmatched routes:
-      ...serverSideRoutes, // IMPORTANT: this must be the last entry in the array
-    ],
   },
   {
     path: 'login',

frontend/views/login/login-view.ts

@@ -30,7 +30,7 @@ export class LoginView extends View {
         action="login"
         no-forgot-password
         .i18n=${Object.assign(
-          { header: { title: 'Fusion', description: 'Login using user/user or admin/admin' } },
+          { header: { title: 'Fusion Management', description: 'Login using user/user or admin/admin' } },
           loginI18nDefault
         )}
       >

package.json

@@ -90,8 +90,6 @@
   },
   "vaadin": {
     "dependencies": {
-      "@adobe/lit-mobx": "2.0.0-rc.4",
-      "@fontsource/roboto": "4.5.0",
       "@polymer/iron-icon": "3.0.1",
       "@polymer/iron-list": "3.1.0",
       "@polymer/polymer": "3.2.0",
@@ -141,9 +139,7 @@
       "@vaadin/vaadin-upload": "21.0.0-alpha13",
       "@vaadin/vaadin-virtual-list": "21.0.0-alpha13",
       "construct-style-sheets-polyfill": "2.4.16",
-      "line-awesome": "1.3.0",
+      "lit": "2.0.0-rc.1"
-      "lit": "2.0.0-rc.1",
-      "mobx": "^6.1.5"
     },
     "devDependencies": {
       "@types/validator": "13.1.0",

pom.xml

@@ -106,6 +106,7 @@
             <artifactId>a-vaadin-helper</artifactId>
             <version>1.7.1</version>
         </dependency>
+
         <dependency>
             <groupId>org.vaadin.artur.exampledata</groupId>
             <artifactId>exampledata</artifactId>
@@ -117,11 +118,11 @@
             <artifactId>h2</artifactId>
         </dependency>
 
-        <!-- Spring and Frameworks-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
@@ -132,7 +133,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- Test Framework-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

src/main/java/com/cubetiqs/fusion/security/SecurityConfiguration.java

@@ -33,9 +33,6 @@ public class SecurityConfiguration extends VaadinWebSecurityConfigurerAdapter {
     @Override
     public void configure(WebSecurity web) throws Exception {
         super.configure(web);
-        web.ignoring()
+        web.ignoring().antMatchers("/images/logo.png");
-                .antMatchers(
-                        "/images/logo.png"
-                );
     }
 }

src/main/kotlin/com/cubetiqs/fusion/Application.kt

@@ -1,22 +1,15 @@
 package com.cubetiqs.fusion
 
-import com.vaadin.flow.component.dependency.NpmPackage
+import org.springframework.boot.autoconfigure.SpringBootApplication
-import com.vaadin.flow.component.page.AppShellConfigurator
 import com.vaadin.flow.server.PWA
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
+import com.vaadin.flow.component.page.AppShellConfigurator
 import com.vaadin.flow.theme.Theme
 import org.springframework.boot.SpringApplication
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 
 @SpringBootApplication
 @Theme(value = "fusionmanagement")
 @PWA(name = "Fusion Management", shortName = "Fusion Management", offlineResources = ["images/logo.png"])
-@NpmPackage.Container(
-    NpmPackage(value = "@fontsource/roboto", version = "4.5.0"),
-    NpmPackage(value = "@adobe/lit-mobx", version = "2.0.0-rc.4"),
-    NpmPackage(value = "mobx", version = "^6.1.5"),
-    NpmPackage(value = "line-awesome", version = "1.3.0"),
-)
 class Application : SpringBootServletInitializer(), AppShellConfigurator
 
 fun main(args: Array<String>) {

src/main/kotlin/com/cubetiqs/fusion/config/DefaultConfig.kt

@@ -1,6 +0,0 @@
-package com.cubetiqs.fusion.config
-
-import org.springframework.context.annotation.Configuration
-
-@Configuration
-class DefaultConfig

src/main/kotlin/com/cubetiqs/fusion/frontend/MainView.kt

@@ -1,5 +0,0 @@
-package com.cubetiqs.fusion.frontend
-
-import com.vaadin.flow.component.UI
-
-class MainView : UI()

src/main/kotlin/com/cubetiqs/fusion/frontend/views/test/TestView.kt

@@ -1,11 +0,0 @@
-package com.cubetiqs.fusion.frontend.views.test
-
-import com.vaadin.flow.component.html.Div
-import com.vaadin.flow.router.Route
-
-@Route("/views/test")
-class TestView : Div() {
-    init {
-        add("Hello World")
-    }
-}

src/main/resources/application.yml

@@ -3,8 +3,7 @@ server:
 
 logging:
   level:
-    org:
+    org.atmosphere: warn
-      atmosphere: warn
 
 spring:
   mustache: