Browse Source

Clean up from rebase.

feature/bike-tracking
Drew Larson 8 years ago
parent
commit
5d85579a4f
  1. 2
      bikeshop_project/assets/js/bikes/components/BikeTable/index.jsx
  2. 10
      bikeshop_project/bikeshop/urls.py
  3. 2
      bikeshop_project/registration/views.py

2
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';

10
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:

2
bikeshop_project/registration/views.py

@ -68,7 +68,7 @@ class MemberSearchView(View):
class VisitSerializer(ModelSerializer):
member = MemberSignInSerializer()
member = MemberSerializer()
class Meta:
model = Visit

Loading…
Cancel
Save