Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

first commit vista-producto #605

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5c8fbaa
first commit home
JenniferFernandezMurga Feb 28, 2025
44c01a1
first commit vista-producto
JenniferFernandezMurga Mar 1, 2025
a627d1b
second commit home
JenniferFernandezMurga Mar 1, 2025
f375d68
ft001 database first commit
BeaNovo Mar 5, 2025
5f4b04b
layout
JenniferFernandezMurga Mar 5, 2025
6b0da17
Merge pull request #2 from 4GeeksAcademy/ft002-home
BeaNovo Mar 5, 2025
3f7e562
ft001 database first full functional DB
BeaNovo Mar 5, 2025
7d0dd7b
ft001 database manejo de errores commit
BeaNovo Mar 5, 2025
c27860e
Merge branch 'develop' into ft001-base-de-datos
BeaNovo Mar 5, 2025
e013acd
Merge pull request #6 from 4GeeksAcademy/ft001-base-de-datos
Alejandrobv25 Mar 5, 2025
bd8ee95
obtener alimentos según el tipo de animal
BeaNovo Mar 6, 2025
8322500
renderizado terminado
JenniferFernandezMurga Mar 6, 2025
85fa4b2
Merge pull request #8 from 4GeeksAcademy/ft002-home
BeaNovo Mar 6, 2025
e5de680
inicio de usuario y nuevos piensos y mascotas
BeaNovo Mar 6, 2025
865bc89
Merge branch 'develop' into ft001-base-de-datos
BeaNovo Mar 6, 2025
a75b0c0
Merge pull request #9 from 4GeeksAcademy/ft001-base-de-datos
Brenes93 Mar 6, 2025
9259f15
Develop actualizado
Brenes93 Mar 7, 2025
fe04305
1. eliminado is_active de los modelos
Alejandrobv25 Mar 8, 2025
c9c8477
login actualizado
BeaNovo Mar 8, 2025
2c3ffad
Merge pull request #10 from 4GeeksAcademy/ft008-login
BeaNovo Mar 8, 2025
84d4be0
Merge branch 'Develop' into ft004-vista-producto
JenniferFernandezMurga Mar 8, 2025
afe36c4
trabajando en link a carrito
JenniferFernandezMurga Mar 9, 2025
cb975e5
modificado fetch de vistaProducto.js, implementada imagen variable(ur…
Alejandrobv25 Mar 9, 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
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gunicorn = "*"
cloudinary = "*"
flask-admin = "*"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
flask-jwt-extended = "*"
wtforms = "==3.1.2"

[requires]
Expand Down
654 changes: 357 additions & 297 deletions Pipfile.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions migrations/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Single-database configuration for Flask.
50 changes: 50 additions & 0 deletions migrations/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# A generic, single database configuration.

[alembic]
# template used to generate migration files
# file_template = %%(rev)s_%%(slug)s

# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false


# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic,flask_migrate

[handlers]
keys = console

[formatters]
keys = generic

[logger_root]
level = WARN
handlers = console
qualname =

[logger_sqlalchemy]
level = WARN
handlers =
qualname = sqlalchemy.engine

[logger_alembic]
level = INFO
handlers =
qualname = alembic

[logger_flask_migrate]
level = INFO
handlers =
qualname = flask_migrate

[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic

[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S
113 changes: 113 additions & 0 deletions migrations/env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
import logging
from logging.config import fileConfig

from flask import current_app

from alembic import context

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config

# Interpret the config file for Python logging.
# This line sets up loggers basically.
fileConfig(config.config_file_name)
logger = logging.getLogger('alembic.env')


def get_engine():
try:
# this works with Flask-SQLAlchemy<3 and Alchemical
return current_app.extensions['migrate'].db.get_engine()
except (TypeError, AttributeError):
# this works with Flask-SQLAlchemy>=3
return current_app.extensions['migrate'].db.engine


def get_engine_url():
try:
return get_engine().url.render_as_string(hide_password=False).replace(
'%', '%%')
except AttributeError:
return str(get_engine().url).replace('%', '%%')


# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
config.set_main_option('sqlalchemy.url', get_engine_url())
target_db = current_app.extensions['migrate'].db

# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
# ... etc.


def get_metadata():
if hasattr(target_db, 'metadatas'):
return target_db.metadatas[None]
return target_db.metadata


def run_migrations_offline():
"""Run migrations in 'offline' mode.

This configures the context with just a URL
and not an Engine, though an Engine is acceptable
here as well. By skipping the Engine creation
we don't even need a DBAPI to be available.

Calls to context.execute() here emit the given string to the
script output.

"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url, target_metadata=get_metadata(), literal_binds=True
)

with context.begin_transaction():
context.run_migrations()


def run_migrations_online():
"""Run migrations in 'online' mode.

In this scenario we need to create an Engine
and associate a connection with the context.

"""

# this callback is used to prevent an auto-migration from being generated
# when there are no changes to the schema
# reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
def process_revision_directives(context, revision, directives):
if getattr(config.cmd_opts, 'autogenerate', False):
script = directives[0]
if script.upgrade_ops.is_empty():
directives[:] = []
logger.info('No changes in schema detected.')

conf_args = current_app.extensions['migrate'].configure_args
if conf_args.get("process_revision_directives") is None:
conf_args["process_revision_directives"] = process_revision_directives

connectable = get_engine()

with connectable.connect() as connection:
context.configure(
connection=connection,
target_metadata=get_metadata(),
**conf_args
)

with context.begin_transaction():
context.run_migrations()


if context.is_offline_mode():
run_migrations_offline()
else:
run_migrations_online()
24 changes: 24 additions & 0 deletions migrations/script.py.mako
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
"""${message}

Revision ID: ${up_revision}
Revises: ${down_revision | comma,n}
Create Date: ${create_date}

"""
from alembic import op
import sqlalchemy as sa
${imports if imports else ""}

# revision identifiers, used by Alembic.
revision = ${repr(up_revision)}
down_revision = ${repr(down_revision)}
branch_labels = ${repr(branch_labels)}
depends_on = ${repr(depends_on)}


def upgrade():
${upgrades if upgrades else "pass"}


def downgrade():
${downgrades if downgrades else "pass"}
77 changes: 77 additions & 0 deletions migrations/versions/048c9f450777_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
"""empty message

Revision ID: 048c9f450777
Revises:
Create Date: 2025-03-09 16:28:54.721880

"""
from alembic import op
import sqlalchemy as sa


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


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('accessories',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=100), nullable=False),
sa.Column('brand', sa.String(length=100), nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('animal_type', sa.String(length=50), nullable=False),
sa.Column('pathologies', sa.Text(), nullable=True),
sa.Column('price', sa.Float(), nullable=False),
sa.Column('url', sa.String(length=255), nullable=True),
sa.PrimaryKeyConstraint('id')
)
op.create_table('foods',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=100), nullable=False),
sa.Column('brand', sa.String(length=100), nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('ingredients', sa.Text(), nullable=False),
sa.Column('weight', sa.Float(), nullable=False),
sa.Column('price', sa.Float(), nullable=False),
sa.Column('age', sa.String(), nullable=False),
sa.Column('animal_type', sa.String(length=50), nullable=False),
sa.Column('size', sa.String(length=30), nullable=True),
sa.Column('pathologies', sa.Text(), nullable=True),
sa.Column('url', sa.String(length=255), nullable=True),
sa.PrimaryKeyConstraint('id')
)
op.create_table('user',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=80), nullable=False),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('password', sa.String(length=80), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email')
)
op.create_table('pet',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=100), nullable=False),
sa.Column('size', sa.String(length=100), nullable=True),
sa.Column('breed', sa.String(length=100), nullable=True),
sa.Column('age', sa.String(), nullable=False),
sa.Column('animal_type', sa.String(), nullable=False),
sa.Column('pathologies', sa.Text(), nullable=True),
sa.Column('user_id', sa.Integer(), nullable=True),
sa.Column('url', sa.String(length=255), nullable=True),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('pet')
op.drop_table('user')
op.drop_table('foods')
op.drop_table('accessories')
# ### end Alembic commands ###
Loading