diff --git a/src/main/java/com/example/application/views/MainLayout.java b/src/main/java/com/example/application/views/MainLayout.java index 71fdd94..6ca8b29 100644 --- a/src/main/java/com/example/application/views/MainLayout.java +++ b/src/main/java/com/example/application/views/MainLayout.java @@ -7,13 +7,11 @@ import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.applayout.DrawerToggle; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.ButtonVariant; -import com.vaadin.flow.component.html.Footer; -import com.vaadin.flow.component.html.H1; -import com.vaadin.flow.component.html.H2; -import com.vaadin.flow.component.html.Header; +import com.vaadin.flow.component.html.*; import com.vaadin.flow.component.orderedlayout.FlexComponent; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.Scroller; +import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.sidenav.SideNav; import com.vaadin.flow.component.sidenav.SideNavItem; import com.vaadin.flow.router.PageTitle; @@ -60,13 +58,19 @@ public class MainLayout extends AppLayout { } private void addDrawerContent() { - H1 appName = new H1("Soporte Técnico T.I v1.2"); - appName.addClassNames(LumoUtility.FontSize.LARGE, LumoUtility.Margin.NONE); - Header header = new Header(appName); + VerticalLayout headerLayout = new VerticalLayout(); + headerLayout.setPadding(false); + headerLayout.setSpacing(false); + headerLayout.setAlignItems(FlexComponent.Alignment.CENTER); + + Image imgLogo = new Image("images/1027x160.png","Logo"); + imgLogo.setWidth("300px"); + + headerLayout.add(imgLogo); Scroller scroller = new Scroller(createNavigation()); - addToDrawer(header, scroller, createFooter()); + addToDrawer(headerLayout, scroller, createFooter()); } private SideNav createNavigation() { diff --git a/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java b/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java index f826c1e..b79ddc6 100644 --- a/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java +++ b/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java @@ -11,6 +11,7 @@ import com.vaadin.flow.component.combobox.ComboBox; import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.notification.Notification; import com.vaadin.flow.component.notification.NotificationVariant; +import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.TextArea; import com.vaadin.flow.component.textfield.TextField; @@ -30,6 +31,7 @@ public class CrearnuevoTicketView extends VerticalLayout { projectId.setReadOnly(true); + //Combo de los tipos de tickets ComboBox tipoTickets = new ComboBox<>("Tipo de ticket"); ApiRedmine api = new ApiRedmine(); @@ -45,7 +47,7 @@ public class CrearnuevoTicketView extends VerticalLayout { //Campo de texto para la descripcion TextArea descripcion = new TextArea("Descripcion"); descripcion.setWidth("1000px"); - descripcion.setHeight("300px"); + descripcion.setHeight("250px"); //Respuestas Json para verificar posibles errores al enviar los nuevos tickets no visibles en la interfaz @@ -84,14 +86,16 @@ public class CrearnuevoTicketView extends VerticalLayout { }); createButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY); - VerticalLayout fieldsLayout = new VerticalLayout(asunto, descripcion); + VerticalLayout fieldsLayout = new VerticalLayout(descripcion); fieldsLayout.setAlignItems(Alignment.CENTER); + HorizontalLayout firstFields = new HorizontalLayout(tipoTickets, asunto); + VerticalLayout buttonLayout = new VerticalLayout(createButton); buttonLayout.setAlignItems(Alignment.END); buttonLayout.setMargin(true); - add(new H2("Crear nuevo ticket"),projectId, tipoTickets, fieldsLayout,buttonLayout/*,jsonOutput,responseField*/); + add(new H2("Crear nuevo ticket"),projectId, firstFields, fieldsLayout,buttonLayout/*,jsonOutput,responseField*/); } diff --git a/src/main/java/com/example/application/views/login/LoginFailAuth.java b/src/main/java/com/example/application/views/login/LoginFailAuth.java new file mode 100644 index 0000000..a8d6c1d --- /dev/null +++ b/src/main/java/com/example/application/views/login/LoginFailAuth.java @@ -0,0 +1,2 @@ +package com.example.application.views.login;public class LoginFailAuth { +} diff --git a/src/main/resources/META-INF/resources/images/1027x160.png b/src/main/resources/META-INF/resources/images/1027x160.png new file mode 100644 index 0000000..3a88986 Binary files /dev/null and b/src/main/resources/META-INF/resources/images/1027x160.png differ diff --git a/src/main/resources/META-INF/resources/images/960x960.png b/src/main/resources/META-INF/resources/images/960x960.png new file mode 100644 index 0000000..301c090 Binary files /dev/null and b/src/main/resources/META-INF/resources/images/960x960.png differ