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
4 changes: 2 additions & 2 deletions frontend/src/app/board/[year]/candidates/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -477,13 +477,13 @@ const BoardCandidatesPage = () => {
(
{ledChapters.length > 0 && (
<>
{ledChapters.length} chapter{ledChapters.length !== 1 ? 's' : ''}
{ledChapters.length} chapter{ledChapters.length === 1 ? '' : 's'}
</>
)}
{ledChapters.length > 0 && ledProjects.length > 0 && ', '}
{ledProjects.length > 0 && (
<>
{ledProjects.length} project{ledProjects.length !== 1 ? 's' : ''}
{ledProjects.length} project{ledProjects.length === 1 ? '' : 's'}
</>
)}
)
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/CardDetailsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ const DetailsCard = ({
detail?.label === 'Leaders' ? (
<div key={detail.label} className="flex flex-row gap-1 pb-1">
<strong>{detail.label}:</strong>{' '}
<LeadersList leaders={detail?.value != null ? String(detail.value) : 'Unknown'} />
<LeadersList leaders={detail?.value == null ? 'Unknown' : String(detail.value)} />
</div>
) : (
<div key={detail.label} className="pb-1">
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/ModuleCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const getSimpleDuration = (start: string | number, end: string | number):

const ms = endDate.getTime() - startDate.getTime()
const days = Math.floor(ms / (1000 * 60 * 60 * 24))

const weeks = Math.ceil(days / 7)
return `${weeks} week${weeks !== 1 ? 's' : ''}`

return `${weeks} week${weeks === 1 ? '' : 's'}`
}
6 changes: 3 additions & 3 deletions frontend/src/components/SearchPageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ const SearchPageLayout = ({
initialValue={searchQuery}
/>
</div>
{!isLoaded ? (
<SkeletonBase indexName={indexName} loadingImageUrl={loadingImageUrl} />
) : (
{isLoaded ? (
<>
<div>
{totalPages !== 0 && <div className="flex justify-end">{sortChildren}</div>}
Expand All @@ -67,6 +65,8 @@ const SearchPageLayout = ({
/>
)}
</>
) : (
<SkeletonBase indexName={indexName} loadingImageUrl={loadingImageUrl} />
)}
</div>
)
Expand Down