Change to Andrew's project structure

shxpark · Aug 26, 2015 · 67b09f7 · 67b09f7
1 parent bee036b
commit 67b09f7
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 9 deletions.
diff --git a/app.json b/app.json
@@ -19,7 +19,7 @@
         },
         "DJANGO_SETTINGS_MODULE": {
             "description": "Instructs our app to use the production settings module",
-            "value": "automated_survey.settings.production",
+            "value": "twilio_sample_project.settings.production",
             "required": true
         }
     },

diff --git a/automated_survey/management/commands/load_survey.py b/automated_survey/management/commands/load_survey.py
@@ -1,8 +1,9 @@
 import os
 from django.core.management import BaseCommand
-from automated_survey.settings.env import root
 from automated_survey.util.survey_loader import SurveyLoader
 
+root = os.path.abspath(os.path.dirname(__name__))
+
 
 class Command(BaseCommand):
     COMMAND = 'load_surveys'

diff --git a/automated_survey/tests/surveys_test.py b/automated_survey/tests/surveys_test.py
@@ -9,7 +9,7 @@ def test_entry_point_redirection(self):
         survey = Survey(title='A testing survey')
         survey.save()
 
-        response = self.client.post('/first_survey/')
+        response = self.client.post(reverse('first-survey'))
         expected_url = reverse('survey', kwargs={'survey_id': survey.id})
 
         assert expected_url in response.url
@@ -54,7 +54,7 @@ def test_render_context(self):
 
         question_response.save()
 
-        redirect = self.client.get('/')
+        redirect = self.client.get(reverse('app-root'))
         survey_results_url = reverse('survey-results', kwargs={'survey_id': survey.id})
 
         assert survey_results_url in redirect.url

diff --git a/manage.py b/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "automated_survey.settings.local")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "twilio_sample_project.settings.local")
 
     from django.core.management import execute_from_command_line
 

diff --git a/pytest.ini b/pytest.ini
@@ -1,2 +1,2 @@
 [pytest]
-DJANGO_SETTINGS_MODULE=automated_survey.settings.test
+DJANGO_SETTINGS_MODULE=twilio_sample_project.settings.test
diff --git a/...mated_survey/templates/base_template.html → templates/base_template.html b/...mated_survey/templates/base_template.html → templates/base_template.html
diff --git a/automated_survey/templates/results.html → templates/results.html b/automated_survey/templates/results.html → templates/results.html
diff --git a/automated_survey/settings/__init__.py → twilio_sample_project/__init__.py b/automated_survey/settings/__init__.py → twilio_sample_project/__init__.py
diff --git a/twilio_sample_project/settings/__init__.py b/twilio_sample_project/settings/__init__.py
diff --git a/automated_survey/settings/common.py → twilio_sample_project/settings/common.py b/automated_survey/settings/common.py → twilio_sample_project/settings/common.py
@@ -44,7 +44,7 @@
     'django.middleware.security.SecurityMiddleware',
 )
 
-ROOT_URLCONF = 'automated_survey.urls'
+ROOT_URLCONF = 'twilio_sample_project.urls'
 
 TEMPLATES = [
     {
@@ -62,7 +62,7 @@
     },
 ]
 
-WSGI_APPLICATION = 'automated_survey.wsgi.application'
+WSGI_APPLICATION = 'twilio_sample_project.wsgi.application'
 
 
 # Database

diff --git a/automated_survey/settings/env.py → twilio_sample_project/settings/env.py b/automated_survey/settings/env.py → twilio_sample_project/settings/env.py
diff --git a/automated_survey/settings/local.py → twilio_sample_project/settings/local.py b/automated_survey/settings/local.py → twilio_sample_project/settings/local.py
diff --git a/automated_survey/settings/production.py → twilio_sample_project/settings/production.py b/automated_survey/settings/production.py → twilio_sample_project/settings/production.py
diff --git a/automated_survey/settings/test.py → twilio_sample_project/settings/test.py b/automated_survey/settings/test.py → twilio_sample_project/settings/test.py
diff --git a/twilio_sample_project/staticfiles/__init__.py b/twilio_sample_project/staticfiles/__init__.py
diff --git a/twilio_sample_project/urls.py b/twilio_sample_project/urls.py
@@ -0,0 +1,5 @@
+from django.conf.urls import include, url
+
+urlpatterns = [
+    url(r'^automated_survey/', include('automated_survey.urls'))
+]
diff --git a/automated_survey/wsgi.py → twilio_sample_project/wsgi.py b/automated_survey/wsgi.py → twilio_sample_project/wsgi.py
@@ -12,7 +12,7 @@
 from django.core.wsgi import get_wsgi_application
 from whitenoise.django import DjangoWhiteNoise
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "automated_survey.settings.production")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "twilio_sample_project.settings.production")
 
 application = get_wsgi_application()
 application = DjangoWhiteNoise(application)