Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
55a6133
migrations en gitingnore
Mr-Encho Feb 25, 2026
11b3442
signup cambios
Mr-Encho Feb 25, 2026
ca90360
Merge pull request #1 from 4GeeksAcademy/signup-backend
sispizua Feb 25, 2026
7d9d003
Login done
Mr-Encho Feb 25, 2026
84f25c6
Merge pull request #2 from 4GeeksAcademy/login-backend
JosetSinPh Feb 25, 2026
570fcfa
Modelo y endpoints de Spot
JosetSinPh Feb 25, 2026
623d8eb
probando Modelo spot
JosetSinPh Feb 25, 2026
eaf6f10
Merge pull request #3 from 4GeeksAcademy/spot-backend
Mr-Encho Feb 26, 2026
1929884
edit and get profile
Mr-Encho Feb 26, 2026
3580a46
get and edit path for the profile-backend
Mr-Encho Feb 26, 2026
b838f92
Merge pull request #4 from 4GeeksAcademy/get-profile-backend
JosetSinPh Feb 26, 2026
b9e3158
modificado modelo spot
JosetSinPh Feb 26, 2026
37c59f0
actualizado modelo spots
JosetSinPh Feb 26, 2026
d166c4e
Merge branch 'develop' into spot-backend
JosetSinPh Feb 26, 2026
0872fe0
modificado una excepcion
JosetSinPh Feb 26, 2026
b85477e
Merge branch 'spot-backend' of https://github.com/4GeeksAcademy/Proye…
JosetSinPh Feb 26, 2026
5189645
media spot terminado
JosetSinPh Feb 26, 2026
4b57eb9
Merge pull request #5 from 4GeeksAcademy/spot-backend
Mr-Encho Feb 27, 2026
8420fc5
Merge pull request #6 from 4GeeksAcademy/media-spot-backend
Mr-Encho Feb 27, 2026
4bbb8a5
modelado de vehiculo y endpoint POST
sispizua Feb 27, 2026
15e26e9
Merge branch 'develop' into vehicle-model
Mr-Encho Feb 27, 2026
6c90ce3
Merge pull request #7 from 4GeeksAcademy/vehicle-model
Mr-Encho Feb 27, 2026
e156fc3
conflicto de rutas resuelto
sispizua Feb 27, 2026
c419905
Creacion carpeta rutas
Mr-Encho Feb 27, 2026
c7ac7b3
Creación carpeta rutas
Mr-Encho Feb 27, 2026
4d8e302
Merge pull request #9 from 4GeeksAcademy/prueba_ruta
sispizua Feb 27, 2026
e1448a5
Creación de las rutas en route
Mr-Encho Feb 27, 2026
b0e7d64
modelos y crud de reservas listo
JosetSinPh Feb 27, 2026
111f4c1
Merge pull request #10 from 4GeeksAcademy/booking-backend
Mr-Encho Feb 28, 2026
c2e0fa3
modelo de vehiculos completo, y rutas
sispizua Feb 28, 2026
938b94c
Merge branch 'develop' into vehicle-model
Mr-Encho Feb 28, 2026
4757bf4
Merge pull request #11 from 4GeeksAcademy/vehicle-model
Mr-Encho Feb 28, 2026
576f335
Create model Coment, CRUD path for Coment and Create Relationships
Mr-Encho Feb 28, 2026
857dd54
Merge branch 'develop' into Comment-backend
Mr-Encho Feb 28, 2026
545e229
Merge pull request #12 from 4GeeksAcademy/Comment-backend
JosetSinPh Mar 1, 2026
1657b91
actualizacion de modelo de vehicle y creacion de media_vehicle
sispizua Mar 2, 2026
b8e78b5
Modelo review_van
Mr-Encho Mar 2, 2026
c5ee3dc
Models Review_van, Favorite table and relationship done
Mr-Encho Mar 2, 2026
b11a7da
Merge branch 'develop' into review_van
Mr-Encho Mar 2, 2026
7329452
Merge pull request #13 from 4GeeksAcademy/review_van
sispizua Mar 2, 2026
867740e
configuracion de JWT_SECRET_KEY
sispizua Mar 2, 2026
a0797d5
pruebas
Mr-Encho Mar 2, 2026
772e07f
Merge pull request #14 from 4GeeksAcademy/signup-frontend
Mr-Encho Mar 2, 2026
a7456f4
Navbar sin funcionalidad
Mr-Encho Mar 2, 2026
1449e59
Merge pull request #15 from 4GeeksAcademy/Navbar
JosetSinPh Mar 2, 2026
16ec523
mapa y sidebar conectados a DB con contador de lugares funcionando
JosetSinPh Mar 3, 2026
caacafa
explicando algunos puntos
JosetSinPh Mar 4, 2026
032a7c5
Merge pull request #16 from 4GeeksAcademy/map-spots
Mr-Encho Mar 4, 2026
5201bf8
resolucion de error mapa
JosetSinPh Mar 4, 2026
27209fc
Merge pull request #17 from 4GeeksAcademy/map-spots
Mr-Encho Mar 4, 2026
d916607
Mapa con Puntos de interes POI creados
JosetSinPh Mar 4, 2026
010f73f
chore: package-lock regenerado desde cero para limpiar conflictos
JosetSinPh Mar 4, 2026
eaf106e
fix: unificados estados de búsqueda y filtros en Map.jsx
JosetSinPh Mar 4, 2026
a60c543
sidebar inteligente con filtro geográfico y orden por valoración
JosetSinPh Mar 4, 2026
de98ffc
Signup.jsx funcionando
sispizua Mar 5, 2026
dfc08d9
Merge pull request #18 from 4GeeksAcademy/map-poi
Mr-Encho Mar 5, 2026
d922675
Merge pull request #19 from 4GeeksAcademy/map-interact
Mr-Encho Mar 5, 2026
fa866b2
Merge branch 'develop' into signup-frontend
Mr-Encho Mar 5, 2026
09c0371
Merge pull request #20 from 4GeeksAcademy/signup-frontend
Mr-Encho Mar 5, 2026
85338b3
actualizacion de signup.jsx, navigate, spiner
sispizua Mar 5, 2026
8e2e494
View all vans
Mr-Encho Mar 5, 2026
2d7dd38
Merge branch 'develop' into all-van
Mr-Encho Mar 5, 2026
68b98a6
Merge pull request #21 from 4GeeksAcademy/all-van
sispizua Mar 5, 2026
ab45cf9
ok
sispizua Mar 5, 2026
81b4a14
Merge branch 'signup-frontend' of https://github.com/4GeeksAcademy/Pr…
sispizua Mar 5, 2026
9a7475e
View Details_van
Mr-Encho Mar 5, 2026
d8a867d
Merge pull request #22 from 4GeeksAcademy/details-van
sispizua Mar 5, 2026
5671efe
actualizacion de .nv token para el mapa
sispizua Mar 5, 2026
eaeeaaf
Merge pull request #23 from 4GeeksAcademy/signup-frontend
Mr-Encho Mar 5, 2026
44ec6d4
booking_services
Mr-Encho Mar 6, 2026
689daa2
Merge pull request #24 from 4GeeksAcademy/booking-services
sispizua Mar 6, 2026
282509e
modificacion package.json
sispizua Mar 6, 2026
de3ed30
modificacion de archivo package.json
sispizua Mar 6, 2026
6e82103
Trabajo en el mapa y filtros comunidad
JosetSinPh Mar 6, 2026
6ef0e02
Add favorites Van
Mr-Encho Mar 7, 2026
359d6df
Merge pull request #25 from 4GeeksAcademy/booking-services
JosetSinPh Mar 7, 2026
f1f5e49
por terminar detalles del mapa
JosetSinPh Mar 8, 2026
73ffce0
por terminar
JosetSinPh Mar 9, 2026
107da2f
user page
Mr-Encho Mar 9, 2026
150264f
Merge pull request #26 from 4GeeksAcademy/user-page
JosetSinPh Mar 9, 2026
775b77c
arreglando
JosetSinPh Mar 9, 2026
18ace49
Fix: solucionados conflictos en rutas y servicios
JosetSinPh Mar 9, 2026
19e2e1a
Guardando avances del modal y servicios antes de sincronizar
JosetSinPh Mar 9, 2026
9eef36f
añadiendo spotservices
JosetSinPh Mar 9, 2026
7c1ec2f
añadiendo
JosetSinPh Mar 9, 2026
622e187
Merge pull request #27 from 4GeeksAcademy/map-detail-view
Mr-Encho Mar 10, 2026
ab9c99e
creacion del Login.jsx, modificacion en modelos de user, creacion de …
sispizua Mar 10, 2026
698093d
seguimos con el mapa
JosetSinPh Mar 10, 2026
9ea67f4
Home 1
Mr-Encho Mar 11, 2026
f0c0548
Merge pull request #28 from 4GeeksAcademy/Home
sispizua Mar 11, 2026
8c1a19c
actualizacion de routes.py
sispizua Mar 11, 2026
9099ba4
Merge branch 'develop' into login-frontend
JosetSinPh Mar 11, 2026
620008b
Merge pull request #29 from 4GeeksAcademy/login-frontend
JosetSinPh Mar 11, 2026
d4d2c63
Merge branch 'develop' of https://github.com/4GeeksAcademy/Proyecto_F…
sispizua Mar 11, 2026
7fca04b
ok
sispizua Mar 11, 2026
0df41ee
resolviendo conflictos
JosetSinPh Mar 11, 2026
87bcd96
intentandolo
JosetSinPh Mar 11, 2026
6c50aab
Recuperando código borrado por error
JosetSinPh Mar 11, 2026
39c5926
Merge branch 'develop' into arreglando-un-error
sispizua Mar 11, 2026
e8dd491
Merge pull request #30 from 4GeeksAcademy/arreglando-un-error
sispizua Mar 11, 2026
fe29ae8
arreglando errores 2
sispizua Mar 11, 2026
60147e0
arreglando error 3
sispizua Mar 11, 2026
866bc4c
Merge branch 'develop' of https://github.com/4GeeksAcademy/Proyecto_F…
JosetSinPh Mar 11, 2026
50ebaa9
arreglado problema rutas
JosetSinPh Mar 11, 2026
32c8781
Merge pull request #31 from 4GeeksAcademy/map-detail-view
sispizua Mar 11, 2026
dfdc9f5
error 4
sispizua Mar 11, 2026
f53e191
Merge branch 'develop' of https://github.com/4GeeksAcademy/Proyecto_F…
sispizua Mar 11, 2026
7d4bea2
vista del mapa lista
JosetSinPh Mar 12, 2026
69a7ac8
offcanvas 1.2
Mr-Encho Mar 13, 2026
81e1973
Merge pull request #32 from 4GeeksAcademy/map-detail-view
Mr-Encho Mar 13, 2026
75fd486
Merge pull request #33 from 4GeeksAcademy/offcanvas-user
sispizua Mar 13, 2026
c3ddc2a
ok
sispizua Mar 13, 2026
71e2fc9
Mod Home
Mr-Encho Mar 14, 2026
15a996a
Welcomemodal movio a layout, eliminacion del archivo routes.py
sispizua Mar 15, 2026
0334704
mod Home 2
Mr-Encho Mar 15, 2026
44e0968
Merge pull request #35 from 4GeeksAcademy/login-frontend
JosetSinPh Mar 15, 2026
ac7552b
Merge pull request #36 from 4GeeksAcademy/Home
JosetSinPh Mar 15, 2026
6884b70
Siguiendo con el mapa
JosetSinPh Mar 15, 2026
8b663b5
spiner para el loyout
sispizua Mar 16, 2026
f6dbd60
Mod Home 3
Mr-Encho Mar 16, 2026
1fa1902
implementando creacion de punto
JosetSinPh Mar 16, 2026
944f00d
Añadida la opcion de crear punto
JosetSinPh Mar 16, 2026
257a058
Merge pull request #37 from 4GeeksAcademy/login-frontend
JosetSinPh Mar 16, 2026
8ef1b31
Merge pull request #38 from 4GeeksAcademy/Home
JosetSinPh Mar 16, 2026
1723834
mapa Terminado?
JosetSinPh Mar 17, 2026
6ef1d63
Merge pull request #39 from 4GeeksAcademy/map-part2
Mr-Encho Mar 18, 2026
b9841cb
mod Home3
Mr-Encho Mar 18, 2026
e771188
Merge pull request #40 from 4GeeksAcademy/Home
JosetSinPh Mar 18, 2026
fa065be
terminado
JosetSinPh Mar 18, 2026
011db4a
Merge pull request #41 from 4GeeksAcademy/map-part3
sispizua Mar 19, 2026
a66895e
correo de confirmación
Mr-Encho Mar 19, 2026
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 .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
# Back-End Variables
DATABASE_URL=postgres://gitpod:postgres@localhost:5432/example
FLASK_APP_KEY="any key works"
SECRET_KEY="any key works"
FLASK_APP=src/app.py
FLASK_DEBUG=1
DEBUG=TRUE

# Front-End Variables
VITE_BASENAME=/
#VITE_BACKEND_URL=

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ database.database
database.db
diagram.png
__pycache__/
migrations
7 changes: 5 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@ flask-migrate = "*"
flask-swagger = "*"
psycopg2-binary = "*"
python-dotenv = "*"
flask-cors = "*"
gunicorn = "*"
cloudinary = "*"
flask-admin = "==2.0.0"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
flask-bcrypt = "*"
flask-jwt-extended = "*"
flask-cors = "*"
mailtrap = "*"
flask-mail = "*"

[requires]
python_version = "3.13"
Expand Down
449 changes: 423 additions & 26 deletions Pipfile.lock

Large diffs are not rendered by default.

29 changes: 25 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,35 @@
<head>
<meta charset="UTF-8" />
<link rel="icon" type="icon" href="/4geeks.ico" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/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" />
<link
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/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"
/>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Chewy&family=Montserrat:ital,wght@0,100..900;1,100..900&family=Spicy+Rice&display=swap"
rel="stylesheet"
/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Hello Rigo</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/front/main.jsx"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
<script
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
crossorigin="anonymous"
></script>
</body>
</html>
</html>
35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

Loading