Commit cbcbe136 authored by Daniel W Bond's avatar Daniel W Bond

created the urls for the newly separated apps

parent d1300884
......@@ -2,7 +2,12 @@ from django.conf.urls import patterns, include, url
from django.contrib import admin
admin.autodiscover()
urlpatterns = patterns('trajectories.views',
from django.contrib.auth.views import login, logout
from advisor.views import about, index
#, login?
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'advisor.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
......@@ -25,23 +30,6 @@ urlpatterns = patterns('trajectories.views',
# about page
url(r'^about/$', 'about', name = 'about'),
# course
url(r'^course/(?P<courseName>\w+)/$', 'course', name = 'course'),
# student's page
url(r'^user/(?P<username>\w+)/$', 'student', name = 'student'),
# single trajectory page
url(r'^user/(?P<username>\w+)/(?P<trajectoryslug>\w+)$', 'trajectory', name = 'trajectory'),
# creating the trajectory
# url(r'^user/(?P<username>\w+)/create/$', 'create', name = 'create'),
url(r'^create/$', 'create', name = 'create'),
# comparison page
# url(r'^user/(?P<username>\w+)/compare/$', 'compare', name = 'compare'),
url(r'^compare/$', 'compare', name = 'compare'),
# admin pages
url(r'^admin/', include(admin.site.urls)),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
......
from django.conf.urls import patterns, include, url
from django.contrib import admin
admin.autodiscover()
from analysis.views import compare, analytics
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'advisor.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
# comparison page
# url(r'^user/(?P<username>\w+)/compare/$', 'compare', name = 'compare'),
url(r'^compare/$', 'compare', name = 'compare'),
# analytics page
# url(r'user/(?P<username>\w+)/analytics/$', 'analytics', name = 'analytics'),
url(r'^analytics/$', 'analytics', name = 'analytics'),
)
from django.conf.urls import patterns, include, url
from django.contrib import admin
admin.autodiscover()
from trajectories.views import course, student, trajectory, create, new
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'advisor.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
# course
url(r'^course/(?P<courseName>\w+)/$', 'course', name = 'course'),
# student's page
url(r'^user/(?P<username>\w+)/$', 'student', name = 'student'),
# single trajectory page
url(r'^user/(?P<username>\w+)/(?P<trajectoryslug>\w+)$', 'trajectory', name = 'trajectory'),
# a new trajectory
# url(r'^user/(?P<username>\w+)/new/$', 'new', name = 'new'),
url(r'^new/$', 'new', name = 'new'),
# creating the trajectory
# url(r'^user/(?P<username>\w+)/create/$', 'create', name = 'create'),
url(r'^create/$', 'create', name = 'create'),
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment