Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
b88a957
modificacion de navbar
Hun73R717 Oct 20, 2025
4f0a131
Avances de backend con modelos
1v4nP4 Oct 21, 2025
aeded35
fix: models. feat: seeder
jseiglie Oct 21, 2025
8b08fe8
Modelos terminados
1v4nP4 Oct 22, 2025
3f6ca16
Merge pull request #1 from 4GeeksAcademy/models
1v4nP4 Oct 22, 2025
bb38d58
modificacion navbar
Hun73R717 Oct 22, 2025
d089983
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
Hun73R717 Oct 22, 2025
8562bf9
Merge pull request #2 from 4GeeksAcademy/navbar
Hun73R717 Oct 22, 2025
e016207
Modelos revisados
1v4nP4 Oct 23, 2025
3dc9e33
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
1v4nP4 Oct 23, 2025
b50224f
Merge pull request #3 from 4GeeksAcademy/models
1v4nP4 Oct 23, 2025
031e1be
footer y header
luciacasasco Oct 24, 2025
1b95de4
Arreglo del bootstrap
1v4nP4 Oct 24, 2025
da31dc3
Merge branch 'Footer' of https://github.com/4GeeksAcademy/Final-Proye…
1v4nP4 Oct 24, 2025
5187cac
Merge pull request #4 from 4GeeksAcademy/Footer
1v4nP4 Oct 24, 2025
013e2f4
vino sergio
1v4nP4 Oct 24, 2025
d3d04e5
Merge pull request #5 from 4GeeksAcademy/Footer
1v4nP4 Oct 24, 2025
faab48d
crear pag login
Hun73R717 Oct 24, 2025
4ba6ac0
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
Hun73R717 Oct 24, 2025
37bf389
Merge pull request #6 from 4GeeksAcademy/login
Hun73R717 Oct 24, 2025
0be3e2f
Register endpoint hecho
1v4nP4 Oct 24, 2025
40d6961
Merge pull request #7 from 4GeeksAcademy/routes
1v4nP4 Oct 24, 2025
3cf3363
registro empezado
1v4nP4 Oct 24, 2025
6316c28
Merge pull request #8 from 4GeeksAcademy/main
1v4nP4 Oct 24, 2025
dcddb1b
login cambio elemnto
Hun73R717 Oct 24, 2025
634fc71
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
Hun73R717 Oct 24, 2025
2fb9340
correcion de llamado del elemento cuando se le da click al boton
Hun73R717 Oct 27, 2025
c7c8e02
Merge pull request #9 from 4GeeksAcademy/login
Hun73R717 Oct 27, 2025
aef890c
avanzado el register
1v4nP4 Oct 27, 2025
bf78875
Update HeroSection component
luciacasasco Oct 27, 2025
b020d7e
Merge branch 'register' of https://github.com/4GeeksAcademy/Final-Pro…
1v4nP4 Oct 27, 2025
28d3c0b
Merge pull request #10 from 4GeeksAcademy/register
1v4nP4 Oct 27, 2025
50250e8
Merge branch 'login' of https://github.com/4GeeksAcademy/Final-Proyec…
1v4nP4 Oct 27, 2025
1aebfc2
arreglo de conflictos y password
1v4nP4 Oct 27, 2025
1e444f6
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
1v4nP4 Oct 27, 2025
c2744d9
Merge pull request #11 from 4GeeksAcademy/login
1v4nP4 Oct 27, 2025
7287442
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
1v4nP4 Oct 27, 2025
07b807a
ya funciona el login
1v4nP4 Oct 27, 2025
5dcfdfc
Merge pull request #12 from 4GeeksAcademy/login
1v4nP4 Oct 27, 2025
2507b96
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
1v4nP4 Oct 27, 2025
d11adef
registro empezado
1v4nP4 Oct 27, 2025
7b5dd9e
Merge pull request #13 from 4GeeksAcademy/register
1v4nP4 Oct 27, 2025
b92faa0
Merge pull request #14 from 4GeeksAcademy/hero-section
luciacasasco Oct 27, 2025
c535bc6
Features HS
luciacasasco Oct 27, 2025
49ca0a0
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
luciacasasco Oct 27, 2025
43d3d09
Merge pull request #15 from 4GeeksAcademy/hero-section
luciacasasco Oct 27, 2025
4702758
endpoint login creado
1v4nP4 Oct 30, 2025
75343cf
fix login
1v4nP4 Oct 30, 2025
6dcc0dd
Merge pull request #16 from 4GeeksAcademy/login
1v4nP4 Oct 30, 2025
6606624
register ya funciona
1v4nP4 Oct 31, 2025
66a9f1e
Merge pull request #17 from 4GeeksAcademy/register
1v4nP4 Oct 31, 2025
262d369
fix register
1v4nP4 Oct 31, 2025
35395f6
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
1v4nP4 Oct 31, 2025
4a90e73
Merge pull request #18 from 4GeeksAcademy/register
1v4nP4 Oct 31, 2025
d3b1d42
edit creado
Hun73R717 Oct 31, 2025
549f298
Merge branch 'develop' of https://github.com/4GeeksAcademy/Final-Proy…
Hun73R717 Oct 31, 2025
06d6348
Merge pull request #19 from 4GeeksAcademy/profile
Hun73R717 Oct 31, 2025
e04cfbd
Call to action hecho
luciacasasco Nov 3, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ database.database
database.db
diagram.png
__pycache__/
migrations/*
4 changes: 3 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ gunicorn = "*"
cloudinary = "*"
flask-admin = "*"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
bcrypt = "*"
flask-jwt-extended = "*"
werkzeug = "*"

[requires]
python_version = "3.13"
Expand Down
837 changes: 474 additions & 363 deletions Pipfile.lock

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions aa
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
* develop
login
main
navbar
register
35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

43 changes: 43 additions & 0 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": {
"bootstrap": "^5.3.8",
"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.18.0"
}
}
12 changes: 9 additions & 3 deletions src/api/admin.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@

import os
from flask_admin import Admin
from .models import db, User
from .models import db, User, Tienda, Productos, Detalles_pedido, Favoritos, Notificaciones, Historial, Resenas
from flask_admin.contrib.sqla import ModelView

def setup_admin(app):
app.secret_key = os.environ.get('FLASK_APP_KEY', 'sample key')
app.config['FLASK_ADMIN_SWATCH'] = 'cerulean'
admin = Admin(app, name='4Geeks Admin', template_mode='bootstrap3')
admin = Admin(app, name='4Geeks Admin')# template_mode='bootstrap3')


# Add your models here, for example this is how we add a the User model to the admin
admin.add_view(ModelView(User, db.session))

admin.add_view(ModelView(Tienda, db.session))
admin.add_view(ModelView(Productos, db.session))
admin.add_view(ModelView(Detalles_pedido, db.session))
admin.add_view(ModelView(Favoritos, db.session))
admin.add_view(ModelView(Notificaciones, db.session))
admin.add_view(ModelView(Historial, db.session))
admin.add_view(ModelView(Resenas, db.session))
# You can duplicate that line to add mew models
# admin.add_view(ModelView(YourModelName, db.session))
Loading