From 248af3de9b30214c4044d0f7d3cabef7ad859da7 Mon Sep 17 00:00:00 2001 From: Sujit Date: Fri, 27 Sep 2024 21:59:17 +0545 Subject: [PATCH 1/3] feat(project-dashboard): show `No projects available` if there is no projects --- src/frontend/src/views/Projects/index.tsx | 30 ++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/frontend/src/views/Projects/index.tsx b/src/frontend/src/views/Projects/index.tsx index db6c1e5f..0f5b8b98 100644 --- a/src/frontend/src/views/Projects/index.tsx +++ b/src/frontend/src/views/Projects/index.tsx @@ -20,9 +20,8 @@ const Projects = () => { ); // fetch api for projectsList - const { data: projectsList, isLoading } = useGetProjectsListQuery( - projectsFilterByOwner, - ); + const { data: projectsList, isLoading }: Record = + useGetProjectsListQuery(projectsFilterByOwner); const { data: userDetails } = useGetUserDetailsQuery(); const localStorageUserDetails = getLocalStorageValue('userprofile'); @@ -54,17 +53,20 @@ const Projects = () => { ))} ) : ( - (projectsList as Record[])?.map( - (project: Record) => ( - - ), - ) + <> + {!projectsList?.length &&
No projects available
} + {(projectsList as Record[])?.map( + (project: Record) => ( + + ), + )} + )} {showMap && ( From b67970bbdd766d1f7ae12b58ff01cead094c4cea Mon Sep 17 00:00:00 2001 From: Sujit Date: Fri, 27 Sep 2024 22:12:42 +0545 Subject: [PATCH 2/3] feat(landing): add jamaica flying lab logo as a offical training partner --- .../LandingPage/ClientsAndPartners/index.tsx | 2 -- .../src/components/LandingPage/Footer/index.tsx | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx b/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx index 23b1a33d..546a97b7 100644 --- a/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx +++ b/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx @@ -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() { @@ -34,7 +33,6 @@ export default function ClientAndPartners() { > world bank logo gfdrrLogo - gfdrrLogo diff --git a/src/frontend/src/components/LandingPage/Footer/index.tsx b/src/frontend/src/components/LandingPage/Footer/index.tsx index 741b6bd4..66480d8d 100644 --- a/src/frontend/src/components/LandingPage/Footer/index.tsx +++ b/src/frontend/src/components/LandingPage/Footer/index.tsx @@ -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'; @@ -57,6 +58,12 @@ export default function Footer() { FAQs Cookies */} +
+

+ Official Training Partner +

+ gfdrrLogo +

© Drone Arial Tasking Manager. All Rights Reserved 2024 From 53f04106d8ff3ab575dea15153b4a614f3c3a24d Mon Sep 17 00:00:00 2001 From: Sujit Date: Fri, 27 Sep 2024 22:12:42 +0545 Subject: [PATCH 3/3] feat(landing): add jamaica flying lab logo as a offical training partner --- .../LandingPage/ClientsAndPartners/index.tsx | 2 -- .../src/components/LandingPage/Footer/index.tsx | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx b/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx index 23b1a33d..546a97b7 100644 --- a/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx +++ b/src/frontend/src/components/LandingPage/ClientsAndPartners/index.tsx @@ -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() { @@ -34,7 +33,6 @@ export default function ClientAndPartners() { > world bank logo gfdrrLogo - gfdrrLogo diff --git a/src/frontend/src/components/LandingPage/Footer/index.tsx b/src/frontend/src/components/LandingPage/Footer/index.tsx index 741b6bd4..fb7de811 100644 --- a/src/frontend/src/components/LandingPage/Footer/index.tsx +++ b/src/frontend/src/components/LandingPage/Footer/index.tsx @@ -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'; @@ -57,6 +58,16 @@ export default function Footer() { FAQs Cookies */} +

+

+ Official Training Partner +

+ Jamaica-Flying-Labs-Logo +

© Drone Arial Tasking Manager. All Rights Reserved 2024