From 5d85579a4f1375aa802cf8bcaae4dc28f8fcdc62 Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Sat, 28 Jan 2017 21:51:23 -0600 Subject: [PATCH] Clean up from rebase. --- .../assets/js/bikes/components/BikeTable/index.jsx | 2 -- bikeshop_project/bikeshop/urls.py | 10 ---------- bikeshop_project/registration/views.py | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/bikeshop_project/assets/js/bikes/components/BikeTable/index.jsx b/bikeshop_project/assets/js/bikes/components/BikeTable/index.jsx index bdefe7a..421aba1 100644 --- a/bikeshop_project/assets/js/bikes/components/BikeTable/index.jsx +++ b/bikeshop_project/assets/js/bikes/components/BikeTable/index.jsx @@ -1,6 +1,4 @@ import React from 'react'; -import { polyFill } from 'es6-promise'; -import moment from 'moment-timezone'; import fetch from 'isomorphic-fetch'; import { Table, TableBody, TableHeader, TableHeaderColumn, TableRow, TableRowColumn } from 'material-ui/Table'; import FlatButton from 'material-ui/FlatButton'; diff --git a/bikeshop_project/bikeshop/urls.py b/bikeshop_project/bikeshop/urls.py index 5782436..4b9b45c 100644 --- a/bikeshop_project/bikeshop/urls.py +++ b/bikeshop_project/bikeshop/urls.py @@ -21,7 +21,6 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns from rest_framework import routers from rest_framework_jwt.views import obtain_jwt_token -import registration import bike import registration from bike import urls as bike_urls @@ -33,15 +32,6 @@ routeLists = [ registration.urls.apiRoutes, ] -router = routers.DefaultRouter() -for routeList in routeLists: - for route in routeList: - router.register(route[0], route[1]) - -routeLists = [ - registration.urls.apiRoutes, -] - router = routers.DefaultRouter() for routeList in routeLists: for route in routeList: diff --git a/bikeshop_project/registration/views.py b/bikeshop_project/registration/views.py index daa33ec..8cabf86 100644 --- a/bikeshop_project/registration/views.py +++ b/bikeshop_project/registration/views.py @@ -68,7 +68,7 @@ class MemberSearchView(View): class VisitSerializer(ModelSerializer): - member = MemberSignInSerializer() + member = MemberSerializer() class Meta: model = Visit