diff --git a/migrations/README b/migrations/README deleted file mode 100644 index 0e04844159..0000000000 --- a/migrations/README +++ /dev/null @@ -1 +0,0 @@ -Single-database configuration for Flask. diff --git a/migrations/alembic.ini b/migrations/alembic.ini deleted file mode 100644 index ec9d45c26a..0000000000 --- a/migrations/alembic.ini +++ /dev/null @@ -1,50 +0,0 @@ -# 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 diff --git a/migrations/env.py b/migrations/env.py deleted file mode 100644 index 4c9709271b..0000000000 --- a/migrations/env.py +++ /dev/null @@ -1,113 +0,0 @@ -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() diff --git a/migrations/script.py.mako b/migrations/script.py.mako deleted file mode 100644 index 2c0156303a..0000000000 --- a/migrations/script.py.mako +++ /dev/null @@ -1,24 +0,0 @@ -"""${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"} diff --git a/migrations/versions/dda1fcda5948_.py b/migrations/versions/dda1fcda5948_.py deleted file mode 100644 index b93ea547ca..0000000000 --- a/migrations/versions/dda1fcda5948_.py +++ /dev/null @@ -1,97 +0,0 @@ -"""empty message - -Revision ID: dda1fcda5948 -Revises: -Create Date: 2025-03-18 16:04:42.679001 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'dda1fcda5948' -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('password_reset', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('email', sa.String(length=120), nullable=False), - sa.Column('token', sa.String(length=255), nullable=False), - sa.Column('expires_at', sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('token') - ) - 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.Column('is_temporary_password', sa.Boolean(), nullable=True), - 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('ordered_food', sa.String(), nullable=True), - sa.Column('ordered_accessories', sa.String(), nullable=True), - sa.Column('status', sa.String(), nullable=False), - sa.ForeignKeyConstraint(['user_id'], ['user.id'], ), - sa.PrimaryKeyConstraint('id') - ) - 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=False), - 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('order') - op.drop_table('user') - op.drop_table('password_reset') - op.drop_table('foods') - op.drop_table('accessories') - # ### end Alembic commands ### diff --git a/src/api/commands.py b/src/api/commands.py index 5a1a270ccf..3023075155 100644 --- a/src/api/commands.py +++ b/src/api/commands.py @@ -1,4 +1,6 @@ + + import click from api.models import db, User, Food, Accessories, Pet from flask_bcrypt import Bcrypt @@ -47,7 +49,7 @@ def insert_data_catfood(): catfood.animal_type = "gato" catfood.age = "adulto" catfood.pathologies = "hipoalergénico" - catfood.url = "" + catfood.url = "https://era2vrmzk5n.exactdn.com/wp-content/uploads/2022/09/Pienso-15K-croqPEZ-Ayurveda-gato-kasaludintegral-1080x1080pix.jpg?strip=all&lossy=1&w=648&ssl=1" db.session.add(catfood) db.session.commit() @@ -61,6 +63,7 @@ def insert_data_catfood(): catfood.animal_type = "gato" catfood.age = "adulto" catfood.pathologies = "diabético" + catfood.url = "https://bixoto.com/media/catalog/product/cache/2e45ba69d70625e0fc47dbc2d34862e1/M/Y/MYNKvuY-920-2042_webp.png" db.session.add(catfood) db.session.commit() @@ -74,6 +77,7 @@ def insert_data_catfood(): catfood.animal_type = "gato" catfood.age = "cachorro" catfood.pathologies = "" + catfood.url = "https://www.tiendanimal.es/dw/image/v2/BDLQ_PRD/on/demandware.static/-/Sites-kiwoko-master-catalog/default/dw55de3cf2/images/ownat_prime_gf_kitten_OWN31463.jpg?sw=780&sh=780&sm=fit&q=85" db.session.add(catfood) db.session.commit() @@ -87,6 +91,7 @@ def insert_data_catfood(): catfood.animal_type = "gato" catfood.age = "senior" catfood.pathologies = "renal" + catfood.url = "https://media.zooplus.com/bilder/2/400/279797_pla_natural_greatness_diet_vet_renal_oxalate_5kg_hs_01_2.jpg" db.session.add(catfood) db.session.commit() @@ -100,6 +105,7 @@ def insert_data_catfood(): catfood.animal_type = "gato" catfood.age = "adulto" catfood.pathologies = "obesidad" + catfood.url = "https://www.tiendanimal.es/dw/image/v2/BDLQ_PRD/on/demandware.static/-/Sites-kiwoko-master-catalog/default/dwfc3b7ec1/images/pienso_gato_criadores_dietetic_obesity_CRD8967_M.jpg?sw=780&sh=780&sm=fit&q=85" db.session.add(catfood) db.session.commit() @@ -109,16 +115,17 @@ def insert_data_catfood(): @app.cli.command("insert_data_dogfood") def insert_data_food(): dogfood = Food() - dogfood.name = "Special Care hepatic/renal" - dogfood.brand="nfnatcane" - dogfood.description = "asd" - dogfood.ingredients = "ads" - dogfood.price = 1. + dogfood.name = " Veterinary Diet Renal pienso para perros" + dogfood.brand="Concept for Life " + dogfood.description = "Pienso dietético para perros adultos con insuficiencia renal crónica. Bajo en fósforo y proteína para reducir la formación de cálculos de oxalato y de urato. Con propiedades alcalinizantes de la orina" + dogfood.ingredients = "Arroz, 31,5 % maíz, grasa de ave, 4,7 % proteína de ave (rica en pollo, en parte deshidratada e hidrolizada), proteína de maíz, pulpa de remolacha deshidratada (desazucarada), gelatina (hidrolizada, HDP*), linaza, aceite de pescado, 1,5 % hígado de pollo (en parte deshidratado e hidrolizado, HDP*), aceite de girasol, carbonato de calcio, cloruro sódico, cloruro potásico, huevo (deshidratado), lignocelulosa, 0,3 % paredes celulares de levadura (ricas en manano-oligosacáridos y en beta-glucanos), 0,2 % citrato de potasio, inulina de achicoria, harina de algas (rica en DHA**)." + dogfood.price = 7.99 dogfood.pathologies = "renal" dogfood.animal_type = "perro" dogfood.age = "senior" dogfood.size = "medium" - dogfood.weight = 12. + dogfood.weight = 1. + dogfood.url = "https://media.zooplus.com/bilder/9/400/cfl_dog_renal_1kg_1000x1000_9.jpg" db.session.add(dogfood) db.session.commit() @@ -133,6 +140,7 @@ def insert_data_food(): dogfood.age = "cachorro" dogfood.size = "grande" dogfood.weight = 1. + dogfood.url = "https://www.tiendanimal.es/dw/image/v2/BDLQ_PRD/on/demandware.static/-/Sites-kiwoko-master-catalog/default/dw9b40881f/images/pienso_perros_ownat_care_digestive_OWN031569.jpg.jpg?sw=780&sh=780&sm=fit&q=85" db.session.add(dogfood) db.session.commit() @@ -142,12 +150,13 @@ def insert_data_food(): dogfood.brand="Virbac W1 Veterinary HPM" dogfood.description = "El alimento dietético para perros tiene un bajo contenido energético y de azúcares totales. Es bajo en hidratos de carbono y se caracteriza por un índice glucémico bajo. En cambio, Virbac Veterinary HPM Dog Weight Loss & Diabetes W1 proporciona a su mascota abundante fibra bruta, que favorece una agradable sensación de saciedad. La receta no contiene trigo, gluten, soja ni carne de vacuno, por lo que es bien tolerada por muchos perros." dogfood.ingredients = "Proteínas deshidratadas de cerdo y de ave, fécula de patata, lignocelulosa, hidrolizado de proteínas de cerdo y de ave, cáscaras de judías, grasa animal, minerales, linaza, pulpa de remolacha deshidratada, fibra de psyllium" - dogfood.price = 12. + dogfood.price = 12.99 dogfood.pathologies = "diabetes" dogfood.animal_type = "perro" dogfood.age = "adulto" dogfood.size = "" - dogfood.weight = 12. + dogfood.weight = 1.5 + dogfood.url = "https://www.tiendanimal.es/dw/image/v2/BDLQ_PRD/on/demandware.static/-/Sites-kiwoko-master-catalog/default/dw6af74272/images/virbac_pienso_perros_hpm_weight_loss_diabetes_VIRAD360106.jpg?sw=780&sh=780&sm=fit&q=85" db.session.add(dogfood) db.session.commit() @@ -177,6 +186,7 @@ def insert_data_food(): dogfood.age = "adulto" dogfood.size = "pequeño" dogfood.weight = 1. + dogfood.url = "https://media.zooplus.com/bilder/7/400/pla_163496_cfl_dog_sterilised_mini_1kg_7.jpg" db.session.add(dogfood) db.session.commit() @@ -196,6 +206,7 @@ def insert_data_exoticfood(): exoticfood.animal_type = "exótico" exoticfood.age = "adulto" exoticfood.weight = 1.5 + exoticfood.url = "https://media.zooplus.com/bilder/7/400/547507_pla_bunny_kaninchentraum_special_edition_harmony_1_5k_hs_01_7.jpg" db.session.add(exoticfood) db.session.commit() @@ -209,6 +220,7 @@ def insert_data_exoticfood(): exoticfood.animal_type = "exótico" exoticfood.age = "senior" exoticfood.weight = 5. + exoticfood.url = "https://media.zooplus.com/bilder/0/400/73777_pla_beaphar_care_kaninchen_5kg_hs_1_2_0.jpg" db.session.add(exoticfood) db.session.commit() @@ -222,6 +234,7 @@ def insert_data_exoticfood(): exoticfood.animal_type = "exótico" exoticfood.age = "cachorro" exoticfood.weight = 2.3 + exoticfood.url = "https://d7rh5s3nxmpy4.cloudfront.net/CMP9365/8/18407_347074-D.jpg" db.session.add(exoticfood) db.session.commit() @@ -235,6 +248,7 @@ def insert_data_exoticfood(): exoticfood.animal_type = "exótico" exoticfood.age = "senior" exoticfood.weight = 2.3 + exoticfood.url = "https://media.zooplus.com/bilder/5/400/28140_pla_jrfarm_grainless_complete_zwergkaninchen_5.jpg" db.session.add(exoticfood) db.session.commit() @@ -247,7 +261,7 @@ def insert_data_accessories(): accessories.price = 7.99 accessories.animal_type = "perro" accessories.pathologies = "" - accessories.url = "" + accessories.url = "https://media.zooplus.com/bilder/4/400/518156_pla_tiaki_security_collar_s_fg_5107_4.jpg" db.session.add(accessories) db.session.commit() @@ -258,7 +272,7 @@ def insert_data_accessories(): accessories.price = 35.99 accessories.animal_type = "gato" accessories.pathologies = "" - accessories.url = "" + accessories.url = "https://media.zooplus.com/bilder/3/400/modern_living_kratzm_bel_f_r_katzen_zur_wandmontage_hs_01_3.jpg" db.session.add(accessories) db.session.commit() @@ -269,7 +283,7 @@ def insert_data_accessories(): accessories.price = 199.99 accessories.animal_type = "perro" accessories.pathologies = "" - accessories.url = "" + accessories.url = "https://www.ferplast.es/cdn/shop/files/1-0180017573_x620.jpg?v=1728917798" db.session.add(accessories) db.session.commit() @@ -280,7 +294,7 @@ def insert_data_accessories(): accessories.price = 7.99 accessories.animal_type = "exótico" accessories.pathologies = "" - accessories.url = "" + accessories.url = "https://media.zooplus.com/bilder/7/400/451140_pla_tiaki_intelligence_toy_carrot_patch_fg_9772_7.jpg" db.session.add(accessories) db.session.commit() @@ -358,3 +372,17 @@ def insert_data_pet(): + + + + + + + + + + + + + + diff --git a/src/front/js/component/navbar.js b/src/front/js/component/navbar.js index 948de9caf6..0e013c1fa0 100755 --- a/src/front/js/component/navbar.js +++ b/src/front/js/component/navbar.js @@ -6,36 +6,27 @@ import { CiSearch } from "react-icons/ci"; import { Context } from "../store/appContext"; import { FaUserCircle, FaShoppingCart, FaSignOutAlt } from "react-icons/fa"; -export const Navbar = () => { +export const Navbar = ({ setActiveCategory }) => { // Recibimos setActiveCategory como prop const { store, actions } = useContext(Context); - const { user, cart } = store; // Obtenemos el usuario del store + const { user, cart } = store; + const cartItemCount = cart.length; - useEffect(() => { - console.log("Usuario en navbar:", user); - }, [user, cart]); - - // Contar la cantidad de productos en el carrito - const cartItemCount = cart.length; + if (typeof setActiveCategory !== "function") { + console.error("⚠️ Error: setActiveCategory no es una función en Navbar.js."); + return null; // Evitamos que falle si `setActiveCategory` no es válida + } return (