diff --git a/payment-iq/app/components/PageLinks/PageLinks.tsx b/payment-iq/app/components/PageLinks/PageLinks.tsx
new file mode 100644
index 0000000..12962d8
--- /dev/null
+++ b/payment-iq/app/components/PageLinks/PageLinks.tsx
@@ -0,0 +1,41 @@
+"use client";
+
+import Link from "next/link";
+import { styled } from "@mui/system";
+import { ISidebarLink } from "@/interfaces/SidebarLink.interfaces";
+
+const LinkContainer = styled("div")(({ theme }) => ({
+ display: "flex",
+ alignItems: "center",
+ padding: "12px 1px",
+ borderRadius: "4px",
+ color: theme.palette.text.tertiary,
+ textDecoration: "none",
+ transition: "background 0.2s ease-in-out",
+
+ "&:hover": {
+ color: "rgb(255, 255, 255)",
+ background: "rgba(255, 255, 255, 0.08)",
+ backgroundColor: theme.palette.action.hover,
+ cursor: "pointer",
+ },
+}));
+
+const LinkText = styled("span")(({ theme }) => ({
+ color: theme.palette.text.tertiary,
+ marginLeft: "12px",
+ fontWeight: 500,
+}));
+
+export default function PageLinks({ title, path, icon: Icon }: ISidebarLink) {
+ return (
+
+
+
+ {Icon && }
+ {title}
+
+
+
+ );
+}
diff --git a/payment-iq/app/components/dashboard/header/DropDown.tsx b/payment-iq/app/components/dashboard/header/DropDown.tsx
deleted file mode 100644
index aaff10d..0000000
--- a/payment-iq/app/components/dashboard/header/DropDown.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import {
- FormControl,
- InputLabel,
- Select,
- MenuItem,
- SelectChangeEvent,
- ListItemIcon,
- ListItemText,
-} from '@mui/material';
-import { SIDEBAR_LINKS } from '@/constants/SidebarLink.constants';
-
-interface Props {
- onChange?: (event: SelectChangeEvent) => void;
-}
-
-export default function SidebarDropdown({ onChange }: Props) {
- const [value, setValue] = React.useState('');
-
- const handleChange = (event: SelectChangeEvent) => {
- setValue(event.target.value);
- onChange?.(event);
- };
-
- return (
-
-
-
-
- );
-}
diff --git a/payment-iq/app/components/dashboard/sidebar/Sidebar.tsx b/payment-iq/app/components/dashboard/sidebar/Sidebar.tsx
deleted file mode 100644
index 512714d..0000000
--- a/payment-iq/app/components/dashboard/sidebar/Sidebar.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-'use client';
-
-import React from 'react';
-import DashboardIcon from '@mui/icons-material/Dashboard';
-import { styled } from '@mui/system';
-import { SIDEBAR_LINKS } from '@/constants/SidebarLink.constants';
-import SidebarLink from './SideBarLink';
-
-const SideBarContainer = styled('aside')(({ theme }) => ({
- position: 'fixed',
- top: 0,
- left: 0,
- width: 240,
- height: '100vh',
- backgroundColor: theme.palette.background.primary,
- color: theme.palette.text.primary,
- display: 'flex',
- flexDirection: 'column',
- padding: theme.spacing(2),
- zIndex: 1100,
- borderRight: `1px solid ${theme.palette.divider}`,
-}));
-
-const SidebarHeader = styled('div')(({ theme }) => ({
- fontSize: '20px',
- fontWeight: 600,
- marginBottom: theme.spacing(3),
- display: 'flex',
- alignItems: 'center',
- color: theme.palette.text.primary,
-}));
-
-const IconSpacing = styled(DashboardIcon)(({ theme }) => ({
- marginLeft: theme.spacing(1),
-}));
-
-const SideBar = () => {
- return (
-
-
- Betrise cashir
-
- {SIDEBAR_LINKS.map((link) => (
-
- ))}
-
- );
-};
-
-export default SideBar;
diff --git a/payment-iq/app/components/sidebar/SideBarLink.tsx b/payment-iq/app/components/sidebar/SideBarLink.tsx
deleted file mode 100644
index 17601cf..0000000
--- a/payment-iq/app/components/sidebar/SideBarLink.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-import { styled } from '@mui/system';
-import { ISidebarLink } from '@/interfaces/SidebarLink.interfaces';
-
-const LinkContainer = styled('div')(({ theme }) => ({
- display: 'flex',
- alignItems: 'center',
- padding: '12px 1px',
- borderRadius: '4px',
- color: theme.palette.text.tertiary,
- textDecoration: 'none',
- transition: 'background 0.2s ease-in-out',
-
- '&:hover': {
- color: 'rgb(255, 255, 255)',
- background: 'rgba(255, 255, 255, 0.08)',
- backgroundColor: theme.palette.action.hover,
- cursor: 'pointer',
- },
-}));
-
-const LinkText = styled('span')(({ theme }) => ({
- color: theme.palette.text.tertiary,
- marginLeft: '12px',
- fontWeight: 500,
-}));
-
-export default function SidebarLink({ title, path, icon: Icon }: ISidebarLink) {
- return (
-
-
-
- {Icon && }
- {title}
-
-
-
- );
-}
diff --git a/payment-iq/app/dashboard/approve/page.tsx b/payment-iq/app/dashboard/approve/page.tsx
index e71ddaf..dab8077 100644
--- a/payment-iq/app/dashboard/approve/page.tsx
+++ b/payment-iq/app/dashboard/approve/page.tsx
@@ -1,7 +1,7 @@
// This ensures this component is rendered only on the client side
-'use client';
+"use client";
-import { Approve } from '@/app/components/Pages/Approve/Approve';
+import { Approve } from "@/app/features/Pages/Approve/Approve";
export default function ApprovePage() {
return (
diff --git a/payment-iq/app/dashboard/layout.tsx b/payment-iq/app/dashboard/layout.tsx
index 333b9d1..31835d6 100644
--- a/payment-iq/app/dashboard/layout.tsx
+++ b/payment-iq/app/dashboard/layout.tsx
@@ -1,16 +1,18 @@
-'use client';
+"use client";
-import React from 'react';
-import { LayoutWrapper } from '../components/dashboard/layout/layoutWrapper';
-import { MainContent } from '../components/dashboard/layout/mainContent';
-import SideBar from '../components/dashboard/sidebar/Sidebar';
-import Header from '../components/dashboard/header/Header';
+import React from "react";
+import { LayoutWrapper } from "../features/dashboard/layout/layoutWrapper";
+import { MainContent } from "../features/dashboard/layout/mainContent";
+import SideBar from "../features/dashboard/sidebar/Sidebar";
+import Header from "../features/dashboard/header/Header";
-const DashboardLayout: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+const DashboardLayout: React.FC<{ children: React.ReactNode }> = ({
+ children,
+}) => {
return (
-
+
{children}
diff --git a/payment-iq/app/dashboard/page.tsx b/payment-iq/app/dashboard/page.tsx
index 37d5286..707967c 100644
--- a/payment-iq/app/dashboard/page.tsx
+++ b/payment-iq/app/dashboard/page.tsx
@@ -1,11 +1,9 @@
-'use client';
+"use client";
-import { DashboardHomePage } from "../components/Pages/DashboardHomePage/DashboardHomePage";
+import { DashboardHomePage } from "../features/Pages/DashboardHomePage/DashboardHomePage";
const DashboardPage = () => {
- return (
-
- );
+ return ;
};
export default DashboardPage;
diff --git a/payment-iq/app/components/AccountIQ/AccountIQ.tsx b/payment-iq/app/features/AccountIQ/AccountIQ.tsx
similarity index 100%
rename from payment-iq/app/components/AccountIQ/AccountIQ.tsx
rename to payment-iq/app/features/AccountIQ/AccountIQ.tsx
diff --git a/payment-iq/app/components/DateRangePicker/DateRangePicker.tsx b/payment-iq/app/features/DateRangePicker/DateRangePicker.tsx
similarity index 100%
rename from payment-iq/app/components/DateRangePicker/DateRangePicker.tsx
rename to payment-iq/app/features/DateRangePicker/DateRangePicker.tsx
diff --git a/payment-iq/app/components/Documentation/Documentation.tsx b/payment-iq/app/features/Documentation/Documentation.tsx
similarity index 100%
rename from payment-iq/app/components/Documentation/Documentation.tsx
rename to payment-iq/app/features/Documentation/Documentation.tsx
diff --git a/payment-iq/app/components/FetchReports/FetchReports.tsx b/payment-iq/app/features/FetchReports/FetchReports.tsx
similarity index 100%
rename from payment-iq/app/components/FetchReports/FetchReports.tsx
rename to payment-iq/app/features/FetchReports/FetchReports.tsx
diff --git a/payment-iq/app/components/GeneralHealthCard/GeneralHealthCard.tsx b/payment-iq/app/features/GeneralHealthCard/GeneralHealthCard.tsx
similarity index 100%
rename from payment-iq/app/components/GeneralHealthCard/GeneralHealthCard.tsx
rename to payment-iq/app/features/GeneralHealthCard/GeneralHealthCard.tsx
diff --git a/payment-iq/app/components/Pages/Approve/Approve.tsx b/payment-iq/app/features/Pages/Approve/Approve.tsx
similarity index 100%
rename from payment-iq/app/components/Pages/Approve/Approve.tsx
rename to payment-iq/app/features/Pages/Approve/Approve.tsx
diff --git a/payment-iq/app/components/pages/DashboardHomePage/DashboardHomePage.tsx b/payment-iq/app/features/Pages/DashboardHomePage/DashboardHomePage.tsx
similarity index 100%
rename from payment-iq/app/components/pages/DashboardHomePage/DashboardHomePage.tsx
rename to payment-iq/app/features/Pages/DashboardHomePage/DashboardHomePage.tsx
diff --git a/payment-iq/app/components/pages/transactions/Transactions.tsx b/payment-iq/app/features/Pages/transactions/Transactions.tsx
similarity index 100%
rename from payment-iq/app/components/pages/transactions/Transactions.tsx
rename to payment-iq/app/features/Pages/transactions/Transactions.tsx
diff --git a/payment-iq/app/components/pages/transactions/constants.ts b/payment-iq/app/features/Pages/transactions/constants.ts
similarity index 100%
rename from payment-iq/app/components/pages/transactions/constants.ts
rename to payment-iq/app/features/Pages/transactions/constants.ts
diff --git a/payment-iq/app/components/pages/transactions/mockData.ts b/payment-iq/app/features/Pages/transactions/mockData.ts
similarity index 100%
rename from payment-iq/app/components/pages/transactions/mockData.ts
rename to payment-iq/app/features/Pages/transactions/mockData.ts
diff --git a/payment-iq/app/components/PieCharts/PieCharts.tsx b/payment-iq/app/features/PieCharts/PieCharts.tsx
similarity index 100%
rename from payment-iq/app/components/PieCharts/PieCharts.tsx
rename to payment-iq/app/features/PieCharts/PieCharts.tsx
diff --git a/payment-iq/app/components/SectionCard/SectionCard.tsx b/payment-iq/app/features/SectionCard/SectionCard.tsx
similarity index 100%
rename from payment-iq/app/components/SectionCard/SectionCard.tsx
rename to payment-iq/app/features/SectionCard/SectionCard.tsx
diff --git a/payment-iq/app/components/SectionCard/types.ts b/payment-iq/app/features/SectionCard/types.ts
similarity index 100%
rename from payment-iq/app/components/SectionCard/types.ts
rename to payment-iq/app/features/SectionCard/types.ts
diff --git a/payment-iq/app/components/TransactionsOverview/TransactionsOverViewTable.tsx b/payment-iq/app/features/TransactionsOverview/TransactionsOverViewTable.tsx
similarity index 100%
rename from payment-iq/app/components/TransactionsOverview/TransactionsOverViewTable.tsx
rename to payment-iq/app/features/TransactionsOverview/TransactionsOverViewTable.tsx
diff --git a/payment-iq/app/components/TransactionsOverview/TransactionsOverview.tsx b/payment-iq/app/features/TransactionsOverview/TransactionsOverview.tsx
similarity index 100%
rename from payment-iq/app/components/TransactionsOverview/TransactionsOverview.tsx
rename to payment-iq/app/features/TransactionsOverview/TransactionsOverview.tsx
diff --git a/payment-iq/app/components/TransactionsWaitingApproval/TransactionsWaitingApproval.tsx b/payment-iq/app/features/TransactionsWaitingApproval/TransactionsWaitingApproval.tsx
similarity index 100%
rename from payment-iq/app/components/TransactionsWaitingApproval/TransactionsWaitingApproval.tsx
rename to payment-iq/app/features/TransactionsWaitingApproval/TransactionsWaitingApproval.tsx
diff --git a/payment-iq/app/components/WhatsNew/WhatsNew.tsx b/payment-iq/app/features/WhatsNew/WhatsNew.tsx
similarity index 100%
rename from payment-iq/app/components/WhatsNew/WhatsNew.tsx
rename to payment-iq/app/features/WhatsNew/WhatsNew.tsx
diff --git a/payment-iq/app/components/dashboard/header/Header.tsx b/payment-iq/app/features/dashboard/header/Header.tsx
similarity index 68%
rename from payment-iq/app/components/dashboard/header/Header.tsx
rename to payment-iq/app/features/dashboard/header/Header.tsx
index 875a926..6c40362 100644
--- a/payment-iq/app/components/dashboard/header/Header.tsx
+++ b/payment-iq/app/features/dashboard/header/Header.tsx
@@ -1,7 +1,7 @@
-import React, { useState } from 'react';
-import { AppBar, Toolbar, IconButton, Menu, MenuItem, Button } from '@mui/material';
-import MenuIcon from '@mui/icons-material/Menu';
-import Dropdown from './DropDown';
+import React, { useState } from "react";
+import { AppBar, Toolbar, IconButton, Menu, MenuItem } from "@mui/material";
+import MenuIcon from "@mui/icons-material/Menu";
+import Dropdown from "./dropDown/DropDown";
const Header = () => {
const [anchorEl, setAnchorEl] = useState(null);
@@ -16,11 +16,15 @@ const Header = () => {
setAnchorEl(null);
};
- const handleChange = (e:any) => {
- };
+ const handleChange = (e: any) => {};
return (
-
+
{/* Burger Menu */}
@@ -28,7 +32,7 @@ const Header = () => {
{/* Dropdown Button */}
-
+
{/* Dropdown Menu */}