merge con develop

pom.xml

@@ -37,6 +37,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+            <version>2.0.0-M1</version>
+        </dependency>
+        <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>42.3.5</version>

src/main/java/com/roshka/proyectofinal/Postulante/PostulanteDao.java

+package com.roshka.proyectofinal.Postulante;
+import com.roshka.proyectofinal.DataBase;
+import com.roshka.proyectofinal.entity.Postulante;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+
+public class PostulanteDao {
+
+    public static int save(Postulante postulante){
+        int status=0;
+        try{
+            Connection con= DataBase.getConnection();
+            PreparedStatement ps=con.prepareStatement(
+                    "insert into postulante(nombre,apellido,nro_cedula,correo,telefono,direccion,experiencia_laboral,estudio_universitario,notebook,bootcamp_id,aceptado) values (?,?,?,?,?,?,?,?,?,?,?)");
+            ps.setString(1,postulante.getNombre());
+            ps.setString(2,postulante.getApellido());
+            ps.setInt(3,postulante.getNro_cedula());
+            ps.setString(4,postulante.getCorreo());
+            ps.setString(5,postulante.getTelefono());
+            ps.setString(6,postulante.getDireccion());
+            ps.setBoolean(7,postulante.getExpLaboral());
+            ps.setBoolean(8,postulante.getEstudioUniversitario());
+            ps.setBoolean(9,postulante.getNotebook());
+            ps.setInt(10,postulante.getBootcampId());
+            ps.setBoolean(11,postulante.getAceptado());
+            status=ps.executeUpdate();
+            con.close();
+        }catch(Exception ex){ex.printStackTrace();}
+
+        return status;
+    }
+}

src/main/java/com/roshka/proyectofinal/Postulante/PostulanteLenguajeDao.java

+package com.roshka.proyectofinal.Postulante;
+
+import com.roshka.proyectofinal.DataBase;
+import com.roshka.proyectofinal.entity.PostulanteLenguaje;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+
+public class PostulanteLenguajeDao {
+
+    public static int save(PostulanteLenguaje lenguajes){
+        int status=0;
+        try{
+            Connection con= DataBase.getConnection();
+            PreparedStatement ps=con.prepareStatement(
+                    "insert into postulante_lenguaje(id_postulante,id_lenguaje) values (?,?)");
+            ps.setInt(1,lenguajes.getIdPostulante());
+            ps.setInt(2,lenguajes.getIdLenguaje());
+            status=ps.executeUpdate();
+            con.close();
+        }catch(Exception ex){ex.printStackTrace();}
+        return status;
+    }
+
+
+}

src/main/java/com/roshka/proyectofinal/Postulante/SaveServlet.java

+package com.roshka.proyectofinal.Postulante;
+
+import com.roshka.proyectofinal.DataBase;
+import com.roshka.proyectofinal.entity.Postulante;
+import com.roshka.proyectofinal.entity.Bootcamp;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+
+@WebServlet("/SaveServlet")
+public class SaveServlet extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        response.setContentType("text/html");
+        PrintWriter out=response.getWriter();
+        boolean rechazarDatos = false;
+        int bootcampActual = 3;
+
+        try {
+            Connection con = DataBase.getConnection();
+            //
+            Statement stmt = con.createStatement();
+            ResultSet rs = stmt.executeQuery("SELECT correo,bootcamp_id FROM postulante WHERE postulante.bootcamp_id =" + bootcampActual);
+            //
+            String nombre=request.getParameter("nombre");
+            String apellido=request.getParameter("apellido");
+            int cedula=Integer.parseInt(request.getParameter("cedula"));
+            String correo=request.getParameter("correo");
+            //BUCLE PARA VERIFICAR EL CORREO EN EL BOOTCAMP ACTUAL
+            while (rs.next()){
+                String correoBase =rs.getString("correo");
+                int bootcampIdBase = rs.getInt("bootcamp_id");
+                if(correo.equals(correoBase) && (bootcampIdBase==bootcampActual)){
+                    rechazarDatos = true;
+                }
+            }
+            String telefono=request.getParameter("telefono");
+            String direccion=request.getParameter("direccion");
+            boolean experienciaProgramando = false;
+            boolean experienciaLaboral = false;
+            boolean universidad = false;
+            boolean notebook = false;
+            if (request.getParameter("experiencia_laboral") != null){
+                experienciaLaboral = true;
+            }
+            if (request.getParameter("experiencia_programando") != null) {
+                experienciaProgramando = true;
+            }
+            if (request.getParameter("notebook") != null){
+                notebook = true;
+            }
+            if (request.getParameter("universidad") != null){
+                universidad = true;
+            }
+            Bootcamp bootcamp = new Bootcamp();
+            Postulante postulante=new Postulante();
+            //SI LOS DATOS SON CORRECTOS NO SE RECHAZAN ENTONCES CARGA A LA BASE
+            if (!rechazarDatos){
+                postulante.setNombre(nombre);
+                postulante.setApellido(apellido);
+                postulante.setNro_cedula(cedula);
+                postulante.setCorreo(correo);
+                postulante.setTelefono(telefono);
+                postulante.setDireccion(direccion);
+                postulante.setExpLaboral(experienciaLaboral);
+                postulante.setEstudioUniversitario(universidad);
+                postulante.setNotebook(notebook);
+                postulante.setBootcampId(bootcampActual);
+                postulante.setAceptado(false);
+            }
+                int status=PostulanteDao.save(postulante);
+                if(status>0){
+                    out.print("<p>Record saved successfully!</p>");
+                    request.getRequestDispatcher("index.html").include(request, response);
+                }else{
+                    if (rechazarDatos){
+                        out.println("El correo ingresado ya esta registrado para el bootcamp actual");
+                    }else {
+                        out.println("Sorry! unable to save record");
+                    }
+                }
+
+        }catch (Exception ex){
+                ex.printStackTrace();
+        }
+        out.close();
+    }
+}

src/main/java/com/roshka/proyectofinal/ProtectedResource.java

 package com.roshka.proyectofinal;
 
-import jakarta.servlet.ServletException;
+import java.io.*; 
+import java.util.*; 
+import jakarta.servlet.*;
 import jakarta.servlet.http.*;
-import java.io.*;
 
 public class ProtectedResource extends HttpServlet {
 
@@ -14,16 +15,22 @@ public class ProtectedResource extends HttpServlet {
 			HttpSession session = req.getSession(true);
 
 			// Does the session indicate this user already logged in?
-			Object done = session.getValue("logon.isDone");
+			Object done = session.getAttribute("logon.isDone");
 			// marker object
 			if (done == null) {
-				// No logon.isDone means he hasn't logged in. // Save the request URL as the true target and redirect to the login page
-				session.putValue("login.target",
-						HttpUtils.getRequestURL(req).toString()); res.sendRedirect(req.getScheme() + "://" + req.getServerName() + ":"
-							+ req.getServerPort() + "/login.html");
+				// No se encuentra loggeado // Guardamos donde trato de dirigirse y lo REDIRIGIMOS AL LOGGIN
+				session.setAttribute("login.target",
+						HttpUtils.getRequestURL(req).toString());
+				res.sendRedirect(req.getScheme() + "://" + req.getServerName() + ":"
+							+ req.getServerPort() + "/login.jsp");
 				return;
 			}
-			// If we get here, the user has logged in and can see the goods
-			out.println("Unpublished O'Reilly book manuscripts await you!");
+			// El usuario se loggeo y puede ver el recurso
+			out.println("PUEDES ACCEDER AL RECURSO - ESTAS LOGGEADO");
+
+
+
+
+
 		}
 	 }
\ No newline at end of file

src/main/java/com/roshka/proyectofinal/entity/LoginBean.java

+package com.roshka.proyectofinal.entity;
+
+public class LoginBean {
+    private String username;
+    private String password;
+    private String correo;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setCorreo(String correo) {
+        this.correo = correo;
+    }
+
+    public String getCorreo() {
+        return correo;
+    }
+}

src/main/java/com/roshka/proyectofinal/entity/PostulanteLenguaje.java

+package com.roshka.proyectofinal.entity;
+
+public class PostulanteLenguaje {
+
+    private int idPostulante,idLenguaje,id;
+
+    public PostulanteLenguaje() {
+    }
+
+    public PostulanteLenguaje(int idPostulante) {
+        this.idPostulante = idPostulante;
+        this.idLenguaje = idPostulante;
+
+    }
+    public int getId(){
+        return id;
+    }
+    public int getIdPostulante(){
+        return idPostulante;
+    }
+    public void setIdPostulante(int idPostulante) {
+        this.idPostulante = idPostulante;
+    }
+
+    public int getIdLenguaje() {
+        return idLenguaje;
+    }
+
+    public void setIdLenguaje(int idLenguaje) {
+        this.idLenguaje = idLenguaje;
+    }
+}

src/main/java/com/roshka/proyectofinal/entity/Usuario.java

@@ -4,6 +4,7 @@ public class Usuario {
     private int id;
     private String nombre,apellido,correo,contrasena;
 
+
     public Usuario() {
 
     }

src/main/java/com/roshka/proyectofinal/login/LoginDao.java

+package com.roshka.proyectofinal.login;
+
+import com.roshka.proyectofinal.DataBase;
+import com.roshka.proyectofinal.entity.Lenguaje;
+import com.roshka.proyectofinal.entity.LoginBean;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+public class LoginDao {
+
+    public boolean validate (LoginBean loginBean) {
+        boolean status = false;
+        try {
+            Connection con = DataBase.getConnection();
+
+            PreparedStatement ps=con.prepareStatement(
+                    "select * from usuario where correo=? and contrasena = ?");
+            ps.setString(1,loginBean.getCorreo());
+            ps.setString(2, loginBean.getPassword());
+            ResultSet rs = ps.executeQuery();
+            status = rs.next();
+            con.close();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
+            return status ;
+
+    }
+
+}

src/main/java/com/roshka/proyectofinal/login/LoginServlet.java

+package com.roshka.proyectofinal.login;
+
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.security.NoSuchAlgorithmException;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import com.roshka.proyectofinal.entity.LoginBean;
+import com.roshka.proyectofinal.login.md5JavaHash;
+import jakarta.servlet.http.HttpSession;
+
+import static java.lang.System.out;
+
+
+/**
+ * Servlet implementation class LoginServlet
+ */
+@WebServlet("/login")
+public class LoginServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @see HttpServlet#HttpServlet()
+     */
+    public LoginServlet() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+    /**
+     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        // TODO Auto-generated method stub
+        response.getWriter().append("Served at: ").append(request.getContextPath());
+    }
+
+    /**
+     * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        LoginDao loginDao = new LoginDao();
+        md5JavaHash passEncrip = new md5JavaHash();
+        String passwordMD5 = "";
+        PrintWriter out = response.getWriter();
+
+        String username = request.getParameter("username");
+        String correo = request.getParameter("correo");
+        String password = request.getParameter("password");
+        LoginBean loginBean = new LoginBean();
+        loginBean.setUsername(username);
+        try {
+            passwordMD5 = passEncrip.getHashPass(password);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        out.println(passwordMD5);
+        loginBean.setPassword(passwordMD5);
+        loginBean.setCorreo(correo);
+
+        out.println("EL pass encriptado es: " +passwordMD5);
+
+        if (loginDao.validate(loginBean))
+        {
+                HttpSession session = request.getSession(true); //incluir nota de sesion valida
+                session.setAttribute("logon.isDone", username);
+
+
+
+                // Tratar de re-dirigir a la pagina que el usuario quiso acceder
+                try {
+                    String target = (String) session.getAttribute("login.target");
+                    response.sendRedirect("loginSuccess.jsp");
+                    if (target != null)
+                        response.sendRedirect(target);
+                    return;
+                }
+                catch (Exception ignored) { }
+
+                // Si no es posible redireccionar a la pagina solicitada, llevar a la main page
+                //response.sendRedirect(request.getScheme() + "://" +
+                       // request.getServerName() + ":" + request.getServerPort());
+                System.out.println("redirigir al index.html");
+
+        } else {
+
+            //si no es un user valido - mandar error y redireccionar al inicio de sesion
+
+            out.println("<p> You may want to <a href='/login.jsp'> try again </a> </p>");
+//            request.getRequestDispatcher("login.jsp").include(request, response);
+//            response.sendRedirect("login.jsp");
+            }
+    }
+
+
+
+}

src/main/java/com/roshka/proyectofinal/login/md5JavaHash.java

+package com.roshka.proyectofinal.login;
+import java.security.*;
+
+
+public class md5JavaHash {
+
+    private String hashpass="";
+
+    public String getHashPass(String password) throws
+            NoSuchAlgorithmException{
+
+        String plainText = password;
+        MessageDigest mdAlgorithm = MessageDigest.getInstance("MD5");
+        mdAlgorithm.update(plainText.getBytes());
+
+        byte[] digest = mdAlgorithm.digest();
+        StringBuffer hexString = new StringBuffer();
+
+        for (int i = 0; i < digest.length; i++) {
+            plainText = Integer.toHexString(0xFF & digest[i]);
+
+            if (plainText.length() < 2) {
+                plainText = "0" + plainText;
+            }
+
+            hexString.append(plainText);
+        }
+        hashpass = hexString.toString();
+
+        return hashpass;
+    }
+
+
+}

src/main/webapp/estilos/home.css

@@ -5,6 +5,9 @@ img.logoi{
 
 img{
     width: 400px;
+    padding: 10px;
+    display: block;
+    padding:10px ;
 }
 .header {
     margin-bottom: 0;
@@ -12,15 +15,21 @@ img{
 }
 a{
     float: right 100px;
+    color: #fff;
+    font-size: larger;
+    text-decoration: none;
+    padding: 10px;
+
 }
 
 body {
-    background: linear-gradient(45deg, rgba(20, 99, 155, 0.25), rgba(30, 148, 227, 0.25));
-    background-image: url(/project-roshka/imagenes/descarga.svg);
-    background-size: cover;
+    background: linear-gradient(100deg, rgba(20, 99, 155, 0.25), rgba(30, 148, 227, 0.25));
+    background-image: url(webapp/imagenes/descarga.svg);
+
+        background-size: contain;
     background-attachment: fixed;
     background-blend-mode: multiply;
-    font-family: "normal";
+    font-family: Georgia, 'Times New Roman', Times, serif;
     color: white;
     position: relative;
     width: 100px;
@@ -59,11 +68,18 @@ body {
   div.menu{
       float: right;
      
+
   }
+  html, body {
+    margin:0;
+    padding:0;
+    height:100%;
+  }
+  
   .menu ul li a {
     padding-left:  5px;
-    text-decoration: none;
-    font-size: clamp(14px, 20px, 1.2vw);
+    
+    font-size: clamp(145px);
     text-transform: uppercase;
     display: block;
     position: relative;
@@ -77,15 +93,16 @@ body {
     height: auto;
 }
 .seccion.hero {
-    padding-bottom: 20px;
-    width: 1098px;
+ margin-top: 10px;
+    padding-bottom: 10px;
+    width: 900px;
 }
 .hero {
-    perspective: 150px;
+    perspective: 100px;
 }
 .hero {
     display: grid;
-    grid-template-columns: auto repeat(10, 1fr) auto;
+    grid-template-columns: auto repeat(5, 0.5fr) auto;
 }
 .hero {
     display: flex;
@@ -95,8 +112,35 @@ body {
     /* padding-right: 200px;
  */
 }
+/*  */
  .postulacion{
 border-radius: 30px;
-color: blue;
- 
+}
+.cta-main{
+   width: 200px;
+   font-family: monospace;
+background-color: yellow;
+border: none;
+}
+/* Contenido pie de pagina */
+/* usamos media quiere para el responsive */
+/* @media (min-width: 768px)
+.footer {
+    display: grid;
+    grid-template-rows: auto auto;
+    align-items: flex-start;
+    gap: 0;
+    padding: 80px 20px
+} */
+.footer{
+    margin-top: 10px;
+    padding-bottom: 10px;
+    height:100px;
+    width: 100px; 
+    display: grid;
+}
+
+.menu-footer  a{
+    text-decoration: none;
+    float: right;
 }
\ No newline at end of file

src/main/webapp/estilos/menu.css

+* {
+    box-sizing: border-box;
+  }
+  
+  body {
+    font-family: 'Concert One', cursive;
+    font-size: 13px
+  }
+  
+  .header, .footer {
+    background-color:rgb(18, 18, 98);
+    color: white;
+    padding: 60px;
+  }
+  
+  .column {
+    float: left;
+    padding: 30px;
+  }
+  
+  .clearfix::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  a{
+    color:white;
+  }
+  
+  .menu {
+    width: 50%;
+  }
+  
+  .content {
+    width: 50%;
+  }
+  
+  .menu ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+  }
+  
+  .menu li {
+    padding: 8px;
+    margin-bottom: 8px;
+    background-color: rgb(18, 18, 98);
+    color: #ffffff;
+  }
+  
+  .menu li:hover {
+    background-color: rgb(18, 18, 98);
+  }
\ No newline at end of file

src/main/webapp/formulario.html → src/main/webapp/formulario.jsp

-<!DOCTYPE html>
+<!-- <!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -7,54 +7,86 @@
     <meta id="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>postulacion</title>
-</head>
+</head> -->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+pageEncoding="UTF-8"%>
+    <!DOCTYPE html>
+    <html>
 
-<body>
-    <main>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <link href="css/bootstrap.css" rel="stylesheet" type="text/css" />
+        <title>JSP Page</title>
+    </head>
 
+    <body>
+        <main>
 
-        <div>
-            <p>Si sigues interesado y cumples con los requisitos, completa el siguiente formulario: </p>
+            <div>
+                <p>Si sigues interesado y cumples con los requisitos, completa el siguiente formulario: </p>
 
-            <form method="post" action="SaveServlet">
+                <form method="post" action="SaveServlet">
 
-                <label for="nombre">Ingrese su Nombre:</label>
-                <input required id="nombre" name="nombre" type="text"><br>
+                    <label for="nombre">Ingrese su Nombre:</label>
+                    <input required id="nombre" name="nombre" type="text"><br>
 
-                <label for="apellido">Ingrese su Apellido:</label>
-                <input required id="apellido" name="apellido" type="text"><br>
+                    <label for="apellido">Ingrese su Apellido:</label>
+                    <input required id="apellido" name="apellido" type="text"><br>
 
-                <label for="cedula">Numero de cedula:</label>
-                <input required id="cedula" name="cedula" type="number"><br>
+                    <label for="cedula">Numero de cedula:</label>
+                    <input required id="cedula" name="cedula" type="number"><br>
 
-                <label for="correo">Correo:</label>
-                <input required id="correo" name="correo" type="email"><br>
+                    <label for="correo">Correo:</label>
+                    <input required id="correo" name="correo" type="email"><br>
 
-                <label for="telefono">Telefono:</label>
-                <input required id="telefono" name="telefono" type="text"><br>
+                    <label for="telefono">Telefono:</label>
+                    <input required id="telefono" name="telefono" type="text"><br>
 
-                <label for="direccion">Direccion:</label>
-                <input required id="direccion" name="direccion" type="text"><br>
+                    <label for="direccion">Direccion:</label>
+                    <input required id="direccion" name="direccion" type="text"><br>
 
-                <label for="experiencia_laboral">Experiencia laboral</label>
-                <!-- Si no lo marca el valor que envia es null y si lo marca es "ON" -->
-                <input id="experiencia_laboral" name="experiencia_laboral" type="checkbox"><br>
+                    <label for="experiencia_laboral">Experiencia laboral</label>
+                    <!-- Si no lo marca el valor que envia es null y si lo marca es "ON" -->
+                    <input id="experiencia_laboral" name="experiencia_laboral" type="checkbox"><br>
+                    <p for="experiencia_programando">Lenguajes de programacion que conoces:</p>
 
-                <label for="experiencia_programando">Que lenguajes de programacion conoces:</label>
-                <input id="experiencia_programando" type="checkbox"><br>
+                    <%@ page import="com.roshka.proyectofinal.entity.Lenguaje, com.roshka.proyectofinal.lenguaje.LenguajeDao, java.util.List,java.util.Iterator" %>
 
-                <label for="notebook">Cuenta con notebook:</label>
-                <input id="notebook" name="notebook" type="checkbox"><br>
+                        <%
+                LenguajeDao lenDao = new LenguajeDao();
+                List<Lenguaje> listLenguaje = lenDao.listar();
+                Iterator<Lenguaje> iter =  listLenguaje.iterator();
+                            Lenguaje len = null;
+   
+   
+                %>
+                            <ul>
+                                <% while(iter.hasNext()){
+                        len = iter.next();
 
-                <label for="universidad">Estudio Universitario: </label>
-                <input id="universidad" name="universidad" type="checkbox"><br>
+                    %>
+                                    <li>
+                                        <label for=<%=len.getNombre_lenguaje() %> > <%= len.getNombre_lenguaje() %> </label><input value=<%=len.getId() %> id=
+                                        <%=len.getNombre_lenguaje() %> name=
+                                            <%=len.getNombre_lenguaje() %> type="checkbox"><br>
+                                    </li>
 
-                <input type="submit">
-                <input type="reset" value="Borrar">
-            </form>
-        </div>
+                                    <% } %>
 
-    </main>
-</body>
+                            </ul>
 
-</html>
\ No newline at end of file
+                            <label for="notebook">Cuenta con notebook:</label>
+                            <input id="notebook" name="notebook" type="checkbox"><br>
+
+                            <label for="universidad">Estudio Universitario: </label>
+                            <input id="universidad" name="universidad" type="checkbox"><br>
+
+                            <input type="submit">
+                            <input type="reset" value="Borrar">
+                </form>
+            </div>
+
+        </main>
+    </body>
+
+    </html>
\ No newline at end of file

src/main/webapp/formulario_bootcamp.jsp

-<%@ page language="java" contentType="text/html; charset=UTF-8"
-pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+    <!DOCTYPE html>
+    <html>
+
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <link href="css/bootstrap.css" rel="stylesheet" type="text/css"/>
+        <link href="css/bootstrap.css" rel="stylesheet" type="text/css" />
         <title>JSP Page</title>
     </head>
+
     <body>
         <div class="container">
             <h1>Crear Bootcamp</h1>
 
             <%@ page import="com.roshka.proyectofinal.entity.Lenguaje, com.roshka.proyectofinal.entity.Bootcamp, com.roshka.proyectofinal.lenguaje.LenguajeDao, com.roshka.proyectofinal.bootcamp.BootcampDao, com.roshka.proyectofinal.entity.Profesor, com.roshka.proyectofinal.profesor.ProfesorDao, java.util.List,java.util.Iterator" %>
 
-             <%
+                <%
              LenguajeDao lenDao = new LenguajeDao();
              List<Lenguaje> listLenguaje = lenDao.listar();
              Iterator<Lenguaje> iter =  listLenguaje.iterator();
+<<<<<<< HEAD
              Lenguaje len = null;
 
              ProfesorDao profeDao = new ProfesorDao();
              List<Profesor> listProfesor = profeDao.listar();
              Iterator<Profesor> iterProfe =  listProfesor.iterator();
              Profesor profe = null;
+=======
+                         Lenguaje len = null;
+>>>>>>> develop
              %>
-
-
-                <form action="" method="post">
-                    <label for="lenguaje">Lenguajes:</label>
-                    <select name="lenguaje" id="lenguaje">
+                    <form action="" method="post">
+                        <label for="lenguaje">Lenguajes:</label>
+                        <select name="lenguaje" id="lenguaje">
                     <% while(iter.hasNext()){
                         len = iter.next();
 
@@ -38,6 +42,7 @@ pageEncoding="UTF-8"%>
                         </option>
                         <% } %>
                     </select>
+<<<<<<< HEAD
 
                     <label for="lenguaje">Profesores:</label>
                     <select name="lenguaje" id="lenguaje">
@@ -120,6 +125,10 @@ pageEncoding="UTF-8"%>
                     <% } %>
               </tbody>
             </table>
+=======
+                    </form>
+>>>>>>> develop
         </div>
     </body>
-</html>
+
+    </html>
\ No newline at end of file

src/main/webapp/imagenes/icon-email.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="70" height="42" viewBox="0 0 70 42">
+  <path fill="#FFF" d="M54.407767,0 L5.24271845,0 C2.34605825,0 0,2.36062136 0,5.24271845 L0,36.6990291 C0,39.5982524 2.36330097,41.9417476 5.24271845,41.9417476 L54.407767,41.9417476 C57.2801942,41.9417476 59.6504854,39.6081553 59.6504854,36.6990291 L59.6504854,5.24271845 C59.6504854,2.36574757 57.3137476,0 54.407767,0 Z M53.6735534,3.49514563 C52.6024078,4.56058252 34.1688932,22.8970485 33.5324272,23.5301359 C32.5421359,24.5204272 31.2256311,25.0656699 29.8252427,25.0656699 C28.4248544,25.0656699 27.1083495,24.5203107 26.1147961,23.5268738 C25.6867573,23.1010485 7.45666019,4.96706796 5.97693204,3.49514563 L53.6735534,3.49514563 Z M3.49514563,35.9876505 L3.49514563,5.95631068 L18.5986019,20.9801942 L3.49514563,35.9876505 Z M5.97914563,38.4466019 L21.0766602,23.4450874 L23.6466408,26.0015534 C25.2970485,27.6519612 27.491301,28.5608155 29.8252427,28.5608155 C32.1591845,28.5608155 34.3534369,27.6519612 36.0005825,26.0048155 L38.5738252,23.4450874 L53.6713398,38.4466019 L5.97914563,38.4466019 Z M56.1553398,35.9876505 L41.0518835,20.9801942 L56.1553398,5.95631068 L56.1553398,35.9876505 Z" transform="translate(5)"/>
+</svg>

src/main/webapp/imagenes/icon-location.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="70" height="70" viewBox="0 0 70 70">
+  <g fill="#FFF" transform="translate(9 5)">
+    <path d="M36.1719612,39.4118447 C42.5194951,29.4514951 41.7215534,30.6941359 41.904466,30.4344466 C44.2154563,27.1748738 45.4368932,23.3384854 45.4368932,19.3398058 C45.4368932,8.73553398 36.8317282,0 26.2135922,0 C15.6300583,0 6.99029126,8.71829126 6.99029126,19.3398058 C6.99029126,23.3359223 8.23735922,27.2727379 10.6240777,30.576233 L16.2549903,39.4119612 C10.2346019,40.3371262 0,43.0942136 0,49.1650485 C0,51.3780583 1.44442718,54.5318447 8.3256699,56.9893981 C13.1305631,58.7053981 19.4832233,59.6504854 26.2135922,59.6504854 C38.7990291,59.6504854 52.4271845,56.1003495 52.4271845,49.1650485 C52.4271845,43.093165 42.2045825,40.3389903 36.1719612,39.4118447 Z M13.5435728,28.6537864 C13.5243495,28.6237282 13.5043107,28.5943689 13.4833398,28.5654757 C11.4972816,25.8332039 10.4854369,22.595068 10.4854369,19.3398058 C10.4854369,10.5998447 17.5230291,3.49514563 26.2135922,3.49514563 C34.8860971,3.49514563 41.9417476,10.6029903 41.9417476,19.3398058 C41.9417476,22.6003107 40.9490097,25.7285825 39.0703689,28.3888544 C38.9020194,28.6109126 39.7803495,27.2464078 26.2135922,48.5346408 L13.5435728,28.6537864 Z M26.2135922,56.1553398 C12.4667184,56.1553398 3.49514563,52.1146019 3.49514563,49.1650485 C3.49514563,47.1826019 8.10500971,43.9229126 18.3201553,42.6523107 L24.7398058,52.7256699 C25.0606602,53.2292039 25.6163883,53.5339806 26.2134757,53.5339806 C26.8105631,53.5339806 27.3664078,53.2290874 27.6871456,52.7256699 L34.1066796,42.6523107 C44.3220583,43.9229126 48.9320388,47.1826019 48.9320388,49.1650485 C48.9320388,52.0895534 40.0412039,56.1553398 26.2135922,56.1553398 Z"/>
+    <path d="M26.2135922,10.6019417 C21.395534,10.6019417 17.4757282,14.5217476 17.4757282,19.3398058 C17.4757282,24.1578641 21.395534,28.0776699 26.2135922,28.0776699 C31.0316505,28.0776699 34.9514563,24.1578641 34.9514563,19.3398058 C34.9514563,14.5217476 31.0316505,10.6019417 26.2135922,10.6019417 Z M26.2135922,24.5825243 C23.3227573,24.5825243 20.9708738,22.2306408 20.9708738,19.3398058 C20.9708738,16.4489709 23.3227573,14.0970874 26.2135922,14.0970874 C29.1044272,14.0970874 31.4563107,16.4489709 31.4563107,19.3398058 C31.4563107,22.2306408 29.1044272,24.5825243 26.2135922,24.5825243 Z"/>
+  </g>
+</svg>

src/main/webapp/imagenes/icon-phone.svg

+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 221.719 221.719" style="enable-background:new 0 0 221.719 221.719;" xml:space="preserve">
+<path fill="#ffffff" d="M180.135,172.169l-4.624-7.721C167.195,150.737,155.718,135,140.664,135c-2.789,0-5.551,0.561-8.285,1.697l-8.08,3.465
+	c-0.738,0.306-1.455,0.654-2.214,1.023c-2.068,1.006-4.413,2.145-6.825,2.145c-5.95,0-12.844-7.743-19.409-21.802
+	c-6.443-13.799-6.032-21.033-4.553-24.673c1.632-4.016,5.427-5.733,9.504-7.276c0.567-0.215,1.079-0.41,1.577-0.615l8.182-3.445
+	c21.316-8.914,13.386-40.065,10.786-50.278l-2.205-8.781C117.257,19.223,112.259,0,95.681,0c-3.069,0-6.343,0.715-9.728,2.126
+	c-2.221,0.882-32.785,13.358-43.858,35.276c-13.234,26.089-10.787,61.074,7.266,103.961c17.918,42.941,41.153,69.206,69.06,78.064
+	c4.787,1.521,10.197,2.291,16.081,2.291c0,0,0.002,0,0.003,0c19.259,0,38.27-8.194,39.813-8.874
+	c6.64-2.813,10.932-7.088,12.756-12.707C190.166,190.608,184.979,180.168,180.135,172.169z M172.805,195.507
+	c-0.424,1.306-1.898,2.498-4.378,3.542c-0.041,0.018-0.091,0.039-0.133,0.058c-0.172,0.076-17.38,7.613-33.793,7.612
+	c-4.342,0-8.225-0.534-11.541-1.588c-23.511-7.463-43.615-30.86-59.766-69.565c-16.271-38.657-18.871-69.401-7.717-91.389
+	c8.661-17.143,35.776-28.018,36.042-28.122c0.054-0.022,0.107-0.043,0.16-0.065C93.223,15.342,94.607,15,95.681,15
+	c3.305,0,6.313,5.126,8.927,15.173l2.195,8.744c4.736,18.6,4.015,30.234-2.048,32.77l-8.143,3.43
+	c-0.324,0.134-0.703,0.275-1.121,0.434c-4.498,1.703-13.858,5.245-18.091,15.657c-3.841,9.448-2.251,21.442,4.856,36.668
+	c9.572,20.493,20.367,30.455,33.002,30.455c5.864,0,10.571-2.288,13.383-3.654c0.518-0.252,0.981-0.483,1.479-0.689l8.092-3.47
+	c0.835-0.348,1.637-0.517,2.451-0.517c3.895,0,10.879,3.857,22.001,22.191l4.621,7.716
+	C172.98,189.311,173.43,193.581,172.805,195.507z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

src/main/webapp/imagenes/social-fb.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
+  <path fill="#FFF" d="M10.5,71.6800003 L33.8800001,71.6800003 L33.8800001,46.2000002 L25.4800001,46.2000002 L25.4800001,37.8000002 L33.8800001,37.8000002 L33.8800001,27.3000001 C33.8800001,21.5102344 38.5902345,16.8000001 44.3800002,16.8000001 L54.8800002,16.8000001 L54.8800002,25.2000001 L46.4800002,25.2000001 C44.1639845,25.2000001 42.2800002,27.0839845 42.2800002,29.4000001 L42.2800002,37.8000002 L54.5010159,37.8000002 L53.1010159,46.2000002 L42.2800002,46.2000002 L42.2800002,71.6800003 L61.1800003,71.6800003 C66.9697659,71.6800003 71.6800003,66.9697659 71.6800003,61.1800003 L71.6800003,10.5 C71.6800003,4.71023436 66.9697659,0 61.1800003,0 L10.5,0 C4.71023436,0 0,4.71023436 0,10.5 L0,61.1800003 C0,66.9697659 4.71023436,71.6800003 10.5,71.6800003 Z M4.20000002,10.5 C4.20000002,7.02625003 7.02625003,4.20000002 10.5,4.20000002 L61.1800003,4.20000002 C64.6537503,4.20000002 67.4800003,7.02625003 67.4800003,10.5 L67.4800003,61.1800003 C67.4800003,64.6537503 64.6537503,67.4800003 61.1800003,67.4800003 L46.4800002,67.4800003 L46.4800002,50.4000002 L56.6589846,50.4000002 L59.4589846,33.6000001 L46.4800002,33.6000001 L46.4800002,29.4000001 L59.0800003,29.4000001 L59.0800003,12.6000001 L44.3800002,12.6000001 C36.2742188,12.6000001 29.6800001,19.1942188 29.6800001,27.3000001 L29.6800001,33.6000001 L21.2800001,33.6000001 L21.2800001,50.4000002 L29.6800001,50.4000002 L29.6800001,67.4800003 L10.5,67.4800003 C7.02625003,67.4800003 4.20000002,64.6537503 4.20000002,61.1800003 L4.20000002,10.5 Z"/>
+</svg>

src/main/webapp/imagenes/social-ig.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
+  <g fill="#FFF">
+    <path d="M10.5,71.6800003 L61.1800003,71.6800003 C66.9697659,71.6800003 71.6800003,66.9697659 71.6800003,61.1800003 L71.6800003,10.5 C71.6800003,4.71023436 66.9697659,0 61.1800003,0 L10.5,0 C4.71023436,0 0,4.71023436 0,10.5 L0,61.1800003 C0,66.9697659 4.71023436,71.6800003 10.5,71.6800003 Z M4.20000002,10.5 C4.20000002,7.02625003 7.02625003,4.20000002 10.5,4.20000002 L61.1800003,4.20000002 C64.6537503,4.20000002 67.4800003,7.02625003 67.4800003,10.5 L67.4800003,61.1800003 C67.4800003,64.6537503 64.6537503,67.4800003 61.1800003,67.4800003 L10.5,67.4800003 C7.02625003,67.4800003 4.20000002,64.6537503 4.20000002,61.1800003 L4.20000002,10.5 Z"/>
+    <path d="M35.8400002 54.7400002C46.2612502 54.7400002 54.7400002 46.2612502 54.7400002 35.8400002 54.7400002 25.4187501 46.2612502 16.9400001 35.8400002 16.9400001 25.4187501 16.9400001 16.9400001 25.4187501 16.9400001 35.8400002 16.9400001 46.2612502 25.4187501 54.7400002 35.8400002 54.7400002zM35.8400002 21.1400001C43.9457815 21.1400001 50.5400002 27.7342188 50.5400002 35.8400002 50.5400002 43.9457815 43.9457815 50.5400002 35.8400002 50.5400002 27.7342188 50.5400002 21.1400001 43.9457815 21.1400001 35.8400002 21.1400001 27.7342188 27.7342188 21.1400001 35.8400002 21.1400001zM56.8400002 21.1400001C60.3137503 21.1400001 63.1400003 18.3137501 63.1400003 14.8400001 63.1400003 11.36625 60.3137503 8.54000004 56.8400002 8.54000004 53.3662502 8.54000004 50.5400002 11.36625 50.5400002 14.8400001 50.5400002 18.3137501 53.3662502 21.1400001 56.8400002 21.1400001zM56.8400002 12.7400001C57.9977346 12.7400001 58.9400003 13.6822657 58.9400003 14.8400001 58.9400003 15.9977344 57.9977346 16.9400001 56.8400002 16.9400001 55.6822659 16.9400001 54.7400002 15.9977344 54.7400002 14.8400001 54.7400002 13.6822657 55.6822659 12.7400001 56.8400002 12.7400001z"/>
+  </g>
+</svg>

src/main/webapp/imagenes/social-linkedin.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#FFF" fill-rule="nonzero" d="M8.45785417,38 L0.564679098,38 L0.564679098,12.6666667 L8.45785417,12.6666667 L8.45785417,38 Z M9.24540992,4.59543237 C9.24540992,2.05885883 7.17521322,0 4.62490727,0 C2.06491098,0 0,2.05885883 0,4.59543237 C0,7.13288158 2.06491098,9.19174041 4.62490727,9.19174041 C7.17521322,9.19174041 9.24540992,7.13288158 9.24540992,4.59543237 Z M38,24.0626382 C38,17.262099 36.5548266,12.2182891 28.5634273,12.2182891 C24.7234328,12.2182891 22.1458179,14.1273968 21.0935413,16.1126936 L21.0860534,16.1126936 L21.0860534,12.6666667 L13.4183976,12.6666667 L13.4183976,38 L21.0860534,38 L21.0860534,25.4217828 C21.0860534,22.1276964 21.9295484,18.9365091 26.0369065,18.9365091 C30.0883254,18.9365091 30.2195846,22.7034937 30.2195846,25.6310841 L30.2195846,38 L38,38 L38,24.0626382 Z" transform="translate(17 17)"/>
+    <path fill="#FFF" fill-rule="nonzero" d="M10.5,71.6800003 L61.1800003,71.6800003 C66.9697659,71.6800003 71.6800003,66.9697659 71.6800003,61.1800003 L71.6800003,10.5 C71.6800003,4.71023436 66.9697659,0 61.1800003,0 L10.5,0 C4.71023436,0 0,4.71023436 0,10.5 L0,61.1800003 C0,66.9697659 4.71023436,71.6800003 10.5,71.6800003 Z M4.20000002,10.5 C4.20000002,7.02625003 7.02625003,4.20000002 10.5,4.20000002 L61.1800003,4.20000002 C64.6537503,4.20000002 67.4800003,7.02625003 67.4800003,10.5 L67.4800003,61.1800003 C67.4800003,64.6537503 64.6537503,67.4800003 61.1800003,67.4800003 L10.5,67.4800003 C7.02625003,67.4800003 4.20000002,64.6537503 4.20000002,61.1800003 L4.20000002,10.5 Z"/>
+  </g>
+</svg>

src/main/webapp/imagenes/social-twitter.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
+  <path fill="#FFF" d="M71.6800003,7.83507819 C67.1710159,8.04289069 67.2694534,8.02593753 66.7597659,8.06859371 L69.4301566,0.442421842 C69.4301566,0.442421842 61.0946878,3.50875001 58.9815628,4.05726568 C53.4318752,-0.930781324 45.1828127,-1.15117184 39.2853127,2.47351567 C34.4558595,5.44250002 31.863672,10.5410157 32.7282815,16.5003126 C23.3291408,15.1960157 15.4098437,10.740625 9.15742188,3.22984369 L7.17992187,0.854765664 L5.70226568,3.56835936 C3.83468752,6.99726569 3.21453133,10.9178125 3.95554686,14.6075782 C4.25960936,16.1213282 4.77640634,17.5650782 5.49226568,18.9169532 L3.79585936,18.2596094 L3.59460936,21.0940626 C3.39062501,23.9733594 4.34929686,27.3344533 6.15945319,30.0841408 C6.66914069,30.8585158 7.32539069,31.7089065 8.15718753,32.5478126 L7.28054687,32.4132815 L8.35023438,35.661172 C9.75625004,39.9284377 12.6765626,43.229922 16.4664064,45.0652345 C12.6814844,46.6714065 9.62390636,47.6962502 4.59812502,49.3494534 L-7.95807867e-15,50.8610159 L4.24703134,53.1830471 C5.86632818,54.0684377 11.5882814,57.0253909 17.2418751,57.9124221 C29.8090626,59.8833596 43.9583595,58.2782816 53.4838284,49.6994534 C61.5070316,42.4735939 64.1396878,32.1950783 63.5928128,21.4987501 C63.5102346,19.8794532 63.9537503,18.3339844 64.8418753,17.1478126 C66.6208596,14.7727344 71.6690628,7.85093753 71.6800003,7.83507819 Z M61.4835159,14.6321876 C60.0085939,16.6014844 59.2697659,19.1165626 59.4021096,21.7131251 C59.9539066,32.502422 57.0182816,40.8696095 50.6761721,46.581172 C43.2676565,53.2535939 31.3178908,55.8725784 17.8921094,53.7665627 C15.4607032,53.3853909 12.9478126,52.5317189 10.8680469,51.6791409 C15.0817187,50.2293752 18.3356251,48.9371095 23.5905469,46.449922 L30.9263283,42.9778127 L22.8271094,42.4593752 C18.9475782,42.2110939 15.7171876,40.3309377 13.7314844,37.2782815 C14.7858594,37.2170315 15.8025001,37.0464065 16.8147657,36.7642188 L24.5393751,34.6128126 L16.7502344,32.7053126 C12.9653126,31.7783595 10.8078907,29.5137501 9.66437504,27.7768751 C8.9135157,26.635547 8.42296872,25.4663283 8.12875003,24.3884376 C8.90968754,24.5978908 9.82023438,24.7471876 11.2885937,24.8926564 L18.4980469,25.6057814 L12.7859376,21.1498438 C8.67015636,17.9396876 7.02078135,13.1167969 8.22992188,8.4803907 C21.0749219,21.8033594 36.1566408,20.8020314 37.6747658,21.1542188 C37.3406252,17.9085157 37.3318752,17.9008594 37.2443752,17.5918751 C35.3002345,10.7192969 39.5609377,7.22968753 41.4826565,6.04843753 C45.4967189,3.58148436 51.8683596,3.20960935 56.2816409,7.27398437 C57.2348439,8.15117187 58.5238284,8.49625004 59.7302346,8.19656253 C60.8130471,7.92750003 61.7017189,7.64257819 62.5717971,7.33250003 L60.7605471,12.5048437 L63.0727346,12.5064844 C62.6363284,13.0916407 62.1129689,13.7921876 61.4835159,14.6321876 Z" transform="translate(0 7)"/>
+</svg>

src/main/webapp/index.html

 <!DOCTYPE html>
 <html lang="en">
-  <head>
+
+<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"
-    />
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" />
     <!-- para concectar con css  -->
-    <link rel="stylesheet" href="./estilos/home.css" />
+
+
+    <link rel="stylesheet" href="estilos/home.css">
 
     <!-- el icono para la pagina  -->
-    <link rel="shortcut icon" href="./imagenes/roshkaicon.ico" sizes="any" />
+    <link rel="shortcut icon" href="imagenes/roshkaicon.ico" sizes="any" />
+
     <title>Roshka WebSite</title>
-  </head>
-  <div class="header">
+</head>
+<div class="header">
     <div class="logo">
-      <a href="./index.html"> <img class="logoi" src="./imagenes/logo-roshka.svg" alt="" /> </a
-      ><!-- logo con link -->
+        <a href="./index.html"> <img class="logoi" src="imagenes/logo-roshka.svg" alt="" /> </a>
+        <!-- logo con link -->
     </div>
     <div class="menu">
+<<<<<<< HEAD
       <ul>
         <li class="link-menu"><a href="">Home</a></li>
         <li class="link-menu"><a href="formulario.html">Postulate</a></li>
         <li class="link-menu"><a href="formulario_bootcamp.jsp">Crear bootcamp</a>
         </li>
       </ul>
+=======
+        <ul>
+            <li class="link-menu"><a href="">Home</a></li>
+            <li class="link-menu"><a href="formulario.jsp">Postulate</a></li>
+            <li class="link-menu"><a href="formulario_bootcamp.jsp">Crear bootcamp</a>
+            </li>
+        </ul>
+>>>>>>> develop
     </div>
     <!-- menu  -->
-  </div>
-  <!-- header -->
+</div>
+<!-- header -->
 
 
-  <div class="main">
+<div class="main">
     <div class="seccion hero">
 
 
-            
 
-            <!-- <div class="contenido"> -->
 
-              <br> <br> <br> <br> <br> <br><br><div class="texto">
+        <!-- <div class="contenido"> -->
+
+        <br> <br> <br> <br> <br> <br><br>
+        <div class="texto">
+            <div class="titulo">
                 <div class="titulo">
-                    <div class="titulo">
-                        <h2>Es tu turno <strong>Postulate</strong> para el bootcamp</h2>
-                        <h1>Aprende</h1>
-                    </div>
-                </div>
-                <div class="parrafo">
-                    <p data-block-key="cwggy">Es un campo de entrenamiento intensivo y gratuito para principiantes que ya programan y quieren ser parte de la empresa</p>
-                </div>
-                <div class="postulacion">
-                    <a href="/postulacion" class="cta-main">POSTULACION</a>
+                    <h2>Es tu turno <strong>Postulate</strong> para el bootcamp</h2>
+                    <h1>Aprende</h1>
                 </div>
             </div>
-
-            <div class="grafico">
-                <img style="align-items:right ;" src="./imagenes/ilustracion-herov3.svg" alt="">
+            <div class="parrafo">
+                <p data-block-key="cwggy">Es un campo de entrenamiento intensivo y gratuito para principiantes que ya programan y quieren ser parte de la empresa</p>
             </div>
+            <div class="postulacion">
+                <button type="submit" class="cta-main">POSTULACION</button>
+                <!--  <a href="/postulacion" class="cta-main">POSTULACION</a> -->
+            </div>
+        </div>
+
+        <div class="grafico">
+            <img style="align-items:right ;" src="imagenes/ilustracion-herov3.svg" alt="">
+        </div>
 
-            <!-- </div> -->
+        <!-- </div> -->
 
     </div>
+    <!-- pie de pagina -->
+    <div class="footer">
+        <div class="logofooter"><img src="imagenes/logo_footer.svg" alt="" class="logofooter"></div>
+    </div>
+</div>
+
+</div>
+</div>
+
+</body>
 
 </html>
+<style>
+    img.logoi {
+        width: 200px;
+    }
+    
+    img {
+        width: 400px;
+        padding: 10px;
+        display: block;
+        padding: 10px;
+    }
+    
+    .header {
+        margin-bottom: 0;
+        width: 700px;
+    }
+    
+    a {
+        float: right 100px;
+        color: #fff;
+        font-size: larger;
+        text-decoration: none;
+        padding: 10px;
+    }
+    
+    body {
+        background: linear-gradient(100deg, rgba(20, 99, 155, 0.25), rgba(30, 148, 227, 0.25));
+        background-image: url(imagenes/descarga.svg);
+        background-size: contain;
+        background-attachment: fixed;
+        background-blend-mode: multiply;
+        font-family: Georgia, 'Times New Roman', Times, serif;
+        color: white;
+        position: relative;
+        width: 100px;
+        height: 100px;
+    }
+    /* ul{
+    list-style: none;
+}
+.menu >ul{
+    float: right;
+}
+
+.menu li a {
+
+    color:#fff;
+    text-decoration:none;
+    padding:10px 12px;
+    display:block;
+}
+
+.menu li ul li {
+    marging-left
+    position:relative;
+} */
+    
+    .menu {
+        width: 400%;
+        float: left;
+    }
+    
+    .menu ul li {
+        float: right;
+        list-style-type: none;
+        text-align: right;
+    }
+    
+    div.menu {
+        float: right;
+    }
+    
+    .menu ul li a {
+        padding-left: 5px;
+        text-decoration: none;
+        font-size: clamp(145px);
+        text-transform: uppercase;
+        display: block;
+        position: relative;
+        overflow: hidden;
+        padding-bottom: 50px;
+        white-space: nowrap;
+    }
+    
+    .grafico,
+    svg {
+        max-width: 50px;
+        display: block;
+        height: auto;
+    }
+    
+    .seccion.hero {
+        margin-top: 10px;
+        padding-bottom: 10px;
+        width: 900px;
+    }
+    
+    .hero {
+        perspective: 100px;
+    }
+    
+    .hero {
+        display: grid;
+        grid-template-columns: auto repeat(5, 0.5fr) auto;
+    }
+    
+    .hero {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        padding-left: 200px;
+        /* padding-right: 200px;
+ */
+    }
+    /*  */
+    
+    .postulacion {
+        border-radius: 30px;
+    }
+    
+    .cta-main {
+        width: 200px;
+        font-family: monospace;
+        background-color: yellow;
+        border: none;
+    }
+</style>
\ No newline at end of file

src/main/webapp/index.jsp

@@ -14,7 +14,8 @@
         </h1>
         <br/>
         <a href="hello-servlet">Hello Servlet</a><br>
-        <a href="./formulario.html">Postulate aqui</a>
+
+
     </body>
 
     </html>

src/main/webapp/login.jsp

+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>BootcampsLogin</title>
+</head>
+<body>
+    <div align=" center">
+    <h1>User Login Form</h1>
+    <form action="login" method="post">
+        <table align = "center">
+            <tr><td>Correo:</td> <td><input type="text" name = "correo"></td></tr>
+            <tr><td>Password:</td><td><input type="password" name="password"></td></tr>
+
+            <tr><td><input type="submit" value="Login"/></td></tr>
+        </table>
+    </form>    
+    </div>
+
+</body>
+</html>
\ No newline at end of file

src/main/webapp/loginSuccess.jsp

+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<!DOCTYPE html>
+<html>
+<head>
+
+<title>LoginExitoso</title>
+</head>
+
+<body>
+    <div align = "center">
+        <h1>LOGGIN EXITOSO</h1>
+
+
+    </div>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/menu.html

+<!DOCTYPE html>
+<html>
+<head>
+<style>
+
+<link href="https://fonts.googleapis.com/css2?family=Concert+One&family=Francois+One&family=Satisfy&family=Staatliches&display=swap" rel="stylesheet">
+
+* {
+  box-sizing: border-box;
+}
+
+body {
+  font-family: 'Concert One', cursive;
+  font-family: 'Francois One', sans-serif;
+  font-family: 'Satisfy', cursive;
+  font-family: 'Staatliches', cursive;
+  font-size: 13px
+}
+
+.header, .footer {
+  background-color:rgb(18, 18, 98);
+  color: white;
+  padding: 60px;
+}
+
+.column {
+  float: left;
+  padding: 30px;
+}
+
+.clearfix::after {
+  content: "";
+  clear: both;
+  display: table;
+}
+
+a{
+  color:white;
+}
+
+.menu {
+  width: 50%;
+}
+
+.content {
+  width: 50%;
+}
+
+.menu ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
+
+.menu li {
+  padding: 8px;
+  margin-bottom: 8px;
+  background-color: rgb(18, 18, 98);
+  color: #ffffff;
+}
+
+.menu li:hover {
+  background-color: rgb(18, 18, 98);
+}
+
+</style>
+</head>
+<body>
+
+<div class="header">
+  <h1> MENU TH</h1>
+  <h2> EN LOS SIGUIENTES LINKS PUEDE MODIFICAR, AGREGAR O ELIMINAR DATOS DE LA BASE DE DATOS DEL BOOTCAMP </h2>
+</div>
+
+
+<div class="column content">
+    <h1>PUEDE ACCEDER A LOS SIGUIENTES LINKS:</h1>
+  </div>
+
+<div class="clearfix">
+  <div class="column menu">
+    <ul>
+      <li><a href="#"> MANAGE BOOTCAMP </a></li>
+      <li><a href="#"> MANAGE POSTULANTE </a></li>
+      <li><a href="#"> MANAGE LENGUAJES  </a></li>
+      <li><a href="#"> MANAGE PROFESORES </a></li>
+      <li><a href="#"> USUARIO NUEVO (ADMINISTRADOR) </a></li>
+    </ul>
+  </div>
+
+  
+</div>
+
+</body>
+</html>
+
+

src/main/webapp/usrebe.html

+<!--
+Follow me on
+------------
+Codepen: https://codepen.io/mycnlz/
+Dribbble: https://dribbble.com/mycnlz
+Pinterest: https://pinterest.com/mycnlz/
+-->
+
+<div class='box'>
+  <div class='box-form'>
+    <div class='box-login-tab'></div>
+    <div class='box-login-title'>
+      <div class='i i-login'></div><h2> USUARIO </h2>
+      <link rel="stylesheet" href="usrebe.css">
+      <link rel="stylesheet" href="usrebe.js">
+    </div>
+    <div class='box-login'>
+      <div class='fieldset-body' id='login_form'>
+        <button onclick="openLoginInfo();" class='b b-form i i-more' title='Mais Informações'></button>
+        	<p class='field'>
+          <label for='user'>E-MAIL</label>
+          <input type='text' id='user' name='user' title='Username' />
+          <span id='valida' class='i i-warning'></span>
+        </p>
+      	  <p class='field'>
+          <label for='pass'>PASSWORD</label>
+          <input type='password' id='pass' name='pass' title='Password' />
+          <span id='valida' class='i i-close'></span>
+        </p>
+
+     
+
+        	<input type='submit' id='do_login' value='INICIAR SESION' title='INICIAR SESION' />
+      </div>
+    </div>
+  </div>
+  <div class='box-info'>
+					    <p><button onclick="closeLoginInfo();" class='b b-info i i-left' title='Back to Sign In'></button><h3>Need Help?</h3>
+    </p>
+					    <div class='line-wh'></div>
+    					<button onclick="" class='b-support' title='Forgot Password?'> Forgot Password?</button>
+    <button onclick="" class='b-support' title='Contact Support'> Contact Support</button>
+    					<div class='line-wh'></div>
+    <button onclick="" class='b-cta' title='Sign up now!'> CREATE ACCOUNT</button>
+  				</div>
+</div>