diff --git a/payment-iq/app/components/GeneralHealthCard/GeneralHealthCard.tsx b/payment-iq/app/components/GeneralHealthCard/GeneralHealthCard.tsx
new file mode 100644
index 0000000..da4de86
--- /dev/null
+++ b/payment-iq/app/components/GeneralHealthCard/GeneralHealthCard.tsx
@@ -0,0 +1,66 @@
+import {
+ Box,
+ Card,
+ CardContent,
+ Typography,
+ IconButton,
+ Divider,
+} from '@mui/material';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
+import CalendarTodayIcon from '@mui/icons-material/CalendarToday';
+import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
+// import { ArrowDropUp } from '@mui/icons-material';
+
+const stats = [
+ { label: 'TOTAL', value: 5, change: '-84.85%' },
+ { label: 'SUCCESSFUL', value: 10, change: '100%' },
+ { label: 'ACCEPTANCE RATE', value: '0%', change: '-100%' },
+ { label: 'AMOUNT', value: '€0.00', change: '-100%' },
+ { label: 'ATV', value: '€0.00', change: '-100%' },
+];
+
+const StatItem = ({ label, value, change }: { label: string, value: string | number, change: string }) => (
+
+
+ {label}
+
+
+ {value}
+
+
+
+ {/* */}
+ {change}
+
+
+);
+
+export const GeneralHealthCard = () => {
+ return (
+
+
+
+
+ General Health
+
+
+
+ Last 24h
+
+
+
+
+
+
+
+
+
+ {stats.map((item) => (
+
+ ))}
+
+
+
+ );
+}
+
diff --git a/payment-iq/app/components/TransactionsOverview/TransactionsOverViewTable.tsx b/payment-iq/app/components/TransactionsOverview/TransactionsOverViewTable.tsx
index 379a972..2fef14c 100644
--- a/payment-iq/app/components/TransactionsOverview/TransactionsOverViewTable.tsx
+++ b/payment-iq/app/components/TransactionsOverview/TransactionsOverViewTable.tsx
@@ -1,137 +1,3 @@
-// import React from 'react';
-// import {
-// Table,
-// TableBody,
-// TableCell,
-// TableContainer,
-// TableHead,
-// TableRow,
-// Paper,
-// Typography,
-// Button,
-// Box
-// } from '@mui/material';
-// import { data1 } from './constants';
-
-// export const TransactionsOverview = () => {
-// const data = [
-// { state: 'Successful', count: 0, percentage: '0%', color: '#4caf50' }, // green
-// { state: 'Waiting', count: 0, percentage: '0%', color: '#ff9800' }, // orange
-// { state: 'Failed', count: 0, percentage: '0%', color: '#f44336' }, // red
-// { state: 'Cancelled', count: 0, percentage: '0%', color: '#9e9e9e' }, // grey
-// ];
-
-// return (
-//
-//
-//
-//
-// State
-// Count
-// Percentage
-// Action
-//
-//
-//
-// {data1.map((row) => (
-//
-//
-//
-//
-// {row.state}
-//
-//
-// {row.count}
-// {row.percentage}
-//
-//
-//
-//
-// ))}
-//
-//
-//
-// );
-// };
-// import React from 'react';
-// import {
-// Table,
-// TableBody,
-// TableCell,
-// TableContainer,
-// TableHead,
-// TableRow,
-// Paper,
-// Box,
-// Button
-// } from '@mui/material';
-// import { data1 } from './constants';
-
-
-// export const TransactionsOverview = () => {
-// return (
-//
-//
-//
-//
-// State
-// Count
-// Percentage
-// Action
-//
-//
-//
-// {data1.map((row) => (
-//
-//
-//
-//
-// {row.state}
-//
-//
-// {row.count}
-// {row.percentage}
-//
-//
-//
-//
-// ))}
-//
-//
-//
-// );
-// };
-
-
-
-
-import React from 'react';
import {
Table,
TableBody,
diff --git a/payment-iq/app/components/TransactionsOverview/TransactionsOverview.tsx b/payment-iq/app/components/TransactionsOverview/TransactionsOverview.tsx
index 7b4b77e..9085762 100644
--- a/payment-iq/app/components/TransactionsOverview/TransactionsOverview.tsx
+++ b/payment-iq/app/components/TransactionsOverview/TransactionsOverview.tsx
@@ -1,47 +1,50 @@
import { useRouter } from 'next/navigation';
-import { Box, Button, Paper, Typography } from "@mui/material"
+import { Box, Button, IconButton, Paper, Typography } from "@mui/material"
import { PieCharts } from "../PieCharts/PieCharts"
+import MoreVertIcon from '@mui/icons-material/MoreVert';
import { TransactionsOverviewTable } from "./TransactionsOverViewTable";
export const TransactionsOverview = () => {
- const router = useRouter();
- return (
+ const router = useRouter();
+ return (
+
-
-
-
-
- {/* Title and All Transactions Button */}
-
-
- Transactions Overview (Last 24h)
-
+ {/* Title and All Transactions Button */}
+
+
+ Transactions Overview (Last 24h)
+
+
+
+
+
+
- {/* Chart and Table */}
-
+ {/* Chart and Table */}
+
-
-
- )
-}
\ No newline at end of file
+
+
+ )
+}
diff --git a/payment-iq/app/components/TransactionsWaitingApproval/TransactionsWaitingApproval.tsx b/payment-iq/app/components/TransactionsWaitingApproval/TransactionsWaitingApproval.tsx
new file mode 100644
index 0000000..18eb247
--- /dev/null
+++ b/payment-iq/app/components/TransactionsWaitingApproval/TransactionsWaitingApproval.tsx
@@ -0,0 +1,111 @@
+import {
+ Box,
+ Button,
+ IconButton,
+ Paper,
+ Table,
+ TableBody,
+ TableCell,
+ TableContainer,
+ TableHead,
+ TableRow,
+ Typography
+} from '@mui/material';
+import CheckCircleIcon from '@mui/icons-material/CheckCircle';
+import CancelIcon from '@mui/icons-material/Cancel';
+
+import MoreVertIcon from '@mui/icons-material/MoreVert';
+
+const transactions = [
+
+ {
+ id: '1049078821',
+ user: '17',
+ created: '2025-06-17 16:45',
+ type: 'BestPayWithdrawal',
+ amount: '-787.49 TRY',
+ psp: 'BestPay'
+ },
+ {
+ id: '1049078822',
+ user: '17',
+ created: '2025-06-17 16:45',
+ type: 'BestPayWithdrawal',
+ amount: '-787.49 TRY',
+ psp: 'BestPay'
+ },
+ {
+ id: '1049078823',
+ user: '17',
+ created: '2025-06-17 16:45',
+ type: 'BestPayWithdrawal',
+ amount: '-787.49 TRY',
+ psp: 'BestPay'
+ },
+ {
+ id: '1049078824',
+ user: '17',
+ created: '2025-06-17 16:45',
+ type: 'BestPayWithdrawal',
+ amount: '-787.49 TRY',
+ psp: 'BestPay'
+ }
+];
+
+export const TransactionsWaitingApproval = () => {
+ return (
+
+
+
+
+
+
+ Transactions Waiting for Approval
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID
+ User
+ Created
+ Type
+ Amount
+ PSP
+ Action
+
+
+
+ {transactions.map((tx) => (
+
+ {tx.id}
+ {tx.user}
+ {tx.created}
+ {tx.type}
+ {tx.amount}
+ {tx.psp}
+
+
+
+
+
+
+
+
+
+ ))}
+
+
+
+
+
+ );
+}
diff --git a/payment-iq/app/components/dashboard/layout/layoutWrapper.ts b/payment-iq/app/components/dashboard/layout/layoutWrapper.ts
index 7da683a..3a9a999 100644
--- a/payment-iq/app/components/dashboard/layout/layoutWrapper.ts
+++ b/payment-iq/app/components/dashboard/layout/layoutWrapper.ts
@@ -4,5 +4,5 @@ export const LayoutWrapper = styled('div')({
display: 'flex',
width: '100%',
height: '100vh',
- overflow: 'hidden',
-});
\ No newline at end of file
+ // overflow: 'hidden',
+});
diff --git a/payment-iq/app/components/pages/homepage/homepage.tsx b/payment-iq/app/components/pages/homepage/homepage.tsx
index 2d2cda4..a2498ad 100644
--- a/payment-iq/app/components/pages/homepage/homepage.tsx
+++ b/payment-iq/app/components/pages/homepage/homepage.tsx
@@ -1,7 +1,16 @@
+import { Box } from "@mui/material"
+import { GeneralHealthCard } from "../../GeneralHealthCard/GeneralHealthCard"
import { TransactionsOverview } from "../../TransactionsOverview/TransactionsOverview"
+import { TransactionsWaitingApproval } from "../../TransactionsWaitingApproval/TransactionsWaitingApproval"
-export const HomePage = () => {
+export const HomePage = () => {
return (
-
+ <>
+
+
+
+
+
+ >
)
-}
\ No newline at end of file
+}
diff --git a/payment-iq/app/dashboard/layout.tsx b/payment-iq/app/dashboard/layout.tsx
index f3f31b0..3cba5b7 100644
--- a/payment-iq/app/dashboard/layout.tsx
+++ b/payment-iq/app/dashboard/layout.tsx
@@ -6,16 +6,17 @@ import Header from '../components/Dashboard/Header/Header';
import { LayoutWrapper } from '../components/Dashboard/Layout/layoutWrapper';
import SideBar from '../components/Dashboard/SideBar/Sidebar';
+
const DashboardLayout: React.FC<{ children: React.ReactNode }> = ({ children }) => {
return (
-
-
- {children}
-
-
+
+
+ {children}
+
+
);
};
diff --git a/payment-iq/app/dashboard/page.tsx b/payment-iq/app/dashboard/page.tsx
index 99c60f5..fa06e89 100644
--- a/payment-iq/app/dashboard/page.tsx
+++ b/payment-iq/app/dashboard/page.tsx
@@ -1,14 +1,10 @@
'use client';
-import { Box } from "@mui/material";
import { HomePage } from "../components/Pages/HomePage/HomePage";
-
const DashboardPage = () => {
return (
-
-
-
+
);
};