diff --git a/.gitignore b/.gitignore index 4cdaed01..4c368c06 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,102 @@ venv *.pyc staticfiles local_settings.py + +# Created by https://www.gitignore.io + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover + +# Translations +*.mo +*.pot + +# Django stuff: +*.log + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + + +### Django ### +*.log +*.pot +*.pyc +__pycache__/ +local_settings.py + + +### VirtualEnv ### +# Virtualenv +# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/ +.Python +[Bb]in +[Ii]nclude +[Ll]ib +[Ss]cripts +pyvenv.cfg +pip-selfcheck.json + + +### SublimeText ### +# cache files for sublime text +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache + +# workspace files are user-specific +*.sublime-workspace + +# project files should be checked into the repository, unless a significant +# proportion of contributors will probably not be using SublimeText +# *.sublime-project + +# sftp configuration file +sftp-config.json + diff --git a/Procfile b/Procfile index 3071ef8b..12a3d40e 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn turingmachine.wsgi --log-file - +web: gunicorn csp.wsgi --log-file - diff --git a/README.md b/README.md index 282bffa7..e1d7f399 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ -# Turing Machine +# Crowdsource Platform - Crowdresearch HCI Stanford -This is a Django 1.8 app using a Postgres database that can be deployed to Heroku. +This is a Django 1.8 app using a MySQL database that can be deployed to Heroku. ### Setup Install [Postgres](http://postgresapp.com/) and create a new database: bash> psql - psql> CREATE DATABASE turingmachine_dev; + psql> CREATE DATABASE crowdsource_dev ENCODING 'UTF8'; Create a `local_settings.py` file and configure it to connect to the Postgres database: DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql_psycopg2", - "NAME": "turingmachine_dev" + "NAME": "crowdsource_dev" } } diff --git a/turingmachine/__init__.py b/csp/__init__.py similarity index 100% rename from turingmachine/__init__.py rename to csp/__init__.py diff --git a/turingmachine/settings.py b/csp/settings.py similarity index 95% rename from turingmachine/settings.py rename to csp/settings.py index a80686ad..408dc86a 100644 --- a/turingmachine/settings.py +++ b/csp/settings.py @@ -1,5 +1,5 @@ """ -Django settings for turingmachine project. +Django settings for csp project. Generated by 'django-admin startproject' using Django 1.8. @@ -51,7 +51,7 @@ 'django.middleware.security.SecurityMiddleware', ) -ROOT_URLCONF = 'turingmachine.urls' +ROOT_URLCONF = 'csp.urls' TEMPLATES = [ { @@ -69,7 +69,7 @@ }, ] -WSGI_APPLICATION = 'turingmachine.wsgi.application' +WSGI_APPLICATION = 'csp.wsgi.application' # Database diff --git a/turingmachine/urls.py b/csp/urls.py similarity index 77% rename from turingmachine/urls.py rename to csp/urls.py index f8dc0164..ab9ae452 100644 --- a/turingmachine/urls.py +++ b/csp/urls.py @@ -3,7 +3,7 @@ urlpatterns = [ # Examples: - # url(r'^$', 'turingmachine.views.home', name='home'), + # url(r'^$', 'csp.views.home', name='home'), # url(r'^blog/', include('blog.urls')), url(r'^admin/', include(admin.site.urls)), diff --git a/turingmachine/wsgi.py b/csp/wsgi.py similarity index 76% rename from turingmachine/wsgi.py rename to csp/wsgi.py index 88fa0f84..4ebf1448 100644 --- a/turingmachine/wsgi.py +++ b/csp/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for turingmachine project. +WSGI config for csp project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -12,7 +12,7 @@ from django.core.wsgi import get_wsgi_application from dj_static import Cling -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "turingmachine.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "csp.settings") # application = get_wsgi_application() application = Cling(get_wsgi_application()) diff --git a/manage.py b/manage.py index cfb48e80..f8fefa22 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "turingmachine.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "csp.settings") from django.core.management import execute_from_command_line