diff --git a/UyTube_web/src/java/com/uytube/SeguirUsuario.java b/UyTube_web/src/java/com/uytube/SeguirUsuario.java
index 10ce5ef0736ade09b4b1e3d0f5ea1a444b13f585..e48275fcc292877509dfd58ea068ef20ee41fd76 100644
--- a/UyTube_web/src/java/com/uytube/SeguirUsuario.java
+++ b/UyTube_web/src/java/com/uytube/SeguirUsuario.java
@@ -5,8 +5,11 @@
*/
package com.uytube;
+import Logica.Fabrica;
+import Logica.Interfaces.IUsuario;
import java.io.IOException;
import java.io.PrintWriter;
+import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -29,34 +32,26 @@ public class SeguirUsuario extends HttpServlet {
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- response.setContentType("text/html;charset=UTF-8");
- try (PrintWriter out = response.getWriter()) {
- /* TODO output your page here. You may use following sample code. */
- out.println("<!DOCTYPE html>");
- out.println("<html>");
- out.println("<head>");
- out.println("<title>Servlet SeguirUsuario</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<h1>Servlet SeguirUsuario at " + request.getContextPath() + "</h1>");
- out.println("</body>");
- out.println("</html>");
- }
}
- // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
- * Handles the HTTP <code>GET</code> method.
- *
- * @param request servlet request
- * @param response servlet response
- * @throws ServletException if a servlet-specific error occurs
- * @throws IOException if an I/O error occurs
- */
+
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- processRequest(request, response);
+ try {
+ IUsuario sys = Fabrica.getInstancia().getIUsuario();
+ String nick = request.getParameter("id");
+ sys.seleccionarUsuario(nick);
+ sys.seguirUsuario();
+
+ response.sendRedirect("/uytube/usuario-consultar?id=" + nick);
+
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/404.jsp");
+ rd.forward(request, response);
+ }
}
/**
@@ -70,17 +65,6 @@ public class SeguirUsuario extends HttpServlet {
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- processRequest(request, response);
+
}
-
- /**
- * Returns a short description of the servlet.
- *
- * @return a String containing servlet description
- */
- @Override
- public String getServletInfo() {
- return "Short description";
- }// </editor-fold>
-
}
diff --git a/UyTube_web/web/ConsultaUsuario.jsp b/UyTube_web/web/ConsultaUsuario.jsp
index 6da5ae6940fc587769f2cc0e1328cc62fda52b5d..7892808b9aa869fe3289e64894e5ee2e7d0c1fd6 100644
--- a/UyTube_web/web/ConsultaUsuario.jsp
+++ b/UyTube_web/web/ConsultaUsuario.jsp
@@ -23,6 +23,8 @@
ArrayList<DtListaDeReproduccion> listasRep = (ArrayList) request.getAttribute("listasRep");
String ps = (String) request.getAttribute("ps");
%>
+
+
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -39,7 +41,7 @@
<title>UyTube - <%= usuario.getNickname()%></title>
</head>
<body>
-
+ <%@ include file='include/ventana-modal_baja.html' %>
<div class="container-fluid">
<div class="row">
<div class="col-12">
@@ -104,13 +106,29 @@
<img src="<%=rutaDeImagenDePerfil%>" class="rounded-circle" alt="<%=textoAlternativo%>" width="180" height="180">
</div>
</div>
+
+
<div class="p-1 flex-fill bd-highlight ">
- <div class="p-2 bd-highlight ">
- <br><h3><%= usuario.getNombre() + " " + usuario.getApellido()%></h3>
- <hr class="mb-1">
+
+ <div class="d-flex bd-highlight ">
+ <div class="p-1 d-flex flex-fill bd-highlight">
+ <br><h3><%= usuario.getNombre() + " " + usuario.getApellido()%></h3>
+ <%
+ if (sesionIniciada && propietario) {
+ %>
+ <button data-toggle="modal" data-target="#exampleModal" data-whatever="@mdo" class=" ml-5 btn btn-danger icon-remove-user" id="btnBaja">
+ Darse de baja
+ </button>
+ <%
+ }
+ %>
+ </div>
</div>
+ <hr class="mb-2">
+
<div class="p-1 bd-highlight ">
<div class="d-flex bd-highlight ">
+
<div class="p-1 flex-fill bd-highlight ">
<p class="text-info"><%= canal.getNombre()%> ✔</p>
</div>
@@ -129,20 +147,39 @@
if (sesionIniciada && propietario) {
%>
<a href="usuario-modificar?id=<%= usuario.getNickname()%>">
- <button class="btn btn-primary" id="btnBuscar" type="submit">
- Modificar
+ <button class="icon-cog btn btn-primary" id="btnBuscar" type="submit">
+ Modificar usuario
</button>
- </a>
+ </a>
<%
}
%>
<%
- if (sesionIniciada && !propietario) {
- %>
- <button class="btn btn-primary" id="btnBuscar" type="submit">
- Seguir (IMPLENENTAR...)
- </button>
- <%
+ if (sesionIniciada && !propietario) {
+ boolean Sigue = false;
+ DtUsuario actual = (DtUsuario)request.getSession().getAttribute("usuario");
+ for (DtUsuario elem : seguidores){
+ if (elem.getNickname().equals(actual.getNickname())){
+ Sigue = true;
+ }
+ }
+ if (Sigue) {
+ %>
+ <a href="usuario-seguir?id=<%= usuario.getNickname()%>">
+ <button class="btn btn-danger" id="btnBuscar" type="submit">
+ Dejar de seguir
+ </button>
+ </a>
+ <%
+ }else{
+ %>
+ <a href="usuario-seguir?id=<%= usuario.getNickname()%>">
+ <button class="btn btn-primary" id="btnBuscar" type="submit">
+ Seguir
+ </button>
+ </a>
+ <%
+ }
}
%>
</div>
diff --git a/UyTube_web/web/IniciarSesion.jsp b/UyTube_web/web/IniciarSesion.jsp
index 60a5e2898bdfeafa900426313dba7046ec610216..c0298cb97436d76dfc6b553a19c6685543c32259 100644
--- a/UyTube_web/web/IniciarSesion.jsp
+++ b/UyTube_web/web/IniciarSesion.jsp
@@ -57,10 +57,6 @@
<label for="inputPassword" name="password" class="sr-only" id="label_contrasenia">Contraseña</label>
<input type="password" name="password" id="input_contraseña" class="form-control mb-4" placeholder="Contraseña" required>
<div class="checkbox mb-3">
- <label>
- <input type="checkbox" value="remember-me" id="check_recuerdarme"> Recuerdarme
- <p id="mitexto"></p>
- </label>
</div>
<button class="btn btn-lg btn-primary btn-block mb-4" type="submit" id="btn_Ingresar">Ingresar</button>
diff --git a/UyTube_web/web/include/ventana-modal_baja.html b/UyTube_web/web/include/ventana-modal_baja.html
new file mode 100644
index 0000000000000000000000000000000000000000..acb04a65058862bb362b75c78f8686aca8b06c4c
--- /dev/null
+++ b/UyTube_web/web/include/ventana-modal_baja.html
@@ -0,0 +1,36 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<!--
+ Ventana emergente para responder comentarios
+-->
+
+<script>
+var bajaUsuario = function(){
+ $("#exampleModal .close").click(); //Cierra el modal
+ window.location.href = "/uytube/usuario-borrar";
+};
+</script>
+
+<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel">Eliminar usuario</h5>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ </div>
+ <div class="modal-body">
+ <form method="get" action="/uytube/usuario-borra">
+ <div class="form-group">
+ <label for="message-text" class="col-form-label">Realmente desea darse de baja</label>
+ </div>
+ </form>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
+ <button type="submit" class="btn btn-danger" onclick="bajaUsuario()">Eliminar</button>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file