diff options
| author | luxagraf <sng@luxagraf.net> | 2018-12-06 07:03:24 -0600 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2018-12-06 07:03:24 -0600 |
| commit | 4eaaa999c89293677dade99568a279c934e0b8d9 (patch) | |
| tree | c543451d3ca149681460f45ab6161a813cf4ed29 /config | |
| parent | cb21e59587ab328e9a3e06c9d57c2bafce281715 (diff) | |
redid scripts to use just npm
Diffstat (limited to 'config')
| -rw-r--r-- | config/base_urls.py | 6 | ||||
| -rw-r--r-- | config/settings.py | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/config/base_urls.py b/config/base_urls.py index c881679..775f07d 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -14,6 +14,7 @@ from notes.views import ( NoteViewSet, NotebookViewSet, NoteListView, + TagViewSet, ) # redirect admin as per Adrian holovaty's site @@ -22,6 +23,7 @@ ADMIN_URL = 'https://docs.djangoproject.com/en/dev/ref/contrib/admin/' router = routers.DefaultRouter() router.register(r'notes/notebook', NotebookViewSet, basename="notebook-api") router.register(r'notes', NoteViewSet, basename="notes-api") +router.register(r'tags', TagViewSet, basename="tags-api") urlpatterns = static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) @@ -35,7 +37,9 @@ urlpatterns += [ path(r'', include('django_registration.backends.activation.urls')), path(r'', include('django.contrib.auth.urls')), path(r'', NoteListView.as_view(), name='homepage',), - path(r'notes/', include('notes.urls')), + path(r'forum/', include('forum.urls')), + path(r'n/', include('notes.notes_urls')), + path(r'nb/', include('notes.notebook_urls')), path(r'api/v1/', include(router.urls)), path(r'<slug>', PageDetailView.as_view(), name="pages"), #path(r'<path>/<slug>/', PageDetailView.as_view(), name="pages"), diff --git a/config/settings.py b/config/settings.py index da75f57..8e2ba3c 100644 --- a/config/settings.py +++ b/config/settings.py @@ -47,7 +47,8 @@ REST_FRAMEWORK = { 'rest_framework.permissions.IsAuthenticated', ) } - +TAGGIT_TAGS_FROM_STRING = 'utils.util.comma_splitter' +TAGGIT_STRING_FROM_TAGS = 'utils.util.comma_joiner' # APPS # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps DJANGO_APPS = [ @@ -71,6 +72,7 @@ LOCAL_APPS = [ 'pages', 'accounts', 'notes', + 'forum', ] INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS |