diff --git a/UyTube_web/src/java/com/uytube/ModificarUsuario.java b/UyTube_web/src/java/com/uytube/ModificarUsuario.java
index 314bd5b2e0ff2b60846a9a4fad6f6640ede1424a..4900522ef3efb1df300f8098635db4ee0fe0add3 100644
--- a/UyTube_web/src/java/com/uytube/ModificarUsuario.java
+++ b/UyTube_web/src/java/com/uytube/ModificarUsuario.java
@@ -128,7 +128,6 @@ public class ModificarUsuario extends HttpServlet {
}
java.sql.Date fecha_Nac = new java.sql.Date(fechaDate.getTime());
-
Privacidad Priv = Privacidad.PRIVADO;
if (pPrivacidad != null && pPrivacidad.equals("PUBLICO")) {
@@ -142,7 +141,6 @@ public class ModificarUsuario extends HttpServlet {
sys.modificarUsuarioYCanal(Usu, CanUsu);
-
response.sendRedirect("/uytube/usuario-consultar?id="+Usu.getNickname());
} catch (Exception e) {
diff --git a/UyTube_web/src/java/com/uytube/Presentacion.java b/UyTube_web/src/java/com/uytube/Presentacion.java
index ba16186263101c6eacedb14a65406fcbf712abe3..90aaa28f65864e552900b0c129ca56b6c0e77eac 100644
--- a/UyTube_web/src/java/com/uytube/Presentacion.java
+++ b/UyTube_web/src/java/com/uytube/Presentacion.java
@@ -5,8 +5,14 @@
*/
package com.uytube;
+import Logica.DataType.DtVideo;
+import Logica.Enumerados.Filtrado;
+import Logica.Enumerados.Ordenacion;
+import Logica.Fabrica;
+import Logica.Interfaces.IUsuario;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.ArrayList;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@@ -38,7 +44,7 @@ public class Presentacion extends HttpServlet {
out.println("<!DOCTYPE html>");
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet Presentacion</title>");
+ out.println("<title>Servlet Presentacion</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet Presentacion at " + request.getContextPath() + "</h1>");
@@ -59,10 +65,22 @@ public class Presentacion extends HttpServlet {
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
-
- RequestDispatcher rd; //objeto para despachar
- rd = request.getRequestDispatcher("/Presentacion.jsp");
- rd.forward(request, response);
+
+ try {
+ IUsuario sys = Fabrica.getInstancia().getIUsuario();
+ boolean sesionIniciada = sys.sesionIniciada();
+ ArrayList<Object> videos = sys.buscar("", Filtrado.VIDEOS, Ordenacion.FECHA_DESCENDENTE);
+
+ request.setAttribute("sesionIniciada", sesionIniciada);
+ request.setAttribute("videos", videos);
+
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/Presentacion.jsp");
+ rd.forward(request, response);
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ }
+
}
/**
diff --git a/UyTube_web/web/Presentacion.jsp b/UyTube_web/web/Presentacion.jsp
index 096204154c872bafaf061baa5f3db4a413fde6a5..9de17622a7205e51c8cd77597b61dbfa8ba227f9 100644
--- a/UyTube_web/web/Presentacion.jsp
+++ b/UyTube_web/web/Presentacion.jsp
@@ -4,9 +4,15 @@
Author : administrador
--%>
+<%@page import="Logica.DataType.DtVideo"%>
+<%@page import="java.util.ArrayList"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html lang="es">
+ <%
+ ArrayList<Object> video = (ArrayList) request.getAttribute("videos");
+ boolean sesionIniciada = (boolean) request.getAttribute("sesionIniciada");
+ %>
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -23,8 +29,17 @@
<title>UyTube</title>
</head>
<body>
-
- <%@include file='include/header-usuario.html' %>
+ <%
+ if (sesionIniciada) {
+ %>
+ <%@ include file='include/header-usuario.html' %>
+ <%
+ } else {
+ %>
+ <%@ include file='include/header-visitante.html' %>
+ <%
+ }
+ %>
<div class="container-fluid">
<div class="row">
<div class="col-12">
@@ -36,88 +51,38 @@
<div class="row">
<div class="col-12">
<section class="principal">
+
+ <%
+ if (sesionIniciada) {
+ %>
<%@ include file='include/menu-usuario.html' %>
+ <%
+ } else {
+ %>
+ <%@ include file='include/menu-visitante.html' %>
+ <%
+ }
+ %>
<div class="contenido">
<section class="contenido-flexible">
<!--================== Aca va el contenido central para agregar ========================== -->
<h3>Lo nuevo</h3>
-
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
-
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
-
- </div>
- </div>
-
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234"><img src="https://i.ytimg.com/vi/OVjbqdm_JVI/hqdefault.jpg" class="card-img-top" alt="Nombre del video"></a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text to buile and make up the bulk of the card's content.</p>
- </div>
- </div>
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/Yq-Kfc81h5s/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text e and make up the bulk of the card's content.</p>
- </div>
- </div>
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quiard title and make up the bulk of the card's content.</p>
- </div>
- </div>
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
-
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
-
- </div>
- </div>
-
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234"><img src="https://i.ytimg.com/vi/OVjbqdm_JVI/hqdefault.jpg" class="card-img-top" alt="Nombre del video"></a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text to buile and make up the bulk of the card's content.</p>
- </div>
- </div>
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/Yq-Kfc81h5s/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text e and make up the bulk of the card's content.</p>
- </div>
- </div>
+ <%
+ for (Object elem : video) {
+
+ DtVideo vid = (DtVideo) elem;
+ String idV = Funciones.Funciones.extraerIDYoutube(vid.getUrlVideoOriginal());
+ String Imagen = Funciones.Funciones.obtenerImagenDeVideo(idV, 4);
+ %>
<div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
+ <a href="/uytube/video-consulta&id=<%= vid.getId()%>"><img src="<%= Imagen%>" class="card-img-top" alt="Nombre del video"></a>
<div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quiard title and make up the bulk of the card's content.</p>
+ <h6 class="card-title"><%= vid.getNombre()%></h6>
</div>
- </div>
- <!-- Fin del contenido central -->
- </section>
+ </div>
+ <%
+ }
+ %>
</div>
</section>
diff --git a/UyTube_web/web/include/menu-visitante.html b/UyTube_web/web/include/menu-visitante.html
index 0364a11db731b1c87f28e703190d670394c4956c..d8654f5e33b457c07f92cdea48b0c5e225b68e4c 100644
--- a/UyTube_web/web/include/menu-visitante.html
+++ b/UyTube_web/web/include/menu-visitante.html
@@ -11,7 +11,7 @@ Menú para el Visitante
<img class="fotoLogo" src="imagenes/logoChico.jpeg" alt="UyTube">
</span>
</li>
- <li><a href="/uytube/"><span class="icon-user"></span> Inicio</a></li>
+ <li><a href="/uytube/presentacion"><span class="icon-user"></span> Inicio</a></li>
<!-- <li class="titulo">VIDEOS</li> -->
<li><a href=""><span class="icon-video-camera"></span> Ver videos</a></li>
<!-- <li class="titulo">LISTAS</li> -->
diff --git a/UyTube_web/web/index.jsp b/UyTube_web/web/index.jsp
index f4463538923075104b7a95418ae101d13a58fe8f..fa6390a4c7e59cbe89e25f3146d9bf6a48e10f85 100644
--- a/UyTube_web/web/index.jsp
+++ b/UyTube_web/web/index.jsp
@@ -32,101 +32,8 @@
</div>
</div>
</div>
- <div class="container-fluid">
- <div class="row">
- <div class="col-12">
- <section class="principal">
-
- <!-- Aca va el menu -->
- <%@ include file='include/menu-visitante.html' %>
-
- <div class="contenido">
- <section class="contenido-flexible">
- <!--================== Aca va el contenido central para agregar ========================== -->
- <h3>Lo nuevo</h3>
-
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
-
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
-
- </div>
- </div>
-
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234"><img src="https://i.ytimg.com/vi/OVjbqdm_JVI/hqdefault.jpg" class="card-img-top" alt="Nombre del video"></a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text to buile and make up the bulk of the card's content.</p>
- </div>
- </div>
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/Yq-Kfc81h5s/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text e and make up the bulk of the card's content.</p>
- </div>
- </div>
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quiard title and make up the bulk of the card's content.</p>
- </div>
- </div>
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
-
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
-
- </div>
- </div>
-
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234"><img src="https://i.ytimg.com/vi/OVjbqdm_JVI/hqdefault.jpg" class="card-img-top" alt="Nombre del video"></a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text to buile and make up the bulk of the card's content.</p>
- </div>
- </div>
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/Yq-Kfc81h5s/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quick example text e and make up the bulk of the card's content.</p>
- </div>
- </div>
- <div class="card" >
- <a href="/uytube/video-consulta&id=1234">
- <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
- </a>
- <div class="card-body">
- <h5 class="card-title">Titulo del video</h5>
- <p class="card-text">Some quiard title and make up the bulk of the card's content.</p>
- </div>
- </div>
- <!-- Fin del contenido central -->
- </section>
- </div>
-
- </section>
- </div>
- </div>
- </div>
+
+ <% response.sendRedirect("presentacion"); %>
<%@ include file='include/widgets.html' %>
<%@ include file='include/footer.html' %>