diff --git a/site/src/components/common/Footer/Footer.tsx b/site/src/components/common/Footer/Footer.tsx index 0cec5b62..2f5f0ed0 100644 --- a/site/src/components/common/Footer/Footer.tsx +++ b/site/src/components/common/Footer/Footer.tsx @@ -59,6 +59,19 @@ function Footer({ className }: InferProps) {
+ {stub.corporate.map((el) => ( +
+
{el.title}
+
+ {el.icons.map((item) => ( + + ))} +
+
+ ))} +
+ + {/*
{stub.address.title}
{stub.address.places.map((el) => ( @@ -67,7 +80,7 @@ function Footer({ className }: InferProps) {
))}
- + */}
diff --git a/site/src/components/common/Footer/stub.ts b/site/src/components/common/Footer/stub.ts index ea78bde8..e1742fec 100644 --- a/site/src/components/common/Footer/stub.ts +++ b/site/src/components/common/Footer/stub.ts @@ -2,20 +2,20 @@ import { socialLinks } from 'constants/socials' export const stub = { list: [ - { - title: 'Products', - links: [ - { name: '=nil;', link: '/' }, - { name: 'Proof Market ', link: '/proof-market' }, - { name: 'zkLLVM Compiler', link: '/zkLLVM' }, - ], - }, + // { + // title: 'Products', + // links: [ + // { name: '=nil;', link: '/' }, + // { name: 'Proof Market ', link: '/proof-market' }, + // { name: 'zkLLVM Compiler', link: '/zkLLVM' }, + // ], + // }, { title: 'Navigation', links: [ { name: 'Blog', link: '/blog' }, { name: 'Careers', link: '/careers' }, - { name: 'Research', link: '/research' }, + // { name: 'Research', link: '/research' }, { name: 'Documentation', link: 'https://docs.nil.foundation/', @@ -36,6 +36,19 @@ export const stub = { { icon: 'dev-portal', link: socialLinks.devPortal }, ], }, + // { + // title: 'Corporate', + // icons: [ + // { + // icon: 'linkedin', + // link: socialLinks.linkedin, + // }, + // { icon: 'twitter', link: socialLinks.twitter }, + // ], + // }, + ], + + corporate: [ { title: 'Corporate', icons: [ diff --git a/site/src/components/common/Header/Header.tsx b/site/src/components/common/Header/Header.tsx index 5848aad0..3cda85bc 100644 --- a/site/src/components/common/Header/Header.tsx +++ b/site/src/components/common/Header/Header.tsx @@ -59,7 +59,7 @@ function Header({ className, config }: HeaderProps) {
- {realLinks.main.map((el) => ( + {/* {realLinks.main.map((el) => ( - ))} + ))} */}
{realLinks.other.map((el) => ( diff --git a/site/src/components/common/Header/stub.ts b/site/src/components/common/Header/stub.ts index b569279c..cb6de5ef 100644 --- a/site/src/components/common/Header/stub.ts +++ b/site/src/components/common/Header/stub.ts @@ -1,8 +1,8 @@ export const links = { main: [ { name: '=nil;', link: '/' }, - { name: 'Proof Market ', link: '/proof-market' }, - { name: 'zkLLVM Compiler', link: '/zkLLVM' }, + // { name: 'Proof Market ', link: '/proof-market' }, + // { name: 'zkLLVM Compiler', link: '/zkLLVM' }, ], other: [ { name: 'Blog', link: '/blog' }, @@ -10,7 +10,7 @@ export const links = { name: 'Documentation', link: 'https://docs.nil.foundation/', }, - { name: 'Research', link: '/research' }, + // { name: 'Research', link: '/research' }, { name: 'About', link: '/about' }, { name: 'Careers', link: '/careers' }, ], diff --git a/site/src/components/common/Icon/icons/DevPortal.tsx b/site/src/components/common/Icon/icons/DevPortal.tsx index d4fe39de..5fbf22e2 100644 --- a/site/src/components/common/Icon/icons/DevPortal.tsx +++ b/site/src/components/common/Icon/icons/DevPortal.tsx @@ -1,12 +1,16 @@ import { memo } from 'react' import { SvgIconComponent } from '../SvgIconComponent' +import { PRIMITIVE_COLORS } from '@nilfoundation/ui-kit' const DevPortal: SvgIconComponent = ({ className }) => ( - - + + + + + + + + ) diff --git a/site/src/components/common/JoinSection/JoinSection.module.scss b/site/src/components/common/JoinSection/JoinSection.module.scss index 03fd7f40..175d4e14 100644 --- a/site/src/components/common/JoinSection/JoinSection.module.scss +++ b/site/src/components/common/JoinSection/JoinSection.module.scss @@ -139,3 +139,7 @@ margin-top: size(3); } } + +.devnet { + padding-left: 0.5ch; +} diff --git a/site/src/components/common/JoinSection/JoinSection.tsx b/site/src/components/common/JoinSection/JoinSection.tsx index 7526561b..dc26cb67 100644 --- a/site/src/components/common/JoinSection/JoinSection.tsx +++ b/site/src/components/common/JoinSection/JoinSection.tsx @@ -5,8 +5,12 @@ import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import s from './JoinSection.module.scss' import { Column } from 'components/Column' +import { useViewport } from 'hooks/useViewport' +import Button from 'components/Button' function JoinSection({ title, leftText, rightText, social, className }: InferProps) { + const { isMobile } = useViewport() + return (
@@ -16,12 +20,19 @@ function JoinSection({ title, leftText, rightText, social, className }: InferPro
-

{leftText}

+

+ {leftText} + +

+ {!isMobile &&
}
-

{rightText}

+ {/*

{rightText}

*/} +
{/* */}
diff --git a/site/src/components/pages/About/Hero/Hero.module.scss b/site/src/components/pages/About/Hero/Hero.module.scss index 114ef855..5882fd9f 100644 --- a/site/src/components/pages/About/Hero/Hero.module.scss +++ b/site/src/components/pages/About/Hero/Hero.module.scss @@ -46,7 +46,7 @@ .heroDescription p { @include paragraph; - max-width: size(247); + max-width: size(494); background-color: $gray900; } @@ -57,7 +57,7 @@ } .line { - width: 50%; + width: 100%; } .info { diff --git a/site/src/components/pages/About/Hero/Hero.tsx b/site/src/components/pages/About/Hero/Hero.tsx index 3f2a13b8..b129f68e 100644 --- a/site/src/components/pages/About/Hero/Hero.tsx +++ b/site/src/components/pages/About/Hero/Hero.tsx @@ -23,7 +23,7 @@ const getContent = (isMobile: boolean | null, content: string | { isDesktop: str return isMobile ? content.isMobile : content.isDesktop } -const Hero = ({ className, data: { title, description, info, content, future, footer } }: HeroProps) => { +const Hero = ({ className, data: { title, description } }: HeroProps) => { const { isMobile } = useViewport() return (
@@ -31,57 +31,23 @@ const Hero = ({ className, data: { title, description, info, content, future, fo

{description}

+
-

{info}

- - -
- -
- - -
- {content.map((el) => ( -
-

{el.title}

-
- {el.description.map((item, index) => ( - // biome-ignore lint/suspicious/noArrayIndexKey: -

{getContent(isMobile, item)}

- ))} -
-
- ))} - - {future.map((el) => ( -
-

{el.title}

-
-

{el.description}

-
-
- ))} - -
-
-

Stay in touch with our news

-
- {footer.socials.map((el) => ( - - ))} -
-
- + {!isMobile && ( + +
+
-
- + + + )}
) } diff --git a/site/src/components/pages/About/JoinNil/JoinNil.module.scss b/site/src/components/pages/About/JoinNil/JoinNil.module.scss index 65a6654d..7f863a73 100644 --- a/site/src/components/pages/About/JoinNil/JoinNil.module.scss +++ b/site/src/components/pages/About/JoinNil/JoinNil.module.scss @@ -130,3 +130,7 @@ } } } + +.devnet { + padding-left: 0.5ch; +} diff --git a/site/src/components/pages/About/JoinNil/JoinNil.tsx b/site/src/components/pages/About/JoinNil/JoinNil.tsx index c26eeb5e..9eeca618 100644 --- a/site/src/components/pages/About/JoinNil/JoinNil.tsx +++ b/site/src/components/pages/About/JoinNil/JoinNil.tsx @@ -4,8 +4,12 @@ import WhiteRectangle from 'components/WhiteRectangle' import classNames from 'classnames' import PropTypes, { InferProps } from 'prop-types' import s from './JoinNil.module.scss' +import { useViewport } from 'hooks/useViewport' +import Button from 'components/Button' function JoinNil({ title, leftText, rightText, social, className }: InferProps) { + const { isMobile } = useViewport() + return (
@@ -15,12 +19,19 @@ function JoinNil({ title, leftText, rightText, social, className }: InferProps
-

{leftText}

+

+ {leftText} + +

+ {!isMobile &&
}
-

{rightText}

+ {/*

{rightText}

*/} +
diff --git a/site/src/components/pages/BlogsPage/BlogsPage.tsx b/site/src/components/pages/BlogsPage/BlogsPage.tsx index bce118ed..ccac1921 100644 --- a/site/src/components/pages/BlogsPage/BlogsPage.tsx +++ b/site/src/components/pages/BlogsPage/BlogsPage.tsx @@ -27,7 +27,6 @@ import ToggleButton from 'components/ToggleButton' type BlogsPageProps = { data: { - tags: MappedTag[] posts: MappedBlog[] categories: MappedCategory[] } @@ -53,14 +52,6 @@ function BlogsPage({ data, activeTag, activeCategory }: BlogsPageProps) {

Blog

-

- - Stay in touch with our products development and explore zero‑knowledge technology - - - Stay in touch with our products development and explore zero-knowledge technology - -

@@ -88,7 +79,7 @@ function BlogsPage({ data, activeTag, activeCategory }: BlogsPageProps) {
-
+ {/*
{data.tags.map((tag) => ( ))} -
+
*/}
diff --git a/site/src/components/pages/Careers/Careers.tsx b/site/src/components/pages/Careers/Careers.tsx index 8fb563a2..f3ae93a6 100644 --- a/site/src/components/pages/Careers/Careers.tsx +++ b/site/src/components/pages/Careers/Careers.tsx @@ -38,7 +38,7 @@ const Careers = ({ data }: CareersProps) => {
- + {!isMobile && } {
- {isMobile && } {!isMobile && ( diff --git a/site/src/components/pages/Careers/JoinUs/JoinUs.tsx b/site/src/components/pages/Careers/JoinUs/JoinUs.tsx index 44314a78..1dbd0b7b 100644 --- a/site/src/components/pages/Careers/JoinUs/JoinUs.tsx +++ b/site/src/components/pages/Careers/JoinUs/JoinUs.tsx @@ -17,7 +17,8 @@ const JoinUs = ({ className, data: { title, cards } }: JoinUsProps) => { return (
-

{title}

+
+ {/*

{title}

{cards.map((card) => ( //
{ //
))} -
+
*/}
diff --git a/site/src/components/pages/ZkSharding/Hero/Hero.module.scss b/site/src/components/pages/ZkSharding/Hero/Hero.module.scss index 132d7c9a..5b5d38d0 100644 --- a/site/src/components/pages/ZkSharding/Hero/Hero.module.scss +++ b/site/src/components/pages/ZkSharding/Hero/Hero.module.scss @@ -54,7 +54,7 @@ padding: size(7) size($spacing32) size($spacing32 + 3) size($spacing32); p { - flex-basis: 50%; + flex-basis: 100%; @include paragraph; } diff --git a/site/src/components/pages/ZkSharding/Hero/Hero.tsx b/site/src/components/pages/ZkSharding/Hero/Hero.tsx index 144b2d1c..16fafd5c 100644 --- a/site/src/components/pages/ZkSharding/Hero/Hero.tsx +++ b/site/src/components/pages/ZkSharding/Hero/Hero.tsx @@ -15,13 +15,14 @@ import { usePrefersReducedMotion } from 'hooks/usePrefersReduceMotion' import { WebButton } from 'components/WebButton' import { useIntersectionObserver } from 'hooks/useIntersectionObserver' import { Column } from 'components/Column' +import { zkShardingPageData } from 'stubs/zkShardingPageData' type HeroProps = { className?: string - data: typeof zkllvmPageData.hero + data: typeof zkShardingPageData.hero } -const Hero = ({ className, data: { title, description, info, list } }: HeroProps) => { +const Hero = ({ className, data: { title, description, list } }: HeroProps) => { const lottieRef = useRef(null) const lottieInstance = useRef(null) const isIntersected = useRef(false) @@ -63,7 +64,6 @@ const Hero = ({ className, data: { title, description, info, list } }: HeroProps

{description}

-

{info}

{!isMobile && }
diff --git a/site/src/components/pages/ZkSharding/Intro/Intro.tsx b/site/src/components/pages/ZkSharding/Intro/Intro.tsx index 0449b102..2cc43bea 100644 --- a/site/src/components/pages/ZkSharding/Intro/Intro.tsx +++ b/site/src/components/pages/ZkSharding/Intro/Intro.tsx @@ -15,7 +15,7 @@ const IntroAnimationWidget = ({ >) => ( { duration={700} delay={500} isVisible={isVisible} - text="=nil; is a zkRollup that uses zkSharding to securely scale Ethereum to 60,000+ TPS, empowering web3 developers to build scalable, secure, and composable applications." + text="Built to Outlast that uses zkSharding to securely scale Ethereum to 60,000+ TPS, empowering web3 developers to build scalable, secure, and composable applications." /> )} diff --git a/site/src/components/pages/ZkSharding/Intro/data.tsx b/site/src/components/pages/ZkSharding/Intro/data.tsx index 8aaa5f4d..aab73c2b 100644 --- a/site/src/components/pages/ZkSharding/Intro/data.tsx +++ b/site/src/components/pages/ZkSharding/Intro/data.tsx @@ -21,7 +21,7 @@ export const getAnimatedItemList = (prefersReduceMotion?: boolean) => [ children: (isCompleted: boolean) => ( ), diff --git a/site/src/components/pages/ZkSharding/JoinNil/JoinNil.module.scss b/site/src/components/pages/ZkSharding/JoinNil/JoinNil.module.scss index eec48fc8..2f81e489 100644 --- a/site/src/components/pages/ZkSharding/JoinNil/JoinNil.module.scss +++ b/site/src/components/pages/ZkSharding/JoinNil/JoinNil.module.scss @@ -126,3 +126,7 @@ margin-bottom: size(60); } } + +.devnet { + padding-left: 0.5ch; +} diff --git a/site/src/components/pages/ZkSharding/JoinNil/JoinNil.tsx b/site/src/components/pages/ZkSharding/JoinNil/JoinNil.tsx index 3b8d6383..e7de35b1 100644 --- a/site/src/components/pages/ZkSharding/JoinNil/JoinNil.tsx +++ b/site/src/components/pages/ZkSharding/JoinNil/JoinNil.tsx @@ -8,6 +8,7 @@ import WhiteRectangle from 'components/WhiteRectangle' import s from './JoinNil.module.scss' import { JoinNilBaseData } from './JoinNilBaseData' +import Button from 'components/Button' type JoinNilProps = { className?: string @@ -31,7 +32,7 @@ const JoinNil = ({ withMargin, }: JoinNilProps) => { const { isMobile } = useViewport() - const contentRight = getContent(isMobile, content) + //const contentRight = getContent(isMobile, content) return (
({
{!isMobile && } -

{content.left}

+

+ {content.left} + +

+ {!isMobile &&
}
{!isMobile && } -

{contentRight}

+ {/*

{contentRight}

*/} +
diff --git a/site/src/components/pages/ZkSharding/ZkSharding.tsx b/site/src/components/pages/ZkSharding/ZkSharding.tsx index fb85dcc3..19a55e5f 100644 --- a/site/src/components/pages/ZkSharding/ZkSharding.tsx +++ b/site/src/components/pages/ZkSharding/ZkSharding.tsx @@ -41,8 +41,8 @@ const ZkSharding = ({ data }: Props) => {
- - + {/* */} + {/* */} ) => ) export async function getStaticProps() { - const [posts, tags, categories, config] = await Promise.all([ + const [posts, categories, config] = await Promise.all([ getBlogPosts({ sort: BLOG_POST_SORT, }), - getTags({ - filters: { - blogs: { - id: { - $notNull: true, - }, - }, - }, - }), getCategories(), getSiteConfig(), ]) @@ -40,7 +31,6 @@ export async function getStaticProps() { props: { cms: { posts: posts, - tags, categories, }, seo: seoData, diff --git a/site/src/stubs/aboutPageData.ts b/site/src/stubs/aboutPageData.ts index 214f6f0f..386fdc7a 100644 --- a/site/src/stubs/aboutPageData.ts +++ b/site/src/stubs/aboutPageData.ts @@ -3,10 +3,9 @@ import { joinNil } from './joinPartData' export const aboutPageData = { hero: { - title: 'Enabling scalable trustless computing with zero-knowledge', + title: "We're dedicated to solving hard problems", description: - '=nil; Foundation is\xa0a\xa0pioneer in\xa0zero\u2011knowledge technology, dedicated to making zkProofs and trustless data management accessible for developers.', - info: 'Our solutions facilitate scalable trustless computing and data access, organized in one flexible toolchain secured by Ethereum.', + 'Founded in 2018, =nil; Foundation has been consistently developing and executing novel ideas that leverage state-of-the-art cryptography, specifically ZK.', content: [ { title: '2018', @@ -81,15 +80,14 @@ export const aboutPageData = { }, toolchain: { - title: 'Robust toolchain to accelerate the development of zk-enabled applications', + title: 'Explore our work', description: 'Implementing zero-knowledge technology into products development and data management is now transparent and cost-effective.', content: [ { id: 1, - title: '=nil; zkSharding', - description: - 'A zkRollup that securely scales Ethereum to 60,000+ TPS through zkSharding, empowering web3 developers to build scalable, secure, and composable applications.', + title: '=nil;', + description: 'An Ethereum L2, powered by zkSharding', link: '/blog/post/database-management-system', list: [ { @@ -100,8 +98,7 @@ export const aboutPageData = { { id: 2, title: 'Proof Market', - description: - 'Decentralized marketplace for zero-knowledge proofs. Automatic generation of high-performance circuits for multiple protocols', + description: 'Marketplace for zero-knowledge proofs.', link: 'https://github.com/NilFoundation/proof-market-toolchain', list: [ { @@ -112,8 +109,7 @@ export const aboutPageData = { { id: 3, title: 'zkLLVM', - description: - 'Circuit compiler from C++, Rust, or other mainstream languages. Outsourcing zkProof generation to optimize time & cost of zk implementation', + description: 'Circuit compiler from C++ and Rust.', link: 'https://github.com/NilFoundation/zkllvm', list: [ { @@ -123,9 +119,8 @@ export const aboutPageData = { }, { id: 4, - title: 'Placeholder & Crypto3 suite', - description: - 'A highly flexible general-purpose zero-knowledge proof system and cryptography suite for fast and safe prototyping', + title: 'Placeholder & Crypto3', + description: 'Flexible zero-knowledge proof system and cryptography suite.', link: 'https://github.com/NilFoundation/crypto3', list: [ { @@ -192,8 +187,8 @@ export const aboutPageData = { }, ourTeam: { - title: 'Become part of our team', - description: 'Learn more about our team and discover current open positions.', + title: 'Join the team', + description: 'Learn more about open positions.', button: { text: 'Go to Careers page', link: '/careers', diff --git a/site/src/stubs/careersPageData.ts b/site/src/stubs/careersPageData.ts index e62a4b57..18008378 100644 --- a/site/src/stubs/careersPageData.ts +++ b/site/src/stubs/careersPageData.ts @@ -2,8 +2,8 @@ import { joinNil } from './joinPartData' export const careersPageData = { intro: { - title: 'Work at the forefront of zero-knowledge development', - description: 'Be it from our Cyprus office, from home, or fully remote.', + title: 'Work on hard problems at the frontier of blockchain scalability', + description: 'Join our global team and work from anywhere.', }, joinUs: { title: 'Contribute to our cutting edge toolchain', diff --git a/site/src/stubs/joinPartData.ts b/site/src/stubs/joinPartData.ts index e623160b..7350b579 100644 --- a/site/src/stubs/joinPartData.ts +++ b/site/src/stubs/joinPartData.ts @@ -1,8 +1,8 @@ export const joinNil = { - title: 'Join our community for expert help', + title: 'Join our community', social: 'community', content: { - left: `Whether you're a seasoned developer or a zk enthusiast taking your first steps, we've got your back!`, + left: `Want to build? Apply to join our`, right: 'Join our community to collaborate with experienced engineers on building secure, scalable and composable decentralized applications.', newRight: { diff --git a/site/src/stubs/zkShardingPageData.ts b/site/src/stubs/zkShardingPageData.ts index 6f2cde18..05ed79ef 100644 --- a/site/src/stubs/zkShardingPageData.ts +++ b/site/src/stubs/zkShardingPageData.ts @@ -3,10 +3,10 @@ import { joinNil } from './joinPartData' export const zkShardingPageData = { hero: { - title: 'Scale starting at 60,000 TPS', + title: 'Why build on =nil;?', description: - 'By implementing dynamic zkSharding, =nil; enables secure parallel execution of transactions across shards operating independently. ', - info: 'As the number of these dedicated shards grows, so does the maximum Ethereum throughput, linearly.', + 'zkSharding enables a new generation of highly scalable applications by distributing workloads across shards.', + // info: 'As the number of these dedicated shards grows, so does the maximum Ethereum throughput, linearly.', list: [ `Compile circuits from existing code, don't start from scratch`, 'Superior circuit performance with no zkVMs involved', @@ -18,8 +18,7 @@ export const zkShardingPageData = { }, more: { title: 'More than just another zkRollup', - description: - 'zkSharding facilitates scalable transaction processing and data availability, all without fragmenting liquidity or economic security.', + description: '"Tap into the power of hundreds of rollups from a single network."', contentFooter: 'Separate decentralized shards compose a single execution layer. The main shard at the top validates transactions across all shards and proves them to Ethereum.',