diff --git a/app/api/dashboard/admin/users/route.ts b/app/api/dashboard/admin/users/route.ts index 6352b69..4f57d83 100644 --- a/app/api/dashboard/admin/users/route.ts +++ b/app/api/dashboard/admin/users/route.ts @@ -1,11 +1,11 @@ -// app/api/user/route.ts +// app/api/dashboard/admin/users/route.ts import { NextRequest, NextResponse } from "next/server"; -export const users = [ +const users = [ { merchantId: 100987998, id: "bc6a8a55-13bc-4538-8255-cd0cec3bb4e9", - mame: "Jacob", + name: "Jacob", username: "lspaddy", firstName: "Paddy", lastName: "Man", @@ -46,9 +46,9 @@ export async function POST(request: NextRequest) { const { firstName, lastName, email, phone, role } = body; // Add the new user to the existing users array (in-memory, not persistent) - const bodytoAdd = { + const newUser = { merchantId: 100987998, - mame: "Jacob", + name: "Jacob", id: "382eed15-1e21-41fa-b1f3-0c1adb3af714", username: "lsterence", firstName, @@ -73,7 +73,7 @@ export async function POST(request: NextRequest) { twoFactorCondition: "required", twoFactorCredentials: [], }; - users.push(bodytoAdd); + users.push(newUser); return NextResponse.json(users, { status: 201 }); -} +} \ No newline at end of file diff --git a/app/dashboard/admin/page.tsx b/app/dashboard/admin/page.tsx index e91d47b..4e7a55d 100644 --- a/app/dashboard/admin/page.tsx +++ b/app/dashboard/admin/page.tsx @@ -1,8 +1,5 @@ -// This ensures this component is rendered only on the client side "use client"; -import { Approve } from "@/app/features/Pages/Approve/Approve"; - export default function BackOfficeUsersPage() { return (
diff --git a/app/dashboard/admin/users/page.tsx b/app/dashboard/admin/users/page.tsx index a3a3654..24a6ad9 100644 --- a/app/dashboard/admin/users/page.tsx +++ b/app/dashboard/admin/users/page.tsx @@ -1,4 +1,4 @@ -import Users from "@/app/features/Pages/Admin/Users/users"; +import Users from "@/app/features/pages/Admin/Users/users"; export default async function BackOfficeUsersPage() { const baseUrl = diff --git a/app/dashboard/approve/page.tsx b/app/dashboard/approve/page.tsx index dab8077..7ed8b86 100644 --- a/app/dashboard/approve/page.tsx +++ b/app/dashboard/approve/page.tsx @@ -1,7 +1,7 @@ // This ensures this component is rendered only on the client side "use client"; -import { Approve } from "@/app/features/Pages/Approve/Approve"; +import { Approve } from "@/app/features/pages/Approve/Approve"; export default function ApprovePage() { return ( diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index 707967c..aad0b66 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -1,6 +1,6 @@ "use client"; -import { DashboardHomePage } from "../features/Pages/DashboardHomePage/DashboardHomePage"; +import { DashboardHomePage } from "../features/pages/DashboardHomePage/DashboardHomePage"; const DashboardPage = () => { return ; diff --git a/app/dashboard/transactions/deposits/page.tsx b/app/dashboard/transactions/deposits/page.tsx index 922a508..3b1a49f 100644 --- a/app/dashboard/transactions/deposits/page.tsx +++ b/app/dashboard/transactions/deposits/page.tsx @@ -1,4 +1,5 @@ -import TransactionsTable from "@/app/features/Pages/Transactions/TransactionsTable"; + +import TransactionsTable from "@/app/features/pages/transactions/TransactionsTable"; import { getTransactions } from "@/app/services/transactions"; export default async function DepositTransactionPage({ diff --git a/app/dashboard/transactions/history/page.tsx b/app/dashboard/transactions/history/page.tsx index 922a508..2db697d 100644 --- a/app/dashboard/transactions/history/page.tsx +++ b/app/dashboard/transactions/history/page.tsx @@ -1,4 +1,4 @@ -import TransactionsTable from "@/app/features/Pages/Transactions/TransactionsTable"; +import TransactionsTable from "@/app/features/pages/transactions/TransactionsTable"; import { getTransactions } from "@/app/services/transactions"; export default async function DepositTransactionPage({ diff --git a/app/dashboard/transactions/withdrawals/page.tsx b/app/dashboard/transactions/withdrawals/page.tsx index 2800942..20afed4 100644 --- a/app/dashboard/transactions/withdrawals/page.tsx +++ b/app/dashboard/transactions/withdrawals/page.tsx @@ -1,7 +1,7 @@ -import TransactionsTable from "@/app/features/Pages/Transactions/TransactionsTable"; +import TransactionsTable from "@/app/features/pages/transactions/TransactionsTable"; import { getTransactions } from "@/app/services/transactions"; -export default async function DepositTransactionPage({ +export default async function WithdrawalTransactionPage({ searchParams, }: { searchParams: Promise>; diff --git a/app/features/Pages/Admin/Users/interfaces.ts b/app/features/Pages/Admin/Users/interfaces.ts index c9ac346..f99b43e 100644 --- a/app/features/Pages/Admin/Users/interfaces.ts +++ b/app/features/Pages/Admin/Users/interfaces.ts @@ -22,5 +22,6 @@ export interface IUser { releaseNotes: boolean; requiredActions: string[]; twoFactorCondition: string; + // eslint-disable-next-line @typescript-eslint/no-explicit-any twoFactorCredentials: any[]; // Assuming this is an array that could contain any type of data } diff --git a/app/features/Pages/DashboardHomePage/DashboardHomePage.tsx b/app/features/Pages/DashboardHomePage/DashboardHomePage.tsx index d36e1ad..b40cb60 100644 --- a/app/features/Pages/DashboardHomePage/DashboardHomePage.tsx +++ b/app/features/Pages/DashboardHomePage/DashboardHomePage.tsx @@ -6,7 +6,7 @@ import { FetchReport } from "../../FetchReports/FetchReports"; import { Documentation } from "../../Documentation/Documentation"; import { AccountIQ } from "../../AccountIQ/AccountIQ"; import { WhatsNew } from "../../WhatsNew/WhatsNew"; -import { TransactionsOverView } from "../../TransactionsOverview/TransactionsOverview"; +import { TransactionsOverView } from "../../TransactionsOverView/TransactionsOverview"; export const DashboardHomePage = () => { return ( diff --git a/app/features/UserRoles/EditUser/EditUser.tsx b/app/features/UserRoles/EditUser/EditUser.tsx index 9f384ff..b7bdbbf 100644 --- a/app/features/UserRoles/EditUser/EditUser.tsx +++ b/app/features/UserRoles/EditUser/EditUser.tsx @@ -47,6 +47,7 @@ const EditUser = () => { try { await createRole(form); router.refresh(); // <- refreshes the page (SSR re-runs) + // eslint-disable-next-line @typescript-eslint/no-explicit-any } catch (err: any) { console.log(err.message || "Error creating role"); // setError(err.message || "Error creating role"); diff --git a/app/features/UserRoles/userRoleCard.tsx b/app/features/UserRoles/userRoleCard.tsx index 32b3e93..4d544ba 100644 --- a/app/features/UserRoles/userRoleCard.tsx +++ b/app/features/UserRoles/userRoleCard.tsx @@ -38,8 +38,6 @@ export default function UserRoleCard({ name, email, isAdmin, - lastLogin, - // merchants, roles, extraRolesCount, }: Props) { diff --git a/app/features/dashboard/header/Header.tsx b/app/features/dashboard/header/Header.tsx index 2da283a..beccad7 100644 --- a/app/features/dashboard/header/Header.tsx +++ b/app/features/dashboard/header/Header.tsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React from "react"; import { AppBar, Toolbar, IconButton } from "@mui/material"; import MenuIcon from "@mui/icons-material/Menu"; import Dropdown from "./dropDown/DropDown"; @@ -6,19 +6,19 @@ import AccountMenu from "./accountMenu/AccountMenu"; import "./Header.scss"; const Header = () => { - const [anchorEl, setAnchorEl] = useState(null); + // const [anchorEl, setAnchorEl] = useState(null); - // Handle menu open - const handleMenuClick = (event: React.MouseEvent) => { - setAnchorEl(event.currentTarget); - }; + // // Handle menu open + // const handleMenuClick = (event: React.MouseEvent) => { + // setAnchorEl(event.currentTarget); + // }; - // Handle menu close - const handleMenuClose = () => { - setAnchorEl(null); - }; + // // Handle menu close + // const handleMenuClose = () => { + // setAnchorEl(null); + // }; - const handleChange = (e: any) => {}; + const handleChange = () => {}; return ( - - {children} - - ); diff --git a/app/page.tsx b/app/page.tsx index bb91a4b..cb6ddb3 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,6 +1,6 @@ "use client"; -import { DashboardHomePage } from "./features/Pages/DashboardHomePage/DashboardHomePage"; +import { DashboardHomePage } from "./features/pages/DashboardHomePage/DashboardHomePage"; const DashboardPage = () => { return ; diff --git a/app/utils/exportData.ts b/app/utils/exportData.ts index 17121fa..1f2b3f0 100644 --- a/app/utils/exportData.ts +++ b/app/utils/exportData.ts @@ -1,9 +1,11 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ +// @ts-nocheck import * as XLSX from "xlsx"; import { GridColDef } from "@mui/x-data-grid"; export type FileType = "csv" | "xls" | "xlsx"; import { saveAs } from "file-saver"; -import type { ITransaction } from "../features/Pages/Transactions/types"; +import type { ITransaction } from "../features/pages/transactions/types"; export const exportData = ( diff --git a/mock/handlers.ts b/mock/handlers.ts index b67318f..f949d9b 100644 --- a/mock/handlers.ts +++ b/mock/handlers.ts @@ -80,6 +80,8 @@ export const handlers = [ const statusCode = url.searchParams.get("statusCode"); // Filter transactions based on query parameters + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore let filteredTransactions = [...transactionDummyData]; if (userId) {