From 3b579ba33b34c12418bd8d6aa6899297fa9a9904 Mon Sep 17 00:00:00 2001
From: Giuli1297 <giuli1297.gg@gmail.com>
Date: Tue, 9 Nov 2021 13:37:20 -0300
Subject: [PATCH] Merge

---
 curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java |  3 +++
 curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java   |  6 ++++--
 curriculumsearch/src/main/webapp/jsp/alerts.jsp                                | 18 ++++++++++++++++++
 curriculumsearch/src/main/webapp/jsp/index.jsp                                 | 19 ++++++-------------
 curriculumsearch/src/main/webapp/jsp/login.jsp                                 |  7 ++++---
 curriculumsearch/src/main/webapp/jsp/registration.jsp                          |  2 +-
 6 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 curriculumsearch/src/main/webapp/jsp/alerts.jsp

diff --git a/curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java b/curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java
index 08d65bc..d1279b2 100644
--- a/curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java
+++ b/curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java
@@ -51,6 +51,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
             .authorizeRequests()
                 .antMatchers("/").authenticated()
                 .antMatchers("/home").authenticated()
+                .antMatchers("/cargo*").authenticated()
+                .antMatchers("/convocatoria*").authenticated()
+                .antMatchers("/tecnologia*").authenticated()
                 .antMatchers("/postulantes").authenticated()
                 .anyRequest().permitAll()
                 .and()
diff --git a/curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java b/curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java
index ef5b0de..262fbfd 100644
--- a/curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java
+++ b/curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java
@@ -3,7 +3,6 @@ package com.roshka.controller;
 import com.roshka.modelo.RRHHUser;
 import com.roshka.repositorio.RRHHUserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -35,7 +34,10 @@ public class RRHHUserController {
     }
 
     @GetMapping("/login")
-    public String getLogin() {
+    public String getLogin(Model model, HttpServletRequest request) {
+        if(request.getParameter("error")!=null){
+            model.addAttribute("error", "Credenciales Incorrectas");
+        }
         return "login";
     }
 
diff --git a/curriculumsearch/src/main/webapp/jsp/alerts.jsp b/curriculumsearch/src/main/webapp/jsp/alerts.jsp
new file mode 100644
index 0000000..173ec86
--- /dev/null
+++ b/curriculumsearch/src/main/webapp/jsp/alerts.jsp
@@ -0,0 +1,18 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<div class="container">
+    <c:if test="${not empty error}">
+        <div class="alert alert-danger alert-dismissible fade show" role="alert">
+                ${error}
+            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+    </c:if>
+    <c:if test="${not empty success}">
+        <div class="alert alert-success alert-dismissible fade show" role="alert">
+                ${success}
+            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+    </c:if>
+</div>
\ No newline at end of file
diff --git a/curriculumsearch/src/main/webapp/jsp/index.jsp b/curriculumsearch/src/main/webapp/jsp/index.jsp
index 67945a0..2ee7cdc 100644
--- a/curriculumsearch/src/main/webapp/jsp/index.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/index.jsp
@@ -15,20 +15,13 @@
 <body>
     <div class="container">
         <jsp:include page="header.jsp"/>
+        <jsp:include page="alerts.jsp"/>
         <a href="postulante">Form postulante</a>
-        <div>
-            <form action="/logout" method="get">
-                <p>
-                    Welcome
-                </p>
-                <input type="submit" value="Sign Out" />
-            </form>
-        </div>
+        <a href="postulantes">Lista de postulantes</a>
+        <a href="#">Tecnologias</a>
+        <a href="convocatorias">Lista de convocatorias</a>
+        <a href="cargos">Lista de cargos</a>
     </div>
-    <a href="postulante">Form postulante</a>
-    <a href="postulantes">Lista de postulantes</a>
-    <a href="#">Tecnologias</a>
-    <a href="convocatorias">Lista de convocatorias</a>
-    <a href="cargos">Lista de cargos</a>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/curriculumsearch/src/main/webapp/jsp/login.jsp b/curriculumsearch/src/main/webapp/jsp/login.jsp
index cda5c85..11e5c13 100644
--- a/curriculumsearch/src/main/webapp/jsp/login.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/login.jsp
@@ -6,11 +6,12 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <title>Login</title>
-    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
     <link href="https://getbootstrap.com/docs/4.0/examples/signin/signin.css" rel="stylesheet" crossorigin="anonymous">
+
 </head>
 <body>
+<jsp:include page="alerts.jsp"/>
 <section class="vh-100" style="background-color: #508bfc;">
     <div class="container py-5 h-100">
         <div class="row d-flex justify-content-center align-items-center h-100">
@@ -44,7 +45,7 @@
         </div>
     </div>
 </section>
-
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
 </body>
 </html>
 
diff --git a/curriculumsearch/src/main/webapp/jsp/registration.jsp b/curriculumsearch/src/main/webapp/jsp/registration.jsp
index 74b4217..fc9a74f 100644
--- a/curriculumsearch/src/main/webapp/jsp/registration.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/registration.jsp
@@ -30,7 +30,7 @@
                         <form:form action="/process_register" class="px-md-2" method="POST" modelAttribute="user">
                             <div class="form-outline mb-4">
                                 <form:label path="email" class="form-label">Email</form:label>
-                                <form:input path="email" class="form-control" required="required"></form:input>
+                                <form:input path="email" type="email" class="form-control" required="required"></form:input>
                             </div>
                             <div class="row">
                                 <div class="col-md-6 mb-4">
--
libgit2 0.26.0