Skip to content

Commit

Permalink
Merge pull request #171 from ethersphere/staging
Browse files Browse the repository at this point in the history
change category order
  • Loading branch information
GasperX93 authored Nov 27, 2024
2 parents fb9b0fd + 9df2379 commit de1ee5a
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 28 deletions.
8 changes: 6 additions & 2 deletions components/common/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { CtaType } from "types";
import { ButtonGroup, SectionContent, Tagline } from ".";
import { cx } from "utils";
import { InfoIcon } from "@/icons/components";

type HeaderProps = {
tagline?: string;
title: string;
id?: string;
content?: string;
ctas?: Array<CtaType>;
size?: "small" | "medium" | "medium-large" | "large";
size?: "small" | "medium" | "medium-large" | "large" | "dynamic";
className?: string;
};

Expand Down Expand Up @@ -37,6 +36,8 @@ const Header: React.FC<HeaderProps> = ({
"text-[48px] leading-[49px] md:text-[64px] md:leading-[1.2] tracking-[-1%]",
large:
"text-[56px] leading-[64px] md:text-[88px] md:leading-[97px] tracking-[-0.88px]",
dynamic:
"text-[13vw] leading-[1.14] md:text-[88px] md:leading-[97px] tracking-[-0.88px]",
}[size]
)}
dangerouslySetInnerHTML={{ __html: title }}
Expand All @@ -52,6 +53,8 @@ const Header: React.FC<HeaderProps> = ({
"medium-large": "md:text-[17px] md:leading-[24px] mt-4 md:mr-8",
large:
"text-base md:text-[19px] md:leading-[26px] mt-8 md:mt-6 md:mr-[72px]",
dynamic:
"text-base md:text-[19px] md:leading-[26px] mt-8 md:mt-6 md:mr-[72px]",
}[size]
)}
content={content}
Expand All @@ -67,6 +70,7 @@ const Header: React.FC<HeaderProps> = ({
medium: "mt-6",
"medium-large": "mt-8",
large: " mt-8",
dynamic: " mt-8",
}[size]
)}
/>
Expand Down
4 changes: 2 additions & 2 deletions components/sections/DevelopSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ const DevelopSection: React.FC<DevelopSectionProps> = ({
tabs,
}) => {
return (
<section className="relative overflow-hidden text-[#F6F7F9]">
<Container className="mt-48 mb-20 ">
<section className="relative overflow-hidden text-[#F6F7F9] mb-48">
<Container className="mb-20 ">
<GridContainer>
<Header
tagline={tagline}
Expand Down
2 changes: 1 addition & 1 deletion components/sections/LandingHero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const LandingHero: React.FC<LandingHero> = ({ title, content = "", ctas }) => {
title={title}
content={content}
ctas={ctas}
size="large"
size="dynamic"
className="col-span-12 texwt-gray-100 lg:col-span-7"
/>
</GridContainer>
Expand Down
39 changes: 23 additions & 16 deletions data/pages/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,10 @@
}
]
},
"odyssey": {
"title": "Odyssey Data Upload",
"tagline": "Sustainable Development Goals",
"content": "The Swarm Foundation aims to empower non-profits to store their data securely and censorship-resistant. Swarm will subsidise data uploads from selected projects to incentivise public goods and advance the Sustainable Development Goals.",
"ctas": [
{
"href": "https://my.ethswarm.org/uploads",
"background": "purple",
"color": "black",
"title": "Apply ->"
}
]
},
"develop": {
"tagline": "Real-world ready",
"title": "Develop fast and free",
"content": "Swarm provides a complete stack of essential base layer components for developers. Build and host dApps, NFT meta-data, and media files, all within a decentralised framework!",
"tagline": "Embrace decentralisation",
"title": "Build with freedom, scale without limits",
"content": "Swarm delivers a powerful base-layer stack tailored for forward-thinking users. Privacy-focused and cypherpunk-inspired, it's the decentralised framework for the next generation of creators and advocates.",
"ctas": [
{
"href": "/build",
Expand All @@ -100,6 +87,13 @@
"color": "black",
"arrow": true,
"title": "Desktop app ->"
},
{
"href": "/get-bzz",
"background": "transparent",
"color": "black",
"arrow": true,
"title": "Get BZZ ->"
}
],
"tabs": [
Expand Down Expand Up @@ -158,6 +152,19 @@
],
"code": "Bee API"
}
]
},
"odyssey": {
"title": "Odyssey Data Upload",
"tagline": "Sustainable Development Goals",
"content": "The Swarm Foundation aims to empower non-profits to store their data securely and censorship-resistant. Swarm will subsidise data uploads from selected projects to incentivise public goods and advance the Sustainable Development Goals.",
"ctas": [
{
"href": "https://my.ethswarm.org/uploads",
"background": "purple",
"color": "black",
"title": "Apply ->"
}
]
},
"fairdata": {
Expand Down
14 changes: 7 additions & 7 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@ const Home: NextPage = (props: any) => {

<GeneralSection content={content.unstoppable} />

<Odyssey
title={content.odyssey.title}
content={content.odyssey.content}
ctas={content.odyssey.ctas as Array<CtaType>}
tagline={content.odyssey.tagline}
/>

<DevelopSection
tagline={content.develop.tagline}
title={content.develop.title}
Expand All @@ -52,6 +45,13 @@ const Home: NextPage = (props: any) => {
tabs={content.develop.tabs as Array<TabType>}
/>

<Odyssey
title={content.odyssey.title}
content={content.odyssey.content}
ctas={content.odyssey.ctas as Array<CtaType>}
tagline={content.odyssey.tagline}
/>

<GeneralSection content={content.news.content} />

<GeneralSection
Expand Down

0 comments on commit de1ee5a

Please sign in to comment.