Merge remote-tracking branch 'origin/main' into dev

celestiaorg · Feb 16, 2024 · d8aeda6 · d8aeda6
2 parents a9d6989 + 4f457d2
commit d8aeda6
Show file tree

Hide file tree

Showing 22 changed files with 1,270 additions and 3 deletions.
diff --git a/src/components/ecosystem.js b/src/components/ecosystem.js
@@ -1,6 +1,7 @@
 import React from "react";
 import Image from "./imageComponent";
 
+<<<<<<< HEAD
 export default class Ecosystem extends React.Component {
 	render() {
 		return (
@@ -17,3 +18,30 @@ export default class Ecosystem extends React.Component {
 		);
 	}
 }
+=======
+const Ecosystem = ({ ecosystem }) => {
+	console.log(ecosystem);
+	return (
+		<a href={ecosystem.url} target={"_blank"} rel={"noreferrer"} aria-label={ecosystem.title}>
+			<div className={"ecosystem d-flex flex-column"}>
+				<div className={"logo-container"}>
+					<Image alt={ecosystem.title} filename={ecosystem.image} />
+				</div>
+				{ecosystem.title && <div className={"title"}>{ecosystem.title}</div>}
+				<div className='category-container'>
+					{ecosystem.categories.map((category) => (
+						<div className={"category"}>{category}</div>
+					))}
+				</div>
+				{ecosystem.description && (
+					<div className='description'>
+						{ecosystem.description.length > 250 ? `${ecosystem.description.substring(0, 250)}...` : ecosystem.description}
+					</div>
+				)}
+			</div>
+		</a>
+	);
+};
+
+export default Ecosystem;
+>>>>>>> origin/main
diff --git a/src/components/footer-box-2.js b/src/components/footer-box-2.js
@@ -15,8 +15,15 @@ function FooterBox2({ footerBoxes2 }) {
 								<div className={"footer-box-inner"}>
 									{/* <div className={"bg"} /> */}
 									<div className={"inner"}>
+<<<<<<< HEAD
 										<div className={"title"}>{box.title}</div>
 										<div className={"text"}>{box.text}</div>
+=======
+										<div>
+											<div className={"title"}>{box.title}</div>
+											<div className={"text"}>{box.text}</div>
+										</div>
+>>>>>>> origin/main
 										<div className={"footer-box-inner-bottom"}>
 											<div className='link-wrapper'>
 												{box.link.type === "internal" ? (

diff --git a/src/components/header.js b/src/components/header.js
@@ -87,12 +87,17 @@ const Header = () => {
 
 	useEffect(() => {
 		const toggleHeaderClass = () => {
+<<<<<<< HEAD
 			if (window.scrollY > 130) {
+=======
+			if (window.scrollY > 80) {
+>>>>>>> origin/main
 				setIsBlur(true);
 			} else if (window.scrollY < 80) {
 				setIsBlur(false);
 			}
 		};
+<<<<<<< HEAD
 
 		window.addEventListener("scroll", toggleHeaderClass);
 		toggleHeaderClass();
@@ -200,4 +205,112 @@ const Header = () => {
 	);
 };
 
+=======
+		window.addEventListener("scroll", toggleHeaderClass);
+		toggleHeaderClass();
+
+		return () => {
+			window.removeEventListener("scroll", toggleHeaderClass);
+		};
+	}, []);
+
+	const toggleMenu = () => {
+		setIsMenuOpen(!isMenuOpen);
+	};
+
+	return (
+		<>
+			<header id={"header"} className={`${isBlur ? "blur" : ""} ${isMenuOpen ? "menu-opened" : ""}`}>
+				<div className={"blurry"} />
+				<div className={"container"}>
+					<button
+						id={"hamburger"}
+						className={`hamburger hamburger--slider ${isMenuOpen ? "is-active" : ""}`}
+						type='button'
+						onClick={toggleMenu}
+						aria-label='Menu Toggle'
+					>
+						<span className='hamburger-box'>
+							<span className='hamburger-inner' />
+						</span>
+					</button>
+					<div className={"logo"}>
+						<Link to='/'>
+							<img src={logo} alt='Celestia' />
+						</Link>
+					</div>
+					<nav>
+						<ul>
+							{navigation.map((link, index) => (
+								<li key={index}>
+									{link.submenus ? (
+										<div className={"hasSubmenu"}>
+											{link.text} <i className={"icon-dropdown"} />
+										</div>
+									) : link.type === "external" ? (
+										<a href={link.url} target={"_blank"} rel={"noreferrer"}>
+											{link.text}
+										</a>
+									) : (
+										<Link to={`${link.url}`} activeClassName='active' aria-label={link.text}>
+											{link.text} {link.submenus && <i className={"icon-dropdown"} />}
+										</Link>
+									)}
+									{link.submenus && (
+										<div className={"submenu"}>
+											<ul>
+												{link.submenus.map((submenu, index) => (
+													<li key={index}>
+														{submenu.type === "external" ? (
+															<a
+																href={submenu.url}
+																target={"_blank"}
+																rel='noreferrer'
+																className={submenu.class}
+																aria-label={submenu.text}
+															>
+																<div className={"row d-table w-100"}>
+																	<div className={"col-2 align-middle d-table-cell"}>
+																		<div className={"icon"}>
+																			<Image alt={submenu.text} filename={submenu.icon} />
+																		</div>
+																	</div>
+																	<div className={"col-10 align-middle d-table-cell"}>
+																		<div className={"subtitle"}>{submenu.subtext}</div>
+																		<div className={"title"}>{submenu.text}</div>
+																	</div>
+																</div>
+															</a>
+														) : (
+															<Link to={submenu.url} className={submenu.class}>
+																<div className={"row d-table w-100"}>
+																	<div className={"col-2 align-middle d-table-cell"}>
+																		<div className={"icon"}>
+																			<Image alt={submenu.text} filename={submenu.icon} />
+																		</div>
+																	</div>
+																	<div className={"col-10 align-middle d-table-cell"}>
+																		<div className={"subtitle"}>{submenu.subtext}</div>
+																		<div className={"title"}>{submenu.text}</div>
+																	</div>
+																</div>
+															</Link>
+														)}
+													</li>
+												))}
+											</ul>
+										</div>
+									)}
+								</li>
+							))}
+						</ul>
+					</nav>
+					<div className={"clear"} />
+				</div>
+			</header>
+		</>
+	);
+};
+
+>>>>>>> origin/main
 export default Header;
diff --git a/src/components/sections/two-column-h2.js b/src/components/sections/two-column-h2.js
@@ -42,16 +42,25 @@ const TwoColumnH2 = ({
 			<div className={"row align-items-center"}>
 
 				<div className={`col col-12 col-lg-6 anim-col ${animVersion === 2 && 'px-2'} ${direction === "rtl" ? "order-lg-2" : "order-lg-1"}`}>
+<<<<<<< HEAD
 					{anim && <Lottie lottieRef={lottieRef} animationData={anim} loop={false} autoplay={false}
 									 renderer={"canvas"} style={{width: animVersion === 2 ? 680 : 700, height: animVersion ? 450 : 450}}
+=======
+					{anim && <Lottie className={`lottie-anim-${animVersion}`} lottieRef={lottieRef} animationData={anim} loop={false} autoplay={false}
+									 renderer={"canvas"}
+>>>>>>> origin/main
 					/>}
 					{!anim && <Image alt={title} filename={image} />}
 				</div>
 				<div className={`d-table-cell align-middle col col-12 col-lg-6 ${direction === "rtl" ? "order-lg-1" : "order-lg-2"}`}>
 					<div className={"text"}>
 						<h2 className={"with-decor mt-4 mt-lg-0"}>{title}</h2>
 						<div className='paragraph' dangerouslySetInnerHTML={{ __html: text }} />
+<<<<<<< HEAD
 						<div className={'position-absolute'} style={{marginTop:'25vh'}} ref={myRef}/>
+=======
+						<div className={'lottie-anchor'} ref={myRef}/>
+>>>>>>> origin/main
 						<div className={"flex mt-4"}>
 							<Link to={buttonPrimaryUrl} className={`button button-simple me-4 ${buttonPrimaryClass}`}>
 								{buttonPrimaryTitle}

diff --git a/src/datas/build/get-started.js b/src/datas/build/get-started.js
@@ -15,7 +15,11 @@ export const getStarted = {
 		{
 			id: 2,
 			title: "Integrate",
+<<<<<<< HEAD
 			text: "Plug Celestia into your existing chain..",
+=======
+			text: "Plug Celestia into your existing chain.",
+>>>>>>> origin/main
 			// image: "build/concepts.png",
 			type: "anchor",
 			link: {

diff --git a/src/datas/build/seoContent.js b/src/datas/build/seoContent.js
@@ -2,5 +2,9 @@ export const seoContent = {
 	title: "Developer Portal | celestia.org",
 	ogTitle: "Developer Portal | celestia.org",
 	description: "The homepage for Celestia developers. Tutorials. Resources. Community.",
+<<<<<<< HEAD
 	image: "/build-og-image.jpg",
+=======
+	image: "/developer-portal-og-image.jpg",
+>>>>>>> origin/main
 };
diff --git a/src/datas/ecosystem/content.js b/src/datas/ecosystem/content.js
@@ -1,4 +1,5 @@
 export const FooterBoxes = [
+<<<<<<< HEAD
     {
         title: 'Join our growing ecosystem',
         text: 'View job openings and career opportunities in our ecosystem.',
@@ -18,4 +19,27 @@ export const FooterBoxes = [
             type: 'simple'
         }
     }
-]
+]
+=======
+	{
+		title: "Join our growing ecosystem",
+		text: "View job openings and career opportunities in our ecosystem.",
+		button: {
+			text: "Current openings",
+			href: "https://celestia.pallet.com/jobs/",
+			id: "operator",
+			type: "simple",
+		},
+	},
+	{
+		title: "Build on testnet",
+		text: "Join a growing modular ecosystem of developers building on testnet.",
+		button: {
+			text: "Get started",
+			href: "https://docs.celestia.org/",
+			id: "operator",
+			type: "simple",
+		},
+	},
+];
+>>>>>>> origin/main