Merge remote-tracking branch 'origin/develop' into jerel/apple-style-…

…tutorial

package.json

@@ -22,12 +22,12 @@
     "gatsby-plugin-google-tagmanager": "^2.3.5",
     "gatsby-plugin-layout": "^1.3.10",
     "gatsby-plugin-manifest": "^2.4.20",
-    "gatsby-plugin-mdx": "^1.2.40",
+    "gatsby-plugin-mdx": "^1.2.42",
     "gatsby-plugin-meta-redirect": "^1.1.1",
     "gatsby-plugin-newrelic": "newrelic/gatsby-plugin-newrelic.git#5cd42e832f0588764dc332ce7ebd05794de5106a",
     "gatsby-plugin-offline": "^3.2.17",
     "gatsby-plugin-react-helmet": "^3.3.10",
-    "gatsby-plugin-robots-txt": "^1.5.2",
+    "gatsby-plugin-robots-txt": "^1.5.3",
     "gatsby-plugin-sass": "^2.3.12",
     "gatsby-plugin-sharp": "^2.6.21",
     "gatsby-plugin-sitemap": "^2.4.11",
@@ -53,7 +53,7 @@
     "react-simple-code-editor": "^0.11.0",
     "react-typist": "^2.0.5",
     "react-use": "^15.3.4",
-    "snyk": "^1.401.0",
+    "snyk": "^1.402.0",
     "use-dark-mode": "^2.3.1",
     "use-media": "^1.4.0",
     "warning": "^4.0.3",

src/pages/apj-nerd-days.js

@@ -270,7 +270,7 @@ const NerdDaysPage = () => {
                 icon={<TrackFeatherIcon name="eye" size="87px" />}
               />
               <TrackItem
-                name="Modernisation"
+                name="Cloud & DevOps"
                 icon={<img src={openSourceIcon} alt="open source" />}
               />
               <TrackItem
@@ -298,12 +298,16 @@ const NerdDaysPage = () => {
                 margin: 0 auto;
               `}
               mobileBreakpoint="1000px"
-              tracks={['Observability', 'Open source', 'Fundamentals']}
+              tracks={[
+                'Fundamentals',
+                'Observability & Open source',
+                'Cloud & DevOps',
+              ]}
             >
               <Agenda.Session
                 time="12:00 PM"
                 title="Keynote: Observability For Good"
-                speaker="Lew Cirne with Jill & Dmitri opening"
+                speaker="Lew Cirne with Jill Macmurchy opening"
                 track={null}
                 span={3}
               />
@@ -364,7 +368,7 @@ const NerdDaysPage = () => {
               />
               <Agenda.Session
                 time="3:30 PM"
-                title="Measuring code pipelines"
+                title="Microservices Observability with Service Mesh and New Relic One"
                 speaker="Nik Jain"
               />
               <Agenda.Session

src/pages/emea-nerd-days.js

@@ -189,7 +189,8 @@ const NerdDaysPage = () => {
                 <p>
                   <strong>Date:</strong> November 10, 2020
                   <br />
-                  <strong>Time:</strong> 9AM GMT - 3PM GMT
+                  <strong>Time:</strong> 9:45AM GMT - 3:30 - 4 pm GMT (Depending
+                  on last session)
                 </p>
                 <p>
                   We look forward to building with you during Nerd Days! If you

src/pages/index.js

@@ -57,7 +57,7 @@ const IndexPage = ({ data, pageContext }) => {
     <PageContext.Provider value={pageContext}>
       <SEO />
       <PageLayout type={PageLayout.TYPE.SINGLE_COLUMN}>
-        <PageLayout.Header title="Mark your calendar for Nerd Days 1.0" />
+        <PageLayout.Header title="Mark your calendar for Nerd Days 1.0 APAC" />
 
         <PageLayout.Content>
           <section
@@ -69,20 +69,19 @@ const IndexPage = ({ data, pageContext }) => {
             <div className={styles.introText}>
               <p>
                 Nerd Days is a <strong>FREE</strong> engineering conference that
-                kicks off October 13 (Dates vary by region). Focused on building
-                more perfect software, our goal is to spend less time looking at
-                slides that tell you what software can do and more time on
-                getting your hands on the software to solve problems
-                efficiently.
+                kicks off October 22 (APAC). Focused on building more perfect
+                software, our goal is to spend less time looking at slides that
+                tell you what software can do and more time on getting your
+                hands on the software to solve problems efficiently.
               </p>
               <Countdown
-                targetDate="October 13 2020 9:00:00 PDT"
-                inactiveMessage="Countdown to Nerd Days"
+                targetDate="October 22 2020 6:00:00 PDT"
+                inactiveMessage="Countdown to Nerd Days APAC"
               />
               <p>
                 <Button
                   as={Link}
-                  to="/nerd-days"
+                  to="/apj-nerd-days"
                   variant={Button.VARIANT.PRIMARY}
                 >
                   Register

src/pages/nerd-days.js

@@ -20,7 +20,6 @@ import heroBackgroundPattern from '../images/nerd-days/nerd-days-hero-bg-pattern
 import shapesIcon from '../images/nerd-days/icon-shapes.svg';
 import openSourceIcon from '../images/nerd-days/icon-open-source.svg';
 import HopinLogo from '../components/HopinLogo';
-import MarketoForm from '../components/MarketoForm';
 import styled from '@emotion/styled';
 import Agenda from '../components/Agenda';
 
@@ -234,13 +233,9 @@ const NerdDaysPage = () => {
                   have any questions about Nerd Days please emails{' '}
                   <a href="mailto:[email protected]">[email protected]</a>.
                 </p>
-                <h3
-                  css={css`
-                    margin: 25px 0 0 0;
-                  `}
-                >
-                  Additional Nerd Days Events
-                </h3>
+              </div>
+              <div>
+                <h3>Upcoming Nerd Days</h3>
                 <ul
                   css={css`
                     padding: 0;
@@ -263,13 +258,6 @@ const NerdDaysPage = () => {
                   </CtaItem>
                 </ul>
               </div>
-              <MarketoForm
-                id={4783}
-                title="REGISTER FOR NERD DAYS | AMERICAS"
-                munchkinId="412-MZS-894"
-                publishableKey="pk_4d10daa544de6f993a9a9ce002ccd1c6"
-                redirectLink="/nerd-days-thank-you"
-              />
             </div>
           </Section>
           <Section className={cx(styles.speakersSection)}>
@@ -929,7 +917,7 @@ const CtaItem = ({ date, to, children }) => (
   <li
     css={css`
       margin-top: 0.5rem;
-      margin-right: 1.25rem;
+      margin-right: 0.5rem;
       display: flex;
       flex-direction: column;
       justify-content: center;