From ffaa43dde748d2d0f139463e7d3d718306010cff Mon Sep 17 00:00:00 2001 From: Lovel George <36924734+lovelgeorge99@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:14:06 -0400 Subject: [PATCH 1/3] made requested ui changes --- src/components/badges/ShareLikeBadge.tsx | 2 +- src/components/views/project/ProjectBadges.tsx | 4 +--- src/components/views/project/ProjectHeader.tsx | 4 ++-- src/components/views/project/ProjectIndex.tsx | 4 ++-- .../projectActionCard/ProjectActionCard.tsx | 17 +---------------- .../projectActionCard/ProjectPublicActions.tsx | 2 +- .../project/projectActionCard/QFSection.tsx | 3 +-- 7 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/components/badges/ShareLikeBadge.tsx b/src/components/badges/ShareLikeBadge.tsx index d55776d3fd..9feb1d256d 100644 --- a/src/components/badges/ShareLikeBadge.tsx +++ b/src/components/badges/ShareLikeBadge.tsx @@ -54,7 +54,7 @@ const Wrapper = styled(FlexCenter)` const BadgeText = styled(ButtonText)<{ $fromDonate?: boolean | null }>` color: ${props => props.$fromDonate ? brandColors.pinky[500] : neutralColors.gray[700]}; - text-transform: ${props => (props.$fromDonate ? 'none' : 'uppercase')}; + text-transform: ${props => (props.$fromDonate ? 'none' : '')}; margin: 0 auto; `; diff --git a/src/components/views/project/ProjectBadges.tsx b/src/components/views/project/ProjectBadges.tsx index a5e4937c0d..e973095695 100644 --- a/src/components/views/project/ProjectBadges.tsx +++ b/src/components/views/project/ProjectBadges.tsx @@ -69,11 +69,9 @@ const ProjectBadges = () => { }; const CustomFlex = styled(Flex)` - overflow-x: scroll; overflow-y: hidden; white-space: nowrap; - margin-bottom: -3px; - padding-top: 8px; + margin-bottom: 24px; `; export default ProjectBadges; diff --git a/src/components/views/project/ProjectHeader.tsx b/src/components/views/project/ProjectHeader.tsx index a5ba55d5db..cbd9a9c9b3 100644 --- a/src/components/views/project/ProjectHeader.tsx +++ b/src/components/views/project/ProjectHeader.tsx @@ -56,7 +56,7 @@ const ProjectImage = styled.img` border-radius: 16px; width: 100%; object-fit: cover; // Ensures the image covers the entire container - height: 380px; + height: 430px; position: relative; `; @@ -65,7 +65,7 @@ const GradientOverlay = styled.div` top: 0; left: 0; width: 100%; - height: 380px; + height: 430px; background: linear-gradient( to top, rgba(1, 1, 27, 0.6), diff --git a/src/components/views/project/ProjectIndex.tsx b/src/components/views/project/ProjectIndex.tsx index f1a691d950..0e9cc06347 100644 --- a/src/components/views/project/ProjectIndex.tsx +++ b/src/components/views/project/ProjectIndex.tsx @@ -180,7 +180,7 @@ const ProjectIndex: FC = () => { orgLabel={projectData?.organization?.label} /> - + {isMobile && isAdmin && ( = () => { )} - + {isDraft && ( diff --git a/src/components/views/project/projectActionCard/ProjectActionCard.tsx b/src/components/views/project/projectActionCard/ProjectActionCard.tsx index 8850874513..2c6ccf5725 100644 --- a/src/components/views/project/projectActionCard/ProjectActionCard.tsx +++ b/src/components/views/project/projectActionCard/ProjectActionCard.tsx @@ -2,9 +2,7 @@ import { mediaQueries, neutralColors, Flex, - Subline, brandColors, - IconChevronRight16, } from '@giveth/ui-design-system'; import Link from 'next/link'; import styled from 'styled-components'; @@ -57,20 +55,7 @@ const ProjectActionInnerCard = () => { )} {!isMobile && !isAdmin && } {isAdmin && } - - - - {formatMessage({ - id: 'label.learn_more_about_donating_on_giveth', - })} - - - - + ); }; diff --git a/src/components/views/project/projectActionCard/ProjectPublicActions.tsx b/src/components/views/project/projectActionCard/ProjectPublicActions.tsx index da97d83148..0d9fcc8724 100644 --- a/src/components/views/project/projectActionCard/ProjectPublicActions.tsx +++ b/src/components/views/project/projectActionCard/ProjectPublicActions.tsx @@ -149,7 +149,7 @@ export const ProjectPublicActions = () => { {reaction?.userId && reaction?.userId === user?.id ? ( ) : ( - + )} diff --git a/src/components/views/project/projectActionCard/QFSection.tsx b/src/components/views/project/projectActionCard/QFSection.tsx index 18e11b18c6..352e987be3 100644 --- a/src/components/views/project/projectActionCard/QFSection.tsx +++ b/src/components/views/project/projectActionCard/QFSection.tsx @@ -138,7 +138,7 @@ const QFSection: FC = ({ projectData }) => { ); return ( - + {isOnDonatePage && ( <> @@ -302,7 +302,6 @@ const Amount = styled(H3)` const Description = styled(Caption)` color: ${neutralColors.gray[700]}; - margin-bottom: 24px; white-space: nowrap; & > div { color: ${neutralColors.gray[900]}; From 8d3a59e94ea1d210dc1ba2f5d9da0d14a869dcf4 Mon Sep 17 00:00:00 2001 From: Lovel George <36924734+lovelgeorge99@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:26:38 -0400 Subject: [PATCH 2/3] remove empty link and change justifyConent --- .../views/project/projectActionCard/ProjectActionCard.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/views/project/projectActionCard/ProjectActionCard.tsx b/src/components/views/project/projectActionCard/ProjectActionCard.tsx index 2c6ccf5725..ab68c2d196 100644 --- a/src/components/views/project/projectActionCard/ProjectActionCard.tsx +++ b/src/components/views/project/projectActionCard/ProjectActionCard.tsx @@ -32,7 +32,7 @@ export const ProjectActionCard = () => { return ( @@ -55,7 +55,6 @@ const ProjectActionInnerCard = () => { )} {!isMobile && !isAdmin && } {isAdmin && } - ); }; From ea79fe05a03f0dce4270d494e766cc71797f6c72 Mon Sep 17 00:00:00 2001 From: Lovel George <36924734+lovelgeorge99@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:38:16 -0400 Subject: [PATCH 3/3] fixed build errors --- .../views/project/projectActionCard/ProjectActionCard.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/views/project/projectActionCard/ProjectActionCard.tsx b/src/components/views/project/projectActionCard/ProjectActionCard.tsx index ab68c2d196..9e6372df0d 100644 --- a/src/components/views/project/projectActionCard/ProjectActionCard.tsx +++ b/src/components/views/project/projectActionCard/ProjectActionCard.tsx @@ -4,7 +4,6 @@ import { Flex, brandColors, } from '@giveth/ui-design-system'; -import Link from 'next/link'; import styled from 'styled-components'; import { useIntl } from 'react-intl'; import { ProjectStats } from './ProjectStats'; @@ -16,7 +15,6 @@ import MobileDonateFooter from './MobileDonateFooter'; import QFSection from './QFSection'; import { DonateSection } from './DonationSection'; import { ProjectPublicActions } from './ProjectPublicActions'; -import Routes from '@/lib/constants/Routes'; export const ProjectActionCard = () => { const isMobile = !useMediaQuery(device.tablet);