Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
63c9793
Primer commit de la parte de perfil de usuario
mvilcaqui Jul 5, 2025
20fe9ca
Creacion de la estructura basica de modulo perfil
mvilcaqui Jul 5, 2025
fc71cd3
se añadio estilos e iconos para el modulo perfil
mvilcaqui Jul 5, 2025
da27832
se añadio datos del usuario en el perfil
mvilcaqui Jul 5, 2025
07c5be9
se agrego la funcionalidad de edicion y guardado en el perfil
mvilcaqui Jul 5, 2025
7f12ce1
se añadio el icono de usuario en perfil
mvilcaqui Jul 5, 2025
64f2fe0
avance de funcionalidad de foto de perfil
mvilcaqui Jul 5, 2025
1f2131e
se añadio subir imagen de usuario
mvilcaqui Jul 5, 2025
df8ad8e
Agrega forma para identificar error en sql
gchambillaala Jul 5, 2025
243fc58
División de archivos para una mejor lectura
gchambillaala Jul 5, 2025
e008e27
Vista perfil
alemaal Jul 5, 2025
fc84fee
Vista perfil
alemaal Jul 5, 2025
5994904
Vista perfil
alemaal Jul 5, 2025
93635c2
Estructura del perfil
alemaal Jul 5, 2025
31f7525
Se agrego seccion biografia
alemaal Jul 5, 2025
9655fcd
Diseño y usabilidad del perfil
alemaal Jul 5, 2025
6d26cc9
Modificaion para evitar inyeccion SQL
gchambillaala Jul 6, 2025
b055bde
Arreglo de error para la consulta
gchambillaala Jul 6, 2025
cda64fe
Mejora en backend para consulta de usuario 1
gchambillaala Jul 6, 2025
46681ac
Comentario para error SQL
gchambillaala Jul 6, 2025
52d2e39
Solucion de error para la consulta
gchambillaala Jul 6, 2025
c15bff1
Version 1.0.0 incluye modulo perfil
mvilcaqui Jul 6, 2025
e90c470
Separacion de codigo css en otro archivos y creacion de carpeta
gchambillaala Jul 12, 2025
e36a8e6
Separacion codigo js
gchambillaala Jul 12, 2025
ec4e43d
Se añadio funcion asistencia
gchambillaala Jul 12, 2025
b95bc41
Asistencia interfaz basico
gchambillaala Jul 12, 2025
e0a66b2
Interfaz asistencia terminada
gchambillaala Jul 12, 2025
b325c57
Cambio de nombre carpeta
gchambillaala Jul 12, 2025
ca5cf9b
Interfaz asistencia mejorada
gchambillaala Jul 12, 2025
73b95a7
Datos random
gchambillaala Jul 12, 2025
ad6a02e
carpeta asistencia movida dentro de pagina web
gchambillaala Jul 12, 2025
0b35517
Pequeño cambio en tabla
gchambillaala Jul 12, 2025
f40872b
Perfil foto
gchambillaala Jul 12, 2025
fc9a894
Merge remote-tracking branch 'origin/rama-grver' into rama_maricielo
mvilcaqui Jul 13, 2025
472bacc
estructura base calendario - primer commit
mvilcaqui Jul 13, 2025
6412f00
se añadio boton para seleccionar mes y agregar curso
mvilcaqui Jul 13, 2025
ba511b1
se añadio modal para añadir, editar y eliminar curso
mvilcaqui Jul 13, 2025
66b3c3c
estructura visual del calendario mensual
mvilcaqui Jul 13, 2025
a9ef97a
estructura de calendario estable
mvilcaqui Jul 13, 2025
631329e
Inicialización de FullCalendar y lectura de eventos
mvilcaqui Jul 13, 2025
4258da5
Habilitar creación de cursos al hacer clic
mvilcaqui Jul 13, 2025
c4b1e71
Permitir editar cursos haciendo clic en eventos existentes
mvilcaqui Jul 13, 2025
672b41b
Guardar y eliminar cursos con persistencia
mvilcaqui Jul 13, 2025
b93541c
cambios finales en funcionalidades del calendario
mvilcaqui Jul 13, 2025
809228b
estilos visuales en calendario
mvilcaqui Jul 13, 2025
0a9663f
correcciones visuales en calendario
mvilcaqui Jul 13, 2025
a9acee7
se arreglo error de que calendario se muestre en otras secciones
mvilcaqui Jul 13, 2025
020db7b
icono de calendario en el apartado de secciones corregido
mvilcaqui Jul 13, 2025
2c79391
Merge remote-tracking branch 'origin/rama_maricielo' into rama-grver
grverlearner Jul 14, 2025
0fecaef
Merge remote-tracking branch 'origin/main' into rama-grver
gchambillaala Jul 14, 2025
adc45de
Carpeta PRODIGIOS
gchambillaala Jul 14, 2025
645185d
Archivos sql
gchambillaala Jul 14, 2025
fa21e40
crear e insertar datos sql
gchambillaala Jul 14, 2025
b817f33
Cambio nombre base de datos
gchambillaala Jul 14, 2025
f8d0af9
Moficacion insertaDatos NO Credenciales
gchambillaala Jul 14, 2025
7379a40
Implementacion de aparaciion de nombre de ususario
gchambillaala Jul 14, 2025
e2e3911
Conteo cursos, profesores, estudiantes, clases DASHBOARD
grverlearner Jul 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
867 changes: 867 additions & 0 deletions PAGINA WEB/ASISTENCIA/cambios-as.css

Large diffs are not rendered by default.

842 changes: 842 additions & 0 deletions PAGINA WEB/ASISTENCIA/cambios-as.html

Large diffs are not rendered by default.

941 changes: 941 additions & 0 deletions PAGINA WEB/ASISTENCIA/cambios-as.js

Large diffs are not rendered by default.

2,375 changes: 2,375 additions & 0 deletions PAGINA WEB/ASISTENCIA/cambios_of.html

Large diffs are not rendered by default.

Binary file added PAGINA WEB/ASISTENCIA/user.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion PAGINA WEB/conexion.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
$host = "localhost";
$usuario = "root";
$contraseña = "";
$contraseña = "382004";
$nombreBaseDeDatos = "escuela_canto";

$conn = new mysqli($host, $usuario, $contraseña, $nombreBaseDeDatos);
Expand Down
30 changes: 29 additions & 1 deletion PAGINA WEB/main.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="es">
<head>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>PRODIGIOS</title>
Expand Down Expand Up @@ -232,12 +233,39 @@
background: #007bff;
color: #ffffff;
}
.profile-icon {
position: absolute;
top: 15px;
right: 20px;
font-size: 26px;
color: white;
z-index: 1101;
background: transparent;
border: none;
}

.profile-icon a {
color: white;
text-decoration: none;
}

.profile-icon a:hover {
color: #ffcc00;
}

</style>
</head>
<body>
<!-- Navbar -->
<header class="navbar" id="navbar-title">Bienvenido</header>
<header class="navbar">
<span id="navbar-title">Bienvenido</span>
<div class="profile-icon">
<a href="perfil.php" title="Mi Perfil">
<i class="fas fa-user-circle"></i>
</a>
</div>
</header>

<!-- Sidebar -->
<aside class="sidebar">
<h2>PRODIGIOS</h2>
Expand Down
59 changes: 46 additions & 13 deletions PAGINA WEB/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<!DOCTYPE html>
<html lang="es">
<head>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>PRODIGIOS</title>
Expand All @@ -28,18 +29,23 @@
background-color: #ecf0f1;
}
/* Navbar */
.navbar {
position: fixed;
top: 0;
left: 0;
width: 100%;
background-color: #2c3e50;
color: white;
padding: 20px 20px;
font-size: 18px;
font-weight: bold;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
z-index: 2000; /* más alto que el sidebar o cualquier contenido */
}
.navbar {
position: fixed;
top: 0;
left: 0;
width: 100%;
background-color: #2c3e50;
color: white;
padding: 20px 20px;
font-size: 18px;
font-weight: bold;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
z-index: 1000;
display: flex;
justify-content: space-between;
align-items: center;
}

/* Sidebar */
Expand Down Expand Up @@ -235,12 +241,39 @@
background: #007bff;
color: #ffffff;
}
.profile-icon {
position: absolute;
top: 15px;
right: 20px;
font-size: 26px;
color: white;
z-index: 1101;
background: transparent;
border: none;
}

.profile-icon a {
color: white;
text-decoration: none;
}

.profile-icon a:hover {
color: #ffcc00;
}

</style>
</head>
<body>
<body>
<!-- Navbar -->
<header class="navbar" id="navbar-title">Bienvenido</header>
<header class="navbar">
<span id="navbar-title">Bienvenido</span>
<div class="profile-icon">
<a href="perfil.php" title="Mi Perfil">
<i class="fas fa-user-circle"></i>
</a>
</div>
</header>

<!-- Sidebar -->
<aside class="sidebar">
<h2>PRODIGIOS</h2>
Expand Down
253 changes: 253 additions & 0 deletions PAGINA WEB/perfil.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
body {
margin: 0;
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
background-color: #f4f7fa;
color: #34495e;
}

/* Navbar */
.navbar {
position: fixed;
top: 0;
left: 0;
width: 100%;
background: linear-gradient(90deg, #34495e, #2c3e50);
color: #ecf0f1;
padding: 16px 24px;
font-size: 20px;
font-weight: 700;
z-index: 1000;
display: flex;
justify-content: space-between;
align-items: center;
box-shadow: 0 2px 8px rgba(0,0,0,0.15);
}

.profile-icon {
font-size: 28px;
}

.profile-icon a {
color: #ecf0f1;
transition: color 0.3s ease;
}

.profile-icon a:hover {
color: #1abc9c;
}

/* Sidebar */
.sidebar {
position: fixed;
top: 60px;
left: 0;
width: 240px;
height: calc(100% - 60px);
background-color: #2c3e50;
color: #ecf0f1;
padding-top: 30px;
box-shadow: 2px 0 8px rgba(0,0,0,0.1);
transition: width 0.3s ease;
}

.sidebar h2 {
text-align: center;
font-size: 24px;
margin-bottom: 30px;
letter-spacing: 1.5px;
font-weight: 800;
}

.sidebar .menu {
list-style: none;
padding: 0;
margin: 0;
}

.sidebar .menu li a {
display: flex;
align-items: center;
padding: 14px 24px;
color: #ecf0f1;
text-decoration: none;
font-weight: 600;
font-size: 16px;
border-left: 4px solid transparent;
transition: background-color 0.3s, border-color 0.3s;
}

.sidebar .menu li a i {
margin-right: 12px;
font-size: 18px;
}

.sidebar .menu li a:hover,
.sidebar .menu li a.active {
background-color: #1abc9c;
border-left-color: #16a085;
color: white;
}

/* Main content */
.main-content {
margin-left: 240px;
margin-top: 80px;
padding: 30px 40px;
background: #fff;
min-height: calc(100vh - 80px);
}

/* Profile card */
.profile-card {
max-width: 550px;
margin: auto;
background: #ffffff;
border-radius: 12px;
padding: 40px 35px;
box-shadow: 0 8px 20px rgba(0,0,0,0.1);
transition: box-shadow 0.3s ease;
}

.profile-card:hover {
box-shadow: 0 12px 30px rgba(0,0,0,0.15);
}

.profile-card h2 {
text-align: center;
color: #2c3e50;
font-weight: 700;
margin-bottom: 25px;
letter-spacing: 1.2px;
}

.profile-avatar {
text-align: center;
margin-bottom: 30px;
position: relative;
}

#avatarPreview {
width: 130px;
height: 130px;
border-radius: 50%;
object-fit: cover;
display: none;
box-shadow: 0 0 8px rgba(26, 188, 156, 0.5);
}

.default-icon {
font-size: 110px;
color: #16a085;
transition: color 0.3s ease;
}

.profile-avatar:hover .default-icon {
color: #1abc9c;
}

.custom-file-input {
display: none;
}

.custom-label {
display: inline-block;
background-color: #16a085;
color: white;
padding: 10px 18px;
border-radius: 8px;
cursor: pointer;
font-weight: 600;
font-size: 14px;
margin-top: 15px;
transition: background-color 0.3s ease;
}

.custom-label:hover {
background-color: #1abc9c;
}

/* Profile info */
.profile-info {
margin-bottom: 20px;
}

.profile-info label {
display: block;
font-weight: 700;
color: #34495e;
margin-bottom: 8px;
font-size: 15px;
}

.profile-info input,
.profile-info textarea {
width: 100%;
padding: 12px 15px;
border: 1.8px solid #ccc;
border-radius: 8px;
font-size: 15px;
transition: border-color 0.3s ease, box-shadow 0.3s ease;
resize: vertical;
background-color: #fafafa;
}

.profile-info input:focus,
.profile-info textarea:focus {
border-color: #16a085;
box-shadow: 0 0 8px rgba(22, 160, 133, 0.3);
outline: none;
background-color: #fff;
}

/* Buttons */
.buttons {
text-align: center;
margin-top: 30px;
}

.buttons button {
padding: 12px 25px;
border: none;
margin: 0 8px;
border-radius: 25px;
cursor: pointer;
font-weight: 700;
font-size: 15px;
transition: background-color 0.3s ease, transform 0.2s ease;
box-shadow: 0 3px 8px rgba(22, 160, 133, 0.3);
color: white;
}

.edit-btn {
background-color: #2980b9;
}

.edit-btn:hover {
background-color: #3498db;
transform: scale(1.05);
}

.save-btn {
background-color: #27ae60;
display: none;
}

.save-btn:hover {
background-color: #2ecc71;
transform: scale(1.05);
}

.cancel-btn {
background-color: #7f8c8d;
display: none;
}

.cancel-btn:hover {
background-color: #95a5a6;
transform: scale(1.05);
}

/* Hover effect for all buttons */
.buttons button:hover {
opacity: 0.9;
}
Loading