From c7ccc5a8804537a40a631d85791e43fdc9a1f951 Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sat, 20 Feb 2021 10:54:00 -0500
Subject: [PATCH 01/11] change default layout to be same as root, remove root
 layout

---
 components/layouts/Default.js | 36 +++++++------
 components/layouts/Root.js    | 97 -----------------------------------
 pages/index.js                |  3 --
 pages/tx/2021/index.js        |  4 +-
 pages/wi/2020/index.js        |  4 +-
 5 files changed, 23 insertions(+), 121 deletions(-)
 delete mode 100644 components/layouts/Root.js

diff --git a/components/layouts/Default.js b/components/layouts/Default.js
index 5618b52e..d5cd62d2 100644
--- a/components/layouts/Default.js
+++ b/components/layouts/Default.js
@@ -1,17 +1,17 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { ThemeProvider } from 'styled-components';
-import { DefaultSeo, LogoJsonLd } from 'next-seo';
+import { DefaultSeo, LogoJsonLd, SocialProfileJsonLd } from 'next-seo';
 import { useRouter } from 'next/router';
 // import LogRocket from 'logrocket';
 import * as Sentry from '@sentry/browser';
-import { isNil } from 'lodash';
+import { isNil, map } from 'lodash';
 
 import GlobalStyle from '../../styles/globalStyle';
 import baseTheme from '../../styles/baseTheme';
 import Meta from '../Meta';
-import Header from '../Header/default';
+import Header from '../Header/root';
 import Footer from '../Footer';
-import { defaultSeo } from '../../utilities';
+import { rootSeo, socialConstants } from '../../utilities';
 import User from '../User';
 import { useFetchUser } from '../../hooks/user';
 import {
@@ -21,17 +21,12 @@ import {
   InnerPage,
 } from '../shared/StandardStyles';
 
-const Default = ({ children, headerType }) => {
+const Default = ({ children }) => {
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
-  const [layeredHeader, setLayeredHeader] = useState(false);
 
   const { user, loading } = useFetchUser();
   const router = useRouter();
 
-  useEffect(() => {
-    setLayeredHeader(headerType === 'layered');
-  });
-
   if (!isNil(user)) {
     document.tidioIdentify = {
       distinct_id: user.id,
@@ -51,6 +46,11 @@ const Default = ({ children, headerType }) => {
     });
   }
 
+  const socialUrls = map(
+    socialConstants.thatSocialLinks,
+    socialLink => socialLink.url,
+  );
+
   return (
     <ThemeProvider theme={baseTheme}>
       <>
@@ -58,12 +58,19 @@ const Default = ({ children, headerType }) => {
         <StyledPage>
           <Meta />
           <DefaultSeo
-            {...defaultSeo}
+            {...rootSeo}
             canonical={`https://www.thatconference.com/${router.pathname}`}
           />
           <LogoJsonLd
-            logo="https://www.thatconference.com/svgs/THATConference-WI.svg"
-            url={`https://www.thatconference.com/${router.pathname}`}
+            logo="https://www.thatconference.com/svgs/THAT.svg"
+            url="https://www.thatconference.com"
+          />
+          <SocialProfileJsonLd
+            type="Organization"
+            name="THAT"
+            url="http://www.thatconference.com"
+            logo="https://www.thatconference.com/svgs/THAT.svg"
+            sameAs={socialUrls}
           />
           <CorePage>
             <User user={user} loading={loading}>
@@ -71,7 +78,6 @@ const Default = ({ children, headerType }) => {
                 <Header
                   user={user}
                   loading={loading}
-                  layered={layeredHeader}
                   mobileMenuOpen={mobileMenuOpen}
                   setMobileMenuOpen={setMobileMenuOpen}
                 />
diff --git a/components/layouts/Root.js b/components/layouts/Root.js
deleted file mode 100644
index d5cd62d2..00000000
--- a/components/layouts/Root.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { useState } from 'react';
-import { ThemeProvider } from 'styled-components';
-import { DefaultSeo, LogoJsonLd, SocialProfileJsonLd } from 'next-seo';
-import { useRouter } from 'next/router';
-// import LogRocket from 'logrocket';
-import * as Sentry from '@sentry/browser';
-import { isNil, map } from 'lodash';
-
-import GlobalStyle from '../../styles/globalStyle';
-import baseTheme from '../../styles/baseTheme';
-import Meta from '../Meta';
-import Header from '../Header/root';
-import Footer from '../Footer';
-import { rootSeo, socialConstants } from '../../utilities';
-import User from '../User';
-import { useFetchUser } from '../../hooks/user';
-import {
-  StyledPage,
-  CorePage,
-  PageDiv,
-  InnerPage,
-} from '../shared/StandardStyles';
-
-const Default = ({ children }) => {
-  const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
-
-  const { user, loading } = useFetchUser();
-  const router = useRouter();
-
-  if (!isNil(user)) {
-    document.tidioIdentify = {
-      distinct_id: user.id,
-      email: user.email,
-    };
-
-    // LogRocket.identify(user.id, {
-    //   email: user.email,
-    // });
-
-    Sentry.configureScope(scope => {
-      scope.setUser({
-        email: user.email,
-        id: user.id,
-      });
-      // scope.setExtra('sessionURL', LogRocket.sessionURL);
-    });
-  }
-
-  const socialUrls = map(
-    socialConstants.thatSocialLinks,
-    socialLink => socialLink.url,
-  );
-
-  return (
-    <ThemeProvider theme={baseTheme}>
-      <>
-        <GlobalStyle />
-        <StyledPage>
-          <Meta />
-          <DefaultSeo
-            {...rootSeo}
-            canonical={`https://www.thatconference.com/${router.pathname}`}
-          />
-          <LogoJsonLd
-            logo="https://www.thatconference.com/svgs/THAT.svg"
-            url="https://www.thatconference.com"
-          />
-          <SocialProfileJsonLd
-            type="Organization"
-            name="THAT"
-            url="http://www.thatconference.com"
-            logo="https://www.thatconference.com/svgs/THAT.svg"
-            sameAs={socialUrls}
-          />
-          <CorePage>
-            <User user={user} loading={loading}>
-              <PageDiv mobileMenuOpen={mobileMenuOpen}>
-                <Header
-                  user={user}
-                  loading={loading}
-                  mobileMenuOpen={mobileMenuOpen}
-                  setMobileMenuOpen={setMobileMenuOpen}
-                />
-                <InnerPage>
-                  {React.cloneElement(children, { user, loading })}
-                </InnerPage>
-                <Footer modifiers="site" />
-              </PageDiv>
-            </User>
-          </CorePage>
-        </StyledPage>
-      </>
-    </ThemeProvider>
-  );
-};
-
-export default Default;
diff --git a/pages/index.js b/pages/index.js
index 4426e76d..ba1c7502 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { NextSeo } from 'next-seo';
-import RootLayout from '../components/layouts/Root';
 
 import ContentSection from '../components/shared/ContentSection';
 
@@ -57,6 +56,4 @@ const index = () => {
   );
 };
 
-index.Layout = RootLayout;
-
 export default index;
diff --git a/pages/tx/2021/index.js b/pages/tx/2021/index.js
index d5bbc24e..bc16efdf 100644
--- a/pages/tx/2021/index.js
+++ b/pages/tx/2021/index.js
@@ -3,13 +3,11 @@
  */
 
 import React from 'react';
-import RootLayout from '../../../components/layouts/Root';
+
 import ComingSoon from '../../../components/EventPages/ComingSoon';
 
 const Index = () => {
   return <ComingSoon />;
 };
 
-Index.Layout = RootLayout;
-
 export default Index;
diff --git a/pages/wi/2020/index.js b/pages/wi/2020/index.js
index c721e5d1..dd07d1c2 100644
--- a/pages/wi/2020/index.js
+++ b/pages/wi/2020/index.js
@@ -3,7 +3,7 @@
  */
 
 import React from 'react';
-import RootLayout from '../../../components/layouts/Root';
+
 import OneDayEvent from '../../../components/EventPages/OneDayEvent';
 
 const TICKETS = [
@@ -72,8 +72,6 @@ const Index = ({ eventSlug }) => {
   return <OneDayEvent eventSlug={eventSlug.substring(1)} tickets={TICKETS} />;
 };
 
-Index.Layout = RootLayout;
-
 Index.getInitialProps = async context => {
   return { eventSlug: context.pathname };
 };

From 46eeaa3bd3283c282378b10473baa6b566ed72e7 Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sat, 20 Feb 2021 11:13:12 -0500
Subject: [PATCH 02/11] fix hero padding wi2021 home page

---
 components/EventHomePage/Hero.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/EventHomePage/Hero.js b/components/EventHomePage/Hero.js
index 44ff0461..a016b8e1 100644
--- a/components/EventHomePage/Hero.js
+++ b/components/EventHomePage/Hero.js
@@ -80,6 +80,7 @@ const Main = styled.div`
   flex-direction: row;
   margin: auto;
   justify-content: center;
+  padding-top: 5rem;
 
   ${below[twoColBp]`
     flex-direction: column;

From f59f026256ddb462986f2851363df1fb38b70a57 Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sat, 20 Feb 2021 12:36:02 -0500
Subject: [PATCH 03/11] standardized top padding blog entry page

---
 pages/blog/[post].js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/blog/[post].js b/pages/blog/[post].js
index 8d6ad28c..7f68fe01 100644
--- a/pages/blog/[post].js
+++ b/pages/blog/[post].js
@@ -13,7 +13,7 @@ import ContentSection from '../../components/shared/ContentSection';
 const SlimContentSection = styled(ContentSection)`
   width: 70vw;
   margin: auto;
-  padding-top: 0;
+  padding-top: 5;
 
   ${below.small`
     width 100vw;

From f56a17ad78bc79ef4c79f588349907b9e3bf3e7d Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sat, 20 Feb 2021 12:38:44 -0500
Subject: [PATCH 04/11] standardize top padding session edit

---
 pages/member/session-edit/[sessionId].js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/member/session-edit/[sessionId].js b/pages/member/session-edit/[sessionId].js
index 01c49408..6726a638 100644
--- a/pages/member/session-edit/[sessionId].js
+++ b/pages/member/session-edit/[sessionId].js
@@ -49,7 +49,7 @@ const Title = styled.h1`
 `;
 
 const MainContent = styled(ContentSection)`
-  padding-top: 0;
+  padding-top: 5;
 `;
 
 const SessionEdit = ({ user, loading: loadingUser, sessionId }) => {

From 24fcc3e43003b4a0c7b0bd67b206e85af5dc984a Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sat, 20 Feb 2021 12:39:46 -0500
Subject: [PATCH 05/11] standardize top padding session-preview

---
 pages/member/session-preview/[sessionId].js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/member/session-preview/[sessionId].js b/pages/member/session-preview/[sessionId].js
index 8a98ccee..7e79622b 100644
--- a/pages/member/session-preview/[sessionId].js
+++ b/pages/member/session-preview/[sessionId].js
@@ -38,7 +38,7 @@ const MainGrid = styled(Grid)`
 `;
 
 const MainContent = styled(ContentSection)`
-  padding-top: 0;
+  padding-top: 5;
 `;
 
 const SessionEdit = ({ user, loading: loadingUser, sessionId }) => {

From d27c7eab9437aa58e04921787f8c47b0f03b728b Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sat, 20 Feb 2021 12:53:38 -0500
Subject: [PATCH 06/11] remove gap top of partner-detail

---
 components/PartnerDetail/HeroSection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/PartnerDetail/HeroSection.js b/components/PartnerDetail/HeroSection.js
index a4a61594..894bbb5b 100644
--- a/components/PartnerDetail/HeroSection.js
+++ b/components/PartnerDetail/HeroSection.js
@@ -23,7 +23,7 @@ const HeroBlock = styled.div`
   height: 75rem;
   align-items: center;
   justify-content: center;
-  margin-top: 5rem;
+  margin-top: 0;
 
   ${below.med`
     height: 43.3rem;

From c542e6dd8b50e3e790fb8e569a46cd8b79b07c4d Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sat, 20 Feb 2021 13:00:04 -0500
Subject: [PATCH 07/11] update wi redirect to wi 2021

---
 pages/wi/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/wi/index.js b/pages/wi/index.js
index c1a62ca9..caf4e033 100644
--- a/pages/wi/index.js
+++ b/pages/wi/index.js
@@ -8,4 +8,4 @@ import redirect from '../../components/shared/Redirect';
  * TO DO: hardcoded for now, eventually be great to have this
  * dynamically pull current event for location
  */
-export default redirect('/wi/2020');
+export default redirect('/wi/2021');

From 5829201de2597a8d59359fd873ac1b2dd78f123c Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sat, 20 Feb 2021 13:21:07 -0500
Subject: [PATCH 08/11] fix stepper negative margin pulling into header

---
 components/shared/Stepper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/shared/Stepper.js b/components/shared/Stepper.js
index 7a795fad..4f1d23e7 100644
--- a/components/shared/Stepper.js
+++ b/components/shared/Stepper.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 const Container = styled.div`
-  margin-top: -10rem;
+  margin-top: 0;
   margin-bottom: 4rem;
 `;
 

From bc8a0ab30491dfe3ca206c4aeb8baa9752766f15 Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sat, 20 Feb 2021 13:46:46 -0500
Subject: [PATCH 09/11] fix header spacing on markdown pages

---
 components/shared/MarkdownSection.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/shared/MarkdownSection.js b/components/shared/MarkdownSection.js
index 53c2853a..3a6e13cc 100644
--- a/components/shared/MarkdownSection.js
+++ b/components/shared/MarkdownSection.js
@@ -14,6 +14,11 @@ const StyledContentSection = styled(ContentSection)`
       outline: none;
     }
   }
+
+  h2 {
+    margin-top: 0;
+    margin-bottom: 2rem;
+  }
 `;
 
 const replaceVariables = (markdownBody, variables) => {

From c592f75e616561e8407f0d06131c4cc4a097b79a Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Sun, 21 Feb 2021 10:33:02 -0500
Subject: [PATCH 10/11] fix broken links on event home page

---
 components/EventHomePage/LearnMore.js | 2 +-
 utilities/index.js                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/EventHomePage/LearnMore.js b/components/EventHomePage/LearnMore.js
index 18334ce6..e979c067 100644
--- a/components/EventHomePage/LearnMore.js
+++ b/components/EventHomePage/LearnMore.js
@@ -98,7 +98,7 @@ const LearnMore = ({ className }) => {
               hoverBackgroundColor="thatBlue"
             />
             <LinkButton
-              href="/wi/faq"
+              href="/wi/2021/faq"
               label="FAQ"
               borderColor="thatBlue"
               className="stretch-sm"
diff --git a/utilities/index.js b/utilities/index.js
index 1e72a5c8..f1d00226 100644
--- a/utilities/index.js
+++ b/utilities/index.js
@@ -7,4 +7,4 @@ export * from './svgs';
 export * from './themeColorNames';
 export * from './utilityFunctions';
 export * from './validation';
-export const DEFAULT_WIP_PAGE = 'work-in-progress';
+export const DEFAULT_WIP_PAGE = '/work-in-progress';

From 2dbdbb8e5755dd8e5d2d4731fec728b81bbc5557 Mon Sep 17 00:00:00 2001
From: Al Zaudtke <azaudtke@jjkeller.com>
Date: Wed, 24 Feb 2021 16:55:24 -0500
Subject: [PATCH 11/11] fix forward ref console error

---
 components/Header/root.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/components/Header/root.js b/components/Header/root.js
index cd0a90c6..ff2d9af6 100644
--- a/components/Header/root.js
+++ b/components/Header/root.js
@@ -16,7 +16,7 @@ const StyledIcon = styled(Icon)`
   &:hover {
     cursor: pointer;
   }
-
+  margin-top: 1rem;
   ${below.small`    
     height: 7rem;
   `};
@@ -95,12 +95,14 @@ const RootHeader = ({ className, loading, user }) => {
   return (
     <header className={className}>
       <Link href="/" prefetch={false}>
-        <StyledIcon
-          icon="thatLogo"
-          width="250"
-          height="50"
-          viewBoxWidth="400"
-        />
+        <a href="/">
+          <StyledIcon
+            icon="thatLogo"
+            width="250"
+            height="50"
+            viewBoxWidth="400"
+          />
+        </a>
       </Link>
       <div style={{ flexGrow: 2 }} />