Merge pull request #2268 from Giveth/hotfix-2.8.2

Hotfix 2.8.2
Giveth · Feb 26, 2023 · 2ddb47c · 2ddb47c · vercel · Feb 26, 2023
2 parents 4e46351 + 9a7f49f
commit 2ddb47c
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 68 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -903,7 +903,7 @@
 	"label.join_our_discord": "join our discord",
 	"label.explore_the_giveconomy": "explore the giveconomy",
 	"label.what_is_giveth": "What is Giveth?",
-	"label.what_people_say": "What people say about the Giveth and why they love it.",
+	"label.discover_what_makes_giveth_different": "Discover what makes Giveth different from other donation platforms",
 	"label.the_first_step_to_empowering": "The first step to empowering donors on Giveth. ",
 	"label.donate_to_verified_projects_and_get_giv": "Donate to verified projects and get GIV - a token that grants you access to our community as a voting member, as well as opportunities to earn additional rewards.",
 	"label.learn_more_about_giv": "Learn more about GIV",

diff --git a/lang/es.json b/lang/es.json
@@ -900,7 +900,7 @@
 	"label.join_our_discord": "",
 	"label.explore_the_giveconomy": "",
 	"label.what_is_giveth": "",
-	"label.what_people_say": "",
+	"label.discover_what_makes_giveth_different": "",
 	"label.the_first_step_to_empowering": "",
 	"label.donate_to_verified_projects_and_get_giv": "",
 	"label.learn_more_about_giv": "",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.8.1",
+	"version": "2.8.2",
 	"private": true,
 	"scripts": {
 		"build": "next build",

diff --git a/src/components/views/homepage/HomeIndex.tsx b/src/components/views/homepage/HomeIndex.tsx
@@ -44,7 +44,7 @@ const HomeIndex: FC<IHomeRoute> = props => {
 			<HomePartners />
 			<Separator />
 			{newCampaigns && newCampaigns.length > 0 ? (
-				<CampaignsBlock campaigns={campaigns} />
+				<CampaignsBlock campaigns={newCampaigns} />
 			) : (
 				''
 			)}

diff --git a/src/components/views/homepage/InformationBlock.tsx b/src/components/views/homepage/InformationBlock.tsx
@@ -94,6 +94,7 @@ const QuarterCircle = styled.div`
 
 const SpanStyled = styled.span`
 	color: ${neutralColors.gray[900]};
+	font-weight: bold;
 `;
 
 const StyledContainer = styled(Container)`

diff --git a/src/components/views/homepage/videoBlock/index.tsx b/src/components/views/homepage/videoBlock/index.tsx
@@ -53,7 +53,9 @@ const VideoBlock = () => {
 							{formatMessage({ id: 'label.what_is_giveth' })}
 						</H2>
 						<Desc>
-							{formatMessage({ id: 'label.what_people_say' })}
+							{formatMessage({
+								id: 'label.discover_what_makes_giveth_different',
+							})}
 						</Desc>
 						<Link href={Routes.AboutUs} passHref>
 							<AboutUsButton

diff --git a/src/components/views/homepage/whyGiveth/index.tsx b/src/components/views/homepage/whyGiveth/index.tsx
@@ -1,7 +1,6 @@
 import {
 	B,
 	brandColors,
-	H3,
 	mediaQueries,
 	neutralColors,
 } from '@giveth/ui-design-system';
@@ -63,7 +62,6 @@ const WhyGiveth: FC<IWhyGivethProps> = props => {
 	return (
 		<Relative>
 			<GivethStats>
-				<Title weight={700}>WAGMI 🤘💜</Title>
 				<Stats>
 					{statsArray.map(i => (
 						<StatsCard
@@ -258,10 +256,6 @@ const Stats = styled(Flex)`
 	}
 `;
 
-const Title = styled(H3)`
-	color: ${brandColors.giv[600]};
-`;
-
 const GivethStats = styled.div`
 	position: relative;
 	padding: 40px 40px 0;

diff --git a/src/components/views/landings/EthDenver/GivethSwag.tsx b/src/components/views/landings/EthDenver/GivethSwag.tsx
@@ -8,35 +8,39 @@ import {
 import SwagImg from '/public/images/swag.png';
 import Image from 'next/image';
 import { GhostButton } from '@/components/styled-components/Button';
-import { Col, Row } from '@/components/Grid';
+import { Col, Container, Row } from '@/components/Grid';
 import ExternalLink from '@/components/ExternalLink';
 import links from '@/lib/constants/links';
 
 const GivethSwag = () => {
 	return (
 		<Wrapper>
-			<Col xs={12} md={6}>
-				<Text>
-					<H3 weight={700}>Giveth Swag</H3>
-					<Desc size='large'>
-						Want to get your hands on the latest Giveth swag? Swing
-						by our booth, and we’ll let you know how to take part in
-						our Impact Quests to claim cool prizes. Or if you
-						prefer, order yours now from our new and improved swag
-						shop.
-					</Desc>
-					<ExternalLink href={links.SWAG}>
-						<GhostButton
-							label='Go to Swag shop'
-							size='large'
-							icon={<IconExternalLink24 />}
-						/>
-					</ExternalLink>
-				</Text>
-			</Col>
-			<Col xs={12} md={6}>
-				<Img src={SwagImg} alt='Swag Image' />
-			</Col>
+			<Container>
+				<Row>
+					<Col xs={12} md={6}>
+						<Text>
+							<H3 weight={700}>Giveth Swag</H3>
+							<Desc size='large'>
+								Want to get your hands on the latest Giveth
+								swag? Swing by our booth, and we’ll let you know
+								how to take part in our Impact Quests to claim
+								cool prizes. Or if you prefer, order yours now
+								from our new and improved swag shop.
+							</Desc>
+							<ExternalLink href={links.SWAG}>
+								<GhostButton
+									label='Go to Swag shop'
+									size='large'
+									icon={<IconExternalLink24 />}
+								/>
+							</ExternalLink>
+						</Text>
+					</Col>
+					<Col xs={12} md={6}>
+						<Img src={SwagImg} alt='Swag Image' />
+					</Col>
+				</Row>
+			</Container>
 		</Wrapper>
 	);
 };
@@ -53,7 +57,7 @@ const Desc = styled(Lead)`
 	margin: 47px 0 31px;
 `;
 
-const Wrapper = styled(Row)`
+const Wrapper = styled.div`
 	color: ${neutralColors.gray[900]};
 	border-radius: 16px;
 	background: ${neutralColors.gray[200]};

diff --git a/src/components/views/landings/EthDenver/givethTalks/CalendarItem.tsx b/src/components/views/landings/EthDenver/givethTalks/CalendarItem.tsx
@@ -19,10 +19,11 @@ interface IProps {
 	date: string;
 	time: string;
 	link: string;
+	calendarLink: string;
 }
 
 const CalendarItem: FC<IProps> = props => {
-	const { title, lecturer, date, time, link } = props;
+	const { title, lecturer, date, time, link, calendarLink } = props;
 	return (
 		<Wrapper>
 			<H5 weight={700}>{title}</H5>
@@ -42,12 +43,14 @@ const CalendarItem: FC<IProps> = props => {
 						icon={<IconExternalLink24 />}
 					/>
 				</ExternalLink>
-				<GhostButton
-					label='Add to calendar'
-					size='large'
-					color={neutralColors.gray[700]}
-					icon={<Image src={CalendarGray} alt='Calendar black' />}
-				/>
+				<a href={calendarLink} target='_blank' rel='noreferrer'>
+					<GhostButton
+						label='Add to calendar'
+						size='large'
+						color={neutralColors.gray[700]}
+						icon={<Image src={CalendarGray} alt='Calendar black' />}
+					/>
+				</a>
 			</Buttons>
 		</Wrapper>
 	);

diff --git a/src/components/views/landings/EthDenver/givethTalks/index.tsx b/src/components/views/landings/EthDenver/givethTalks/index.tsx
@@ -11,6 +11,7 @@ import CalendarWhite from '/public/images/calendar-white.svg';
 import Image from 'next/image';
 import CalendarItem from '@/components/views/landings/EthDenver/givethTalks/CalendarItem';
 import { Col, Container, Row } from '@/components/Grid';
+import { Flex } from '@/components/styled-components/Flex';
 
 const GivethTalks = () => {
 	return (
@@ -25,39 +26,65 @@ const GivethTalks = () => {
 						the Future of Giving, check out these upcoming
 						presentations at ETH Denver!
 					</Lead>
-					<ButtonStyled
-						label='Add all to calendar'
-						icon={
-							<Image src={CalendarWhite} alt='Calendar black' />
-						}
-						size='small'
-					/>
+					<a
+						href='https://calendar.google.com/calendar/u/0?cid=Z2l2ZXRoZXRoZGVudmVyQGdtYWlsLmNvbQ'
+						target='_blank'
+						rel='noreferrer'
+					>
+						<ButtonStyled
+							label='Add all to calendar'
+							icon={
+								<Image
+									src={CalendarWhite}
+									alt='Calendar black'
+								/>
+							}
+							size='small'
+						/>
+					</a>
 				</Talks>
 				<Calendar xs={12} md={6} xl={8}>
-					<CalendarItem
-						title='Combating the Metacrisis'
-						lecturer='Griff Green'
-						date='Mar 03, 2023'
-						time='13:00 - 13:15 MST'
-						link='https://events.ethdenver.com/eden23/attendease/networking/experience/9dfae4fa-a017-47bb-837c-e2b7b8da8468/af96b57b-a734-45c0-918f-f32bb030cbcc'
-					/>
-					<CalendarItem
-						title='Why DAOs will change the world'
-						lecturer='Lauren Luz'
-						date='Mar 04, 2023'
-						time='10:20 - 10:40 MST'
-						link='https://events.ethdenver.com/eden23/attendease/networking/experience/3185f05e-1283-47c4-b1cd-c456c3b6af3a/dd50c09c-f707-4389-a60a-75c2d37c2aa5'
-					/>
+					<Flex flexDirection='column' gap='40px'>
+						<CalendarItem
+							title='DAO it like you mean it'
+							lecturer='Lauren Luz'
+							date='Feb 28, 2023'
+							time='2:05 - 2:45pm MST'
+							link='https://events.ethdenver.com/eden23/attendease/networking/experience/bf427728-b151-4edf-ab90-f501a3d84970/212d0aa6-f013-45af-8b31-f98155087c88'
+							calendarLink='https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=NzNwdHI2ZmNrMHI5ZW8xc25rODUzdDhkMTUgZ2l2ZXRoZXRoZGVudmVyQG0&tmsrc=givethethdenver%40gmail.com'
+						/>
+						<CalendarItem
+							title='Dissecting Sustainable DAO Governance and Effective Operations'
+							lecturer='Griff Green'
+							date='Feb 28, 2023'
+							time='3:40PM MST'
+							link='https://events.ethdenver.com/eden23/attendease/networking/experience/bf427728-b151-4edf-ab90-f501a3d84970/212d0aa6-f013-45af-8b31-f98155087c88'
+							calendarLink='https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=NzBlNG85YTUyMGFucTI3c3M2MjBmM2YxMjUgZ2l2ZXRoZXRoZGVudmVyQG0&tmsrc=givethethdenver%40gmail.com'
+						/>
+						<CalendarItem
+							title='Why DAOs will change the world'
+							lecturer='Lauren Luz'
+							date='Mar 04, 2023'
+							time='10:20 - 10:40 MST'
+							link='https://events.ethdenver.com/eden23/attendease/networking/experience/3185f05e-1283-47c4-b1cd-c456c3b6af3a/dd50c09c-f707-4389-a60a-75c2d37c2aa5'
+							calendarLink='https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=MjAwN3Nwc2dvbGhuNWh2N3B1cjdiZDg5c24gZ2l2ZXRoZXRoZGVudmVyQG0&tmsrc=givethethdenver%40gmail.com'
+						/>
+						<CalendarItem
+							title='Combating the Metacrisis'
+							lecturer='Griff Green'
+							date='Mar 03, 2023'
+							time='13:00 - 13:15 MST'
+							link='https://events.ethdenver.com/eden23/attendease/networking/experience/9dfae4fa-a017-47bb-837c-e2b7b8da8468/af96b57b-a734-45c0-918f-f32bb030cbcc'
+							calendarLink='https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=MGYxZ25uNWJjc25qdmVpdWFzMHQxNmk0YnIgZ2l2ZXRoZXRoZGVudmVyQG0&tmsrc=givethethdenver%40gmail.com'
+						/>
+					</Flex>
 				</Calendar>
 			</Row>
 		</Wrapper>
 	);
 };
 
 const Calendar = styled(Col)`
-	> :first-of-type {
-		margin-bottom: 40px;
-	}
 	${mediaQueries.laptopS} {
 		padding-left: 60px;
 	}

diff --git a/src/components/views/landings/EthDenver/impactQuest/ImpactDenver.tsx b/src/components/views/landings/EthDenver/impactQuest/ImpactDenver.tsx
@@ -28,14 +28,12 @@ const ImpactDenver: FC<IImpactDenver> = props => {
 				},
 				fetchPolicy: 'no-cache',
 			});
-			console.log('data.findCampaignBySlug', data.findCampaignBySlug);
 			if (data.findCampaignBySlug) {
 				setCampaign(data.findCampaignBySlug);
 			}
 		};
 		getCampaign();
 	}, [user?.id]);
-	console.log('campaign', campaign);
 
 	return (
 		<Wrapper>