Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 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
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
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.

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

Revision ID: a641ec06e1ec
Revises:
Create Date: 2026-04-08 18:19:57.987352

"""
from alembic import op
import sqlalchemy as sa


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


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('trip',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=30), nullable=False),
sa.Column('destination', sa.String(length=50), nullable=False),
sa.Column('state', sa.Enum('FINISHED', 'ONGOING', 'PLANNING', name='statetypes'), nullable=False),
sa.Column('starting_date', sa.Date(), nullable=False),
sa.Column('ending_date', sa.Date(), nullable=False),
sa.Column('budget', sa.Float(), nullable=False),
sa.Column('notes', sa.String(length=150), nullable=False),
sa.PrimaryKeyConstraint('id')
)
op.create_table('user',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=20), nullable=False),
sa.Column('last_name', sa.String(length=50), nullable=False),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('password', sa.String(), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email')
)
op.create_table('chat',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=50), nullable=True),
sa.Column('trip_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['trip_id'], ['trip.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id')
)
op.create_table('document',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=50), nullable=False),
sa.Column('url', sa.String(length=250), nullable=False),
sa.Column('trip_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['trip_id'], ['trip.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id')
)
op.create_table('expense',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('amount', sa.Float(), nullable=False),
sa.Column('description', sa.String(length=100), nullable=False),
sa.Column('trip_id', sa.Integer(), nullable=False),
sa.Column('payer_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['payer_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['trip_id'], ['trip.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id')
)
op.create_table('itinerary',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=30), nullable=False),
sa.Column('destination', sa.String(length=50), nullable=False),
sa.Column('hour', sa.Time(), nullable=False),
sa.Column('starting_date', sa.Date(), nullable=False),
sa.Column('notes', sa.String(length=150), nullable=False),
sa.Column('trip_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['trip_id'], ['trip.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id')
)
op.create_table('traveler',
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('trip_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['trip_id'], ['trip.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('user_id', 'trip_id')
)
op.create_table('debt',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('amount', sa.Float(), nullable=False),
sa.Column('debtor_id', sa.Integer(), nullable=False),
sa.Column('creditor_id', sa.Integer(), nullable=False),
sa.Column('expense_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['creditor_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['debtor_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['expense_id'], ['expense.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('message',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('content', sa.String(length=500), nullable=False),
sa.Column('date_time', sa.DateTime(), nullable=False),
sa.Column('chat_id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['chat_id'], ['chat.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('message')
op.drop_table('debt')
op.drop_table('traveler')
op.drop_table('itinerary')
op.drop_table('expense')
op.drop_table('document')
op.drop_table('chat')
op.drop_table('user')
op.drop_table('trip')
# ### end Alembic commands ###
36 changes: 36 additions & 0 deletions migrations/versions/a9c11e29682c_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
"""empty message

Revision ID: a9c11e29682c
Revises: a641ec06e1ec
Create Date: 2026-04-13 18:29:47.379931

"""
from alembic import op
import sqlalchemy as sa


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


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

# ### end Alembic commands ###


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

# ### end Alembic commands ###
Loading