Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
05623a0
prueba
Silvia-LC Jul 18, 2025
44962d3
login-aboutus
AdrianBene Jul 21, 2025
465f6e2
gitMerge branch 'Adrian' into beta
AdrianBene Jul 21, 2025
f7890c8
navbar-test
Silvia-LC Jul 21, 2025
5d11b63
nav
Silvia-LC Jul 21, 2025
acc77b2
conflict footer
Silvia-LC Jul 21, 2025
eee8865
login-contact-aboutus-footer
AdrianBene Jul 22, 2025
fc6ebe0
navbar-home
Silvia-LC Jul 22, 2025
309f651
navbar-home
Silvia-LC Jul 23, 2025
ac1a081
navbar-home
Silvia-LC Jul 23, 2025
c498b04
carousel
Silvia-LC Jul 23, 2025
530510c
carousel-install lucide
Silvia-LC Jul 23, 2025
a92ea0b
color login
AdrianBene Jul 23, 2025
06794dd
changes nav
AdrianBene Jul 23, 2025
bbcff6e
Merge branch 'beta' into Adrian
AdrianBene Jul 23, 2025
85e4899
prueba
AdrianBene Jul 23, 2025
99c8265
nothome
AdrianBene Jul 23, 2025
7855df1
icono error
AdrianBene Jul 23, 2025
916b60d
models y route user
AdrianBene Jul 23, 2025
ebf1e6d
routes-modal-user-create
AdrianBene Jul 23, 2025
b430e87
actualizar
AdrianBene Jul 23, 2025
030b862
carousel-banner
Silvia-LC Jul 23, 2025
eee7b75
carousel-banner
Silvia-LC Jul 23, 2025
0a01b7a
register
AdrianBene Jul 24, 2025
6d09a62
Merge branch 'Adrian' into beta
AdrianBene Jul 24, 2025
72d7b05
update-carousel-navbar-home
Silvia-LC Jul 24, 2025
7431674
login-route-login-token
AdrianBene Jul 25, 2025
266b672
Link to register
AdrianBene Jul 25, 2025
5464c32
update nav-home-carousel
Silvia-LC Jul 25, 2025
6b655d7
soporte, footer, warnings
Betoluchenco Jul 25, 2025
8b5acb9
modificacion carpetas
Betoluchenco Jul 25, 2025
d67bf05
Merge pull request #2 from 4GeeksAcademy/Silvia
Silvia-LC Jul 25, 2025
1e7de2c
logo-home-navbar-cards
Silvia-LC Jul 27, 2025
80aec3d
Merge pull request #3 from 4GeeksAcademy/Silvia
Silvia-LC Jul 27, 2025
08aff35
cambios en footer y rutas
Betoluchenco Jul 27, 2025
3f95459
route game and model game
AdrianBene Jul 28, 2025
d810f3e
route game and modal
AdrianBene Jul 28, 2025
f858e5a
prueba
AdrianBene Jul 28, 2025
1b4bec1
Merge branch 'beta' into Adrian
AngelRRand Jul 28, 2025
ad85c73
Merge pull request #4 from 4GeeksAcademy/Adrian
AngelRRand Jul 28, 2025
f956010
Merge branch 'beta' of https://github.com/4GeeksAcademy/FinalProject-…
Betoluchenco Jul 28, 2025
b02cac5
test home
Silvia-LC Jul 28, 2025
3bccc86
Merge pull request #5 from 4GeeksAcademy/Silvia
Silvia-LC Jul 28, 2025
0722bf4
errors
AdrianBene Jul 28, 2025
f7cf80b
beto 2
Betoluchenco Jul 28, 2025
0ec88af
beto 2
Betoluchenco Jul 28, 2025
36c0ec7
Merge branch 'beta' of https://github.com/4GeeksAcademy/FinalProject-…
AdrianBene Jul 28, 2025
698a8ea
cambio .
Betoluchenco Jul 28, 2025
f9a21db
formulario-front-home-bgcolor
Silvia-LC Jul 28, 2025
1516353
Merge pull request #6 from 4GeeksAcademy/Silvia
Silvia-LC Jul 28, 2025
d9edd42
update formulario
Silvia-LC Jul 28, 2025
2e6e649
Merge pull request #7 from 4GeeksAcademy/Silvia
Silvia-LC Jul 28, 2025
647cb44
route add,delete,get
AdrianBene Jul 28, 2025
cfeb478
logica formulario
Silvia-LC Jul 29, 2025
768e612
Merge pull request #8 from 4GeeksAcademy/Silvia
Silvia-LC Jul 29, 2025
e01a778
Merge branch 'beta' into Adrian
AdrianBene Jul 29, 2025
dba89fc
update form
Silvia-LC Jul 30, 2025
f2f102c
Merge pull request #9 from 4GeeksAcademy/Silvia
Silvia-LC Jul 30, 2025
cd7526d
routes-api
AdrianBene Jul 30, 2025
00e9537
Merge branch 'beta' into Adrian
AdrianBene Jul 30, 2025
f12dc10
Merge pull request #10 from 4GeeksAcademy/Alberto
Betoluchenco Jul 30, 2025
2a835bb
Guardando cambios en package-lock.json
Betoluchenco Jul 30, 2025
8a72cb7
Merge branch 'beta' into Alberto
Betoluchenco Jul 30, 2025
736cde8
Guardando cambios en package-lock.json
Betoluchenco Jul 30, 2025
64a9092
Guardando cambios en package.json
Betoluchenco Jul 30, 2025
06f599b
cambios beto
Betoluchenco Jul 30, 2025
a61f6cb
Merge pull request #11 from 4GeeksAcademy/Alberto
Betoluchenco Jul 30, 2025
254f6af
cambios home y form
Silvia-LC Jul 30, 2025
98c56ac
icons install
Silvia-LC Jul 30, 2025
a395ac7
Merge branch 'beta' into Silvia
Silvia-LC Jul 30, 2025
ade1824
login link
AdrianBene Jul 30, 2025
39eaf81
Merge branch 'beta' into Adrian
AdrianBene Jul 30, 2025
bdfd8fc
routes variable backend
AdrianBene Jul 30, 2025
3b237a8
juegosnuevos
Betoluchenco Jul 30, 2025
c3f478b
Merge branch 'beta' into Alberto
Betoluchenco Jul 30, 2025
1fbe827
navbar-form-home
Silvia-LC Jul 30, 2025
3d8d1d3
silvia
Betoluchenco Jul 30, 2025
f832efd
Eliminar migraciones conflictivas
Silvia-LC Jul 30, 2025
57726db
home-games prepare
AdrianBene Jul 30, 2025
19f794d
Merge pull request #12 from 4GeeksAcademy/Silvia
Silvia-LC Jul 31, 2025
131fc04
addgame-backendurl
Silvia-LC Jul 31, 2025
0c282b4
Merge pull request #13 from 4GeeksAcademy/Silvia
Silvia-LC Jul 31, 2025
6f381b3
games in home
AdrianBene Jul 31, 2025
cd7ab48
Merge branch 'beta' into Adrian
AdrianBene Jul 31, 2025
68c2561
estilos footer
Silvia-LC Jul 31, 2025
e48b18e
Merge pull request #14 from 4GeeksAcademy/Silvia
Silvia-LC Jul 31, 2025
33f9d7f
games
AdrianBene Jul 31, 2025
e75cdb9
footer fijo
Betoluchenco Jul 31, 2025
7f4deab
login-cerrar sesion-home games
AdrianBene Jul 31, 2025
0d0b6d6
cambios de estilos
Betoluchenco Aug 1, 2025
e02f5c5
Merge branch 'beta' into Adrian
AdrianBene Aug 1, 2025
22e4e8c
cards home
AdrianBene Aug 1, 2025
ca61568
Merge branch 'beta' of https://github.com/4GeeksAcademy/FinalProject-…
AdrianBene Aug 1, 2025
42b7eb0
cards css
Betoluchenco Aug 1, 2025
f2ef543
actualizacion routes
AdrianBene Aug 1, 2025
31e1510
arreglos
AdrianBene Aug 1, 2025
873ccc5
modificaciones para renderizar web
Betoluchenco Aug 1, 2025
3e55290
cards-navbar
Silvia-LC Aug 2, 2025
44cbe28
Merge pull request #15 from 4GeeksAcademy/Silvia
Silvia-LC Aug 2, 2025
5b539e0
ruta Login
AdrianBene Aug 2, 2025
64e3d10
detailsGames
AdrianBene Aug 2, 2025
77f6a41
Merge branch 'beta' of https://github.com/4GeeksAcademy/FinalProject-…
AdrianBene Aug 2, 2025
119bd90
Merge branch 'beta' into Adrian
AdrianBene Aug 2, 2025
66bd689
detailsGames tailwin
AdrianBene Aug 4, 2025
253f1cb
logo footer
Silvia-LC Aug 4, 2025
3c4f550
actualizacion db Game
AdrianBene Aug 4, 2025
eb11153
Addgames update
Silvia-LC Aug 4, 2025
a24bbf6
Merge branch 'Silvia' into beta
Silvia-LC Aug 4, 2025
26d01cc
esitlo DetailsGames
Silvia-LC Aug 4, 2025
dddabe8
Merge pull request #16 from 4GeeksAcademy/Silvia
Silvia-LC Aug 4, 2025
2a71bb3
mod db and addGame
AdrianBene Aug 4, 2025
d0dc674
Merge branch 'beta' into Adrian
AdrianBene Aug 4, 2025
690cb4b
detailsgames backend-front and logic
AdrianBene Aug 4, 2025
4add798
db user
AdrianBene Aug 5, 2025
989b2b7
Merge branch 'beta' into Alberto
Betoluchenco Aug 5, 2025
d4c303e
carro y funcionalidades nuevas
Betoluchenco Aug 6, 2025
9de6263
estilos
Silvia-LC Aug 6, 2025
6c2cfc8
estilos detailsgames-video
Silvia-LC Aug 6, 2025
3ee965d
resgiter form- estilos
Silvia-LC Aug 6, 2025
900e66e
Merge pull request #17 from 4GeeksAcademy/Silvia
Silvia-LC Aug 6, 2025
4236dc5
recuperacion
Betoluchenco Aug 6, 2025
f5f9f69
actualizacion y reparacion de codigo
AdrianBene Aug 6, 2025
6544329
admin boton añadir juego
AdrianBene Aug 7, 2025
8b71945
ocultar botones segun rol
AdrianBene Aug 7, 2025
2fab6c8
carro final
Betoluchenco Aug 8, 2025
cbba6cb
add video - form-back
Silvia-LC Aug 8, 2025
6437339
Merge pull request #18 from 4GeeksAcademy/Silvia
Silvia-LC Aug 8, 2025
a0cf30a
buttons cards
Silvia-LC Aug 10, 2025
5d061f6
Merge pull request #19 from 4GeeksAcademy/Silvia
Silvia-LC Aug 10, 2025
bda09a9
orden
AdrianBene Aug 10, 2025
3cb834f
Merge branch 'beta' of https://github.com/4GeeksAcademy/FinalProject-…
AdrianBene Aug 10, 2025
6b50c28
boton eliminar juego front-back
AdrianBene Aug 10, 2025
6242481
editar juegos
Silvia-LC Aug 11, 2025
a1be878
prueba
Silvia-LC Aug 11, 2025
6d5c994
prueba
Silvia-LC Aug 11, 2025
58142ae
save
Silvia-LC Aug 11, 2025
9665413
recuperar contraseña
AdrianBene Aug 11, 2025
a0dbf82
modificar
Silvia-LC Aug 11, 2025
ab68386
EditGames-games.py
Silvia-LC Aug 12, 2025
b4c6d84
EditGames terminado
Silvia-LC Aug 12, 2025
78d4d8f
Merge branch 'Silvia' into beta
Silvia-LC Aug 12, 2025
f55bb05
Merge pull request #20 from 4GeeksAcademy/beta
Silvia-LC Aug 12, 2025
bfdad21
Merge pull request #21 from 4GeeksAcademy/Silvia
Silvia-LC Aug 12, 2025
234c46b
navbar-cards
Silvia-LC Aug 12, 2025
b0dddc2
Merge branch 'Silvia' of https://github.com/4GeeksAcademy/FinalProjec…
Silvia-LC Aug 12, 2025
6f98b28
Merge pull request #22 from 4GeeksAcademy/Silvia
Silvia-LC Aug 12, 2025
4f7a81f
enviar email
AdrianBene Aug 12, 2025
ca8b4df
front email
AdrianBene Aug 12, 2025
4ab8510
reset password
AdrianBene Aug 13, 2025
6c0624c
Merge branch 'beta' into Adrian
AdrianBene Aug 13, 2025
3ab4bef
cambios
Betoluchenco Aug 13, 2025
96a4fff
cambios2
Betoluchenco Aug 13, 2025
c03ad21
ocultar modificar noadmin
AdrianBene Aug 13, 2025
0fe2d98
updates
Silvia-LC Aug 13, 2025
6a108e6
Merge branch 'beta' into Silvia
Silvia-LC Aug 13, 2025
60e83d8
Merge pull request #23 from 4GeeksAcademy/Silvia
Silvia-LC Aug 13, 2025
4947e2e
url
AdrianBene Aug 13, 2025
807e392
estilos home-cards-register-login
Silvia-LC Aug 13, 2025
93ffafc
Merge pull request #24 from 4GeeksAcademy/Silvia
Silvia-LC Aug 13, 2025
9055753
filtro
Betoluchenco Aug 14, 2025
a45c94f
Merge branch 'beta' into Alberto
Betoluchenco Aug 14, 2025
c7719f1
filtro completo
Betoluchenco Aug 15, 2025
d8dc92b
about us
AdrianBene Aug 15, 2025
16f15e9
Merge branch 'beta' into Adrian
AdrianBene Aug 15, 2025
5799e9d
estilos forms-home-register-recpassword
Silvia-LC Aug 16, 2025
e1b28c1
Merge pull request #25 from 4GeeksAcademy/Silvia
Silvia-LC Aug 16, 2025
ea3a866
prueba-barra-buscar-navbar
Silvia-LC Aug 17, 2025
bcc4a72
boton carritos
AdrianBene Aug 17, 2025
d6ce516
payment
AdrianBene Aug 18, 2025
989c882
Merge pull request #26 from 4GeeksAcademy/beta
AdrianBene Aug 18, 2025
593b904
tommi falllo
AdrianBene Aug 18, 2025
9c163b6
search bar
Silvia-LC Aug 19, 2025
895021d
Merge branch 'beta' into Adrian
Silvia-LC Aug 19, 2025
58b8006
Merge pull request #28 from 4GeeksAcademy/Adrian
Silvia-LC Aug 19, 2025
fd35d7c
Merge branch 'beta' into Silvia
Silvia-LC Aug 19, 2025
bceaa60
Merge pull request #29 from 4GeeksAcademy/Silvia
Silvia-LC Aug 19, 2025
e9ecd86
navbar-buscar
Silvia-LC Aug 19, 2025
72ae105
navbar-buscar
Silvia-LC Aug 19, 2025
d774f90
Merge pull request #30 from 4GeeksAcademy/Silvia
Silvia-LC Aug 19, 2025
d15a584
Merge branch 'main' into beta
Silvia-LC Aug 19, 2025
6c91106
admin email
AdrianBene Aug 19, 2025
043298d
Merge pull request #32 from 4GeeksAcademy/AdrianB
AdrianBene Aug 19, 2025
690db04
modificaciones de css y arreglos
Betoluchenco Aug 20, 2025
d2f0351
mapa
Betoluchenco Aug 20, 2025
fdb540b
estilos-buscar
Silvia-LC Aug 20, 2025
59fee10
Merge branch 'beta' into Silvia
Silvia-LC Aug 20, 2025
fc6549d
maps en footer
Betoluchenco Aug 20, 2025
34d1db9
valencia ubicacion
Betoluchenco Aug 20, 2025
2f28585
maps-buscar
Silvia-LC Aug 20, 2025
e80abcd
cambios
Silvia-LC Aug 20, 2025
9c5556b
final
Betoluchenco Aug 21, 2025
924a3f6
Merge branch 'beta' into Silvia
Silvia-LC Aug 22, 2025
0ec4a67
ajuste carousel
Silvia-LC Aug 22, 2025
27e0658
Merge pull request #35 from 4GeeksAcademy/Silvia
Silvia-LC Aug 22, 2025
d9f01cf
correccion nintendo
Betoluchenco Aug 22, 2025
4ea7933
entrega
Betoluchenco Sep 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
23 changes: 15 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
{
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"python.analysis.extraPaths": [
"./src/api",
"./src/api",
"./src/api",
"./src/api",
"./src/api"
]
}
9 changes: 7 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ verify_ssl = true

[packages]
flask = "*"
flask-sqlalchemy = "*"
flask-migrate = "*"
flask-swagger = "*"
psycopg2-binary = "*"
python-dotenv = "*"
Expand All @@ -19,7 +17,14 @@ flask-admin = "*"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
flask-bcrypt = "*"
flask-mail = "*"
flask-migrate = "*"
sqlalchemy = "*"
flask-sqlalchemy = "*"
stripe = "*"
tomli = "*"


[requires]
python_version = "3.13"
Expand Down
492 changes: 331 additions & 161 deletions Pipfile.lock

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
<head>
<meta charset="UTF-8" />
<link rel="icon" type="icon" href="/4geeks.ico" />
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" integrity="sha512-SnH5WK+bZxgPHs44uWIX+LLJAJ9/2PkPKZ5QiAj6Ta86w+fsb2TkcmfRyVX3pBnMFcV7oQPJkl9QevSCWr3W6A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<link href="/src/front/index.css" rel="stylesheet" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Hello Rigo</title>
<title>Game Store</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/front/main.jsx"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
</body>
</body>
</html>
35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

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

Revision ID: b07da2e750df
Revises:
Create Date: 2025-08-19 21:00:25.203060

"""
from alembic import op
import sqlalchemy as sa


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


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('games',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('img', sa.String(length=500), nullable=False),
sa.Column('video', sa.String(length=500), nullable=False),
sa.Column('name', sa.String(length=50), nullable=False),
sa.Column('platform', sa.String(length=30), nullable=False),
sa.Column('description', sa.String(length=600), nullable=False),
sa.Column('price', sa.Float(), nullable=False),
sa.Column('genero', sa.String(length=20), nullable=False),
sa.Column('distribuidora', sa.String(length=20), nullable=False),
sa.Column('online', sa.Integer(), nullable=False),
sa.Column('offline', sa.Integer(), nullable=False),
sa.Column('gamemode', sa.String(length=30), nullable=False),
sa.PrimaryKeyConstraint('id')
)
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('is_active', sa.Boolean(), nullable=False),
sa.Column('username', sa.String(length=120), nullable=False),
sa.Column('is_admin', 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')
op.drop_table('games')
# ### end Alembic commands ###
Loading