fix: redirects, memos

4 years ago · 60418ed23e
7 changed files with 257 additions and 85 deletions
--- a/next.config.js
+++ b/next.config.js
@ -96,52 +96,200 @@ async function redirects() {
      destination: '/smart-contracts/running-a-testnet-node',
      permanent: true,
    },
-    { source: '/core/smart/cli-wallet-quickstart.html', destination: '', permanent: true },
-    { source: '/core/naming/introduction.html', destination: '', permanent: true },
-    { source: '/core/naming/architecture.html', destination: '', permanent: true },
-    { source: '/core/naming/namespaces.html', destination: '', permanent: true },
-    { source: '/core/naming/comparison.html', destination: '', permanent: true },
-    { source: '/core/naming/tutorial_subdomains.html', destination: '', permanent: true },
-    { source: '/core/naming/search.html', destination: '', permanent: true },
-    { source: '/core/faq_technical.html', destination: '', permanent: true },
-    { source: '/core/naming/pickname.html', destination: '', permanent: true },
-    { source: '/core/naming/creationhowto.html', destination: '', permanent: true },
-    { source: '/core/naming/resolving.html', destination: '', permanent: true },
-    { source: '/core/naming/register.html', destination: '', permanent: true },
-    { source: '/core/naming/manage.html', destination: '', permanent: true },
-    { source: '/core/naming/subdomains.html', destination: '', permanent: true },
-    { source: '/core/naming/forks.html', destination: '', permanent: true },
-    { source: '/develop/collections.html', destination: '', permanent: true },
-    { source: '/develop/collection-type.html', destination: '', permanent: true },
-    { source: '/storage/hub-operation.html', destination: '', permanent: true },
-    { source: '/storage/amazon-s3-deploy.html', destination: '', permanent: true },
-    { source: '/storage/digital-ocean-deploy.html', destination: '', permanent: true },
-    { source: '/storage/hello-hub-choice.html', destination: '', permanent: true },
-    { source: '/storage/gaia-admin.html', destination: '', permanent: true },
-    { source: '/core/atlas/overview.html', destination: '', permanent: true },
-    { source: '/core/atlas/howitworks.html', destination: '', permanent: true },
-    { source: '/core/atlas/howtouse.html', destination: '', permanent: true },
-    { source: '/org/overview.html', destination: '', permanent: true },
-    { source: '/faqs/allFAQS.html', destination: '', permanent: true },
-    { source: '/org/token.html', destination: '', permanent: true },
-    { source: '/org/whitepaper-blockchain.html', destination: '', permanent: true },
-    { source: '/org/wallet-intro.html', destination: '', permanent: true },
-    { source: '/org/wallet-install.html', destination: '', permanent: true },
-    { source: '/org/wallet-use.html', destination: '', permanent: true },
-    { source: '/org/wallet-troubleshoot.html', destination: '', permanent: true },
-    { source: '/org/tokenholders.html', destination: '', permanent: true },
-    { source: '/core/cmdLineRef.html', destination: '', permanent: true },
-    { source: '/core/smart/clarityRef.html', destination: '', permanent: true },
-    { source: '/core/smart/rpc-api.html', destination: '', permanent: true },
-    { source: '/common/javascript_ref.html', destination: '', permanent: true },
-    { source: '/common/android_ref.html', destination: '', permanent: true },
-    { source: '/common/ios_ref.html', destination: '', permanent: true },
-    { source: '/common/core_ref.html', destination: '', permanent: true },
-    { source: '/core/wire-format.html', destination: '', permanent: true },
-    { source: '/storage/config-schema.html', destination: '', permanent: true },
-    { source: '/org/secureref.html', destination: '', permanent: true },
-    { source: '/develop/overview_auth.html', destination: '', permanent: true },
-    { source: '/org/terms.html', destination: '', permanent: true },
+    {
+      source: '/core/smart/cli-wallet-quickstart.html',
+      destination: '/smart-contracts/cli-wallet-quickstart',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/introduction.html',
+      destination: '/naming-services/overview',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/architecture.html',
+      destination: '/naming-services/architecture',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/namespaces.html',
+      destination: '/naming-services/namespaces',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/comparison.html',
+      destination: '/naming-services/comparison',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/tutorial_subdomains.html',
+      destination: '/naming-services/subdomains-tutorial',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/search.html',
+      destination: '/naming-services/build-profile-search-index',
+      permanent: true,
+    },
+    {
+      source: '/core/faq_technical.html',
+      destination: 'https://blockstack.zendesk.com/hc/en-us',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/pickname.html',
+      destination: '/naming-services/choose-name',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/creationhowto.html',
+      destination: '/naming-services/create-namespace',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/resolving.html',
+      destination: '/naming-services/resolve-name',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/register.html',
+      destination: '/naming-services/register-name',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/manage.html',
+      destination: '/naming-services/manage-names',
+      permanent: true,
+    },
+    {
+      source: '/core/naming/subdomains.html',
+      destination: '/naming-services/subdomains',
+      permanent: true,
+    },
+    { source: '/core/naming/forks.html', destination: '/naming-services/forks', permanent: true },
+    {
+      source: '/develop/collections.html',
+      destination: '/data-storage/collections',
+      permanent: true,
+    },
+    {
+      source: '/develop/collection-type.html',
+      destination: '/data-storage/collections-type',
+      permanent: true,
+    },
+    {
+      source: '/storage/hub-operation.html',
+      destination: '/storage-hubs/overview',
+      permanent: true,
+    },
+    {
+      source: '/storage/amazon-s3-deploy.html',
+      destination: '/storage-hubs/amazon-s3-deploy',
+      permanent: true,
+    },
+    {
+      source: '/storage/digital-ocean-deploy.html',
+      destination: '/storage-hubs/digital-ocean-deploy',
+      permanent: true,
+    },
+    {
+      source: '/storage-hubs/hello-hub-choice.html',
+      destination: '/storage-hubs/hello-hub-choice',
+      permanent: true,
+    },
+    {
+      source: '/storage/gaia-admin.html',
+      destination: '/storage-hubs/gaia-admin',
+      permanent: true,
+    },
+    {
+      source: '/core/atlas/overview.html',
+      destination: '/stacks-blockchain/atlas/overview',
+      permanent: true,
+    },
+    {
+      source: '/core/atlas/howitworks.html',
+      destination: '/stacks-blockchain/atlas/how-atlas-works',
+      permanent: true,
+    },
+    {
+      source: '/core/atlas/howtouse.html',
+      destination: '/stacks-blockchain/atlas/usage',
+      permanent: true,
+    },
+    { source: '/org/overview.html', destination: '/ecosystem/overview', permanent: true },
+    {
+      source: '/faqs/allFAQS.html',
+      destination: 'https://blockstack.zendesk.com/hc/en-us',
+      permanent: true,
+    },
+    { source: '/org/token.html', destination: '/ecosystem/stacks-token', permanent: true },
+    {
+      source: '/org/whitepaper-blockchain.html',
+      destination: 'https://blockstack.org/whitepaper.pdf',
+      permanent: true,
+    },
+    { source: '/org/wallet-intro.html', destination: '/stacks-wallet/overview', permanent: true },
+    { source: '/org/wallet-install.html', destination: '/stacks-wallet/install', permanent: true },
+    { source: '/org/wallet-use.html', destination: '/stacks-wallet/usage', permanent: true },
+    {
+      source: '/org/wallet-troubleshoot.html',
+      destination: '/stacks-wallet/troubleshooting',
+      permanent: true,
+    },
+    {
+      source: '/org/tokenholders.html',
+      destination: '/ecosystem/stacks-token-holders',
+      permanent: true,
+    },
+    { source: '/core/cmdLineRef.html', destination: '/references/blockstack-cli', permanent: true },
+    {
+      source: '/core/smart/clarityRef.html',
+      destination: '/references/clarity-language',
+      permanent: true,
+    },
+    {
+      source: '/core/smart/rpc-api.html',
+      destination: '/references/stacks-rpc-api',
+      permanent: true,
+    },
+    {
+      source: '/common/javascript_ref.html',
+      destination: 'https://blockstack.github.io/blockstack.js/',
+      permanent: true,
+    },
+    {
+      source: '/common/android_ref.html',
+      destination: 'https://blockstack.github.io/blockstack-android/',
+      permanent: true,
+    },
+    {
+      source: '/common/ios_ref.html',
+      destination: 'https://blockstack.github.io/blockstack-ios/',
+      permanent: true,
+    },
+    {
+      source: '/common/core_ref.html',
+      destination: '/references/stacks-blockchain',
+      permanent: true,
+    },
+    {
+      source: '/core/wire-format.html',
+      destination: '/stacks-blockchain/wire-format',
+      permanent: true,
+    },
+    {
+      source: '/storage/config-schema.html',
+      destination: '/storage-hubs/config-schema',
+      permanent: true,
+    },
+    { source: '/org/secureref.html', destination: '/stacks-wallet/security', permanent: true },
+    {
+      source: '/develop/overview_auth.html',
+      destination: '/authentication/overview',
+      permanent: true,
+    },
+    { source: '/org/terms.html', destination: '/references/glossary', permanent: true },
  ];
 }

@ -153,6 +301,7 @@ module.exports = withFonts(
      jsconfigPaths: true,
      trailingSlash: true,
    },
+    redirects,
    pageExtensions: ['js', 'ts', 'tsx', 'md', 'mdx'],
    webpack: (config, options) => {
      config.module.rules.push({
--- a/package.json
+++ b/package.json
@ -6,8 +6,8 @@
    "@docsearch/react": "^1.0.0-alpha.26",
    "@hashicorp/remark-plugins": "^3.0.0",
    "@mdx-js/loader": "1.6.15",
-    "@mdx-js/mdx": "^1.6.15",
-    "@mdx-js/react": "^1.6.15",
+    "@mdx-js/mdx": "^1.6.16",
+    "@mdx-js/react": "^1.6.16",
    "@next/mdx": "^9.4.4",
    "@reach/accordion": "^0.10.5",
    "@reach/tooltip": "^0.10.5",
--- a/src/components/custom-blocks/page-reference.tsx
+++ b/src/components/custom-blocks/page-reference.tsx
@ -125,25 +125,22 @@ const InlineCard = ({ page }) => {
  );
 };

-const GridCard: React.FC<BoxProps & { page?: any }> = ({ page, ...rest }) => {
-  const { hover, active, bind } = useTouchable({
-    behavior: 'link',
-  });
-  return (
-    <Box position="relative" {...rest} {...bind}>
+const GridCardImage: React.FC<BoxProps & { isHovered?: boolean; page: any }> = React.memo(
+  ({ isHovered, page, ...props }) => (
    <Box
      bg="#9985FF"
      position="relative"
      borderRadius="12px"
      mb={space('loose')}
      overflow="hidden"
+      {...props}
    >
      <Grid style={{ placeItems: 'center' }} height="0px" paddingTop="56.25%">
        <Image
          width="102%"
          size="102%"
          transition={transition('0.45s')}
-            transform={(hover || active) && 'scale(1.08)'}
+          transform={isHovered && 'scale(1.08)'}
          style={{ willChange: 'transform' }}
          src={page?.images?.large}
          position="absolute"
@ -152,18 +149,42 @@ const GridCard: React.FC<BoxProps & { page?: any }> = ({ page, ...rest }) => {
        />
      </Grid>
    </Box>
+  )
+);
+
+const GridCardDetails: React.FC<BoxProps & { isHovered?: boolean; page: any }> = React.memo(
+  ({ isHovered, page, ...props }) => (
+    <>
      <Flex alignItems="flex-start" justifyContent="flex-start" flexDirection="column">
-        <Title color={hover ? color('accent') : color('text-title')} mb={space('tight')}>
+        <Title color="currentColor" mb={space('tight')}>
          {page.title || page.headings[0]}
        </Title>
        <Description>{page.description}</Description>
      </Flex>
      <FloatingLink href={`${page.path}`} />
+    </>
+  )
+);
+
+const GridCard: React.FC<BoxProps & { page?: any }> = React.memo(({ page, ...rest }) => {
+  const { hover, active, bind } = useTouchable({
+    behavior: 'link',
+  });
+  return (
+    <Box
+      position="relative"
+      color={color('text-title')}
+      _hover={{ color: color('accent') }}
+      {...rest}
+      {...bind}
+    >
+      <GridCardImage page={page} isHovered={hover || active} />
+      <GridCardDetails page={page} />
    </Box>
  );
-};
+});

-export const PageReference = ({ children }) => {
+export const PageReference: React.FC<BoxProps> = React.memo(({ children }) => {
  const content = onlyText(children).trim();
  const [variant, _paths] = content.includes('\n') ? content.split('\n') : ['default', content];
  const paths = _paths.includes(', ') ? _paths.split(', ') : [_paths];
@ -188,4 +209,4 @@ export const PageReference = ({ children }) => {
      )}
    </Grid>
  );
-};
+});
--- a/src/components/footer.tsx
+++ b/src/components/footer.tsx
@ -6,7 +6,7 @@ import { FeedbackSection } from '@components/feedback';

 const Footer = ({ hidePagination, ...rest }: any) => {
  return (
-    <Section px={space(['extra-loose', 'extra-loose', 'none', 'none'])}>
+    <Section px={space(['extra-loose', 'extra-loose', 'none', 'none'])} {...rest}>
      <SectionWrapper>
        <Pagination />
        <FeedbackSection />
--- a/src/components/mdx/components/heading.tsx
+++ b/src/components/mdx/components/heading.tsx
@ -77,7 +77,7 @@ const Hashtag = () => (
 export const Heading = ({ as, children, id, ...rest }: FlexProps) => {
  const { isActive, doChangeActiveSlug } = useActiveHeading(id);

-  const { bind, hover, active } = useTouchable({
+  const { bind: _bind, hover, active } = useTouchable({
    behavior: 'link',
  });
  const router = useRouter();
@ -90,6 +90,8 @@ export const Heading = ({ as, children, id, ...rest }: FlexProps) => {
  };
  const styles = getHeadingStyles(as as any);

+  const bind = id ? _bind : {};
+
  return (
    <Title
      as={as}
--- a/src/components/search.tsx
+++ b/src/components/search.tsx
@ -46,7 +46,7 @@ const navigator = {
  },
 };

-const Key: React.FC<BoxProps> = ({ children, ...rest }) => (
+const Key: React.FC<BoxProps> = React.memo(({ children, ...rest }) => (
  <Grid
    style={{
      placeItems: 'center',
@ -70,7 +70,7 @@ const Key: React.FC<BoxProps> = ({ children, ...rest }) => (
      {children}
    </Text>
  </Grid>
-);
+));

 const searchOptions = {
  apiKey: '9040ba6d60f5ecb36eafc26396288875',
--- a/yarn.lock
+++ b/yarn.lock
@ -1469,7 +1469,7 @@
    unist-builder "2.0.3"
    unist-util-visit "2.0.3"

-"@mdx-js/mdx@^1.6.15", "@mdx-js/mdx@^1.6.8":
+"@mdx-js/mdx@^1.6.16", "@mdx-js/mdx@^1.6.8":
  version "1.6.16"
  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.16.tgz#f01af0140539c1ce043d246259d8becd2153b2bb"
  integrity sha512-jnYyJ0aCafCIehn3GjYcibIapaLBgs3YkoenNQBPcPFyyuUty7B3B07OE+pMllhJ6YkWeP/R5Ax19x0nqTzgJw==
@ -1499,7 +1499,7 @@
  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.15.tgz#99a6061d0f74f2d01b95ad0314efba9ad6f19e81"
  integrity sha512-C8yhsYZyFwL2kTa4Yw1zFIUxHcl225NrP75F6qgNbBum1APcsnl0WQ7N5V/l515gxnJmXSRQ6uL7pAFPZvdmzA==

-"@mdx-js/react@^1.6.15", "@mdx-js/react@^1.6.8":
+"@mdx-js/react@^1.6.16", "@mdx-js/react@^1.6.8":
  version "1.6.16"
  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.16.tgz#538eb14473194d0b3c54020cb230e426174315cd"
  integrity sha512-+FhuSVOPo7+4fZaRwWuCSRUcZkJOkZu0rfAbBKvoCg1LWb1Td8Vzi0DTLORdSvgWNbU6+EL40HIgwTOs00x2Jw==