From 3d868521f60b1b8d5d1106e4b8cd089a018328e3 Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Mon, 8 Apr 2019 12:48:53 +0100 Subject: First attempt at getting the wiki up --- pydis_site/apps/wiki/__init__.py | 0 pydis_site/apps/wiki/admin.py | 3 --- pydis_site/apps/wiki/apps.py | 5 ----- pydis_site/apps/wiki/migrations/__init__.py | 0 pydis_site/apps/wiki/models.py | 3 --- pydis_site/apps/wiki/tests.py | 3 --- pydis_site/apps/wiki/views.py | 3 --- pydis_site/apps/wiki_container/__init__.py | 0 pydis_site/apps/wiki_container/apps.py | 6 ++++++ pydis_site/apps/wiki_container/urls.py | 6 ++++++ pydis_site/hosts.py | 1 + pydis_site/settings.py | 26 +++++++++++++++++++++++--- pydis_site/sites.py | 5 +++++ 13 files changed, 41 insertions(+), 20 deletions(-) delete mode 100644 pydis_site/apps/wiki/__init__.py delete mode 100644 pydis_site/apps/wiki/admin.py delete mode 100644 pydis_site/apps/wiki/apps.py delete mode 100644 pydis_site/apps/wiki/migrations/__init__.py delete mode 100644 pydis_site/apps/wiki/models.py delete mode 100644 pydis_site/apps/wiki/tests.py delete mode 100644 pydis_site/apps/wiki/views.py create mode 100644 pydis_site/apps/wiki_container/__init__.py create mode 100644 pydis_site/apps/wiki_container/apps.py create mode 100644 pydis_site/apps/wiki_container/urls.py create mode 100644 pydis_site/sites.py diff --git a/pydis_site/apps/wiki/__init__.py b/pydis_site/apps/wiki/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/pydis_site/apps/wiki/admin.py b/pydis_site/apps/wiki/admin.py deleted file mode 100644 index 4185d360..00000000 --- a/pydis_site/apps/wiki/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -# from django.contrib import admin - -# Register your models here. diff --git a/pydis_site/apps/wiki/apps.py b/pydis_site/apps/wiki/apps.py deleted file mode 100644 index fce4708e..00000000 --- a/pydis_site/apps/wiki/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class WikiConfig(AppConfig): - name = 'wiki' diff --git a/pydis_site/apps/wiki/migrations/__init__.py b/pydis_site/apps/wiki/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/pydis_site/apps/wiki/models.py b/pydis_site/apps/wiki/models.py deleted file mode 100644 index 0b4331b3..00000000 --- a/pydis_site/apps/wiki/models.py +++ /dev/null @@ -1,3 +0,0 @@ -# from django.db import models - -# Create your models here. diff --git a/pydis_site/apps/wiki/tests.py b/pydis_site/apps/wiki/tests.py deleted file mode 100644 index a79ca8be..00000000 --- a/pydis_site/apps/wiki/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -# from django.test import TestCase - -# Create your tests here. diff --git a/pydis_site/apps/wiki/views.py b/pydis_site/apps/wiki/views.py deleted file mode 100644 index fd0e0449..00000000 --- a/pydis_site/apps/wiki/views.py +++ /dev/null @@ -1,3 +0,0 @@ -# from django.shortcuts import render - -# Create your views here. diff --git a/pydis_site/apps/wiki_container/__init__.py b/pydis_site/apps/wiki_container/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pydis_site/apps/wiki_container/apps.py b/pydis_site/apps/wiki_container/apps.py new file mode 100644 index 00000000..874ae8e4 --- /dev/null +++ b/pydis_site/apps/wiki_container/apps.py @@ -0,0 +1,6 @@ +from wiki.apps import WikiConfig + + +class WikiContainerConfig(WikiConfig): + name = 'wiki_container' + default_site = 'pydis_site.sites.PyDisWikiSite' diff --git a/pydis_site/apps/wiki_container/urls.py b/pydis_site/apps/wiki_container/urls.py new file mode 100644 index 00000000..1537fe8c --- /dev/null +++ b/pydis_site/apps/wiki_container/urls.py @@ -0,0 +1,6 @@ +from django.urls import path, include + +urlpatterns = [ + path('notifications/', include('django_nyt.urls')), + path('', include('wiki.urls')) +] diff --git a/pydis_site/hosts.py b/pydis_site/hosts.py index 34acfd09..fc43d0eb 100644 --- a/pydis_site/hosts.py +++ b/pydis_site/hosts.py @@ -4,6 +4,7 @@ from django_hosts import host, patterns host_patterns = patterns( '', # host(r"subdomain pattern", "URLs module", "host entry name") + host(r'wiki', 'pydis_site.apps.wiki_container.urls', name="wiki"), host(r'admin', 'pydis_site.apps.admin.urls', name="admin"), host(r'api', 'pydis_site.apps.api.urls', name='api'), host(r'.*', 'pydis_site.apps.home.urls', name=settings.DEFAULT_HOST) diff --git a/pydis_site/settings.py b/pydis_site/settings.py index e8355918..2212da21 100644 --- a/pydis_site/settings.py +++ b/pydis_site/settings.py @@ -64,22 +64,34 @@ else: INSTALLED_APPS = [ 'pydis_site.apps.api', 'pydis_site.apps.home', - 'pydis_site.apps.wiki', + 'pydis_site.apps.wiki_container', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', + 'django.contrib.humanize.apps.HumanizeConfig', 'django.contrib.sessions', 'django.contrib.messages', + 'django.contrib.sites.apps.SitesConfig', 'django.contrib.staticfiles', 'crispy_forms', + 'django_crispy_bulma', 'django_hosts', 'django_filters', - 'django_crispy_bulma', + 'django_nyt.apps.DjangoNytConfig', 'django_simple_bulma', + 'mptt', 'rest_framework', - 'rest_framework.authtoken' + 'rest_framework.authtoken', + 'sekizai', + 'sorl.thumbnail', + + 'wiki.apps.WikiConfig', + 'wiki.plugins.attachments.apps.AttachmentsConfig', + 'wiki.plugins.notifications.apps.NotificationsConfig', + 'wiki.plugins.images.apps.ImagesConfig', + 'wiki.plugins.macros.apps.MacrosConfig', ] MIDDLEWARE = [ @@ -112,6 +124,8 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', + + "sekizai.context_processors.sekizai", ], }, }, @@ -257,3 +271,9 @@ BULMA_SETTINGS = { "link": "$primary", } } + +# Required for the wiki +SITE_ID = 1 + +WIKI_ACCOUNT_HANDLING = False +WIKI_ACCOUNT_SIGNUP_ALLOWED = False diff --git a/pydis_site/sites.py b/pydis_site/sites.py new file mode 100644 index 00000000..b3370049 --- /dev/null +++ b/pydis_site/sites.py @@ -0,0 +1,5 @@ +from wiki.sites import WikiSite + + +class PyDisWikiSite(WikiSite): + pass -- cgit v1.2.3