Skip to content
Merged

Mod #331

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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
10 changes: 5 additions & 5 deletions components/auth/LoginForm.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -50,7 +50,7 @@ const LoginForm = ({
</p>
</div>
<div className='mt-6 space-y-6'>
<BoundlessButton
{/* <BoundlessButton
fullWidth
size='xl'
icon={
Expand All @@ -65,15 +65,15 @@ const LoginForm = ({
className='bg-background hover:!text-background border !border-[#484848] text-base !text-white'
>
Continue with Google
</BoundlessButton>

</BoundlessButton> */}
{/*
<div className='flex items-center justify-center gap-2.5'>
<div className='h-[1px] w-full bg-[#2B2B2B]'></div>
<p className='text-center text-sm leading-[145%] text-[#B5B5B5]'>
Or
</p>
<div className='h-[1px] w-full bg-[#2B2B2B]'></div>
</div>
</div> */}

<Form {...form}>
<form
Expand Down
10 changes: 5 additions & 5 deletions components/auth/SignupForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { register } from '@/lib/api/auth';
import { zodResolver } from '@hookform/resolvers/zod';
import { LockIcon, MailIcon, User } from 'lucide-react';
import Image from 'next/image';
// import Image from 'next/image';
import Link from 'next/link';
import { useRouter } from 'next/navigation';
import { useEffect, useState } from 'react';
Expand Down Expand Up @@ -164,7 +164,7 @@ const SignupForm = ({ onLoadingChange, invitation }: SignupFormProps) => {
</p>
</div>
<div className='mt-6 space-y-6'>
<BoundlessButton
{/* <BoundlessButton
fullWidth
className='bg-background border !border-[#484848] !text-white'
>
Expand All @@ -177,13 +177,13 @@ const SignupForm = ({ onLoadingChange, invitation }: SignupFormProps) => {
unoptimized
/>
Continue with Google
</BoundlessButton>

</BoundlessButton> */}
{/*
<div className='flex items-center justify-center gap-2.5'>
<div className='h-[1px] w-full bg-[#2B2B2B]'></div>
<p className='text-center text-sm text-[#B5B5B5]'>Or</p>
<div className='h-[1px] w-full bg-[#2B2B2B]'></div>
</div>
</div> */}

<Form {...form}>
<form
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,29 +52,37 @@ export function ProjectSidebarActions({
return (
<div className='flex flex-row gap-3'>
{projectStatus === 'Validation' && (
<BoundlessButton
onClick={() => onVote(1)}
disabled={isVoting || userVote === 1}
// variant={userVote === 1 ? 'default' : 'outline'}
loading={isVoting}
iconPosition={userVote === 1 ? 'right' : 'left'}
icon={
userVote === 1 ? (
<ThumbsUp className='h-5 w-5' fill='#A7F950' />
) : (
<ArrowUp className='h-5 w-5' />
)
}
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]'
} `}
>
<span className=''>
{isVoting ? 'Voting...' : userVote === 1 ? 'Upvoted' : 'Upvote'}
</span>
</BoundlessButton>
<div className='group relative inline-block'>
<BoundlessButton
onClick={() => onVote(1)}
disabled={isVoting || userVote === 1}
loading={isVoting}
iconPosition={userVote === 1 ? 'right' : 'left'}
icon={
userVote === 1 ? (
<ThumbsUp className='h-5 w-5' fill='#A7F950' />
) : (
<ArrowUp className='h-5 w-5' />
)
}
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]'
} `}
>
<span>
{isVoting ? 'Voting...' : userVote === 1 ? 'Upvoted' : 'Upvote'}
</span>
</BoundlessButton>

{/* Dropdown text */}
<div className='absolute top-full left-1/2 z-10 mt-2 hidden w-64 -translate-x-1/2 rounded-xl border border-gray-200 bg-white p-3 text-sm text-gray-700 shadow-lg group-hover:block'>
Voting is straightforward and individualistic — it’s for everyone.
Voting power, weight, and eligibility for who can vote are currently
under implementation.
</div>
</div>
)}

{projectStatus === 'funding' ||
Expand Down
4 changes: 2 additions & 2 deletions lib/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
Loading