Skip to content
This repository has been archived by the owner on Aug 27, 2019. It is now read-only.

Commit

Permalink
update url config for simpler team urls
Browse files Browse the repository at this point in the history
  • Loading branch information
stvnrlly committed Nov 20, 2016
1 parent 0c46d59 commit 885dbb2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions acquisitions/urls.py
Expand Up @@ -22,15 +22,15 @@
from django.conf.urls.static import static


api_patterns = projects_urls.api_patterns
api_patterns = projects_urls.api_patterns + team_urls.api_patterns


urlpatterns = [
url(r'^$', web_views.index),
url(r'^guides$', web_views.guides),
url(r'^api/', include(api_patterns, namespace='api')),
url(r'^admin/', include(admin.site.urls)),
url(r'^team/', include(team_urls, namespace='team')),
url(r'^team/', include(team_urls.urlpatterns, namespace='team')),
url(r'^projects/', include(projects_urls.urlpatterns, namespace='projects')),
url(r'^profile/$', web_views.profile),
url(r'^profile/refresh_token/$', web_views.refresh_token),
Expand Down
2 changes: 1 addition & 1 deletion team/templates/team/index.html
Expand Up @@ -44,7 +44,7 @@ <h1>Team</h1>
document.addEventListener("DOMContentLoaded", function(event) {
let team = document.getElementById('team');
let r = new XMLHttpRequest();
r.open("GET", "/team/api/people/", true);
r.open("GET", "/api/team/", true);
r.onreadystatechange = function () {
if (r.readyState != 4 || r.status != 200) return;
var jsonResponse = JSON.parse(r.responseText);
Expand Down
13 changes: 8 additions & 5 deletions team/urls.py
Expand Up @@ -2,13 +2,16 @@
from team import views
from rest_framework.urlpatterns import format_suffix_patterns

api_patterns = [
url(r'^team/$', views.TeammateList.as_view()),
url(r'^team/(?P<pk>[0-9]+)', views.TeammateDetail.as_view()),
url(r'^roles/$', views.RoleList.as_view()),
url(r'^roles/(?P<pk>[0-9]+)', views.RoleDetail.as_view()),
]

urlpatterns = [
url(r'^$', views.home, name='home'),
url(r'^api/people/$', views.TeammateList.as_view()),
url(r'^api/people/(?P<pk>[0-9]+)', views.TeammateDetail.as_view()),
url(r'^api/roles/$', views.RoleList.as_view()),
url(r'^api/roles/(?P<pk>[0-9]+)', views.RoleDetail.as_view()),
url(r'(?P<teammate>\w+)', views.teammate),
]

urlpatterns = format_suffix_patterns(urlpatterns)
api_patterns = format_suffix_patterns(api_patterns)

0 comments on commit 885dbb2

Please sign in to comment.