Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 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
85338b3
actualizacion de signup.jsx, navigate, spiner
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
5671efe
actualizacion de .nv token para el mapa
sispizua Mar 5, 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
3 changes: 2 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ 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 = "*"

[requires]
python_version = "3.13"
Expand Down
111 changes: 94 additions & 17 deletions Pipfile.lock

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

35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

Loading