Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
852bd97
instalando librerias back-end
JuanjoVillarejo Nov 2, 2025
ce5784a
importado User
JuanjoVillarejo Nov 3, 2025
dcdf090
tabla models User Activity Message
JuanjoVillarejo Nov 3, 2025
4fd57e5
password gmail
JuanjoVillarejo Nov 4, 2025
1232afa
prueba exito enviar correo end point
JuanjoVillarejo Nov 4, 2025
1b7c9ab
actualizando models
JuanjoVillarejo Nov 5, 2025
2a4ca0d
revisando models
JuanjoVillarejo Nov 5, 2025
be30472
[Tareas BACKEND-LOGIN / REGISTER / USER listas]
Sergioalv15 Nov 5, 2025
af21576
Merge branch 'develop' into develop-Sergio
Sergioalv15 Nov 6, 2025
ca5214f
Merge pull request #2 from 4GeeksAcademy/develop-Sergio
Sergioalv15 Nov 6, 2025
2d4d4b9
UserProfile
JuanjoVillarejo Nov 6, 2025
6365eae
Merge pull request #3 from 4GeeksAcademy/UserProfile-front-juanjo
JuanjoVillarejo Nov 6, 2025
c06885f
profile y editProfile
JuanjoVillarejo Nov 6, 2025
12da920
Merge pull request #4 from 4GeeksAcademy/EditProfile-front-juanjo
JuanjoVillarejo Nov 6, 2025
a3d8167
Añadidos Login, Register, Forgot, Layout, AuthNotice, AuthShell, inde…
SashaGIT2904 Nov 7, 2025
c783033
prueba boceto home
JuanjoVillarejo Nov 7, 2025
e5a649b
Añadidos Login, Register, Forgot, Layout, AuthNotice, AuthShell,TextI…
SashaGIT2904 Nov 7, 2025
ed95a9d
Añadidos Login, Register, Forgot, Layout, AuthNotice, AuthShell,TextI…
SashaGIT2904 Nov 7, 2025
6035f97
Merge branch 'develop' into develop-sasha
SashaGIT2904 Nov 7, 2025
4dd2f6c
Merge pull request #5 from 4GeeksAcademy/develop-sasha
SashaGIT2904 Nov 7, 2025
58354fa
[AGREGADO LOGIN Y REGISTRO A DB]
Sergioalv15 Nov 9, 2025
1b8f5a8
[agregado/unido login y register al db]
Sergioalv15 Nov 9, 2025
c5d6109
[login, register y user unidos/integrados]
Sergioalv15 Nov 9, 2025
91dbdc9
clave API google Maps e instalación dependecias
JuanjoVillarejo Nov 10, 2025
0f2f5f7
mostrando maps /map
JuanjoVillarejo Nov 10, 2025
a362b91
falta endPoint activity
JuanjoVillarejo Nov 10, 2025
fe1b5da
Merge pull request #8 from 4GeeksAcademy/MapView-front-juanjo
JuanjoVillarejo Nov 10, 2025
f207140
front-fetch activity mapsView
JuanjoVillarejo Nov 10, 2025
ef5d61e
Merge pull request #9 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 10, 2025
270087e
Añadidos Reset y Modificado el Forgot, routes
SashaGIT2904 Nov 10, 2025
740b052
Añadidos Reset y Modificado el Forgot, routes
SashaGIT2904 Nov 10, 2025
d3d9a43
[Login y register terminado]
Sergioalv15 Nov 10, 2025
90700a7
Añadidos Reset y Modificado el Forgot, routes
SashaGIT2904 Nov 10, 2025
ef2f00a
Merge branch 'develop' of https://github.com/4GeeksAcademy/Proyecto_F…
Sergioalv15 Nov 10, 2025
8670867
Merge branch 'develop' into develop-sasha
SashaGIT2904 Nov 10, 2025
46e45e9
Merge pull request #10 from 4GeeksAcademy/develop-sasha
SashaGIT2904 Nov 10, 2025
d0df71e
[Dios soy yo de nuevo]
Sergioalv15 Nov 10, 2025
ff2023d
Merge branch 'develop' of https://github.com/4GeeksAcademy/Proyecto_F…
Sergioalv15 Nov 10, 2025
4f1d922
ver maps y crear actividad OK
JuanjoVillarejo Nov 12, 2025
e8e863b
Merge pull request #11 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 12, 2025
5f6a5be
actualizando rutas de profile y editProfile
JuanjoVillarejo Nov 12, 2025
2cf5fdf
Merge branch 'develop' into develop-juanjo
JuanjoVillarejo Nov 12, 2025
ede64ed
Merge pull request #13 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 12, 2025
338f903
Añadidos métodos PUT y DELETE
SashaGIT2904 Nov 14, 2025
9228953
Merge pull request #14 from 4GeeksAcademy/develop-sasha
SashaGIT2904 Nov 14, 2025
aacacd4
reporte y bloqueo user endpoint
JuanjoVillarejo Nov 14, 2025
2fd453f
endpoint bloqueo y reporte user
JuanjoVillarejo Nov 14, 2025
8a07928
Merge branch 'develop' into develop-juanjo
JuanjoVillarejo Nov 14, 2025
5426f2f
Merge pull request #15 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 14, 2025
14cbd87
Resolved conflicts and updated develop
NatiSen Nov 14, 2025
e1cb3d6
[Agregado funcion borrar usuario]
Sergioalv15 Nov 14, 2025
680be32
Merge remote-tracking branch 'origin/develop' into sergio-develop-def…
Sergioalv15 Nov 14, 2025
ef91ed0
Merge pull request #16 from 4GeeksAcademy/sergio-develop-definitivo
Sergioalv15 Nov 14, 2025
7c9fc44
Update
NatiSen Nov 14, 2025
2c3891a
Merge pull request #17 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 14, 2025
816e816
[Accesibilidad Usuario]
Sergioalv15 Nov 15, 2025
2c59dd7
[Accesibilidad Usuario]
Sergioalv15 Nov 15, 2025
9d4de4d
Update
NatiSen Nov 15, 2025
3fb5cf8
Merge branch 'develop' into Develop-Natalia
NatiSen Nov 15, 2025
24eae6f
Added changes: authshell, assets, css files and more
NatiSen Nov 16, 2025
665cc2c
Merge pull request #19 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 16, 2025
5aaa030
Procesos Sasha app.py
SashaGIT2904 Nov 16, 2025
8d29036
endpoint activity
JuanjoVillarejo Nov 17, 2025
a96aea4
Merge branch 'develop' into develop-juanjo
JuanjoVillarejo Nov 17, 2025
069b141
Merge pull request #20 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 17, 2025
3b8f254
[]
Sergioalv15 Nov 17, 2025
84cc3f7
[Vista de Usuario completa front end]
Sergioalv15 Nov 17, 2025
87c1d5d
ajustando estilos de map y crear actividad
JuanjoVillarejo Nov 17, 2025
d98cbf5
Merge pull request #21 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 17, 2025
5b10d14
Añadidos Get USER y GET USERS
SashaGIT2904 Nov 17, 2025
f5b7d3e
Añadidos Get USER y GET USERS
SashaGIT2904 Nov 17, 2025
29b2459
Merge pull request #22 from 4GeeksAcademy/develop-sasha
SashaGIT2904 Nov 17, 2025
c22e7e3
Update
NatiSen Nov 17, 2025
5ff7390
Merge pull request #23 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 17, 2025
840a5b3
Merge branch 'develop' into Develop-Natalia
NatiSen Nov 17, 2025
07cf50e
Update
NatiSen Nov 17, 2025
aa20cc1
Merge pull request #24 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 17, 2025
fb2a691
Preparing a new view-Eventos
NatiSen Nov 18, 2025
a44d3f8
Merge pull request #25 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 18, 2025
09fc845
[Agregado Nuevas funciones al MapView]
Sergioalv15 Nov 19, 2025
690d3e6
Merge branch 'develop' into sergio-develop-definitivo
Sergioalv15 Nov 19, 2025
976fbbb
[Nuevas funciones agregadas para MapView]
Sergioalv15 Nov 19, 2025
b7c1d99
[punto de guardado]
Sergioalv15 Nov 19, 2025
107ded1
[Guardado]
Sergioalv15 Nov 19, 2025
ebf49b3
Update: Espanol
NatiSen Nov 19, 2025
3af5c59
[]
Sergioalv15 Nov 19, 2025
b28fe73
Mejorar la legibilidad y la estructura del código en CreateActivityPo…
Sergioalv15 Nov 19, 2025
6be735b
Merge remote-tracking branch 'origin/develop' into sergio-develop-def…
Sergioalv15 Nov 19, 2025
bb41e22
Update + sorpresa ;)
NatiSen Nov 19, 2025
d038236
Merge pull request #27 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 19, 2025
fe8e8f6
Update
NatiSen Nov 19, 2025
eea7714
Change after verification
NatiSen Nov 19, 2025
c80f03c
Merge pull request #28 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 19, 2025
bc3a3a2
ajustando btn mapView
JuanjoVillarejo Nov 20, 2025
a6e8612
Merge pull request #29 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 20, 2025
736dbff
Combining maps with events
NatiSen Nov 20, 2025
70b0148
Merge branch 'develop' into Develop-Natalia
NatiSen Nov 20, 2025
4238537
Merge pull request #30 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 20, 2025
80825a7
[Guardado con avances hasta 21-11]
Sergioalv15 Nov 21, 2025
26e493c
Merge remote-tracking branch 'origin/develop' into sergio-develop-def…
Sergioalv15 Nov 21, 2025
00ba846
posicion btn mapView
JuanjoVillarejo Nov 21, 2025
421aaba
Merge pull request #31 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 21, 2025
f74ea6e
[Profile terminado, mejoras accesibilidad]
Sergioalv15 Nov 21, 2025
ab2cb43
Merge remote-tracking branch 'origin/develop' into sergio-develop-def…
Sergioalv15 Nov 21, 2025
bdb0dc5
[Profile terminado, cambios para delete events en el backend y agrega…
Sergioalv15 Nov 21, 2025
bc0e69c
[Solucionado error de alertas por sesion caducada]
Sergioalv15 Nov 21, 2025
e910095
Merge pull request #33 from 4GeeksAcademy/sergio-develop-definitivo
Sergioalv15 Nov 21, 2025
9e9ded4
[Solucionado error profile alertas 2.0]
Sergioalv15 Nov 21, 2025
a68e668
Merge pull request #34 from 4GeeksAcademy/sergio-develop-definitivo
Sergioalv15 Nov 21, 2025
801273f
[profile delete user arreglado]
Sergioalv15 Nov 21, 2025
4414e94
Merge pull request #35 from 4GeeksAcademy/sergio-develop-definitivo
Sergioalv15 Nov 21, 2025
99f2703
Navbar updated
NatiSen Nov 21, 2025
201d802
Merge branch 'develop' into Develop-Natalia
NatiSen Nov 21, 2025
706d48b
Merge pull request #36 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 21, 2025
bc4741a
Update
NatiSen Nov 21, 2025
5409a69
Update
NatiSen Nov 21, 2025
2ecec5d
configuración de Flask Mail y Helper para gener Toker JWT en app.py
JuanjoVillarejo Nov 22, 2025
3992ca9
Merge pull request #37 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 22, 2025
ede7f9c
[MAPA Y EVENTOS RESPONSIVE, BOTON MI UBICACION, FILTROS]
Sergioalv15 Nov 24, 2025
b6b8ec4
[MAPA Y EVENTOS RESPONSIVE, BOTON MI UBICACION, FILTROS]
Sergioalv15 Nov 24, 2025
23d9ed5
recuperacion contraseña y token en prueba
JuanjoVillarejo Nov 24, 2025
a9c84ec
Merge pull request #39 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 24, 2025
8f7d135
[Solucionado error de scroll horizontal en MapView]
Sergioalv15 Nov 24, 2025
be7c682
[Solucionado error de scroll horizontal en MapView]
Sergioalv15 Nov 24, 2025
6301162
Navbar update
NatiSen Nov 24, 2025
7026858
Merge branch 'develop' into Develop-Natalia
NatiSen Nov 24, 2025
a548ae8
Merge pull request #41 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 24, 2025
db4d7f0
[Nuevas funciones]
Sergioalv15 Nov 24, 2025
7ca4662
Merge remote-tracking branch 'origin/develop' into sergio-develop-def…
Sergioalv15 Nov 24, 2025
9eb4a9f
Merge pull request #43 from 4GeeksAcademy/sergio-develop-definitivo
Sergioalv15 Nov 24, 2025
09a3190
Change of opening page
NatiSen Nov 24, 2025
56832a4
Opening Page
NatiSen Nov 24, 2025
10c8557
Home Page
NatiSen Nov 24, 2025
63237a0
Changes in page views
NatiSen Nov 24, 2025
43bc495
Merge pull request #44 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 24, 2025
0503134
prueba send-email app.py
JuanjoVillarejo Nov 25, 2025
485b144
Merge pull request #45 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 25, 2025
88c1032
envio OK de token al correo
JuanjoVillarejo Nov 25, 2025
cd188d5
Merge pull request #46 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 25, 2025
927729e
[Profile Actualizado, Crear eventos actualizado, nuevas
Sergioalv15 Nov 26, 2025
6b0f184
[Profile Actualizado, Crear eventos actualizado, nuevas librerias, na…
Sergioalv15 Nov 26, 2025
19b359e
Events, Newsletter, Style, Navigation
NatiSen Nov 26, 2025
ba62eca
eliminado endpoint de test send mail
JuanjoVillarejo Nov 26, 2025
034bfcc
Newsletter, events, updated and added styles
NatiSen Nov 26, 2025
6af09df
Merge branch 'develop' into Develop-Natalia
NatiSen Nov 26, 2025
a3264b6
modificando forgot.jsx
JuanjoVillarejo Nov 26, 2025
10f8d43
Newsletter, events, navigation and style updates
NatiSen Nov 26, 2025
1c72b62
Merge pull request #50 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 26, 2025
14c2a8b
[Tiempo de toast aumentado a 4 segundos]
Sergioalv15 Nov 26, 2025
334d40b
Update
NatiSen Nov 26, 2025
23aec1b
Merge pull request #51 from 4GeeksAcademy/Develop-Natalia
NatiSen Nov 26, 2025
8758b38
[mapview funciona]
Sergioalv15 Nov 26, 2025
dadde04
Merge branch 'develop' into develop-juanjo
JuanjoVillarejo Nov 26, 2025
9b805f6
Merge pull request #53 from 4GeeksAcademy/develop-juanjo
JuanjoVillarejo Nov 26, 2025
d0c88a9
[Version Lista y funcional]
Sergioalv15 Nov 26, 2025
9db309b
Merge remote-tracking branch 'origin/develop' into sergio-develop-def…
Sergioalv15 Nov 26, 2025
c85984f
[Error solucionado Token se guarda undefined]
Sergioalv15 Nov 26, 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
2 changes: 2 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
flask-mail = "*"
flask-bcrypt = "*"

[requires]
python_version = "3.13"
Expand Down
102 changes: 100 additions & 2 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 18 additions & 14 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<!DOCTYPE html>
<html class="h-100">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<title>Hello Rigo with React + Flux + Context.js</title>
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
<link rel="shortcut icon" href="./4geeks.ico"></head>
<body class="h-100">
<div id="app" class="h-100"></div>
<script type="text/javascript" src="./bundle.js"></script>
</body>
</html>
<!doctype html>
<html lang="es">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="icon" href="/4geeks.ico" />
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" integrity="sha512-SnH5WK+bZxgPHs44uWIX+LLJAJ9/2PkPKZ5QiAj6Ta86w+fsb2TkcmfRyVX3pBnMFcV7oQPJkl9QevSCWr3W6A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<meta name="description" content="MeetFit is a social sports app to connect, explore, and stay active together.">
<title>MeetFit ~Sport~Connect~Explore Social Sport App</title>
<script type="module" crossorigin src="/assets/index-99cf282c.js"></script>
<link rel="stylesheet" href="/assets/index-3cff7cbc.css">
</head>
<body>
<div id="root">Hello</div>

<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
</body>
</html>
12 changes: 7 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<!doctype html>
<html lang="en">
<!DOCTYPE html>

<html lang="es">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="icon" href="/4geeks.ico" />
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" integrity="sha512-SnH5WK+bZxgPHs44uWIX+LLJAJ9/2PkPKZ5QiAj6Ta86w+fsb2TkcmfRyVX3pBnMFcV7oQPJkl9QevSCWr3W6A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Hello Rigo</title>

<meta name="description" content="MeetFit is a social sports app to connect, explore, and stay active together.">
<title>MeetFit ~Sport~Connect~Explore Social Sport App</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/front/main.jsx"></script>
<script type="module" src="./src/front/main.jsx"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
</body>
</html>
35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

Loading