Skip to content

use leaders-list for main page #1207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arkid15r merged 8 commits into from
Mar 31, 2025
Merged

use leaders-list for main page #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
353494c
use leaders-list for main page
yashgoyal0110 Mar 29, 2025
0d685e4
Merge branch 'main' into fix/using-leaderslist-for-homepage
arkid15r Mar 31, 2025
5ed5463
Merge branch 'main' into fix/using-leaderslist-for-homepage
yashgoyal0110 Mar 31, 2025
3174adc
commit
yashgoyal0110 Mar 31, 2025
0d4795c
Merge branch 'main' into fix/using-leaderslist-for-homepage
yashgoyal0110 Mar 31, 2025
5a686ef
commit
yashgoyal0110 Mar 31, 2025
c6f1853
Merge branch 'main' into pr/yashgoyal0110/1207
arkid15r Mar 31, 2025
b10a2f7
Update code
arkid15r Mar 31, 2025
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
7 changes: 4 additions & 3 deletions frontend/src/components/LeadersList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Link } from 'react-router-dom'
import { LeadersListProps } from 'types/leaders'
import { TruncatedText } from './TruncatedText'

/**
* Component that renders a list of project leaders as clickable links.
Expand All @@ -17,20 +18,20 @@ const LeadersList = ({ leaders }: LeadersListProps) => {
const leadersArray = leaders.split(',').map((leader) => leader.trim())

return (
<>
<TruncatedText>
{leadersArray.map((leader, index) => (
<span key={`${leader}-${index}`}>
<Link
to={`/community/users?q=${encodeURIComponent(leader)}`}
aria-label={`View profile of ${leader}`}
className="text-blue-400"
className="text-blue-400 hover:underline"
>
{leader}
</Link>
{index < leadersArray.length - 1 && ', '}
</span>
))}
</>
</TruncatedText>
)
}

Expand Down
16 changes: 12 additions & 4 deletions frontend/src/components/TruncatedText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import { useRef, useEffect, useCallback } from 'react'
import React, { useRef, useEffect, useCallback } from 'react'

export const TruncatedText = ({ text, className = '' }: { text: string; className?: string }) => {
export const TruncatedText = ({
text,
children,
className = '',
}: {
text?: string
children?: React.ReactNode
className?: string
}) => {
const textRef = useRef<HTMLSpanElement>(null)

const checkTruncation = useCallback(() => {
const element = textRef.current
if (element) {
element.title = text
element.title = text || element.textContent || ''
}
}, [text])

Expand All @@ -31,7 +39,7 @@ export const TruncatedText = ({ text, className = '' }: { text: string; classNam
ref={textRef}
className={`block overflow-hidden truncate text-ellipsis whitespace-nowrap ${className}`}
>
{text}
{text || children}
</span>
)
}
19 changes: 11 additions & 8 deletions frontend/src/pages/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { formatDate, formatDateRange } from 'utils/dateFormatter'
import AnimatedCounter from 'components/AnimatedCounter'
import ChapterMap from 'components/ChapterMap'
import ItemCardList from 'components/ItemCardList'
import LeadersList from 'components/LeadersList'
import LoadingSpinner from 'components/LoadingSpinner'
import MovingLogos from 'components/LogoCarousel'
import Modal from 'components/Modal'
Expand Down Expand Up @@ -192,15 +193,16 @@ export default function Home() {
<FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
<span>{formatDate(chapter.createdAt)}</span>
</div>
<div className="mr-4 flex items-center">
<div className="mr-4 flex flex-1 items-center overflow-hidden">
<FontAwesomeIcon icon={faMapMarkerAlt} className="mr-2 h-4 w-4" />
<span>{chapter.suggestedLocation}</span>
<TruncatedText text={chapter.suggestedLocation} />
</div>
</div>

{chapter.leaders.length > 0 && (
<div className="mr-4 mt-1 flex flex-wrap items-center text-sm text-gray-600 dark:text-gray-400">
<FontAwesomeIcon icon={faUsers} className="mr-2 h-4 w-4" />
<span>{chapter.leaders.join(', ')}</span>
<div className="mr-4 mt-1 flex items-center gap-x-2 text-sm [&_a]:text-gray-600 dark:[&_a]:text-gray-400">
<FontAwesomeIcon icon={faUsers} className="h-4 w-4" />
<LeadersList leaders={String(chapter.leaders)} />
</div>
)}
</div>
Expand Down Expand Up @@ -229,10 +231,11 @@ export default function Home() {
<span>{capitalize(project.type)}</span>
</div>
</div>

{project.leaders.length > 0 && (
<div className="mr-4 mt-1 flex flex-wrap items-center text-sm text-gray-600 dark:text-gray-400">
<FontAwesomeIcon icon={faUsers} className="mr-2 h-4 w-4" />
<span>{project.leaders.join(', ')}</span>
<div className="mr-4 mt-1 flex items-center gap-x-2 text-sm [&_a]:text-gray-600 dark:[&_a]:text-gray-400">
<FontAwesomeIcon icon={faUsers} className="h-4 w-4" />
<LeadersList leaders={String(project.leaders)} />
</div>
)}
</div>
Expand Down