Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
15d7220
estrura de usuario
anagit2025 Jul 11, 2025
4338749
Add Navbar Shopping Cart
GuillermoMoralesS Jul 16, 2025
c62cf4b
Add Navbar Shopping Cart (#15)
GuillermoMoralesS Jul 16, 2025
a8c0c1f
bd
anagit2025 Jul 16, 2025
7c2baad
bd
anagit2025 Jul 16, 2025
0df82f3
correcciones
anagit2025 Jul 17, 2025
337c985
agregar body y footer
HannahAlAssad Jul 18, 2025
60b6597
guardar mejoras
HannahAlAssad Jul 18, 2025
c02d50b
cambios
anagit2025 Jul 19, 2025
3d2d651
agregar carrusel
HannahAlAssad Jul 20, 2025
ce89e90
cambiar colores
HannahAlAssad Jul 20, 2025
888aa9c
Bd productos (#16)
anagit2025 Jul 20, 2025
5d251f3
agregar home
HannahAlAssad Jul 21, 2025
edd7f34
Body (#17)
HannahAlAssad Jul 21, 2025
589a4a6
Añadido Registro/login sin completar
GuillermoMoralesS Jul 21, 2025
0c29064
agregue un enum para el carrito de compras
anagit2025 Jul 22, 2025
156a685
Merge branch 'bd-productos' of https://github.com/4GeeksAcademy/Patit…
ErwinGonzalezBonilla Jul 22, 2025
f66019b
correcciones de codigo
anagit2025 Jul 22, 2025
29cd72c
Implementación de rutas para registro, login y acceso privado con JWT
ErwinGonzalezBonilla Jul 23, 2025
472dc22
Bd productos (#18)
anagit2025 Jul 23, 2025
275fffa
resolución de conflictos
ErwinGonzalezBonilla Jul 23, 2025
7355d6b
Register (#19)
GuillermoMoralesS Jul 23, 2025
9526397
arreglar login
HannahAlAssad Jul 24, 2025
29f7c0f
arreglar login
HannahAlAssad Jul 24, 2025
d394a49
Registro y login funcional (#20)
HannahAlAssad Jul 24, 2025
7f5a70b
añadida funcionalidad login y vista nueva del Dashboard
GuillermoMoralesS Jul 24, 2025
675c1a9
arreglo carrusel
HannahAlAssad Jul 24, 2025
9ba8557
nuevos endpoind
anagit2025 Jul 24, 2025
d3fbfa2
Merge branch 'main' into BODY
HannahAlAssad Jul 25, 2025
8ead334
Body (#22)
HannahAlAssad Jul 25, 2025
11726b7
Cambios en el registro, login, Creacion del dashboard y cambios en la…
GuillermoMoralesS Jul 25, 2025
6518aaa
Merge branch 'registro-y-login-funcional'
GuillermoMoralesS Jul 25, 2025
c33fb78
ajustes
anagit2025 Jul 26, 2025
020269e
tomli
anagit2025 Jul 26, 2025
56af67d
he creado el put
anagit2025 Jul 26, 2025
3861ccd
Añadidos consejos aleatorios, cambios estticos
GuillermoMoralesS Jul 28, 2025
1cdadf3
carrito get hecho
velazcopolo Jul 28, 2025
ad62d53
resolviendo conflictos
anagit2025 Jul 28, 2025
510c04c
put de productos
velazcopolo Jul 28, 2025
457b5e9
Añadidas Vista Cartera de Productos y Producto Individual
GuillermoMoralesS Jul 28, 2025
407c628
he arreglado el metodo get para que los datos aparezcan completos
anagit2025 Jul 29, 2025
6dbf214
he agregado un nuevo atributo para las imagenes, y lo serialize
anagit2025 Jul 29, 2025
8650f97
configuracion de cloudinary en ambos archivos
anagit2025 Jul 29, 2025
6cdd4c7
creación de endpoints cart
ErwinGonzalezBonilla Jul 30, 2025
69bfe16
Añadido componente de pagos sin vincular con back
GuillermoMoralesS Jul 30, 2025
c949ed7
Endpoints de carrito de compras
ErwinGonzalezBonilla Jul 30, 2025
6eff180
Cerrar sesion, dashboard directo
GuillermoMoralesS Jul 30, 2025
7f01e36
Register (#25)
GuillermoMoralesS Jul 30, 2025
a9651c2
Revert "Register (#25)"
velazcopolo Jul 30, 2025
79464fe
intente arreglar los endpoinds
anagit2025 Jul 30, 2025
e62d62d
corrección de error de pipfile
ErwinGonzalezBonilla Jul 31, 2025
f345b22
endpoinds funcionando correctamente
anagit2025 Jul 31, 2025
84cbbff
Merge branch 'main' into carrito-compras
anagit2025 Jul 31, 2025
52f5955
Carrito compras (#26)
anagit2025 Jul 31, 2025
4c452a4
Merge branch 'main' into register
ErwinGonzalezBonilla Jul 31, 2025
49b5c1f
corrección de error de pipfile (#27)
ErwinGonzalezBonilla Jul 31, 2025
64aa07f
agrago endpoint de Cart
ErwinGonzalezBonilla Jul 31, 2025
fe9cf52
corrección de errores pipfile
ErwinGonzalezBonilla Jul 31, 2025
fb59501
resolviendo conflictos
anagit2025 Jul 31, 2025
8756481
Merge branch 'register'
ErwinGonzalezBonilla Jul 31, 2025
47ad718
actualizacion de rutas Cart
ErwinGonzalezBonilla Jul 31, 2025
562bd23
Merge branch 'main' of https://github.com/4GeeksAcademy/PatitasClub
ErwinGonzalezBonilla Jul 31, 2025
f20758e
agregar carrito, no listo
HannahAlAssad Aug 1, 2025
0e297f4
endpoind de la barra de busqueda
anagit2025 Aug 1, 2025
d538b0f
una correccion en el endpoind
anagit2025 Aug 1, 2025
fb7e82a
agregando instancia de bcrypt
velazcopolo Aug 1, 2025
7d0fd9f
Fetch realizado falta modificar array para poder filtrar
GuillermoMoralesS Aug 2, 2025
8dbb064
Merge branch 'main' into barra-busqueda
anagit2025 Aug 3, 2025
ba197db
Barra busqueda (#28)
anagit2025 Aug 3, 2025
a841628
pet-type serialize
anagit2025 Aug 3, 2025
4dcdbc8
agregando la categoria y el pet type de los productos
anagit2025 Aug 3, 2025
565fcbb
Bd productos (#29)
anagit2025 Aug 3, 2025
c797730
subir carrito
HannahAlAssad Aug 3, 2025
490c93e
Carrito compras front (#30)
HannahAlAssad Aug 3, 2025
c5a2f0a
serializacion mucho a muchos
anagit2025 Aug 3, 2025
786da5a
serializacion mucho a muchos (#31)
anagit2025 Aug 3, 2025
b32ce39
Revert "serializacion mucho a muchos"
anagit2025 Aug 4, 2025
a165c30
correcciones de serializacion
anagit2025 Aug 4, 2025
1d92406
correcciones de serializacion (#33)
anagit2025 Aug 4, 2025
d0c6a58
Cambios
GuillermoMoralesS Aug 4, 2025
bb7c743
Merge branch 'MostrarProductos'
GuillermoMoralesS Aug 4, 2025
9b0b2ee
solucion de la api
velazcopolo Aug 4, 2025
dc8f9e6
Merge branch 'main' into revert-31-bd-productos
anagit2025 Aug 5, 2025
4cf0d9d
Revert "serializacion mucho a muchos" (#32)
anagit2025 Aug 5, 2025
75fbaf3
correcciones
anagit2025 Aug 5, 2025
26c6dbc
cargar productos
HannahAlAssad Aug 5, 2025
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
17 changes: 9 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"githubPullRequests.ignoredPullRequestBranches": ["main"]
}
17 changes: 10 additions & 7 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,23 @@ verify_ssl = true
[dev-packages]

[packages]
flask = "*"
flask-sqlalchemy = "*"
flask-migrate = "*"
flask-swagger = "*"
psycopg2-binary = "*"
python-dotenv = "*"
flask-cors = "*"
gunicorn = "*"
cloudinary = "*"
flask-admin = "*"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
flask-migrate = "*"
flask-swagger = "*"
email-validator = "*"
tomli = "*"
flask-cors = "*"
flask-sqlalchemy = "*"
flask-jwt-extended = "*"
flask-bcrypt = "*"
cloudinary = "*"
flask = "*"

[requires]
python_version = "3.13"
Expand Down
474 changes: 298 additions & 176 deletions Pipfile.lock

Large diffs are not rendered by default.

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

This file was deleted.

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

Revision ID: c1b7772616bc
Revises:
Create Date: 2025-08-05 18:55:58.850569

"""
from alembic import op
import sqlalchemy as sa


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


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('category',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.Column('description', sa.String(), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
)
op.create_table('pet_type',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
)
op.create_table('user',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=True),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('password', sa.String(), nullable=False),
sa.Column('is_active', sa.Boolean(), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email')
)
op.create_table('order',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('status', sa.Enum('CART', 'PENDING', 'COMPLETED', 'CANCELLED', name='status'), nullable=False),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('product',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.Column('description', sa.String(), nullable=False),
sa.Column('photo', sa.String(), nullable=False),
sa.Column('coste', sa.Float(), nullable=False),
sa.Column('price', sa.Float(), nullable=False),
sa.Column('pet_type_id', sa.Integer(), nullable=False),
sa.Column('stock', sa.Integer(), nullable=True),
sa.ForeignKeyConstraint(['pet_type_id'], ['pet_type.id'], ),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
)
op.create_table('order_item',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('order_id', sa.Integer(), nullable=False),
sa.Column('product_id', sa.Integer(), nullable=False),
sa.Column('cant', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['order_id'], ['order.id'], ),
sa.ForeignKeyConstraint(['product_id'], ['product.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('product_category',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('category_id', sa.Integer(), nullable=False),
sa.Column('product_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['category_id'], ['category.id'], ),
sa.ForeignKeyConstraint(['product_id'], ['product.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('product_category')
op.drop_table('order_item')
op.drop_table('product')
op.drop_table('order')
op.drop_table('user')
op.drop_table('pet_type')
op.drop_table('category')
# ### end Alembic commands ###
Loading