Skip to content

Fixes 1396: UI for Mobile Homepage fixed #1404

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
merged 6 commits into from
Apr 21, 2025
Merged

Fixes 1396: UI for Mobile Homepage fixed #1404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5286f3
fix-home-page
KaranNegi20Feb Apr 20, 2025
61290a5
arrange-side-by-side
KaranNegi20Feb Apr 21, 2025
9a39ff8
arrange-side-by-side
KaranNegi20Feb Apr 21, 2025
658bd91
Merge branch 'main' into pr/KaranNegi20Feb/1404
arkid15r Apr 21, 2025
ba7fd47
Update code
arkid15r Apr 21, 2025
d55a310
Merge branch 'main' into next-1
arkid15r Apr 21, 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
23 changes: 11 additions & 12 deletions frontend/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,15 @@ export default function Home() {
>
<TruncatedText text={event.name} />
</button>
<div className="flex flex-col flex-wrap items-start text-sm text-gray-600 dark:text-gray-400 md:flex-row">
<div className="flex flex-wrap items-center text-sm text-gray-600 dark:text-gray-400">
<div className="mr-2 flex items-center">
<FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
<span>{formatDateRange(event.startDate, event.endDate)}</span>
</div>
{event.suggestedLocation && (
<div className="flex items-center">
<div className="flex flex-1 items-center overflow-hidden">
<FontAwesomeIcon icon={faMapMarkerAlt} className="mr-1 h-4 w-4" />
<span>{event.suggestedLocation}</span>
<TruncatedText text={event.suggestedLocation} />
</div>
)}
</div>
Expand Down Expand Up @@ -227,14 +227,14 @@ 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 flex-1 items-center overflow-hidden">
<div className="flex flex-1 items-center overflow-hidden">
<FontAwesomeIcon icon={faMapMarkerAlt} className="mr-2 h-4 w-4" />
<TruncatedText text={chapter.suggestedLocation} />
</div>
</div>

{chapter.leaders.length > 0 && (
<div className="mr-4 mt-1 flex items-center gap-x-2 text-sm text-gray-600 dark:text-gray-400">
<div className="mt-1 flex items-center gap-x-2 text-sm text-gray-600 dark:text-gray-400">
{' '}
<FontAwesomeIcon icon={faUsers} className="h-4 w-4" />
<LeadersList leaders={String(chapter.leaders)} />
Expand Down Expand Up @@ -265,22 +265,21 @@ export default function Home() {
<TruncatedText text={project.name} />
</h3>
</Link>
<div className="flex items-center text-sm text-gray-600 dark:text-gray-400">
<div className="flex flex-wrap items-center text-sm text-gray-600 dark:text-gray-400">
<div className="mr-4 flex items-center">
<FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
<span>{formatDate(project.createdAt)}</span>
</div>
<div className="mr-4 flex items-center">
<div className="mr-4 flex flex-1 items-center overflow-hidden">
<FontAwesomeIcon
icon={getProjectIcon(project.type) as IconProp}
className="mr-2 h-4 w-4"
/>
<span>{capitalize(project.type)}</span>
<TruncatedText text={capitalize(project.type)} />
</div>
</div>

{project.leaders.length > 0 && (
<div className="mr-4 mt-1 flex items-center gap-x-2 text-sm text-gray-600 dark:text-gray-400">
<div className="mt-1 flex items-center gap-x-2 text-sm text-gray-600 dark:text-gray-400">
<FontAwesomeIcon icon={faUsers} className="h-4 w-4" />
<LeadersList leaders={String(project.leaders)} />
</div>
Expand Down Expand Up @@ -355,12 +354,12 @@ export default function Home() {
<TruncatedText text={post.title} />
</Link>
</h3>
<div className="mt-2 flex flex-col flex-wrap items-start text-sm text-gray-600 dark:text-gray-400 md:flex-row">
<div className="mt-2 flex flex-wrap items-center text-sm text-gray-600 dark:text-gray-400">
<div className="mr-4 flex items-center">
<FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
<span>{formatDate(post.publishedAt)}</span>
</div>
<div className="flex items-center">
<div className="flex flex-1 items-center overflow-hidden">
<FontAwesomeIcon icon={faUser} className="mr-2 h-4 w-4" />
<LeadersList leaders={post.authorName} />
</div>
Expand Down
13 changes: 7 additions & 6 deletions frontend/src/components/RecentIssues.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { ProjectIssuesType } from 'types/project'
import { formatDate } from 'utils/dateFormatter'
import AnchorTitle from './AnchorTitle'
import ItemCardList from './ItemCardList'
import { TruncatedText } from './TruncatedText'

interface RecentIssuesProps {
data: ProjectIssuesType[]
Expand All @@ -30,23 +31,23 @@ const RecentIssues: React.FC<RecentIssuesProps> = ({ data, showAvatar = true })
showAvatar={showAvatar}
icon={faCircleExclamation}
renderDetails={(item) => (
<div className="mt-2 flex flex-col flex-wrap items-start text-sm text-gray-600 dark:text-gray-400 md:flex-row">
<div className="flex items-center">
<div className="mt-2 flex flex-wrap items-center text-sm text-gray-600 dark:text-gray-400">
<div className="mr-4 flex items-center">
<FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
<span>{formatDate(item.createdAt)}</span>
</div>
{item?.repositoryName && (
<div className="item-center flex">
<FontAwesomeIcon icon={faFolderOpen} className="ml-4 mr-2 h-4 w-4" />
<div className="flex flex-1 items-center overflow-hidden">
<FontAwesomeIcon icon={faFolderOpen} className="mr-2 h-5 w-4" />
<button
className="cursor-pointer text-gray-600 hover:underline dark:text-gray-400"
className="cursor-pointer overflow-hidden text-ellipsis whitespace-nowrap text-gray-600 hover:underline dark:text-gray-400"
onClick={() =>
router.push(
`/organizations/${item.organizationName}/repositories/${item.repositoryName || ''}`
)
}
>
{item.repositoryName}
<TruncatedText text={item.repositoryName} />
</button>
</div>
)}
Expand Down
13 changes: 7 additions & 6 deletions frontend/src/components/RecentPullRequests.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { ItemCardPullRequests } from 'types/user'
import { formatDate } from 'utils/dateFormatter'
import AnchorTitle from './AnchorTitle'
import ItemCardList from './ItemCardList'
import { TruncatedText } from './TruncatedText'

interface RecentPullRequestsProps {
data: ItemCardPullRequests[] | PullRequestsType[]
Expand All @@ -31,24 +32,24 @@ const RecentPullRequests: React.FC<RecentPullRequestsProps> = ({ data, showAvata
icon={faCodePullRequest}
showAvatar={showAvatar}
renderDetails={(item) => (
<div className="mt-2 flex flex-col flex-wrap items-start text-sm text-gray-600 dark:text-gray-400 md:flex-row">
<div className="flex items-center">
<div className="mt-2 flex flex-wrap items-center text-sm text-gray-600 dark:text-gray-400">
<div className="mr-4 flex items-center">
<FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
<span>{formatDate(item.createdAt)}</span>
</div>

{item?.repositoryName && (
<div className="item-center flex">
<FontAwesomeIcon icon={faFolderOpen} className="ml-4 mr-2 h-4 w-4" />
<div className="mr-4 flex flex-1 items-center overflow-hidden">
<FontAwesomeIcon icon={faFolderOpen} className="mr-2 h-5 w-4" />
<button
className="cursor-pointer text-gray-600 hover:underline dark:text-gray-400"
className="cursor-pointer overflow-hidden text-ellipsis whitespace-nowrap text-gray-600 hover:underline dark:text-gray-400"
onClick={() =>
router.push(
`/organizations/${item.organizationName}/repositories/${item.repositoryName || ''}`
)
}
>
{item.repositoryName}
<TruncatedText text={item.repositoryName} />
</button>
</div>
)}
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/RecentReleases.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,22 @@ const RecentReleases: React.FC<RecentReleasesProps> = ({
</Link>
</h3>
</div>
<div className="ml-0.5 w-full">
<div className="mt-2 flex items-center text-sm text-gray-600 dark:text-gray-400">
<div className="mt-2 flex flex-wrap items-center text-sm text-gray-600 dark:text-gray-400">
<div className="mr-4 flex items-center">
<FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
<span>{formatDate(item.publishedAt)}</span>
<FontAwesomeIcon icon={faFolderOpen} className="ml-4 mr-2 h-4 w-4" />
</div>
<div className="flex flex-1 items-center overflow-hidden">
<FontAwesomeIcon icon={faFolderOpen} className="mr-2 h-5 w-4" />
<button
className="cursor-pointer text-gray-600 hover:underline dark:text-gray-400"
className="cursor-pointer overflow-hidden text-ellipsis whitespace-nowrap text-gray-600 hover:underline dark:text-gray-400"
onClick={() =>
router.push(
`/organizations/${item?.organizationName}/repositories/${item.repositoryName || ''}`
)
}
>
{item.repositoryName}
<TruncatedText text={item.repositoryName} />
</button>
</div>
</div>
Expand Down