diff --git a/frontend/themes/soportet.iv1.2/styles.css b/frontend/themes/soportet.iv1.2/styles.css index d188256..a73035b 100644 --- a/frontend/themes/soportet.iv1.2/styles.css +++ b/frontend/themes/soportet.iv1.2/styles.css @@ -94,7 +94,7 @@ vaadin-side-nav-item[aria-current="page"]::part(content) { } vaadin-side-nav-item:hover::part(content) { - background-color: #ddc9a3; /* Color de fondo al hacer hover*/ + background-color: #ddc9a3; /* Color de fondo al hacer hover */ fill-opacity: 50%; border-radius: 5px; } @@ -136,3 +136,15 @@ vaadin-progress-bar::part(value) { .v-loading-indicator { /* Cambiar el color de la barra de carga que sale cuando la aplicacion esta cargando */ background: #691b31 !important; } + + +/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */ +/* (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) (*)(*) */ +/*Estilos de los botones */ +vaadin-button[theme~="primary"] { + background-color: #691b31; +} + +vaadin-button-tertiary-text-color { + color: #691b31; +} diff --git a/src/main/bundles/dev.bundle b/src/main/bundles/dev.bundle index 131a055..621532f 100644 Binary files a/src/main/bundles/dev.bundle and b/src/main/bundles/dev.bundle differ diff --git a/src/main/bundles/prod.bundle b/src/main/bundles/prod.bundle index 22bf9a6..76c1473 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 1bdf14c..0a9b988 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java +++ b/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java @@ -9,6 +9,7 @@ import com.vaadin.flow.component.html.Footer; import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.html.Image; import com.vaadin.flow.component.html.Span; +import com.vaadin.flow.component.icon.VaadinIcon; import com.vaadin.flow.component.orderedlayout.FlexComponent; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.Scroller; @@ -52,9 +53,12 @@ public class MainLayout extends AppLayout { viewTitle.addClassNames(LumoUtility.FontSize.LARGE, LumoUtility.Margin.NONE); String u = securityService.getAuthenticatedUser(); - Span usrNameLabel = new Span("Hola " + u); + Span usrNameLabel = new Span("Hola 👉 " + u); + usrNameLabel.getStyle().set("color", "#691b31"); + usrNameLabel.getStyle().set("font-weight", "bold"); + usrNameLabel.getStyle().set("font-size", "20px"); - Button logoutButton = new Button("Cerrar sesión", event -> { + Button logoutButton = new Button("Cerrar sesión", VaadinIcon.SIGN_OUT.create(), event -> { securityService.logout(); }); logoutButton.getStyle().set("margin-right", "50px"); @@ -83,7 +87,7 @@ public class MainLayout extends AppLayout { Scroller scroller = new Scroller(createNavigation()); - scroller.getStyle().set("background-color", "#691b31"); + scroller.getStyle().set("background-image", "url('images/fondopay.png')"); addToDrawer(headerLayout, scroller, createFooter()); } @@ -99,7 +103,7 @@ public class MainLayout extends AppLayout { 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/crearnuevoticket/CrearnuevoTicketView.java b/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java index ac5c80c..e036dd2 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java @@ -73,7 +73,6 @@ public class CrearnuevoTicketView extends VerticalLayout { //Configuracion del Boton Button createButton = new Button("Enviar ticket", event -> handleCreateButton(user, tipoTickets, asunto, descripcion)); createButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY, ButtonVariant.LUMO_LARGE); - createButton.getStyle().set("background-color", "#691B31"); uploadFile.addSucceededListener(event -> { handleFileUpload(event.getFileName()); @@ -179,6 +178,7 @@ public class CrearnuevoTicketView extends VerticalLayout { private RichTextEditor createTextArea(String label, String width, String height) { RichTextEditor textArea = new RichTextEditor(); textArea.setSizeFull(); + textArea.setMaxHeight("200px"); return textArea; } diff --git a/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java b/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java index 665cd92..e68ff77 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java @@ -47,7 +47,7 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver { // Configuración de i18n para el formulario de login LoginI18n i18n = LoginI18n.createDefault(); LoginI18n.Form i18nFormulario = i18n.getForm(); - i18nFormulario.setTitle("Sistema de Soporte Técnico Gcia. de T.I"); + i18nFormulario.setTitle("Soporte Técnico Gcia. de T.I"); i18nFormulario.setUsername("Usuario"); i18nFormulario.setPassword("Contraseña"); i18nFormulario.setSubmit("Iniciar sesión"); 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 89d22dc..67efe1c 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java @@ -65,6 +65,7 @@ public class AllTicketsView extends VerticalLayout { grid.addComponentColumn(ticket -> { Button btnVer = new Button("Ver"); btnVer.addClickListener(event -> showDescription(ticket)); + btnVer.getStyle().set("color", "#691b31"); return btnVer; }).setHeader("Descripcion").setAutoWidth(true); 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 2278b62..077c076 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/tickets/MisTicketsView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/tickets/MisTicketsView.java @@ -70,6 +70,7 @@ public class MisTicketsView extends VerticalLayout { grid.addComponentColumn(ticket -> { Button btnVer = new Button("Ver"); btnVer.addClickListener(event -> showDescription(ticket)); + btnVer.getStyle().set("color", "#691b31"); return btnVer; }).setHeader("Descripcion").setAutoWidth(true); diff --git a/src/main/resources/META-INF/resources/images/fondopay.png b/src/main/resources/META-INF/resources/images/fondopay.png new file mode 100644 index 0000000..75b114e Binary files /dev/null and b/src/main/resources/META-INF/resources/images/fondopay.png differ diff --git a/src/main/resources/META-INF/resources/images/fondopay_.png b/src/main/resources/META-INF/resources/images/fondopay_.png new file mode 100644 index 0000000..b220cdf Binary files /dev/null and b/src/main/resources/META-INF/resources/images/fondopay_.png differ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 168fde2..e701bb6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -18,13 +18,13 @@ spring.ldap.password=Dr3na$134%4guA ########PRODUCTIVO################################# -#redmine.url=https://proyman.jumapacelaya.gob.mx/ -#redmine.api_key=65b37a803babb6ba27f0f4fa3e562575d5ae63b3 +redmine.url=https://proyman.jumapacelaya.gob.mx/ +redmine.api_key=98158784609a110b3f9e837ac961d73b9ec58271 ########LOCAL###################################### -redmine.url=http://localhost:10083 -redmine.api_key=69b347fdfbf01bb60a10ea6daa92eb86acd10e3b +#redmine.url=http://localhost:10083 +#redmine.api_key=69b347fdfbf01bb60a10ea6daa92eb86acd10e3b ###CONFIGURACION DEL TAMANO MAXIMO PERMITIDO PARA ARCHIVOS###