Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
982 changes: 4 additions & 978 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"@headlessui/react": "^2.2.0",
"@hookform/resolvers": "^4.1.3",
"@radix-ui/react-slot": "^1.1.2",
"@shadcn/ui": "^0.0.4",
"@starknet-react/chains": "^3.1.2",
"@starknet-react/core": "^3.7.2",
"@starknet-react/typescript-config": "^0.0.1",
Expand All @@ -22,14 +21,13 @@
"lodash": "^4.17.21",
"lucide-react": "^0.475.0",
"next": "^14.2.24",
"react": "^18.3.1",
"react": "^18",
"react-datepicker": "^8.2.1",
"react-datetime-picker": "^6.0.1",
"react-dom": "^18.3.1",
"react-dom": "^18",
"react-hook-form": "^7.54.2",
"react-hot-toast": "^2.5.2",
"react-icons": "^5.5.0",
"recharts": "^2.15.1",
"starknet": "^6.23.1",
"tailwind-merge": "^3.0.2",
"tailwindcss-animate": "^1.0.7",
Expand Down
42 changes: 21 additions & 21 deletions src/app/dashboard/components/sideBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,41 +71,41 @@ const Sidebar: FC = () => {

useEffect(() => {
switch (pathname) {
case '/dashboard':
case '/':
setActivePath('/');
break;
case '/dashboard/projects':
case '/projects':
setActivePath('/projects');
break;
case '/dashboard/transactions':
case '/dashboard/user/transactions':
setActivePath('/transactions');
break;
case '/dashboard/target':
case '/target':
setActivePath('/target');
break;
case '/dashboard/appeals':
case '/appeals':
setActivePath('/appeals');
setIsAppealsOpen(true);
break;
case '/dashboard/appeals/pending':
case '/appeals/pending':
setActivePath('/appeals/pending');
setIsAppealsOpen(true);
break;
case '/dashboard/appeals/resolved':
case '/appeals/resolved':
setActivePath('/appeals/resolved');
setIsAppealsOpen(true);
break;
case '/dashboard/schedules':
case '/schedules':
setActivePath('/schedules');
break;
case '/dashboard/settings':
case '/settings':
setActivePath('/settings');
break;
case '/dashboard/help':
case '/help':
setActivePath('/help');
break;
default:
setActivePath('/dashboard'); // Default active item
setActivePath('/target'); // Default active item
break;
}
}, [pathname]);
Expand All @@ -117,31 +117,31 @@ const Sidebar: FC = () => {
</div>
<div className="flex-grow">
<SidebarItem
href="/dashboard"
href="/"
icon={<HomeIcon size={20} />}
text="Home"
active={activePath === '/'}
/>
<SidebarItem
href="/dashboard/projects"
href="/projects"
icon={<FolderIcon size={20} />}
text="Projects"
active={activePath === '/projects'}
/>
<SidebarItem
href="/dashboard/transactions"
href="/transactions"
icon={<CreditCardIcon size={20} />}
text="Transactions"
active={activePath === '/transactions'}
/>
<SidebarItem
href="/dashboard/target"
href="/target"
icon={<TargetIcon size={20} />}
text="Target"
active={activePath === '/target'}
/>
<SidebarItem
href="/dashboard/appeals"
href="/appeals"
icon={<InfoIcon size={20} />}
text="Appeals"
active={
Expand All @@ -155,7 +155,7 @@ const Sidebar: FC = () => {
{isAppealsOpen && (
<div className="pl-9 bg-gray-800 bg-opacity-40">
<Link
href="/dashboard/appeals/pending"
href="/appeals/pending"
className={`block py-2 text-sm ${
activePath === '/appeals/pending'
? 'text-indigo-400'
Expand All @@ -167,7 +167,7 @@ const Sidebar: FC = () => {
<Link
href="/appeals/resolved"
className={`block py-2 text-sm ${
activePath === '/dashboard/appeals/resolved'
activePath === '/appeals/resolved'
? 'text-indigo-400'
: 'text-gray-400 hover:text-white'
}`}
Expand All @@ -178,21 +178,21 @@ const Sidebar: FC = () => {
)}

<SidebarItem
href="/dashboard/schedules"
href="/schedules"
icon={<CalendarIcon size={20} />}
text="Schedules"
active={activePath === '/schedules'}
/>

<div className="mt-32 pt-2">
<SidebarItem
href="/dashboard/settings"
href="/settings"
icon={<SettingsIcon size={20} />}
text="Settings"
active={activePath === '/settings'}
/>
<SidebarItem
href="/dashboard/help"
href="/help"
icon={<HelpCircleIcon size={20} />}
text="Help centre"
active={activePath === '/help'}
Expand Down
7 changes: 0 additions & 7 deletions src/app/dashboard/help/page.tsx

This file was deleted.

19 changes: 0 additions & 19 deletions src/app/dashboard/layout.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions src/app/dashboard/page.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions src/app/dashboard/projects/page.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions src/app/dashboard/settings/page.tsx

This file was deleted.

4 changes: 4 additions & 0 deletions src/app/dashboard/target/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use client';
import { useState } from 'react';
import { NextPage } from 'next';
import Sidebar from '../components/sideBar';
import NavBar from '../components/navBar';
import ProgressCard from '../components/progressCard';
import Records from '../records/page';

Expand Down Expand Up @@ -52,7 +54,9 @@ const Target: NextPage = () => {

return (
<main className="flex bg-[#171720]">
<Sidebar />
<div className="w-full bg-[#171720] px-10">
<NavBar />
{showRecords ? (
<Records />
) : (
Expand Down
18 changes: 0 additions & 18 deletions src/app/dashboard/transactions/components/OutcomeStatistics.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions src/app/dashboard/transactions/components/ProgressBar.tsx

This file was deleted.

34 changes: 0 additions & 34 deletions src/app/dashboard/transactions/components/ProgressCircle.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions src/app/dashboard/transactions/components/ProjectCard.tsx

This file was deleted.

23 changes: 0 additions & 23 deletions src/app/dashboard/transactions/components/TransactionFilter.tsx

This file was deleted.

Loading
Loading