From 3bad364e2dcd8bab6b3ec6f7a87e0275e2d6b64d Mon Sep 17 00:00:00 2001 From: cbtMountSinai Date: Tue, 10 Jul 2018 10:28:30 -0400 Subject: [PATCH 1/2] getting up to date --- Procfile | 2 +- app/__init__.py | 2 +- config.py | 2 +- project/manage/templates/chat.html | 2 +- .../manage/templates/competition_layout.html | 3 ++- project/manage/templates/details.html | 14 +++++++------- requirements.txt | 17 +++++++++-------- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Procfile b/Procfile index ca6e941..0f1969c 100755 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn app:app +web: gunicorn --worker-class eventlet -w 1 app:app diff --git a/app/__init__.py b/app/__init__.py index f91e168..9a01470 100755 --- a/app/__init__.py +++ b/app/__init__.py @@ -12,7 +12,7 @@ lm = LoginManager() lm.init_app(app) # app.config['SECRET_KEY'] = 'uh23jl13o2j3' -app.config.from_object('config.BaseConfig') #HerokuDeploy +app.config.from_object('config.HerokuDeployConfig') #HerokuDeploy db = SQLAlchemy(app) socketio = SocketIO(app) diff --git a/config.py b/config.py index 5b03190..cd97e9d 100755 --- a/config.py +++ b/config.py @@ -19,5 +19,5 @@ class TestConfig(BaseConfig): class HerokuDeployConfig(object): SECRET_KEY = 'thisPasswordIsSoDarnAmazinglyStrong123!' -# SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL'] + SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL'] SQLALCHEMY_TRACK_MODIFICATIONS = False diff --git a/project/manage/templates/chat.html b/project/manage/templates/chat.html index 85ff507..8ab1e79 100644 --- a/project/manage/templates/chat.html +++ b/project/manage/templates/chat.html @@ -13,7 +13,7 @@

Start a conversation.

{% endif %} -
+ diff --git a/project/manage/templates/competition_layout.html b/project/manage/templates/competition_layout.html index 7ade8c3..bc86084 100644 --- a/project/manage/templates/competition_layout.html +++ b/project/manage/templates/competition_layout.html @@ -11,4 +11,5 @@
- \ No newline at end of file + + diff --git a/project/manage/templates/details.html b/project/manage/templates/details.html index 681f392..2658ffb 100644 --- a/project/manage/templates/details.html +++ b/project/manage/templates/details.html @@ -1,19 +1,19 @@ {% extends 'competition_layout.html' %} {% block comp_content %}
-
+
-
Date:
-
{{ comp.date }}
-
Address:
-
+
Date:
+
{{ comp.date }}
+
Address:
+

{{ comp.address }}

{{comp.city}}, {{comp.state}}, {{comp.zipcode}}

-
Organizer:
-
{{organizer.first_name}} {{organizer.last_name}}
+
Organizer:
+
{{organizer.first_name}} {{organizer.last_name}}
diff --git a/requirements.txt b/requirements.txt index 8bd8eae..0b04e4f 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ appnope==0.1.0 -astroid==1.5.3 bcrypt==3.1.4 beautifulsoup4==4.6.0 blinker==1.4 @@ -19,6 +18,7 @@ Flask-Admin==1.5.0 Flask-Bootstrap==3.3.7.1 Flask-Login==0.4.0 Flask-Mail==0.9.1 +Flask-OAuth==0.12 Flask-OAuthlib==0.9.4 Flask-Script==2.0.6 Flask-SocketIO==2.9.2 @@ -26,25 +26,28 @@ Flask-SQLAlchemy==2.3.2 Flask-Testing==0.6.2 Flask-User==0.6.19 Flask-WTF==0.14.2 +gevent==1.2.2 +gevent-socketio==0.3.6 +gevent-websocket==0.10.1 greenlet==0.4.12 gunicorn==19.7.1 +httplib2==0.10.3 idna==2.6 infinity==1.4 intervals==0.8.0 ipython==6.2.1 ipython-genutils==0.2.0 -isort==4.2.15 itsdangerous==0.24 jedi==0.11.0 Jinja2==2.9.6 -lazy-object-proxy==1.3.1 MarkupSafe==1.0 -mccabe==0.6.1 +mock==2.0.0 +oauth2==1.9.0.post1 oauthlib==2.0.6 parso==0.1.0 passlib==1.7.1 pbr==3.1.1 -pexpect==4.3.0 +pexpect==4.3.1 pickleshare==0.7.4 prompt-toolkit==1.0.15 psycopg2==2.7.3.2 @@ -52,7 +55,6 @@ ptyprocess==0.5.2 pycparser==2.18 pycryptodome==3.4.7 Pygments==2.2.0 -pylint==1.7.4 python-engineio==1.7.0 python-socketio==1.8.1 requests==2.18.4 @@ -70,6 +72,5 @@ visitor==0.1.3 wcwidth==0.1.7 Werkzeug==0.12.2 win-unicode-console==0.5 -wrapt==1.10.11 WTForms==2.1 -WTForms-Components==0.10.3 +WTForms-Components==0.10.3 \ No newline at end of file From db32dfd515a91cfa7bcb0c15403b7f421fc6e1dc Mon Sep 17 00:00:00 2001 From: LennyGonz Date: Tue, 10 Jul 2018 11:01:14 -0400 Subject: [PATCH 2/2] push --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0b04e4f..c0199e2 100755 --- a/requirements.txt +++ b/requirements.txt @@ -72,5 +72,5 @@ visitor==0.1.3 wcwidth==0.1.7 Werkzeug==0.12.2 win-unicode-console==0.5 -WTForms==2.1 -WTForms-Components==0.10.3 \ No newline at end of file +WTForms==2.10 +WTForms-Components==0.10.3