Skip to content

Commit

Permalink
Merge pull request #244 from hotosm/feat/user-profile
Browse files Browse the repository at this point in the history
Feat: Text and logo update
  • Loading branch information
suzit-10 authored Sep 27, 2024
2 parents ea845eb + 998bc97 commit 475944c
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { motion } from 'framer-motion';
import worldBankLogo from '@Assets/images/LandingPage/WorldbankLogo.png';
import { fadeUpVariant } from '@Constants/animations';
import gfdrrLogo from '@Assets/images/GFDRR-logo.png';
import JamaicaFlyingLabsLogo from '@Assets/images/LandingPage/JamaicaFlyingLabs_Logo.png';
import { FlexRow } from '@Components/common/Layouts';

export default function ClientAndPartners() {
Expand Down Expand Up @@ -34,7 +33,6 @@ export default function ClientAndPartners() {
>
<Image src={worldBankLogo} alt="world bank logo" />
<Image src={gfdrrLogo} alt="gfdrrLogo" width={260} />
<Image src={JamaicaFlyingLabsLogo} alt="gfdrrLogo" width={200} />
</FlexRow>
</motion.div>
</div>
Expand Down
15 changes: 13 additions & 2 deletions src/frontend/src/components/LandingPage/Footer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* eslint-disable no-unused-vars */
import { Flex, FlexRow } from '@Components/common/Layouts';
import Icon from '@Components/common/Icon';
import { FlexRow } from '@Components/common/Layouts';
// import Icon from '@Components/common/Icon';
import Image from '@Components/RadixComponents/Image';
import JamaicaFlyingLabsLogo from '@Assets/images/LandingPage/JamaicaFlyingLabs_Logo.png';
import naxaLogo from '@Assets/images/LandingPage/Naxa-logo.png';
import hotLogo from '@Assets/images/LandingPage/HOT-logo.png';
import { Button } from '@Components/RadixComponents/Button';
Expand Down Expand Up @@ -57,6 +58,16 @@ export default function Footer() {
<span className="naxatw-cursor-pointer">FAQs</span>
<span className="naxatw-cursor-pointer">Cookies</span>
</div> */}
<div className="naxatw-flex naxatw-w-[200px] naxatw-flex-col naxatw-items-start">
<p className="naxatw-mt-2 naxatw-text-center naxatw-text-base naxatw-text-landing-grey">
Official Training Partner
</p>
<Image
src={JamaicaFlyingLabsLogo}
alt="Jamaica-Flying-Labs-Logo"
width={200}
/>
</div>
</motion.div>
<p className="naxatw-mt-2 naxatw-text-center naxatw-text-base naxatw-text-landing-grey">
© Drone Arial Tasking Manager. All Rights Reserved 2024
Expand Down
30 changes: 16 additions & 14 deletions src/frontend/src/views/Projects/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ const Projects = () => {
);

// fetch api for projectsList
const { data: projectsList, isLoading } = useGetProjectsListQuery(
projectsFilterByOwner,
);
const { data: projectsList, isLoading }: Record<string, any> =
useGetProjectsListQuery(projectsFilterByOwner);

const { data: userDetails } = useGetUserDetailsQuery();
const localStorageUserDetails = getLocalStorageValue('userprofile');
Expand Down Expand Up @@ -54,17 +53,20 @@ const Projects = () => {
))}
</>
) : (
(projectsList as Record<string, any>[])?.map(
(project: Record<string, any>) => (
<ProjectCard
key={project.id}
id={project.id}
imageUrl={project?.image_url}
title={project.name}
description={project.description}
/>
),
)
<>
{!projectsList?.length && <div>No projects available</div>}
{(projectsList as Record<string, any>[])?.map(
(project: Record<string, any>) => (
<ProjectCard
key={project.id}
id={project.id}
imageUrl={project?.image_url}
title={project.name}
description={project.description}
/>
),
)}
</>
)}
</div>
{showMap && (
Expand Down

0 comments on commit 475944c

Please sign in to comment.