diff --git a/pom.xml b/pom.xml index a49aeca..240b07a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 21 24.4.0.beta4 2023.0.1 - 5.3.0 + 5.4.1 diff --git a/src/main/java/dev/mars3142/fhq/views/checkoutform/CheckoutFormView.java b/src/main/java/dev/mars3142/fhq/views/checkoutform/CheckoutFormView.java index bcc9fbb..041bb43 100644 --- a/src/main/java/dev/mars3142/fhq/views/checkoutform/CheckoutFormView.java +++ b/src/main/java/dev/mars3142/fhq/views/checkoutform/CheckoutFormView.java @@ -38,7 +38,7 @@ import java.util.LinkedHashSet; import java.util.Set; @PageTitle("Checkout Form") -@Route(value = "", layout = MainLayout.class) +@Route(value = "/checkout", layout = MainLayout.class) public class CheckoutFormView extends Div { private static final Set states = new LinkedHashSet<>(); diff --git a/src/main/java/dev/mars3142/fhq/views/landingpage/LandingPageLayout.java b/src/main/java/dev/mars3142/fhq/views/landingpage/LandingPageLayout.java new file mode 100644 index 0000000..266a748 --- /dev/null +++ b/src/main/java/dev/mars3142/fhq/views/landingpage/LandingPageLayout.java @@ -0,0 +1,34 @@ +package dev.mars3142.fhq.views.landingpage; + +import com.vaadin.flow.component.applayout.AppLayout; +import com.vaadin.flow.component.html.Div; +import com.vaadin.flow.component.html.NativeLabel; +import com.vaadin.flow.component.orderedlayout.HorizontalLayout; +import jakarta.annotation.PostConstruct; +import lombok.val; + +/* package */ class LandingPageLayout extends AppLayout { + + @PostConstruct + private void init() { + initNavBar(); + } + + private void initNavBar() { + val left = new Div(); + left.setWidthFull(); + + val title = new NativeLabel("Firmware HQ"); + title.setWidthFull(); + + val right = new Div(); + right.setWidthFull(); + + val bar = new HorizontalLayout(); + bar.addClassName("navbar"); + bar.setWidthFull(); + bar.add(left, title, right); + + addToNavbar(bar); + } +} diff --git a/src/main/java/dev/mars3142/fhq/views/landingpage/LandingPageView.java b/src/main/java/dev/mars3142/fhq/views/landingpage/LandingPageView.java new file mode 100644 index 0000000..2582690 --- /dev/null +++ b/src/main/java/dev/mars3142/fhq/views/landingpage/LandingPageView.java @@ -0,0 +1,26 @@ +package dev.mars3142.fhq.views.landingpage; + +import com.vaadin.flow.component.Composite; +import com.vaadin.flow.component.orderedlayout.VerticalLayout; +import com.vaadin.flow.router.PageTitle; +import com.vaadin.flow.router.Route; +import lombok.extern.slf4j.Slf4j; +import lombok.val; +import org.springframework.web.client.RestClient; + +@PageTitle("Firmware HQ") +@Route(value = "", layout = LandingPageLayout.class) +@Slf4j +public class LandingPageView extends Composite { + public LandingPageView() { + val client = RestClient + .builder() + .baseUrl("https://user-service-ggxookssmq-ew.a.run.app/v1") + .build(); + val response = client.get() + .uri("/users") + .retrieve() + .body(String.class); + log.info("Response: {}", response); + } +} diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml new file mode 100644 index 0000000..f506a59 --- /dev/null +++ b/src/main/resources/application-dev.yaml @@ -0,0 +1,7 @@ +server: + port: ${PORT:8090} + +vaadin: + # To improve the performance during development. + # For more information https://vaadin.com/docs/latest/integrations/spring/configuration#special-configuration-parameters + allowed-packages : com.vaadin,org.vaadin,dev.hilla,dev.mars3142 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index dab2cd7..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,15 +0,0 @@ -server.port=${PORT:8080} -logging.level.org.atmosphere = warn -spring.mustache.check-template-location = false - -# Launch the default browser when starting the application in development mode -vaadin.launch-browser=true -# PostgreSQL configuration. -spring.datasource.url = jdbc:postgresql://localhost:5432/vaadinstart -spring.datasource.username = vaadinstart -spring.datasource.password = vaadinstart -spring.jpa.hibernate.ddl-auto = update -# 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,dev.mars3142.fhq -spring.jpa.defer-datasource-initialization = true diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000..264c5bc --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,12 @@ +server: + port: ${PORT:8080} + +logging: + level: + org:atmosphere: warn + +spring: + mustache: + check-template-location: false + jpa: + defer-datasource-initialization: true