summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2019-05-03 11:38:24 -0500
committerluxagraf <sng@luxagraf.net>2019-05-03 11:38:24 -0500
commit0e59ad7de18bffcf6a62f9ee61275b4951c27358 (patch)
tree514fca6efb90db53ca3061aa4ab8ba7d2a33cffe /config
parent86fcf7ed710f41fc5324b638d092af54f4bb756f (diff)
finished up initial design work
Diffstat (limited to 'config')
-rw-r--r--config/base_urls.py7
-rw-r--r--config/requirements.txt1
2 files changed, 6 insertions, 2 deletions
diff --git a/config/base_urls.py b/config/base_urls.py
index ed7da2d..cbc9517 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -4,7 +4,8 @@ from django.conf.urls.static import static
from django.conf import settings
from django.contrib.sitemaps.views import sitemap
-from pages.views import PageDetailView, HomePageDetailView
+from pages.views import PageDetailView
+from blog.views import HomePageView
#import builder.views
import utils.views
import builder.views
@@ -18,9 +19,11 @@ urlpatterns = [
path(r'admin/', admin.site.urls),
#path(r'luximages/insert/', utils.views.insert_image),
#path(r'sitemap.xml', sitemap, {'sitemaps': sitemaps}),
+ path(r'essays/', include('blog.urls')),
+ path(r'linked/', include('links.urls')),
path(r'<slug>', PageDetailView.as_view()),
path(r'<path>/<slug>/', PageDetailView.as_view()),
- path(r'', HomePageDetailView.as_view()),
+ path(r'', HomePageView.as_view()),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/config/requirements.txt b/config/requirements.txt
index a75a0c8..be0d327 100644
--- a/config/requirements.txt
+++ b/config/requirements.txt
@@ -14,6 +14,7 @@ ipython==7.4.0
ipython-genutils==0.2.0
jedi==0.13.3
Jinja2==2.10
+jsmin==2.2.2
lxml==4.3.3
Markdown==3.1
MarkupSafe==1.1.1