Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 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
7f5a70b
añadida funcionalidad login y vista nueva del Dashboard
GuillermoMoralesS Jul 24, 2025
11726b7
Cambios en el registro, login, Creacion del dashboard y cambios en la…
GuillermoMoralesS Jul 25, 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"]
}
14 changes: 8 additions & 6 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,22 @@ 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 = "*"
flask = "*"
flask-cors = "*"
flask-sqlalchemy = "*"
flask-jwt-extended = "*"
flask-bcrypt = "*"
email-validator = "*"

[requires]
python_version = "3.13"
Expand Down
435 changes: 259 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/ec3dc653e85e_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
"""empty message

Revision ID: ec3dc653e85e
Revises:
Create Date: 2025-07-23 19:05:41.212111

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'ec3dc653e85e'
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