Skip to content

Feat/transactions page redesign #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
portableDD merged 3 commits into from
Jul 2, 2025
Merged

Feat/transactions page redesign #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c10227b
feat: resolving build failure
Ayoazeez26 Jul 2, 2025
d6cca5d
feat: added transactions api call
Ayoazeez26 Jul 2, 2025
47162e2
feat: updated fixes
Ayoazeez26 Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/dashboard/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,15 @@ export default function Layout({ children }: LayoutProps) {
const { isCollapsed } = useSidebarStore();

return (
<div className="bg-[linear-gradient(to_bottom_right,_#EFEDED,_#ACB4B7)] min-h-screen">
<div className="bg-[#F0F0F0] min-h-screen">
<Navbar />
<Sidebar />

{/* Main content */}
<div
className={`p-4 transition-all duration-300 ${
isCollapsed ? "lg:ml-16" : "lg:ml-64"
} pt-20`}
>
} pt-20`}>
<div className="p-4 rounded-lg min-h-[calc(100vh-120px)]">
{children}
</div>
Expand Down
6 changes: 2 additions & 4 deletions app/dashboard/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ export default function Dashboard() {
</Button>
<Button
variant="secondary"
className="bg-gray-400 hover:bg-gray-500 text-white rounded-full px-6 py-2 h-auto"
>
className="bg-gray-400 hover:bg-gray-500 text-white rounded-full px-6 py-2 h-auto">
Withdraw
<ArrowUp className="ml-2 h-4 w-4" />
</Button>
Expand Down Expand Up @@ -107,8 +106,7 @@ export default function Dashboard() {
</h2>
<Button
variant="ghost"
className="text-gray-600 hover:text-gray-900"
>
className="text-gray-600 hover:text-gray-900">
See All
<ChevronRight className="ml-1 h-4 w-4" />
</Button>
Expand Down
164 changes: 82 additions & 82 deletions app/dashboard/transactions/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
import { Transaction } from "@/types/transaction";
// import { Transaction } from "@/types/transaction";
import { Card, CardContent } from "@/components/ui/card";
import { TransactionList } from "@/components/dashboard/transaction/TransactionList";

// Dummy transaction data
const dummyTransactions: Transaction[] = [
{
id: "1",
type: "Deposit",
fromCurrency: "NGN",
date: "04.07.2025 12:40 AM",
status: "Success",
amount: "+ 200,000 NGN",
usdAmount: "80 USD"
},
{
id: "2",
type: "Withdraw",
fromCurrency: "NGN",
date: "04.07.2025 12:40 AM",
status: "Success",
amount: "+ 200,000 NGN",
usdAmount: "80 USD"
},
{
id: "3",
type: "Convert",
fromCurrency: "NGN",
toCurrency: "USD",
date: "04.07.2025 12:40 AM",
status: "Failed",
amount: "+ 200,000 NGN",
usdAmount: "80 USD"
},
{
id: "4",
type: "Withdraw",
fromCurrency: "USD",
date: "04.07.2025 12:40 AM",
status: "Success",
amount: "+ 200,000 NGN",
usdAmount: "80 USD"
},
{
id: "5",
type: "Convert",
fromCurrency: "NGN",
toCurrency: "USD",
date: "04.07.2025 12:40 AM",
status: "Failed",
amount: "+ 200,000 NGN",
usdAmount: "80 USD"
},
{
id: "6",
type: "Withdraw",
fromCurrency: "NGN",
toCurrency: "NGN",
date: "04.07.2025 12:40 AM",
status: "Success",
amount: "+ 200,000 NGN",
usdAmount: "80 USD"
},
{
id: "7",
type: "Convert",
fromCurrency: "NGN",
toCurrency: "USD",
date: "04.07.2025 12:40 AM",
status: "Failed",
amount: "+ 200,000 NGN",
usdAmount: "80 USD"
},
{
id: "8",
type: "Deposit",
fromCurrency: "NGN",
date: "04.07.2025 12:40 AM",
status: "Success",
amount: "+ 200,000 NGN",
usdAmount: "80 USD"
}
];
// const dummyTransactions: Transaction[] = [
// {
// id: "1",
// type: "Deposit",
// fromCurrency: "NGN",
// date: "04.07.2025 12:40 AM",
// status: "Success",
// amount: "+ 200,000 NGN",
// usdAmount: "80 USD"
// },
// {
// id: "2",
// type: "Withdraw",
// fromCurrency: "NGN",
// date: "04.07.2025 12:40 AM",
// status: "Success",
// amount: "+ 200,000 NGN",
// usdAmount: "80 USD"
// },
// {
// id: "3",
// type: "Convert",
// fromCurrency: "NGN",
// toCurrency: "USD",
// date: "04.07.2025 12:40 AM",
// status: "Failed",
// amount: "+ 200,000 NGN",
// usdAmount: "80 USD"
// },
// {
// id: "4",
// type: "Withdraw",
// fromCurrency: "USD",
// date: "04.07.2025 12:40 AM",
// status: "Success",
// amount: "+ 200,000 NGN",
// usdAmount: "80 USD"
// },
// {
// id: "5",
// type: "Convert",
// fromCurrency: "NGN",
// toCurrency: "USD",
// date: "04.07.2025 12:40 AM",
// status: "Failed",
// amount: "+ 200,000 NGN",
// usdAmount: "80 USD"
// },
// {
// id: "6",
// type: "Withdraw",
// fromCurrency: "NGN",
// toCurrency: "NGN",
// date: "04.07.2025 12:40 AM",
// status: "Success",
// amount: "+ 200,000 NGN",
// usdAmount: "80 USD"
// },
// {
// id: "7",
// type: "Convert",
// fromCurrency: "NGN",
// toCurrency: "USD",
// date: "04.07.2025 12:40 AM",
// status: "Failed",
// amount: "+ 200,000 NGN",
// usdAmount: "80 USD"
// },
// {
// id: "8",
// type: "Deposit",
// fromCurrency: "NGN",
// date: "04.07.2025 12:40 AM",
// status: "Success",
// amount: "+ 200,000 NGN",
// usdAmount: "80 USD"
// }
// ];

export default function TransactionsPage() {
return (
<div className="container mx-auto p-6 space-y-6">
<Card className="border-0 shadow-none bg-transparent">
<div className="container mx-auto p-0 bg-white space-y-6">
<Card className="border-0 shadow-none pb-0">
<CardContent className="p-0">
<TransactionList transactions={dummyTransactions} />
<TransactionList />
</CardContent>
</Card>
</div>
Expand Down
5 changes: 4 additions & 1 deletion app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Metadata } from "next";
import ReactQueryProvider from "@/lib/react-query-provider";
import "./globals.css";

export const metadata: Metadata = {
Expand All @@ -16,7 +17,9 @@ export default function RootLayout({
}>) {
return (
<html lang="en">
<body>{children}</body>
<body>
<ReactQueryProvider>{children}</ReactQueryProvider>
</body>
</html>
);
}
3 changes: 1 addition & 2 deletions components/Landing-page/Hero/HeroCTA.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ export default function HeroCTA() {
<Link href="/sign-up">
<Button
size="lg"
className="bg-gradient-to-r from-blue-500 to-yellow-500 text-white"
>
className="bg-gradient-to-r from-blue-500 to-yellow-500 text-white">
Start Trading <ArrowRight className="ml-2 h-4 w-4" />
</Button>
</Link>
Expand Down
Loading