Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
cbe2479
Models y rutas basicas
zoscra Jul 17, 2025
1fa7994
Merge pull request #1 from 4GeeksAcademy/Backend
zoscra Jul 17, 2025
2dd4bfc
login y register
daviidgodino Jul 18, 2025
3071b74
Merge pull request #2 from 4GeeksAcademy/Develop
daviidgodino Jul 18, 2025
acca8c9
LOGINRegister
daviidgodino Jul 18, 2025
02213d0
Models y rutas basicas arregladas
zoscra Jul 18, 2025
4989ccf
Merge pull request #3 from 4GeeksAcademy/Backend
zoscra Jul 18, 2025
21cdf1b
pagina principal
CarlosAguayo1 Jul 18, 2025
7efa89f
Merge pull request #4 from 4GeeksAcademy/main
daviidgodino Jul 19, 2025
d053970
cambiado env
daviidgodino Jul 19, 2025
50065be
barrabusqueda
daviidgodino Jul 19, 2025
0235cbd
Merge pull request #5 from 4GeeksAcademy/barra-busqueda
daviidgodino Jul 19, 2025
fab8262
Merge branch 'Develop' into login-David
daviidgodino Jul 19, 2025
121623f
Merge pull request #6 from 4GeeksAcademy/login-David
daviidgodino Jul 19, 2025
0ee4d8e
Merge pull request #7 from 4GeeksAcademy/Pagina-principal
CarlosAguayo1 Jul 21, 2025
1273e47
Version que carga
zoscra Jul 22, 2025
374f109
Register con Api,Navbar,Store Funcional
zoscra Jul 23, 2025
c8edc42
Login Funcional y bonito
zoscra Jul 23, 2025
e0546f0
ESTABLE
zoscra Jul 24, 2025
466fb52
Enlazado,registro,login
zoscra Jul 25, 2025
f0dc155
Sistema de registro y login completamente funcional
zoscra Jul 28, 2025
185a55d
Sistema de creacion de ofertas en home y visualizacion en home
zoscra Jul 30, 2025
86d8592
Esta roto
zoscra Aug 4, 2025
8ac1ee9
Reset password
zoscra Aug 14, 2025
89ff12b
flask-mail
zoscra Aug 18, 2025
efe52c0
reset password 2
zoscra Aug 20, 2025
9b9f0b6
Funcional
zoscra Aug 22, 2025
7876f38
urlfront
zoscra Aug 22, 2025
03b6435
flaskmail
zoscra Aug 22, 2025
ab0b4ef
tomli
zoscra Aug 22, 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
3 changes: 3 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
bcrypt = "*"
flask-mail = "*"
tomli = "*"

[requires]
python_version = "3.13"
Expand Down
445 changes: 272 additions & 173 deletions Pipfile.lock

Large diffs are not rendered by default.

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

This file was deleted.

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

Revision ID: 91adadb09156
Revises:
Create Date: 2025-08-22 06:46:36.007477

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '91adadb09156'
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(), nullable=False),
sa.Column('vehicle', sa.Boolean(), nullable=False),
sa.Column('coordenates', sa.String(length=120), nullable=False),
sa.Column('name', sa.String(length=200), nullable=False),
sa.Column('vehicle_consume_km', sa.Float(precision=50), nullable=True),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('coordenates'),
sa.UniqueConstraint('email')
)
op.create_table('oferta',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('id_comprador', sa.Integer(), nullable=True),
sa.Column('id_vendedor', sa.Integer(), nullable=False),
sa.Column('esta_realizada', sa.Boolean(), nullable=False),
sa.Column('descripcion', sa.String(length=600), nullable=False),
sa.Column('titulo', sa.String(length=200), nullable=False),
sa.Column('coordenates_vendedor', sa.String(length=120), nullable=False),
sa.Column('coordenates_comprador', sa.String(length=120), nullable=True),
sa.Column('precio_ud', sa.Integer(), nullable=True),
sa.Column('ud', sa.String(length=200), nullable=False),
sa.Column('img_cosecha', sa.String(), nullable=True),
sa.ForeignKeyConstraint(['coordenates_comprador'], ['user.coordenates'], ),
sa.ForeignKeyConstraint(['coordenates_vendedor'], ['user.coordenates'], ),
sa.ForeignKeyConstraint(['id_comprador'], ['user.id'], ),
sa.ForeignKeyConstraint(['id_vendedor'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('oferta')
op.drop_table('user')
# ### end Alembic commands ###
91 changes: 62 additions & 29 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"main": "index.js",
"scripts": {
"dev": "vite",
"start": "vite",
"build": "vite build",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
"start": "vite",
"build": "vite build",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
"author": {
"name": "Alejandro Sanchez",
Expand All @@ -30,13 +30,13 @@
"license": "ISC",
"devDependencies": {
"@types/react": "^18.2.18",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.0.4",
"eslint": "^8.46.0",
"eslint-plugin-react": "^7.33.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"vite": "^4.4.8"
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.0.4",
"eslint": "^8.46.0",
"eslint-plugin-react": "^7.33.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"vite": "^4.4.8"
},
"babel": {
"presets": [
Expand All @@ -54,9 +54,10 @@
]
},
"dependencies": {
"@vis.gl/react-google-maps": "^1.5.4",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.18.0"
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.30.1"
}
}
Loading