From cbc589aafeceacd0ecb76a9897f2452e1a1e9271 Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 25 Jun 2023 10:59:11 -0500 Subject: [PATCH] WIP --- db.sqlite3 | Bin 2007040 -> 2007040 bytes registered_user/serializers.py | 4 ---- registered_user/urls.py | 12 ++++++++++++ registered_user/views.py | 5 ++--- werkout_api/urls.py | 1 + workout/urls.py | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 registered_user/urls.py diff --git a/db.sqlite3 b/db.sqlite3 index 849f15b1cabb3d583adc2c1bff105de0c89a9834..7fc6c59d67cc758b684fd19ed72d9760d3087230 100644 GIT binary patch delta 1309 zcma)*OKclO7{_<^;o8BQt>ZKW9Ln0UO^RhR`(Cdo#N>gLC^T_nN&*e*XPk$fG}|<( zp-Ms}rz(dg%3%c(s4=J#9EfNRiv&`Fgg79f_J~lCP!SwBR|*mrChI1tDqbu7=Gz(R z`{qCYnQv*Qvb0lK_0c+pf!`6m7>4E7+7+OGuA4Cs-uffv;^@Y&FoM2@F@23~^tCOI z{x;1lw-7Y8d8cw5(=WRHAF(=Uf5%T!{Z|GP#c~mjO=sna_`;;B zl+PO%DmUGzg9Lbyga-xI5BlG(cLqa9qx+@ zg)_tHAvL{_nN!Ak{ zE<^+3F@zgIBN`D5;wZvnDXFIKe@v$?>z%a_lQ z`>*&x!hJ|tRe$QHexl|RKNi9K+6^cA{9^+QOj1vmd=Ty zdU87L)=nkcv@x-aNi(y<4yVIBIxHJIt!$>Aecsl8O@I96<>&V-?z5l$eIHoWw_;V_ zitco++GevKH`ipF&DMB(X2@Q>DPm;Xy}iF>OMcDVbb3l`dYNahr=&NfFXYiz3r@|p zdYnxhsA-~9*t4#A&d7i-5X|!BW%+|%U!cI}D+v0sb93@SdH$7-e_z})re*N#wwbv_ zMR`R<6%CcXmfAplSz~o;pm4j-SC_OeT2_1Eyk%o*{7p5L^X5-0Dy^?>zjR5- zlo^fTnbWJ9n)6%o$F(nRX!HO3j(%^ze8+G>AlOsZ`m%V$rk~PJ=tsn>&HNoYV1SU`DC@)@^Q_+!CGIzHkYfh#W_Imr4>cfXQ3+?~?-#fYv??^0X z{O}GTqdVz7SIDNHjt{7Gg`A4dHOiIYN_VBXw0QYc*G_wnH!|8t?jI_2jh*H)SCYBh z<`T^%nM*d8VlLHOnz=mY(#@4@u9W!LX=m*|DBPH|$7ZPG)276y`%-r~%%Y!n8mo>u zh4{X_)Vxv7a~*RGcOja_PYT3qcu`{x~^ zENrnqA!OK$37x{|xOeB!e!H>Xn;tU`txwr+jOY}G8_k`3a)WjAQNcYk z$!T{8?n|K@N}&iw!w7JJ6C7Z(NctE)gnrlsuRzv#pJaDEJP3C{43@zXSPYAx8Ro;) za1}JbT$l~BfbT+&PA6Ul)ldbMFa;`ruT3u_jfG^;KmoUf=P&pJeuES6Z4|$TFJUWC zn}=`F^8%Zj;CXl!o`MbV1Uv?hz&f}SZiB9*XyQbA&fG;iyA_XyWZNiRZ&GNQWUX2vQ*hR5;T!j8Nk765 zkT}OthoHSrd>38^Mo6Q4jq)|>);O{n1#1uU1NVXf6s+Asx)HiyEv!xu6*S7%R!%xauft%S{sfu6Mj5_N0&q+IYpnuU54KCpw-N46Iw~%^a6EMH(Go+2c zDN~tZ^=>x#plS0%NE$e`4v zq`QCvrQAT``KYWRH9|eihUqXBC|03ZWeW4BlyZ@?ql8FIqjDZ89cWKs{*)v(9TxIw zI0Yx+I2?t;@DU^mGUrd;Nu&h%A<_eIAKVM;fG*@7((OPq^39~Ruo@UDc{yn@EKCp; zWR9o2fL)HKOqcTIY}No>%2gz@J@erum%&6RhVd{CE{3s?2SJOdd=c>ipl+FiET6-s z0-Rat8!Jgi;B(-RO7D~UfnudsNc>Kgwvw1|DawdT53+kdP`5 zVQq^1S`dF>{zN8SJix{GfY}z`Ch?dQc}$A0u}Q(=4${lO=@ffNcR)AX3O7L)^CwCs6dILNOA#P zy8p70`%m}@zK8FCxpyBX9Rk{RTSwOXtN259soTAev>moV99{q(6z+|r4ZvA-8zc&L zn*}HS;9dgOzzgmc(tL|#cN4JzX2&7}Vv&Kd$e>tca4a$;7Dw( B^>+XO 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