diff --git a/Padel/.env.dev b/Padel/.env.dev new file mode 100644 index 0000000..e7a10c6 --- /dev/null +++ b/Padel/.env.dev @@ -0,0 +1,11 @@ +ENVIRONMENT="Development" + +FLASK_SECRET_KEY=29d3e20c7048a9d5df4f632fce4c0969fdac4e7f5334afff3ec869789a73a5d5 +FLASK_DATABASE=padel.sqlite + +MAIL_SERVER= 'smtp.mail.yahoo.com' +MAIL_PORT = 465 +MAIL_USERNAME = 'celestino_rey@ymail.com' +MAIL_PASSWORD = 'kbryvwxkockqckss' +MAIL_USE_TLS = 'False' +MAIL_USE_SSL = 'True' diff --git a/Padel/buildConCompose.sh b/Padel/buildConCompose.sh new file mode 100644 index 0000000..0cb3c15 --- /dev/null +++ b/Padel/buildConCompose.sh @@ -0,0 +1,3 @@ +docker-compose down -v +docker rmi padel_padel +docker-compose up -d --build \ No newline at end of file diff --git a/Padel/creaDBCompose.sh b/Padel/creaDBCompose.sh new file mode 100644 index 0000000..dfe11e6 --- /dev/null +++ b/Padel/creaDBCompose.sh @@ -0,0 +1 @@ +docker-compose exec python padel create_db \ No newline at end of file diff --git a/Padel/docker-compose.yml b/Padel/docker-compose.yml new file mode 100644 index 0000000..beae44e --- /dev/null +++ b/Padel/docker-compose.yml @@ -0,0 +1,15 @@ +version: '3.8' + +services: + padel: + build: ./servicios + command: python3 -m flask --app padel run -h 0.0.0.0 + volumes: + - ./padel:/usr/src/padel/ + ports: + - 5001:5000 + env_file: + - ./.env.dev + +volumes: + postgres_data: \ No newline at end of file diff --git a/Padel/Dockerfile b/Padel/servicios/Dockerfile similarity index 50% rename from Padel/Dockerfile rename to Padel/servicios/Dockerfile index c75c319..bc36ec3 100644 --- a/Padel/Dockerfile +++ b/Padel/servicios/Dockerfile @@ -4,11 +4,18 @@ FROM python:3.8-slim-buster WORKDIR /padel +# set environment variables +ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONUNBUFFERED 1 + COPY requirements.txt requirements.txt RUN pip3 install -r requirements.txt COPY . . -CMD [ "python3", "-m" , "flask", "--app", "padel", "run", "--host=0.0.0.0"] +# CMD [ "python3", "-m" , "flask", "--app", "padel", "run", "--host=0.0.0.0"] #CMD [ "python3", "-m" , "flask", "run", "--host=0.0.0.0"] + +# run entrypoint.sh +ENTRYPOINT ["/padel/entrypoint.sh"] \ No newline at end of file diff --git a/Padel/servicios/entrypoint.sh b/Padel/servicios/entrypoint.sh new file mode 100755 index 0000000..badf05f --- /dev/null +++ b/Padel/servicios/entrypoint.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +python -m flask --app padel init-db + +exec "$@" \ No newline at end of file diff --git a/Padel/padel/README.md b/Padel/servicios/padel/README.md similarity index 100% rename from Padel/padel/README.md rename to Padel/servicios/padel/README.md diff --git a/Padel/padel/__init__.py b/Padel/servicios/padel/__init__.py similarity index 100% rename from Padel/padel/__init__.py rename to Padel/servicios/padel/__init__.py diff --git a/Padel/padel/auth.py b/Padel/servicios/padel/auth.py similarity index 100% rename from Padel/padel/auth.py rename to Padel/servicios/padel/auth.py diff --git a/Padel/padel/basededatos.py b/Padel/servicios/padel/basededatos.py similarity index 100% rename from Padel/padel/basededatos.py rename to Padel/servicios/padel/basededatos.py diff --git a/Padel/padel/models.py b/Padel/servicios/padel/models.py similarity index 100% rename from Padel/padel/models.py rename to Padel/servicios/padel/models.py diff --git a/Padel/servicios/padel/nginx/Dockerfile b/Padel/servicios/padel/nginx/Dockerfile new file mode 100644 index 0000000..072b014 --- /dev/null +++ b/Padel/servicios/padel/nginx/Dockerfile @@ -0,0 +1,4 @@ +FROM nginx:1.25 + +RUN rm /etc/nginx/conf.d/default.conf +COPY nginx.conf /etc/nginx/conf.d \ No newline at end of file diff --git a/Padel/servicios/padel/nginx/nginx.conf b/Padel/servicios/padel/nginx/nginx.conf new file mode 100644 index 0000000..3566cde --- /dev/null +++ b/Padel/servicios/padel/nginx/nginx.conf @@ -0,0 +1,21 @@ +upstream hello_flask { + server web:5000; +} + +server { + + listen 80; + + location / { + proxy_pass http://hello_flask; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_redirect off; + } + + + location /static/ { + alias /home/app/web/project/static/; + } + +} \ No newline at end of file diff --git a/Padel/padel/paginas.py b/Padel/servicios/padel/paginas.py similarity index 100% rename from Padel/padel/paginas.py rename to Padel/servicios/padel/paginas.py diff --git a/Padel/padel/reservas.py b/Padel/servicios/padel/reservas.py similarity index 89% rename from Padel/padel/reservas.py rename to Padel/servicios/padel/reservas.py index 728af49..9e83f6f 100644 --- a/Padel/padel/reservas.py +++ b/Padel/servicios/padel/reservas.py @@ -6,6 +6,7 @@ from padel.basededatos import get_db from flask_login import login_required, current_user from flask_mail import Mail, Message import os +import sqlite3 bp = Blueprint("reservas", __name__) @@ -109,10 +110,22 @@ def eligedia(): # borra los registros del día anterior al de hoy db = get_db() - db.execute( - "DELETE FROM reservas WHERE fecha=?", (ayer,) - ) - db.commit() + + # pero antes, mete uno a una hora no usada por si acaso no hubiera + +# db.execute( +# "INSERT INTO reservas (nombre, fecha, hora) VALUES (?, ?, ?)", ("-", ayer, "00:00",), +# ) +# db.commit() + + + try: + db.execute( + "DELETE FROM reservas WHERE fecha=?", (ayer,) + ) + db.commit() + except sqlite3.Error as er: + print("SQLite error: %s" %(' '.join(er.args))) if request.method == "POST": diaelegido = request.form['dias'] @@ -140,7 +153,7 @@ def eligedia(): db.commit() horashoy = db.execute( - "SELECT * FROM horas WHERE fecha=?", (diaelegido,) + "SELECT * FROM reservas WHERE fecha=?", (diaelegido,) ).fetchall() db.commit() diff --git a/Padel/padel/schema.sql b/Padel/servicios/padel/schema.sql similarity index 100% rename from Padel/padel/schema.sql rename to Padel/servicios/padel/schema.sql diff --git a/Padel/padel/static/bulma.css b/Padel/servicios/padel/static/bulma.css similarity index 100% rename from Padel/padel/static/bulma.css rename to Padel/servicios/padel/static/bulma.css diff --git a/Padel/padel/static/styles.css b/Padel/servicios/padel/static/styles.css similarity index 100% rename from Padel/padel/static/styles.css rename to Padel/servicios/padel/static/styles.css diff --git a/Padel/padel/templates/_navegacion.html b/Padel/servicios/padel/templates/_navegacion.html similarity index 100% rename from Padel/padel/templates/_navegacion.html rename to Padel/servicios/padel/templates/_navegacion.html diff --git a/Padel/padel/templates/autorizacion/index.html b/Padel/servicios/padel/templates/autorizacion/index.html similarity index 100% rename from Padel/padel/templates/autorizacion/index.html rename to Padel/servicios/padel/templates/autorizacion/index.html diff --git a/Padel/padel/templates/autorizacion/login.html b/Padel/servicios/padel/templates/autorizacion/login.html similarity index 100% rename from Padel/padel/templates/autorizacion/login.html rename to Padel/servicios/padel/templates/autorizacion/login.html diff --git a/Padel/padel/templates/autorizacion/profile.html b/Padel/servicios/padel/templates/autorizacion/profile.html similarity index 100% rename from Padel/padel/templates/autorizacion/profile.html rename to Padel/servicios/padel/templates/autorizacion/profile.html diff --git a/Padel/padel/templates/autorizacion/signup.html b/Padel/servicios/padel/templates/autorizacion/signup.html similarity index 100% rename from Padel/padel/templates/autorizacion/signup.html rename to Padel/servicios/padel/templates/autorizacion/signup.html diff --git a/Padel/padel/templates/base.html b/Padel/servicios/padel/templates/base.html similarity index 100% rename from Padel/padel/templates/base.html rename to Padel/servicios/padel/templates/base.html diff --git a/Padel/padel/templates/paginas/acerca.html b/Padel/servicios/padel/templates/paginas/acerca.html similarity index 100% rename from Padel/padel/templates/paginas/acerca.html rename to Padel/servicios/padel/templates/paginas/acerca.html diff --git a/Padel/padel/templates/paginas/inicio.html b/Padel/servicios/padel/templates/paginas/inicio.html similarity index 100% rename from Padel/padel/templates/paginas/inicio.html rename to Padel/servicios/padel/templates/paginas/inicio.html diff --git a/Padel/padel/templates/reservas/eligedia.html b/Padel/servicios/padel/templates/reservas/eligedia.html similarity index 100% rename from Padel/padel/templates/reservas/eligedia.html rename to Padel/servicios/padel/templates/reservas/eligedia.html diff --git a/Padel/padel/templates/reservas/misreservas.html b/Padel/servicios/padel/templates/reservas/misreservas.html similarity index 100% rename from Padel/padel/templates/reservas/misreservas.html rename to Padel/servicios/padel/templates/reservas/misreservas.html diff --git a/Padel/padel/templates/reservas/reservahoras.html b/Padel/servicios/padel/templates/reservas/reservahoras.html similarity index 100% rename from Padel/padel/templates/reservas/reservahoras.html rename to Padel/servicios/padel/templates/reservas/reservahoras.html diff --git a/Padel/padel/templates/reservas/reservar.html b/Padel/servicios/padel/templates/reservas/reservar.html similarity index 100% rename from Padel/padel/templates/reservas/reservar.html rename to Padel/servicios/padel/templates/reservas/reservar.html diff --git a/Padel/requirements.txt b/Padel/servicios/requirements.txt similarity index 100% rename from Padel/requirements.txt rename to Padel/servicios/requirements.txt