Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d9cb709
Update README.es.md with project details
Diego-Tello Mar 27, 2026
6bb3439
Update README.md
Diego-Tello Mar 27, 2026
765e8bb
Vista inicial del dashboard del hijo
alexrolfo Mar 29, 2026
f312788
feature: formulario registro de hijos con validaciones y avatares
maurigarciavg Mar 29, 2026
7593a98
first commit
Diego-Tello Mar 30, 2026
505e9ab
commit 2
Diego-Tello Mar 30, 2026
64236e7
feat: registro de hijo funcional con validaciones y pantalla de éxito
maurigarciavg Mar 30, 2026
31b8bcd
cambios simples
maurigarciavg Mar 30, 2026
4df2f89
arreglos diseño
maurigarciavg Mar 30, 2026
c2be502
style: centrado total y ajuste de avatares según diseño Canva con doc…
maurigarciavg Mar 30, 2026
c767656
Mejorar diseño del dashboard del hijo y conectar con backend
alexrolfo Mar 30, 2026
1bd677f
modificando ubicacion en carpeta propia
maurigarciavg Mar 30, 2026
f604333
cambio nombre carpeta
maurigarciavg Mar 30, 2026
11634a7
Mejora de interfaz del dashboard del hijo
alexrolfo Mar 30, 2026
de36e37
Refactorizar dashboard del hijo en componentes
alexrolfo Mar 30, 2026
f9a7a66
Añadir endpoint GET child dashboard
alexrolfo Mar 30, 2026
b7aed09
commit 3
Diego-Tello Mar 30, 2026
4eeb528
feat(login): inputs y estado inicial
DanSantamaria Mar 30, 2026
60a3902
Merge pull request #5 from 4GeeksAcademy/Epic3_DashboardPadre
maurigarciavg Mar 31, 2026
1d2911f
Refactor visual del dashboard del hijo eliminando Bootstrap y aplican…
alexrolfo Mar 31, 2026
4faf04e
Merge branch 'Develop' into epic2-child-profile
Diego-Tello Mar 31, 2026
3e7a73b
Merge pull request #3 from 4GeeksAcademy/epic2-child-profile
Diego-Tello Mar 31, 2026
09d7f5e
Add files via upload
DanSantamaria Mar 31, 2026
cad9102
Add files via upload
DanSantamaria Mar 31, 2026
4995a3a
cambios
maurigarciavg Mar 31, 2026
cf6284a
Merge branch 'epic2-child-profile' of https://github.com/4GeeksAcadem…
maurigarciavg Apr 1, 2026
ea44d63
rutas arregladas de nuevo
maurigarciavg Apr 1, 2026
07c1cf1
complete child profile wizard flow with tasks, small goals and grand …
maurigarciavg Apr 1, 2026
21bcd00
Merge branch 'Develop' into epic2-child-profile
maurigarciavg Apr 1, 2026
aa6274d
feat: mejoras en login
DanSantamaria Apr 1, 2026
24e60f7
feat: racha diaria real con modelo Child y lógica en backend
alexrolfo Apr 1, 2026
580738f
dashboard 2da parte
Diego-Tello Apr 1, 2026
887ed6a
imagenes
Diego-Tello Apr 1, 2026
2c69592
front bastante organizado
maurigarciavg Apr 1, 2026
06ef632
feat: completar tareas con modal y endpoint PATCH
alexrolfo Apr 1, 2026
ec5e12c
Epic1: Profiles selection page con modal PIN y estilos adaptados al l…
DanSantamaria Apr 1, 2026
9851ed5
feat: canjear recompensas con validación de saldo y modal de tienda
alexrolfo Apr 1, 2026
fde07d2
feat: tablas de base de datos para perfiles infantiles creadas y migr…
maurigarciavg Apr 3, 2026
19b77c9
conexion completa y funcionando del Wizard de registro de hijo con el…
maurigarciavg Apr 3, 2026
f2eac07
arreglos front, queda por hacer
maurigarciavg Apr 6, 2026
6ca2f69
ultimos cambios
maurigarciavg Apr 6, 2026
796ada0
calendar
Diego-Tello Apr 6, 2026
33724fc
Merge pull request #11 from 4GeeksAcademy/Epic3_DashboardPadre
Diego-Tello Apr 6, 2026
b99a4fc
Merge branch 'Develop' into feature/epica4-logica-tareas
Diego-Tello Apr 6, 2026
14cfe2d
Merge pull request #12 from 4GeeksAcademy/feature/epica4-logica-tareas
maurigarciavg Apr 6, 2026
25bf94f
Agrego validación de PIN y redirección de rutas segín rol
DanSantamaria Apr 6, 2026
21bee8f
Merge branch 'epic1-profile-selection' into Epic1-login
DanSantamaria Apr 6, 2026
f9e4c1f
cambios sugeridos por Diego hechos en los modales
maurigarciavg Apr 6, 2026
13d43e3
merge con profile selection
DanSantamaria Apr 6, 2026
0e412e4
mejora de UI
maurigarciavg Apr 7, 2026
0afac32
Merge branch 'Develop' into Epic1-login
maurigarciavg Apr 7, 2026
f3f85e6
Merge pull request #2 from 4GeeksAcademy/Epic1-login
maurigarciavg Apr 7, 2026
3792b91
Merge pull request #13 from 4GeeksAcademy/feature/epica4-logica-tareas
maurigarciavg Apr 7, 2026
4bf7965
Merge branch 'Develop' into epica-5-canjear-recompensas
alexrolfo Apr 7, 2026
f72831b
Merge pull request #10 from 4GeeksAcademy/epica-5-canjear-recompensas
alexrolfo Apr 7, 2026
4b96d2f
Revision
AngelRRand Apr 7, 2026
de66e96
calendar2
Diego-Tello Apr 7, 2026
e0112a6
Conexión con backend
DanSantamaria Apr 7, 2026
d430252
Merge branch 'Develop' into Epic1-login
Diego-Tello Apr 7, 2026
068a700
develop updated 1
Diego-Tello Apr 7, 2026
114ccc3
Merge pull request #15 from 4GeeksAcademy/Epic1-login
Diego-Tello Apr 7, 2026
2cc805b
Merge branch 'Develop_diego' into Epic3_DashboardPadre
Diego-Tello Apr 7, 2026
e270cd2
updated2
Diego-Tello Apr 8, 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
7 changes: 7 additions & 0 deletions README.es.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#PROYECTO FINAL - FINQUEST

KANBAN
https://trello.com/b/2KYME95B/finquest



# Plantilla de WebApp con React JS y Flask API

Construye aplicaciones web usando React.js para el front end y python/flask para tu API backend.
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#PROYECTO FINAL - FINQUEST

KANBAN https://trello.com/b/2KYME95B/finquest

# JWT Example: React + Flask

Ejemplo full stack de autenticación JWT con catálogo público y páginas privadas.
Expand Down
111 changes: 111 additions & 0 deletions migrations/versions/30a7f56653b6_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
"""empty message

Revision ID: 30a7f56653b6
Revises:
Create Date: 2026-04-07 19:07:29.637553

"""
from alembic import op
import sqlalchemy as sa


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


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('products',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.Column('slug', sa.String(length=120), nullable=False),
sa.Column('description', sa.Text(), nullable=False),
sa.Column('category', sa.String(length=80), nullable=False),
sa.Column('image_url', sa.String(length=255), nullable=False),
sa.Column('price', sa.Numeric(precision=10, scale=2), nullable=False),
sa.Column('is_active', sa.Boolean(), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('slug')
)
op.create_table('user',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('password', sa.String(length=255), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.Column('is_active', sa.Boolean(), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email')
)
op.create_table('child',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.Column('age', sa.Integer(), nullable=False),
sa.Column('pin', sa.String(length=4), nullable=False),
sa.Column('avatar', sa.String(length=255), nullable=True),
sa.Column('total_coins', sa.Integer(), nullable=False),
sa.Column('parent_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['parent_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('orders',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('product_id', sa.Integer(), nullable=False),
sa.Column('quantity', sa.Integer(), nullable=False),
sa.Column('status', sa.String(length=50), nullable=False),
sa.Column('unit_price', sa.Numeric(precision=10, scale=2), nullable=False),
sa.Column('created_at', sa.DateTime(), nullable=False),
sa.ForeignKeyConstraint(['product_id'], ['products.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('grand_prize',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.Column('coins', sa.Integer(), nullable=False),
sa.Column('image_url', sa.String(length=255), nullable=True),
sa.Column('child_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['child_id'], ['child.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('reward',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('cost', sa.Integer(), nullable=False),
sa.Column('child_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['child_id'], ['child.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('small_goal',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.Column('coins', sa.Integer(), nullable=False),
sa.Column('child_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['child_id'], ['child.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('task',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.Column('coins', sa.Integer(), nullable=False),
sa.Column('days', sa.String(length=100), nullable=False),
sa.Column('child_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['child_id'], ['child.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('task')
op.drop_table('small_goal')
op.drop_table('reward')
op.drop_table('grand_prize')
op.drop_table('orders')
op.drop_table('child')
op.drop_table('user')
op.drop_table('products')
# ### end Alembic commands ###
36 changes: 0 additions & 36 deletions migrations/versions/7579f63830e1_.py

This file was deleted.

50 changes: 0 additions & 50 deletions migrations/versions/bd2f3a0b9b6d_add_products_and_orders.py

This file was deleted.

Loading