diff --git a/links/search_urls.py b/links/search_urls.py index 99d2585..7ca961f 100644 --- a/links/search_urls.py +++ b/links/search_urls.py @@ -1,9 +1,8 @@ from django.urls import path -from .search_views import SearchView, search, search_aliases, search_api_v2, SearchReactView +from .search_views import SearchReactView, search, search_aliases, search_api_v2 urlpatterns = [ - path('', SearchView.as_view(), name='search'), - path('react/', SearchReactView.as_view(), name='search_react'), + path('', SearchReactView.as_view(), name='search_main'), path('api/', search, name='search_api'), path('api/v2/', search_api_v2, name='search_api_v2'), path('aliases/', search_aliases, name='search_aliases'), diff --git a/links/templates/links/search.html b/links/templates/links/search.html.old_deprecated similarity index 100% rename from links/templates/links/search.html rename to links/templates/links/search.html.old_deprecated diff --git a/links/urls.py b/links/urls.py index 33b2ec2..2549273 100644 --- a/links/urls.py +++ b/links/urls.py @@ -15,7 +15,7 @@ urlpatterns = [ path('delete//', views.LinkDeleteView.as_view(), name='link_delete'), path('delete-selected/', views.delete_selected, name='delete_selected'), path('detail//', views.LinkDetailView.as_view(), name='link_detail'), - path('ui/search/', search_views.SearchView.as_view(), name='search'), + path('ui/search/', search_views.SearchReactView.as_view(), name='search'), path('link//', views.LinkDetailView.as_view(), name='link_detail'), path('link//edit/', views.LinkUpdateView.as_view(), name='link_update'), path('ui/tools/', views.ToolsView.as_view(), name='tools'), @@ -24,7 +24,6 @@ urlpatterns = [ # Pages path('ui/pages/', page_views.PageListView.as_view(), name='page-list'), - path('ui/new_search/', search_views.SearchReactView.as_view(), name='new_search'), path('ui/pages/new/', page_views.PageCreateView.as_view(), name='page-create'), path('ui/pages//', page_views.PageDetailView.as_view(), name='page-detail'), path('ui/pages//edit/', page_views.PageUpdateView.as_view(), name='page-update'), diff --git a/links/views.py b/links/views.py index 746fd0e..d9c43d2 100644 --- a/links/views.py +++ b/links/views.py @@ -40,7 +40,7 @@ from .page_views import ( PageUpdateView, PageDeleteView, fetch_page_info, PageViewSet ) -from .search_views import SearchView, search_aliases, search +from .search_views import search_aliases, search logger = logging.getLogger(__name__) diff --git a/templates/base.html b/templates/base.html index c8fa1bb..13900fa 100644 --- a/templates/base.html +++ b/templates/base.html @@ -67,20 +67,12 @@ {% trans "Menu" %}