Skip to content

Commit

Permalink
Merge pull request #19 from near/develop
Browse files Browse the repository at this point in the history
develop -> main
  • Loading branch information
charleslavon authored May 9, 2024
2 parents 9ca0bce + 404106d commit 17896a9
Show file tree
Hide file tree
Showing 22 changed files with 277 additions and 234 deletions.
5 changes: 5 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ const nextConfig = {
destination: `${appGatewayHostname}/:path/widget/:slug`,
permanent: true,
},
{
source: '/auditrequest',
destination: 'https://airtable.com/appr1nBRRGx2PTJVh/shrpa99vKKW3xafso',
permanent: false,
},
];
},
rewrites: async () => [
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/components/navigation/desktop/MainNavigationMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import * as NavigationMenu from '@radix-ui/react-navigation-menu';
import Link from 'next/link';
import styled from 'styled-components';

import { recordMouseEnter } from '@/utils/analytics';

import { navigationCategories } from '../categories';

const Wrapper = styled.div`
Expand Down Expand Up @@ -152,7 +154,7 @@ export const MainNavigationMenu = () => {
.filter((category) => category.visible === 'all' || category.visible === 'desktop')
.map((category) => (
<NavItem key={category.title}>
<NavTrigger>{category.title}</NavTrigger>
<NavTrigger onMouseEnter={recordMouseEnter}>{category.title}</NavTrigger>

<NavContent>
<Container>
Expand Down
25 changes: 15 additions & 10 deletions src/components/pages/Blockchain.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { CREATE_ACCOUNT_URL } from '@/utils/constants';

import { Button } from '../lib/Button';
import { Card } from '../lib/Card';
import { Container } from '../lib/Container';
Expand Down Expand Up @@ -38,7 +36,7 @@ const communityItems = [
},
];

const ipfsImages = {
const images = {
illustrations: {
developers: 'bafkreiaccoujoiwowiypzjyobdqyfeqweu32htcswc3ojvnesvtwfs5acm',
endUsers: 'bafkreifew3ibskmcxicoa7bffleekg6kn3cwswyg5ht5shifbii6elwp2a',
Expand Down Expand Up @@ -80,7 +78,7 @@ export const Blockchain = () => {
</Flex>

<ContentWithImage
src={returnImageSrc(ipfsImages.illustrations.endUsers)}
src={returnImageSrc(images.illustrations.endUsers)}
imageSide="left"
alt="A line drawing of a user avatar and the NEAR logo set behind the Create Account screen from FastAuth"
>
Expand Down Expand Up @@ -117,8 +115,9 @@ export const Blockchain = () => {

<div>
<Button
href={CREATE_ACCOUNT_URL}
label="Create Account"
href="https://docs.near.org/tools/welcome"
target="_blank"
label="Start Building"
variant="secondary"
fill="outline"
size="large"
Expand All @@ -135,7 +134,7 @@ export const Blockchain = () => {
</Flex>

<ContentWithImage
src={returnImageSrc(ipfsImages.illustrations.developers)}
src={returnImageSrc(images.illustrations.developers)}
imageSide="right"
alt="A line drawing of two diamonds with arrows pointing toward each other set behind a console window with a code snippet"
>
Expand Down Expand Up @@ -186,13 +185,13 @@ export const Blockchain = () => {
<Flex $direction="column" $gap="24px">
<H2 style={{ color: 'var(--white)' }}>NEAR, a technical marvel</H2>
<Text $size="text-2xl" $mobileSize="text-l" color="white" style={{ maxWidth: '808px' }}>
Built on years of research, NEARs efficient and robust protocol stands as a true marvel of modern
Built on years of research, NEAR&apos;s efficient and robust protocol stands as a true marvel of modern
technology.
</Text>
</Flex>

<ContentWithImage
src={returnImageSrc(ipfsImages.illustrations.technicalMarvel)}
src={returnImageSrc(images.illustrations.technicalMarvel)}
imageSide="left"
alt="A line drawing of a leaf, a flower, and two data towers all interconnected"
>
Expand Down Expand Up @@ -269,7 +268,13 @@ export const Blockchain = () => {
</Flex>

<Flex $gap="24px" $wrap="$wrap" $alignItems="center" $justifyContent="center">
<Button href={CREATE_ACCOUNT_URL} label="Create Account" variant="secondary" size="large" />
<Button
href="https://docs.near.org/tools/welcome"
target="_blank"
label="Start Building"
variant="secondary"
size="large"
/>

<Button
href="https://docs.near.org/concepts/welcome"
Expand Down
Loading

0 comments on commit 17896a9

Please sign in to comment.