Skip to content

Commit be2dbfe

Browse files
authored
Collins (#334)
* refactor: update project components and API for voting functionality - Adjust layout and styling in ProjectsPage and ProjectCard components. - Enhance ProjectSidebar to include crowdfund data and voting logic. - Implement new API methods for voting, retrieving votes, and removing votes. - Update types for vote handling in the API. - Clean up unused code and improve responsiveness across components. * chore: update project dependencies and enhance project details layout * feat: added static api for staging * fix: made few changes * fix: minor changes * feat: chaged test data * fix: minor fixes * refactor: update project components and improve functionality * feat: file clean up * feat: added extra validation * feat: integrate wallet protection and validation across components * feat: enhance profile components and add activity tracking - Refactor ProfileData to use ProfileDataClient for improved user data display. - Introduce ActivityFeed and ActivityTab components for tracking user activities. - Implement filtering and sorting functionality in the new ProjectsTab and FilterControls components. - Add modal support for displaying followers and following lists. - Create reusable TeamList component for displaying team members across various sections. - Integrate mock data for testing and development purposes. - Update UserStats to include clickable follower and following counts for better user interaction. * feat: add lodash.debounce and enhance profile components with user data integration - Added lodash.debounce for improved performance in user interactions. - Updated ProfileDataClient to utilize user data for displaying activities and stats. - Refactored ActivityFeed and ActivityTab components to fetch real user activities and statistics. - Removed mock data dependencies from FollowersModal and ProjectsTab, integrating real user data instead. - Enhanced ProjectsTab to support infinite scrolling and dynamic project loading based on user data. * feat: enhance navbar and project components for improved responsiveness and user experience - Integrated useWindowSize hook to adjust component layouts and styles based on screen size. - Updated Navbar component to improve spacing and responsiveness for various screen sizes. - Refactored ProjectCard to support full-width display and adjusted styles accordingly. - Enhanced ProjectList and ProjectsTab to utilize updated ProjectCard properties and improve project status mapping. - Improved MobileMenu and AuthenticatedNav for better user interaction and accessibility. * feat: enhance organization layout and settings components for improved user experience - Updated OrganizationsLayout to include relative positioning for better layout control. - Refactored OrganizationContent to replace Button with BoundlessButton for consistency. - Enhanced OrganizationHeader with sticky positioning and improved link styling. - Introduced new tabs in OrganizationSettings for Profile, Links, Members, and Transfer Ownership, improving organization management. - Added new components for managing organization links and members, including EmailInviteSection and PermissionsTable. - Improved styling and layout across various components for better responsiveness and user interaction.
1 parent 1e184eb commit be2dbfe

42 files changed

Lines changed: 1840 additions & 861 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/(landing)/me/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ProfileData } from './profile-data';
22

33
export default async function MePage() {
44
return (
5-
<section className='min-h-[70vh]'>
5+
<section className=''>
66
<ProfileData />
77
</section>
88
);

app/(landing)/me/profile-data.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export async function ProfileData() {
1616

1717
try {
1818
const userData = await getMe(session.user.accessToken);
19+
// console.log(userData);
1920
return (
2021
<ProfileDataClient
2122
user={userData}

app/(landing)/organizations/layout.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ export default function OrganizationsLayout({
1818
(pathname.split('/').length > 4 && pathname !== '/dashboard/organizations');
1919

2020
return (
21-
<div className='min-h-screen bg-black text-white'>
21+
<div className='relative min-h-screen bg-black text-white'>
2222
<OrganizationHeader />
2323
{showSidebar ? (
24-
<div className='flex border-t border-t-zinc-800'>
24+
<div className='relative border-t border-t-zinc-800'>
2525
<OrganizationSidebar />
26-
<main className='flex-1'>{children}</main>
26+
<main className='md:ml-[350px]'>{children}</main>
2727
</div>
2828
) : (
2929
<main>{children}</main>

app/(landing)/privacy/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const metadata: Metadata = generatePageMetadata('privacy');
77
const PrivacyPage = () => {
88
return (
99
<div className='mx-auto mt-10 max-w-[1440px] px-5 py-5 text-center text-4xl font-bold text-white md:px-[50px] lg:px-[100px]'>
10-
Privacy Page
10+
Privacy Pages
1111
</div>
1212
);
1313
};

app/globals.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
--color-success-700: #036b26;
5656
--color-success-800: #015b20;
5757
--color-success-900: #004617;
58+
59+
--color-active-bg: rgba(167, 249, 80, 0.08);
5860
}
5961
/* Custom scrollbar styles for comment modal */
6062
.custom-scrollbar {

components/ProjectCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ const ProjectCard: React.FC<ProjectCardProps> = memo(
186186
<Badge className='flex-shrink-0 rounded-[4px] border border-[#645D5D] bg-[#E4DBDB] px-1 py-0.5 text-xs font-medium text-[#645D5D]'>
187187
{project.category}
188188
</Badge>
189-
<Badge className='flex-shrink-0 rounded-[4px] border border-[#A7F950] bg-[rgba(167,249,80,0.08)] px-1 py-0.5 text-xs font-medium text-[#A7F950]'>
189+
<Badge className='bg-active-bg flex-shrink-0 rounded-[4px] border border-[#A7F950] px-1 py-0.5 text-xs font-medium text-[#A7F950]'>
190190
{project.category}
191191
</Badge>
192192
</div>

components/landing-page/blog/BlogPostDetails.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ const BlogPostDetails: React.FC<BlogPostDetailsProps> = ({ post }) => {
213213
<div className='flex gap-3 lg:flex-col'>
214214
<button
215215
onClick={() => handleShare('twitter')}
216-
className='flex h-10 w-10 items-center justify-center rounded-full bg-[rgba(167,249,80,0.08)] text-black transition-colors hover:bg-[#A7F950]/80 focus:ring-2 focus:ring-[#A7F950]/50 focus:outline-none'
216+
className='bg-active-bg flex h-10 w-10 items-center justify-center rounded-full text-black transition-colors hover:bg-[#A7F950]/80 focus:ring-2 focus:ring-[#A7F950]/50 focus:outline-none'
217217
aria-label='Share on Twitter'
218218
>
219219
<svg
@@ -234,7 +234,7 @@ const BlogPostDetails: React.FC<BlogPostDetailsProps> = ({ post }) => {
234234
</button>
235235
<button
236236
onClick={() => handleShare('discord')}
237-
className='flex h-10 w-10 items-center justify-center rounded-full bg-[rgba(167,249,80,0.08)] text-black transition-colors hover:bg-[#A7F950]/80 focus:ring-2 focus:ring-[#A7F950]/50 focus:outline-none'
237+
className='bg-active-bg flex h-10 w-10 items-center justify-center rounded-full text-black transition-colors hover:bg-[#A7F950]/80 focus:ring-2 focus:ring-[#A7F950]/50 focus:outline-none'
238238
aria-label='Copy for Discord'
239239
>
240240
{copiedStates.discord ? (
@@ -257,7 +257,7 @@ const BlogPostDetails: React.FC<BlogPostDetailsProps> = ({ post }) => {
257257
</button>
258258
<button
259259
onClick={() => handleShare('send')}
260-
className='flex h-10 w-10 items-center justify-center rounded-full bg-[rgba(167,249,80,0.08)] text-black transition-colors hover:bg-[#A7F950]/80 focus:ring-2 focus:ring-[#A7F950]/50 focus:outline-none'
260+
className='bg-active-bg flex h-10 w-10 items-center justify-center rounded-full text-black transition-colors hover:bg-[#A7F950]/80 focus:ring-2 focus:ring-[#A7F950]/50 focus:outline-none'
261261
aria-label='Share via native share'
262262
>
263263
<svg
@@ -278,7 +278,7 @@ const BlogPostDetails: React.FC<BlogPostDetailsProps> = ({ post }) => {
278278
</button>
279279
<button
280280
onClick={() => handleShare('link')}
281-
className='flex h-10 w-10 items-center justify-center rounded-full bg-[rgba(167,249,80,0.08)] text-black transition-colors hover:bg-[#A7F950]/80 focus:ring-2 focus:ring-[#A7F950]/50 focus:outline-none'
281+
className='bg-active-bg flex h-10 w-10 items-center justify-center rounded-full text-black transition-colors hover:bg-[#A7F950]/80 focus:ring-2 focus:ring-[#A7F950]/50 focus:outline-none'
282282
aria-label='Copy link'
283283
>
284284
{copiedStates.link ? (

0 commit comments

Comments
 (0)