diff --git a/.gitignore b/.gitignore index 719aa17..d75cb60 100755 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,7 @@ venv/* env/ **/*.pytest_cache -**/__pycache__ +app/__pycache__ +app/frontend/__pycache__/ +app/frontend/api/__pycache__/ **/.DS_Store \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index a738bd2..e561422 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.10-alpine MAINTAINER Peter Fisher diff --git a/app/app.py b/app/app.py index fef71f9..c4a025e 100644 --- a/app/app.py +++ b/app/app.py @@ -1,4 +1,4 @@ -from flask import Blueprint, Flask +from flask import Flask from flask_login import LoginManager from flask_bootstrap import Bootstrap from frontend import frontend_blueprint @@ -11,14 +11,12 @@ bootstrap = Bootstrap(app) - app.config.update(dict( SECRET_KEY="powerful secretkey", WTF_CSRF_SECRET_KEY="a csrf secret key", - PRODUCT_SERVICE= 'http://192.168.99.100:8081' + PRODUCT_SERVICE='http://0.0.0.0:8081' )) app.register_blueprint(frontend_blueprint) app.run(debug=True, host='0.0.0.0') - diff --git a/app/frontend/forms.py b/app/frontend/forms.py index 998d317..00655cd 100644 --- a/app/frontend/forms.py +++ b/app/frontend/forms.py @@ -1,5 +1,5 @@ from flask_wtf import FlaskForm -from wtforms import StringField, PasswordField, SubmitField, HiddenField, IntegerField, SelectField +from wtforms import StringField, PasswordField, SubmitField, HiddenField, IntegerField from wtforms.validators import DataRequired, Email diff --git a/app/requirements.txt b/app/requirements.txt index e10d0f4..2770d3f 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,29 +1,30 @@ -atomicwrites==1.2.1 -attrs==18.2.0 +atomicwrites==1.4.0 +attrs==21.4.0 blinker==1.4 -certifi==2018.10.15 -chardet==3.0.4 -Click==7.0 -dominate==2.3.4 -Flask==1.0.2 -Flask-Bootstrap==3.3.7.1 +certifi==2021.10.8 +chardet==4.0.0 +dominate==2.6.0 Flask-Login==0.4.1 -Flask-SQLAlchemy==2.3.2 -Flask-WTF==0.14.2 -idna==2.7 -ItsDangerous==1.1.0 -MarkupSafe==1.1.1 -Jinja2==2.10.1 -more-itertools==4.3.0 +Flask-SQLAlchemy==2.5.1 +flask-swagger-ui==3.36.0 +Flask-Bootstrap>=3.3 +Flask-WTF>=0.14 +wtforms[email]==2.3.1 +idna==3.3 +more-itertools==8.12.0 mysql-connector==2.2.9 -passlib==1.7.1 -pluggy==0.8.0 -py==1.7.0 -pytest==3.9.1 -requests==2.20.0 -six==1.11.0 -SQLAlchemy==1.3.0 -urllib3==1.24.2 +passlib==1.7.4 +pluggy==1.0.0 +py==1.11.0 +pytest==7.1.1 +requests==2.27.1 +six==1.16.0 +SQLAlchemy==1.4.32 +urllib3==1.26.9 visitor==0.1.3 -Werkzeug==0.16.1 -WTForms==2.1 +click==8.1.0 +Flask==2.1.0 +itsdangerous==2.1.2 +Jinja2==3.1.1 +MarkupSafe==2.1.1 +Werkzeug~=2.0.0