Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: gunicorn app:app
web: gunicorn --worker-class eventlet -w 1 app:app
2 changes: 1 addition & 1 deletion app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion project/manage/templates/chat.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h4 style='color: #ccc'>Start a conversation.</h4>
{% endif %}
</div>
</div>
<form action="POST" method="POST">
<form action="" method="POST">
<input id="text" class="animated fadeInDown message form-control" size="40"
placeholder="Enter your message here" autocomplete="off"></input>
<button type=submit class="animated fadeInDown btn btn-dark btn-lg btn-block" style="align: right">Send</button>
Expand Down
3 changes: 2 additions & 1 deletion project/manage/templates/competition_layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
</div>
<div class="col-md-2"></div>
</div>
</div>

</div>
14 changes: 7 additions & 7 deletions project/manage/templates/details.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{% extends 'competition_layout.html' %}
{% block comp_content %}
<div class="container mx-0 row card">
<div class="container col-5 mx-0">
<div class="container col-8 mx-0">
<dl class="row my-2">
<dt class="col-4 text-right">Date:</dt>
<dd class="col-8">{{ comp.date }}</dd>
<dt class="col-4 text-right">Address:</dt>
<dd class="col-8">
<dt class="col-6 text-right">Date:</dt>
<dd class="col-6">{{ comp.date }}</dd>
<dt class="col-6 text-right">Address:</dt>
<dd class="col-6">
<p class="my-0">
{{ comp.address }}
</p>
<p class="my-0">{{comp.city}}, {{comp.state}}, {{comp.zipcode}}</p>
</dd>
<dt class="col-4 text-right">Organizer:</dt>
<dd class="col-8">{{organizer.first_name}} {{organizer.last_name}}</dd>
<dt class="col-6 text-right">Organizer:</dt>
<dd class="col-6">{{organizer.first_name}} {{organizer.last_name}}</dd>
</dl>
</div>

Expand Down
17 changes: 9 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
appnope==0.1.0
astroid==1.5.3
bcrypt==3.1.4
beautifulsoup4==4.6.0
blinker==1.4
Expand All @@ -19,40 +18,43 @@ 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
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
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
Expand All @@ -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==2.10
WTForms-Components==0.10.3