Backend fixed and features

packages/sshecret-admin/src/sshecret_admin/frontend/views/clients.py

@@ -79,39 +79,60 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter:
     templates = dependencies.templates
 
     @app.get("/clients/")
-    async def get_client_tree(
+    async def get_test_page(
         request: Request,
         current_user: Annotated[LocalUserInfo, Depends(dependencies.get_user_info)],
         admin: Annotated[AdminBackend, Depends(dependencies.get_admin_backend)],
     ) -> Response:
-        """Get client tree view."""
-        page = 1
-        per_page = CLIENTS_PER_PAGE
-        offset = 0
+        """Get test page."""
 
-        client_filter = ClientFilter(offset=offset, limit=per_page)
-        results = await admin.query_clients(client_filter)
-        paginate = PagingInfo(
-            page=page, limit=per_page, total=results.total_results, offset=offset
-        )
 
         breadcrumbs = [("clients", "/clients/")]
 
-        LOG.info("Results %r", results)
         return templates.TemplateResponse(
             request,
-            "clients/index.html.j2",
+            "admin/index.html.j2",
             {
                 "breadcrumbs": breadcrumbs,
                 "page_title": "Clients",
-                "offset": offset,
-                "pages": paginate,
-                "clients": results.clients,
                 "user": current_user,
-                "results": results,
-            },
+            }
         )
 
+    # @app.get("/clients/")
+    # async def get_client_tree(
+    #     request: Request,
+    #     current_user: Annotated[LocalUserInfo, Depends(dependencies.get_user_info)],
+    #     admin: Annotated[AdminBackend, Depends(dependencies.get_admin_backend)],
+    # ) -> Response:
+    #     """Get client tree view."""
+    #     page = 1
+    #     per_page = CLIENTS_PER_PAGE
+    #     offset = 0
+
+    #     client_filter = ClientFilter(offset=offset, limit=per_page)
+    #     results = await admin.query_clients(client_filter)
+    #     paginate = PagingInfo(
+    #         page=page, limit=per_page, total=results.total_results, offset=offset
+    #     )
+
+    #     breadcrumbs = [("clients", "/clients/")]
+
+    #     LOG.info("Results %r", results)
+    #     return templates.TemplateResponse(
+    #         request,
+    #         "clients/index_new.html.j2",
+    #         {
+    #             "breadcrumbs": breadcrumbs,
+    #             "page_title": "Clients",
+    #             "offset": offset,
+    #             "pages": paginate,
+    #             "clients": results.clients,
+    #             "user": current_user,
+    #             "results": results,
+    #         },
+    #     )
+
     @app.get("/clients/page/{page}")
     async def get_client_page(
         request: Request,

packages/sshecret-admin/src/sshecret_admin/frontend/views/index.py

@@ -3,7 +3,7 @@
 # pyright: reportUnusedFunction=false
 import logging
 from typing import Annotated
-from fastapi import APIRouter, Depends, Form, Request
+from fastapi import APIRouter, Depends, Form, Request, Response
 from fastapi.responses import RedirectResponse
 from pydantic import BaseModel
 from sqlalchemy.ext.asyncio import AsyncSession