Skip to content

Commit

Permalink
removed api prefix views
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Moorman committed Feb 22, 2016
1 parent 512209b commit 0caa832
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
15 changes: 7 additions & 8 deletions technology_radar/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
name='area-detail'),
url(r'^radars/(?P<radar>[\w-]+)/(?P<area>[\w-]+)/(?P<blip>[\w-]+)/$',
views.blip_detail, name='blip-detail'),
url(r'^api/$', views.ApiRootView.as_view(), name='api-root'),
url(r'^api/areas/$', views.ApiAreaListView.as_view(),
name='api-area-list'),
url(r'^api/statuses/$', views.ApiStatusListView.as_view(),
url(r'^api/$', views.RootView.as_view(), name='api-root'),
url(r'^api/areas/$', views.AreaListView.as_view(), name='api-area-list'),
url(r'^api/statuses/$', views.StatusListView.as_view(),
name='api-status-list'),
url(r'^api/radars/$', views.ApiRadarListView.as_view(),
url(r'^api/radars/$', views.RadarListView.as_view(),
name='api-radar-list'),
url(r'^api/radars/(?P<pk>[0-9]+)/$', views.ApiRadarDetailView.as_view(),
url(r'^api/radars/(?P<pk>[0-9]+)/$', views.RadarDetailView.as_view(),
name='api-radar-detail'),
url(r'^api/blips/$', views.ApiBlipListView.as_view(),
url(r'^api/blips/$', views.BlipListView.as_view(),
name='api-blip-list'),
url(r'^api/blips/(?P<pk>[0-9]+)/$', views.ApiBlipDetailView.as_view(),
url(r'^api/blips/(?P<pk>[0-9]+)/$', views.BlipDetailView.as_view(),
name='api-blip-detail'),
]
16 changes: 8 additions & 8 deletions technology_radar/views/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,46 @@
AreaSerializer, StatusSerializer, BlipSerializer, RadarSerializer)


__all__ = ['ApiAreaListView', 'ApiStatusListView', 'ApiRadarListView',
'ApiRadarDetailView', 'ApiBlipListView', 'ApiBlipDetailView']
__all__ = ['AreaListView', 'StatusListView', 'RadarListView',
'RadarDetailView', 'BlipListView', 'BlipDetailView']


class ApiAreaListView(APIView):
class AreaListView(APIView):
def get(self, request, format=None):
queryset = Area.objects.all()
serializer = AreaSerializer(queryset, many=True)
return Response(serializer.data)


class ApiStatusListView(APIView):
class StatusListView(APIView):
def get(self, request, format=None):
queryset = Status.objects.all()
serializer = StatusSerializer(queryset, many=True)
return Response(serializer.data)


class ApiRadarListView(APIView):
class RadarListView(APIView):
def get(self, request, format=None):
queryset = Radar.objects.all()
serializer = RadarSerializer(queryset, many=True)
return Response(serializer.data)


class ApiRadarDetailView(APIView):
class RadarDetailView(APIView):
def get(self, request, pk, format=None):
obj = get_object_or_404(Radar, pk=pk)
serializer = RadarSerializer(obj)
return Response(serializer.data)


class ApiBlipListView(APIView):
class BlipListView(APIView):
def get(self, request, format=None):
queryset = Blip.objects.all()
serializer = BlipSerializer(queryset, many=True)
return Response(serializer.data)


class ApiBlipDetailView(APIView):
class BlipDetailView(APIView):
def get(self, request, pk, format=None):
obj = get_object_or_404(Blip, pk=pk)
serializer = BlipSerializer(obj)
Expand Down
4 changes: 2 additions & 2 deletions technology_radar/views/root.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
from rest_framework.views import APIView


__all__ = ['ApiRootView']
__all__ = ['RootView']


class ApiRootView(APIView):
class RootView(APIView):
def get(self, request, format=None):
return Response({
'area-list': reverse(
Expand Down

0 comments on commit 0caa832

Please sign in to comment.