diff --git a/bocal/urls.py b/bocal/urls.py index b5d692d..b7ac9a7 100644 --- a/bocal/urls.py +++ b/bocal/urls.py @@ -13,9 +13,13 @@ Including another URLconf 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ -from django.conf.urls import url +from django.conf.urls import url, include from django.contrib import admin +import mainsite.urls + + urlpatterns = [ url(r'^admin/', admin.site.urls), + url(r'^', include(mainsite.urls.urlpatterns)), ] diff --git a/mainsite/urls.py b/mainsite/urls.py index a41c5cb..6219ce8 100644 --- a/mainsite/urls.py +++ b/mainsite/urls.py @@ -1,7 +1,9 @@ from django.conf.urls import url -from .views import YearView +from . import views + +app_name = 'manisite' urlpatterns = [ url(r'^(?P\d{4})-(?P\d{4})/', - YearView.as_view(), name='year_view'), + views.YearView.as_view(), name='year_view'), ]