Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
3dd99d8
GDV-2: Added model User in the backend
Ruben-Alba-Gonzalez Apr 6, 2026
6f68080
Merge pull request #1 from 4GeeksAcademy/feature/Model_User
Estimatus Apr 6, 2026
fbc0ab6
GDV-3: Added model Viajes in the backend
Ruben-Alba-Gonzalez Apr 6, 2026
8e6dc3a
Merge pull request #2 from 4GeeksAcademy/feature/Model_Viaje
Ruben-Alba-Gonzalez Apr 6, 2026
a694759
GDV-4: Added model Viajero, updated models Viaje and User
Ruben-Alba-Gonzalez Apr 6, 2026
8a9b20f
Merge pull request #3 from 4GeeksAcademy/feature/Model_Viajeros
Ruben-Alba-Gonzalez Apr 6, 2026
e3bea01
GDV-5: Added model Itinerario, updated model Viaje, updated all model…
Ruben-Alba-Gonzalez Apr 6, 2026
85ed5e1
Merge pull request #4 from 4GeeksAcademy/feature/Model_Itinerarios
Ruben-Alba-Gonzalez Apr 6, 2026
687d328
GDV-7: Added model deudas, gastos, documento, chat, mensajes
Estimatus Apr 8, 2026
0ce8076
Added model Gasto, updated model Viaje
Ruben-Alba-Gonzalez Apr 8, 2026
c10e82b
GDV-7: Translated models to English and added Chat title
Estimatus Apr 8, 2026
0aa5b08
Merge pull request #5 from 4GeeksAcademy/feature/Model_Deuda
Estimatus Apr 8, 2026
9ea4c42
Merge branch 'develop' into feature/Model_Gasto
Ruben-Alba-Gonzalez Apr 8, 2026
278e726
Merge pull request #6 from 4GeeksAcademy/feature/Model_Gasto
Ruben-Alba-Gonzalez Apr 8, 2026
b8332cd
Fixed migration version error
Ruben-Alba-Gonzalez Apr 8, 2026
0956e85
Merge pull request #7 from 4GeeksAcademy/bug/migration_error
Estimatus Apr 8, 2026
6ca957e
GDV-13: add landingpage
Estimatus Apr 11, 2026
9fbb1eb
GDV-13: extracted Hero, Stats, and Features into separate components
Estimatus Apr 11, 2026
01a07b7
Merge pull request #8 from 4GeeksAcademy/feature/landingpage
Estimatus Apr 11, 2026
c970d1b
GDV-16 Pag Login/Registro con botones
Estimatus Apr 11, 2026
97a20a8
Merge pull request #9 from Estimatus/feature/Login
Ruben-Alba-Gonzalez Apr 13, 2026
b7956af
GDV-16: Added JWT authentication, updated model User
Ruben-Alba-Gonzalez Apr 13, 2026
1b89257
Merge pull request #10 from 4GeeksAcademy/feature/authentication_JWT
Ruben-Alba-Gonzalez Apr 13, 2026
bdd2d69
GDV-15: Added login endpoint
Ruben-Alba-Gonzalez Apr 13, 2026
4711af0
Merge pull request #12 from 4GeeksAcademy/feature/login_endpoint_API
Ruben-Alba-Gonzalez Apr 13, 2026
6aadc03
GDV- Camdio de Landing/Login-style
Estimatus Apr 13, 2026
6e83095
Merge pull request #13 from 4GeeksAcademy/feature/new-landing-style
Ruben-Alba-Gonzalez Apr 13, 2026
a616674
GDV-14: Added register endpoint, updated user model
Ruben-Alba-Gonzalez Apr 13, 2026
81b89c0
Merge pull request #14 from 4GeeksAcademy/feature/register_endpoint_API
Ruben-Alba-Gonzalez Apr 13, 2026
ee4f8be
GDV-17: Added private endpoint Travels, updated models Trip and Traveler
Ruben-Alba-Gonzalez Apr 14, 2026
c409424
Merge pull request #15 from 4GeeksAcademy/feature/endpoint_viajes
Ruben-Alba-Gonzalez Apr 14, 2026
9efeff9
GDV-18: add mytips
Estimatus Apr 14, 2026
e0419f9
Merge pull request #16 from 4GeeksAcademy/feature/travels
Estimatus Apr 14, 2026
b1ead1e
GDV-20: new trip
Estimatus Apr 14, 2026
b51d5fa
Merge pull request #17 from 4GeeksAcademy/feature/newtravel
Estimatus Apr 14, 2026
7134dfa
GDV-30 Added TripDetails
Estimatus Apr 15, 2026
4c510db
Merge pull request #18 from 4GeeksAcademy/feature/gestionDeViaje
Estimatus Apr 15, 2026
adb8c74
GDV-32: Updated endoint travels adding filters
Ruben-Alba-Gonzalez Apr 15, 2026
d31d90c
Merge pull request #19 from 4GeeksAcademy/feature/update_endpoint_tra…
Ruben-Alba-Gonzalez Apr 15, 2026
3181b49
GDV-26: Added profile endpoint
Ruben-Alba-Gonzalez Apr 15, 2026
bff0c98
Merge pull request #20 from 4GeeksAcademy/feature/endpoint_profile
Ruben-Alba-Gonzalez Apr 15, 2026
3c4a45c
Pending changes exported from your codespace
Estimatus Apr 16, 2026
478adf3
Merge pull request #21 from 4GeeksAcademy/codespace-fluffy-space-cod-…
Estimatus Apr 16, 2026
5ea864d
GDV-34:newexpense and rework ux/ui and fixes responsives
Estimatus Apr 16, 2026
db51409
Merge pull request #22 from 4GeeksAcademy/feature/modal-newExpense
Estimatus Apr 16, 2026
3f27218
GDV-35:detailed-itinerary
Estimatus Apr 16, 2026
03051b6
Merge pull request #23 from 4GeeksAcademy/feature/detailed-itinerary
Estimatus Apr 16, 2026
912fb17
GDV-33 new Activity
Estimatus Apr 16, 2026
f228fbd
Merge pull request #24 from 4GeeksAcademy/feature/new-activity
Estimatus Apr 16, 2026
395b610
GDV-19: Added endpoint new-trip, updated model trip
Ruben-Alba-Gonzalez Apr 17, 2026
8f4506c
Merge pull request #25 from 4GeeksAcademy/feature/endpoint_new_trip
Ruben-Alba-Gonzalez Apr 17, 2026
145faa4
GDV-36 desglose de gastos y refactorizacion de la arquitectura
Estimatus Apr 17, 2026
7cbf8a9
Merge pull request #26 from 4GeeksAcademy/feature/breakdown-expenses
Estimatus Apr 17, 2026
c1841a3
GDV-21: added endpoint trip-detail
Ruben-Alba-Gonzalez Apr 17, 2026
c512fd2
Merge pull request #27 from 4GeeksAcademy/feature/endpoint_travel_detail
Ruben-Alba-Gonzalez Apr 17, 2026
a79e818
GDV-22: Added endpoint new-activity
Ruben-Alba-Gonzalez Apr 17, 2026
d96cbd7
Merge pull request #28 from 4GeeksAcademy/feature/endpoint_new_activity
Ruben-Alba-Gonzalez Apr 17, 2026
a0788ed
GDV-23: Added endpoint new-expense, updated model expense
Ruben-Alba-Gonzalez Apr 17, 2026
943b99e
Merge pull request #29 from 4GeeksAcademy/feature/endpoint_new_expense
Ruben-Alba-Gonzalez Apr 17, 2026
2d4d069
GDV-24: Added endpoint all-activity
Ruben-Alba-Gonzalez Apr 17, 2026
756235c
Merge pull request #30 from 4GeeksAcademy/feature/endpoint_all_itinerary
Ruben-Alba-Gonzalez Apr 17, 2026
9b03c9e
GDV-37 chats
Estimatus Apr 19, 2026
ec0824a
Merge pull request #31 from 4GeeksAcademy/feature/chat
Estimatus Apr 19, 2026
dbbb9fe
GDV-25: Added endpoint all-expenses, updated models
Ruben-Alba-Gonzalez Apr 19, 2026
12c04c9
GDV-42: update endpoints
Estimatus Apr 19, 2026
01c93cd
Merge pull request #32 from 4GeeksAcademy/feature/endpoint_all_expense
Ruben-Alba-Gonzalez Apr 19, 2026
f5a5e2c
Merge branch 'develop' into feature/Connect-frontend-to-backend
Ruben-Alba-Gonzalez Apr 19, 2026
5388739
Merge pull request #33 from 4GeeksAcademy/feature/Connect-frontend-to…
Ruben-Alba-Gonzalez Apr 19, 2026
ef045b0
GDV-42: partial connection of the back and front
Estimatus Apr 20, 2026
b5f8b3d
Merge pull request #34 from 4GeeksAcademy/feature/Connect-frontend-to…
Estimatus Apr 20, 2026
73ee9c6
GDV-fix bugs
Estimatus Apr 20, 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: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ 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-cors = "*"

[requires]
python_version = "3.13"
Expand Down
24 changes: 12 additions & 12 deletions Pipfile.lock

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

6 changes: 5 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@
<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 rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
<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=Poppins:wght@400;600;700;800&display=swap" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Hello Rigo</title>
<title>Expedition</title>
</head>
<body>
<div id="root"></div>
Expand Down
35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

48 changes: 48 additions & 0 deletions migrations/versions/e26fa83162c6_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
"""empty message

Revision ID: e26fa83162c6
Revises:
Create Date: 2026-04-20 16:17:52.714014

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'e26fa83162c6'
down_revision = None
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('itinerary', schema=None) as batch_op:
batch_op.alter_column('notes',
existing_type=sa.VARCHAR(length=150),
nullable=True)

with op.batch_alter_table('trip', schema=None) as batch_op:
batch_op.add_column(sa.Column('image_url', sa.String(length=500), nullable=True))
batch_op.alter_column('notes',
existing_type=sa.VARCHAR(length=150),
nullable=True)

# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('trip', schema=None) as batch_op:
batch_op.alter_column('notes',
existing_type=sa.VARCHAR(length=150),
nullable=False)
batch_op.drop_column('image_url')

with op.batch_alter_table('itinerary', schema=None) as batch_op:
batch_op.alter_column('notes',
existing_type=sa.VARCHAR(length=150),
nullable=False)

# ### end Alembic commands ###
Loading