Removed Solutions from app to demo

sebivenlo · Nov 12, 2023 · 218a3b5 · 218a3b5
1 parent a57f70e
commit 218a3b5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/vaadin-app/src/main/java/com/example/esde/views/task1/Task1.java b/vaadin-app/src/main/java/com/example/esde/views/task1/Task1.java
@@ -1,16 +1,12 @@
 package com.example.esde.views.task1;
 
 import com.example.esde.views.MainLayout;
-import com.example.esde.views.task2.Task2;
 import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.html.H2;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
-import com.vaadin.flow.theme.Theme;
-import com.vaadin.flow.theme.lumo.Lumo;
 
 /**
  * This will be a very simple task, change some values, create some objects, and you'll be done!
@@ -22,15 +18,13 @@ public class Task1 extends VerticalLayout {
     private H2 header;
     private TextField textfield;
     private Button button;
-    private Button successButton;
 
     public Task1() {
         header = createHeader();
         button = createButton();
-        successButton = createSuccessButton();
         textfield = null;
 
-        add(header, button, successButton);
+        add(header, button);
     }
 
     /**
@@ -66,14 +60,5 @@ private Button createButton() {
      * TODO 4.2: Clicking on the button should navigate to the next task (Task2)
      * (Dont forget to add the button to the layout)
      */
-    private Button createSuccessButton() {
-        Button button = new Button();
-        button.setText("Next Task");
-        button.getStyle().set("background-color","green");
-        button.addClickListener(buttonClickEvent -> {
-            getUI().ifPresent(ui -> ui.navigate(Task2.class));
-        });
-        return button;
-    }
 
 }
diff --git a/vaadin-demo/src/main/java/com/example/esde/views/task1/Task1.java b/vaadin-demo/src/main/java/com/example/esde/views/task1/Task1.java
@@ -1,6 +1,7 @@
 package com.example.esde.views.task1;
 
 import com.example.esde.views.MainLayout;
+import com.example.esde.views.task2.Task2;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.html.H2;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
@@ -18,13 +19,15 @@ public class Task1 extends VerticalLayout {
     private H2 header;
     private TextField textfield;
     private Button button;
+    private Button successButton;
 
     public Task1() {
         header = createHeader();
         button = createButton();
+        successButton = createSuccessButton();
         textfield = null;
 
-        add(header, button);
+        add(header, button, successButton);
     }
 
     /**
@@ -60,5 +63,15 @@ private Button createButton() {
      * TODO 4.2: Clicking on the button should navigate to the next task (Task2)
      * (Dont forget to add the button to the layout)
      */
+    private Button createSuccessButton() {
+        Button button = new Button();
+        button.setText("Next Task");
+        button.getStyle().set("background-color","green");
+        button.addClickListener(buttonClickEvent -> {
+            getUI().ifPresent(ui -> ui.navigate(Task2.class));
+        });
+        return button;
+    }
+
 
 }