Remove old search page

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'),

links/urls.py

@@ -15,7 +15,7 @@ urlpatterns = [
     path('delete/<int:pk>/', views.LinkDeleteView.as_view(), name='link_delete'),
     path('delete-selected/', views.delete_selected, name='delete_selected'),
     path('detail/<int:pk>/', 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/<int:pk>/', views.LinkDetailView.as_view(), name='link_detail'),
     path('link/<int:pk>/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/<int:pk>/', page_views.PageDetailView.as_view(), name='page-detail'),
     path('ui/pages/<int:pk>/edit/', page_views.PageUpdateView.as_view(), name='page-update'),

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__)
 

templates/base.html

@@ -67,20 +67,12 @@
                         {% trans "Menu" %}
                     </button>
                     <div id="more-menu-dropdown" class="absolute right-0 mt-2 py-2 w-48 bg-white rounded-md shadow-xl z-20 hidden">
-                        <a href="{% url 'new_search' %}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">
-                            <div class="flex items-center">
-                                <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>
-                                </svg>
-                                {% trans "New Search" %}
-                            </div>
-                        </a>
                         <a href="{% url 'search' %}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">
                             <div class="flex items-center">
                                 <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"/>
                                 </svg>
-                                {% trans "Advanced Search" %}
+                                {% trans "Search" %}
                             </div>
                         </a>
                         <a href="{% url 'page-list' %}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100">