Skip to content
This repository was archived by the owner on May 30, 2022. It is now read-only.

Heroku #157

Open
andrewhuang wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Heroku #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4fa3211
fix path in Procfile
Feb 20, 2017
dc81228
stop heroku from freaking out about favicon
Feb 25, 2017
1def14b
update settings.py for heroku
Feb 25, 2017
ff41400
fix static files
Feb 25, 2017
55a8828
remove unnecessary reqs
Feb 25, 2017
7112f33
Merge branch 'master' of github.com:MaxFangX/calendar-analytics
Feb 25, 2017
f540ee6
remove unnecessary reqs
Feb 26, 2017
037b90f
cleanup
Feb 27, 2017
d36d12f
tweak?
Mar 1, 2017
2d89769
meep
Mar 6, 2017
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: gunicorn cal.wsgi --log-file -
web: cd cal && gunicorn cal.wsgi --log-file -
8 changes: 0 additions & 8 deletions cal/README.md
View file
Open in desktop

This file was deleted.

17 changes: 14 additions & 3 deletions cal/cal/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
assert GOOGLE_CALENDAR_API_CLIENT_ID, "GOOGLE_CALENDAR_API_CLIENT_ID environment variable must be set"
assert GOOGLE_CALENDAR_API_CLIENT_SECRET, "GOOGLE_CALENDAR_API_CLIENT_SECRET environment variable must be set"

ALLOWED_HOSTS = ['panalytics.elasticbeanstalk.com', 'localhost', '127.0.0.1', 'ngrok.io']
ALLOWED_HOSTS = ['.herokuapp.com', 'localhost', '127.0.0.1', 'ngrok.io']

AUTHENTICATION_BACKENDS = (
# Python social auth
Expand Down Expand Up @@ -147,7 +147,7 @@
# Vendor processors
'social.apps.django_app.context_processors.backends',
'social.apps.django_app.context_processors.login_redirect', # TODO ensure this is used

]

WSGI_APPLICATION = 'cal.wsgi.application'
Expand Down Expand Up @@ -192,8 +192,19 @@
# https://docs.djangoproject.com/en/1.7/howto/static-files/

if ENVIRONMENT == 'prod':
STATIC_ROOT = os.path.join(BASE_DIR, "..", "www", "static")
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.9/howto/static-files/

PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))

STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')
STATIC_URL = '/static/'

# Extra places for collectstatic to find static files.
STATICFILES_DIRS = (
os.path.join(PROJECT_ROOT, '../static'),
)

BOWER_COMPONENTS_ROOT = os.path.join(BASE_DIR, "..", "www", "cal", "static/")
else:
STATIC_ROOT = os.path.join(BASE_DIR, "static/")
Expand Down
1 change: 1 addition & 0 deletions cal/cal/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{% endblock %}

{% block head_css %}
<link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
<link rel="stylesheet" href="{% static "lib/css/bootstrap.min.css" %}">
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
<link rel="stylesheet" href="{% static "bower_components/fullcalendar/dist/fullcalendar.min.css" %}"/>
Expand Down
3 changes: 3 additions & 0 deletions cal/cal/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.conf.urls import patterns, include, url
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.contrib import admin

urlpatterns = patterns(
Expand All @@ -23,3 +24,5 @@
url('', include('social.apps.django_app.urls', namespace='social')),

)

urlpatterns += staticfiles_urlpatterns()
12 changes: 12 additions & 0 deletions requirements-to-freeze.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Django==1.8.4
django-bower==5.1.0
django-loginas==0.2.2
djangorestframework==3.2.4
google-api-python-client==1.4.1
gunicorn==19.6.0
httplib2==0.10.3
jsonfield==1.0.3
oauth2client==1.5.0
python-dateutil==2.5.3
python-social-auth==0.2.14
pytz==2015.7
110 changes: 70 additions & 40 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,84 @@
appnope==0.1.0
awsebcli==3.7.7
blessed==1.9.5
botocore==1.4.43
appdirs==1.4.0
attrs==15.2.0
awscli==1.11.47
awsebcli==3.9.1
backports.ssl-match-hostname==3.5.0.1
BeautifulSoup==3.2.1
blessed==1.14.1
blinker==1.3
botocore==1.5.10
cement==2.8.2
chardet==2.3.0
colorama==0.3.7
decorator==4.0.9
Django==1.8.4
django-bower==5.1.0
django-filter==0.11.0
django-loginas==0.2.2
djangorestframework==3.2.4
configglue==1.1.2
configobj==5.0.6
cryptography==1.2.3
debtags==2.0
defer==1.0.6
dirspec==13.10
docker-py==1.7.2
dockerpty==0.4.1
docopt==0.6.2
docutils==0.12
google-api-python-client==1.4.1
gunicorn==19.3.0
docutils==0.13.1
duplicity==0.7.6
ecdsa==0.13
enum34==1.1.2
feedparser==5.1.3
futures==3.0.5
gyp==0.1
httplib2==0.9.1
ipdb==0.9.0
ipython==4.1.2
ipython-genutils==0.1.0
jmespath==0.9.0
jsonfield==1.0.3
Markdown==2.6.2
oauth2client==1.5.0
idna==2.0
ipaddress==1.0.16
jmespath==0.9.1
lockfile==0.12.2
lxml==3.5.0
Mako==1.0.3
MarkupSafe==0.23
nemo-emblems==3.2.3
netifaces==0.10.4
oauthlib==1.0.3
path.py==8.1.2
pathspec==0.3.4
oneconf==0.3.9
packaging==16.8
PAM==0.4.2
paramiko==1.16.0
pathspec==0.5.0
pexpect==4.0.1
pickleshare==0.6
psycopg2==2.6.1
ptyprocess==0.5.1
pyasn1==0.1.8
Pillow==3.1.2
piston-mini-client==0.7.5
protobuf==2.6.1
ptyprocess==0.5
pyasn1==0.2.2
pyasn1-modules==0.0.7
pycrypto==2.6.1
PyJWT==1.4.0
python-dateutil==2.5.3
python-openid==2.2.5
python-social-auth==0.2.14
pytz==2015.7
PyYAML==3.11
pycups==1.9.73
pycurl==7.43.0
pygobject==3.20.0
pyinotify==0.9.6
PyJWT==1.3.0
pyOpenSSL==0.15.1
pyparsing==2.1.10
pyparted==3.10.7
pyserial==3.0.1
pysmbc==1.0.15.5
python-apt==1.1.0b1
python-dateutil==2.6.0
python-debian==0.1.27
python-xlib==0.14
pyxdg==0.25
PyYAML==3.12
reportlab==3.3.0
requests==2.9.1
requests-oauthlib==0.6.1
rsa==3.2
rsa==3.4.2
s3transfer==0.1.10
semantic-version==2.5.0
simplegeneric==0.8.1
simplejson==3.8.0
service-identity==16.0.0
setproctitle==1.1.8
six==1.10.0
texttable==0.8.4
traitlets==4.2.1
uritemplate==0.6
tabulate==0.7.5
Twisted==16.0.0
urllib3==1.13.1
uTidylib==0.2
virtualenv==15.1.0
wcwidth==0.1.7
websocket-client==0.37.0
websocket-client==0.40.0
zope.interface==4.1.3