edit users solved conflicts
This commit is contained in:
@@ -21,7 +21,7 @@ DATABASES = {
|
||||
},
|
||||
}
|
||||
|
||||
MEDIA_ROOT = BASE_DIR + '/media/'
|
||||
MEDIA_ROOT = BASE_DIR + '/../media/'
|
||||
MEDIA_URL = '/media/'
|
||||
|
||||
# JWT SETTINGS
|
||||
|
||||
@@ -18,7 +18,7 @@ from django.urls import path, include
|
||||
from django.conf.urls.static import static
|
||||
from django.conf import settings
|
||||
|
||||
from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView, TokenVerifyView
|
||||
from rest_framework_simplejwt.views import TokenRefreshView, TokenVerifyView
|
||||
|
||||
from core import views as core_views
|
||||
from products import views as product_views
|
||||
@@ -28,11 +28,10 @@ from .routers import router
|
||||
|
||||
urlpatterns = [
|
||||
path('admin/', admin.site.urls),
|
||||
path('api/v1/token/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
|
||||
path('api/v1/token/', core_views.CustomTokenObtainPairView.as_view(), name='token_obtain_pair'),
|
||||
path('api/v1/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
|
||||
path('api/v1/token/verify/', TokenVerifyView.as_view(), name='token_verify'),
|
||||
path('api/v1/user/change_password/<int:pk>/', core_views.ChangeUserPasswordView.as_view(), name="change-password"),
|
||||
path('api/v1/user/update/<int:pk>/', core_views.UpdateUserView.as_view(), name="update-user"),
|
||||
path('api/v1/load_coops/', core_views.load_coop_managers, name='coop-loader'),
|
||||
path('api/v1/load_products/', product_views.load_coop_products, name='product-loader'),
|
||||
path('api/v1/search_products/', product_views.product_search, name='product-search'),
|
||||
|
||||
Reference in New Issue
Block a user