updated requirements, rolled in style changes and js

3 files changed, 36 insertions, 5 deletions

diff --git a/config/base_urls.py b/config/base_urls.py
index bb2fa56..84dd56d 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -9,17 +9,16 @@ from django_registration.backends.activation.views import RegistrationView
 from rest_framework import routers
 
 from pages.views import PageDetailView
-from notes.views import NoteViewSet
+from notes.views import NoteViewSet, FolderViewSet, NoteListView
 from accounts.forms import UserForm
 
 router = routers.DefaultRouter()
-router.register(r'notes', NoteViewSet, basename="notes")
+router.register(r'<str:user>/notes/folder/', FolderViewSet, basename="folder-api")
+router.register(r'<str:user>/notes/', NoteViewSet, basename="notes-api")
 
 urlpatterns = static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 urlpatterns += [
     path('admin/', admin.site.urls),
-    # path(r'profile/', include('accounts.urls')),
-    path(r'notes/', include('notes.urls')),
     path(r'accounts/', include('django_registration.backends.activation.urls')),
     path(r'accounts/', include('django.contrib.auth.urls')),
     path(r'register/', RegistrationView.as_view(form_class=UserForm), name='django_registration_register',),
diff --git a/config/requirements.txt b/config/requirements.txt
index f174273..fb66a23 100644
--- a/config/requirements.txt
+++ b/config/requirements.txt
@@ -1,12 +1,43 @@
+backcall==0.1.0
+beautifulsoup4==4.6.3
+bs4==0.0.1
+certifi==2018.10.15
+chardet==3.0.4
+confusable-homoglyphs==3.2.0
 coverage==4.5.1
+decorator==4.3.0
 Django==2.1.2
 django-extensions==2.1.3
 django-registration==3.0
 django-storages==1.7.1
 django-taggit==0.23.0
+django-taggit-serializer==0.1.7
+djangorestframework==3.9.0
+Faker==0.9.1
+idna==2.7
 ipython==7.1.1
 ipython-genutils==0.2.0
+jedi==0.13.1
+jsmin==2.2.2
+Markdown==3.0.1
 mixer==6.1.3
+parso==0.3.1
+pexpect==4.6.0
+pickleshare==0.7.5
 Pillow==5.3.0
+pkg-resources==0.0.0
+prompt-toolkit==2.0.7
 psycopg2==2.7.5
+psycopg2-binary==2.7.6.1
+ptyprocess==0.6.0
 pwned-passwords-django==1.3.1
+Pygments==2.2.0
+python-dateutil==2.7.5
+python-decouple==3.1
+pytz==2018.7
+requests==2.20.1
+six==1.11.0
+text-unidecode==1.2
+traitlets==4.3.2
+urllib3==1.24.1
+wcwidth==0.1.7
diff --git a/config/settings.py b/config/settings.py
index ade8a84..52d2314 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -87,7 +87,7 @@ TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-            os.path.join(BASE_DIR, 'templates'),
+            os.path.join(BASE_DIR, 'design/templates'),
             ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -96,6 +96,7 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                #'notes.context_processors.add_login_form',
             ],
         },
     },