diff --git a/src/main/java/org/s4s/gui/InitView.java b/src/main/java/org/s4s/gui/InitView.java index b819d9f3ec59b1c2e225db30a0d119bc4f4f85b0..71f695a96c42ba598df5464e8c202280697b77a0 100644 --- a/src/main/java/org/s4s/gui/InitView.java +++ b/src/main/java/org/s4s/gui/InitView.java @@ -44,6 +44,7 @@ public class InitView extends UI { navi.addView(Views.SHOPERSTELLUNG, ShopErstellung.class); navi.addView(Views.SHOPERSTELLUNGSBESTAETIGUNG, ShoperstellungsBestätigung.class); navi.addView(Views.REGISTRIERUNGSBESTAETIGUNG, RegistrierungsBestaetigung.class); + navi.addView(Views.KONTAKTBESTAETIGUNG, Kontaktbestaetigung.class); //Test der RegistrierungsView UI.getCurrent().getNavigator().navigateTo(Views.WELCOME); setHeight(100f,Unit.PERCENTAGE); diff --git a/src/main/java/org/s4s/gui/views/ContactView.java b/src/main/java/org/s4s/gui/views/ContactView.java index aa9afc000ef72b2241ff52b81bba48ebdc9c9566..486e59fab3f05c320fd83d8f35ffebd63c26fcf3 100644 --- a/src/main/java/org/s4s/gui/views/ContactView.java +++ b/src/main/java/org/s4s/gui/views/ContactView.java @@ -9,7 +9,9 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; +import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; +import org.s4s.services.util.Views; /** * Created by Max-Desktop on 16.05.2017. @@ -39,6 +41,9 @@ public class ContactView extends TemplateView{ //this.addComponent(pKontakt); //this.setComponentAlignment(pKontakt, Alignment.MIDDLE_CENTER); + bSenden.addClickListener(e -> + UI.getCurrent().getNavigator().navigateTo(Views.KONTAKTBESTAETIGUNG)); + pKontakt.setContent(vLayout); super.setUpFooterAndHeader(pKontakt); diff --git a/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java b/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java index 16d617dd3656a8b2e5ca48fa24770fb816ba3ed2..d23c8ff45c639730e4ca753739dd72b7fdd0d4e9 100644 --- a/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java +++ b/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java @@ -7,17 +7,46 @@ package org.s4s.gui.views; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; +import com.vaadin.server.FontAwesome; +import com.vaadin.ui.Button; +import com.vaadin.ui.Label; +import com.vaadin.ui.Panel; +import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; +import org.s4s.services.util.Views; /** * - * @author Holger + * @author JanPhilipp */ public class KaufbestaetigungView extends TemplateView{ @Override public void enter(ViewChangeListener.ViewChangeEvent event) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + this.setUp(); } - -} + + private void setUp() { + Panel panel = new Panel(); + panel.setSizeUndefined(); + + VerticalLayout content = new VerticalLayout(); + + Button button = new Button("Weiter shoppen"); + button.setIcon(FontAwesome.BOOK); + button.addClickListener(e -> + UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); + + Label label = new Label("Vielen Dank für ihren Einkauf! Wenn sie weitershoppen wollen... :)"); + + content.addComponent(label); + content.addComponent(button); + + content.setMargin(true); + + panel.setContent(content); + //this.addComponent(panel); + //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); + + super.setUpFooterAndHeader(panel); +}} diff --git a/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java b/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java new file mode 100644 index 0000000000000000000000000000000000000000..2656c044d091c88225ac27d53ff33afc62182285 --- /dev/null +++ b/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java @@ -0,0 +1,53 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.s4s.gui.views; + +import com.vaadin.navigator.ViewChangeListener; +import com.vaadin.ui.Button; +import com.vaadin.ui.Label; +import com.vaadin.ui.Panel; +import com.vaadin.ui.UI; +import com.vaadin.ui.VerticalLayout; +import org.s4s.services.util.Views; + +/** + * + * @author JanPhilipp + */ +public class Kontaktbestaetigung extends TemplateView { + + @Override + public void enter(ViewChangeListener.ViewChangeEvent event) { + this.setUp(); + } + + private void setUp() { + Panel panel = new Panel(); + panel.setSizeUndefined(); + + VerticalLayout content = new VerticalLayout(); + + Button button = new Button("Zurück zur Startseite"); + button.addClickListener(e -> + UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); + + Label label = new Label("Vielen Dank für ihre Kontaktanfrage, Wir werden diese in Kürze beantworten und so schnell wie möglich beantworten"); + + content.addComponent(label); + content.addComponent(button); + + content.setMargin(true); + + panel.setContent(content); + //this.addComponent(panel); + //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); + + super.setUpFooterAndHeader(panel); +}} + + + + diff --git a/src/main/java/org/s4s/services/util/Views.java b/src/main/java/org/s4s/services/util/Views.java index ecba275b1eeea0e03238143a8652b193e4b5792d..16120194681eadc0b147938af4ef491563a5c73a 100644 --- a/src/main/java/org/s4s/services/util/Views.java +++ b/src/main/java/org/s4s/services/util/Views.java @@ -27,7 +27,8 @@ public final class Views { public final static String SHOPERSTELLUNG = "shoperstellung"; public final static String SHOPERSTELLUNGSBESTAETIGUNG = "shoperstellungsbestaetigung"; public final static String REGISTRIERUNGSBESTAETIGUNG = "registrierungsbestaetigung"; - + public final static String KONTAKTBESTAETIGUNG = "kontaktbestaetigung"; + private Views(){ }