Skip to content
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

Fix explore projects #805

Merged
merged 2 commits into from
Sep 6, 2023
Merged

Fix explore projects #805

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e9ccee
fix (explrore projects): map section to be shown in absence of projec…
NSUWAL123 Sep 6, 2023
88975f3
Merge branch 'development' of https://github.com/hotosm/fmtm into fix…
NSUWAL123 Sep 6, 2023
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
32 changes: 18 additions & 14 deletions src/frontend/main/src/views/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ const Home = () => {
totalProjectCount={stateHome.homeProjectSummary.length}
/>
{stateHome.homeProjectLoading == false ? (
filteredProjectCards.length > 0 ? (
<div>
<div className="fmtm-flex fmtm-flex-col lg:fmtm-flex-row fmtm-gap-5">
<div className={`fmtm-w-full ${showMapStatus ? 'lg:fmtm-w-[50%]' : ''} `}>
<div className="fmtm-flex fmtm-flex-col lg:fmtm-flex-row fmtm-gap-5">
<div className={`fmtm-w-full ${showMapStatus ? 'lg:fmtm-w-[50%]' : ''} `}>
{filteredProjectCards.length > 0 ? (
<div>
<div
className={`fmtm-px-[1rem] fmtm-grid fmtm-gap-5 ${
!showMapStatus
Expand All @@ -73,17 +73,21 @@ const Home = () => {
))}
</div>
</div>
{/* fmtm-w-[41.8rem] */}
{showMapStatus && (
<div className="lg:fmtm-order-last lg:fmtm-w-[50%] fmtm-h-[33rem] fmtm-bg-gray-300 fmtm-mx-4 fmtm-mb-2"></div>
)}
</div>
) : (
<CoreModules.Typography
variant="h2"
color="error"
sx={{ p: 2, textAlign: 'center' }}
className="fmtm-h-full fmtm-flex fmtm-justify-center fmtm-items-center"
>
No projects found.
</CoreModules.Typography>
)}
</div>
) : (
<CoreModules.Typography variant="h2" color="error" sx={{ p: 2, textAlign: 'center' }}>
No projects found.
</CoreModules.Typography>
)
{showMapStatus && (
<div className="lg:fmtm-w-[50%] fmtm-h-[33rem] fmtm-bg-gray-300 fmtm-mx-4 fmtm-mb-2"></div>
)}
</div>
) : (
<CoreModules.Stack
sx={{
Expand Down
Loading