From f4dcdc0c47ce401d4e6a90f2a4080c09bcd5301e Mon Sep 17 00:00:00 2001 From: Benjtalkshow Date: Tue, 14 Oct 2025 12:49:02 +0100 Subject: [PATCH 1/6] fix: modify api.ts --- lib/api/api.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/api/api.ts b/lib/api/api.ts index edeb5c309..1af831c4d 100644 --- a/lib/api/api.ts +++ b/lib/api/api.ts @@ -2,8 +2,8 @@ import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios'; import Cookies from 'js-cookie'; import { useAuthStore } from '@/lib/stores/auth-store'; -// const API_BASE_URL = 'https://staging-api.boundlessfi.xyz/api'; -const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL; +const API_BASE_URL = 'https://staging-api.boundlessfi.xyz/api'; +// const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL; if (!API_BASE_URL) { throw new Error('NEXT_PUBLIC_API_URL environment variable is not defined'); } From 5be269f786c038f9ee3084824108a6f896072b62 Mon Sep 17 00:00:00 2001 From: Benjtalkshow Date: Thu, 16 Oct 2025 18:31:50 +0100 Subject: [PATCH 2/6] fix: remove google auth buttom --- .vscode/settings.json | 3 ++ components/auth/LoginForm.tsx | 10 ++-- components/auth/SignupForm.tsx | 10 ++-- .../project-sidebar/ProjectSidebarActions.tsx | 54 +++++++++++-------- 4 files changed, 44 insertions(+), 33 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..6f3a2913e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/components/auth/LoginForm.tsx b/components/auth/LoginForm.tsx index 1372bd74a..412f19546 100644 --- a/components/auth/LoginForm.tsx +++ b/components/auth/LoginForm.tsx @@ -1,6 +1,6 @@ 'use client'; import { Eye, EyeOff, LockIcon, MailIcon } from 'lucide-react'; -import Image from 'next/image'; +// import Image from 'next/image'; import Link from 'next/link'; import { UseFormReturn } from 'react-hook-form'; import z from 'zod'; @@ -50,7 +50,7 @@ const LoginForm = ({

- Continue with Google - - + */} + {/*

Or

-
+
*/}
{

- @@ -177,13 +177,13 @@ const SignupForm = ({ onLoadingChange, invitation }: SignupFormProps) => { unoptimized /> Continue with Google - - + */} + {/*

Or

-
+
*/} {projectStatus === 'Validation' && ( - onVote(1)} - disabled={isVoting || userVote === 1} - // variant={userVote === 1 ? 'default' : 'outline'} - loading={isVoting} - iconPosition={userVote === 1 ? 'right' : 'left'} - icon={ - userVote === 1 ? ( - - ) : ( - - ) - } - className={`flex h-12 flex-1 items-center justify-center gap-2 rounded-lg text-base font-semibold shadow-lg transition-all duration-200 hover:shadow-xl ${ - userVote === 1 - ? 'bg-primary/10 border-primary/24 text-primary border' - : 'bg-[#A7F950] text-black hover:bg-[#A7F950]' - } `} - > - - {isVoting ? 'Voting...' : userVote === 1 ? 'Upvoted' : 'Upvote'} - - +
+ onVote(1)} + disabled={isVoting || userVote === 1} + loading={isVoting} + iconPosition={userVote === 1 ? 'right' : 'left'} + icon={ + userVote === 1 ? ( + + ) : ( + + ) + } + className={`flex h-12 flex-1 items-center justify-center gap-2 rounded-lg text-base font-semibold shadow-lg transition-all duration-200 hover:shadow-xl ${ + userVote === 1 + ? 'bg-primary/10 border-primary/24 text-primary border' + : 'bg-[#A7F950] text-black hover:bg-[#A7F950]' + } `} + > + + {isVoting ? 'Voting...' : userVote === 1 ? 'Upvoted' : 'Upvote'} + + + + {/* Dropdown text */} +
+ Voting is straightforward and individualistic — it’s for everyone. + Voting power, weight, and eligibility for who can vote are currently + under implementation. +
+
)} {projectStatus === 'funding' || From 842fd489834d697ec2b77d7a85607a423b2f9388 Mon Sep 17 00:00:00 2001 From: Benjtalkshow Date: Mon, 20 Oct 2025 22:12:15 +0100 Subject: [PATCH 3/6] fix: fixes responsive fixes on organization --- .../organization/OrganizationContent.tsx | 17 +++++- .../organization/OrganizationHeader.tsx | 4 +- .../organization/OrganizationSettings.tsx | 54 ++++++++++--------- components/organization/ResponsiveSidebar.tsx | 12 ++++- 4 files changed, 56 insertions(+), 31 deletions(-) diff --git a/components/organization/OrganizationContent.tsx b/components/organization/OrganizationContent.tsx index 6136e65d7..42901e5cd 100644 --- a/components/organization/OrganizationContent.tsx +++ b/components/organization/OrganizationContent.tsx @@ -6,10 +6,25 @@ import OrganizationCard from './cards/OrganzationCards'; import Link from 'next/link'; import { BoundlessButton } from '../buttons'; import { useOrganization } from '@/lib/providers/OrganizationProvider'; +import LoadingSpinner from '../LoadingSpinner'; export default function OrganizationContent() { - const { organizations } = useOrganization(); + const { organizations, isLoading, isLoadingOrganizations } = + useOrganization(); + const loading = isLoading || isLoadingOrganizations; const hasOrganizations = organizations.length > 0; + + if (loading) { + return ( +
+
+ +

Loading organizations...

+
+
+ ); + } + return (
{hasOrganizations && ( diff --git a/components/organization/OrganizationHeader.tsx b/components/organization/OrganizationHeader.tsx index 9045fee29..8e8bc2efd 100644 --- a/components/organization/OrganizationHeader.tsx +++ b/components/organization/OrganizationHeader.tsx @@ -26,8 +26,8 @@ export default function OrganizationHeader() { pathname !== '/organizations' && pathname.startsWith('/organizations'); return ( -
-
+
+
- - - Profile - - - Links - - - Members - - - Transfer Ownership - - +
+ + + Profile + + + Links + + + Members + + + Transfer Ownership + + +
diff --git a/components/organization/ResponsiveSidebar.tsx b/components/organization/ResponsiveSidebar.tsx index 1cd3b487f..27ae91984 100644 --- a/components/organization/ResponsiveSidebar.tsx +++ b/components/organization/ResponsiveSidebar.tsx @@ -1,6 +1,6 @@ 'use client'; -import { Trophy, HandCoins, Settings, Plus } from 'lucide-react'; +import { Trophy, HandCoins, Settings, Plus, X } from 'lucide-react'; import Link from 'next/link'; import { usePathname } from 'next/navigation'; import { cn } from '@/lib/utils'; @@ -45,8 +45,16 @@ export default function ResponsiveSidebar({ + +