From abf15a7a7df612cd82cc7c38a9eaccdb0df98966 Mon Sep 17 00:00:00 2001 From: Mitchell Magro Date: Mon, 22 Dec 2025 10:32:37 +0100 Subject: [PATCH] s --- app/api/dashboard/admin/users/route.ts | 2 ++ app/components/PageLinks/PageLinks.tsx | 1 - app/dashboard/audits/AuditTableClient.tsx | 2 -- app/redux/auth/authSlice.tsx | 3 --- app/services/users.ts | 20 ++++++++++++++++++-- app/utils/iconMap.ts | 2 ++ middleware.ts | 1 - 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/app/api/dashboard/admin/users/route.ts b/app/api/dashboard/admin/users/route.ts index ee5764a..ad02f85 100644 --- a/app/api/dashboard/admin/users/route.ts +++ b/app/api/dashboard/admin/users/route.ts @@ -28,6 +28,8 @@ export async function GET(request: Request) { const data = await response.json(); + console.log("[Users] - data FROM ROUTE", data); + return NextResponse.json(data, { status: response.status }); } catch (err: unknown) { console.error("Proxy GET /api/v1/users/list error:", err); diff --git a/app/components/PageLinks/PageLinks.tsx b/app/components/PageLinks/PageLinks.tsx index 34f319f..62af6b4 100644 --- a/app/components/PageLinks/PageLinks.tsx +++ b/app/components/PageLinks/PageLinks.tsx @@ -15,7 +15,6 @@ interface IPageLinksProps extends ISidebarLink { // PageLinks component export default function PageLinks({ title, path, icon }: IPageLinksProps) { const Icon = resolveIcon(icon); - console.log("Icon", Icon); return ( {Icon && } diff --git a/app/dashboard/audits/AuditTableClient.tsx b/app/dashboard/audits/AuditTableClient.tsx index 5c9b2ff..98abfd5 100644 --- a/app/dashboard/audits/AuditTableClient.tsx +++ b/app/dashboard/audits/AuditTableClient.tsx @@ -151,8 +151,6 @@ export default function AuditTableClient({ const loading = isNavigating; - console.log("LOADING", loading); - return (
diff --git a/app/redux/auth/authSlice.tsx b/app/redux/auth/authSlice.tsx index d9bb870..9a649ab 100644 --- a/app/redux/auth/authSlice.tsx +++ b/app/redux/auth/authSlice.tsx @@ -230,7 +230,6 @@ export const addUser = createAsyncThunk< try { const state = getState(); const currentUserId = state.auth.user?.id; - console.log("[DEBUG] [ADD-USER] [currentUserId]: ", currentUserId); const res = await fetch("/api/auth/register", { method: "POST", headers: { "Content-Type": "application/json" }, @@ -239,8 +238,6 @@ export const addUser = createAsyncThunk< const data = await res.json(); - console.log("[DEBUG] [ADD-USER] [data]: ", data); - if (!res.ok) { return rejectWithValue(data.message || "Failed to create user"); } diff --git a/app/services/users.ts b/app/services/users.ts index d636246..7a51eea 100644 --- a/app/services/users.ts +++ b/app/services/users.ts @@ -8,7 +8,17 @@ import { USERS_CACHE_TAG, } from "./constants"; -export async function fetchUsers(): Promise { +const DEFAULT_PAGE_SIZE = 25; + +interface FetchUsersParams { + limit?: number; + page?: number; +} + +export async function fetchUsers({ + limit = DEFAULT_PAGE_SIZE, + page = 1, +}: FetchUsersParams = {}): Promise { const cookieStore = await cookies(); const token = cookieStore.get(AUTH_COOKIE_NAME)?.value; @@ -16,8 +26,14 @@ export async function fetchUsers(): Promise { throw new Error("Missing auth token"); } - const backendUrl = `${BE_BASE_URL}/api/v1/users`; + const params = new URLSearchParams(); + params.set("limit", String(limit)); + params.set("page", String(page)); + const backendUrl = `${BE_BASE_URL}/api/v1/users${ + params.size ? `?${params.toString()}` : "" + }`; + console.log("[Users] - backendUrl", backendUrl); const response = await fetch(backendUrl, { method: "GET", headers: { diff --git a/app/utils/iconMap.ts b/app/utils/iconMap.ts index 014b96c..ed4fbe8 100644 --- a/app/utils/iconMap.ts +++ b/app/utils/iconMap.ts @@ -26,6 +26,7 @@ import AccountBalanceIcon from "@mui/icons-material/AccountBalance"; import PaymentIcon from "@mui/icons-material/Payment"; import CurrencyExchangeIcon from "@mui/icons-material/CurrencyExchange"; import ViewSidebarIcon from "@mui/icons-material/ViewSidebar"; +import CompareArrowsIcon from "@mui/icons-material/CompareArrows"; const IconMap = { HomeIcon, @@ -53,6 +54,7 @@ const IconMap = { PaymentIcon, CurrencyExchangeIcon, ViewSidebarIcon, + CompareArrowsIcon, }; export default IconMap; diff --git a/middleware.ts b/middleware.ts index 907587d..4947eb7 100644 --- a/middleware.ts +++ b/middleware.ts @@ -56,7 +56,6 @@ async function validateToken(token: string) { algorithms: ["HS256"], }); - console.log("[middleware] payload", payload); return payload as { exp?: number; MustChangePassword?: boolean;