From 5984be5be6fb9bfce3e04fee5f6f61879f2ce83b Mon Sep 17 00:00:00 2001 From: Cherik Date: Mon, 27 Feb 2023 14:38:47 +0330 Subject: [PATCH 01/21] remove slice campaign.title --- src/components/views/homepage/ProjectsCampaignBlock.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/views/homepage/ProjectsCampaignBlock.tsx b/src/components/views/homepage/ProjectsCampaignBlock.tsx index 25dc5d2b0c..88a71c4d16 100644 --- a/src/components/views/homepage/ProjectsCampaignBlock.tsx +++ b/src/components/views/homepage/ProjectsCampaignBlock.tsx @@ -10,7 +10,7 @@ import { import styled from 'styled-components'; import { Navigation, Pagination } from 'swiper'; import { Swiper, SwiperSlide } from 'swiper/react'; -import { FC, Fragment, useEffect, useRef, useState } from 'react'; +import { FC, useEffect, useRef, useState } from 'react'; import { Swiper as SwiperClass } from 'swiper/types'; import InternalLink from '@/components/InternalLink'; import { ICampaign } from '@/apollo/types/types'; @@ -83,12 +83,13 @@ const ProjectsCampaignBlock: FC = ({ <H1 weight={700} style={{ overflowWrap: 'anywhere' }}> - {campaign.title.split(' ').map((t, index) => ( + {/* {campaign.title.split(' ').map((t, index) => ( <Fragment key={index}> <span>{t}</span> <br /> </Fragment> - ))} + ))} */} + {campaign.title} </H1> <InternalLink href={campaignLinkGenerator(campaign) || ''} From ea21a237189a489a9566fba72eeb86f27ed6735b Mon Sep 17 00:00:00 2001 From: Cherik <Pourcheriki@gmail.com> Date: Mon, 27 Feb 2023 14:57:25 +0330 Subject: [PATCH 02/21] update logo --- public/images/logo/logo.svg | 5 +++++ public/images/logo/logo1.png | Bin 1204 -> 0 bytes src/components/Header/Header.tsx | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 public/images/logo/logo.svg delete mode 100644 public/images/logo/logo1.png diff --git a/public/images/logo/logo.svg b/public/images/logo/logo.svg new file mode 100644 index 0000000000..1af9d487b9 --- /dev/null +++ b/public/images/logo/logo.svg @@ -0,0 +1,5 @@ +<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M49.6112 25.6113C49.5627 26.307 49.5457 27.0071 49.4608 27.6976C48.5605 35.0305 45.1505 40.9064 39.1644 45.2091C34.6928 48.4241 29.6459 49.9245 24.1488 49.7336C17.7921 49.5144 12.3118 47.1415 7.71639 42.7294C7.6741 42.6887 7.67513 42.5263 7.71639 42.4828C13.448 36.725 19.185 30.973 24.9274 25.2269C25.0632 25.1022 25.2388 25.0301 25.4228 25.0237C33.4863 25.0137 41.5496 25.0108 49.6129 25.0151L49.6112 25.6113Z" fill="#121B4B"/> +<path d="M25.5293 0.25C26.2072 0.301645 26.8865 0.331743 27.562 0.404935C31.5177 0.834969 35.1608 2.14468 38.4913 4.33406C38.5139 4.35109 38.5355 4.36936 38.5561 4.38879L36.4507 6.49598C35.9924 6.95462 35.5372 7.41635 35.0734 7.86919C35.0441 7.88821 35.0106 7.89974 34.9758 7.90278C34.9411 7.90582 34.9061 7.90028 34.8739 7.88663C31.5209 5.95194 27.9117 5.06211 24.0463 5.21716C15.398 5.56671 7.85866 11.7097 5.785 20.1334C4.50145 25.3526 5.21552 30.3109 7.85866 34.9907C7.8839 35.0352 7.88526 35.1333 7.85491 35.1617C6.70754 36.3209 5.55618 37.4772 4.40085 38.6305C4.3896 38.6418 4.37562 38.651 4.34936 38.6722C4.24058 38.5033 4.13111 38.3398 4.02813 38.1729C1.17765 33.5515 -0.0806642 28.5286 0.326498 23.1069C1.17526 11.8363 9.53948 2.60276 20.6693 0.641955C21.7946 0.443926 22.9455 0.393649 24.0841 0.274967L24.3167 0.25H25.5293Z" fill="#121B4B"/> +<path d="M38.0391 15.1913C38.041 14.1621 38.3986 13.1653 39.0508 12.3706C39.7031 11.576 40.6098 11.0326 41.6165 10.833C42.6232 10.6334 43.6679 10.7898 44.5725 11.2758C45.4772 11.7617 46.186 12.547 46.5783 13.4981C46.9707 14.4492 47.0223 15.5073 46.7243 16.4922C46.4264 17.4772 45.7973 18.3281 44.9442 18.9002C44.0912 19.4724 43.0668 19.7303 42.0454 19.6301C41.024 19.53 40.0688 19.0779 39.3424 18.3509C38.9287 17.9361 38.6006 17.4435 38.377 16.9013C38.1533 16.3591 38.0385 15.7781 38.0391 15.1913Z" fill="#121B4B"/> +</svg> diff --git a/public/images/logo/logo1.png b/public/images/logo/logo1.png deleted file mode 100644 index 4d76b25b577810efb74f44b199fd93bca6b8af33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1204 zcmV;l1WWsgP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1W8FmK~#7F)tb$2 z+eQ$_XO^;yCWkQ1rL9|-w_KfDZ&7Z|2T;9%qhn94pTPDTL{DJ(395tR2FM}G8z|Qx zKp4PA0t9i^ft^otCo>eSP$Wf)A|*0EK#;gxuJ+HFUCz!Dp+xMT|8y*XCMo3r;;NJp zfa9Me(uk<}`vnpWJpSlc4_qh-go1GAo655O;tsaB^A6-=z@NVP{CQWuemH;v%p}CN zo3^@m@h;!(b#7n{%3**&oi~U3U6_H~LawabVga}b=Ppw|E(_YuD`;vV;{Rw_JA6SC z7Jxy#p%3=@)7EcHQ|ZbtH(NY_clf8BQB@OSAB}l}2(E|94WG2gI7Hy^pubLOHw1Az zj|l>O`H<dTWy#-b$-OL_HST$@}N_?{`{AJkDgI81)FZj}G>>ASbCpvPDqGoW9@E zy04)C;<h~VZSjA(vxpET3P}^eZZTjN+Q@5xd6Fn37!&^`Us8@0$|fcxF!LiwnqFu0 z-=avLVAvmbQZx_~a(U(Uqr@q;0uf15KD%|FJg*%UG$tf?*zLrdq|VXd{=cw5Qayt$ zV@^-6h22|)&jwHIF?im07cD|y5oytbqb^(+>(fYxSR?5|GTsfShF0oX#P#suNJx@3 zm~NS&_B`>0NGJ{o)-ay84HbdI5Pu>(=-u$KFNFPZJ)v%;*6?_iOgm3NyW!(=*J?&9 za`d?i72-z?lf+0+842?-nC6~G+c`SCe;I1Puz!kYD7?gWI5y%bhx;+NYgkK-H8M0- z$kFU$s0o34XHNf$JQG{0W(~ADqWJbZ(L%!+4*1ScsMKn#)Us+7*-nE>EdBK9yAzVU zW^XLLg_5vWZm;v*x(C_o{UUUgk?dcTvoEDgy@7}>%vS`+w5-tcj$`GGh64o&iI_hG zTFHVxTCNHv-xewYhO?}a{8RJ<Cl;D8Ba0T{b9Uw`&oljKxg^kF1}YK34}VF3s~`l3 z4tU%C?M@SNP>~2fH6`D{bA)1%E~h>Jfhnm<gm50t`$7z=UbF(cS4*}JvKp#VgikOu zd?6D1OOhd4hxb4>)7q$7grtVf7k{G=1rywh&2l`ck;*Lr<EzAx5VO22VZ^sVpOTQP zg$VYb@G5a6M7uq0fHwStnu`z=nT_yqJon29Z2j{8Ued*N5y5nMDc%kjOuzM36A|K4 zk~B=s{Z67rmH>ADYe~rmm33jQL@3ox5+S5oWJ0Q_8Zx#uth8%Co;=e(Ub-q`n@}B^ zE%Eo;gS~rcl~RQWAKpFf|6pHz!p`{zhx~J1>5bzLY^0m|;QoWGy18B$uz2@~7Gxb> z6ZPoiq&@9kW$srvY~Dvf!cDf019QN)g2Hy`FAPj#4uS?ewRZHPUaE;A3ou1=m+$2D z8ANGW3&}E~=$?IHAz|1`YoL^)B%h49ilHQiq@9px_~Mzor?Rx%=lITrlK2W*<KY@z S%}(?H0000<MNUMnLSTZ+sxSxu diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index b0ba19479d..eb463fc86a 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -187,7 +187,7 @@ const Header: FC<IHeader> = () => { width='50' height='50' alt='Giveth logo' - src='/images/logo/logo1.png' + src='/images/logo/logo.svg' /> </Logo> </Link> From bf59c28e93e2bce3a0f328aa08b0ece8c25e8e4b Mon Sep 17 00:00:00 2001 From: Cherik <Pourcheriki@gmail.com> Date: Mon, 27 Feb 2023 15:01:47 +0330 Subject: [PATCH 03/21] change nft to community --- src/components/sidebar/HomeSidebar.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/sidebar/HomeSidebar.tsx b/src/components/sidebar/HomeSidebar.tsx index d60db5a4d3..4d4bb9201a 100644 --- a/src/components/sidebar/HomeSidebar.tsx +++ b/src/components/sidebar/HomeSidebar.tsx @@ -31,9 +31,9 @@ export const HomeSidebar = () => { <GIVeconomyItems /> </SidebarParentItem> <ItemSpacer /> - <Link href={Routes.NFT}> + <Link href={Routes.Join}> <Item theme={theme}> - <GLink size='Big'>NFT</GLink> + <GLink size='Big'>Community</GLink> </Item> </Link> <SearchButton From ca13c63cf5749ddf4a3125df438c2b49e877d886 Mon Sep 17 00:00:00 2001 From: Cherik <Pourcheriki@gmail.com> Date: Mon, 27 Feb 2023 15:09:18 +0330 Subject: [PATCH 04/21] fix campaign title --- .../views/homepage/ProjectsCampaignBlock.tsx | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/components/views/homepage/ProjectsCampaignBlock.tsx b/src/components/views/homepage/ProjectsCampaignBlock.tsx index 88a71c4d16..05c5fc7358 100644 --- a/src/components/views/homepage/ProjectsCampaignBlock.tsx +++ b/src/components/views/homepage/ProjectsCampaignBlock.tsx @@ -12,7 +12,6 @@ import { Navigation, Pagination } from 'swiper'; import { Swiper, SwiperSlide } from 'swiper/react'; import { FC, useEffect, useRef, useState } from 'react'; import { Swiper as SwiperClass } from 'swiper/types'; -import InternalLink from '@/components/InternalLink'; import { ICampaign } from '@/apollo/types/types'; import { Flex, FlexCenter } from '@/components/styled-components/Flex'; import ProjectCard from '@/components/project-card/ProjectCard'; @@ -22,12 +21,13 @@ import { client } from '@/apollo/apolloClient'; import { FETCH_CAMPAIGN_BY_SLUG } from '@/apollo/gql/gqlCampaign'; import { BlockHeader, BlockTitle } from './common'; import { Container } from '@/components/Grid'; -import { campaignLinkGenerator } from '@/helpers/url'; import { NavigationWrapper, PaginationWrapper, SwiperPaginationWrapper, } from '@/components/styled-components/SwiperPagination'; +import InternalLink from '@/components/InternalLink'; +import { campaignLinkGenerator } from '@/helpers/url'; interface IProjectsCampaignBlockProps { campaign: ICampaign; @@ -82,15 +82,7 @@ const ProjectsCampaignBlock: FC<IProjectsCampaignBlockProps> = ({ </BlockHeader> <BottomSection> <Title> - <H1 weight={700} style={{ overflowWrap: 'anywhere' }}> - {/* {campaign.title.split(' ').map((t, index) => ( - <Fragment key={index}> - <span>{t}</span> - <br /> - </Fragment> - ))} */} - {campaign.title} - </H1> + <H1 weight={700}>{campaign.title}</H1> <InternalLink href={campaignLinkGenerator(campaign) || ''} color={brandColors.giv[500]} From 1dc10d3b1944e027d49968f320063caaefbe5c97 Mon Sep 17 00:00:00 2001 From: Cherik <Pourcheriki@gmail.com> Date: Mon, 27 Feb 2023 15:22:49 +0330 Subject: [PATCH 05/21] fix menu and sidebar paddings --- src/components/menu/GIVeconomyItems.tsx | 2 +- src/components/menu/ProjectsItems.tsx | 2 +- src/components/sidebar/SidebarItem.tsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/menu/GIVeconomyItems.tsx b/src/components/menu/GIVeconomyItems.tsx index 0650285464..2f9fa94d8d 100644 --- a/src/components/menu/GIVeconomyItems.tsx +++ b/src/components/menu/GIVeconomyItems.tsx @@ -64,5 +64,5 @@ export const GIVeconomyItems = () => { }; const LabelStyle = styled(Caption)` - margin: 24px 8px 16px; + margin: 24px 16px 16px; `; diff --git a/src/components/menu/ProjectsItems.tsx b/src/components/menu/ProjectsItems.tsx index 4cc70ba198..8e46409468 100644 --- a/src/components/menu/ProjectsItems.tsx +++ b/src/components/menu/ProjectsItems.tsx @@ -92,5 +92,5 @@ const CategoriesGrid = styled.div<{ inSidebar?: boolean }>` `; const Label = styled(Caption)` - padding-left: 8px; + padding-left: 16px; `; diff --git a/src/components/sidebar/SidebarItem.tsx b/src/components/sidebar/SidebarItem.tsx index 589a007ef3..c9827ea068 100644 --- a/src/components/sidebar/SidebarItem.tsx +++ b/src/components/sidebar/SidebarItem.tsx @@ -46,11 +46,11 @@ export const SidebarParentItem: FC<ISidebarItemProps> = ({ const ItemWrapper = styled(Flex)` cursor: pointer; - padding: 12px 8px; + padding: 12px 16px; `; const ChildrenWrapper = styled.div` - padding: 12px 8px; + padding: 12px 0; border-bottom: 1px solid ${props => props.theme === ETheme.Dark From a20c559108cc0cc54c1a0727273760cbddaf5eba Mon Sep 17 00:00:00 2001 From: Cherik <Pourcheriki@gmail.com> Date: Mon, 27 Feb 2023 15:28:15 +0330 Subject: [PATCH 06/21] show small search on overlap --- src/components/Header/Header.sc.tsx | 13 +++++++++++++ src/components/Header/Header.tsx | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/components/Header/Header.sc.tsx b/src/components/Header/Header.sc.tsx index 2f01a4492f..0f06346d23 100644 --- a/src/components/Header/Header.sc.tsx +++ b/src/components/Header/Header.sc.tsx @@ -215,6 +215,14 @@ export const SearchButton = styled(HeaderLink)` props.theme === ETheme.Dark ? brandColors.giv[300] : neutralColors.gray[200]}; + & > div > span { + display: none; + } + ${mediaQueries.desktop} { + & > div > span { + display: inline-block; + } + } `; export const ConnectButton = styled(Button)` @@ -301,3 +309,8 @@ export const UserName = styled(GLink)` overflow: hidden; text-overflow: ellipsis; `; + +export const GLinkNoWrap = styled(GLink)` + text-overflow: ellipsis; + white-space: nowrap; +`; diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index eb463fc86a..c25f8aa0d8 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -23,6 +23,7 @@ import { HeaderLink, HomeButton, SearchButton, + GLinkNoWrap, } from './Header.sc'; import { isUserRegistered } from '@/lib/helpers'; import Routes from '@/lib/constants/Routes'; @@ -222,7 +223,9 @@ const Header: FC<IHeader> = () => { onClick={() => dispatch(setShowSearchModal(true))} > <Flex alignItems='center' gap='16px'> - <GLink size='Big'>Search projects</GLink> + <GLinkNoWrap size='Big'> + Search projects + </GLinkNoWrap> <IconSearch24 /> </Flex> </SearchButton> From 35309cd7f3272eb10300936f5570d680a430cac7 Mon Sep 17 00:00:00 2001 From: Cherik <Pourcheriki@gmail.com> Date: Mon, 27 Feb 2023 15:30:05 +0330 Subject: [PATCH 07/21] update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5fcbed6d8c..a7671f8e20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "givethdapp", - "version": "2.8.2", + "version": "2.8.3", "private": true, "scripts": { "build": "next build", From aacc6c4b0ecc23343959b325d45996e785f951b5 Mon Sep 17 00:00:00 2001 From: Cherik <Pourcheriki@gmail.com> Date: Mon, 27 Feb 2023 15:37:05 +0330 Subject: [PATCH 08/21] fix EXPLORE button --- .../views/homepage/ProjectsCampaignBlock.tsx | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/components/views/homepage/ProjectsCampaignBlock.tsx b/src/components/views/homepage/ProjectsCampaignBlock.tsx index 05c5fc7358..515387ef64 100644 --- a/src/components/views/homepage/ProjectsCampaignBlock.tsx +++ b/src/components/views/homepage/ProjectsCampaignBlock.tsx @@ -1,6 +1,5 @@ import { - brandColors, - ButtonText, + Button, H1, IconChevronRight32, IconPointerLeft, @@ -12,6 +11,7 @@ import { Navigation, Pagination } from 'swiper'; import { Swiper, SwiperSlide } from 'swiper/react'; import { FC, useEffect, useRef, useState } from 'react'; import { Swiper as SwiperClass } from 'swiper/types'; +import Link from 'next/link'; import { ICampaign } from '@/apollo/types/types'; import { Flex, FlexCenter } from '@/components/styled-components/Flex'; import ProjectCard from '@/components/project-card/ProjectCard'; @@ -26,7 +26,6 @@ import { PaginationWrapper, SwiperPaginationWrapper, } from '@/components/styled-components/SwiperPagination'; -import InternalLink from '@/components/InternalLink'; import { campaignLinkGenerator } from '@/helpers/url'; interface IProjectsCampaignBlockProps { @@ -83,14 +82,13 @@ const ProjectsCampaignBlock: FC<IProjectsCampaignBlockProps> = ({ <BottomSection> <Title> <H1 weight={700}>{campaign.title}</H1> - <InternalLink - href={campaignLinkGenerator(campaign) || ''} - color={brandColors.giv[500]} - > - <ExploreText> - EXPLORE <IconChevronRight32 /> - </ExploreText> - </InternalLink> + <Link href={campaignLinkGenerator(campaign) || ''}> + <Button + buttonType='texty-primary' + label='EXPLORE' + icon={<IconChevronRight32 />} + /> + </Link> Date: Mon, 27 Feb 2023 15:48:04 +0330 Subject: [PATCH 09/21] fix Join us on Discord button --- .../impactQuest/ImpactTrackMentorship.tsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/components/views/landings/EthDenver/impactQuest/ImpactTrackMentorship.tsx b/src/components/views/landings/EthDenver/impactQuest/ImpactTrackMentorship.tsx index 5b191017c8..6f446ffac7 100644 --- a/src/components/views/landings/EthDenver/impactQuest/ImpactTrackMentorship.tsx +++ b/src/components/views/landings/EthDenver/impactQuest/ImpactTrackMentorship.tsx @@ -1,14 +1,13 @@ import styled from 'styled-components'; import { + Button, H3, IconChevronRight32, neutralColors, } from '@giveth/ui-design-system'; import ImpactTrackImg from '/public/images/ETHDenver-Impact-mentorship.png'; import Image from 'next/image'; -import { GhostButton } from '@/components/styled-components/Button'; import { Col, Row } from '@/components/Grid'; -import ExternalLink from '@/components/ExternalLink'; import links from '@/lib/constants/links'; const ImpactTrackMentorship = () => { @@ -30,15 +29,20 @@ const ImpactTrackMentorship = () => {
Do you need help with your project for the Impact Track? Reach out to us on the ETHDenver Discord - server under the "Building" section! + server under the "Building" section! - - +