Merge branch 'dev' into dev

undefinedorgcr · Oct 29, 2024 · ac6644b · ac6644b
2 parents 1b51ecb + 2e062d0
commit ac6644b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/frontend/gostarkme-web/app/app/myfunds/page.tsx b/frontend/gostarkme-web/app/app/myfunds/page.tsx
@@ -7,15 +7,11 @@ import { useState } from 'react';
 import { useEventListener, useLocalStorage } from 'usehooks-ts'
 import { useAtomValue } from 'jotai';
 import { walletStarknetkitLatestAtom } from '@/state/connectedWallet';
+import { navItems } from '@/constants';
 
 const MyFundsPage = () => { 
   const wallet = useAtomValue(walletStarknetkitLatestAtom);
 
-  const navItems = [
-    { label: 'My Profile', href: `/app/myprofile` },
-    { label: 'My funds', href: `/app/myfunds` }
-  ];
-
   return (
     <div className="min-h-screen flex flex-col">
       <Navbar

diff --git a/frontend/gostarkme-web/app/app/myprofile/page.tsx b/frontend/gostarkme-web/app/app/myprofile/page.tsx
@@ -9,16 +9,13 @@ import { useEventListener } from 'usehooks-ts';
 import { useState } from 'react';
 import { walletStarknetkitLatestAtom } from '@/state/connectedWallet';
 import { useAtomValue } from 'jotai';
+import { navItems } from '@/constants';
+
 
 const UserProfilePage = () => {
 
   const wallet = useAtomValue(walletStarknetkitLatestAtom);
 
-  const navItems = [
-    { label: 'My Profile', href: `/app/myprofile` },
-    { label: 'My funds', href: `/app/myfunds` }
-  ];
-
   // Mock data for design purposes
   const totalDonations = 20000;
   const currentLevel = 10;

diff --git a/frontend/gostarkme-web/app/app/page.tsx b/frontend/gostarkme-web/app/app/page.tsx
@@ -9,12 +9,10 @@ import { walletStarknetkitLatestAtom } from "@/state/connectedWallet";
 import { useAtomValue } from "jotai";
 import React, { useEffect, useState } from "react";
 import { byteArray, Contract, InvokeFunctionResponse } from "starknet";
+import React from "react";
+import { navItems } from "@/constants";
 
 const Dashboard = () => {
-  const navItems = [
-    { label: 'My Profile', href: 'app/myprofile' },
-    { label: 'My funds', href: '/app/myfunds' }
-  ];
 
   const wallet = useAtomValue(walletStarknetkitLatestAtom);
 

diff --git a/frontend/gostarkme-web/constants/index.ts b/frontend/gostarkme-web/constants/index.ts
@@ -36,6 +36,10 @@ export const ARGENT_SESSION_SERVICE_BASE_URL =
 export const ARGENT_WEBWALLET_URL =
   process.env.NEXT_PUBLIC_ARGENT_WEBWALLET_URL || "https://web.argent.xyz"
 
-
 export const FUND_MANAGER_ADDR = 
-  "0x0263457e0646dc4312c4a583fcae334d98f9b4ff1cf7a9c091649c2bec02543a"
+  "0x0263457e0646dc4312c4a583fcae334d98f9b4ff1cf7a9c091649c2bec02543a"
+
+export const navItems = [
+    { label: 'My Profile', href: '/app/myprofile' },
+    { label: 'My funds', href: '/app/myfunds' }
+  ];