diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index aa7da3a..fbfe4cc 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -60,11 +60,11 @@ class UserSerializer(serializers.ModelSerializer): # member viewing member list or other member class OtherMemberSerializer(serializers.ModelSerializer): q = serializers.CharField(write_only=True, max_length=64) - seq = serializers.IntegerField(write_only=True, ) + seq = serializers.IntegerField(write_only=True) class Meta: model = models.Member - fields = ['q', 'seq', 'preferred_name', 'last_name', 'status', 'current_start_date', 'photo_small'] + fields = ['q', 'seq', 'id', 'preferred_name', 'last_name', 'status', 'current_start_date', 'photo_small', 'photo_large'] # member viewing himself class MemberSerializer(serializers.ModelSerializer): diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index c0a4cea..9827e5b 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -1,6 +1,6 @@ from django.contrib.auth.models import User, Group from django.db.models import Max -from rest_framework import viewsets, views, permissions +from rest_framework import viewsets, views, permissions, mixins from rest_framework.response import Response from rest_auth.registration.views import RegisterView from fuzzywuzzy import fuzz, process @@ -23,12 +23,12 @@ def gen_search_strings(): ).lower() search_strings[string] = m.id -class SearchViewSet(viewsets.ViewSet): +NUM_SEARCH_RESULTS = 10 +class SearchViewSet(viewsets.GenericViewSet, mixins.RetrieveModelMixin): permission_classes = [AllowMetadata | permissions.IsAuthenticated] serializer_class = serializers.OtherMemberSerializer def get_queryset(self): - NUM_SEARCH_RESULTS = 10 queryset = models.Member.objects.all() search = self.request.data.get('q', '').lower() @@ -55,7 +55,7 @@ class SearchViewSet(viewsets.ViewSet): queryset = result_objects else: gen_search_strings() - queryset = queryset.order_by('-vetted_date')[:NUM_SEARCH_RESULTS] + queryset = queryset.order_by('-vetted_date') return queryset @@ -66,7 +66,7 @@ class SearchViewSet(viewsets.ViewSet): except ValueError: seq = 0 - queryset = self.get_queryset() + queryset = self.get_queryset()[:NUM_SEARCH_RESULTS] serializer = self.serializer_class(queryset, many=True) return Response({'seq': seq, 'results': serializer.data}) diff --git a/webclient/src/App.js b/webclient/src/App.js index 12810cd..e21627f 100644 --- a/webclient/src/App.js +++ b/webclient/src/App.js @@ -1,7 +1,6 @@ import React, { useState, useEffect } from 'react'; import { BrowserRouter as Router, Switch, Route, Link, useParams } from 'react-router-dom'; -import './light.css'; -import { Container, Divider, Dropdown, Form, Grid, Header, Icon, Image, Menu, Message, Segment, Table } from 'semantic-ui-react'; +import './light.css'; import { Container, Divider, Dropdown, Form, Grid, Header, Icon, Image, Menu, Message, Segment, Table } from 'semantic-ui-react'; import { requester } from './utils.js'; import { Home } from './Home.js'; import { Transactions, TransactionDetail } from './Transactions.js'; @@ -9,7 +8,7 @@ import { Cards } from './Cards.js'; import { Training } from './Training.js'; import { Courses, CourseDetail } from './Courses.js'; import { Classes, ClassDetail } from './Classes.js'; -import { Members } from './Members.js'; +import { Members, MemberDetail } from './Members.js'; import { NotFound, PleaseLogin } from './Misc.js'; import { Footer } from './Footer.js'; @@ -50,7 +49,7 @@ function App() {
No cards yet! Ask a director for one after you are vetted.
} diff --git a/webclient/src/Classes.js b/webclient/src/Classes.js index fc50958..450d487 100644 --- a/webclient/src/Classes.js +++ b/webclient/src/Classes.js @@ -3,7 +3,7 @@ import { BrowserRouter as Router, Switch, Route, Link, useParams } from 'react-r import './light.css'; import { Container, Divider, Dropdown, Form, Grid, Header, Icon, Image, Menu, Message, Segment, Table } from 'semantic-ui-react'; import moment from 'moment'; -import { requester } from './utils.js'; +import { BasicTable, requester } from './utils.js'; import { NotFound, PleaseLogin } from './Misc.js'; function ClassTable(props) { @@ -115,7 +115,7 @@ export function ClassDetail(props) {No Results
+ } +Loading...
} @@ -86,3 +72,51 @@ export function Members(props) { ); }; +export function MemberDetail(props) { + const [member, setMember] = useState(false); + const [error, setError] = useState(false); + const { token } = props; + const { id } = useParams(); + + useEffect(() => { + requester('/search/'+id+'/', 'GET', token) + .then(res => { + setMember(res); + }) + .catch(err => { + console.log(err); + setError(true); + }); + }, []); + + return ( +Loading...
+ : +