Merge branch 'develop' into feature/webapp-tests

webapp/views.py

@@ -1,31 +1,24 @@
 """Webapp views."""
 
 import jwt
-# import logging
+from django.utils import timezone
-# import requests
 from dealer.git import git
 from django.conf import settings
-from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth import authenticate
 from django.http import HttpResponse
-# from django.db.models import Count
 from django.shortcuts import redirect, render
 from django.views.decorators.http import require_http_methods
 from django_filters import rest_framework as filters
-# from django.views.decorators.csrf import ensure_csrf_cookie
-# from django.http import HttpResponse, HttpResponseRedirect
-# from django.contrib.auth.decorators import permission_required, login_required
-# from django.conf import settings
-# from django.utils import timezone
 from rest_framework import permissions, routers, viewsets
 from rest_framework.filters import OrderingFilter, SearchFilter
 from rest_framework.permissions import IsAuthenticatedOrReadOnly
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 
-from members.views.utils import *
+from webapp.models import Event, SignupForm, Signup, TemplateQuestion, Feed, Committee, Occupation, Tag
-from webapp.models import (Committee, Event, Feed, Official, Signup,
+from webapp.serializers import (EventSerializer, SignupFormSerializer, SignupSerializer,
-                           SignupForm, Tag, TemplateQuestion)
+                                SavedQuestionsSerializer, FeedSerializer, CommitteeSerializer,
-from webapp.serializers import *
+                                OccupationSerializer, TagSerializer)
 
 
 class IsPostOrIsAuthenticated(permissions.BasePermission):