Renamed example project

ellmetha · Dec 10, 2017 · f827abc · f827abc
1 parent 6770dad
commit f827abc
Show file tree

Hide file tree

Showing 35 changed files with 11 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,4 @@ tests/_testdata/media/machina
 tests/settings_local.py
 
 # Don't commit env-specific settings and files
-example_project/vanilla_project/settings/env.py
+example_project/example_project/settings/env.py
diff --git a/docs/example_project.rst b/docs/example_project.rst
@@ -17,7 +17,7 @@ To run this project locally, you can follow these instructions:
   $ cd example_project/
   $ pipenv run python manage.py migrate
   $ pipenv run python manage.py createsuperuser
-  $ pipenv run python manage.py loaddata vanilla_project/fixtures/*
+  $ pipenv run python manage.py loaddata example_project/fixtures/*
   $ pipenv run python manage.py runserver
 
 .. note::

diff --git a/example_project/vanilla/__init__.py → example_project/example/__init__.py b/example_project/vanilla/__init__.py → example_project/example/__init__.py
diff --git a/example_project/vanilla/apps/__init__.py → example_project/example/apps/__init__.py b/example_project/vanilla/apps/__init__.py → example_project/example/apps/__init__.py
diff --git a/...ple_project/vanilla/apps/auth/__init__.py → ...ple_project/example/apps/auth/__init__.py b/...ple_project/vanilla/apps/auth/__init__.py → ...ple_project/example/apps/auth/__init__.py
diff --git a/example_project/vanilla/apps/auth/forms.py → example_project/example/apps/auth/forms.py b/example_project/vanilla/apps/auth/forms.py → example_project/example/apps/auth/forms.py
diff --git a/example_project/vanilla/apps/auth/urls.py → example_project/example/apps/auth/urls.py b/example_project/vanilla/apps/auth/urls.py → example_project/example/apps/auth/urls.py
diff --git a/example_project/vanilla/apps/auth/views.py → example_project/example/apps/auth/views.py b/example_project/vanilla/apps/auth/views.py → example_project/example/apps/auth/views.py
@@ -16,7 +16,7 @@
 from django.views.generic import FormView
 from django.views.generic import UpdateView
 
-from vanilla.common.mixins import MenuItemMixin
+from example.common.mixins import MenuItemMixin
 
 from .forms import UserCreationForm
 from .forms import UserDeletionForm

diff --git a/example_project/vanilla/common/__init__.py → example_project/example/common/__init__.py b/example_project/vanilla/common/__init__.py → example_project/example/common/__init__.py
diff --git a/example_project/vanilla/common/mixins.py → example_project/example/common/mixins.py b/example_project/vanilla/common/mixins.py → example_project/example/common/mixins.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import unicode_literals
+
 import inspect
 
 

diff --git a/example_project/vanilla/static/css/theme.css → example_project/example/static/css/theme.css b/example_project/vanilla/static/css/theme.css → example_project/example/static/css/theme.css
diff --git a/example_project/vanilla/templates/base.html → example_project/example/templates/base.html b/example_project/vanilla/templates/base.html → example_project/example/templates/base.html
diff --git a/...project/vanilla/templates/board_base.html → ...project/example/templates/board_base.html b/...project/vanilla/templates/board_base.html → ...project/example/templates/board_base.html
diff --git a/.../templates/registration/base_account.html → .../templates/registration/base_account.html b/.../templates/registration/base_account.html → .../templates/registration/base_account.html
diff --git a/...vanilla/templates/registration/login.html → ...example/templates/registration/login.html b/...vanilla/templates/registration/login.html → ...example/templates/registration/login.html
diff --git a/...la/templates/registration/parameters.html → ...le/templates/registration/parameters.html b/...la/templates/registration/parameters.html → ...le/templates/registration/parameters.html
diff --git a/...illa/templates/registration/password.html → ...mple/templates/registration/password.html b/...illa/templates/registration/password.html → ...mple/templates/registration/password.html
diff --git a/...registration/password_reset_complete.html → ...registration/password_reset_complete.html b/...registration/password_reset_complete.html → ...registration/password_reset_complete.html
diff --git a/.../registration/password_reset_confirm.html → .../registration/password_reset_confirm.html b/.../registration/password_reset_confirm.html → .../registration/password_reset_confirm.html
diff --git a/...tes/registration/password_reset_done.html → ...tes/registration/password_reset_done.html b/...tes/registration/password_reset_done.html → ...tes/registration/password_reset_done.html
diff --git a/...tes/registration/password_reset_form.html → ...tes/registration/password_reset_form.html b/...tes/registration/password_reset_form.html → ...tes/registration/password_reset_form.html
diff --git a/...illa/templates/registration/register.html → ...mple/templates/registration/register.html b/...illa/templates/registration/register.html → ...mple/templates/registration/register.html
diff --git a/...la/templates/registration/unregister.html → ...le/templates/registration/unregister.html b/...la/templates/registration/unregister.html → ...le/templates/registration/unregister.html
diff --git a/example_project/vanilla_project/__init__.py → example_project/example_project/__init__.py b/example_project/vanilla_project/__init__.py → example_project/example_project/__init__.py
diff --git a/...ject/vanilla_project/fixtures/forums.json → ...ject/example_project/fixtures/forums.json b/...ject/vanilla_project/fixtures/forums.json → ...ject/example_project/fixtures/forums.json
diff --git a/...vanilla_project/fixtures/polloptions.json → ...example_project/fixtures/polloptions.json b/...vanilla_project/fixtures/polloptions.json → ...example_project/fixtures/polloptions.json
diff --git a/...oject/vanilla_project/fixtures/polls.json → ...oject/example_project/fixtures/polls.json b/...oject/vanilla_project/fixtures/polls.json → ...oject/example_project/fixtures/polls.json
diff --git a/...oject/vanilla_project/fixtures/posts.json → ...oject/example_project/fixtures/posts.json b/...oject/vanilla_project/fixtures/posts.json → ...oject/example_project/fixtures/posts.json
diff --git a/...ject/vanilla_project/fixtures/topics.json → ...ject/example_project/fixtures/topics.json b/...ject/vanilla_project/fixtures/topics.json → ...ject/example_project/fixtures/topics.json
diff --git a/...ject/vanilla_project/settings/__init__.py → ...ject/example_project/settings/__init__.py b/...ject/vanilla_project/settings/__init__.py → ...ject/example_project/settings/__init__.py
diff --git a/..._project/vanilla_project/settings/base.py → ..._project/example_project/settings/base.py b/..._project/vanilla_project/settings/base.py → ..._project/example_project/settings/base.py
@@ -112,7 +112,7 @@
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths
 LOCALE_PATHS = (
-    PROJECT_PATH.child('vanilla_project', 'locale'),
+    PROJECT_PATH.child('example_project', 'locale'),
 )
 
 
@@ -131,7 +131,7 @@
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': (
-            PROJECT_PATH.child('vanilla', 'templates'),
+            PROJECT_PATH.child('example', 'templates'),
             MACHINA_MAIN_TEMPLATE_DIR,
         ),
         'OPTIONS': {
@@ -194,7 +194,7 @@
 # URL CONFIGURATION
 # ------------------------------------------------------------------------------
 
-ROOT_URLCONF = 'vanilla_project.urls'
+ROOT_URLCONF = 'example_project.urls'
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#wsgi-application
 WSGI_APPLICATION = 'wsgi.application'

diff --git a/...e_project/vanilla_project/settings/dev.py → ...e_project/example_project/settings/dev.py b/...e_project/vanilla_project/settings/dev.py → ...e_project/example_project/settings/dev.py
@@ -45,7 +45,7 @@
 
 STATICFILES_DIRS = (
     MACHINA_MAIN_STATIC_DIR,  # noqa: F405
-    PROJECT_PATH.child('vanilla', 'static'),  # noqa: F405
+    PROJECT_PATH.child('example', 'static'),  # noqa: F405
 )
 
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
diff --git a/example_project/vanilla_project/urls.py → example_project/example_project/urls.py b/example_project/vanilla_project/urls.py → example_project/example_project/urls.py
@@ -21,7 +21,7 @@
     url(r'^' + settings.ADMIN_URL, admin.site.urls),
 
     # Apps
-    url(r'', include('vanilla.apps.auth.urls')),
+    url(r'', include('example.apps.auth.urls')),
     url(r'', include(board.urls)),
 ]
 

diff --git a/example_project/manage.py b/example_project/manage.py
@@ -3,6 +3,6 @@
 import sys
 
 if __name__ == '__main__':
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vanilla_project.settings.dev')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'example_project.settings.dev')
     from django.core.management import execute_from_command_line
     execute_from_command_line(sys.argv)
diff --git a/example_project/wsgi.py b/example_project/wsgi.py
@@ -5,5 +5,5 @@
 from django.core.wsgi import get_wsgi_application
 
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vanilla_project.settings.dev')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'example_project.settings.dev')
 application = get_wsgi_application()