Merge remote-tracking branch 'origin/develop' into release/maker-portal-redesign

Author: kyranjamie

.babelrc

@@ -7,8 +7,6 @@
         "ssr": true
       }
     ],
-    "@babel/plugin-transform-regenerator",
-    "@babel/plugin-transform-runtime",
     [
       "module-resolver",
       {

components/list/categories.js

@@ -15,7 +15,7 @@ const mapStateToProps = (state) => ({
 })
 
 const CategoryItem = ({ category, link, ...rest }) => (
-  <Link href={link.href} as={link.as} prefetch>
+  <Link href={link.href} as={link.as}>
     <StyledList.ItemLink {...rest} link>
       <Box style={{ flexGrow: 1, maxWidth: '100%' }} px={2}>
         <Type.strong>

components/list/platforms.js

@@ -19,7 +19,7 @@ const mapStateToProps = (state) => ({
 })
 
 const PlatformItem = ({ platform, link, image, width, icon: Icon, ...rest }) => (
-  <Link href={link.href} as={link.as} prefetch>
+  <Link href={link.href} as={link.as}>
     <StyledList.ItemLink width={width} link {...rest}>
       <Flex justifyContent="flex-start" style={{ flexGrow: 1, maxWidth: '100%' }} pr={2}>
         {Icon ? (

components/logos/index.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-const AppIcon = ({ size = 34, ...rest }) => (
+const AppIcon = ({ ...rest }) => (
   <svg viewBox="0 0 34 34" fill="none" style={{ width: '100%', maxWidth: '100%', display: 'block' }} {...rest}>
     <path
       d="M27.7771 34H6.24321C2.78386 34 1.24936e-06 31.1957 1.24936e-06 27.7568V6.24323C1.24936e-06 2.78386 2.80433 1.56171e-07 6.24321 1.56171e-07H27.7567C31.216 1.56171e-07 33.9999 2.80433 33.9999 6.24323V27.7568C34.0204 31.1957 31.216 34 27.7771 34Z"

components/mining/shared/index.js

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Flex, Box, Type, OpenModal } from 'blockstack-ui'
 import { Hover } from 'react-powerplug'
 import { ArrowIcon, OutlinedLogo } from '@components/mining/svg'
-import { StarterKitModal } from '@pages/mining/starter-kit-modal'
+import { StarterKitModal } from '@containers/mining/starter-kit-modal'
 import { InView } from 'react-intersection-observer'
 
 import dynamic from 'next/dynamic'
@@ -79,8 +79,8 @@ const Wrapper = ({ observed, inView, ...rest }) => (
   <Flex
     maxWidth={1180}
     px={[6, 8]}
-    width={'100%'}
-    mx={'auto'}
+    width="100%"
+    mx="auto"
     flexDirection={['column', 'column', 'row', 'row']}
     opacity={!observed ? 1 : inView ? 1 : 0}
     transform={!observed ? 'none' : inView ? 'none' : 'translateY(-20px)'}
@@ -204,7 +204,7 @@ const CallToAction = ({ hideTimer, buttonProps = {}, ...rest }) => (
             borderRadius={2}
             overflow="hidden"
             transform={hovered ? 'translateY(-5px)' : 'unset'}
-            transition={'0.1s all ease-in-out'}
+            transition="0.1s all ease-in-out"
             {...rest}
           >
             <Flex

components/navigation/index.js

@@ -29,15 +29,13 @@ const NavigationComponent = ({ handleClick, isErrorPage, openNewsletterModal, fo
           <ErrorPageLink isErrorPage={isErrorPage} href="/all">
             <a href="/all">All apps</a>
           </ErrorPageLink>
-          <ErrorPageLink isErrorPage={isErrorPage} href="/faq" prefetch {...extraProps}>
+          <ErrorPageLink isErrorPage={isErrorPage} href="/faq" {...extraProps}>
             <a href="/faq">Learn more</a>
           </ErrorPageLink>
-          <ErrorPageLink isErrorPage={isErrorPage} href="/mining" prefetch {...extraProps}>
+          <ErrorPageLink isErrorPage={isErrorPage} href="/mining" {...extraProps}>
             <a href="/mining">App Mining</a>
           </ErrorPageLink>
-          <ErrorPageLink isErrorPage={isErrorPage} href="https://blog.app.co" {...extraProps}>
-            <a href="https://blog.app.co">Blog</a>
-          </ErrorPageLink>
+          <a href="https://blog.app.co" target="_blank" rel="noopener noreferrer">Blog</a>
           <a
             href="#"
             onClick={(evt) => {
@@ -49,13 +47,13 @@ const NavigationComponent = ({ handleClick, isErrorPage, openNewsletterModal, fo
           </a>
           {footer && (
             <>
-              <ErrorPageLink isErrorPage={isErrorPage} href="/privacy" prefetch>
+              <ErrorPageLink isErrorPage={isErrorPage} href="/privacy">
                 <a href="/privacy">Privacy Policy</a>
               </ErrorPageLink>
-              <ErrorPageLink isErrorPage={isErrorPage} href="/terms" prefetch>
+              <ErrorPageLink isErrorPage={isErrorPage} href="/terms">
                 <a href="/terms">Terms of Use</a>
               </ErrorPageLink>
-              <ErrorPageLink isErrorPage={isErrorPage} href="/mining/terms" prefetch>
+              <ErrorPageLink isErrorPage={isErrorPage} href="/mining/terms">
                 <a href="/mining/terms">App Mining Terms</a>
               </ErrorPageLink>
             </>

components/page/index.js

@@ -5,9 +5,9 @@ import { Footer } from '@components/footer'
 
 import { StyledPage } from './styled'
 
-const Page = ({ isErrorPage, children, admin, wrap, innerPadding = [2, 0], ...rest }) => (
+const Page = ({ isErrorPage = false, children, admin = false, wrap, innerPadding = [2, 0], ...rest }) => (
   <StyledPage {...rest}>
-    <TopBar isErrorPage={isErrorPage} admin={admin} wrap={wrap} />
+    <TopBar isErrorPage={isErrorPage} admin={admin} wrap={rest.wrap} />
     <StyledPage.Section flexDirection={['column']} alignItems="center" pt={[3, 4]} px={innerPadding}>
       {children}
     </StyledPage.Section>
@@ -28,6 +28,13 @@ Page.Section.Content = StyledPage.Content
 
 Page.propTypes = {
   children: PropTypes.node.isRequired,
+  isErrorPage: PropTypes.bool,
+  admin: PropTypes.bool,
   wrap: PropTypes.bool
 }
+
+Page.defaultProps = {
+  isErrorPage: false,
+  admin: false
+}
 export { Page }

components/tag/index.js

@@ -6,7 +6,7 @@ import { StyledTag, StyledTagLink } from '@components/tag/styled'
 const Tag = ({ children, ...rest }) => (children ? <StyledTag {...rest}>{children}</StyledTag> : null)
 
 const TagLink = ({ children, href, as, ...rest }) => (
-  <Link href={href} as={as} prefetch>
+  <Link href={href} as={as}>
     <StyledTagLink href={as} {...rest}>
       {children}
     </StyledTagLink>

components/top-bar/index.js

@@ -17,7 +17,7 @@ const handleBodyScroll = (on) =>
 const TopBar = ({ isErrorPage, admin, wrap, ...props }) => (
   <Headroom>
     <StyledTopBar {...props}>
-      <StyledTopBar.Wrapper wrap={false}>
+      <StyledTopBar.Wrapper wrap={wrap}>
         <StyledTopBar.Section grow>
           {isErrorPage ? (
             <a href="/">

containers/admin/app-list.js

@@ -27,11 +27,10 @@ const appRows = (apps) => apps.map((app) => (
 
 class AppList extends React.Component {
   async downloadAllApps() {
-    const { jwt, apiServer } = this.props
-    const url = `${apiServer}/api/admin/download-apps`
+    const url = `${this.props.apiServer}/api/admin/download-apps`
     const res = await fetch(url, {
       headers: new Headers({
-        Authorization: `Bearer ${jwt}`
+        Authorization: `Bearer ${this.props.jwt}`
       })
     })
     const blob = await res.blob()