Merge branch 'William_001' of https://phoebe.roshka.com/gitlab/hshah/TalentoHumano into javi001

.vscode/settings.json

+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file

curriculumsearch/pom.xml

@@ -78,6 +78,13 @@
 <!--			<version>1.18.22</version>-->
 <!--			<scope>provided</scope>-->
 <!--		</dependency>-->
+		<dependency>
+			<groupId>kr.pe.kwonnam.jsp</groupId>
+			<artifactId>jsp-template-inheritance</artifactId>
+			<version>0.3.RELEASE</version>
+			<scope>compile</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>

curriculumsearch/src/main/java/com/roshka/configuration/CustomUserDetails.java

@@ -53,4 +53,8 @@ public class CustomUserDetails implements UserDetails {
         return user.getFirstName() + " " + user.getLastName();
     }
 
+    @Override
+    public String toString(){
+        return user.getEmail();
+    }
 }
\ No newline at end of file

curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java

@@ -55,6 +55,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/convocatoria*").authenticated()
                 .antMatchers("/tecnologia*").authenticated()
                 .antMatchers("/postulantes").authenticated()
+                .antMatchers("/edit-user-data").authenticated()
                 .anyRequest().permitAll()
                 .and()
                 .formLogin()

curriculumsearch/src/main/java/com/roshka/controller/CargoController.java

 package com.roshka.controller;
 
 
+import javax.validation.Valid;
+
 import com.roshka.modelo.Cargo;
 import com.roshka.repositorio.CargoRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +44,11 @@ public class CargoController {
     }
 
     @PostMapping(path = {"/cargo","/cargo/{id}"})
-    public String guardarCargo(@ModelAttribute Cargo cargo, BindingResult result, @PathVariable(required = false) Long id) {
-        if(result.hasErrors()); 
+    public String guardarCargo(@Valid @ModelAttribute Cargo cargo, BindingResult result, @PathVariable(required = false) Long id, Model model) {
+        if(result.hasErrors() || (id==null && cargoRepo.existsByNombreIgnoreCase(cargo.getNombre())  )){
+            model.addAttribute("mismoNombre", true);
+            return "cargo-form";
+        }; 
         if(id != null ) cargo.setId(id);
         cargoRepo.save(cargo);
         System.out.println(cargo.getNombre());

curriculumsearch/src/main/java/com/roshka/controller/HomeController.java

+package com.roshka.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+@Controller
+@RequestMapping("/home")
+public class HomeController {
+    @RequestMapping()
+    public String home(Model model) {
+        return "index";
+    }
+}

curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java

@@ -81,13 +81,6 @@ public class PostulanteController {
         this.carRepo=carRepo;
     }
 
-    @RequestMapping("home")
-    public String index() {
-      
-
-      return "index";
-    }
-
     @RequestMapping("/postulantes")
     public String postulantes(Model model,
                             @RequestParam(required = false)Long tecId,
@@ -190,8 +183,8 @@ public class PostulanteController {
                 return "redirect:/postulacion-correcta";
             }
 
-            @GetMapping("/postulacion-correcta")
-            public String successPostulation(Model model){
+    @GetMapping("/postulacion-correcta")
+    public String successPostulation(Model model){
         model.addAttribute("mensaje1", "Tu informacion se ha recibido correctamente!");
         model.addAttribute("mensaje2", " espera por que nos pongamos en contacto!");
         return "exitoRegistro";
@@ -203,35 +196,35 @@ public class PostulanteController {
         MethodArgumentNotValidException ex) {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST)
                 .body(ex.getMessage());
-            }
+    }
             
-            @ResponseStatus(HttpStatus.BAD_REQUEST)
-            @ExceptionHandler({ConstraintViolationException.class})
-            public ResponseEntity<String> handleValidationExceptions2(
-                ConstraintViolationException ex) {
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(ex.getMessage());
-                }
-                
-                
-                
-                @GetMapping({"/postulante/{postulanteId}"})
-                public String getPostulanteDetalle(Model model, @PathVariable("postulanteId") Long postulanteId) {
-                    Postulante p = post.findById(postulanteId).orElse(null);
-                    model.addAttribute("postulante",p);
-                    model.addAttribute("estadoP", EstadoPostulante.values());				
-                    return "detallepostulante";
-                    
-                }
-                @PostMapping({"/postulante/{postulanteId}"})
-                public String setPostulanteEstado(@ModelAttribute Postulante postulante, BindingResult result, @PathVariable("postulanteId") Long postulanteId) {
-                    //post.setPostulanteEstadoAndComentario(postulante.getEstadoPostulante(),postulante.getComentarioRRHH(), postulante.getId());
-                    Postulante postulanteVd = post.getById(postulanteId);
-                    postulanteVd.setEstadoPostulante(postulante.getEstadoPostulante());
-                    postulanteVd.setComentarioRRHH(postulante.getComentarioRRHH());
-                    post.setPostulanteEstadoAndComentario(postulante.getEstadoPostulante(), postulante.getComentarioRRHH(), postulanteId); 
-                    //post.save(postulanteVd);
-                    return "redirect:/postulante/"+postulanteId;
-                }
-            }
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler({ConstraintViolationException.class})
+    public ResponseEntity<String> handleValidationExceptions2(
+        ConstraintViolationException ex) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+            .body(ex.getMessage());
+        }
+
+
+
+    @GetMapping({"/postulante/{postulanteId}"})
+    public String getPostulanteDetalle(Model model, @PathVariable("postulanteId") Long postulanteId) {
+        Postulante p = post.findById(postulanteId).orElse(null);
+        model.addAttribute("postulante",p);
+        model.addAttribute("estadoP", EstadoPostulante.values());				
+        return "detallepostulante";
+        
+    }
+    @PostMapping({"/postulante/{postulanteId}"})
+    public String setPostulanteEstado(@ModelAttribute Postulante postulante, BindingResult result, @PathVariable("postulanteId") Long postulanteId) {
+        //post.setPostulanteEstadoAndComentario(postulante.getEstadoPostulante(),postulante.getComentarioRRHH(), postulante.getId());
+        Postulante postulanteVd = post.getById(postulanteId);
+        postulanteVd.setEstadoPostulante(postulante.getEstadoPostulante());
+        postulanteVd.setComentarioRRHH(postulante.getComentarioRRHH());
+        post.setPostulanteEstadoAndComentario(postulante.getEstadoPostulante(), postulante.getComentarioRRHH(), postulanteId);
+        //post.save(postulanteVd);
+        return "redirect:/postulante/"+postulanteId;
+    }
+}
             
\ No newline at end of file

curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java

@@ -11,6 +11,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -21,6 +24,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
 
@@ -76,6 +80,35 @@ public class RRHHUserController {
         return "register_success";
     }
 
+    @GetMapping("/edit-user-data")
+    public String editUserData(HttpServletRequest request, Model model){
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        System.out.println(auth.getPrincipal().toString());
+        System.out.println(rrhhUserRepository.findByEmail(auth.getPrincipal().toString()));
+        model.addAttribute("user", rrhhUserRepository.findByEmail(auth.getPrincipal().toString()));
+        return "edit-user-data";
+    }
+
+    @PostMapping("/edit-user-data")
+    public RedirectView processEditUser(HttpServletRequest request, RRHHUser user,
+                                        RedirectAttributes redirectAttributes){
+        RRHHUser editUser = rrhhUserRepository.findByEmail(SecurityContextHolder.getContext().getAuthentication()
+                .getPrincipal().toString());
+        if(user.getEmail()!=null){
+            editUser.setEmail(user.getEmail());
+        }
+        if(user.getFirstName()!=null){
+            editUser.setFirstName(user.getFirstName());
+        }
+        if(user.getLastName()!=null){
+            editUser.setLastName(user.getLastName());
+        }
+        rrhhUserRepository.save(editUser);
+        RedirectView redirectView = new RedirectView("/home",true);
+        redirectAttributes.addFlashAttribute("success", "Datos actualizados");
+        return redirectView;
+    }
+
     @Autowired
     private RRHHUserService userService;
 
@@ -155,15 +188,6 @@ public class RRHHUserController {
         return "redirect:/";
     }
 
-    @ResponseStatus(HttpStatus.PERMANENT_REDIRECT)
-    @ExceptionHandler({UsernameNotFoundException.class})
-    public RedirectView handleValidationExceptions(
-            RedirectAttributes redir, UsernameNotFoundException ex) {
-        RedirectView redirectView = new RedirectView("/forgot-password", true);
-        redir.addAttribute("error", "Error al enviar el mail. Checkee sus credenciales" +
-                " y intentelo de nuevo");
-        return redirectView;
-    }
 }
 
 class Utility {

curriculumsearch/src/main/java/com/roshka/controller/TecnologiaController.java

 package com.roshka.controller;
 
+import javax.validation.Valid;
+
 import com.roshka.modelo.Tecnologia;
 import com.roshka.repositorio.TecnologiaRepository;
 
@@ -45,8 +47,11 @@ public String addtecnologiaView(Model model,@PathVariable(required = false) Long
     }
 
 @PostMapping(path = {"/tecnologia","/tecnologia/{id}"})
-    public String addtecnologia(@ModelAttribute Tecnologia tecnologia, BindingResult result, @PathVariable(required = false) Long id) {
-        if(result.hasErrors()); 
+    public String addtecnologia(@Valid @ModelAttribute Tecnologia tecnologia, BindingResult result, @PathVariable(required = false) Long id, Model model) {
+        if(result.hasErrors() || (id==null && tecRepo.existsByNombreIgnoreCase(tecnologia.getNombre()))){
+            model.addAttribute("mismoNombre", true);
+            return "tecnologia-form";
+        } 
         if(id != null ) tecnologia.setId(id);
         tecRepo.save(tecnologia);
         System.out.println(tecnologia.getNombre());

curriculumsearch/src/main/java/com/roshka/modelo/Tecnologia.java

@@ -15,17 +15,17 @@ public class Tecnologia {
    @GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Id
 	@Column(name="id")
-	private long id;
+	private Long id;
 	
 	@Column(name="nombre")
 	@NotBlank(message = "Este campo no puede estar vacio")
     private String nombre;
     
 	
-	public long getId() {
+	public Long getId() {
 		return id;
 	}
-	public void setId(long id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 	public String getNombre() {

curriculumsearch/src/main/java/com/roshka/repositorio/CargoRepository.java

@@ -8,4 +8,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CargoRepository extends JpaRepository<Cargo,Long>{
     public List<Cargo> findByNombreContainingIgnoreCase(String nombre);
+    public boolean existsByNombreIgnoreCase(String nombre);
 }

curriculumsearch/src/main/java/com/roshka/repositorio/TecnologiaRepository.java

@@ -9,4 +9,6 @@ import com.roshka.modelo.Tecnologia;
 public interface TecnologiaRepository extends JpaRepository<Tecnologia,Long> {
 
 	public List<Tecnologia> findByNombreContainingIgnoreCase(String nombre);
+
+	public boolean existsByNombreIgnoreCase(String nombre);
 }

curriculumsearch/src/main/resources/application.properties

 
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-#spring.jpa.show-sql=true
+spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
-#logging.level.org.hibernate.SQL=DEBUG
-#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
 spring.sql.init.mode=always
 spring.sql.init.platform=postgres
@@ -24,3 +24,5 @@ spring.mail.port=587
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 
+jsp-inheritance-prefix=/jsp/layouts/
+jsp-inheritance-suffix=.jsp

curriculumsearch/src/main/resources/static/main.js

@@ -158,8 +158,9 @@ function agregarFieldTecnologia(){
         if(tecn==null) continue;
         content1 += `
         <li id="tecn-${index}">        
-            ${tecn.tecnologia.nombre} 
+            ${tecn.tecnologia.nombre}         
             <button type="button" onclick="eliminarTecnologia(event)">Eliminar</button>
+            <br>
         </li>
         
         `
@@ -528,4 +529,58 @@ function eliminarReferencia(event) {
 
 
 
-
+/*--------------------------------------------------------------------------------------------------------- */
+$(function(){
+    $("#wizard").steps({
+    headerTag: "h4",
+    bodyTag: "section",
+    transitionEffect: "fade",
+    enableAllSteps: true,
+    transitionEffectSpeed: 500,
+    onStepChanging: function (event, currentIndex, newIndex) {
+    if ( newIndex === 1 ) {
+    $('.steps ul').addClass('step-2');
+    } else {
+    $('.steps ul').removeClass('step-2');
+    }
+    if ( newIndex === 2 ) {
+    $('.steps ul').addClass('step-3');
+    } else {
+    $('.steps ul').removeClass('step-3');
+    }
+    
+    if ( newIndex === 3 ) {
+    $('.steps ul').addClass('step-4');
+    $('.actions ul').addClass('step-last');
+    } else {
+    $('.steps ul').removeClass('step-4');
+    $('.actions ul').removeClass('step-last');
+    }
+    return true;
+    },
+    labels: {
+    finish: "Order again",
+    next: "Next",
+    previous: "Previous"
+    }
+    });
+    // Custom Steps Jquery Steps
+    $('.wizard > .steps li a').click(function(){
+    $(this).parent().addClass('checked');
+    $(this).parent().prevAll().addClass('checked');
+    $(this).parent().nextAll().removeClass('checked');
+    });
+    // Custom Button Jquery Steps
+    $('.forward').click(function(){
+    $("#wizard").steps('next');
+    })
+    $('.backward').click(function(){
+    $("#wizard").steps('previous');
+    })
+    // Checkbox
+    $('.checkbox-circle label').click(function(){
+    $('.checkbox-circle label').removeClass('active');
+    $(this).addClass('active');
+    })
+    })
+/*--------------------------------------------------------------------------------------------------------- */
\ No newline at end of file

curriculumsearch/src/main/webapp/css/cargoStyle.css

+body{
+    background-image:url(/img/fondoBlanco.jpg);
+    background-size:cover;
+    background-repeat:no-repeat;
+    height:100vh;width:100vw; 
+}
+label {
+    display: inline-block;
+    width: 100px;
+}
\ No newline at end of file

curriculumsearch/src/main/webapp/css/detallePostulantestyle.css

+:root {
+    --nord0: #2e3440;
+    --nord1: #3b4252;
+    --nord2: #434c5e;
+    --nord3: #4c566a;
+    --nord4: #d8dee9;
+    --nord5: #e5e9f0;
+    --nord6: #eceff4;
+    --nord7: #8fbcbb;
+    --nord8: #88c0d0;
+    --nord9: #81a1c1;
+    --nord10: #5e81ac;
+    --nord11: #bf616a;
+    --nord12: #d08770;
+    --nord13: #ebcb8b;
+    --nord14: #a3be8c;
+    --nord15: #b48ead;
+}
+*{outline: 1px #bf616a;}
+body{
+    color: #3b4252;
+    margin: auto;
+}
+header,section{
+    width: 960px;
+    margin: 0 auto;
+}
+ul{
+    list-style-type: none;
+}
+header{
+    background-image:url(/img/fondoHeader.png);
+    display: flex;
+    color: #2e3440;
+}
+section{
+    background-image:url(/img/fondoBlanco.jpg);
+    
+    display: flex;
+    
+}
+article{
+    width: 60%;
+}
\ No newline at end of file

curriculumsearch/src/main/webapp/css/formPostulanteStyle.css

+body {
+    /* background-color: #506BEE; */
+    background-image:url(/img/fondo.png);
+    /*background-size:cover;*/
+    background-repeat:repeat;
+    height:100vh;width:100vw;  
+    align-items:"middle";
+    
+}
+#head{text-align:center}
+ form{/*max-width:300px;
+    width:90%;position:relative;
+    left:50%;
+    top:10%;padding:40px;
+    border-radius:4px;
+    transform:translate(-50%,10%);*/
+   
+    box-shadow:3px 3px 4px rgba(175, 209, 20, 0.2)} 
+.card {
+    border: none
+}
+li {
+    padding: 0;
+    display: inline-block; 
+    width: 80px; 
+    text-align: center; 
+    letter-spacing:normal; 
+    vertical-align: middle;
+    line-height: 1.1;
+}
+button {
+ 
+    border: none;
+    color: white;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 16px;
+}
+
+.image {
+    position: relative
+}
+
+.image span {
+    background-color: #506BEE;
+    color: #fff;
+    padding: 6px;
+    height: 30px;
+    width: 30px;
+    border-radius: 50%;
+    font-size: 13px;
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    top: -0px;
+    right: 0px
+}
+
+.user-details h4 {
+    color: #506BEE
+}
+
+.ratings {
+    font-size: 30px;
+    font-weight: 600;
+    display: flex;
+    justify-content: left;
+    align-items: center;
+    color: #f9b43a
+}
+
+.user-details span {
+    text-align: left
+}
+
+.inputs label {
+    display: flex;
+    margin-left: 3px;
+    font-weight: 500;
+    font-size: 13px;
+    margin-bottom: 4px
+}
+
+.inputs input {
+    font-size: 14px;
+    height: 40px;
+    border: 2px solid #ced4da
+}
+
+.inputs input:focus {
+    box-shadow: none;
+    border: 2px solid #506BEE
+}
+
+.about-inputs label {
+    display: flex;
+    margin-left: 3px;
+    font-weight: 500;
+    font-size: 13px;
+    margin-bottom: 4px
+}
+
+.about-inputs textarea {
+    font-size: 14px;
+    height: 100px;
+    border: 2px solid #ced4da;
+    resize: none
+}
+
+.about-inputs textarea:focus {
+    box-shadow: none
+}
+
+.btn {
+    font-weight: 600
+}
+
+.btn:focus {
+    box-shadow: none
+}
+
+select {
+    display: block;
+    width: 100%;
+    border: 1px solid #ddd;
+    border-radius: 20px;
+    height: 40px;
+    padding: 5px 10px
+}
+
+select:focus {
+    outline: none
+}
+
+.add-experience:hover {
+    background: #506BEE;
+    color: #fff;
+    cursor: pointer;
+    border: solid 1px #506BEE
+}
+
+.content-select select{
+	appearance: none;
+	-webkit-appearance: none;
+	-moz-appearance: none;
+}
+.content-select{
+	max-width: 250px;
+	position: relative;
+}
+ 
+.content-select select{
+	display: inline-block;
+	width: 100%;
+	cursor: pointer;
+  	padding: 7px 10px;
+  	height: 42px;
+  	outline: 0; 
+  	border: 0;
+	border-radius: 0;
+	background: #f0f0f0;
+	color: #7b7b7b;
+	font-size: 1em;
+	color: #999;
+	font-family: 
+	'Quicksand', sans-serif;
+	border:2px solid rgba(0,0,0,0.2);
+    border-radius: 12px;
+    position: relative;
+    transition: all 0.25s ease;
+}
+ 
+.content-select select:hover{
+	background: #B1E8CD;
+}
+ 
+/* 
+Creamos la fecha que aparece a la izquierda del select.
+Realmente este elemento es un cuadrado que sólo tienen
+dos bordes con color y que giramos con transform: rotate(-45deg);
+*/
+.content-select i{
+	position: absolute;
+	right: 20px;
+	top: calc(50% - 13px);
+	width: 16px;
+	height: 16px;
+	display: block;
+	border-left:4px solid #2AC176;
+	border-bottom:4px solid #2AC176;
+	transform: rotate(-45deg); /* Giramos el cuadrado */
+	transition: all 0.25s ease;
+}
+ 
+.content-select:hover i{
+	margin-top: 3px;
+}
\ No newline at end of file

curriculumsearch/src/main/webapp/css/indexStyle.css

+body{
+    background-image:url(/img/fondoIndex.jpg);
+    background-size:cover;
+    background-repeat:no-repeat;
+    height:100vh;width:100vw;  
+    position: absolute;
+    -webkit-text-size-adjust: 100%;
+}
\ No newline at end of file

curriculumsearch/src/main/webapp/css/style.css

+*{
+    margin: 0px;
+    padding: 0px;
+}
+body{
+    background-image:url(/img/FondoRoshka.jpg);
+    background-size:cover;
+    background-repeat:no-repeat;
+    overflow: hidden;
+    height:100%;width:100%; 
+    align-items:"middle";
+    position: absolute;
+}
+#form{max-width:333px;
+    width:90%;position:relative;
+    left:50%;
+    top:10%;padding:40px;
+    border-radius:4px;
+    transform:translate(-50%,10%);
+    color:#fff;
+    box-shadow:3px 3px 4px rgba(0,0,0,.2)}
+#head{text-align:center}
+#image{margin:auto;width:50%;
+    padding:10px;max-height:175px;
+    max-width:175px}
+/*#linkas{display:block;
+    text-align:center;
+    font-size:12px;
+    opacity:.9;
+    text-decoration:none}
+#butonas{background:#70b2d0;
+    outline:0;
+    text-shadow:initial}
+#formum,#formum2{background:0 0;
+    border:none;
+    border-bottom:1px solid #434a52;
+    border-radius:0;
+    box-shadow:none;
+    outline:0;
+    color:inherit} */
\ No newline at end of file

curriculumsearch/src/main/webapp/jsp/cargo-form.jsp

-<%@ 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" %>
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Cargo</title>
-    <link
-      href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
-      rel="stylesheet"
-      integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
-      crossorigin="anonymous"
-    />
-    <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>
-  </head>
-  <body>
-    <jsp:include page="header.jsp" />
-    <jsp:include page="alerts.jsp" />
-    <div class="container-xxl my-md-4 bd-layout">
-        <h2>Agregar Cargo</h2>
-        <div class="p-3 mb-2 bg-light text-dark border border-light">
-            <form:form
-            action="/cargo/${cargo.id == null ? '' : cargo.id}"
-            method="post"
-            modelAttribute="cargo"
-            class="row row-cols-lg-auto g-3 align-items-center"
-            >
-            <div class="col-12">
-                <form:label class="form-label visually-hidden" path="nombre"
-                >Nombre del cargo
-                </form:label>
-                <form:input
-                type="text"
-                path="nombre"
-                class="form-control"
-                placeholder="Nombre del cargo" required="true"
-                
-                />
-            </div>
-            <div class="col-12">
-                <input type="submit" value="Guardar" class="btn btn-primary" />
-            </div>
-            </form:form>
-        </div>
-    </div>
-  </body>
-</html>
+<%@ 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" %>
+<%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
+<layout:extends name="layouts/base.jsp">
+  <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
+    <layout:put block="contents" type="REPLACE">
+      <div class="card d-flex flex-column justify-content-center align-items-center mx-auto mt-2 p-3" style="width: 20rem;">
+        <h5 class="card-title">${cargo.id == null ? "Agregar" : "Modificar"} Cargo</h5>
+          <form:form
+          action="/cargo/${cargo.id == null ? '' : cargo.id}"
+          method="post"
+          modelAttribute="cargo"
+          class="card-body d-flex flex-column"
+          >
+          <div class="">
+              <form:label class="form-label visually-hidden" path="nombre"
+              >Nombre del cargo
+              </form:label>
+              <form:input
+              type="text"
+              path="nombre"
+              class="form-control ${ mismoNombre ? 'is-invalid' : ''}"
+              placeholder="Nombre del cargo" required="true"
+              
+              />
+              <div id="validationServerUsernameFeedback" class="invalid-feedback">
+                Este nombre ya existe
+              </div>
+          </div>
+          <div class="mt-2 align-self-end">
+              <input type="submit" value="Guardar" class="btn btn-primary" />
+          </div>
+          </form:form>
+      </div>
+    </layout:put>
+    <layout:put block="scripts" type="APPEND">
+
+    </layout:put>
+</layout:extends>

curriculumsearch/src/main/webapp/jsp/cargos.jsp

 <%@ 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" %>
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Cargo</title>
-    <link
-      href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
-      rel="stylesheet"
-      integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
-      crossorigin="anonymous"
-    />
-    <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>
-  </head>
-  <body>
-    <jsp:include page="header.jsp" />
-    <jsp:include page="alerts.jsp" />
-    <div class="container-xxl my-md-4 bd-layout">
-    <h2>Lista de cargos</h2>
-      <div>
-        <form>
-          <label for="cargos">Nombre:</label>
-          <input
-            type="text"
-            name="nombre"
-            id="nombre"
-            value="${param.nombre}"
-          />
-          <input type="submit" value="Buscar" />
-        </form>
-        <a href="/cargo">Agregar Nuevo Cargo</a>
-      </div>
-      <div>
-        <table class="table">
-          <thead>
-            <tr>
-              <th scope="col">#</th>
-              <th scope="col">Cargo</th>
-            </tr>
-          </thead>
-          <tbody>
-            <c:forEach items="${cargos}" var="cargo" varStatus="sta">
-              <tr>
-                <th scope="row">${sta.index+1}</th>
-                <td>${cargo.getNombre()}</td>
-                <td>
-                  <a href="/convocatorias?cargoId=${cargo.id}"
-                    >Ver Convocatorias</a
-                  >
-                </td>
-                <td><a href="/cargo/${cargo.id}">Editar cargo</a></td>
-              </tr>
-            </c:forEach>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
+<%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
+<layout:extends name="layouts/base.jsp">
+  <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
+    <layout:put block="contents" type="REPLACE">
+      <div class="container-xxl my-md-4 bd-layout">
+        <h2>Lista de cargos</h2>
+          <div>
+            <form>
+              <label for="cargos">Nombre:</label>
+              <input
+                type="text"
+                name="nombre"
+                id="nombre"
+                value="${param.nombre}"
+              />
+              <input type="submit" value="Buscar" />
+            </form>
+            <a href="/cargo">Agregar Nuevo Cargo</a>
+          </div>
+          <div>
+            <table class="table">
+              <thead>
+                <tr>
+                  <th scope="col">#</th>
+                  <th scope="col">Cargo</th>
+                </tr>
+              </thead>
+              <tbody>
+                <c:forEach items="${cargos}" var="cargo" varStatus="sta">
+                  <tr>
+                    <th scope="row">${sta.index+1}</th>
+                    <td>${cargo.getNombre()}</td>
+                    <td>
+                      <a href="/convocatorias?cargoId=${cargo.id}"
+                        >Ver Convocatorias</a
+                      >
+                    </td>
+                    <td><a href="/cargo/${cargo.id}">Editar cargo</a></td>
+                  </tr>
+                </c:forEach>
+              </tbody>
+            </table>
+          </div>
+        </div>
+    </layout:put>
+    <layout:put block="scripts" type="APPEND">
+
+    </layout:put>
+</layout:extends>

curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp

 <%@ 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" %>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Convocatoria</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <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>
-</head>
-<body>
-    <jsp:include page="header.jsp"/>
-    <jsp:include page="alerts.jsp"/>
-    <div class="container-xxl my-md-4 bd-layout">
-    <h2>Agregar Convocatoria</h2>
-    <div class="p-3 mb-2 bg-light text-dark border border-light ">
-        <form:form action="/convocatoria/${convocatoria.id == null ? '' : convocatoria.id}" method="post" modelAttribute="convocatoria">
-            <div class="mb-3 col-3">
-                <form:label path="fechaInicioS" class="form-label">Fecha inicial</form:label>
-                <form:input type="date" class="form-control" path="fechaInicioS" required="true"/>
-              
-            </div>
-            <div class="mb-3 col-3">
-                <form:label path="fechaFinS" class="form-label">Fecha Fin</form:label>
-                <form:input type="date" class="form-control" path="fechaFinS" required="true"/>
-            </div>
-            <div class="mb-3 col-3">
-                <form:label path="cupos" class="form-label">Cupos:</form:label>
-                <form:input type="number" class="form-control" path="cupos" required="true"/>
-            </div>
-            <div class="mb-3 col-3">
-                <form:label path="cargoId" class="form-label">Cargo</form:label>
-                <form:select class="form-select" path="cargoId" required="true">
-                    <c:forEach items="${cargos}" var="cargo">
-                        <form:option value="${cargo.id}">${cargo.nombre} </form:option>
-                    </c:forEach>
-                </form:select>
-            </div>
-            <button type="submit" class="btn btn-primary">Guardar</button>
-          </form:form>
-    </div>
-   </div>
-</body>
-</html>
\ No newline at end of file
+<%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
+<layout:extends name="layouts/base.jsp">
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
+    <layout:put block="contents" type="REPLACE">
+        <h2>${convocatoria.id == null ? "Agregar" : "Modificar"} Convocatoria</h2>
+        <div class="p-3 mb-2 bg-light text-dark border border-light ">
+            <form:form action="/convocatoria/${convocatoria.id == null ? '' : convocatoria.id}" method="post" modelAttribute="convocatoria">
+                <div class="mb-3 col-3">
+                    <form:label path="fechaInicioS" class="form-label">Fecha inicial</form:label>
+                    <form:input type="date" class="form-control" path="fechaInicioS" required="true"/>
+                
+                </div>
+                <div class="mb-3 col-3">
+                    <form:label path="fechaFinS" class="form-label">Fecha Fin</form:label>
+                    <form:input type="date" class="form-control" path="fechaFinS" required="true"/>
+                </div>
+                <div class="mb-3 col-3">
+                    <form:label path="cupos" class="form-label">Cupos:</form:label>
+                    <form:input type="number" class="form-control" path="cupos" required="true"/>
+                </div>
+                <div class="mb-3 col-3">
+                    <form:label path="cargoId" class="form-label">Cargo</form:label>
+                    <form:select class="form-select" path="cargoId" required="true">
+                        <c:forEach items="${cargos}" var="cargo">
+                            <form:option value="${cargo.id}">${cargo.nombre} </form:option>
+                        </c:forEach>
+                    </form:select>
+                </div>
+                <button type="submit" class="btn btn-primary">Guardar</button>
+            </form:form>
+        </div>
+    </layout:put>
+    <layout:put block="scripts" type="APPEND">
+
+    </layout:put>
+</layout:extends>

curriculumsearch/src/main/webapp/jsp/convocatorias.jsp

 <%@ 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" %>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Cargo</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <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>
-</head>
-<body >
-    <jsp:include page="header.jsp"/>
-    <jsp:include page="alerts.jsp"/>
-    <div class="container-xxl my-md-4 bd-layout">
+<%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
+<layout:extends name="layouts/base.jsp">
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
+    <layout:put block="contents" type="REPLACE">
         <h2>Lista de convocatorias</h2>
         <div>
             <form>
@@ -67,7 +57,8 @@
               </table>
              
         </div>
-    </div>
-    
-</body>
-</html>
\ No newline at end of file
+    </layout:put>
+    <layout:put block="scripts" type="APPEND">
+
+    </layout:put>
+</layout:extends>

curriculumsearch/src/main/webapp/jsp/detallepostulante2.jsp

+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Curriculum vitae</title>
+    <link href="../css/detallePostulantestyle.css" rel="stylesheet" type="text/css"/>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <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>
+</head>
+<body class="container">
+    <header>
+        <div>
+            <br>
+            <h2>&nbsp;&nbsp;&nbsp;&nbsp; ${postulante.nombre} ${postulante.apellido}</h2>    
+            <h3>&nbsp;&nbsp;&nbsp;&nbsp; ${postulante.tipoDocumento}: ${postulante.nroDocument}</h3>
+            <h3>&nbsp;&nbsp;&nbsp;&nbsp; Correo: ${postulante.correo}</h3>
+            <br>
+        </div>
+    </header>
+    <section>
+        <article>
+            <br>
+            <h2>&nbsp;&nbsp;Informacion Personal</h2>
+            <ul>
+                <li>
+                    Direccion: ${postulante.getCiudad().getDepartamento().getNombre()},${postulante.getCiudad().getNombre()}
+                </li>
+                <li>
+                    Telefono: ${postulante.telefono}
+                </li>
+                <li>
+                    Fecha de nacimiento: ${postulante.fechaNacimiento}
+                </li>
+                <li>
+                    Nivel de ingles:&nbsp;&nbsp;<progress value="${postulante.nivelIngles}" max="5"> 
+                </li>
+                <li>
+                    Estado civil: ${postulante.estadoCivil}
+                </li>
+                <li>
+                    Nacionalidad: ${postulante.nacionalidad}
+                </li>
+                <li>
+                    Disponibilidad: ${postulante.disponibilidad}
+                </li>
+                <li>
+                    Resumen: ${postulante.resumen}
+                </li>
+            </ul>
+            <br>
+            <h2>&nbsp;&nbsp;TECNOLOGIAS</h2>
+            <ul>
+                <c:forEach items="${postulante.tecnologias}" var="detalle_tecnologia">
+                    <label>Tecnologias: ${detalle_tecnologia.getTecnologia().getNombre()} &nbsp;&nbsp;<progress value="${detalle_tecnologia.getNivel()}" max="5"></progress></label><br>
+                </c:forEach>
+            </ul>
+            <br>
+            <h2>&nbsp;&nbsp;Cargo al que Postula</h2>
+            <ul>
+                <c:forEach items="${postulante.postulaciones}" var="convocatoria">
+                    <li>Nombre: ${convocatoria.getCargo().getNombre()}</li><br>
+                </c:forEach>
+            </ul>
+            <br>
+            <h2>&nbsp;&nbsp;Estado RRHH</h2>
+            <ul>
+                <li>Estado del Postulante: ${postulante.estadoPostulante.getEstado()}</li>
+                <li>Comentario RRHH: ${postulante.getComentarioRRHH()}</li>
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalLong">Cambiar</button>
+                  
+            </ul>
+        </article>
+        <aside>
+            <br>
+            <h2>Informacion Academica</h2>
+            <ul>
+                <c:forEach items="${postulante.estudios}" var="detalle_estudios">
+                    <label>Institucion: ${detalle_estudios.getInstitucion().getNombre()}</label><br>
+                    <label>Tipo de estudio: ${detalle_estudios.getTipoDeEstudio()}</label><br>  
+                    <label>Tema de estudio: ${detalle_estudios.getTemaDeEstudio()}</label><br>     
+                    <label>Fecha Inicio: ${detalle_estudios.getFechaDesde()}</label><br>
+                    <label>Fecha Fin: ${detalle_estudios.getFechaHasta()}</label><br>
+                    <label>Estado: ${detalle_estudios.getEstado()}</label><br>
+                    <br><br>
+                </c:forEach>
+            </ul>
+            <br>
+            <h2>EXPERIENCIAS</h2>
+            <ul>
+                <c:forEach items="${postulante.experiencias}" var="detalle_experiencia">
+                    <label>Institucion: ${detalle_experiencia.getInstitucion()}</label><br>
+                    <label>Fecha Inicio: ${detalle_experiencia.getFechaDesde()}</label><br>
+                    <label>Fecha Fin: ${detalle_experiencia.getFechaHasta()}</label><br>
+                    <label>Referencia: ${detalle_experiencia.getNombreReferencia()}</label><br>
+                    <label>Telefono de la referencia: ${detalle_experiencia.getTelefonoReferencia()}</label><br>
+                    <label>Cargo: ${detalle_experiencia.getCargo()}</label><br>
+                    <label>Motivo de salida: ${detalle_experiencia.getMotivoSalida()}</label><br>
+                    </c:forEach>
+            </ul>
+            <br> 
+            <h2>Referencias</h2>
+            <ul>
+                <c:forEach items="${postulante.referencias}" var="detalle_referencias">
+                    <label>Nombre: ${detalle_referencias.getNombre()}</label><br>
+                    <label>Relacion: ${detalle_referencias.getRelacion()}</label><br>
+                    <label>Telefono: ${detalle_referencias.getTelefono()}</label><br>
+                </c:forEach>
+            </ul>   
+        </aside>
+        
+    </section>
+    <!-- Modal -->
+    <div class="modal fade" id="exampleModalLong" tabindex="-1" role="dialog" aria-labelledby="exampleModalLongTitle" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+            <h5 class="modal-title" id="exampleModalLongTitle">Modal title</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
+            </div>
+            <div class="modal-body">
+                <form:form class="needs-validation" method="post" modelAttribute="postulante">
+                    <form:label path="estadoPostulante" class="form-label">Estado</form:label>
+                    <div class="inputs">
+                        <form:select class="form-select" path="estadoPostulante" aria-label="Default select example">
+                            <c:forEach items="${estadoP}" var="estadoPostulante">
+                                        <c:choose>
+                                            <c:when test="${estadoPostulante.getEstado()=='Nuevo' }">
+                                            </c:when>
+                                            <c:otherwise>
+                                                <form:option value="${estadoPostulante}">${estadoPostulante.getEstado()}</form:option>
+                                            </c:otherwise>
+                                        </c:choose>    
+                            </c:forEach>
+                        </form:select>
+                    </div>
+                    <div class="inputs">
+                        <form:label path="comentarioRRHH" class="form-label">ComentarioRRHH</form:label>
+                        <form:textarea  class="form-control" path="comentarioRRHH" id="comentarioRRHH"></form:textarea>
+                    </div>
+                    <input type="submit" value="Guardar"/>
+                </form:form> 
+            </div>
+            <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+            </div>
+        </div>
+        </div>
+    </div>  
+      
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+    
+</body>
+  
+</html>
\ No newline at end of file

curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp

+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<html>
+<head>
+    <meta charset="ISO-8859-1">
+    <title>Edit Profile</title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <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>
+
+</head>
+<style>
+    @media (min-width: 1025px) {
+        .h-custom {
+            height: 100vh !important;
+        }
+    }
+</style>
+<body>
+<section class="h-100 h-custom">
+    <div class="container py-5 h-100">
+        <div class="row d-flex justify-content-center align-items-center h-100">
+            <div class="col-lg-8 col-xl-6">
+                <div class="card rounded-3">
+                    <img src="https://cdn.pixabay.com/photo/2013/08/09/05/54/layer-170971_960_720.jpg" class="w-100" style="border-top-left-radius: .3rem; border-top-right-radius: .3rem;height: 250px;" alt="Sample photo";>
+                    <div class="card-body p-4 p-md-5">
+                        <h3 class="mb-4 pb-2 pb-md-0 mb-md-5 px-md-2">Perfil</h3>
+
+                        <form:form action="/edit-user-data" 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" type="email" class="form-control" required="required"></form:input>
+                            </div>
+                            <div class="row">
+                                <div class="col-md-6 mb-4">
+                                    <div class="form-outline">
+                                        <form:label path="firstName" class="form-label">Nombre </form:label>
+                                        <form:input path="firstName" class="form-control"></form:input>
+                                    </div>
+                                </div>
+                                <div class="col-md-6 mb-4">
+                                    <div class="form-outline">
+                                        <form:label path="lastName" class="form-label">Apellido </form:label>
+                                        <form:input path="lastName" class="form-control"></form:input>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row mb-4 pb-2 pb-md-0 mb-md-5">
+                                <div class="col-md-6">
+
+                                </div>
+                            </div>
+
+                            <button type="submit" class="btn btn-success btn-lg mb-1">Submit</button>
+                        </form:form>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+</body>
+</html>

curriculumsearch/src/main/webapp/jsp/header.jsp

@@ -46,8 +46,12 @@
                 </ul>
               </li>
               <li class="nav-item">
+                <a class="nav-link" href="/edit-user-data">Editar mis datos</a>
+              </li>
+              <li class="nav-item">
                 <a class="nav-link" href="/logout">Salir</a>
               </li>
+
             </ul>
           </div>
         </div>

curriculumsearch/src/main/webapp/jsp/index.jsp

@@ -8,7 +8,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <title>Document</title>
+    <title>RRHH</title>
+    <link href="../css/indexStyle.css" rel="stylesheet" type="text/css"/>
+    
 </head>
 <body>
     <jsp:include page="header.jsp"/>

curriculumsearch/src/main/webapp/jsp/layouts/base.jsp

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <layout:block name="cssDeclaracion"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:block>
+
+    <title>RRHH</title>
+</head>
+<body>
+    <header>
+    
+    
+        <nav class="navbar navbar-expand-lg navbar-light bg-light">
+            <div class="container-fluid">
+              <a class="navbar-brand" href="#">ROSHKA</a>
+              <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+              </button>
+              <div class="collapse navbar-collapse" id="navbarNavDropdown">
+                <ul class="navbar-nav">
+                  <li class="nav-item">
+                    <a class="nav-link active" aria-current="page" href="/home">Home</a>
+                  </li>
+                
+                  <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                      Cargos
+                    </a>
+                    <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                      <li><a class="dropdown-item" href="/cargo">Agregar Cargo</a></li>
+                      <li><a class="dropdown-item" href="/convocatoria">Agregar Convocatoria</a></li>
+                      <li><a class="dropdown-item" href="/cargos">Listar cargos</a></li>
+                      <li><a class="dropdown-item" href="/convocatorias">Listar convocatorias</a></li>
+                    </ul>
+                  </li>
+                  <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                      Tecnologias
+                    </a>
+                    <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                      <li><a class="dropdown-item" href="/tecnologia">Agregar</a></li>
+                      <li><a class="dropdown-item" href="/tecnologias">Listar</a></li>
+                    </ul>
+                  </li>
+                  <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                      Postulantes
+                    </a>
+                    <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                      <li><a class="dropdown-item" href="/postulante">Agregar</a></li>
+                      <li><a class="dropdown-item" href="/postulantes">Listar</a></li>
+                    </ul>
+                  </li>
+                  <li class="nav-item">
+                    <a class="nav-link" href="/logout">Salir</a>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </nav>
+    </header>
+    
+    <div class="container-xxl my-md-4 bd-layout">
+        <layout:block name="contents">
+        
+        </layout:block>
+    </div>
+
+    <layout:block name="scripts">
+        
+    </layout:block>
+    <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>
\ No newline at end of file

curriculumsearch/src/main/webapp/jsp/login.jsp

@@ -8,21 +8,22 @@
     <title>Login</title>
     <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">
-
+    <link href="../css/style.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
 <jsp:include page="alerts.jsp"/>
-<section class="vh-100" style="background-color: #508bfc;">
+<!-- <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">
+        <div class="row d-flex justify-content-center align-items-center h-10">
             <div class="col-12 col-md-8 col-lg-6 col-xl-5">
                 <div class="card shadow-2-strong" style="border-radius: 1rem;">
                     <div class="card-body p-5 text-center">
 
-
-
                         <form:form method="post" action="/login">
                             <h3 class="mb-5">Ingresar</h3>
+                            <div align="center">
+                                <img src="../img/LogoRoshka.jpg" class="rounded img-fluid" id="image" style="width:auto;height:auto;" alt=""/>
+                            </div>
                             <div class="form-outline mb-4">
                                 <input type="email" id="typeEmailX-2" class="form-control form-control-lg" name="email" placeholder="example@example.com"/>
                                 <label class="form-label" for="typeEmailX-2">Email</label>
@@ -41,6 +42,9 @@
                         <div class="row">
                             <a href="/forgot-password">Olvidaste tu contrasena?</a>
                         </div>
+                        <div class="row">
+                            <a href="/register">Registrate</a>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -48,6 +52,7 @@
     </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>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
 

curriculumsearch/src/main/webapp/jsp/tecnologia-form.jsp

 <%@ 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" %>
-
-
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- Bootstrap CSS -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <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>
-    <title>Agregar Tecnologia</title>
-
-
-</head>
-<body>
-    <jsp:include page="header.jsp"/>
-    <jsp:include page="alerts.jsp"/>
-    <div class="container-xxl my-md-4 bd-layout">
-        <h2>Agregar Tecnologia</h2>
+<%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
+<layout:extends name="layouts/base.jsp">
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
+    <layout:put block="contents" type="REPLACE">
+        <h2>${tecnologia.id == null ? "Agregar" : "Modificar"} Tecnologia</h2>
         <div class="p-3 mb-2 bg-light text-dark border border-light">
 
             <form:form action="/tecnologia/${tecnologia.id == null ? '' : tecnologia.id}"  method="post" modelAttribute="tecnologia" class="row row-cols-lg-auto g-3 align-items-center">
             <div class="col-12">
-                <form:label class="form-label visually-hidden"  path="nombre">Nombre: </form:label> <form:input type="text" path="nombre" class="form-control" required="true" placeholder="Nombre de la tecnologia"/>
+                <form:label class="form-label visually-hidden"  path="nombre">Nombre: </form:label> 
+                <form:input type="text" path="nombre" class="form-control ${ mismoNombre ? 'is-invalid' : ''}" required="true" placeholder="Nombre de la tecnologia"/>
+                <div id="validationServerUsernameFeedback" class="invalid-feedback">
+                    Este nombre ya existe
+                  </div>
             </div>
             <div class="col-12">
                 <input type="submit" value="Guardar" class="btn btn-primary"/>
             </div>
             </form:form>
         </div>
-    </div>
-
-
-
-
-
-</body>
-
-
-
-</html>
\ No newline at end of file
+    </layout:put>
+</layout:extends>
\ No newline at end of file

curriculumsearch/src/main/webapp/jsp/tecnologias.jsp

 <%@ 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" %>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Tecnologia</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <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>
-</head>
-<body>
-    <jsp:include page="header.jsp"/>
-    <jsp:include page="alerts.jsp"/>
-    <div class="container-xxl my-md-4 bd-layout">
+<%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
+<layout:extends name="layouts/base.jsp">
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
+    <layout:put block="contents" type="REPLACE">
         <h2>Lista de Tecnologias</h2>
 
         <div>
@@ -49,7 +39,5 @@
                 </tbody>
               </table>
         </div>
-    </div>
-    
-</body>
-</html>
\ No newline at end of file
+    </layout:put>
+</layout:extends>

curriculumsearch/webapp/css/styles.min.css

+body{
+    background-image:url(/img/FondoRoshka.jpg?h=4dba38685316d6e65f6e24d740c4c6b5);
+    background-size:cover;
+    background-repeat:no-repeat;
+    height:auto;width:auto}
+/* #form{max-width:333px;
+    width:90%;position:relative;
+    left:50%;
+    top:10%;padding:40px;
+    border-radius:4px;
+    transform:translate(-50%,10%);
+    color:#fff;
+    box-shadow:3px 3px 4px rgba(0,0,0,.2)}
+#head{text-align:center}
+#image{margin:auto;width:50%;
+    padding:10px;max-height:175px;
+    max-width:175px}
+#linkas{display:block;
+    text-align:center;
+    font-size:12px;
+    opacity:.9;
+    text-decoration:none}
+#butonas{background:#70b2d0;
+    outline:0;
+    text-shadow:initial}
+#formum,#formum2{background:0 0;
+    border:none;
+    border-bottom:1px solid #434a52;
+    border-radius:0;
+    box-shadow:none;
+    outline:0;
+    color:inherit} */
\ No newline at end of file