mirror of
https://github.com/fspc/workstand.git
synced 2025-04-04 10:03:22 -04:00
Clean up from rebase.
This commit is contained in:
parent
329980ccb1
commit
5d85579a4f
@ -1,6 +1,4 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { polyFill } from 'es6-promise';
|
|
||||||
import moment from 'moment-timezone';
|
|
||||||
import fetch from 'isomorphic-fetch';
|
import fetch from 'isomorphic-fetch';
|
||||||
import { Table, TableBody, TableHeader, TableHeaderColumn, TableRow, TableRowColumn } from 'material-ui/Table';
|
import { Table, TableBody, TableHeader, TableHeaderColumn, TableRow, TableRowColumn } from 'material-ui/Table';
|
||||||
import FlatButton from 'material-ui/FlatButton';
|
import FlatButton from 'material-ui/FlatButton';
|
||||||
|
@ -21,7 +21,6 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
|||||||
from rest_framework import routers
|
from rest_framework import routers
|
||||||
from rest_framework_jwt.views import obtain_jwt_token
|
from rest_framework_jwt.views import obtain_jwt_token
|
||||||
|
|
||||||
import registration
|
|
||||||
import bike
|
import bike
|
||||||
import registration
|
import registration
|
||||||
from bike import urls as bike_urls
|
from bike import urls as bike_urls
|
||||||
@ -33,15 +32,6 @@ routeLists = [
|
|||||||
registration.urls.apiRoutes,
|
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()
|
router = routers.DefaultRouter()
|
||||||
for routeList in routeLists:
|
for routeList in routeLists:
|
||||||
for route in routeList:
|
for route in routeList:
|
||||||
|
@ -68,7 +68,7 @@ class MemberSearchView(View):
|
|||||||
|
|
||||||
|
|
||||||
class VisitSerializer(ModelSerializer):
|
class VisitSerializer(ModelSerializer):
|
||||||
member = MemberSignInSerializer()
|
member = MemberSerializer()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Visit
|
model = Visit
|
||||||
|
Loading…
x
Reference in New Issue
Block a user