Merge branch 'main' into feat/base

yearn · Dec 17, 2024 · 6c0337f · 6c0337f
2 parents 09bc1a5 + 673317a
commit 6c0337f
Show file tree

Hide file tree

Showing 24 changed files with 346 additions and 177 deletions.
diff --git a/apps/common/CarouselControls.tsx b/apps/common/CarouselControls.tsx
@@ -19,7 +19,7 @@ export function CarouselControls({
 	}
 
 	return (
-		<div className={'hidden w-full justify-center md:flex'}>
+		<div className={'mt-4 hidden w-full justify-center md:flex'}>
 			<div className={'flex gap-x-3'}>
 				{Array(numberOfControls)
 					.fill('')

diff --git a/apps/common/components/AppCard.tsx b/apps/common/components/AppCard.tsx
@@ -14,9 +14,9 @@ export function AppCard(props: TAppCardProps): ReactElement {
 		<>
 			<Link
 				href={props.app.appURI ?? ''}
-				target={'_blank'}
+				target={props.app.appURI.startsWith('/') ? '_self' : '_blank'}
 				className={
-					'group relative hidden h-[240px] min-w-[208px] max-w-[208px] overflow-hidden rounded-lg border border-gray-700/50 bg-gray-900 p-6 hover:bg-gray-600/40 md:block'
+					'group relative hidden min-w-[208px] max-w-[208px] overflow-hidden rounded-lg border border-gray-700/50 bg-gray-900 p-6 hover:bg-gray-600/40 md:block'
 				}>
 				<div className={'mb-4'}>
 					<div
@@ -40,10 +40,11 @@ export function AppCard(props: TAppCardProps): ReactElement {
 				</div>
 				<div className={'mb-1 text-lg font-bold text-white'}>{props.app.name}</div>
 
-				<p className={'max-h-[60px] whitespace-normal text-sm text-gray-400'}>{props.app.description}</p>
+				<p className={'whitespace-normal text-sm text-gray-400'}>{props.app.description}</p>
 			</Link>
 			<Link
 				href={props.app.appURI}
+				target={props.app.appURI.startsWith('/') ? '_self' : '_blank'}
 				className={'flex items-center md:hidden'}>
 				<div>
 					{props.app.logoURI ? (

diff --git a/apps/common/components/AppsCarousel.tsx b/apps/common/components/AppsCarousel.tsx
@@ -13,8 +13,8 @@ export const AppsCarousel = forwardRef(
 		ref: ForwardedRef<HTMLDivElement>
 	): ReactElement => {
 		return (
-			<div className={props.isUsingFeatured ? 'h-[262px]' : 'h-[360px] md:h-[262px]'}>
-				<section className={'absolute left-0 -mx-1 w-full'}>
+			<div>
+				<section className={'left-0 -mx-1 w-full'}>
 					<div
 						className={
 							'pointer-events-none absolute left-0 top-0 z-30 h-[272px] w-1/6 bg-gradient-to-r from-gray-900/0 to-transparent md:h-full'
@@ -29,7 +29,7 @@ export const AppsCarousel = forwardRef(
 						ref={ref}
 						onScroll={props.onScroll}
 						className={cl(
-							'hidden md:flex overflow-x-auto pb-1 pl-[38px] scrollbar-none max-sm:pr-6',
+							'hidden md:flex overflow-x-auto pb-1 pl-1 scrollbar-none max-sm:pr-6',
 							props.isUsingFeatured ? 'gap-x-8' : 'flex-col md:flex-row gap-x-4 overflow-y-hidden'
 						)}>
 						{props.apps?.map((app, i) => {

diff --git a/apps/common/components/FeaturedApp.tsx b/apps/common/components/FeaturedApp.tsx
@@ -9,7 +9,7 @@ export function FeaturedApp(props: {app: TApp}): ReactElement {
 	return (
 		<Link
 			href={props.app.appURI}
-			target={'_blank'}
+			target={props.app.appURI.startsWith('/') ? '_self' : '_blank'}
 			className={cl(
 				'group relative flex cursor-pointer flex-col justify-end px-6 py-10 rounded-lg z-20 overflow-hidden outline outline-1 outline-gray-700/50 h-[272px] min-w-[272px]'
 			)}>

diff --git a/apps/common/icons/IconCommunity.tsx b/apps/common/icons/IconCommunity.tsx
@@ -1,6 +1,6 @@
 import type {ReactElement} from 'react';
 
-export function IconCommunity(props: React.SVGProps<SVGSVGElement>): ReactElement {
+export function IconYearnApps(props: React.SVGProps<SVGSVGElement>): ReactElement {
 	return (
 		<svg
 			{...props}

diff --git a/apps/common/utils/constants.tsx b/apps/common/utils/constants.tsx
@@ -30,13 +30,13 @@ export const VAULTS_APPS: TApp[] = [
 		name: 'Vaults',
 		description: 'The full Yearn experience with all Vaults, for sophisticated users.',
 		logoURI: '/v3.png',
-		appURI: 'https://yearn.fi/v3'
+		appURI: '/v3'
 	},
 	{
 		name: 'Vaults V2',
 		description: "Discover Vaults from Yearn's v2 era.",
 		logoURI: '/v2.png',
-		appURI: 'https://yearn.fi/vaults'
+		appURI: '/vaults'
 	},
 	{
 		name: 'Juiced',
@@ -46,7 +46,7 @@ export const VAULTS_APPS: TApp[] = [
 	}
 ];
 
-export const COMMUNITY_APPS: TApp[] = [
+export const YEARN_APPS: TApp[] = [
 	{
 		name: 'yETH',
 		description: 'A basket of LSTs in a single token.',
@@ -149,18 +149,18 @@ export const INTEGRATIONS_APPS: TApp[] = [
 	},
 	{
 		name: 'Superform',
-		description: 'Earn Yield & Distribute Vaults',
+		description: 'Superform grows your onchain wealth. Earn the best returns on your crypto.',
 		logoURI: 'https://www.superform.xyz/icon.png',
 		appURI: 'https://www.superform.xyz'
 	}
 ];
 
 export const FEATURED_APPS = [
 	{
-		name: 'Juiced',
-		description: 'Discover yields juiced with extra token rewards.',
-		logoURI: '/juiced-featured.jpg',
-		appURI: 'https://juiced.app/'
+		name: 'yCRV',
+		description: "Let Yearn's veCRV position boost your CRV yield, while you chill.",
+		logoURI: '/ycrv-featured.jpg',
+		appURI: 'https://ycrv.yearn.fi/'
 	},
 	{
 		name: 'Gimme',
@@ -175,10 +175,10 @@ export const FEATURED_APPS = [
 		appURI: '/v3'
 	},
 	{
-		name: 'Juiced',
-		description: 'Discover yields juiced with extra token rewards.',
-		logoURI: '/juiced-featured.jpg',
-		appURI: 'https://juiced.app/'
+		name: 'yCRV',
+		description: "Let Yearn's veCRV position boost your CRV yield, while you chill.",
+		logoURI: '/ycrv-featured.jpg',
+		appURI: 'https://ycrv.yearn.fi/'
 	},
 	{
 		name: 'Gimme',
@@ -193,10 +193,10 @@ export const FEATURED_APPS = [
 		appURI: '/v3'
 	},
 	{
-		name: 'Juiced',
-		description: 'Discover yields juiced with extra token rewards.',
-		logoURI: '/juiced-featured.jpg',
-		appURI: 'https://juiced.app/'
+		name: 'yCRV',
+		description: "Let Yearn's veCRV position boost your CRV yield, while you chill.",
+		logoURI: '/ycrv-featured.jpg',
+		appURI: 'https://ycrv.yearn.fi/'
 	},
 	{
 		name: 'Gimme',
@@ -212,7 +212,7 @@ export const FEATURED_APPS = [
 	}
 ];
 
-export const ALL_APPS = [...FEATURED_APPS, ...VAULTS_APPS, ...COMMUNITY_APPS, ...YEARN_X_APPS, ...INTEGRATIONS_APPS];
+export const ALL_APPS = [...FEATURED_APPS, ...VAULTS_APPS, ...YEARN_APPS, ...YEARN_X_APPS, ...INTEGRATIONS_APPS];
 
 export const CATEGORIES_DICT = {
 	'featured-apps': {
@@ -229,12 +229,12 @@ export const CATEGORIES_DICT = {
 		catrgorySlug: 'vaults',
 		apps: VAULTS_APPS
 	},
-	'community-apps': {
-		categoryName: 'Community Apps',
+	'yearn-apps': {
+		categoryName: 'Yearn Apps',
 		categoryDescription:
 			'Yearn is a decentralized suite of products helping individuals, DAOs, and other protocols earn yield on their digital assets.',
-		catrgorySlug: 'community-apps',
-		apps: COMMUNITY_APPS
+		catrgorySlug: 'yearn-apps',
+		apps: YEARN_APPS
 	},
 	'yearn-x': {
 		categoryName: 'Yearn X Projects',
@@ -266,7 +266,7 @@ export const LANDING_SIDEBAR_LINKS = [
 export const MENU_TABS = [
 	{title: 'Home', route: 'apps'},
 	{title: 'Vaults', route: 'vaults'},
-	{title: 'Community Apps', route: 'community-apps'},
+	{title: 'Yearn Apps', route: 'yearn-apps'},
 	{title: 'Yearn X Projects', route: 'yearn-x'},
 	{title: 'Integrations', route: 'integrations'}
 	// {title: 'About', route: 'about'}
@@ -283,7 +283,7 @@ export const iconsDict = {
 	apps: <IconYearn />,
 	about: <IconAbout />,
 	vaults: <IconVaults />,
-	'community-apps': <IconFrontends />,
+	'yearn-apps': <IconFrontends />,
 	'yearn-x': <IconYearnXApps />,
 	integrations: <IconIntegrations />
 };
diff --git a/apps/landing/components/sections/About.tsx b/apps/landing/components/sections/About.tsx
@@ -13,7 +13,7 @@ export function About(): ReactElement {
 				backgroundPosition: 'center'
 			}}>
 			<div className={'relative lg:mr-[400px]'}>
-				<p className={'mb-10 text-left font-aeonikFono text-3xl font-light text-white md:text-5xl'}>
+				<p className={'font-aeonikFono mb-10 text-left text-3xl font-light text-white md:text-5xl'}>
 					{'WTF IS A YEARN VAULT?'}
 				</p>
 				<div
@@ -33,7 +33,9 @@ export function About(): ReactElement {
 					<div className={cl('text-gray-400')}>
 						<p>{'Yearn Vaults are like crypto savings accounts floating in cyberspace. You deposit'}</p>{' '}
 						<p className={cl('text-gray-400')}>
-							{'your assets, andYearn puts them to work within the DeFi ecosystem, returning the earned '}
+							{
+								'your assets, and Yearn puts them to work within the DeFi ecosystem, returning the earned '
+							}
 							{'yield back to you.'}
 						</p>
 					</div>
@@ -49,7 +51,7 @@ export function About(): ReactElement {
 				</div>
 				{isReadMore ? null : (
 					<button
-						className={'mt-6 text-lg font-light text-primary md:hidden'}
+						className={'text-primary mt-6 text-lg font-light md:hidden'}
 						onClick={() => set_isReadMore(true)}>
 						{'Read more'}
 					</button>

diff --git a/apps/landing/components/sections/WaysToEarn.tsx b/apps/landing/components/sections/WaysToEarn.tsx
@@ -76,11 +76,11 @@ export function WaysToEarn(): ReactElement {
 				</Link>
 				<div className={'col-span-12 row-span-3 md:col-span-5 md:row-span-6'}>
 					<EarnCard
-						title={'COMMUNITY APPS.'}
+						title={'YEARN APPS.'}
 						info={'Apps built on Yearn vaults by contributors and the wider community!'}
-						logoSrc={'/landing/community-logo.png'}
-						href={'/apps/community-apps'}
-						hoverLogoSrc={'/landing/community-hover.png'}
+						logoSrc={'/landing/yearn-apps-logo.png'}
+						href={'/apps/yearn-apps'}
+						hoverLogoSrc={'/landing/yearn-apps-hover.png'}
 					/>
 				</div>
 				<div className={'col-span-12 row-span-3 md:col-span-5 md:row-span-6'}>