This commit is contained in:
Trey t
2023-06-25 10:59:11 -05:00
parent 26df876a7f
commit cbc589aafe
6 changed files with 16 additions and 8 deletions

Binary file not shown.

View File

@@ -5,11 +5,7 @@ from rest_framework.authtoken.models import Token
class RegisteredUserSerializer(serializers.ModelSerializer): class RegisteredUserSerializer(serializers.ModelSerializer):
phone_number = serializers.SerializerMethodField()
email_address = serializers.SerializerMethodField() email_address = serializers.SerializerMethodField()
def get_phone_number(self, obj):
return obj.phone_number
def get_email_address(self, obj): def get_email_address(self, obj):
return obj.user.email return obj.user.email

12
registered_user/urls.py Normal file
View File

@@ -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')
]

View File

@@ -1,4 +1,4 @@
from .models import RegisteredUser, RegisteredUserBlockUser from .models import RegisteredUser
from rest_framework.decorators import api_view from rest_framework.decorators import api_view
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework import status from rest_framework import status
@@ -6,7 +6,6 @@ from .serializers import RegisteredUserSerializer, CreateRegisteredUserThroughUs
from django.contrib.auth.models import User from django.contrib.auth.models import User
from rest_framework.authtoken.models import Token from rest_framework.authtoken.models import Token
from django.contrib.auth import authenticate from django.contrib.auth import authenticate
from push_notifications.models import APNSDevice
from rest_framework.authentication import TokenAuthentication from rest_framework.authentication import TokenAuthentication
from rest_framework.permissions import IsAuthenticated from rest_framework.permissions import IsAuthenticated
from rest_framework.decorators import authentication_classes from rest_framework.decorators import authentication_classes
@@ -50,7 +49,7 @@ def create_registered_user(request):
def login_registered_user(request): def login_registered_user(request):
email = request.data["email"] email = request.data["email"]
password = request.data["password"] password = request.data["password"]
user = authenticate(username=email, password=password) user = authenticate(username=email, password=password)
if user is not None: if user is not None:

View File

@@ -10,6 +10,7 @@ urlpatterns = [
path('exercise/', include('exercise.urls')), path('exercise/', include('exercise.urls')),
path('muscle/', include('muscle.urls')), path('muscle/', include('muscle.urls')),
path('equipment/', include('equipment.urls')), path('equipment/', include('equipment.urls')),
path('registered_user/', include('registered_user.urls')),
# path('scripts/', include('scripts.urls')), # path('scripts/', include('scripts.urls')),
] + static(settings.MEDIA_URL,document_root=settings.MEDIA_ROOT) ] + static(settings.MEDIA_URL,document_root=settings.MEDIA_ROOT)

View File

@@ -7,5 +7,5 @@ urlpatterns = [
path('<workout_id>/details/', views.workout_details, name='single workout details'), path('<workout_id>/details/', views.workout_details, name='single workout details'),
path('complete/', views.complete_workout, name='user complete workout'), path('complete/', views.complete_workout, name='user complete workout'),
path('completed/', views.workouts_completed_by_logged_in_user, name='user completed workouts'), 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'),
] ]