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
29 changes: 16 additions & 13 deletions app/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { SessionProvider } from 'next-auth/react';
import { ReactNode } from 'react';
import { AuthProvider } from '@/components/providers/auth-provider';
import { WalletProvider } from '@/components/providers/wallet-provider';
import { NotificationProvider } from 'react-notification-core';
import {
mockFetchNotifications,
Expand All @@ -19,19 +20,21 @@ export function Providers({ children }: ProvidersProps) {
return (
<SessionProvider>
<AuthProvider>
<NotificationProvider
fetchNotifications={mockFetchNotifications}
onMarkAsRead={mockMarkAsRead}
onMarkAllAsRead={mockMarkAllAsRead}
onDeleteNotification={mockDeleteNotification}
fetchOptions={{
retryCount: 2,
retryDelay: 1000,
timeout: 5000,
}}
>
{children}
</NotificationProvider>
<WalletProvider>
<NotificationProvider
fetchNotifications={mockFetchNotifications}
onMarkAsRead={mockMarkAsRead}
onMarkAllAsRead={mockMarkAllAsRead}
onDeleteNotification={mockDeleteNotification}
fetchOptions={{
retryCount: 2,
retryDelay: 1000,
timeout: 5000,
}}
>
{children}
</NotificationProvider>
</WalletProvider>
</AuthProvider>
</SessionProvider>
);
Expand Down
48 changes: 46 additions & 2 deletions components/landing-page/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ import { User, LogOut, Settings } from 'lucide-react';
import { cn } from '@/lib/utils';
import WalletConnectButton from '../wallet/WalletConnectButton';
import CreateProjectModal from './project/CreateProjectModal';
import { useProtectedAction } from '@/hooks/use-protected-action';
import { useAuthStore } from '@/lib/stores/auth-store';
import WalletRequiredModal from '@/components/wallet/WalletRequiredModal';

gsap.registerPlugin(useGSAP);

Expand Down Expand Up @@ -229,6 +231,16 @@ function AuthenticatedNav({
const { logout } = useAuthActions();
const { isLoading } = useAuthStore();
const [createProjectModalOpen, setCreateProjectModalOpen] = useState(false);

const {
executeProtectedAction,
showWalletModal,
closeWalletModal,
handleWalletConnected,
} = useProtectedAction({
actionName: 'create project',
onSuccess: () => setCreateProjectModalOpen(true),
});
return (
<div className='flex items-center space-x-3'>
<WalletConnectButton />
Expand All @@ -243,7 +255,11 @@ function AuthenticatedNav({
className='bg-background w-[300px] rounded-[8px] border border-[#2B2B2B] pt-3 pb-6 text-white shadow-[0_4px_4px_0_rgba(26,26,26,0.25)]'
>
<DropdownMenuItem
onClick={() => setCreateProjectModalOpen(true)}
onClick={async () => {
await executeProtectedAction(() =>
setCreateProjectModalOpen(true)
);
}}
className='group hover:text-primary px-6 py-3.5 text-white hover:!bg-transparent'
>
<span className='group-hover:text-primary flex w-full items-center justify-between'>
Expand Down Expand Up @@ -366,6 +382,14 @@ function AuthenticatedNav({
open={createProjectModalOpen}
setOpen={setCreateProjectModalOpen}
/>

{/* Wallet Required Modal */}
<WalletRequiredModal
open={showWalletModal}
onOpenChange={closeWalletModal}
actionName='create project'
onWalletConnected={handleWalletConnected}
/>
</div>
);
}
Expand All @@ -375,6 +399,16 @@ function AuthenticatedNav({
function UnauthenticatedNav() {
const [createProjectModalOpen, setCreateProjectModalOpen] = useState(false);

const {
executeProtectedAction,
showWalletModal,
closeWalletModal,
handleWalletConnected,
} = useProtectedAction({
actionName: 'create project',
onSuccess: () => setCreateProjectModalOpen(true),
});

const showDevAddProject =
process.env.NODE_ENV !== 'production' &&
(process.env.NEXT_PUBLIC_SHOW_ADD_PROJECT_FOR_GUESTS === 'true' || true);
Expand All @@ -391,7 +425,9 @@ function UnauthenticatedNav() {
<div className='flex items-center space-x-3'>
<BoundlessButton
variant='outline'
onClick={() => setCreateProjectModalOpen(true)}
onClick={async () => {
await executeProtectedAction(() => setCreateProjectModalOpen(true));
}}
className='border-white/20 text-white hover:bg-white/10'
>
<Plus className='mr-2 h-4 w-4' />
Expand All @@ -404,6 +440,14 @@ function UnauthenticatedNav() {
open={createProjectModalOpen}
setOpen={setCreateProjectModalOpen}
/>

{/* Wallet Required Modal */}
<WalletRequiredModal
open={showWalletModal}
onOpenChange={closeWalletModal}
actionName='create project'
onWalletConnected={handleWalletConnected}
/>
</div>
);
}
Expand Down
Loading
Loading