Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
db11d98
Version to start to work
OscarVillalobos-GH Jun 13, 2025
3726b66
Check Status
OscarVillalobos-GH Jun 19, 2025
42832e8
vistas creadas
LA9905 Jun 22, 2025
3ac39c4
diseño vista Desarrollo web
LA9905 Jun 23, 2025
1e5584f
Merge branch '200_Alejandro'
LA9905 Jun 23, 2025
6c4e63d
modfique vistas de ApisIntegraciones y Ecommerce
LA9905 Jun 24, 2025
50bb6d0
vista ApisIntegraciones diseñada
LA9905 Jun 25, 2025
52c4a62
cambios
LA9905 Jun 25, 2025
12756a4
Merge branch '200_Alejandro'
LA9905 Jun 25, 2025
a3e06bc
added form and Public Key
LA9905 Jun 26, 2025
845aa1b
Merge branch '200_Alejandro'
LA9905 Jun 26, 2025
7603987
Planes Web
LA9905 Jul 14, 2025
825437d
Merge branch '200_Alejandro'
LA9905 Jul 14, 2025
b89e60a
add fixes
OscarVillalobos-GH Jul 15, 2025
34fe663
check
OscarVillalobos-GH Jul 15, 2025
da3cb5f
Add 3 components relation with ERP
OscarVillalobos-GH Jul 18, 2025
6a0b399
diseño home page casi terminado
Sarayrodriguezz Jul 19, 2025
a59f700
Merge remote-tracking branch 'origin/main' into 300_Saray
Sarayrodriguezz Jul 19, 2025
7b1ed69
solve merge conflict
Sarayrodriguezz Jul 19, 2025
37c9cfd
solve conflict wit main
LA9905 Jul 19, 2025
acae592
vistas Ecommerce y ApiIntegraciones mejoradas, formulario de home fun…
LA9905 Jul 20, 2025
8f78654
Vistas Desarrollo Web y Tecnologias mejoradas
LA9905 Jul 20, 2025
18c0a6a
vistas DesarrolloAplicacionesWeb y Tecnologias mejoradas
LA9905 Jul 20, 2025
3eedee7
add about us + fix details
OscarVillalobos-GH Jul 21, 2025
681da50
fix details
OscarVillalobos-GH Jul 21, 2025
79aaee7
home arreglado
LA9905 Jul 21, 2025
d0e94a6
vistas corregidas
LA9905 Jul 28, 2025
5ceabef
fix details
OscarVillalobos-GH Aug 6, 2025
7e3473a
correcion del diseño en el home y agrego info en about us
Sarayrodriguezz Aug 10, 2025
0409180
Merge branch 'develop' of https://github.com/OscarVillalobos-GH/Corpo…
OscarVillalobos-GH Aug 15, 2025
b5dd7d6
check
OscarVillalobos-GH Aug 15, 2025
0901c81
14_08_2025_20:26
OscarVillalobos-GH Aug 15, 2025
f881fcb
merge whit Oscar
LA9905 Aug 15, 2025
852560b
resolve conflic
LA9905 Aug 15, 2025
f10bb01
Merge pull request #1 from OscarVillalobos-GH/300_Saray
LA9905 Aug 15, 2025
7719ea8
Merge branch 'develop' into 100_oscar
OscarVillalobos-GH Aug 16, 2025
3e01289
Merge branch 'origin/100_oscar' into 100_oscar
OscarVillalobos-GH Aug 16, 2025
23a7ad9
Ajustes varios a todos los componentes, centralizacion a un component…
OscarVillalobos-GH Aug 18, 2025
e41fb13
Mas Ajustes y centrado..Me falta solo Tecnologias
OscarVillalobos-GH Aug 18, 2025
1adc8ca
Fix detail and componentes- Falta solo setup mail
OscarVillalobos-GH Aug 18, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
}
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"

[requires]
python_version = "3.10"
python_version = "3.13"

[scripts]
start="flask run -p 3001 -h 0.0.0.0"
Expand Down
465 changes: 3 additions & 462 deletions Pipfile.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/assets/reset_migrations.bash
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
rm -R -f ./migrations &&
pipenv run init &&
dropdb -h localhost -U gitpod example || true &&
createdb -h localhost -U gitpod example || true &&
psql -h localhost example -U gitpod -c 'CREATE EXTENSION unaccent;' || true &&
dropdb -h localhost -U postgres bd_corporativa || true &&
createdb -h localhost -U postgres bd_corporativa || true &&
psql -h localhost bd_corporativa -U postgres -c 'CREATE EXTENSION unaccent;' || true &&
pipenv run migrate &&
pipenv run upgrade
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"}
35 changes: 35 additions & 0 deletions migrations/versions/25556fa4d0ef_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""empty message

Revision ID: 25556fa4d0ef
Revises:
Create Date: 2025-06-26 18:28:53.076766

"""
from alembic import op
import sqlalchemy as sa


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


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
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=80), nullable=False),
sa.Column('is_active', sa.Boolean(), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('user')
# ### end Alembic commands ###
35 changes: 35 additions & 0 deletions migrations/versions/b51589e49543_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""empty message

Revision ID: b51589e49543
Revises:
Create Date: 2025-06-14 09:06:03.851477

"""
from alembic import op
import sqlalchemy as sa


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


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
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=80), nullable=False),
sa.Column('is_active', sa.Boolean(), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email')
)
# ### end Alembic commands ###


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