diff --git a/apimanager/accountlist/urls.py b/apimanager/accountlist/urls.py index 66d4b9a..b4769c8 100644 --- a/apimanager/accountlist/urls.py +++ b/apimanager/accountlist/urls.py @@ -3,14 +3,14 @@ URLs for Account list app """ -from django.conf.urls import url +from django.urls import re_path from .views import AccountListView, ExportCsvView urlpatterns = [ - url(r'^$', + re_path(r'^$', AccountListView.as_view(), name='account-list'), - url(r'^export_csv$', + re_path(r'^export_csv$', ExportCsvView.as_view(), name='export-csv-account') ] diff --git a/apimanager/accounts/urls.py b/apimanager/accounts/urls.py index 1b49947..a56ac75 100644 --- a/apimanager/accounts/urls.py +++ b/apimanager/accounts/urls.py @@ -3,11 +3,11 @@ URLs for Account app """ -from django.conf.urls import url +from django.urls import re_path from .views import IndexAccountsView urlpatterns = [ - url(r'^create', + re_path(r'^create', IndexAccountsView.as_view(), name='accounts-create'), diff --git a/apimanager/apicollectionlist/urls.py b/apimanager/apicollectionlist/urls.py index 2b0e83c..e7943fa 100644 --- a/apimanager/apicollectionlist/urls.py +++ b/apimanager/apicollectionlist/urls.py @@ -3,14 +3,14 @@ URLs for Api Collection list app """ -from django.conf.urls import url +from django.urls import re_path from .views import ApiCollectionListView, ExportCsvView urlpatterns = [ - url(r'^$', + re_path(r'^$', ApiCollectionListView.as_view(), name='apicollection-list'), - url(r'^export_csv$', + re_path(r'^export_csv$', ExportCsvView.as_view(), name='export-csv-apicollection') ] diff --git a/apimanager/apicollections/urls.py b/apimanager/apicollections/urls.py index b3b6851..12c595b 100644 --- a/apimanager/apicollections/urls.py +++ b/apimanager/apicollections/urls.py @@ -3,28 +3,25 @@ URLs for config app """ -from django.conf.urls import url +from django.urls import re_path from apicollections.views import IndexView, apicollections_save, \ apicollections_delete, DetailView, DeleteCollectionEndpointView, apicollections_update urlpatterns = [ - url(r'^$', + re_path(r'^$', IndexView.as_view(), name='apicollections-index'), - url(r'save/apicollection', apicollections_save, + re_path(r'save/apicollection', apicollections_save, name='apicollection-save'), - url(r'update/apicollection', apicollections_update, + re_path(r'update/apicollection', apicollections_update, name='apicollection-update'), - url(r'delete/apicollection', apicollections_delete, + re_path(r'delete/apicollection', apicollections_delete, name='apicollection-delete'), - url(r'^my-api-collection-ids/(?P[\w\@\.\+-]+)$', + re_path(r'^my-api-collection-ids/(?P[\w\@\.\+-]+)$', DetailView.as_view(), name='my-api-collection-detail'), - url(r'^delete/api-collections/(?P[\w-]+)/api-collection-endpoint/(?P[\w\@\.\+-]+)$', + re_path(r'^delete/api-collections/(?P[\w-]+)/api-collection-endpoint/(?P[\w\@\.\+-]+)$', DeleteCollectionEndpointView.as_view(), name='delete-api-collection-endpoint'), - # url(r'^add/api-collections/(?P[\w-]+)/api-collection-endpoints/(?P[\w\@\.\+-]+)$', - # AddCollectionEndpointView.as_view(), - # name='add-api-collection-endpoint'), ] diff --git a/apimanager/apimanager/urls.py b/apimanager/apimanager/urls.py index 4dfef6c..32143b3 100644 --- a/apimanager/apimanager/urls.py +++ b/apimanager/apimanager/urls.py @@ -3,7 +3,7 @@ URLs for apimanager """ -from django.conf.urls import url, include +from django.urls import re_path, include from django.conf.urls.i18n import i18n_patterns from base.views import HomeView @@ -16,13 +16,13 @@ from obp.views import ( urlpatterns = [ #These pages URLs have no GUI - url(r'^oauth/initiate$', + re_path(r'^oauth/initiate$', OAuthInitiateView.as_view(), name='oauth-initiate'), - url(r'^oauth/authorize$', + re_path(r'^oauth/authorize$', OAuthAuthorizeView.as_view(), name='oauth-authorize'), - url(r'^directlogin$', + re_path(r'^directlogin$', DirectLoginView.as_view(), name='directlogin'), - url(r'^gatewaylogin$', + re_path(r'^gatewaylogin$', GatewayLoginView.as_view(), name='gatewaylogin'), # Defining authentication URLs here and not including oauth.urls for # backward compatibility @@ -30,32 +30,32 @@ urlpatterns = [ urlpatterns += i18n_patterns( #urlpatterns = ( url(r'^$', HomeView.as_view(), name="home"), - url(r'^single-sign-on', + re_path(r'^single-sign-on', OAuthInitiateView.as_view(), name='single-sign-on'), - url(r'^logout$', LogoutView.as_view(), name='oauth-logout'), - url(r'^systemviews/', include('systemviews.urls')), - url(r'^accounts/', include('accounts.urls')), - url(r'^account/list', include('accountlist.urls')), - url(r'^consumers/', include('consumers.urls')), - url(r'^entitlementrequests/', include('entitlementrequests.urls')), - url(r'^users/', include('users.urls')), - url(r'^branches/', include('branches.urls')), - url(r'^atms/', include('atms.urls')), - url(r'^atms/list', include('atmlist.urls')), - url(r'^banks/', include('banks.urls')), - url(r'^banks/list', include('banklist.urls')), - url(r'^products/', include('products.urls')), - url(r'^products/list', include('productlist.urls')), - url(r'^customers/', include('customers.urls')), - url(r'^customer/list', include('customerlist.urls')), - url(r'^metrics/', include('metrics.urls')), - url(r'^config/', include('config.urls')), - url(r'^webui/', include('webui.urls')), - url(r'^methodrouting/', include('methodrouting.urls')), - url(r'^connectormethod/', include('connectormethod.urls')), - url(r'^dynamicendpoints/', include('dynamicendpoints.urls')), - url(r'^apicollections/', include('apicollections.urls')), - url(r'^apicollections-list', include('apicollectionlist.urls')), + re_path(r'^logout$', LogoutView.as_view(), name='oauth-logout'), + re_path(r'^systemviews/', include('systemviews.urls')), + re_path(r'^accounts/', include('accounts.urls')), + re_path(r'^account/list', include('accountlist.urls')), + re_path(r'^consumers/', include('consumers.urls')), + re_path(r'^entitlementrequests/', include('entitlementrequests.urls')), + re_path(r'^users/', include('users.urls')), + re_path(r'^branches/', include('branches.urls')), + re_path(r'^atms/', include('atms.urls')), + re_path(r'^atms/list', include('atmlist.urls')), + re_path(r'^banks/', include('banks.urls')), + re_path(r'^banks/list', include('banklist.urls')), + re_path(r'^products/', include('products.urls')), + re_path(r'^products/list', include('productlist.urls')), + re_path(r'^customers/', include('customers.urls')), + re_path(r'^customer/list', include('customerlist.urls')), + re_path(r'^metrics/', include('metrics.urls')), + re_path(r'^config/', include('config.urls')), + re_path(r'^webui/', include('webui.urls')), + re_path(r'^methodrouting/', include('methodrouting.urls')), + re_path(r'^connectormethod/', include('connectormethod.urls')), + re_path(r'^dynamicendpoints/', include('dynamicendpoints.urls')), + re_path(r'^apicollections/', include('apicollections.urls')), + re_path(r'^apicollections-list', include('apicollectionlist.urls')), ) #prefix_default_language=False, #)+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/apimanager/atmlist/urls.py b/apimanager/atmlist/urls.py index b41d66d..ed94382 100644 --- a/apimanager/atmlist/urls.py +++ b/apimanager/atmlist/urls.py @@ -3,14 +3,14 @@ URLs for ATM list app """ -from django.conf.urls import url +from django.urls import re_path from .views import AtmListView, ExportCsvView urlpatterns = [ - url(r'^$', + re_path(r'^$', AtmListView.as_view(), name='atm-list'), - url(r'^export_csv$', + re_path(r'^export_csv$', ExportCsvView.as_view(), name='export-csv') ] diff --git a/apimanager/atms/urls.py b/apimanager/atms/urls.py index f67b2d7..95e16ed 100644 --- a/apimanager/atms/urls.py +++ b/apimanager/atms/urls.py @@ -3,20 +3,20 @@ URLs for metrics app """ -from django.conf.urls import url +from django.urls import re_path from atms.views import IndexAtmsView, UpdateAtmsView, atm_attribute_save, atm_attribute_delete, atm_attribute_update urlpatterns = [ - url(r'^create', + re_path(r'^create', IndexAtmsView.as_view(), name='atms_create'), - url(r'^update/(?P[ 0-9\w|\W\@\.\+-]+)/bank/(?P[0-9\w\@\.\+-]+)/$', + re_path(r'^update/(?P[ 0-9\w|\W\@\.\+-]+)/bank/(?P[0-9\w\@\.\+-]+)/$', UpdateAtmsView.as_view(), name='atms_update'), - url(r'save/attribute', atm_attribute_save, + re_path(r'save/attribute', atm_attribute_save, name='atm_attribute_save'), - url(r'delete/attribute', atm_attribute_delete, + re_path(r'delete/attribute', atm_attribute_delete, name='atm_attribute_delete'), - url(r'updateattribute/attribute', atm_attribute_update, + re_path(r'updateattribute/attribute', atm_attribute_update, name='atm_attribute_update'), ] diff --git a/apimanager/banklist/urls.py b/apimanager/banklist/urls.py index 2bafd12..8c6dcd4 100644 --- a/apimanager/banklist/urls.py +++ b/apimanager/banklist/urls.py @@ -3,11 +3,11 @@ URLs for Bank list app """ -from django.conf.urls import url +from django.urls import re_path from .views import BankListView #, ExportCsvView urlpatterns = [ - url(r'^$', + re_path(r'^$', BankListView.as_view(), name='bank-list'), diff --git a/apimanager/banks/urls.py b/apimanager/banks/urls.py index 12c7250..11b5a8e 100644 --- a/apimanager/banks/urls.py +++ b/apimanager/banks/urls.py @@ -3,20 +3,20 @@ URLs for Bank app """ -from django.conf.urls import url +from django.urls import re_path from banks.views import IndexBanksView, UpdateBanksView, bank_attribute_save, bank_attribute_update, bank_attribute_delete urlpatterns = [ - url(r'^create', + re_path(r'^create', IndexBanksView.as_view(), name='banks_create'), - url(r'^update/bank/(?P[0-9\w\@\.\+-]+)/$', + re_path(r'^update/bank/(?P[0-9\w\@\.\+-]+)/$', UpdateBanksView.as_view(), name='banks_update'), - url(r'save/attribute', bank_attribute_save, + re_path(r'save/attribute', bank_attribute_save, name='bank_attribute_save'), - url(r'updateattribute/attribute', bank_attribute_update, + re_path(r'updateattribute/attribute', bank_attribute_update, name='bank_attribute_update'), - url(r'delete/attribute', bank_attribute_delete, + re_path(r'delete/attribute', bank_attribute_delete, name='bank_attribute_delete'), ] \ No newline at end of file diff --git a/apimanager/branches/urls.py b/apimanager/branches/urls.py index 11f3ebc..8cd5750 100644 --- a/apimanager/branches/urls.py +++ b/apimanager/branches/urls.py @@ -3,15 +3,15 @@ URLs for metrics app """ -from django.conf.urls import url +from django.urls import re_path from .views import IndexBranchesView, UpdateBranchesView urlpatterns = [ - url(r'^$', + re_path(r'^$', IndexBranchesView.as_view(), name='branches_list'), - url(r'^update/(?P[0-9\w\@\.\+-]+)/bank/(?P[0-9\w\@\.\+-]+)/$', + re_path(r'^update/(?P[0-9\w\@\.\+-]+)/bank/(?P[0-9\w\@\.\+-]+)/$', UpdateBranchesView.as_view(), name='branches_update') ] diff --git a/apimanager/config/urls.py b/apimanager/config/urls.py index 02f9816..01c182e 100644 --- a/apimanager/config/urls.py +++ b/apimanager/config/urls.py @@ -3,12 +3,12 @@ URLs for config app """ -from django.conf.urls import url +from django.urls import re_path from .views import IndexView urlpatterns = [ - url(r'^$', + re_path(r'^$', IndexView.as_view(), name='config-index'), ] diff --git a/apimanager/connectormethod/urls.py b/apimanager/connectormethod/urls.py index 66d432f..0f3fc50 100644 --- a/apimanager/connectormethod/urls.py +++ b/apimanager/connectormethod/urls.py @@ -3,16 +3,16 @@ URLs for config app """ -from django.conf.urls import url +from django.urls import re_path from connectormethod.views import IndexView, connectormethod_save, connectormethod_update urlpatterns = [ - url(r'^$', + re_path(r'^$', IndexView.as_view(), name='connectormethod'), - url(r'save/connectormethod', connectormethod_save, + re_path(r'save/connectormethod', connectormethod_save, name='connectormethod-save'), - url(r'^update/connectormethod', connectormethod_update, + re_path(r'^update/connectormethod', connectormethod_update, name='connectormethod-update') ] diff --git a/apimanager/consumers/urls.py b/apimanager/consumers/urls.py index 97678ef..e79395b 100644 --- a/apimanager/consumers/urls.py +++ b/apimanager/consumers/urls.py @@ -3,21 +3,21 @@ URLs for consumers app """ -from django.conf.urls import url +from django.urls import re_path from .views import IndexView, DetailView, EnableView, DisableView urlpatterns = [ - url(r'^$', + re_path(r'^$', IndexView.as_view(), name='consumers-index'), - url(r'^(?P[0-9a-z\-]+)$', + re_path(r'^(?P[0-9a-z\-]+)$', DetailView.as_view(), name='consumers-detail'), - url(r'^(?P[0-9a-z\-]+)/enable$', + re_path(r'^(?P[0-9a-z\-]+)/enable$', EnableView.as_view(), name='consumers-enable'), - url(r'^(?P[0-9a-z\-]+)/disable$', + re_path(r'^(?P[0-9a-z\-]+)/disable$', DisableView.as_view(), name='consumers-disable'), ] diff --git a/apimanager/customerlist/urls.py b/apimanager/customerlist/urls.py index 122fb52..8c79ccf 100644 --- a/apimanager/customerlist/urls.py +++ b/apimanager/customerlist/urls.py @@ -3,14 +3,14 @@ URLs for customer list app """ -from django.conf.urls import url +from django.urls import re_path from .views import CustomerListView, ExportCsvView urlpatterns = [ - url(r'^$', + re_path(r'^$', CustomerListView.as_view(), name='customer-list'), - url(r'^export_csv$', + re_path(r'^export_csv$', ExportCsvView.as_view(), name='export-csv-customer') ] diff --git a/apimanager/customers/urls.py b/apimanager/customers/urls.py index 060fe8c..45880f6 100644 --- a/apimanager/customers/urls.py +++ b/apimanager/customers/urls.py @@ -3,11 +3,11 @@ URLs for customers app """ -from django.conf.urls import url +from django.urls import re_path from .views import CreateView urlpatterns = [ - url(r'^$', + re_path(r'^$', CreateView.as_view(), name='customers-create'), ] diff --git a/apimanager/dynamicendpoints/urls.py b/apimanager/dynamicendpoints/urls.py index 614dfa0..cf43185 100644 --- a/apimanager/dynamicendpoints/urls.py +++ b/apimanager/dynamicendpoints/urls.py @@ -3,16 +3,16 @@ URLs for config app """ -from django.conf.urls import url +from django.urls import re_path from dynamicendpoints.views import IndexView, dynamicendpoints_save,dynamicendpoints_delete urlpatterns = [ - url(r'^$', + re_path(r'^$', IndexView.as_view(), name='dynamicendpoints-index'), - url(r'save/dynamicendpoint', dynamicendpoints_save, + re_path(r'save/dynamicendpoint', dynamicendpoints_save, name='dynamicendpoint-save'), - url(r'delete/dynamicendpoint', dynamicendpoints_delete, + re_path(r'delete/dynamicendpoint', dynamicendpoints_delete, name='dynamicendpoint-delete') ] diff --git a/apimanager/entitlementrequests/urls.py b/apimanager/entitlementrequests/urls.py index d17ea4c..864e07e 100644 --- a/apimanager/entitlementrequests/urls.py +++ b/apimanager/entitlementrequests/urls.py @@ -3,18 +3,18 @@ URLs for entitlement requests app """ -from django.conf.urls import url +from django.urls import re_path from .views import IndexView, RejectEntitlementRequest, AcceptEntitlementRequest urlpatterns = [ - url(r'^$', + re_path(r'^$', IndexView.as_view(), name='entitlementrequests-index'), - url(r'^entitlement-requests/entitlement_request_id/(?P[\w\@\.\+-]+)$', + re_path(r'^entitlement-requests/entitlement_request_id/(?P[\w\@\.\+-]+)$', RejectEntitlementRequest.as_view(), name='entitlement-request-delete'), - url(r'^entitlement-requests/user_id/(?P[\w\@\.\+-]+)$', + re_path(r'^entitlement-requests/user_id/(?P[\w\@\.\+-]+)$', AcceptEntitlementRequest.as_view(), name='entitlement-request-accept'), ] diff --git a/apimanager/methodrouting/urls.py b/apimanager/methodrouting/urls.py index 0574feb..7930ed4 100644 --- a/apimanager/methodrouting/urls.py +++ b/apimanager/methodrouting/urls.py @@ -3,16 +3,16 @@ URLs for config app """ -from django.conf.urls import url +from django.urls import re_path from methodrouting.views import IndexView, methodrouting_save, methodrouting_delete urlpatterns = [ - url(r'^$', + re_path(r'^$', IndexView.as_view(), name='methodrouting-index'), - url(r'save/method', methodrouting_save, + re_path(r'save/method', methodrouting_save, name='methodrouting-save'), - url(r'delete/method', methodrouting_delete, + re_path(r'delete/method', methodrouting_delete, name='methodrouting-delete'), ] diff --git a/apimanager/metrics/urls.py b/apimanager/metrics/urls.py index d94d6b8..c04d4a2 100644 --- a/apimanager/metrics/urls.py +++ b/apimanager/metrics/urls.py @@ -3,7 +3,7 @@ URLs for metrics app """ -from django.conf.urls import url +from django.urls import re_path from .views import ( APIMetricsView, @@ -20,37 +20,37 @@ from .views import ( ) urlpatterns = [ - url(r'^api/$', + re_path(r'^api/$', APIMetricsView.as_view(), name='api-metrics'), - url(r'^api/last-endpoint/$', + re_path(r'^api/last-endpoint/$', get_metric_last_endpoint, name='api-metrics-last-endpoint'), - url(r'^api/summary-partial-function$', + re_path(r'^api/summary-partial-function$', APISummaryPartialFunctionView.as_view(), name='api-metrics-summary-partial-function'), - url(r'^connector/$', + re_path(r'^connector/$', ConnectorMetricsView.as_view(), name='connector-metrics'), - url(r'^monthly-summary/$', + re_path(r'^monthly-summary/$', MonthlyMetricsSummaryView.as_view(), name='metrics-summary'), - url(r'^yearly-summary/$', + re_path(r'^yearly-summary/$', YearlySummaryView.as_view(), name='yearly-summary'), - url(r'^quarterly-summary/$', + re_path(r'^quarterly-summary/$', QuarterlySummaryView.as_view(), name='quarterly-summary'), - url(r'^weekly-summary/$', + re_path(r'^weekly-summary/$', WeeklySummaryView.as_view(), name='weekly-summary'), - url(r'^daily-summary/$', + re_path(r'^daily-summary/$', DailySummaryView.as_view(), name='daily-summary'), - url(r'^hourly-summary/$', + re_path(r'^hourly-summary/$', HourlySummaryView.as_view(), name='hourly-summary'), - url(r'^custom-summary/$', + re_path(r'^custom-summary/$', CustomSummaryView.as_view(), name='custom-summary'), ] diff --git a/apimanager/obp/urls.py b/apimanager/obp/urls.py index 097d448..cbbff78 100644 --- a/apimanager/obp/urls.py +++ b/apimanager/obp/urls.py @@ -3,7 +3,7 @@ URLs for OBP app """ -from django.conf.urls import url +from django.urls import re_path from .views import ( OAuthInitiateView, OAuthAuthorizeView, @@ -14,14 +14,14 @@ from .views import ( urlpatterns = [ - url(r'^oauth/initiate$', + re_path(r'^oauth/initiate$', OAuthInitiateView.as_view(), name='oauth-initiate'), - url(r'^oauth/authorize$', + re_path(r'^oauth/authorize$', OAuthAuthorizeView.as_view(), name='oauth-authorize'), - url(r'^directlogin$', + re_path(r'^directlogin$', DirectLoginView.as_view(), name='directlogin'), - url(r'^gatewaylogin$', + re_path(r'^gatewaylogin$', GatewayLoginView.as_view(), name='gatewaylogin'), - url(r'^logout$', + re_path(r'^logout$', LogoutView.as_view(), name='oauth-logout'), ] diff --git a/apimanager/productlist/urls.py b/apimanager/productlist/urls.py index 6fd076a..f8bb1ad 100644 --- a/apimanager/productlist/urls.py +++ b/apimanager/productlist/urls.py @@ -3,14 +3,14 @@ URLs for Product list app """ -from django.conf.urls import url +from django.urls import re_path from .views import ProductListView, ExportCsvView urlpatterns = [ - url(r'^$', + re_path(r'^$', ProductListView.as_view(), name='product-list'), - url(r'^export_csv$', + re_path(r'^export_csv$', ExportCsvView.as_view(), name='export-csv-product'), diff --git a/apimanager/products/urls.py b/apimanager/products/urls.py index 84e4e9b..c28123e 100644 --- a/apimanager/products/urls.py +++ b/apimanager/products/urls.py @@ -3,18 +3,18 @@ URLs for metrics app """ -from django.conf.urls import url +from django.urls import re_path from .views import IndexProductView, UpdateProductView, create_list urlpatterns = [ - url(r'^create', + re_path(r'^create', IndexProductView.as_view(), name='products-create'), - url(r'^update/(?P[0-9\w\@\.\+-]+)/bank/(?P[0-9\w\@\.\+-]+)/$', + re_path(r'^update/(?P[0-9\w\@\.\+-]+)/bank/(?P[0-9\w\@\.\+-]+)/$', UpdateProductView.as_view(), name='products_update'), - url(r'^createProductList', + re_path(r'^createProductList', create_list, name = 'create-product-list'), ] diff --git a/apimanager/systemviews/urls.py b/apimanager/systemviews/urls.py index 76a6e13..5690645 100644 --- a/apimanager/systemviews/urls.py +++ b/apimanager/systemviews/urls.py @@ -3,11 +3,11 @@ URLs for System View app """ -from django.conf.urls import url +from django.urls import re_path from .views import SystemView urlpatterns = [ - url(r'^$', + re_path(r'^$', SystemView.as_view(), name='system_view'), ] diff --git a/apimanager/users/urls.py b/apimanager/users/urls.py index c7e3891..3b19edd 100644 --- a/apimanager/users/urls.py +++ b/apimanager/users/urls.py @@ -3,35 +3,35 @@ URLs for users app """ -from django.conf.urls import url +from django.urls import re_path from django.urls import path from .views import IndexView, DetailView, MyDetailView, DeleteEntitlementView, InvitationView, UserStatusUpdateView, \ ExportCsvView, AutocompleteFieldView, DeleteAttributeView urlpatterns = [ - url(r'^all$', + re_path(r'^all$', IndexView.as_view(), name='users-index'), - url(r'^all/user_id/(?P[\w\@\.\+-]+)$', + re_path(r'^all/user_id/(?P[\w\@\.\+-]+)$', DetailView.as_view(), name='users-detail'), - url(r'^myuser$', + re_path(r'^myuser$', MyDetailView.as_view(), name='my-user-detail'), - url(r'^myuser/invitation$', + re_path(r'^myuser/invitation$', InvitationView.as_view(), name='my-user-invitation'), - url(r'^(?P[\w-]+)/entitlement/delete/(?P[\w-]+)$', + re_path(r'^(?P[\w-]+)/entitlement/delete/(?P[\w-]+)$', DeleteEntitlementView.as_view(), name='users-delete-entitlement'), - url(r'^(?P[\w-]+)/atribute/delete/(?P[\w-]+)$', + re_path(r'^(?P[\w-]+)/atribute/delete/(?P[\w-]+)$', DeleteAttributeView.as_view(), name='users-delete-attribute'), - url(r'^(?P[\w-]+)/userStatusUpdateView/(?P[\w\@\.\+-]+)$', + re_path(r'^(?P[\w-]+)/userStatusUpdateView/(?P[\w\@\.\+-]+)$', UserStatusUpdateView.as_view(), name='user-status-update'), - url(r'^export_csv$', + re_path(r'^export_csv$', ExportCsvView.as_view(), name='export-csv-users'), ] diff --git a/apimanager/webui/urls.py b/apimanager/webui/urls.py index ee5f9ee..bb190ca 100644 --- a/apimanager/webui/urls.py +++ b/apimanager/webui/urls.py @@ -3,16 +3,16 @@ URLs for config app """ -from django.conf.urls import url +from django.urls import re_path from .views import IndexView, webui_save, webui_delete urlpatterns = [ - url(r'^$', + re_path(r'^$', IndexView.as_view(), name='webui-index'), - url(r'save/method', webui_save, + re_path(r'save/method', webui_save, name='methodrouting-save'), - url(r'delete/method', webui_delete, + re_path(r'delete/method', webui_delete, name='methodrouting-delete') ] diff --git a/requirements.txt b/requirements.txt index 29432a6..099257b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ psycopg2-binary #Django==1.11.7 -Django==3.2.25 +Django==4.2.16 oauthlib==3.2.2 requests==2.32.3 requests-oauthlib==1.3.1