Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
2ba113c
Add files via upload
guilarte100192 Jul 18, 2025
1dfd92a
1eraparte
ThanerMerlo Jul 23, 2025
34340cd
CambiosDEThaner
guilarte100192 Jul 23, 2025
e54b709
Modif-CSS
guilarte100192 Jul 23, 2025
f65bf17
Depurando CSS
guilarte100192 Jul 23, 2025
30d054d
Add files via upload
guilarte100192 Jul 25, 2025
9f52b0f
Primero paso del HOME
guilarte100192 Jul 25, 2025
0511a7a
ImagenHome
guilarte100192 Jul 25, 2025
1e05087
Delete src/front/assets/img/Gif-Fondo.MOV
guilarte100192 Jul 25, 2025
bd3eeb8
Imagen para HOME
guilarte100192 Jul 25, 2025
4019137
Delete src/front/assets/ImagenDJ.jpg
guilarte100192 Jul 25, 2025
f6e3dd2
nuevaImagen
guilarte100192 Jul 25, 2025
cf11837
otra imagen
guilarte100192 Jul 25, 2025
5ce9c76
otra foto
guilarte100192 Jul 25, 2025
df5606e
integrando fondos a los page
guilarte100192 Jul 25, 2025
4195a82
rutas medio creadas
Sebas-RS Jul 28, 2025
609aa01
Agregando Card al Home
guilarte100192 Jul 28, 2025
23876b8
Merge pull request #1 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Jul 28, 2025
0e3369c
Merge branch 'Main' into Dev-Sebas
AngelRRand Jul 28, 2025
62199d8
Merge pull request #2 from 4GeeksAcademy/Dev-Sebas
AngelRRand Jul 28, 2025
bfb3e7b
DEPURANDO
guilarte100192 Jul 28, 2025
9b202bf
Add files via upload
guilarte100192 Jul 30, 2025
36b4ef5
Agregadon carousel
guilarte100192 Jul 30, 2025
c417c44
Merge branch 'Developer-Alejandro' of https://github.com/4GeeksAcadem…
guilarte100192 Jul 30, 2025
2464880
Retoques carousel, textos, titulos
guilarte100192 Jul 30, 2025
80d9673
Merge pull request #3 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Jul 30, 2025
921649c
Merge pull request #4 from 4GeeksAcademy/Main
ThanerMerlo Jul 30, 2025
6d666e7
Agregando mas card
guilarte100192 Jul 30, 2025
7816af9
Merge pull request #5 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Jul 30, 2025
0967ae1
rutas evento
XanderCodex-lab Aug 1, 2025
cda5b9b
Merge pull request #6 from 4GeeksAcademy/Developer-Alexander
XanderCodex-lab Aug 1, 2025
b9b1cd1
Register, Login y roles(revisar)
XanderCodex-lab Aug 1, 2025
ee07c4d
Merge pull request #7 from 4GeeksAcademy/Developer-Alexander
XanderCodex-lab Aug 1, 2025
ccc7ffb
rutas hechas y probadas
Sebas-RS Aug 3, 2025
bc07d4c
backend estructurado
Sebas-RS Aug 3, 2025
419e02a
backen terminado con google maps
Sebas-RS Aug 4, 2025
ed76fc3
Merge pull request #9 from 4GeeksAcademy/Main
guilarte100192 Aug 4, 2025
e6fab39
Merge branch 'Main' into Dev-Sebas
AngelRRand Aug 4, 2025
f38963c
Merge pull request #8 from 4GeeksAcademy/Dev-Sebas
AngelRRand Aug 4, 2025
e470f84
revisao
AngelRRand Aug 4, 2025
318fa98
Merge pull request #10 from 4GeeksAcademy/Developer-Alexander
XanderCodex-lab Aug 4, 2025
822fd65
Merge pull request #11 from 4GeeksAcademy/Main
guilarte100192 Aug 4, 2025
9378c4f
Merge pull request #12 from 4GeeksAcademy/Main
ThanerMerlo Aug 4, 2025
e633124
agregado formulario ,eventos,navbar
ThanerMerlo Aug 4, 2025
1ad0caa
Merge remote-tracking branch 'refs/remotes/origin/DevelopThaner' into…
ThanerMerlo Aug 4, 2025
f86f105
pull,merge de el nuevo backend
ThanerMerlo Aug 4, 2025
9cd4d38
Merge pull request #13 from 4GeeksAcademy/DevelopThaner
ThanerMerlo Aug 6, 2025
2585208
Merge pull request #14 from 4GeeksAcademy/Main
guilarte100192 Aug 6, 2025
4fd272f
CORS
guilarte100192 Aug 7, 2025
ec57d9e
Merge pull request #15 from 4GeeksAcademy/Developer-Alejandro
ThanerMerlo Aug 8, 2025
f8148c8
fech de register
guilarte100192 Aug 8, 2025
ea1c242
Merge pull request #16 from 4GeeksAcademy/Developer-Alejandro
Sebas-RS Aug 8, 2025
dd7b30d
Merge pull request #17 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Aug 8, 2025
c0a5925
Agrego modal de los detalles de las CARDS
guilarte100192 Aug 9, 2025
b6b9492
Formulario actualizado
ThanerMerlo Aug 9, 2025
3b51bca
Merge pull request #19 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Aug 9, 2025
ec6e35e
Merge pull request #20 from 4GeeksAcademy/Main
guilarte100192 Aug 9, 2025
f0e7f10
Merge pull request #21 from 4GeeksAcademy/Main
Sebas-RS Aug 10, 2025
5a1777f
modificaciones formu
ThanerMerlo Aug 11, 2025
69e2f42
delete y put
Sebas-RS Aug 11, 2025
77fedf7
Merge pull request #22 from 4GeeksAcademy/Dev-Sebas
Sebas-RS Aug 11, 2025
dc92aae
actual
ThanerMerlo Aug 11, 2025
22dc50e
Merge pull request #23 from 4GeeksAcademy/Main
ThanerMerlo Aug 11, 2025
f46eedd
Merge pull request #24 from 4GeeksAcademy/DevelopThaner
ThanerMerlo Aug 11, 2025
dcce475
Fetch de PUT Y DELETE
Sebas-RS Aug 11, 2025
7746d5b
cambios
XanderCodex-lab Aug 11, 2025
1ffb372
Merge pull request #25 from 4GeeksAcademy/Developer-Alexander
XanderCodex-lab Aug 11, 2025
d875e62
Merge pull request #26 from 4GeeksAcademy/Main
ThanerMerlo Aug 12, 2025
6701c4d
fetch de put y delete
Sebas-RS Aug 13, 2025
3df72bc
put y delete
Sebas-RS Aug 13, 2025
a19ba35
ultimos cambios
Sebas-RS Aug 13, 2025
1666463
Merge branch 'Main' into Dev-Sebas
AngelRRand Aug 14, 2025
21f1a59
Merge pull request #27 from 4GeeksAcademy/Dev-Sebas
Sebas-RS Aug 14, 2025
d601387
Main actualizado
Sebas-RS Aug 14, 2025
b1d999a
Merge pull request #28 from 4GeeksAcademy/Main
guilarte100192 Aug 18, 2025
72e8949
Merge pull request #29 from 4GeeksAcademy/Main
ThanerMerlo Aug 18, 2025
6a09033
cambios
ThanerMerlo Aug 18, 2025
d4268fb
Google maps finiquitado
Sebas-RS Aug 18, 2025
b31a0bf
Retoques CCS
guilarte100192 Aug 18, 2025
f05766d
Merge pull request #30 from 4GeeksAcademy/Developer-Alejandro
Sebas-RS Aug 18, 2025
e40f16d
Merge branch 'DevelopThaner' of https://github.com/4GeeksAcademy/Proy…
ThanerMerlo Aug 18, 2025
743e9f3
Finalizar merge con Developer-Alejandro
Sebas-RS Aug 18, 2025
b933e4e
Finalizar merge con Developer-Alejandro
Sebas-RS Aug 18, 2025
49b7db7
Retocando CCS
guilarte100192 Aug 18, 2025
a1a3d5b
Merge pull request #31 from 4GeeksAcademy/Dev-Sebas
Sebas-RS Aug 18, 2025
532c99b
Merge pull request #32 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Aug 18, 2025
7678cbd
Merge pull request #33 from 4GeeksAcademy/Main
guilarte100192 Aug 18, 2025
d940ef3
EventForm
ThanerMerlo Aug 18, 2025
b47e33c
API-KEY
guilarte100192 Aug 18, 2025
84a9e38
flask mail on
ThanerMerlo Aug 20, 2025
d9f55dc
About y Contact
Sebas-RS Aug 20, 2025
2c2e253
Merge pull request #36 from 4GeeksAcademy/Dev-Sebas
Sebas-RS Aug 20, 2025
16dafdb
flask mail + front
ThanerMerlo Aug 21, 2025
e1db7e1
restablecimiento funciona
ThanerMerlo Aug 21, 2025
306fac9
Comenzando Mapp
guilarte100192 Aug 21, 2025
1248a08
Merge pull request #37 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Aug 21, 2025
ca76127
Merge pull request #38 from 4GeeksAcademy/Main
guilarte100192 Aug 21, 2025
900d801
cards mappers
guilarte100192 Aug 21, 2025
2410986
Merge branch 'Main' into DevelopThaner
ThanerMerlo Aug 22, 2025
c5091ee
Merge pull request #39 from 4GeeksAcademy/DevelopThaner
ThanerMerlo Aug 22, 2025
e5026ef
DB
guilarte100192 Aug 22, 2025
bb0c97e
Merge pull request #40 from 4GeeksAcademy/Main
ThanerMerlo Aug 22, 2025
bcfa96a
Img a cards
guilarte100192 Aug 22, 2025
a6b8895
Merge pull request #41 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Aug 22, 2025
a6754f7
Merge pull request #42 from 4GeeksAcademy/Main
guilarte100192 Aug 22, 2025
e4bbb29
add tomli
ThanerMerlo Aug 22, 2025
2475ffb
pipenv install
ThanerMerlo Aug 22, 2025
4245c3d
Terminando CSS
guilarte100192 Aug 22, 2025
59d35f8
Merge pull request #44 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Aug 22, 2025
d5f46e0
Merge pull request #45 from 4GeeksAcademy/Main
guilarte100192 Aug 22, 2025
818bd24
Merge pull request #46 from 4GeeksAcademy/Main
guilarte100192 Aug 22, 2025
9ad331d
debbug
guilarte100192 Aug 22, 2025
76a0955
Reset db
guilarte100192 Aug 23, 2025
0b9551e
Merge pull request #47 from 4GeeksAcademy/Developer-Alejandro
guilarte100192 Aug 23, 2025
9b27538
Ultimos retoques CCS
guilarte100192 Aug 25, 2025
412a5f6
Merge pull request #48 from 4GeeksAcademy/AlejandroDev
guilarte100192 Aug 25, 2025
1a07183
db
guilarte100192 Aug 26, 2025
a75dda2
db2
guilarte100192 Aug 26, 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
4 changes: 1 addition & 3 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# This file includes global variables that will be available inside your project
# 1. In the front end code you can access this variables like this: console.log(import.meta.env.VARIABLE_NAME)
# 1. In the back end code you access the variable by importing os and then typing print(os.getenv('VARIABLE_NAME'))

# Back-End Variables
DATABASE_URL=postgres://gitpod:postgres@localhost:5432/example
FLASK_APP_KEY="any key works"
FLASK_APP=src/app.py
FLASK_DEBUG=1
DEBUG=TRUE

# Front-End Variables
VITE_BASENAME=/
#VITE_BACKEND_URL=
#VITE_BACKEND_URL=
28 changes: 23 additions & 5 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,38 @@ verify_ssl = true
[dev-packages]

[packages]
flask = "*"
tomli = "*"
flask-sqlalchemy = "*"
flask-migrate = "*"
flask-swagger = "*"
psycopg2-binary = "*"
python-dotenv = "*"
flask-cors = "*"
gunicorn = "*"
cloudinary = "*"
flask-admin = "*"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
flask-bcrypt = "*"
flask-migrate = "*"
blinker = "==1.9.0"
certifi = "==2025.7.14"
charset-normalizer = "==3.4.2"
click = "==8.2.1"
flask = "==3.1.1"
gitdb = "==4.0.12"
gitpython = "==3.1.41"
greenlet = "==3.2.3"
idna = "==3.10"
jinja2 = "==3.1.6"
markupsafe = "==3.0.2"
requests = "==2.32.4"
smmap = "==5.0.2"
sqlalchemy = "==2.0.41"
typing-extensions = "==4.14.1"
urllib3 = "==2.5.0"
werkzeug = "==3.1.3"
flask-admin = "*"
flask-mail = "*"
itsdangerous = "*"

[requires]
python_version = "3.13"
Expand Down
609 changes: 434 additions & 175 deletions Pipfile.lock

Large diffs are not rendered by default.

32 changes: 18 additions & 14 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<!DOCTYPE html>
<html class="h-100">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<title>Hello Rigo with React + Flux + Context.js</title>
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
<link rel="shortcut icon" href="./4geeks.ico"></head>
<body class="h-100">
<div id="app" class="h-100"></div>
<script type="text/javascript" src="./bundle.js"></script>
</body>
</html>
<!doctype html>
<html lang="en">
<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" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Festquila</title>
<script type="module" crossorigin src="/assets/index-c559096d.js"></script>
<link rel="stylesheet" href="/assets/index-d81b6e8e.css">
</head>
<body>
<div id="root"></div>

<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion docs/assets/reset_migrations.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ 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 &&
pipenv run migrate &&
pipenv run upgrade
pipenv run upgrade
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<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" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Hello Rigo</title>
<title>Festquila</title>
</head>
<body>
<div id="root"></div>
Expand Down
35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

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

Revision ID: 08924aa3e3d1
Revises:
Create Date: 2025-08-23 13:26:57.055300
"""
from alembic import op
import sqlalchemy as sa

# revision identifiers, used by Alembic.

revision = '08924aa3e3d1'
down_revision = None
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('artist',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=False),
sa.Column('genere', sa.String(length=120), nullable=True),
sa.Column('social_link', sa.String(
length=255), nullable=True),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
)
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=True),
sa.Column('role', sa.String(length=20), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email')
)
op.create_table('event',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=120), nullable=False),
sa.Column('date', sa.String(length=50), nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('location', sa.String(
length=255), nullable=True),
sa.Column('lat', sa.Float(), nullable=True),
sa.Column('lng', sa.Float(), nullable=True),
sa.Column('artist_id', sa.Integer(), nullable=True),
sa.Column('price', sa.Numeric(
precision=10, scale=2), nullable=False),
sa.ForeignKeyConstraint(['artist_id'], ['artist.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('cart_item',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('event_id', sa.Integer(), nullable=False),
sa.Column('quantity', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['event_id'], ['event.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('purchase',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('event_id', sa.Integer(), nullable=False),
sa.Column('quantity', sa.Integer(), nullable=False),
sa.Column('timestamp', sa.DateTime(), nullable=False),
sa.ForeignKeyConstraint(['event_id'], ['event.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


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