diff --git a/src/main/java/mx/gob/jumapacelaya/views/SecurityConfiguration.java b/src/main/java/mx/gob/jumapacelaya/controller/SecurityConfiguration.java similarity index 88% rename from src/main/java/mx/gob/jumapacelaya/views/SecurityConfiguration.java rename to src/main/java/mx/gob/jumapacelaya/controller/SecurityConfiguration.java index c1074c4..0aeb10c 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/SecurityConfiguration.java +++ b/src/main/java/mx/gob/jumapacelaya/controller/SecurityConfiguration.java @@ -1,7 +1,7 @@ -package mx.gob.jumapacelaya.views; +package mx.gob.jumapacelaya.controller; import com.vaadin.flow.spring.security.VaadinWebSecurity; -import mx.gob.jumapacelaya.views.login.LoginView; +import mx.gob.jumapacelaya.ui.login.LoginView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -10,11 +10,7 @@ import org.springframework.http.HttpMethod; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; -import org.springframework.security.provisioning.UserDetailsManager; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.ldap.core.support.LdapContextSource; diff --git a/src/main/java/mx/gob/jumapacelaya/views/SecurityService.java b/src/main/java/mx/gob/jumapacelaya/services/SecurityService.java similarity index 95% rename from src/main/java/mx/gob/jumapacelaya/views/SecurityService.java rename to src/main/java/mx/gob/jumapacelaya/services/SecurityService.java index c3c8a68..3fd53d6 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/SecurityService.java +++ b/src/main/java/mx/gob/jumapacelaya/services/SecurityService.java @@ -1,4 +1,4 @@ -package mx.gob.jumapacelaya.views; +package mx.gob.jumapacelaya.services; import com.vaadin.flow.spring.security.AuthenticationContext; import org.springframework.security.core.Authentication; diff --git a/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java b/src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java similarity index 72% rename from src/main/java/mx/gob/jumapacelaya/views/MainLayout.java rename to src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java index 36f2725..9a3c625 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java +++ b/src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java @@ -1,29 +1,26 @@ -package mx.gob.jumapacelaya.views; +package mx.gob.jumapacelaya.ui; 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.Header; -import com.vaadin.flow.component.html.Span; +import com.vaadin.flow.component.html.*; +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; +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; import com.vaadin.flow.theme.lumo.LumoUtility; -import jakarta.annotation.security.PermitAll; -import mx.gob.jumapacelaya.views.home.HomeView; -import mx.gob.jumapacelaya.views.login.LoginView; -import org.vaadin.lineawesome.LineAwesomeIcon; +import mx.gob.jumapacelaya.services.SecurityService; +import mx.gob.jumapacelaya.ui.mantenimiento.MantenimientoView; public class MainLayout extends AppLayout { - private H1 viewTitle; + private H2 viewTitle; private final SecurityService securityService; public MainLayout(SecurityService securityService) { @@ -37,10 +34,9 @@ public class MainLayout extends AppLayout { DrawerToggle toggle = new DrawerToggle(); toggle.setAriaLabel("Menu toggle"); - viewTitle = new H1(); + viewTitle = new H2(); viewTitle.addClassNames(LumoUtility.FontSize.LARGE, LumoUtility.Margin.NONE); - addToNavbar(true, toggle, viewTitle); String u = securityService.getAuthenticatedUser(); Span usrNameLabel = new Span("Hola " + u); @@ -58,25 +54,31 @@ public class MainLayout extends AppLayout { headerContent.setFlexGrow(1, viewTitle); headerContent.add(usrNameLabel, logoutButton); - addToNavbar(true, toggle, headerContent); + addToNavbar(false, toggle, headerContent); } private void addDrawerContent() { - Span appName = new Span("Sistema de Mantenimiento"); - appName.addClassNames(LumoUtility.FontWeight.SEMIBOLD, LumoUtility.FontSize.LARGE); - 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() { SideNav nav = new SideNav(); - nav.addItem(new SideNavItem("Home", LoginView.class, LineAwesomeIcon.FILE.create())); + nav.addItem(new SideNavItem("Mantenimiento", MantenimientoView.class, VaadinIcon.EDIT.create())); return nav; } diff --git a/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java b/src/main/java/mx/gob/jumapacelaya/ui/login/LoginView.java similarity index 89% rename from src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java rename to src/main/java/mx/gob/jumapacelaya/ui/login/LoginView.java index 52182f4..b550708 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java +++ b/src/main/java/mx/gob/jumapacelaya/ui/login/LoginView.java @@ -1,4 +1,4 @@ -package mx.gob.jumapacelaya.views.login; +package mx.gob.jumapacelaya.ui.login; import com.vaadin.flow.component.html.Div; @@ -43,7 +43,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 Mantenimiento Preventivo y Correctivo Gcia. de T.I"); + i18nFormulario.setTitle("Mantenimiento Preventivo y Correctivo"); i18nFormulario.setUsername("Usuario"); i18nFormulario.setPassword("Contraseña"); i18nFormulario.setSubmit("Iniciar sesión"); @@ -56,7 +56,7 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver { i18nError.setMessage("Usuario o contraseña incorrectos, verifica tus credenciales"); i18n.setErrorMessage(i18nError); - i18n.setAdditionalInformation("Versión 1.2.2"); + i18n.setAdditionalInformation("Versión 1.0"); // Configuración del formulario de login login.setAction("login"); @@ -85,18 +85,6 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver { // Añadir el layout principal a la vista add(mainLayout); - - /* setSizeFull(); - setAlignItems(Alignment.CENTER); - setJustifyContentMode(JustifyContentMode.CENTER); - - - login.setAction("login"); - - add( - - login - );*/ } diff --git a/src/main/java/mx/gob/jumapacelaya/views/home/HomeView.java b/src/main/java/mx/gob/jumapacelaya/ui/mantenimiento/MantenimientoView.java similarity index 84% rename from src/main/java/mx/gob/jumapacelaya/views/home/HomeView.java rename to src/main/java/mx/gob/jumapacelaya/ui/mantenimiento/MantenimientoView.java index 7b762fe..ee5d7b7 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/home/HomeView.java +++ b/src/main/java/mx/gob/jumapacelaya/ui/mantenimiento/MantenimientoView.java @@ -1,4 +1,4 @@ -package mx.gob.jumapacelaya.views.home; +package mx.gob.jumapacelaya.ui.mantenimiento; import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.html.Image; @@ -6,17 +6,17 @@ import com.vaadin.flow.component.html.Paragraph; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; -import com.vaadin.flow.router.RouteAlias; import com.vaadin.flow.theme.lumo.LumoUtility.Margin; import jakarta.annotation.security.PermitAll; -import mx.gob.jumapacelaya.views.MainLayout; +import mx.gob.jumapacelaya.ui.MainLayout; + @PermitAll @PageTitle("Home") @Route(value = "/", layout = MainLayout.class) -public class HomeView extends VerticalLayout { +public class MantenimientoView extends VerticalLayout { - public HomeView() { + public MantenimientoView() { setSpacing(false); Image img = new Image("images/empty-plant.png", "placeholder plant");