diff --git a/src/main/bundles/prod.bundle b/src/main/bundles/prod.bundle index 8422063..3b8ff8f 100644 Binary files a/src/main/bundles/prod.bundle and b/src/main/bundles/prod.bundle differ diff --git a/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java b/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java index 99dbf98..68efeea 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java +++ b/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java @@ -32,7 +32,7 @@ public class MainLayout extends AppLayout { public MainLayout(SecurityService securityService) { this.securityService = securityService; - this.getStyle().set("background-image", "red"); + this.getStyle().set("background-image", "url('images/bckgnd.png')"); setPrimarySection(Section.DRAWER); addDrawerContent(); addHeaderContent(); @@ -66,16 +66,18 @@ public class MainLayout extends AppLayout { private void addDrawerContent() { VerticalLayout headerLayout = new VerticalLayout(); - headerLayout.setPadding(false); - headerLayout.setSpacing(false); + headerLayout.setPadding(true); + headerLayout.setSpacing(true); headerLayout.setAlignItems(FlexComponent.Alignment.CENTER); - Image imgLogo = new Image("images/1027x160.png", "Logo"); - imgLogo.setWidth("300px"); + Image imgLogo = new Image("images/1027x160.png", "Logo"); + imgLogo.setWidth("260px"); headerLayout.add(imgLogo); + Scroller scroller = new Scroller(createNavigation()); + scroller.getStyle().set("background-image", "url('images/textureblue.jpg')"); addToDrawer(headerLayout, scroller, createFooter()); } @@ -86,6 +88,12 @@ public class MainLayout extends AppLayout { nav.addItem(new SideNavItem("Crear nuevo ticket", CrearnuevoTicketView.class, LineAwesomeIcon.EDIT.create())); nav.addItem(new SideNavItem("Mis tickets", MisTicketsView.class, LineAwesomeIcon.TICKET_ALT_SOLID.create())); nav.addItem(new SideNavItem("Todos los tickets", AllTicketsView.class, LineAwesomeIcon.LIST_ALT.create())); + nav.getStyle().set("background-size", "cover"); // Hace que la imagen cubra todo el SideNav + nav.getStyle().set("background-repeat", "no-repeat"); // Evita que la imagen se repita + nav.getStyle().set("background-position", "center"); // Centra la imagen + nav.getStyle().set("background-color", "white"); + nav.getStyle().set("border-radius", "5px"); + nav.getStyle().set("opacity", "0.9"); return nav; } diff --git a/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java b/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java index f16e631..ff7d16f 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java @@ -59,17 +59,17 @@ public class AllTicketsView extends VerticalLayout { grid.addColumn(Ticket::getDescription).setHeader("Descripcion").setWidth("25em"); grid.addThemeVariants(GridVariant.LUMO_WRAP_CELL_CONTENT); + grid.getStyle().set("opacity", "0.8"); + grid.setAllRowsVisible(true); - // Ajustar tamaño del Grid y Layout - grid.setSizeFull(); - setSizeFull(); - setPadding(false); - setMargin(false); - setSpacing(false); + //Ajustar tamaño del Grid y Layout + /*grid.setSizeFull(); + setSizeFull();*/ add(grid); expand(grid); + setMargin(false); // Cargar tickets loadTickets(); diff --git a/src/main/java/mx/gob/jumapacelaya/views/tickets/MisTicketsView.java b/src/main/java/mx/gob/jumapacelaya/views/tickets/MisTicketsView.java index 9fb6210..b7875fd 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/tickets/MisTicketsView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/tickets/MisTicketsView.java @@ -61,16 +61,17 @@ public class MisTicketsView extends VerticalLayout { grid.addColumn(Ticket::getDescription).setHeader("Descripción").setWidth("25em"); grid.addThemeVariants(GridVariant.LUMO_WRAP_CELL_CONTENT); + grid.getStyle().set("opacity", "0.8"); + grid.setAllRowsVisible(true); // Ajustar tamaño del Grid y Layout - grid.setSizeFull(); - setSizeFull(); - setPadding(false); - setMargin(false); - setSpacing(false); + //grid.setSizeFull(); + //setSizeFull(); + add(grid); expand(grid); + setMargin(false); loadTickets(); } @@ -85,13 +86,6 @@ public class MisTicketsView extends VerticalLayout { } } - private String formatDate(Date date) { - if (date != null) { - SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); - return formatter.format(date); - } - return ""; - } private ComponentRenderer createStatusRender() { return new ComponentRenderer<>(ticket -> { diff --git a/src/main/resources/META-INF/resources/images/textureblue.jpg b/src/main/resources/META-INF/resources/images/textureblue.jpg new file mode 100644 index 0000000..78ab70d Binary files /dev/null and b/src/main/resources/META-INF/resources/images/textureblue.jpg differ