From 83fdd5b79a2dcaa559c2731dfe254cd2ff8cd152 Mon Sep 17 00:00:00 2001
From: Elijah Lucian <elijahlucian@gmail.com>
Date: Thu, 15 Jul 2021 15:13:43 -0600
Subject: [PATCH] broke af

---
 docker-compose.yml                   |  3 ++-
 frontend/src/contexts/AppContext.tsx |  2 +-
 frontend/src/pages/Login/index.tsx   | 10 ++++------
 server/server/api/views.py           |  7 +++++--
 server/server/settings.py            |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 84811a1..58fe0e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,7 +30,8 @@ services:
       context: ./server
     volumes:
       - ./server:/usr/src/server
-
     ports:
       - 8000:8000
+    environment:
+      - DEBUG=true
     command: ["python", "manage.py", "runserver", "0.0.0.0:8000"]
diff --git a/frontend/src/contexts/AppContext.tsx b/frontend/src/contexts/AppContext.tsx
index 41e92df..a1375bc 100644
--- a/frontend/src/contexts/AppContext.tsx
+++ b/frontend/src/contexts/AppContext.tsx
@@ -20,7 +20,7 @@ export const AppContextProvider = ({ children, baseURL }: Props) => {
   const api = axios.create({ baseURL })
 
   api.interceptors.request.use((config) => {
-    config.url += '?format=json'
+    // config.url += '?format=json'
     return config
   })
 
diff --git a/frontend/src/pages/Login/index.tsx b/frontend/src/pages/Login/index.tsx
index 28e27f9..15b6972 100644
--- a/frontend/src/pages/Login/index.tsx
+++ b/frontend/src/pages/Login/index.tsx
@@ -5,19 +5,17 @@ import { Form } from '../../elements/Form'
 import { Button } from '../../elements/Button'
 import { useForm } from 'antd/lib/form/Form'
 import { useAppContext } from '../../contexts/AppContext'
-import { useStacks } from '../../hooks/getMany/useStacks'
 
-type FormValues = { email: string; password: string }
+type FormValues = { username: string; password: string }
 
 export const Login = () => {
   const appContext = useAppContext()
-  const stacks = useStacks('')
 
   const [form] = useForm<FormValues>()
 
-  const handleFinish = async ({ email, password }: FormValues) => {
+  const handleFinish = async ({ username, password }: FormValues) => {
     const res = await appContext.post('/dj-rest-auth/login', {
-      email,
+      username,
       password,
     })
     console.log(res)
@@ -27,7 +25,7 @@ export const Login = () => {
     <div className="login">
       <Form onFinish={handleFinish} form={form}>
         <h1>Log In</h1>
-        <FormItem label="email" name="email">
+        <FormItem label="username" name="username">
           <Input />
         </FormItem>
         <FormItem label="Password" name="password">
diff --git a/server/server/api/views.py b/server/server/api/views.py
index c507191..ceecc83 100644
--- a/server/server/api/views.py
+++ b/server/server/api/views.py
@@ -1,8 +1,8 @@
 from django.contrib.auth.models import User, Group
-from rest_framework import viewsets
-from rest_framework import permissions
+from rest_framework import viewsets, permissions
 from server.api import serializers, models
 
+
 class UserViewSet(viewsets.ModelViewSet):
     queryset = User.objects.all()
     serializer_class = serializers.UserSerializer
@@ -11,6 +11,7 @@ class UserViewSet(viewsets.ModelViewSet):
     def get_queryset(self):
         return [self.request.user]
 
+
 class AccountViewSet(viewsets.ModelViewSet):
     queryset = models.Account.objects.all()
     serializer_class = serializers.AccountSerializer
@@ -19,6 +20,7 @@ class AccountViewSet(viewsets.ModelViewSet):
     def get_queryset(self):
         return self.queryset.filter(users=self.request.user)
 
+
 class StackViewSet(viewsets.ModelViewSet):
     queryset = models.Stack.objects.all()
     serializer_class = serializers.StackSerializer
@@ -27,6 +29,7 @@ class StackViewSet(viewsets.ModelViewSet):
     def get_queryset(self):
         return self.queryset.filter(account__users=self.request.user)
 
+
 class TransactionViewSet(viewsets.ModelViewSet):
     queryset = models.Transaction.objects.all()
     serializer_class = serializers.TransactionSerializer
diff --git a/server/server/settings.py b/server/server/settings.py
index e511bd8..df88191 100644
--- a/server/server/settings.py
+++ b/server/server/settings.py
@@ -88,7 +88,7 @@ TEMPLATES = [
 ]
 
 WSGI_APPLICATION = 'server.wsgi.application'
-
+APPEND_SLASH = False
 
 # Database
 # https://docs.djangoproject.com/en/3.1/ref/settings/#databases