Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1 into shaxob
# Conflicts: # core/apps/accounts/serializers/user.py # core/apps/accounts/urls.py # core/apps/accounts/views/user.py # core/apps/evaluation/urls.py # core/apps/evaluation/views/request.py
This commit is contained in:
@@ -5,7 +5,7 @@ Accounts app urls
|
||||
from django.urls import path, include
|
||||
from rest_framework_simplejwt import views as jwt_views
|
||||
from .views import RegisterView, ResetPasswordView, MeView, ChangePasswordView, UserListApiView, AdminUserListApiView, \
|
||||
AdminUpdateAPIView, AdminCreateAPIView
|
||||
AdminUserView, AdminCreateAPIView, AdminUpdateAPIView
|
||||
from rest_framework.routers import DefaultRouter
|
||||
|
||||
router = DefaultRouter()
|
||||
@@ -13,6 +13,7 @@ router.register("auth", RegisterView, basename="auth")
|
||||
router.register("auth", ResetPasswordView, basename="reset-password")
|
||||
router.register("auth", MeView, basename="me")
|
||||
router.register("auth", ChangePasswordView, basename="change-password")
|
||||
router.register("user", AdminUserView, basename="user-crud")
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
|
||||
Reference in New Issue
Block a user