diff --git a/WikiENS/.gitignore b/WikiENS/.gitignore deleted file mode 100644 index fce19e4..0000000 --- a/WikiENS/.gitignore +++ /dev/null @@ -1 +0,0 @@ -settings.py diff --git a/WikiENS/__pycache__/__init__.cpython-36.pyc b/WikiENS/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index 599d89d..0000000 Binary files a/WikiENS/__pycache__/__init__.cpython-36.pyc and /dev/null differ diff --git a/WikiENS/__pycache__/settings.cpython-36.pyc b/WikiENS/__pycache__/settings.cpython-36.pyc deleted file mode 100644 index 9d90b52..0000000 Binary files a/WikiENS/__pycache__/settings.cpython-36.pyc and /dev/null differ diff --git a/WikiENS/__pycache__/urls.cpython-36.pyc b/WikiENS/__pycache__/urls.cpython-36.pyc deleted file mode 100644 index 210fa85..0000000 Binary files a/WikiENS/__pycache__/urls.cpython-36.pyc and /dev/null differ diff --git a/WikiENS/__pycache__/wsgi.cpython-36.pyc b/WikiENS/__pycache__/wsgi.cpython-36.pyc deleted file mode 100644 index 4eddf32..0000000 Binary files a/WikiENS/__pycache__/wsgi.cpython-36.pyc and /dev/null differ diff --git a/WikiENS/urls.py b/WikiENS/urls.py deleted file mode 100644 index ceafd69..0000000 --- a/WikiENS/urls.py +++ /dev/null @@ -1,23 +0,0 @@ -from django.conf.urls import url, include -from django.contrib import admin - -from allauth_ens.views import capture_login, capture_logout -from wiki.urls import get_pattern as get_wiki_pattern -from django_nyt.urls import get_pattern as get_nyt_pattern - -allauth_urls = [ - # Catch login/logout views of admin site. - url(r'^_admin/login/$', capture_login), - url(r'^_admin/logout/$', capture_logout), - # Allauth urls. - url(r'^_profil/', include('allauth.urls')), -] - -urlpatterns = allauth_urls + [ - url(r'^_admin/', admin.site.urls), - url(r'^notifications/', get_nyt_pattern()), - url(r'^_groups/', include("wiki_groups.urls")), - url(r'', get_wiki_pattern()), -] - -# TODO add MEDIA_ROOT diff --git a/WikiENS/__init__.py b/app/__init__.py similarity index 100% rename from WikiENS/__init__.py rename to app/__init__.py diff --git a/WikiENS/settings/__init__.py b/app/settings.py similarity index 100% rename from WikiENS/settings/__init__.py rename to app/settings.py diff --git a/app/settings/__init__.py b/app/settings/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/WikiENS/settings/common.py b/app/settings/common.py similarity index 100% rename from WikiENS/settings/common.py rename to app/settings/common.py diff --git a/WikiENS/settings/local.py b/app/settings/local.py similarity index 100% rename from WikiENS/settings/local.py rename to app/settings/local.py diff --git a/WikiENS/settings/prod.py b/app/settings/prod.py similarity index 100% rename from WikiENS/settings/prod.py rename to app/settings/prod.py diff --git a/WikiENS/settings/secret_example.py b/app/settings/secret_example.py similarity index 100% rename from WikiENS/settings/secret_example.py rename to app/settings/secret_example.py diff --git a/app/urls.py b/app/urls.py new file mode 100644 index 0000000..4c378cc --- /dev/null +++ b/app/urls.py @@ -0,0 +1,22 @@ +from allauth_ens.views import capture_login, capture_logout +from django.conf.urls import include, url +from django.contrib import admin +from django_nyt.urls import get_pattern as get_nyt_pattern +from wiki.urls import get_pattern as get_wiki_pattern + +allauth_urls = [ + # Catch login/logout views of admin site. + url(r"^_admin/login/$", capture_login), + url(r"^_admin/logout/$", capture_logout), + # Allauth urls. + url(r"^_profil/", include("allauth.urls")), +] + +urlpatterns = allauth_urls + [ + url(r"^_admin/", admin.site.urls), + url(r"^notifications/", get_nyt_pattern()), + url(r"^_groups/", include("wiki_groups.urls")), + url(r"", get_wiki_pattern()), +] + +# TODO add MEDIA_ROOT diff --git a/WikiENS/wsgi.py b/app/wsgi.py similarity index 82% rename from WikiENS/wsgi.py rename to app/wsgi.py index 1549535..e9f412f 100644 --- a/WikiENS/wsgi.py +++ b/app/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "WikiENS.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "app.settings") application = get_wsgi_application() diff --git a/manage.py b/manage.py index bd7b5ad..7525f87 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "WikiENS.settings.local") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "app.settings") try: from django.core.management import execute_from_command_line except ImportError: