Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some creative work for test #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"next-seo": "^4.23.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"styled-jsx-plugin-postcss": "^4.0.1"
"styled-jsx-plugin-postcss": "^4.0.1",
"yarn": "^1.22.17"
},
"devDependencies": {
"@next/bundle-analyzer": "^10.1.2",
Expand Down
Binary file added public/assets/images/inter1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/yelunderline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/hero/HeroOneButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ const HeroOneButton = (props: IHeroOneButtonProps) => (
<h1 className="text-5xl text-gray-900 font-bold whitespace-pre-line leading-hero">
{props.title}
</h1>
<img
className="w-3/6 m-auto mt-2"
src={`${process.env.baseUrl}/assets/images/yelunderline.png`}
/>
<div className="text-2xl mt-4 mb-16">{props.description}</div>
{props.button}
</header>
Expand Down
4 changes: 3 additions & 1 deletion src/layout/Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ type ISectionProps = {
title?: string;
description?: string;
yPadding?: string;
background?: string;
children: ReactNode;
maxWidth?: string;
};

const Section = (props: ISectionProps) => (
<div className={`max-w-screen-lg mx-auto px-3 ${props.yPadding ? props.yPadding : 'py-16'}`}>
<div className={`${props.maxWidth ? props.maxWidth : ''} mx-auto px-3 ${props.yPadding ? props.yPadding : 'py-16'} ${props.background ? props.background : ''}`}>
{(props.title || props.description) && (
<div className="mb-12 text-center">
{props.title && <h2 className="text-4xl text-gray-900 font-bold">{props.title}</h2>}
Expand Down
58 changes: 32 additions & 26 deletions src/navigation/NavbarTwoColumns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,43 @@ import React, { ReactNode } from 'react';

import Link from 'next/link';

import className from 'classnames';

type INavbarProps = {
logo: ReactNode;
children: ReactNode;
};

const NavbarTwoColumns = (props: INavbarProps) => (
<div className="flex flex-wrap justify-between items-center">
<div>
<Link href="/">
<a>{props.logo}</a>
</Link>
</div>
const NavbarTwoColumns = (props: INavbarProps) => {
const navbarTwoColumnClass = className('flex', 'flex-wrap', 'justify-between', 'items-center');

return (
<div className={navbarTwoColumnClass}>
<div>
<Link href="/">
<a>{props.logo}</a>
</Link>
</div>

<nav>
<ul className="navbar flex items-center font-medium text-xl text-primary-500">
{props.children}
</ul>
</nav>

<nav>
<ul className="navbar flex items-center font-medium text-xl text-gray-800">
{props.children}
</ul>
</nav>

<style jsx>
{`
.navbar :global(li:not(:first-child)) {
@apply mt-0;
}

.navbar :global(li:not(:last-child)) {
@apply mr-5;
}
`}
</style>
</div>
);
<style jsx>
{`
.navbar :global(li:not(:first-child)) {
@apply mt-0;
}

.navbar :global(li:not(:last-child)) {
@apply mr-5;
}
`}
</style>
</div>
);
};

export { NavbarTwoColumns };
48 changes: 24 additions & 24 deletions src/templates/commons/Logo.tsx

Large diffs are not rendered by default.

55 changes: 33 additions & 22 deletions src/templates/landing-page/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ import { NavbarTwoColumns } from '../../navigation/NavbarTwoColumns';
import { Logo } from '../commons/Logo';

const Hero = () => (
<Background color="bg-gray-100">
<Section yPadding="py-6">
<Background color="bg-primary-100">
<Section
yPadding="py-6"
background="bg-primary-700"
maxWidth="max-w-screen-lg"
>
<NavbarTwoColumns logo={<Logo xl />}>
<li>
<Link href="https://github.com/AxLabs/meme-governance-frontend">
Expand All @@ -20,30 +24,37 @@ const Hero = () => (
</li>
<li>
<Link href="/dapp">
<a>dApp</a>
<a>DApp</a>
</Link>
</li>
</NavbarTwoColumns>
</Section>

<Section yPadding="pt-20 pb-32">
<HeroOneButton
title={
<>
{'The Best Memes, ever.\n'}
Built and Governed on <span className="text-primary-500">Neo N3</span>
</>
}
description="Propose new ones, vote on the best, and dump the shittiest..."
button={
<Link href="/dapp">
<a>
<Button xl>Let&lsquo;s do it!</Button>
</a>
</Link>
}
/>
</Section>
<div class="container mx-auto">
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-2 gap-6 px-3 pt-14 pb-28">
<HeroOneButton
title={
<>
{'The Best Memes, ever.\n'}
Built and Governed on <span className="text-primary-500">Neo N3</span>
</>
}
description="Propose new ones, vote on the best, and dump the shittiest..."
button={
<Link href="/dapp">
<a>
<Button xl>Let&lsquo;s do it!</Button>
</a>
</Link>
}
/>
<div class="flex justify-center align-center">
<img
className="w-3/5 m-auto"
src={`${process.env.baseUrl}/assets/images/inter1.png`}
/>
</div>
</div>
</div>
</Background>
);

Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module.exports = {
},
},
lineHeight: {
hero: '4.5rem',
hero: '3.5rem',
},
},
},
Expand Down