diff --git a/db.sqlite3 b/db.sqlite3 index 849f15b..7fc6c59 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/registered_user/serializers.py b/registered_user/serializers.py index 2d9e06a..beb718a 100644 --- a/registered_user/serializers.py +++ b/registered_user/serializers.py @@ -5,11 +5,7 @@ from rest_framework.authtoken.models import Token class RegisteredUserSerializer(serializers.ModelSerializer): - phone_number = serializers.SerializerMethodField() email_address = serializers.SerializerMethodField() - - def get_phone_number(self, obj): - return obj.phone_number def get_email_address(self, obj): return obj.user.email diff --git a/registered_user/urls.py b/registered_user/urls.py new file mode 100644 index 0000000..4c0f21f --- /dev/null +++ b/registered_user/urls.py @@ -0,0 +1,12 @@ +from django.urls import path +from . import views + + +urlpatterns = [ + # path('users/', views.all_registered_users, name='users'), + path('register/', views.create_registered_user, name='create user'), + path('login/', views.login_registered_user, name='login user'), + # path('add_push_token/', views.add_push_token, name='add device push'), + path('update/', views.update_registered_user, name='update registered user'), + path('update_password/', views.update_password, name='update registered user password') +] \ No newline at end of file diff --git a/registered_user/views.py b/registered_user/views.py index 004a5a0..637f997 100644 --- a/registered_user/views.py +++ b/registered_user/views.py @@ -1,4 +1,4 @@ -from .models import RegisteredUser, RegisteredUserBlockUser +from .models import RegisteredUser from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework import status @@ -6,7 +6,6 @@ from .serializers import RegisteredUserSerializer, CreateRegisteredUserThroughUs from django.contrib.auth.models import User from rest_framework.authtoken.models import Token from django.contrib.auth import authenticate -from push_notifications.models import APNSDevice from rest_framework.authentication import TokenAuthentication from rest_framework.permissions import IsAuthenticated from rest_framework.decorators import authentication_classes @@ -50,7 +49,7 @@ def create_registered_user(request): def login_registered_user(request): email = request.data["email"] password = request.data["password"] - + user = authenticate(username=email, password=password) if user is not None: diff --git a/werkout_api/urls.py b/werkout_api/urls.py index 32fdbdc..f8872f9 100644 --- a/werkout_api/urls.py +++ b/werkout_api/urls.py @@ -10,6 +10,7 @@ urlpatterns = [ path('exercise/', include('exercise.urls')), path('muscle/', include('muscle.urls')), path('equipment/', include('equipment.urls')), + path('registered_user/', include('registered_user.urls')), # path('scripts/', include('scripts.urls')), ] + static(settings.MEDIA_URL,document_root=settings.MEDIA_ROOT) diff --git a/workout/urls.py b/workout/urls.py index a876757..1aac951 100644 --- a/workout/urls.py +++ b/workout/urls.py @@ -7,5 +7,5 @@ urlpatterns = [ path('/details/', views.workout_details, name='single workout details'), path('complete/', views.complete_workout, name='user complete workout'), path('completed/', views.workouts_completed_by_logged_in_user, name='user completed workouts'), - path('create/', views.add_workout, name='create new workout') + path('create/', views.add_workout, name='create new workout'), ] \ No newline at end of file