diff --git a/UyTube_estacion_de_trabajo/librerias/UyTube_logica.jar b/UyTube_estacion_de_trabajo/librerias/UyTube_logica.jar index 48cf4360d6d98d1583069feabf3ba313adec3fcc..3d50499f09a11d47c7795f8690f58bb0189b6d18 100644 Binary files a/UyTube_estacion_de_trabajo/librerias/UyTube_logica.jar and b/UyTube_estacion_de_trabajo/librerias/UyTube_logica.jar differ diff --git a/UyTube_logica/.jacocoverage/project.json b/UyTube_logica/.jacocoverage/project.json new file mode 100644 index 0000000000000000000000000000000000000000..a79bd896b95c16bee2baa9d815d04d258d7406f3 --- /dev/null +++ b/UyTube_logica/.jacocoverage/project.json @@ -0,0 +1,6 @@ +{ + "pkgclss.excludelist" : [ ], + "preferences" : { + "JaCoCoverage.Prj.OverrideGlobals" : "false" + } +} \ No newline at end of file diff --git a/UyTube_logica/nbproject/project.properties b/UyTube_logica/nbproject/project.properties index 326ba1b35441a746c982025d52f23880b2033655..072bb3f216a1ee0d1875c57d3d13595dc50348a9 100644 --- a/UyTube_logica/nbproject/project.properties +++ b/UyTube_logica/nbproject/project.properties @@ -4,6 +4,8 @@ annotation.processing.processor.options=-Aeclipselink.canonicalmodel.use_static_ annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +application.title=UyTube_logica +application.vendor=Juan build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -26,15 +28,13 @@ dist.archive.excludes= dist.dir=dist dist.jar=${dist.dir}/UyTube_logica.jar dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= excludes= -file.reference.JCalendar_1.4.jar=librerias\\JCalendar_1.4.jar includes=** jar.compress=false javac.classpath=\ ${libs.eclipselink.classpath}:\ - ${libs.PostgreSQLDriver.classpath}:\ - ${libs.absolutelayout.classpath}:\ - ${file.reference.JCalendar_1.4.jar} + ${libs.PostgreSQLDriver.classpath} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/UyTube_logica/src/Logica/Clases/Video.java b/UyTube_logica/src/Logica/Clases/Video.java index 17709956df942eda900968a2a0c74cf28bd39172..1fb8b21587de1df9073a193a71d3ed1068649e26 100644 --- a/UyTube_logica/src/Logica/Clases/Video.java +++ b/UyTube_logica/src/Logica/Clases/Video.java @@ -192,9 +192,6 @@ public class Video implements Serializable { if (usuario == null){ throw new RuntimeException("El usuario es null"); } - int likes_backup = this.cantLikes; - int disLikes_backup = this.cantDisLikes; - String nickname = usuario.getNickname(); // por las dudas, para que los contadores de likes no queden inconsistentes: @@ -207,13 +204,6 @@ public class Video implements Serializable { return; } - // segun cual fuera la valoracion anterior, resta 1 al contador - if (dtv.getVal() == TipoValoracion.LIKE) { - cantLikes--; - } else { - cantDisLikes--; - } - // Si te estas preguntando por que esta parte de la cobertura esta en amarillo // te comento que es porque al for siempre se entra al menos una vez, dado que // si se esta en este bloque del if, significa que el usuario ya ha valorado el @@ -225,29 +215,29 @@ public class Video implements Serializable { try { new ValoracionJpaController().edit(val); } catch (Exception e) { - this.cantLikes = likes_backup; - this.cantDisLikes = disLikes_backup; throw new RuntimeException(e.getMessage()); } break; } } - } else { - try { - Valoracion nuevaValoracion = new Valoracion(dtValoracion.getVal(), usuario); - new ValoracionJpaController().create(nuevaValoracion); - valoraciones.add(nuevaValoracion); - } catch (Exception e) { - this.cantLikes = likes_backup; - this.cantDisLikes = disLikes_backup; + // segun cual fuera la valoracion anterior, resta 1 al contador + if (dtv.getVal() == TipoValoracion.LIKE) { + cantLikes--; + cantDisLikes++; + } else { + cantLikes++; + cantDisLikes--; } - } - - // segun cual sea la nueva valoracion, suma 1 al contador - if (dtValoracion.getVal() == TipoValoracion.LIKE) { - cantLikes++; } else { - cantDisLikes++; + Valoracion nuevaValoracion = new Valoracion(dtValoracion.getVal(), usuario); + new ValoracionJpaController().create(nuevaValoracion); + valoraciones.add(nuevaValoracion); + // segun cual sea la nueva valoracion, suma 1 al contador + if (dtValoracion.getVal() == TipoValoracion.LIKE) { + cantLikes++; + } else { + cantDisLikes++; + } } } diff --git a/UyTube_logica/src/Logica/Controladores/CUsuario.java b/UyTube_logica/src/Logica/Controladores/CUsuario.java index b771176748ea2d428a61ee6956a5548161a7e52c..a467352a3d3259d4a362f4f495fa36d3e00482d7 100644 --- a/UyTube_logica/src/Logica/Controladores/CUsuario.java +++ b/UyTube_logica/src/Logica/Controladores/CUsuario.java @@ -7,7 +7,6 @@ import JPAControllerClasses.UsuarioJpaController; import Logica.Clases.Categoria; import Logica.Clases.ListaPorDefecto; import Logica.Clases.Usuario; -import Logica.Clases.Video; import Logica.DataType.DtCanal; import Logica.DataType.DtComentario; import Logica.DataType.DtListaDeReproduccion; @@ -759,7 +758,11 @@ public class CUsuario implements IUsuario { @Override public DtUsuario seleccionarUsuario(String nickname) { - usuarioSeleccionado = obtenerUsuarios().get(nickname); + if (usuarioActual != null && usuarioActual.getNickname().equals(nickname)){ + usuarioSeleccionado = usuarioActual; + }else{ + usuarioSeleccionado = obtenerUsuarios().get(nickname); + } if (usuarioSeleccionado == null){ throw new RuntimeException("No se encontro ningun usuario con ese nickname"); } diff --git a/UyTube_logica/src/Logica/DatosDePrueba.java b/UyTube_logica/src/Logica/DatosDePrueba.java index a5b672710f670331fb6baef631962bdd585e4843..1ce8eec8764429f938b2108d86a3b158c6c27437 100644 --- a/UyTube_logica/src/Logica/DatosDePrueba.java +++ b/UyTube_logica/src/Logica/DatosDePrueba.java @@ -1,34 +1,18 @@ package Logica; -import JPAControllerClasses.BusquedaEnBDD; -import Logica.Clases.Canal; -import Logica.Clases.ListaDeReproduccion; -import Logica.Clases.Video; -import Logica.DataType.DtCanal; -import Logica.DataType.DtListaDeReproduccion; -import Logica.DataType.DtVideo; -import Logica.Enumerados.Filtrado; -import Logica.Enumerados.Ordenacion; +import Logica.DataType.DtValoracion; +import Logica.Enumerados.TipoValoracion; import Logica.Interfaces.IAdmin; import Logica.Interfaces.IUsuario; import java.util.ArrayList; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; public class DatosDePrueba { private static IAdmin adminSys = null; private static IUsuario usuSys = null; public static void main(String[] args) { - probar(); - System.exit(0); - } - - private static void probar(){ Fabrica f = Fabrica.getInstancia(); usuSys = f.getIUsuario(); - //CUsuario su = CUsuario.getInstancia(); try { } catch (Exception e) { @@ -36,7 +20,10 @@ public class DatosDePrueba { System.out.println(e.getMessage()); System.out.println("//////////////////////////"); } + System.exit(0); } + + /* private static void mostrarLista(ArrayList<Object> lst){ // Prueba de búsqueda por categorÃa diff --git a/UyTube_web/libreria/UyTube_logica.jar b/UyTube_web/libreria/UyTube_logica.jar index 34ac517aa79d8807263020535e986c75c03aae4f..533234ca8e508f89691f1c9cc608e1c06d271032 100644 Binary files a/UyTube_web/libreria/UyTube_logica.jar and b/UyTube_web/libreria/UyTube_logica.jar differ diff --git a/UyTube_web/src/java/com/uytube/ConsultaVideo.java b/UyTube_web/src/java/com/uytube/ConsultaVideo.java index 335fb6a5a692227165c5ab2c90735e80ccdff2ab..f697e5fc9b5105bf096384ad52b3deb06905c32e 100644 --- a/UyTube_web/src/java/com/uytube/ConsultaVideo.java +++ b/UyTube_web/src/java/com/uytube/ConsultaVideo.java @@ -8,6 +8,7 @@ import Logica.DataType.DtValoracion; import Logica.DataType.DtVideo; import Logica.Enumerados.TipoValoracion; import Logica.Fabrica; +import Logica.Interfaces.IAdmin; import Logica.Interfaces.IUsuario; import java.io.IOException; import java.text.SimpleDateFormat; @@ -19,7 +20,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public class ConsultaVideo extends HttpServlet { - + /** * Handles the HTTP <code>GET</code> method. * @@ -42,13 +43,16 @@ public class ConsultaVideo extends HttpServlet { DtVideo video = sys.seleccionarVideo(idVideo); ArrayList<DtComentario> comentarios = sys.listarComentariosDeVideo(); DtValoracion valoracionDada = null; + ArrayList<DtValoracion> valoraciones = null; boolean sesionIniciada = sys.sesionIniciada(); boolean propietarioDelVideo = false; if (sesionIniciada) { propietarioDelVideo = usuario.getNickname().equals(sys.obtenerUsuarioActual().getNickname()); valoracionDada = sys.obtenerValoracionDada(); + if (propietarioDelVideo){ + valoraciones = sys.obtenerValoracionesDeVideo(); + } } - String htmlComentarios = htmlDeSeccionDeComentarios(comentarios, obtenerImagenesDeUsuarios(comentarios), sesionIniciada); // no se si la siguiente linea es necesaria, pero por las dudas la pongo, para no dejar incoherencias en la logica @@ -60,6 +64,7 @@ public class ConsultaVideo extends HttpServlet { request.setAttribute("sesionIniciada", sesionIniciada); request.setAttribute("propietarioDelVideo", propietarioDelVideo); request.setAttribute("valoracionDada", valoracionDada); + request.setAttribute("valoraciones", valoraciones); RequestDispatcher rd; //objeto para despachar rd = request.getRequestDispatcher("/ConsultaVideo.jsp"); rd.forward(request, response); @@ -96,6 +101,35 @@ public class ConsultaVideo extends HttpServlet { switch (accion) { case "like": case "disLike": { + /** + * Estimado programador que está leyendo esto: + * El codigo que comento a continuacion deberia ser el + * correcto para esta funcionalidad, pero por alguna extraña + * razon no funciona y debi implementar un parche. El codigo + * en cuestion falla al hacer la siguiente secuencia de + * pasos: 1- Iniciar sesion en el sitio web 2- Consultar un + * video que no posee ninguna valoracion 3- Indicar que te + * gusta el video Sibien la página muestra los contadores + * correctamente, este cambio no se ve reflejado en la base + * de datos, lo cual genera inconsistencias al recargar la + * página + * Si + * usted encuentra el verdadero problema y lo logra + * solucionar de manera correcta, por favor comuniquese + * conmigo + */ + /** + * En respuesta al comentario anterior: + * Parece ser que el + * error estaba en la logica, JPA hacia cosas raras. + * Modifiqué la funcion seleccionarUsuario(nickname) en la + * Logica para que si se intenta seleccionar al usuario que + * tiene la sesion iniciada, se apunte a usuarioActual y no + * a una copia de la entidad (generada por JPA) + * Descomento + * el codigo que parecia no funcionar y comento el otro + * (aunque sospecho que tampoco funcionaba) + */ int idVideo = Integer.valueOf(request.getParameter("idVideo")); DtValoracion dtVal = null; switch (accion) { @@ -111,15 +145,43 @@ public class ConsultaVideo extends HttpServlet { sys.seleccionarVideo(idVideo); sys.valorarVideo(dtVal); // obtiene las cantidades de valoraciones - String strCantLikes = String.valueOf(sys.seleccionarVideo(idVideo).getCantLikes()); - String strCantDisLikes = String.valueOf(sys.seleccionarVideo(idVideo).getCantDisLikes()); + DtVideo dtv = sys.seleccionarVideo(idVideo); + String strCantLikes = String.valueOf(dtv.getCantLikes()); + String strCantDisLikes = String.valueOf(dtv.getCantDisLikes()); // Las concatena para devolverlas respuesta = strCantLikes + ":" + strCantDisLikes; response.getWriter().write(respuesta); - - // ---- Acciones relacionadas a COMENTAR VIDEO ---- break; + + /* + IAdmin parche = Fabrica.getInstancia().getIAdmin(); + + int idVideo = Integer.valueOf(request.getParameter("idVideo")); + DtValoracion dtVal = null; + switch (accion) { + case "like": + dtVal = new DtValoracion(TipoValoracion.LIKE, ""); + break; + case "disLike": + dtVal = new DtValoracion(TipoValoracion.DISLIKE, ""); + break; + } // se seleccionan el usuario due;o del video y el video (por las dudas) + DtUsuario usuarioDuenioDelVideo = parche.obtenerPropietarioDeVideo(idVideo); + parche.seleccionarUsuarioActual(((DtUsuario)request.getSession().getAttribute("usuario")).getNickname()); + parche.seleccionarUsuario(usuarioDuenioDelVideo.getNickname()); + parche.seleccionarVideo(idVideo); + parche.altaValoracion(dtVal); + // obtiene las cantidades de valoraciones + DtVideo dtv = parche.seleccionarVideo(idVideo); + String strCantLikes = String.valueOf(dtv.getCantLikes()); + String strCantDisLikes = String.valueOf(dtv.getCantDisLikes()); + // Las concatena para devolverlas + respuesta = strCantLikes + ":" + strCantDisLikes; + response.getWriter().write(respuesta); + break; + */ } + // ---- Acciones relacionadas a COMENTAR VIDEO ---- case "comentarVideo": case "responderComentario": { // Se extraen los datos recibidos @@ -145,10 +207,9 @@ public class ConsultaVideo extends HttpServlet { sys.seleccionarUsuario(usuarioDuenioDelVideo.getNickname()); respuesta = htmlComentarios; response.getWriter().write(respuesta); - - // ---- Acciones relacionadas a AGREGAR VIDEO A LISTA DE REPRODUCCION---- break; } + // ---- Acciones relacionadas a AGREGAR VIDEO A LISTA DE REPRODUCCION---- case "agregarALista": /* int idVideo = Integer.valueOf(request.getParameter("idVideo")); @@ -160,11 +221,20 @@ public class ConsultaVideo extends HttpServlet { respuesta = "Esta funcionalidad no ha sido implementada aun..."; response.getWriter().write(respuesta); break; + case "listarValoraciones": + int idVideo = Integer.valueOf(request.getParameter("idVideo")); + respuesta = ""; + sys.seleccionarVideo(idVideo); + ArrayList<DtValoracion> valoraciones = sys.obtenerValoracionesDeVideo(); + for (DtValoracion val : valoraciones){ + respuesta += val.getNickname() + ":" + val.getVal() + ";"; + } + response.getWriter().write(respuesta); + break; default: break; } - - } catch (IOException | NumberFormatException e) { + } catch (Exception e) { System.out.println("---- Exception ----"); System.out.println(e.getMessage()); System.out.println("-------------------"); @@ -189,8 +259,13 @@ public class ConsultaVideo extends HttpServlet { private ArrayList<String> obtenerImagenesDeUsuarios(ArrayList<DtComentario> comentarios){ ArrayList<String> ret = new ArrayList(); IUsuario sys = Fabrica.getInstancia().getIUsuario(); + String img; for (DtComentario c : comentarios){ - ret.add(sys.seleccionarUsuario(c.getNickname()).getImagen()); + img = sys.seleccionarUsuario(c.getNickname()).getImagen(); + if (img == null || img.equals("")){ + img = "imagenes/ukp.png"; + } + ret.add(img); } return ret; } diff --git a/UyTube_web/web/AltaVideo.jsp b/UyTube_web/web/AltaVideo.jsp index 358ba07bd2521d575c472226871c1ec4b5c6aff5..6853ca270b2dd129303adc6cf64957ebc873c54a 100644 --- a/UyTube_web/web/AltaVideo.jsp +++ b/UyTube_web/web/AltaVideo.jsp @@ -70,11 +70,11 @@ <h3>Alta de video</h3> <form class="form-alta-video" action="/uytube/video-agregar" method="post" > <div class="form-group row"> - <div class="form-group col-md-9"> + <div class="form-group col-12 col-md-9"> <label for="inputNombre">Nombre</label> <input type="text" class="form-control" name="nombre" id="inputNombre" placeholder="Nombre del video"> </div> - <div class="form-group col-md-3"> + <div class="form-group col-4 col-md-3"> <label for="inputDuracion">Duración</label> <input type="time" step='1'class="form-control" name="duracion" id="inputDuracion" placeholder="Duración"> </div> @@ -92,12 +92,14 @@ </div> </div> <div class="form-group row"> - <div class="form-group col-md-5"> + <div class="form-group col-6 col-md-4"> <label for="inputFecha">Fecha</label> <input type="date" name="fecha" class="form-control" id="inputFecha"> </div> - - <div class="form-group col-md-7"> + <div class="form-group col-md-2"> + + </div> + <div class="form-group col-8 col-md-7"> <label for="inputCategoria">CategorÃa</label> <select id="inputCategoria" name="categoria" class="form-control"> <% diff --git a/UyTube_web/web/ConsultaUsuario.jsp b/UyTube_web/web/ConsultaUsuario.jsp index 3a1c8367f2606c62977ad0719435ead14404d1bf..ba441e947b02cecea9389e1f9e015d8badb091a0 100644 --- a/UyTube_web/web/ConsultaUsuario.jsp +++ b/UyTube_web/web/ConsultaUsuario.jsp @@ -87,7 +87,7 @@ <div class="contenido"> <section class="contenido-flexible"> <div class="container"> - <div class="d-flex bd-highlight "> + <div class="d-block d-md-flex bd-highlight "> <div class="p-4 flex-fill bd-highlight"> <div class="d-flex justify-content-center"> <% @@ -246,7 +246,7 @@ ); %> <!-- Video individual en la lista --> - <div class="d-flex bd-highlight "> + <div class="d-block d-md-flex bd-highlight "> <div class="p-1 flex-shrink-1 bd-highlight "> <div class="p-1 bd-highlight "> <a href="video-consultar?id=<%= v.getId() %>"> diff --git a/UyTube_web/web/ConsultaVideo.jsp b/UyTube_web/web/ConsultaVideo.jsp index 53a8747c93762952c93acabe8f102df34f7e79c8..87d36975abc9b3dffd9386af509ed21bf7b584c5 100644 --- a/UyTube_web/web/ConsultaVideo.jsp +++ b/UyTube_web/web/ConsultaVideo.jsp @@ -30,6 +30,7 @@ DtVideo video = (DtVideo) request.getAttribute("video"); String htmlComentarios = (String) request.getAttribute("comentarios"); DtValoracion valoracionDada = (DtValoracion) request.getAttribute("valoracionDada"); + ArrayList<DtValoracion> valoraciones = (ArrayList) request.getAttribute("valoraciones"); %> <head> <meta charset="UTF-8"> @@ -44,7 +45,7 @@ <link rel="stylesheet" type="text/css" href="css/contenido-buscar.css"> <link rel="stylesheet" type="text/css" href="iconos/style.css"> <link rel="icon" type="image/png" href="imagenes/icono.png" /> - <title>UyTube - <%= video.getNombre() %></title> + <title>UyTube - <%= video.getNombre()%></title> </head> <body> <div class="container-fluid" style="padding-left: 0; padding-right: 0px;"> @@ -56,7 +57,7 @@ %> <%@ include file='include/header-usuario.jsp' %> <% - } else { + } else { %> <%@ include file='include/header-visitante.jsp' %> <% @@ -82,7 +83,7 @@ %> <%@ include file='include/menu-usuario.jsp' %> <% - } else { + } else { %> <%@ include file='include/menu-visitante.jsp' %> <% @@ -92,7 +93,7 @@ <div class="contenido"> <section class="contenido-flexible"> <div class="container"> - + <!-- Ventana emergente para responder comentario, no borrar --> <%@ include file='include/ventana-modal.html' %> @@ -113,8 +114,8 @@ <div class="embed-responsive embed-responsive-16by9"> <iframe id="video" value="<%= video.getId()%>" class="embed-responsive-item" src="<%= videoEmbebido%>" allowfullscreen></iframe> </div> - - + + <!-- BOTONES PARA LIKE, DISLIKE y AGREGAR A LISTA--> <% if (sesionIniciada) { @@ -122,73 +123,68 @@ <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups"> <!-- Botones Me gusta y no me gusta --> <div class="p-2 btn-group mr-2" role="group" aria-label="Third group"> - <% - if (valoracionDada == null){ - %> - <button type="button" id="btnLike" class="btn btn-success icon-thumbs-up"> - <span id="txtMeGusta">ME GUSTA</span> - <span id="txtLike" class="badge badge-light"><%= video.getCantLikes()%></span> - </button> - <button type="button" id="btnDisLike" class="btn btn-danger icon-thumbs-down"> - <span id="txtNoMeGusta">NO ME GUSTA</span> - <span id="txtDisLike" class="badge badge-light"><%= video.getCantDisLikes()%></span> - </button> <% - }else if (valoracionDada.getVal() == TipoValoracion.LIKE){ - %> - <button disabled="true" type="button" id="btnLike" class="btn btn-success icon-thumbs-up"> - <span id="txtMeGusta">TE GUSTA</span> - <span id="txtLike" class="badge badge-light"><%= video.getCantLikes()%></span> - </button> - <button type="button" id="btnDisLike" class="btn btn-danger icon-thumbs-down"> - <span id="txtNoMeGusta">NO ME GUSTA</span> - <span id="txtDisLike" class="badge badge-light"><%= video.getCantDisLikes()%></span> - </button> - <% - }else if (valoracionDada.getVal() == TipoValoracion.DISLIKE){ + String textoBtnLike = "ME GUSTA"; + String textoBtnDisLike = "NO ME GUSTA"; + String deshabilitarBtnLike = ""; + String deshabilitartextoBtnDisLike = ""; + + if (valoracionDada == null) { + // quedan como fueron declaradas + } else if (valoracionDada.getVal() == TipoValoracion.LIKE) { + textoBtnLike = "TE GUSTA"; + textoBtnDisLike = "NO ME GUSTA"; + deshabilitarBtnLike = "disabled=\"true\""; + deshabilitartextoBtnDisLike = ""; + } else if (valoracionDada.getVal() == TipoValoracion.DISLIKE) { + textoBtnLike = "ME GUSTA"; + textoBtnDisLike = "NO TE GUSTA"; + deshabilitarBtnLike = ""; + deshabilitartextoBtnDisLike = "disabled=\"true\""; + } %> - <button type="button" id="btnLike" class="btn btn-success icon-thumbs-up"> - <span id="txtMeGusta">ME GUSTA</span> + <button <%= deshabilitarBtnLike%> type="button" id="btnLike" class="btn btn-success icon-thumbs-up"> + <span id="txtMeGusta"><%= textoBtnLike%></span> <span id="txtLike" class="badge badge-light"><%= video.getCantLikes()%></span> </button> - <button disabled="true" type="button" id="btnDisLike" class="btn btn-danger icon-thumbs-down"> - <span id="txtNoMeGusta">NO TE GUSTA</span> + <button <%= deshabilitartextoBtnDisLike%> type="button" id="btnDisLike" class="btn btn-danger icon-thumbs-down"> + <span id="txtNoMeGusta"><%= textoBtnDisLike%></span> <span id="txtDisLike" class="badge badge-light"><%= video.getCantDisLikes()%></span> </button> - <% - } - %> </div> - + <!-- Boton agregar a lista de reproduccion --> <div class="p-2 btn-group mr-3" role="group" aria-label="Third group"> <button type="button" id="btnAgregarALista" class="btn btn-info icon-add-to-list"> LISTA DE REPRODUCCIÓN </button> </div> - + <% - if (propietarioDelVideo){ + if (propietarioDelVideo) { %> <!-- Boton modificar video --> - <div class="p-2 btn-group mr-3" role="group" aria-label="Third group"> - <a href="video-modificar?id=<%= video.getId() %>"> - <button type="button" id="btnModificarVideo" class="btn btn-primary icon-cog"> + <div class="p-2 btn-group" role="group" aria-label="Third group"> + <a href="video-modificar?id=<%= video.getId()%>"> + <button type="button" id="btnModificarVideo" class="btn btn-primary icon-cog mr-2"> MODIFICAR </button> </a> + <button href="#ventanaModalValoraciones" data-toggle="modal" type="button" id="btnListarValoraciones" class="btn btn-info icon-info-with-circle"> + QUIÉN VALORÓ + </button> </div> <% } %> - + </div> <% } %> - + <br><hr class="mb-2"><br> - + <!-- IMAGEN DEL USUARIO Y NOMBRE DEL CANAL --> <div class="row"> <% @@ -203,32 +199,32 @@ } %> <div class="bd-highlight"> - <img class="align-self-center mr-3" src="<%= rutaDeImagenDePerfil %>" width="70" height="70" alt="<%= textoAlternativo %>"> + <img class="align-self-center mr-3" src="<%= rutaDeImagenDePerfil%>" width="70" height="70" alt="<%= textoAlternativo%>"> </div> <div class="bd-highlight" > - <a href="usuario-consultar?id=<%= usuario.getNickname() %>"> - <h5><%= canal.getNombre() %></h5> + <a href="usuario-consultar?id=<%= usuario.getNickname()%>"> + <h5><%= canal.getNombre()%></h5> </a> </div> </div> <br> - + <!-- DESCRIPCION DEL VIDEO --> <div class="bd-highlight" > - <h5>Fecha de publicación: <%= new SimpleDateFormat("dd/MM/yyyy").format(video.getFechaPublicacion()) %></h5> + <h5>Fecha de publicación: <%= new SimpleDateFormat("dd/MM/yyyy").format(video.getFechaPublicacion())%></h5> </div> <div class="bd-highlight" > <h3><small class="text-muted">DESCRIPCIÓN</small></h3> </div> <div class="bd-highlight" > - <h5><%= video.getDescripcion() %></h5> + <h5><%= video.getDescripcion()%></h5> </div> <!--==================== FIN DEL VIDEO ====================--> - + <br><hr class="mb-2"><br> - + <!--==================== INGRESO DE COMENTARIOS ====================--> - + <% if (sesionIniciada) { %> @@ -256,12 +252,12 @@ <!--==================== FIN DE INGRESO DE COMENTARIOS ====================--> <br> - + <!--==================== SECCION DE COMENTARIOS ====================--> <div id="seccion-comentarios"> <% out.print(htmlComentarios);%> </div> - + <!-- -------- Ejemplo de estructura de comentarios-------- --> <!-- <div id="seccion-comentarios"> @@ -304,6 +300,52 @@ </div> </div> + <!-- Tabla emergente de valoraciones --> + <% + if (propietarioDelVideo) { + %> + <div class="modal fade" id="ventanaModalValoraciones"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <h3 class="modal-title">Valoraciones</h3> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + </div> + <table class="table table-striped table-fixed" id="tblValoraciones"> + <thead id="tblHead"> + <tr> + <th>Usuario</th> + <th>Valoración</th> + </tr> + </thead> + <tbody id="tblValoraciones-bodyRows"> + <!-- El contenido es obtenido por jQuery --> + </tbody> + </table> + <div class="modal-footer"> + <button type="button" class="btn btn-primary" data-dismiss="modal">Cerrar</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + <% + } + %> + <!-- FIN de Tabla emergente de valoraciones --> + + <style> + .table-fixed tbody { + display:block; + height:250px; /* Altura a la cual aparece el scroll */ + overflow:auto; + } + .table-fixed thead, .table-fixed tbody tr { + display:table; + width:100%; + } + </style> + + <%@ include file='include/widgets.html' %> <%@ include file='include/footer.html' %> diff --git a/UyTube_web/web/ConsultarListaReproduccion.jsp b/UyTube_web/web/ConsultarListaReproduccion.jsp index d1fedcb45e92be72affb478db29aeea7ebfb7cc5..69e10e36c1d13ada610eda7728df1e488b8378f6 100644 --- a/UyTube_web/web/ConsultarListaReproduccion.jsp +++ b/UyTube_web/web/ConsultarListaReproduccion.jsp @@ -4,6 +4,7 @@ Author : administrador --%> +<%@page import="Logica.Enumerados.TipoListaDeReproduccion"%> <%@page import="Logica.DataType.DtVideo"%> <%@page import="java.util.ArrayList"%> <%@page import="Logica.DataType.DtListaDeReproduccion"%> @@ -96,34 +97,27 @@ <h5><%= listasRep.getPrivacidad()%></h5> <h5><%= listasRep.getCategoria()%></h5> </div> - - <% - if (sesionIniciada && propietario) { - %> - <a href="lista-modificar?idUsu=<%= usuario %>&idList=<%= listasRep.getId()%>"> - <div class="p-2 d-flex align-items-end"> - <button type="button" class="btn btn-primary">Modificar</button> - </div> - </a> - <% - } - %> - - - + <% + if (sesionIniciada && propietario && listasRep.getTipo() != TipoListaDeReproduccion.POR_DEFECTO) { + %> + <div class="p-2 d-flex align-items-end"> + <a href="lista-modificar?idUsu=<%= usuario%>&idList=<%= listasRep.getId()%>"> + <button type="button" class="btn btn-primary">MODIFICAR</button> + </a> + </div> + <% + } + %> </div> <!--FIN INFORMACION LISTA.REP--> <hr> - <h3>VIDEOS:</h3> - - <!--LISTA DE CONTENIDO--> + <h3>VIDEOS:</h3> <div class="tab-pane fade show active" id="videos" role="tabpanel" aria-labelledby="nav-VIDEO-tab"> <!--PRIMER VIDEO--> <% - for (DtVideo elem : videos) { String id = Funciones.Funciones.extraerIDYoutube(elem.getUrlVideoOriginal()); %> @@ -147,8 +141,6 @@ <% } %> - - </div> </section> </div> diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/_alturas.sassc b/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/_alturas.sassc similarity index 63% rename from UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/_alturas.sassc rename to UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/_alturas.sassc index b1b03fbfd2c8022607b6d31ecc54d4c8a9f472d1..5b1ed625d09b477b54bfdf09b47645a1c2a1a506 100644 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/_alturas.sassc and b/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/_alturas.sassc differ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/_colores.sassc b/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/_colores.sassc similarity index 88% rename from UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/_colores.sassc rename to UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/_colores.sassc index 9f87e5e31b15d529229ae6f283a8f28d5288c7b6..6d13430efc10d36e01aa5c6d74cc0f62049f84d2 100644 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/_colores.sassc and b/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/_colores.sassc differ diff --git a/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/header.sassc b/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/header.sassc new file mode 100644 index 0000000000000000000000000000000000000000..01aac36cd420d7360b0073074a95f9e1446db642 Binary files /dev/null and b/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/header.sassc differ diff --git a/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/menu.sassc b/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/menu.sassc new file mode 100644 index 0000000000000000000000000000000000000000..54c512472f3c739c9544868d9ee6291dc0d29271 Binary files /dev/null and b/UyTube_web/web/css/.sass-cache/c5945467622b764634fe3b9fcf530060a0a026da/menu.sassc differ diff --git a/UyTube_web/web/sass/_alturas.sass b/UyTube_web/web/css/_alturas.sass similarity index 97% rename from UyTube_web/web/sass/_alturas.sass rename to UyTube_web/web/css/_alturas.sass index cacb76ff51f87970fb02f68290c944e8b5dbdf71..b1a211011ae4771ee20e57bdd03adcea19a0580b 100644 --- a/UyTube_web/web/sass/_alturas.sass +++ b/UyTube_web/web/css/_alturas.sass @@ -9,10 +9,11 @@ $alturaHeader501: 56px //Alto del header tamaño minimo 576 $alturaHeader576: 56px //Alto del header tamaño minimo 768 -$alturaHeader768: 77.2px +$alturaHeader768: 56px //Alto del header tamaño minimo 992 $alturaHeader992: 56px + //Alto del widget tamaño maximo 340 $alturaWidget340: 170px //Alto del widget tamaño minimo 341 diff --git a/UyTube_web/web/sass/_colores.sass b/UyTube_web/web/css/_colores.sass similarity index 100% rename from UyTube_web/web/sass/_colores.sass rename to UyTube_web/web/css/_colores.sass diff --git a/UyTube_web/web/sass/body.sass b/UyTube_web/web/css/body.sass similarity index 100% rename from UyTube_web/web/sass/body.sass rename to UyTube_web/web/css/body.sass diff --git a/UyTube_web/web/css/contenido-alta-usuario.css b/UyTube_web/web/css/contenido-alta-usuario.css index 0755e2a141cae931500c6438042fa298733c96e5..c1197bf544d5a738e76d1f20048cb7ae417cfe72 100644 --- a/UyTube_web/web/css/contenido-alta-usuario.css +++ b/UyTube_web/web/css/contenido-alta-usuario.css @@ -2,392 +2,105 @@ background-color: #f6f6f6; min-height: 800px; border-bottom: 2px solid #5aa1e3; - border-top: 2px solid #5aa1e3; } + border-top: 2px solid #5aa1e3; + width: 100%; } .contenido { background-color: #f6f6f6; - border-radius: 5px; padding: 16px; margin-left: auto; margin-right: auto; - width: 70%; + width: 1070px; height: 100%; } .contenido .contenido-flexible { background-color: #f6f6f6; margin-bottom: 16px; display: flex; flex-direction: row; - justify-content: center; + justify-content: space-between; flex-wrap: wrap; flex-grow: 0; flex-shrink: 0; } + .contenido .contenido-flexible h3 { + width: 100%; } @media (max-width: 340px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 175.112px; } - .header nav { - height: 175.112px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 175.112px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - - .menu { - top: -171.112px; } - .contenido { - width: 100%; } + width: 100%; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 170px; - padding-top: 5px; - padding-bottom: 5px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + justify-content: flex-start; } } @media (min-width: 341px) and (max-width: 387px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - height: 175.112px; - left: 0px; } - .header nav { - height: 175.112px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 175.112px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 330px; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 170px; - padding-top: 5px; - padding-bottom: 5px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + justify-content: flex-start; } } @media (min-width: 388px) and (max-width: 500px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 127.176px; } - .header nav { - height: 127.176px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 127.176px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 388px; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } + justify-content: flex-start; } .contenido .h3 { - width: 90%; } - - .widgets { - height: 180px; - padding-top: 10px; - padding-bottom: 10px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + width: 90%; } } @media (min-width: 501px) and (max-width: 575.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 129.176px; } - .header nav { - height: 129.176px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 129.176px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 501px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 180px; - flex-direction: column; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 80%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 70%; - display: flex; - justify-content: space-around; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 576px) and (max-width: 767.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0rem; - height: 124.117px; } - .header .nav { - height: 124.117px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 124.117px; } - - #navLogo { - justify-content: flex-start; } - - #navbarSupportedContent { - width: 100%; } - #navbarSupportedContent #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #navbarSupportedContent #formBuscar input { - width: 87%; } - .contenido { - width: 100%; } + width: 576px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 160px; - flex-direction: column; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 60%; - flex-direction: row; - justify-content: space-between; - align-items: center; } - .widgets .widget-2 { - width: 60%; - display: flex; - justify-content: space-between; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 768px) and (max-width: 991.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0rem; - height: 77.2px; } - .header nav { - height: 77.2px; - justify-content: space-between; } - .header nav #navLogo { - justify-content: space-between; } - .header nav #navbarSupportedContent { - width: 100%; } - .header nav #navbarSupportedContent #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - .header nav #navbarSupportedContent #formBuscar input { - width: 87%; } - - .relleno-header { - height: 77.2px; } - .contenido { - width: 100%; } + width: 664px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 100px; - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 50%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 30%; - display: flex; - flex-direction: row; - justify-content: center; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 992px) { - .header { - width: 98%; - height: 56px; } - .header nav { - height: 56px; } - - .relleno-header { - height: 56px; } + .container-fluid { + padding-left: 0px; + padding-right: 0px; } .contenido { - width: 70%; } - - .widgets { - height: 123px; - padding-left: 30px; - padding-right: 30px; - justify-content: space-around; - flex-wrap: wrap; - align-content: center; } - .widgets .img-widget { - height: 83px; } - .widgets .widget-1 { - width: 460px; - display: flex; - justify-content: space-around; } - .widgets .widget-2 { - width: 350px; } } + width: 60%; } + .contenido .contenido-flexible { + width: 100%; + justify-content: flex-start; } } -/*# sourceMappingURL=contenido-index.css.map */ +/*# sourceMappingURL=contenido-alta-usuario.css.map */ diff --git a/UyTube_web/web/css/contenido-alta-usuario.sass b/UyTube_web/web/css/contenido-alta-usuario.sass new file mode 100644 index 0000000000000000000000000000000000000000..09cdd1601b50305e113ef195073025de21dfe0f7 --- /dev/null +++ b/UyTube_web/web/css/contenido-alta-usuario.sass @@ -0,0 +1,139 @@ +@import _colores + +.principal + background-color: $colorGrisClaro + min-height: 800px + border-bottom: 2px solid $colorCelesteClaro + border-top: 2px solid $colorCelesteClaro + width: 100% + +.contenido + background-color: $colorGrisClaro + padding: 16px + margin-left: auto + margin-right: auto + width: 1070px + height: 100% + .contenido-flexible + background-color: $colorGrisClaro + margin-bottom: 16px + display: flex + flex-direction: row + justify-content: space-between + flex-wrap: wrap + flex-grow: 0 + flex-shrink: 0 + h3 + width: 100% + + +// Para un maximo de 340px ================================================================================ +@media (max-width: 340px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 100% + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Para dispositivos mayores a 340 y menores a 388 ============================================================== +@media (min-width: 341px) and (max-width: 387px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 330px + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Para dispositivos mayores a 387 y menores a 500 ================================================================ +@media (min-width: 388px) and (max-width: 500px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 388px + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + .h3 + width: 90% + + +// Extra small devices (portrait phones, less than 576px) ======================================================= +@media (min-width: 501px) and (max-width: 575.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 501px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Small devices (landscape phones, 576px and up) ================================================================ +@media (min-width: 576px) and (max-width: 767.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 576px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Medium devices (tablets, 768px and up) +@media (min-width: 768px) and (max-width: 991.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 664px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Large devices (desktops, 992px and up) ======================================================================= +@media (min-width: 992px) + .container-fluid + padding-left: 0px + padding-right: 0px + //Estilos del contenido principal + .contenido + width: 60% + .contenido-flexible + width: 100% + justify-content: flex-start + + + + + + \ No newline at end of file diff --git a/UyTube_web/web/css/contenido-alta-video.css b/UyTube_web/web/css/contenido-alta-video.css index 6c26ee393b4f88c1350e9356017a72ce077a2bb8..e069fb71a2034c47396237fd9fe2ca7a17ed7a4b 100644 --- a/UyTube_web/web/css/contenido-alta-video.css +++ b/UyTube_web/web/css/contenido-alta-video.css @@ -2,19 +2,20 @@ background-color: #f6f6f6; min-height: 800px; border-bottom: 2px solid #5aa1e3; - border-top: 2px solid #5aa1e3; } + border-top: 2px solid #5aa1e3; + width: 100%; } .contenido { background-color: #f6f6f6; - border-radius: 5px; padding: 16px; margin-left: auto; margin-right: auto; - width: 70%; + width: 1070px; height: 100%; } .contenido .contenido-flexible { background-color: #f6f6f6; margin-bottom: 16px; + padding: 10px; display: flex; flex-direction: row; justify-content: center; @@ -22,379 +23,87 @@ flex-grow: 0; flex-shrink: 0; } .contenido .contenido-flexible h3 { - width: 100%; - margin: 0.625rem; - text-decoration: underline; } + width: 60%; } .contenido .contenido-flexible .form-alta-video { - width: 100%; - padding: 16px; } + width: 100%; } @media (max-width: 340px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 175.112px; } - .header nav { - height: 175.112px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 175.112px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - - .menu { - top: -171.112px; } - .contenido { - width: 100%; } + width: 100%; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 170px; - padding-top: 5px; - padding-bottom: 5px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + justify-content: flex-start; } } @media (min-width: 341px) and (max-width: 387px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - height: 175.112px; - left: 0px; } - .header nav { - height: 175.112px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 175.112px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 330px; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 170px; - padding-top: 5px; - padding-bottom: 5px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + justify-content: flex-start; } } @media (min-width: 388px) and (max-width: 500px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 127.176px; } - .header nav { - height: 127.176px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 127.176px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 388px; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } + justify-content: flex-start; } .contenido .h3 { - width: 90%; } - - .widgets { - height: 180px; - padding-top: 10px; - padding-bottom: 10px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + width: 90%; } } @media (min-width: 501px) and (max-width: 575.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 129.176px; } - .header nav { - height: 129.176px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 129.176px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 501px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 180px; - flex-direction: column; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 80%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 70%; - display: flex; - justify-content: space-around; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 576px) and (max-width: 767.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0rem; - height: 124.117px; } - .header .nav { - height: 124.117px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 124.117px; } - - #navLogo { - justify-content: flex-start; } - - #navbarSupportedContent { - width: 100%; } - #navbarSupportedContent #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #navbarSupportedContent #formBuscar input { - width: 87%; } - .contenido { - width: 100%; } + width: 576px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 160px; - flex-direction: column; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 60%; - flex-direction: row; - justify-content: space-between; - align-items: center; } - .widgets .widget-2 { - width: 60%; - display: flex; - justify-content: space-between; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 768px) and (max-width: 991.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0rem; - height: 77.2px; } - .header nav { - height: 77.2px; - justify-content: space-between; } - .header nav #navLogo { - justify-content: space-between; } - .header nav #navbarSupportedContent { - width: 100%; } - .header nav #navbarSupportedContent #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - .header nav #navbarSupportedContent #formBuscar input { - width: 87%; } - - .relleno-header { - height: 77.2px; } - .contenido { - width: 100%; } + width: 664px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 100px; - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 50%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 30%; - display: flex; - flex-direction: row; - justify-content: center; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 992px) { - .header { - width: 98%; - height: 56px; } - .header nav { - height: 56px; } - - .relleno-header { - height: 56px; } + .container-fluid { + padding-left: 0px; + padding-right: 0px; } .contenido { - width: 70%; } - - .widgets { - height: 123px; - padding-left: 30px; - padding-right: 30px; - justify-content: space-around; - flex-wrap: wrap; - align-content: center; } - .widgets .img-widget { - height: 83px; } - .widgets .widget-1 { - width: 460px; - display: flex; - justify-content: space-around; } - .widgets .widget-2 { - width: 350px; } } + width: 50%; } + .contenido .contenido-flexible { + width: 100%; + justify-content: flex-start; } } /*# sourceMappingURL=contenido-alta-video.css.map */ diff --git a/UyTube_web/web/css/contenido-alta-video.css.map b/UyTube_web/web/css/contenido-alta-video.css.map deleted file mode 100644 index a2d57abd163abaf132227236ca681e2dda71ec25..0000000000000000000000000000000000000000 --- a/UyTube_web/web/css/contenido-alta-video.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["../sass/contenido-alta-video.sass","../sass/_colores.sass"], -"names": [], -"file": "contenido-alta-video.css" -} \ No newline at end of file diff --git a/UyTube_web/web/css/contenido-alta-video.sass b/UyTube_web/web/css/contenido-alta-video.sass new file mode 100644 index 0000000000000000000000000000000000000000..b1afba97c542012d60e770cc6f4b7a0a18666bb2 --- /dev/null +++ b/UyTube_web/web/css/contenido-alta-video.sass @@ -0,0 +1,143 @@ +@import _colores + +.principal + background-color: $colorGrisClaro + min-height: 800px + border-bottom: 2px solid $colorCelesteClaro + border-top: 2px solid $colorCelesteClaro + width: 100% + +.contenido + background-color: $colorGrisClaro + padding: 16px + margin-left: auto + margin-right: auto + width: 1070px + height: 100% + .contenido-flexible + background-color: $colorGrisClaro + margin-bottom: 16px + padding: 10px + display: flex + flex-direction: row + justify-content: center + flex-wrap: wrap + flex-grow: 0 + flex-shrink: 0 + h3 + width: 60% + .form-alta-video + width: 100% + + + +// Para un maximo de 340px ================================================================================ +@media (max-width: 340px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 100% + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Para dispositivos mayores a 340 y menores a 388 ============================================================== +@media (min-width: 341px) and (max-width: 387px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 330px + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + + +// Para dispositivos mayores a 387 y menores a 500 ================================================================ +@media (min-width: 388px) and (max-width: 500px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 388px + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + .h3 + width: 90% + + +// Extra small devices (portrait phones, less than 576px) ======================================================= +@media (min-width: 501px) and (max-width: 575.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 501px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Small devices (landscape phones, 576px and up) ================================================================ +@media (min-width: 576px) and (max-width: 767.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 576px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Medium devices (tablets, 768px and up) +@media (min-width: 768px) and (max-width: 991.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 664px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Large devices (desktops, 992px and up) ======================================================================= +@media (min-width: 992px) + .container-fluid + padding-left: 0px + padding-right: 0px + //Estilos del contenido principal + .contenido + width: 50% + .contenido-flexible + width: 100% + justify-content: flex-start + + + + + \ No newline at end of file diff --git a/UyTube_web/web/css/contenido-base.css.map b/UyTube_web/web/css/contenido-base.css.map deleted file mode 100644 index ce8a0271808cf68c324f8376763eb95b2e198c83..0000000000000000000000000000000000000000 --- a/UyTube_web/web/css/contenido-base.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["../sass/contenido-base.sass","../sass/_colores.sass"], -"names": [], -"file": "contenido-base.css" -} diff --git a/UyTube_web/web/sass/contenido-base.sass b/UyTube_web/web/css/contenido-base.sass similarity index 77% rename from UyTube_web/web/sass/contenido-base.sass rename to UyTube_web/web/css/contenido-base.sass index e0a173102946878a67e0a4ef4a85abc227ef7524..2f0f3fcb56ef7b5672cdd31f342919eef33c8fbc 100644 --- a/UyTube_web/web/sass/contenido-base.sass +++ b/UyTube_web/web/css/contenido-base.sass @@ -9,7 +9,6 @@ .contenido background-color: $colorGrisClaro - border-radius: 5px padding: 16px margin-left: auto margin-right: auto @@ -26,10 +25,7 @@ flex-shrink: 0 h3 width: 100% - .card - width: 210px - margin: 0px - + // Para un maximo de 340px ================================================================================ @media (max-width: 340px) @@ -37,25 +33,32 @@ padding-left: 0px padding-right: 0px + //estilos del contenido principal .contenido width: 100% + padding-left: 2px + padding-right: 2px .contenido-flexible width: 100% - justify-content: center - + justify-content: flex-start + // Para dispositivos mayores a 340 y menores a 388 ============================================================== @media (min-width: 341px) and (max-width: 387px) .container-fluid padding-left: 0px - padding-right: 0px - + padding-right: 0px + //estilos del contenido principal .contenido - width: 100% + width: 330px + padding-left: 2px + padding-right: 2px .contenido-flexible width: 100% - justify-content: center + justify-content: flex-start + + // Para dispositivos mayores a 387 y menores a 500 ================================================================ @media (min-width: 388px) and (max-width: 500px) @@ -65,10 +68,13 @@ //estilos del contenido principal .contenido - width: 100% + width: 388px + padding-left: 2px + padding-right: 2px .contenido-flexible width: 100% - justify-content: center + justify-content: flex-start + .h3 width: 90% @@ -81,11 +87,11 @@ //Estilos del contenido principal .contenido - width: 100% + width: 501px .contenido-flexible width: 100% - justify-content: center - + justify-content: flex-start + // Small devices (landscape phones, 576px and up) ================================================================ @media (min-width: 576px) and (max-width: 767.98px) @@ -95,11 +101,11 @@ //Estilos del contenido principal .contenido - width: 100% + width: 576px .contenido-flexible width: 100% - justify-content: center - + justify-content: flex-start + // Medium devices (tablets, 768px and up) @media (min-width: 768px) and (max-width: 991.98px) @@ -109,21 +115,23 @@ //Estilos del contenido principal .contenido - width: 100% + width: 664px .contenido-flexible width: 100% - justify-content: center - + justify-content: flex-start - - // Large devices (desktops, 992px and up) ======================================================================= @media (min-width: 992px) + .container-fluid + padding-left: 0px + padding-right: 0px //Estilos del contenido principal .contenido - width: 1070px - + width: 872px + .contenido-flexible + width: 100% + justify-content: flex-start diff --git a/UyTube_web/web/css/contenido-buscar.css.map b/UyTube_web/web/css/contenido-buscar.css.map deleted file mode 100644 index 7f2de646bc474c3417b8ab6081f2fe1b4f20fb30..0000000000000000000000000000000000000000 --- a/UyTube_web/web/css/contenido-buscar.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["../sass/contenido-buscar.sass","../sass/_colores.sass"], -"names": [], -"file": "contenido-buscar.css" -} \ No newline at end of file diff --git a/UyTube_web/web/sass/contenido-buscar.sass b/UyTube_web/web/css/contenido-buscar.sass similarity index 100% rename from UyTube_web/web/sass/contenido-buscar.sass rename to UyTube_web/web/css/contenido-buscar.sass diff --git a/UyTube_web/web/css/contenido-consulta-usuario.css b/UyTube_web/web/css/contenido-consulta-usuario.css index 0755e2a141cae931500c6438042fa298733c96e5..b29d8f5272751b8c404015a5fd45b1a9ee6b9581 100644 --- a/UyTube_web/web/css/contenido-consulta-usuario.css +++ b/UyTube_web/web/css/contenido-consulta-usuario.css @@ -2,392 +2,105 @@ background-color: #f6f6f6; min-height: 800px; border-bottom: 2px solid #5aa1e3; - border-top: 2px solid #5aa1e3; } + border-top: 2px solid #5aa1e3; + width: 100%; } .contenido { background-color: #f6f6f6; - border-radius: 5px; padding: 16px; margin-left: auto; margin-right: auto; - width: 70%; + width: 1070px; height: 100%; } .contenido .contenido-flexible { background-color: #f6f6f6; margin-bottom: 16px; display: flex; flex-direction: row; - justify-content: center; + justify-content: space-between; flex-wrap: wrap; flex-grow: 0; flex-shrink: 0; } + .contenido .contenido-flexible h3 { + width: 100%; } @media (max-width: 340px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 175.112px; } - .header nav { - height: 175.112px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 175.112px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - - .menu { - top: -171.112px; } - .contenido { - width: 100%; } + width: 100%; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 170px; - padding-top: 5px; - padding-bottom: 5px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + justify-content: flex-start; } } @media (min-width: 341px) and (max-width: 387px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - height: 175.112px; - left: 0px; } - .header nav { - height: 175.112px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 175.112px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 330px; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 170px; - padding-top: 5px; - padding-bottom: 5px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + justify-content: flex-start; } } @media (min-width: 388px) and (max-width: 500px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 127.176px; } - .header nav { - height: 127.176px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 127.176px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 388px; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } + justify-content: flex-start; } .contenido .h3 { - width: 90%; } - - .widgets { - height: 180px; - padding-top: 10px; - padding-bottom: 10px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + width: 90%; } } @media (min-width: 501px) and (max-width: 575.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 129.176px; } - .header nav { - height: 129.176px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 129.176px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 501px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 180px; - flex-direction: column; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 80%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 70%; - display: flex; - justify-content: space-around; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 576px) and (max-width: 767.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0rem; - height: 124.117px; } - .header .nav { - height: 124.117px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 124.117px; } - - #navLogo { - justify-content: flex-start; } - - #navbarSupportedContent { - width: 100%; } - #navbarSupportedContent #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #navbarSupportedContent #formBuscar input { - width: 87%; } - .contenido { - width: 100%; } + width: 576px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 160px; - flex-direction: column; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 60%; - flex-direction: row; - justify-content: space-between; - align-items: center; } - .widgets .widget-2 { - width: 60%; - display: flex; - justify-content: space-between; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 768px) and (max-width: 991.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0rem; - height: 77.2px; } - .header nav { - height: 77.2px; - justify-content: space-between; } - .header nav #navLogo { - justify-content: space-between; } - .header nav #navbarSupportedContent { - width: 100%; } - .header nav #navbarSupportedContent #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - .header nav #navbarSupportedContent #formBuscar input { - width: 87%; } - - .relleno-header { - height: 77.2px; } - .contenido { - width: 100%; } + width: 664px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 100px; - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 50%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 30%; - display: flex; - flex-direction: row; - justify-content: center; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 992px) { - .header { - width: 98%; - height: 56px; } - .header nav { - height: 56px; } - - .relleno-header { - height: 56px; } + .container-fluid { + padding-left: 0px; + padding-right: 0px; } .contenido { - width: 70%; } - - .widgets { - height: 123px; - padding-left: 30px; - padding-right: 30px; - justify-content: space-around; - flex-wrap: wrap; - align-content: center; } - .widgets .img-widget { - height: 83px; } - .widgets .widget-1 { - width: 460px; - display: flex; - justify-content: space-around; } - .widgets .widget-2 { - width: 350px; } } + width: 872px; } + .contenido .contenido-flexible { + width: 100%; + justify-content: flex-start; } } -/*# sourceMappingURL=contenido-index.css.map */ +/*# sourceMappingURL=contenido-consulta-usuario.css.map */ diff --git a/UyTube_web/web/css/contenido-consulta-usuario.sass b/UyTube_web/web/css/contenido-consulta-usuario.sass new file mode 100644 index 0000000000000000000000000000000000000000..d8cbcacf9a64ecba7245ed891383755c7b875361 --- /dev/null +++ b/UyTube_web/web/css/contenido-consulta-usuario.sass @@ -0,0 +1,133 @@ +@import _colores + +.principal + background-color: $colorGrisClaro + min-height: 800px + border-bottom: 2px solid $colorCelesteClaro + border-top: 2px solid $colorCelesteClaro + width: 100% + +.contenido + background-color: $colorGrisClaro + padding: 16px + margin-left: auto + margin-right: auto + width: 1070px + height: 100% + .contenido-flexible + background-color: $colorGrisClaro + margin-bottom: 16px + display: flex + flex-direction: row + justify-content: space-between + flex-wrap: wrap + flex-grow: 0 + flex-shrink: 0 + h3 + width: 100% + + +// Para un maximo de 340px ================================================================================ +@media (max-width: 340px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 100% + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Para dispositivos mayores a 340 y menores a 388 ============================================================== +@media (min-width: 341px) and (max-width: 387px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 330px + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Para dispositivos mayores a 387 y menores a 500 ================================================================ +@media (min-width: 388px) and (max-width: 500px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 388px + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + .h3 + width: 90% + + +// Extra small devices (portrait phones, less than 576px) ======================================================= +@media (min-width: 501px) and (max-width: 575.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 501px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Small devices (landscape phones, 576px and up) ================================================================ +@media (min-width: 576px) and (max-width: 767.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 576px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Medium devices (tablets, 768px and up) +@media (min-width: 768px) and (max-width: 991.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 664px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Large devices (desktops, 992px and up) ======================================================================= +@media (min-width: 992px) + .container-fluid + padding-left: 0px + padding-right: 0px + //Estilos del contenido principal + .contenido + width: 872px + .contenido-flexible + width: 100% + justify-content: flex-start diff --git a/UyTube_web/web/css/contenido-consulta-video.css.map b/UyTube_web/web/css/contenido-consulta-video.css.map deleted file mode 100644 index ead549ad7d12d971280a20ffa5ad24234aba53cf..0000000000000000000000000000000000000000 --- a/UyTube_web/web/css/contenido-consulta-video.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["../sass/contenido-consulta-video.sass","../sass/_colores.sass"], -"names": [], -"file": "contenido-consulta-video.css" -} \ No newline at end of file diff --git a/UyTube_web/web/sass/contenido-consulta-video.sass b/UyTube_web/web/css/contenido-consulta-video.sass similarity index 100% rename from UyTube_web/web/sass/contenido-consulta-video.sass rename to UyTube_web/web/css/contenido-consulta-video.sass diff --git a/UyTube_web/web/sass/contenido-consulta-video2.sass b/UyTube_web/web/css/contenido-consulta-video2.sass similarity index 100% rename from UyTube_web/web/sass/contenido-consulta-video2.sass rename to UyTube_web/web/css/contenido-consulta-video2.sass diff --git a/UyTube_web/web/css/contenido-index.css.map b/UyTube_web/web/css/contenido-index.css.map deleted file mode 100644 index d53332e48a4dba7581f6a7016191943b82423c77..0000000000000000000000000000000000000000 --- a/UyTube_web/web/css/contenido-index.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["../sass/contenido-index.sass","../sass/_colores.sass"], -"names": [], -"file": "contenido-index.css" -} \ No newline at end of file diff --git a/UyTube_web/web/sass/contenido-index.sass b/UyTube_web/web/css/contenido-index.sass similarity index 100% rename from UyTube_web/web/sass/contenido-index.sass rename to UyTube_web/web/css/contenido-index.sass diff --git a/UyTube_web/web/css/contenido-iniciar-sesion.css b/UyTube_web/web/css/contenido-iniciar-sesion.css index 0755e2a141cae931500c6438042fa298733c96e5..77b484b723807b0d3b7ebeeba68cedf278721bb3 100644 --- a/UyTube_web/web/css/contenido-iniciar-sesion.css +++ b/UyTube_web/web/css/contenido-iniciar-sesion.css @@ -2,392 +2,105 @@ background-color: #f6f6f6; min-height: 800px; border-bottom: 2px solid #5aa1e3; - border-top: 2px solid #5aa1e3; } + border-top: 2px solid #5aa1e3; + width: 100%; } .contenido { background-color: #f6f6f6; - border-radius: 5px; padding: 16px; margin-left: auto; margin-right: auto; - width: 70%; + width: 1070px; height: 100%; } .contenido .contenido-flexible { background-color: #f6f6f6; margin-bottom: 16px; display: flex; flex-direction: row; - justify-content: center; + justify-content: space-between; flex-wrap: wrap; flex-grow: 0; flex-shrink: 0; } + .contenido .contenido-flexible h3 { + width: 100%; } @media (max-width: 340px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 175.112px; } - .header nav { - height: 175.112px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 175.112px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - - .menu { - top: -171.112px; } - .contenido { - width: 100%; } + width: 100%; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 170px; - padding-top: 5px; - padding-bottom: 5px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + justify-content: flex-start; } } @media (min-width: 341px) and (max-width: 387px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - height: 175.112px; - left: 0px; } - .header nav { - height: 175.112px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 175.112px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 330px; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 170px; - padding-top: 5px; - padding-bottom: 5px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + justify-content: flex-start; } } @media (min-width: 388px) and (max-width: 500px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 127.176px; } - .header nav { - height: 127.176px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 127.176px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 388px; + padding-left: 2px; + padding-right: 2px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } + justify-content: flex-start; } .contenido .h3 { - width: 90%; } - - .widgets { - height: 180px; - padding-top: 10px; - padding-bottom: 10px; - flex-direction: column; - justify-content: space-around; - align-content: center; } - .widgets .widget-1 { - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 100%; - justify-content: space-around; } } + width: 90%; } } @media (min-width: 501px) and (max-width: 575.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0px; - height: 129.176px; } - .header nav { - height: 129.176px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 129.176px; } - - #navLogo { - justify-content: flex-start; } - #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } - - #navbarSupportedContent { - width: 100%; } - - #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #formBuscar input { - width: 100%; } - #formBuscar #btnBuscar { - display: none; } - .contenido { - width: 100%; } + width: 501px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 180px; - flex-direction: column; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 80%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 70%; - display: flex; - justify-content: space-around; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 576px) and (max-width: 767.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0rem; - height: 124.117px; } - .header .nav { - height: 124.117px; } - .header .item-header2 { - order: 3; - width: 100%; } - - .relleno-header { - height: 124.117px; } - - #navLogo { - justify-content: flex-start; } - - #navbarSupportedContent { - width: 100%; } - #navbarSupportedContent #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - #navbarSupportedContent #formBuscar input { - width: 87%; } - .contenido { - width: 100%; } + width: 576px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 160px; - flex-direction: column; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 60%; - flex-direction: row; - justify-content: space-between; - align-items: center; } - .widgets .widget-2 { - width: 60%; - display: flex; - justify-content: space-between; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 768px) and (max-width: 991.98px) { .container-fluid { padding-left: 0px; padding-right: 0px; } - .header { - width: 100%; - left: 0rem; - height: 77.2px; } - .header nav { - height: 77.2px; - justify-content: space-between; } - .header nav #navLogo { - justify-content: space-between; } - .header nav #navbarSupportedContent { - width: 100%; } - .header nav #navbarSupportedContent #formBuscar { - display: flex; - justify-content: space-between; - width: 100%; } - .header nav #navbarSupportedContent #formBuscar input { - width: 87%; } - - .relleno-header { - height: 77.2px; } - .contenido { - width: 100%; } + width: 664px; } .contenido .contenido-flexible { width: 100%; - justify-content: center; } - - .widgets { - height: 100px; - width: 100%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-1 { - width: 50%; - flex-direction: row; - justify-content: space-around; - align-items: center; } - .widgets .widget-2 { - width: 30%; - display: flex; - flex-direction: row; - justify-content: center; } - - .footer { - padding: 1rem 0.625rem; } } + justify-content: flex-start; } } @media (min-width: 992px) { - .header { - width: 98%; - height: 56px; } - .header nav { - height: 56px; } - - .relleno-header { - height: 56px; } + .container-fluid { + padding-left: 0px; + padding-right: 0px; } .contenido { - width: 70%; } - - .widgets { - height: 123px; - padding-left: 30px; - padding-right: 30px; - justify-content: space-around; - flex-wrap: wrap; - align-content: center; } - .widgets .img-widget { - height: 83px; } - .widgets .widget-1 { - width: 460px; - display: flex; - justify-content: space-around; } - .widgets .widget-2 { - width: 350px; } } + width: 872px; } + .contenido .contenido-flexible { + width: 100%; + justify-content: flex-start; } } -/*# sourceMappingURL=contenido-index.css.map */ +/*# sourceMappingURL=contenido-iniciar-sesion.css.map */ diff --git a/UyTube_web/web/css/contenido-iniciar-sesion.sass b/UyTube_web/web/css/contenido-iniciar-sesion.sass new file mode 100644 index 0000000000000000000000000000000000000000..4f014c762ffce4fbc430f5e5860cbc40edf22482 --- /dev/null +++ b/UyTube_web/web/css/contenido-iniciar-sesion.sass @@ -0,0 +1,139 @@ +@import _colores + +.principal + background-color: $colorGrisClaro + min-height: 800px + border-bottom: 2px solid $colorCelesteClaro + border-top: 2px solid $colorCelesteClaro + width: 100% + +.contenido + background-color: $colorGrisClaro + padding: 16px + margin-left: auto + margin-right: auto + width: 1070px + height: 100% + .contenido-flexible + background-color: $colorGrisClaro + margin-bottom: 16px + display: flex + flex-direction: row + justify-content: space-between + flex-wrap: wrap + flex-grow: 0 + flex-shrink: 0 + h3 + width: 100% + + +// Para un maximo de 340px ================================================================================ +@media (max-width: 340px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 100% + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Para dispositivos mayores a 340 y menores a 388 ============================================================== +@media (min-width: 341px) and (max-width: 387px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 330px + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + + +// Para dispositivos mayores a 387 y menores a 500 ================================================================ +@media (min-width: 388px) and (max-width: 500px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //estilos del contenido principal + .contenido + width: 388px + padding-left: 2px + padding-right: 2px + .contenido-flexible + width: 100% + justify-content: flex-start + + .h3 + width: 90% + + +// Extra small devices (portrait phones, less than 576px) ======================================================= +@media (min-width: 501px) and (max-width: 575.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 501px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Small devices (landscape phones, 576px and up) ================================================================ +@media (min-width: 576px) and (max-width: 767.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 576px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Medium devices (tablets, 768px and up) +@media (min-width: 768px) and (max-width: 991.98px) + .container-fluid + padding-left: 0px + padding-right: 0px + + //Estilos del contenido principal + .contenido + width: 664px + .contenido-flexible + width: 100% + justify-content: flex-start + + +// Large devices (desktops, 992px and up) ======================================================================= +@media (min-width: 992px) + .container-fluid + padding-left: 0px + padding-right: 0px + //Estilos del contenido principal + .contenido + width: 872px + .contenido-flexible + width: 100% + justify-content: flex-start + + + + + \ No newline at end of file diff --git a/UyTube_web/web/css/footer.css.map b/UyTube_web/web/css/footer.css.map deleted file mode 100644 index 868102379925c0fd1fe6cd2d38216677e8482f1a..0000000000000000000000000000000000000000 --- a/UyTube_web/web/css/footer.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "AAEA,OAAO;EACH,gBAAgB,ECMI,OAAO;EDL3B,aAAa,EAAE,iBAA4B;EAC3C,OAAO,EAAE,IAAI;EACb,aAAa,EAAE,GAAG;EAClB,KAAK,ECIK,IAAI;EDHd,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,eAAe,EAAE,YAAY;EAC7B,WAAW,EAAE,UAAU;;AAW3B,gDAAgD;EAC5C,OAAO;IACH,OAAO,EAAE,aAAa;AAE9B,mDAAmD;EAC/C,OAAO;IACH,OAAO,EAAE,aAAa;AAG9B,mDAAmD;EAC/C,OAAO;IACH,OAAO,EAAE,aAAa", -"sources": ["../sass/footer.sass","../sass/_colores.sass"], -"names": [], -"file": "footer.css" -} \ No newline at end of file diff --git a/UyTube_web/web/sass/footer.sass b/UyTube_web/web/css/footer.sass similarity index 100% rename from UyTube_web/web/sass/footer.sass rename to UyTube_web/web/css/footer.sass diff --git a/UyTube_web/web/css/header.css b/UyTube_web/web/css/header.css index ae0979ea4f94e836aa343d0f52c4982560f1f996..9fb955e5f5e821d2476f2ab2046a0ce0d4a0220f 100644 --- a/UyTube_web/web/css/header.css +++ b/UyTube_web/web/css/header.css @@ -1,25 +1,21 @@ .header { z-index: 9; - position: fixed; - margin-top: 0px; - margin-bottom: 0px; + background-color: #00001a; + margin: 0px; left: 0px; - right: 0px; - margin-left: auto; - margin-right: auto; } + padding-left: 20px; + padding-right: 20px; } .header nav { - background-color: #00001a; display: flex; flex-wrap: wrap; - align-items: center; justify-content: space-between; - padding: 0.1rem 1rem; } + height: 100%; } .header nav .item-header { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; - padding: 0rem 1rem; } + padding: 0rem 0rem; } .header nav .item-header #nombrePerfil { color: #fff; } .header nav .item-header .fotoLogo { @@ -33,7 +29,6 @@ border-radius: 50%; } .header nav .item-header .formBuscar { display: flex; - width: 500px; justify-content: center; flex-wrap: nowrap; } .header nav .item-header .formBuscar input { @@ -43,10 +38,13 @@ border-radius: 0.25rem; font-size: 1rem; padding: 0.375rem 0.75rem; } + .header nav .item-header a { + color: #fff; + text-decoration: none; } .header nav .item-header .icon-menu1 { color: #fff; - margin-right: 2rem; - margin-top: 7px; + margin-right: 16px; + margin-top: 8px; font-size: 1.62rem; cursor: pointer; } .header nav .btn { @@ -83,10 +81,12 @@ height: 56px; } #navLogo { - justify-content: flex-start; } + justify-content: center; + align-items: center; } #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } + margin-left: 10px; + margin-right: 16px; + margin-top: 12px; } #navbarSupportedContent { width: 100%; } @@ -129,10 +129,12 @@ height: 56px; } #navLogo { - justify-content: flex-start; } + justify-content: center; + align-items: center; } #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } + margin-left: 10px; + margin-right: 16px; + margin-top: 12px; } #navbarSupportedContent { width: 100%; } @@ -154,7 +156,7 @@ .header nav { height: 100%; } .header nav .item-header1 { - padding-left: 0px; + padding-left: 5px; padding-right: 0px; width: 10%; } .header nav .item-header1 .fotoLogo { @@ -175,10 +177,12 @@ height: 56px; } #navLogo { - justify-content: flex-start; } + justify-content: center; + align-items: center; } #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } + margin-left: 10px; + margin-right: 16px; + margin-top: 14px; } #navbarSupportedContent { width: 100%; } @@ -219,8 +223,8 @@ #navLogo { justify-content: flex-start; } #navLogo .icon-menu1 { - margin-left: 0px; - margin-right: 10px; } + margin-left: 5px; + margin-right: 5px; } #navbarSupportedContent { width: 100%; } @@ -273,11 +277,11 @@ display: none; } } @media (min-width: 768px) and (max-width: 991.98px) { .header { + position: absolute; width: 100%; left: 0rem; - height: 77.2px; } + height: 56px; } .header nav { - height: 100%; justify-content: space-between; } .header nav #navLogo { justify-content: space-between; } @@ -291,13 +295,14 @@ width: 87%; } .relleno-header { - height: 77.2px; } } + height: 56px; } } @media (min-width: 992px) { .header { + position: fixed; width: 100%; + left: 0px; + top: 0px; height: 56px; } - .header nav { - height: 100%; } .relleno-header { height: 56px; } } diff --git a/UyTube_web/web/css/header.css.map b/UyTube_web/web/css/header.css.map index 40502606c37ada3034423d48df52eb1d6371fdbd..d987e01281c761acbf6ce871e7f0d3f0c3932fd2 100644 --- a/UyTube_web/web/css/header.css.map +++ b/UyTube_web/web/css/header.css.map @@ -1,7 +1,7 @@ { "version": 3, -"mappings": "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", -"sources": ["../sass/header.sass","../sass/_colores.sass","../sass/_alturas.sass"], +"mappings": "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", +"sources": ["header.sass","_colores.sass","_alturas.sass"], "names": [], "file": "header.css" } \ No newline at end of file diff --git a/UyTube_web/web/sass/header.sass b/UyTube_web/web/css/header.sass similarity index 89% rename from UyTube_web/web/sass/header.sass rename to UyTube_web/web/css/header.sass index c89ac415644d8a406148a82bd4ca40b63369ed02..9a0211ba2e3be23e6af27634dbb6cff0a8d08699 100644 --- a/UyTube_web/web/sass/header.sass +++ b/UyTube_web/web/css/header.sass @@ -3,27 +3,24 @@ .header z-index: 9 - position: fixed - margin-top: 0px - margin-bottom: 0px + background-color: $colorHeaderMenuFooter + margin: 0px left: 0px - right: 0px - margin-left: auto - margin-right: auto + padding-left: 20px + padding-right: 20px //Estilos del nav nav - background-color: $colorHeaderMenuFooter display: flex flex-wrap: wrap - align-items: center justify-content: space-between - padding: 0.1rem 1rem + height: 100% + //padding: 0.1rem 1rem .item-header display: flex flex-wrap: wrap align-items: center justify-content: space-between - padding: 0rem 1rem + padding: 0rem 0rem .logo //width: 200px @@ -40,7 +37,6 @@ border-radius: 50% .formBuscar display: flex - width: 500px justify-content: center flex-wrap: nowrap input @@ -50,16 +46,16 @@ border-radius: 0.25rem font-size: 1rem padding: 0.375rem 0.75rem - - #header - //background-color: $colorHeaderMenuFooter - //display: none + a + color: $colorBlanco + text-decoration: none + //Estilos de icon del menú .icon-menu1 color: $colorBlanco - margin-right: 2rem - margin-top: 7px + margin-right: 16px + margin-top: 8px font-size: 1.62rem cursor: pointer //Estilos de los botones del header @@ -73,7 +69,7 @@ position: absolute width: 100% left: 0px - height: $alturaHeader388 + height: $alturaHeader340 nav height: 100% .item-header1 @@ -93,15 +89,17 @@ display: none #nombrePerfil display: none - //Espacio de relleno + //Espacio de relleno .relleno-header - height: $alturaHeader340 + height: $alturaHeader341 //Estilos del contenedor del logo #navLogo - justify-content: flex-start + justify-content: center + align-items: center .icon-menu1 - margin-left: 0px - margin-right: 10px + margin-left: 10px + margin-right: 16px + margin-top: 12px //Genera el espacio para dar lugar a el formulario de buscar #navbarSupportedContent width: 100% @@ -147,10 +145,12 @@ height: $alturaHeader341 //Estilos del contenedor del logo #navLogo - justify-content: flex-start + justify-content: center + align-items: center .icon-menu1 - margin-left: 0px - margin-right: 10px + margin-left: 10px + margin-right: 16px + margin-top: 12px //Genera el espacio para dar lugar a el formulario de buscar #navbarSupportedContent width: 100% @@ -175,7 +175,7 @@ nav height: 100% .item-header1 - padding-left: 0px + padding-left: 5px padding-right: 0px width: 10% .fotoLogo @@ -194,14 +194,15 @@ //Espacio de relleno .relleno-header height: $alturaHeader388 - //Espacio de relleno - .relleno-header + //Estilos del contenedor del logo #navLogo - justify-content: flex-start + justify-content: center + align-items: center .icon-menu1 - margin-left: 0px - margin-right: 10px + margin-left: 10px + margin-right: 16px + margin-top: 14px //Genera el espacio para dar lugar a el formulario de buscar #navbarSupportedContent width: 100% @@ -247,8 +248,8 @@ #navLogo justify-content: flex-start .icon-menu1 - margin-left: 0px - margin-right: 10px + margin-left: 5px + margin-right: 5px //Genera el espacio para dar lugar a el formulario de buscar #navbarSupportedContent width: 100% @@ -312,11 +313,12 @@ @media (min-width: 768px) and (max-width: 991.98px) //Estilos del header .header + position: absolute width: 100% left: 0rem height: $alturaHeader768 nav - height: 100% + //height: 100% justify-content: space-between //Estilos del contenedor del logo #navLogo @@ -337,12 +339,15 @@ // Large devices (deskheights, 992px and up) ======================================================================= @media (min-width: 992px) + //Estilos del header .header + position: fixed width: 100% + left: 0px + top: 0px height: $alturaHeader992 - nav - height: 100% + //Espacio de relleno .relleno-header height: $alturaHeader992 diff --git a/UyTube_web/web/css/menu.css b/UyTube_web/web/css/menu.css index ac6d7799dd374982bff5c85dcbdace03f819c2b6..47811081f36265dd6106658182bb9b6fc6e79abb 100644 --- a/UyTube_web/web/css/menu.css +++ b/UyTube_web/web/css/menu.css @@ -1,5 +1,4 @@ .menu { - position: fixed; max-height: 450px; z-index: 10; width: 0px; @@ -84,10 +83,12 @@ left: 0px; } } @media (min-width: 768px) and (max-width: 991.98px) { .menu { - top: 77.2px; + position: absolute; + top: 0px; left: 0px; } } @media (min-width: 992px) { .menu { + position: fixed; top: 56px; left: 0px; } } diff --git a/UyTube_web/web/css/menu.css.map b/UyTube_web/web/css/menu.css.map deleted file mode 100644 index 241cae346cc3ffe8a9ceb9a57ae4c510101b6fbe..0000000000000000000000000000000000000000 --- a/UyTube_web/web/css/menu.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "AAIA,KAAK;EACD,QAAQ,EAAE,KAAK;EACf,UAAU,EAAE,KAAK;EACjB,OAAO,EAAE,EAAE;EACX,KAAK,EAAE,GAAG;EACV,IAAI,EAAE,GAAG;EACT,WAAW,EAAE,IAAI;EAEjB,gBAAgB,ECHI,OAAO;EDI3B,QAAQ,EAAE,IAAI;EACd,UAAU,EAAE,SAAS;EACrB,QAAE;IACE,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,IAAI;IACX,iCAAe;MACX,UAAU,EAAE,mBAAqB;IAErC,gBAAO;MACH,UAAU,EAAE,MAAM;MAClB,OAAO,EAAE,MAAM;MACf,MAAM,EAAE,IAAI;MACZ,KAAK,ECtBV,OAAO;IDuBN,WAAE;MACE,UAAU,EAAE,WAAW;MACvB,gBAAgB,EAAE,OAAO;MACzB,OAAO,EAAE,KAAK;MACd,KAAK,EAAE,IAAI;MACX,iBAAK;QACD,MAAM,EAAE,IAAI;MAChB,uBAAW;QACP,KAAK,ECzBP,IAAI;QD0BF,MAAM,EAAE,qBAAqB;QAC7B,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;MACnB,gBAAI;QACA,UAAU,EAAE,MAAM;QAClB,KAAK,EAAE,IAAI;QACX,KAAK,EChCP,IAAI;QDiCF,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE,IAAI;QAElB,0BAAS;UACL,MAAM,EAAE,IAAI;UACZ,aAAa,EAAE,IAAI;MAE3B,aAAC;QACG,KAAK,ECzCP,IAAI;QD0CF,OAAO,EAAE,+BAA+B;QACxC,OAAO,EAAE,KAAK;QACd,eAAe,EAAE,IAAI;MAEzB,kBAAM;QACF,YAAY,EAAE,IAAI;;AAGlC,gBAAgB;EACZ,eAAe,EAAE,IAAI;EACrB,gBAAgB,ECjDP,SAAS;;ADmDtB,MAAM;EACF,KAAK,EAAE,SAAS;EAChB,IAAI,EAAE,GAAG;;AAGb,yBAAyB;EACrB,KAAK;IACD,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,IAAI;AAElB,gDAAgD;EAC5C,KAAK;IACD,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,GAAG;AAEjB,gDAAgD;EAC5C,KAAK;IACD,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,GAAG;AAGjB,mDAAmD;EAC/C,KAAK;IACD,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,GAAG;AAGjB,mDAAmD;EAC/C,KAAK;IACD,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,GAAG;AAIjB,mDAAmD;EAC/C,KAAK;IACD,GAAG,EE/FO,MAAM;IFgGhB,IAAI,EAAE,GAAG;AAMjB,yBAAyB;EACrB,KAAK;IACD,GAAG,EEtGO,IAAI;IFuGd,IAAI,EAAE,GAAG", -"sources": ["../sass/menu.sass","../sass/_colores.sass","../sass/_alturas.sass"], -"names": [], -"file": "menu.css" -} \ No newline at end of file diff --git a/UyTube_web/web/sass/menu.sass b/UyTube_web/web/css/menu.sass similarity index 97% rename from UyTube_web/web/sass/menu.sass rename to UyTube_web/web/css/menu.sass index c7bd39d64ad585a02891bedfaf8cecf53b35d0c9..18acbd5c35394348982678306bb44cd835fcb37e 100644 --- a/UyTube_web/web/sass/menu.sass +++ b/UyTube_web/web/css/menu.sass @@ -3,7 +3,6 @@ //Estilos del menu .menu - position: fixed max-height: 450px z-index: 10 width: 0px @@ -104,7 +103,8 @@ // Medium devices (tablets, 768px and up) @media (min-width: 768px) and (max-width: 991.98px) .menu - top: $alturaHeader768 + position: absolute + top: 0px left: 0px @@ -113,6 +113,7 @@ // Large devices (desktops, 992px and up) ======================================================================= @media (min-width: 992px) .menu + position: fixed top: $alturaHeader992 left: 0px diff --git a/UyTube_web/web/css/widget.css.map b/UyTube_web/web/css/widget.css.map deleted file mode 100644 index 6809672a81befd54c85aac22dc595b036e59ffc4..0000000000000000000000000000000000000000 --- a/UyTube_web/web/css/widget.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "AAGA,QAAQ;EACJ,gBAAgB,ECSH,OAAO;EDRpB,UAAU,EAAE,GAAG;EACf,OAAO,EAAE,IAAI;EACb,aAAa,EAAE,iBAA4B;EAE3C,oBAAW;IACP,MAAM,EAAE,IAAI;;AAUpB,oBAAoB;EAChB,OAAO,EAAE,IAAI;;AAGjB,yBAAyB;EACrB,QAAQ;IACJ,MAAM,EEVI,KAAK;IFWf,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,GAAG;IACnB,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,YAAY;IAC7B,aAAa,EAAE,MAAM;IACrB,kBAAS;MACL,KAAK,EAAE,IAAI;MACX,cAAc,EAAE,GAAG;MACnB,eAAe,EAAE,YAAY;MAC7B,WAAW,EAAE,MAAM;IACvB,kBAAS;MACL,KAAK,EAAE,IAAI;MACX,eAAe,EAAE,YAAY;AAGzC,gDAAgD;EAC5C,QAAQ;IACJ,MAAM,EE1BI,KAAK;IF2Bf,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,GAAG;IACnB,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,YAAY;IAC7B,aAAa,EAAE,MAAM;IACrB,kBAAS;MACL,KAAK,EAAE,IAAI;MACX,cAAc,EAAE,GAAG;MACnB,eAAe,EAAE,YAAY;MAC7B,WAAW,EAAE,MAAM;IACvB,kBAAS;MACL,KAAK,EAAE,IAAI;MACX,eAAe,EAAE,YAAY;AAGzC,gDAAgD;EAC5C,QAAQ;IACJ,MAAM,EE1CI,KAAK;IF2Cf,WAAW,EAAE,IAAI;IACjB,cAAc,EAAE,IAAI;IACpB,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,YAAY;IAC7B,aAAa,EAAE,MAAM;IACrB,kBAAS;MACL,KAAK,EAAE,IAAI;MACX,cAAc,EAAE,GAAG;MACnB,eAAe,EAAE,YAAY;MAC7B,WAAW,EAAE,MAAM;IACvB,kBAAS;MACL,KAAK,EAAE,IAAI;MACX,eAAe,EAAE,YAAY;AAGzC,mDAAmD;EAC/C,QAAQ;IACJ,MAAM,EE1DI,KAAK;IF2Df,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,YAAY;IAC7B,WAAW,EAAE,MAAM;IACnB,kBAAS;MACL,KAAK,EAAE,GAAG;MACV,cAAc,EAAE,GAAG;MACnB,eAAe,EAAE,YAAY;MAC7B,WAAW,EAAE,MAAM;IACvB,kBAAS;MACL,KAAK,EAAE,GAAG;MACV,OAAO,EAAE,IAAI;MACb,eAAe,EAAE,YAAY;AAGzC,mDAAmD;EAC/C,QAAQ;IACJ,MAAM,EEzEI,KAAK;IF0Ef,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,YAAY;IAC7B,WAAW,EAAE,MAAM;IACnB,kBAAS;MACL,KAAK,EAAE,GAAG;MACV,cAAc,EAAE,GAAG;MACnB,eAAe,EAAE,aAAa;MAC9B,WAAW,EAAE,MAAM;IACvB,kBAAS;MACL,KAAK,EAAE,GAAG;MACV,OAAO,EAAE,IAAI;MACb,eAAe,EAAE,aAAa;AAG1C,mDAAmD;EAC/C,QAAQ;IACJ,MAAM,EExFI,KAAK;IFyFf,KAAK,EAAE,IAAI;IACX,cAAc,EAAE,GAAG;IACnB,eAAe,EAAE,YAAY;IAC7B,WAAW,EAAE,MAAM;IACnB,kBAAS;MACL,KAAK,EAAE,GAAG;MACV,cAAc,EAAE,GAAG;MACnB,eAAe,EAAE,YAAY;MAC7B,WAAW,EAAE,MAAM;IACvB,kBAAS;MACL,KAAK,EAAE,GAAG;MACV,OAAO,EAAE,IAAI;MACb,cAAc,EAAE,GAAG;MACnB,eAAe,EAAE,MAAM;AAInC,yBAAyB;EACrB,QAAQ;IACJ,MAAM,EE1GI,KAAK;IF4Gf,YAAY,EAAE,IAAI;IAClB,aAAa,EAAE,IAAI;IACnB,eAAe,EAAE,YAAY;IAC7B,SAAS,EAAE,IAAI;IACf,aAAa,EAAE,MAAM;IACrB,oBAAW;MACP,MAAM,EAAE,IAAI;IAChB,kBAAS;MACL,KAAK,EAAE,KAAK;MACZ,OAAO,EAAE,IAAI;MACb,eAAe,EAAE,YAAY;IACjC,kBAAS;MACL,KAAK,EAAE,KAAK", -"sources": ["../sass/widget.sass","../sass/_colores.sass","../sass/_alturas.sass"], -"names": [], -"file": "widget.css" -} \ No newline at end of file diff --git a/UyTube_web/web/sass/widget.sass b/UyTube_web/web/css/widget.sass similarity index 100% rename from UyTube_web/web/sass/widget.sass rename to UyTube_web/web/css/widget.sass diff --git a/UyTube_web/web/imagenes/perfiles/jarrieta31.jpg b/UyTube_web/web/imagenes/perfiles/jarrieta31.jpg index d54ec04f4eee56374821fcfb9c9928a761cbc10b..421215cb9a5a007be104366f69efa5ea7277d5ea 100644 Binary files a/UyTube_web/web/imagenes/perfiles/jarrieta31.jpg and b/UyTube_web/web/imagenes/perfiles/jarrieta31.jpg differ diff --git a/UyTube_web/web/js/consultar-video.js b/UyTube_web/web/js/consultar-video.js index e979dee65288168cc7700e83342ac632e849c046..6987dfed7d47d5571b681b2fe8b24d37058e100e 100644 --- a/UyTube_web/web/js/consultar-video.js +++ b/UyTube_web/web/js/consultar-video.js @@ -84,6 +84,39 @@ $("#btnAgregarALista").on('click',function(){ }); }); +//boton agregar lista de reproduccion +$("#btnListarValoraciones").on('click',function(){ + // obtengo el id del video + var idVideo = $("#video").attr("value"); + // mando una peticion post a esa ruta con los parametros entre {}, + // y defino una funcion callback (ejecuta al recibir respuesta + $.post("/uytube/video-consultar", + { + accion: "listarValoraciones" , + idVideo: idVideo + }, function(respuesta, status){ + // esta variable contrendra el htm de las nuevas filas + var nuevasFilas = ''; + // esta variable es un array con los pares (usuario:valoracion) + // cada par viene en la respuesta separado por punto y coma + var filasObtenidas = respuesta.split(";"); + // itero sobre los elementos del array (el ultimo es vacio, por eso el -1) + for (var i = 0; i < filasObtenidas.length -1; i++){ + // esta variable es un array en cuyo indice 0 esta el nickname de un usuario y en el 1 su valoracion + var fila = (filasObtenidas[i]).split(":"); + // esta variable sera la fila procesada en esta iteracion, y contendra las dos celdas + var tr = ''; + tr += '<tr>\n'; + tr += '<td>' + fila[0] + '</td>\n'; + tr += '<td>' + fila[1] + '</td>\n'; + tr += '</tr>\n'; + // concatena la nueva fila con las filas ya procesadas + nuevasFilas += tr; + } + // reemplaza el contenido de la etiqueta <body> con los nuevos datos + $("#tblValoraciones-bodyRows").html(nuevasFilas); + }); +}); //Responeder comentarios, se dispara luego de la ventana modal var responderComentario = function(){ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-alta-video.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-alta-video.sassc deleted file mode 100644 index f0e8c48f1ba3e461b19f7451ce9c2c9c723f4337..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-alta-video.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-base.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-base.sassc deleted file mode 100644 index 8ff9d9d3e379aa392a3880df86db199ac5709098..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-base.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-buscar.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-buscar.sassc deleted file mode 100644 index 52db38f2ed4a362f5ddb9f3ba95f51aa390391e6..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-buscar.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-consulta-video.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-consulta-video.sassc deleted file mode 100644 index a3517db6a79796c5999a18078ffc3a7d394fa93d..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-consulta-video.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-index.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-index.sassc deleted file mode 100644 index 5fd3ad3dd99fecdcfa15b10cd1e3d16e33517fe8..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-index.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/footer.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/footer.sassc deleted file mode 100644 index dfe83a05ad576cb1d4c0175be385393743ef1df2..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/footer.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/header.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/header.sassc deleted file mode 100644 index 360ffeb90ab60bb9a5ebf318815d985c214d023d..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/header.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/menu.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/menu.sassc deleted file mode 100644 index efaf32b66cbfaa7089c14ddf56f7c87c558c50b9..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/menu.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/widget.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/widget.sassc deleted file mode 100644 index 88248952659f000048390fc580a3090fc1ff4726..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/widget.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/_colores.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/_colores.sassc deleted file mode 100644 index e3fb05e95168319737023e79f3818f4e98ebb9c3..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/_colores.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/body.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/body.sassc deleted file mode 100644 index fd602c5bf2dcccc1fafdda9309687c82c5ca94b7..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/body.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/contenido-alta-video.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/contenido-alta-video.sassc deleted file mode 100644 index a08e8f6674ce7a68765a1a3071d027f99f2d1164..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/contenido-alta-video.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/contenido-index.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/contenido-index.sassc deleted file mode 100644 index 5d4ee0794129c38e213b8d570e03e2599cc9f659..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/contenido-index.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/footer.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/footer.sassc deleted file mode 100644 index 7855c26f197e444a0cdfeb8a77b3cbe41cc444d8..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/footer.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/grid-main.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/grid-main.sassc deleted file mode 100644 index 1907353d86efdc37d7318928a4520579bb889d24..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/grid-main.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/header.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/header.sassc deleted file mode 100644 index a34de6629aecfd1049706882250c51dc6e6be476..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/header.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/menu.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/menu.sassc deleted file mode 100644 index 48374252b1915c47a5a1f1c1c256b1bfabc8f805..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/menu.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/mqueries-alta-video.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/mqueries-alta-video.sassc deleted file mode 100644 index 1125073f206152c8280716c3c0acef71f6684d29..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/mqueries-alta-video.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/mqueries-index.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/mqueries-index.sassc deleted file mode 100644 index 5a3d2b1fdb6236a65ce494662194e9ffea833246..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/mqueries-index.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/widget.sassc b/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/widget.sassc deleted file mode 100644 index 8783fa02700a55387d480c071c722c47d294ca4e..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/5255e67d43b13e1d631f3963eed9e45a0eadffc9/widget.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/_colores.sassc b/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/_colores.sassc deleted file mode 100644 index 4028a0b56f131ea8a6906c36b4c516c0ffbf2831..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/_colores.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/contenido-index.sassc b/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/contenido-index.sassc deleted file mode 100644 index bb4570c7ea6d7851ffc429574f5e441933163000..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/contenido-index.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/header.sassc b/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/header.sassc deleted file mode 100644 index f350cc4d0ed152f73e2972fccaeca755726a5ae2..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/header.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/menu.sassc b/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/menu.sassc deleted file mode 100644 index 6921f269a38fbde235cc217983c496ce74f66845..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/70e12d6de6b866eb0515ccb36aefe54ac1796edf/menu.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/_colores.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/_colores.sassc deleted file mode 100644 index 58f6db87127664d47bc912f88aa3c54ba30d8052..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/_colores.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/body.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/body.sassc deleted file mode 100644 index edbfdbffb0d9c6ba4ff8459f6eef59bd1095ec52..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/body.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/contenido-alta-video.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/contenido-alta-video.sassc deleted file mode 100644 index 3d7a0aed52da44ab988d5b78d7583e8c1ac22432..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/contenido-alta-video.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/contenido-index.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/contenido-index.sassc deleted file mode 100644 index 2fba8e6922d21c023cb2376c879c5b9cd70f3924..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/contenido-index.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/footer.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/footer.sassc deleted file mode 100644 index 852d8f06a4d2690a78e4800a1624192a53687327..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/footer.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/grid-main.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/grid-main.sassc deleted file mode 100644 index 4b6e6400909f02f86674e0aebbf1b7a0513aaa5e..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/grid-main.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/header.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/header.sassc deleted file mode 100644 index c7b029e0b3809d3f89f921bdbcc59f380599696d..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/header.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/menu.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/menu.sassc deleted file mode 100644 index ec4b66a770fd94ba376b10de046d71eb3ce3a5a9..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/menu.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/mqueries-alta-video.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/mqueries-alta-video.sassc deleted file mode 100644 index a4f6c75959257c0f6c90e2934b6e79f5d830d67d..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/mqueries-alta-video.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/mqueries-index.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/mqueries-index.sassc deleted file mode 100644 index c96e6e0d29cb9af4e5aa1c1f1659a939639c174e..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/mqueries-index.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/principal.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/principal.sassc deleted file mode 100644 index 0c5d018aa49c23199aea3a604c84e8841a20dcd1..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/principal.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/widget.sassc b/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/widget.sassc deleted file mode 100644 index e7f1d213b1b09d7c09905b3d1f58a734d0dbbbbb..0000000000000000000000000000000000000000 Binary files a/UyTube_web/web/sass/.sass-cache/d2a90a38b75cce8589f0f79f47357b4229081906/widget.sassc and /dev/null differ diff --git a/UyTube_web/web/sass/_ b/UyTube_web/web/sass/_ deleted file mode 100644 index 8a37492bd9de17ab3b39d197ceffc5fb353bff29..0000000000000000000000000000000000000000 --- a/UyTube_web/web/sass/_ +++ /dev/null @@ -1,9 +0,0 @@ -.footer { - grid-column: 1/1; - grid-row: 3/4; - background-color: #00001a; - padding: 0.9rem; - margin-bottom: 0px; - color: #fff; } - -/*# sourceMappingURL=:.map */ diff --git a/UyTube_web/web/sass/compilar_consulta-video b/UyTube_web/web/sass/compilar_consulta-video deleted file mode 100644 index 33c8122e244082bf41c095e8ed073c7914a31f11..0000000000000000000000000000000000000000 --- a/UyTube_web/web/sass/compilar_consulta-video +++ /dev/null @@ -1,9 +0,0 @@ -sass --watch \ - body.sass:../css/body.css \ - header.sass:../css/header.css \ - principal.sass:../css/principal.css \ - contenido-consulata-video2.sass:../css/contenido-consulta-video.css \ - menu.sass:../css/menu.css grid.sass:../css/grid.css \ - widget.sass:../css/widget.css \ - footer.sass:../css/footer.css \ - mqueries-consulta-video2.sass:../css/mqueries-consulta-video.css; diff --git a/UyTube_web/web/sass/compilar_index b/UyTube_web/web/sass/compilar_index deleted file mode 100644 index 16e3894200db9c3adfc8e9087361a294e0682fd8..0000000000000000000000000000000000000000 --- a/UyTube_web/web/sass/compilar_index +++ /dev/null @@ -1,7 +0,0 @@ -sass --watch \ - body.sass:../css/body.css \ - header.sass:../css/header.css \ - contenido-index.sass:../css/contenido-index.css \ - menu.sass:../css/menu.css \ - widget.sass:../css/widget.css \ - footer.sass:../css/footer.css ; diff --git a/UyTube_web/web/sass/contenido-alta-video.sass b/UyTube_web/web/sass/contenido-alta-video.sass deleted file mode 100644 index 63a7342180f3169a3ede3fe60c88bc3c9915e79f..0000000000000000000000000000000000000000 --- a/UyTube_web/web/sass/contenido-alta-video.sass +++ /dev/null @@ -1,427 +0,0 @@ -@import _colores - -.principal - background-color: $colorGrisClaro - min-height: 800px - border-bottom: 2px solid $colorCelesteClaro - border-top: 2px solid $colorCelesteClaro - -.contenido - background-color: $colorGrisClaro - border-radius: 5px - padding: 16px - margin-left: auto - margin-right: auto - width: 70% - height: 100% - .contenido-flexible - background-color: $colorGrisClaro - margin-bottom: 16px - display: flex - flex-direction: row - justify-content: center - flex-wrap: wrap - flex-grow: 0 - flex-shrink: 0 - h3 - width: 100% - margin: 0.625rem - text-decoration: underline - .form-alta-video - width: 100% - padding: 16px - - - -// Para un maximo de 340px ================================================================================ -@media (max-width: 340px) - .container-fluid - padding-left: 0px - padding-right: 0px - .header - width: 100% - left: 0px - height: 175.112px - nav - height: 175.112px - .item-header2 - order: 3 - width: 100% - //Espacio de relleno - .relleno-header - height: 175.112px - //Estilos del contenedor del logo - #navLogo - justify-content: flex-start - .icon-menu1 - margin-left: 0px - margin-right: 10px - //Genera el espacio para dar lugar a el formulario de buscar - #navbarSupportedContent - width: 100% - //Estilos de formulario buscar - #formBuscar - display: flex - justify-content: space-between - width: 100% - input - width: 100% - //Oculta el boton buscar - #btnBuscar - display: none - .menu - top: -171.112px - .contenido - width: 100% - .contenido-flexible - width: 100% - justify-content: center - .widgets - height: 170px - padding-top: 5px - padding-bottom: 5px - flex-direction: column - justify-content: space-around - align-content: center - .widget-1 - width: 100% - flex-direction: row - justify-content: space-around - align-items: center - .widget-2 - width: 100% - justify-content: space-around - -// Para dispositivos mayores a 340 y menores a 388 ============================================================== -@media (min-width: 341px) and (max-width: 387px) - .container-fluid - padding-left: 0px - padding-right: 0px - //Estilos del header - .header - width: 100% - height: 175.112px - left: 0px - nav - height: 175.112px - .item-header2 - order: 3 - width: 100% - //Espacio de relleno - .relleno-header - height: 175.112px - //Estilos del contenedor del logo - #navLogo - justify-content: flex-start - .icon-menu1 - margin-left: 0px - margin-right: 10px - //Genera el espacio para dar lugar a el formulario de buscar - #navbarSupportedContent - width: 100% - //Estilos de formulario buscar - #formBuscar - display: flex - justify-content: space-between - width: 100% - input - width: 100% - //Oculta el boton buscar - #btnBuscar - display: none - - //estilos del contenido principal - .contenido - width: 100% - .contenido-flexible - width: 100% - justify-content: center - .widgets - height: 170px - padding-top: 5px - padding-bottom: 5px - flex-direction: column - justify-content: space-around - align-content: center - .widget-1 - width: 100% - flex-direction: row - justify-content: space-around - align-items: center - .widget-2 - width: 100% - justify-content: space-around -// Para dispositivos mayores a 387 y menores a 500 ================================================================ -@media (min-width: 388px) and (max-width: 500px) - .container-fluid - padding-left: 0px - padding-right: 0px - //Estilos del header - .header - width: 100% - left: 0px - height: 127.176px - nav - height: 127.176px - .item-header2 - order: 3 - width: 100% - //Espacio de relleno - .relleno-header - height: 127.176px - //Espacio de relleno - .relleno-header - //Estilos del contenedor del logo - #navLogo - justify-content: flex-start - .icon-menu1 - margin-left: 0px - margin-right: 10px - //Genera el espacio para dar lugar a el formulario de buscar - #navbarSupportedContent - width: 100% - //Estilos de formulario buscar - #formBuscar - display: flex - justify-content: space-between - width: 100% - input - width: 100% - //Oculta el boton buscar - #btnBuscar - display: none - - //estilos del contenido principal - .contenido - width: 100% - .contenido-flexible - width: 100% - justify-content: center - .h3 - width: 90% - .widgets - height: 180px - padding-top: 10px - padding-bottom: 10px - flex-direction: column - justify-content: space-around - align-content: center - .widget-1 - width: 100% - flex-direction: row - justify-content: space-around - align-items: center - .widget-2 - width: 100% - justify-content: space-around - - -// Extra small devices (portrait phones, less than 576px) ======================================================= -@media (min-width: 501px) and (max-width: 575.98px) - .container-fluid - padding-left: 0px - padding-right: 0px - //Estilos del header - .header - width: 100% - left: 0px - height: 129.176px - nav - height: 129.176px - .item-header2 - order: 3 - width: 100% - //Espacio de relleno - .relleno-header - height: 129.176px - //Estilos del contenedor del logo - #navLogo - justify-content: flex-start - .icon-menu1 - margin-left: 0px - margin-right: 10px - //Genera el espacio para dar lugar a el formulario de buscar - #navbarSupportedContent - width: 100% - //Estilos de formulario buscar - #formBuscar - display: flex - justify-content: space-between - width: 100% - input - width: 100% - //Oculta el boton buscar - #btnBuscar - display: none - - //Estilos del contenido principal - .contenido - width: 100% - .contenido-flexible - width: 100% - justify-content: center - - .widgets - height: 180px - flex-direction: column - justify-content: space-around - align-items: center - .widget-1 - width: 80% - flex-direction: row - justify-content: space-around - align-items: center - .widget-2 - width: 70% - display: flex - justify-content: space-around - .footer - padding: 1rem 0.625rem - - -// Small devices (landscape phones, 576px and up) ================================================================ -@media (min-width: 576px) and (max-width: 767.98px) - .container-fluid - padding-left: 0px - padding-right: 0px - //Estilos del header - .header - width: 100% - left: 0rem - height: 124.117px - .nav - height: 124.117px - .item-header2 - order: 3 - width: 100% - //Espacio de relleno - .relleno-header - height: 124.117px - //Estilos del contenedor del logo - #navLogo - justify-content: flex-start - //Genera el espacio para el formulario de buscar - #navbarSupportedContent - width: 100% - #formBuscar - display: flex - justify-content: space-between - width: 100% - input - width: 87% - //Estilos del contenido principal - .contenido - width: 100% - .contenido-flexible - width: 100% - justify-content: center - .widgets - height: 160px - flex-direction: column - justify-content: space-around - align-items: center - .widget-1 - width: 60% - flex-direction: row - justify-content: space-between - align-items: center - .widget-2 - width: 60% - display: flex - justify-content: space-between - .footer - padding: 1rem 0.625rem - - -// Medium devices (tablets, 768px and up) -@media (min-width: 768px) and (max-width: 991.98px) - .container-fluid - padding-left: 0px - padding-right: 0px - //Estilos del header - .header - width: 100% - left: 0rem - height: 77.2px - nav - height: 77.2px - justify-content: space-between - //Estilos del contenedor del logo - #navLogo - justify-content: space-between - //Genera el espacio para el formulario de buscar - #navbarSupportedContent - width: 100% - #formBuscar - display: flex - justify-content: space-between - width: 100% - input - width: 87% - //Espacio de relleno - .relleno-header - height: 77.2px - - //Estilos del contenido principal - .contenido - width: 100% - .contenido-flexible - width: 100% - justify-content: center - .widgets - height: 100px - width: 100% - flex-direction: row - justify-content: space-around - align-items: center - .widget-1 - width: 50% - flex-direction: row - justify-content: space-around - align-items: center - .widget-2 - width: 30% - display: flex - flex-direction: row - justify-content: center - .footer - padding: 1rem 0.625rem - - - -// Large devices (desktops, 992px and up) ======================================================================= -@media (min-width: 992px) - //Estilos del header - .header - width: 98% - height: 56px - nav - height: 56px - //Espacio de relleno - .relleno-header - height: 56px - //Estilos del contenido principal - .contenido - width: 70% - .widgets - height: 123px - //height: 223px - padding-left: 30px - padding-right: 30px - justify-content: space-around - flex-wrap: wrap - align-content: center - .img-widget - height: 83px - .widget-1 - width: 460px - display: flex - justify-content: space-around - .widget-2 - width: 350px - //Estilos del footer - .footer - - - - \ No newline at end of file