Skip to content

Commit

Permalink
Merge pull request #26 from Signbank/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
TobiasCunnen committed Jul 8, 2023
2 parents 3d65c07 + 2733483 commit 9527643
Show file tree
Hide file tree
Showing 178 changed files with 2,986 additions and 1,342 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Code coverage

on:
push:
branches: [ "main","develop" ]
branches: [ "main"]
pull_request:
branches: [ "main" ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Pylint

on:
push:
branches: [ "main","develop" ]
branches: [ "main"]
pull_request:
branches: [ "main" ]

Expand Down
118 changes: 0 additions & 118 deletions data_scripts/get_sign_property_data.py

This file was deleted.

File renamed without changes.
3 changes: 3 additions & 0 deletions django/accounts/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
4 changes: 2 additions & 2 deletions django/dictionary/apps.py → django/accounts/apps.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.apps import AppConfig


class DictionaryConfig(AppConfig):
class AccountsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'dictionary'
name = 'accounts'
File renamed without changes.
3 changes: 3 additions & 0 deletions django/accounts/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.db import models

# Create your models here.
22 changes: 22 additions & 0 deletions django/accounts/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
from rest_framework import serializers
from django.contrib.auth.models import User


# User Serializer
class UserSerializer(serializers.ModelSerializer):
class Meta:
model = User
fields = ('id', 'username', 'email')


# Register Serializer
class RegisterSerializer(serializers.ModelSerializer):
class Meta:
model = User
fields = ('id', 'username', 'email', 'password')
extra_kwargs = {'password': {'write_only': True}}

def create(self, validated_data):
user = User.objects.create_user(validated_data['username'], validated_data['email'], validated_data['password'])

return user
3 changes: 3 additions & 0 deletions django/accounts/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

# Create your tests here.
11 changes: 11 additions & 0 deletions django/accounts/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from .views import RegisterAPI
from django.urls import path
from knox import views as knox_views
from .views import LoginAPI

urlpatterns = [
path('register/', RegisterAPI.as_view(), name='register'),
path('login/', LoginAPI.as_view(), name='login'),
path('logout/', knox_views.LogoutView.as_view(), name='logout'),
path('logoutall/', knox_views.LogoutAllView.as_view(), name='logoutall'),
]
32 changes: 32 additions & 0 deletions django/accounts/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
from django.contrib.auth import login
from rest_framework import generics, permissions
from rest_framework.response import Response
from knox.models import AuthToken
from .serializers import UserSerializer, RegisterSerializer
from rest_framework.authtoken.serializers import AuthTokenSerializer
from knox.views import LoginView as KnoxLoginView


# Register API
class RegisterAPI(generics.GenericAPIView):
serializer_class = RegisterSerializer

def post(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
user = serializer.save()
return Response({
"user": UserSerializer(user, context=self.get_serializer_context()).data,
"token": AuthToken.objects.create(user)[1]
})


class LoginAPI(KnoxLoginView):
permission_classes = (permissions.AllowAny,)

def post(self, request, format=None):
serializer = AuthTokenSerializer(data=request.data)
serializer.is_valid(raise_exception=True)
user = serializer.validated_data['user']
login(request, user)
return super(LoginAPI, self).post(request, format=None)
22 changes: 0 additions & 22 deletions django/dictionary/migrations/0001_initial.py

This file was deleted.

54 changes: 0 additions & 54 deletions django/dictionary/package-lock.json

This file was deleted.

5 changes: 0 additions & 5 deletions django/dictionary/package.json

This file was deleted.

10 changes: 0 additions & 10 deletions django/dictionary/serializers.py

This file was deleted.

Loading

0 comments on commit 9527643

Please sign in to comment.