From f65c7e26079caa2d438d53d481f440393d42b74d Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 11 Nov 2019 23:06:48 +0000
Subject: [PATCH 1/5] feat: add a CoC Reporting page

---
 src/components/Thanks.js          | 19 +---------
 src/components/footer/elements.js |  6 +++
 src/components/footer/index.js    | 31 ++++++++++++++++
 src/components/layout/index.js    |  2 +
 src/pages/_main.js                |  9 +----
 src/pages/code-of-conduct.js      | 28 +++++++++-----
 src/pages/flags.js                |  2 -
 src/pages/report.js               | 62 +++++++++++++++++++++++++++++++
 8 files changed, 122 insertions(+), 37 deletions(-)
 create mode 100644 src/components/footer/elements.js
 create mode 100644 src/components/footer/index.js
 create mode 100644 src/pages/report.js

diff --git a/src/components/Thanks.js b/src/components/Thanks.js
index 3b239a8f..7974f6d7 100644
--- a/src/components/Thanks.js
+++ b/src/components/Thanks.js
@@ -1,5 +1,4 @@
 import React from 'react'
-import { Link } from 'gatsby'
 import styled from 'styled-components'
 
 const Thanks = styled.ul`
@@ -13,7 +12,7 @@ const Thanks = styled.ul`
   }
 `
 
-export default ({ thanks, mainOrganizer, site }) => {
+export default ({ thanks }) => {
   return (
     <>
       <Thanks>
@@ -25,22 +24,6 @@ export default ({ thanks, mainOrganizer, site }) => {
           </li>
         ))}
       </Thanks>
-      We have a{' '}
-      <Link state={{ organizer: mainOrganizer, site: site }} to="/code-of-conduct">
-        Code of Conduct
-      </Link>
-      .
-      <br />
-      <Link state={{ site: site }} to="/flags">
-        What's with all the flags?
-      </Link>
-      <br />
-      Follow QueerJS on{' '}
-      <a href="https://twitter.com/queerjs" title="Follow us on Twitter">
-        Twitter
-      </a>
-      <br />
-      <br />
     </>
   )
 }
diff --git a/src/components/footer/elements.js b/src/components/footer/elements.js
new file mode 100644
index 00000000..306328a9
--- /dev/null
+++ b/src/components/footer/elements.js
@@ -0,0 +1,6 @@
+import styled from 'styled-components'
+
+export const FooterWrap = styled.div`
+  position:sticky;
+  bottom:0;
+`
diff --git a/src/components/footer/index.js b/src/components/footer/index.js
new file mode 100644
index 00000000..a7aaa216
--- /dev/null
+++ b/src/components/footer/index.js
@@ -0,0 +1,31 @@
+import React from 'react'
+import { Link } from 'gatsby'
+import { FooterWrap } from './elements'
+
+const Footer = () => {
+  const site = {
+    title: 'QueerJS',
+    description: 'A meetup for everyone where Queer Speakers take the stage'
+  }
+
+  return (
+    <FooterWrap>
+      We have a{' '}
+      <Link to="/code-of-conduct"> Code of Conduct</Link>
+      .
+      <br />
+      <Link state={{ site: site }} to="/flags">
+        What's with all the flags?
+      </Link>
+      <br />
+      Follow QueerJS on{' '}
+      <a href="https://twitter.com/queerjs" title="Follow us on Twitter">
+        Twitter
+      </a>
+      <br />
+      <br />
+    </FooterWrap>
+    )
+}
+
+export default Footer
diff --git a/src/components/layout/index.js b/src/components/layout/index.js
index 8a6eb2f0..d60c1c14 100644
--- a/src/components/layout/index.js
+++ b/src/components/layout/index.js
@@ -2,6 +2,7 @@ import React from 'react'
 import Header from '../header'
 import { ThemeProvider } from 'styled-components'
 import { theme, Global, Wrapper, SubWrapper, SideRainbow } from './elements'
+import Footer from '../../components/footer'
 
 const Layout = ({ children, siteTitle }) => (
   <ThemeProvider theme={theme}>
@@ -11,6 +12,7 @@ const Layout = ({ children, siteTitle }) => (
       <Wrapper>
         <Header siteTitle={siteTitle} />
         <SubWrapper>{children}</SubWrapper>
+        <Footer/>
       </Wrapper>
     </>
   </ThemeProvider>
diff --git a/src/pages/_main.js b/src/pages/_main.js
index 51704542..8600222b 100644
--- a/src/pages/_main.js
+++ b/src/pages/_main.js
@@ -10,7 +10,7 @@ import Panel from '../components/Panel'
 import Heading from '../components/Heading'
 
 const Main = ({ city, attendees }) => {
-  const { site, organizers, mainOrganizer, thanks, speakers, sponsors, info } = city
+  const { site, thanks, speakers, sponsors, info } = city
 
   return (
     <Layout>
@@ -54,12 +54,7 @@ const Main = ({ city, attendees }) => {
       </section>
 
       <Panel heading={thanks && thanks.length ? 'Special Thanks' : null}>
-        <Thanks
-          organizers={organizers}
-          thanks={thanks || []}
-          site={site}
-          mainOrganizer={(mainOrganizer || []).find(o => o.main)}
-        />
+        <Thanks thanks={thanks || []} />
       </Panel>
     </Layout>
   )
diff --git a/src/pages/code-of-conduct.js b/src/pages/code-of-conduct.js
index 060d9a0a..71cd18b0 100644
--- a/src/pages/code-of-conduct.js
+++ b/src/pages/code-of-conduct.js
@@ -3,13 +3,7 @@ import SEO from '../components/seo'
 import Layout from '../containers/layout'
 import Panel from '../components/Panel'
 
-const CodeOfConduct = ({ location }) => {
-  const organizer = (location.state || {}).organizer || {
-    name: 'Sara Vieira',
-    phoneNumber: '+351 91 7296 830',
-    email: 'hey@iamsaravieira.com',
-    twitterHandle: '@NikkitaFTW'
-  }
+const CodeOfConduct = () => {
   return (
     <Layout>
       <SEO
@@ -33,7 +27,14 @@ const CodeOfConduct = ({ location }) => {
               from all participants to help ensuring a safe environment for everybody.
             </p>
             <p>
-              Need Help? Contact {organizer.name} {organizer.phoneNumber}
+              {' '}
+              <a
+                href="/report"
+                rel="noopener noreferrer"
+                title="Code of Conduct"
+              >
+                Report an Issue
+              </a>.
             </p>
 
             <h2>The Quick Version</h2>
@@ -74,8 +75,15 @@ const CodeOfConduct = ({ location }) => {
               please notify a QueerJS organizer as soon as possible.
             </p>
             <p>
-              If you can’t find the organizer, reach out to {organizer.name} at {organizer.email} /{' '}
-              {organizer.phoneNumber} / {organizer.twitterHandle}
+              If you can’t find the organizer, please
+              {' '}
+              <a
+                href="/report"
+                rel="noopener noreferrer"
+                title="Code of Conduct"
+              >
+                Report an Issue
+              </a>.
             </p>
             <p>
               Conference staff will be happy to help participants and assist those experiencing
diff --git a/src/pages/flags.js b/src/pages/flags.js
index 02a193af..abcc650e 100644
--- a/src/pages/flags.js
+++ b/src/pages/flags.js
@@ -58,7 +58,6 @@ const OrganizersPage = ({ location }) => {
         </Panel>
       </main>
       <Thanks
-        organizers={[]}
         thanks={[
           {
             link: 'https://www.flaticon.com',
@@ -66,7 +65,6 @@ const OrganizersPage = ({ location }) => {
             reason: 'icons'
           }
         ]}
-        site={site}
       />
     </Layout>
   )
diff --git a/src/pages/report.js b/src/pages/report.js
new file mode 100644
index 00000000..419f263d
--- /dev/null
+++ b/src/pages/report.js
@@ -0,0 +1,62 @@
+import React from 'react'
+import SEO from '../components/seo'
+import Layout from '../containers/layout'
+import Panel from '../components/Panel'
+
+const Report = () => {
+  const contactInfo = {
+    email: 'coc@queerjs.com',
+    twitterHandle: '@QueerJS'
+  }
+
+  return (
+    <Layout>
+      <SEO
+        title="QueerJS - Code Of Conduct"
+        description="A meetup for everyone where Queer Speakers take the stage"
+      />
+      <main>
+        <h1 hidden>Welcome to QueerJS</h1>
+        <Panel heading="Code of Conduct - Report An Issue">
+          <section
+            css={`
+              line-height: 1.5;
+            `}
+          >
+            <p>
+              We want QueerJS to be a safe and inclusive environment.  That’s why we ask our attendees to follow our
+              <a
+                href="/code-of-conduct"
+                rel="noopener noreferrer"
+                title="Code of Conduct"
+              >
+              Code of Conduct
+              </a>!
+              .
+            </p>
+            <p>
+            In the unfortunate case that you see someone violating the code of conduct, here are some ways you can report it to us:
+            </p>
+            <ul>
+              <li>-  Send a DM to {contactInfo.twitterHandle}</li>
+              <li>- Let a
+                {' '}
+                <a
+                  href="/organizers"
+                  rel="noopener noreferrer"
+                  title="Code of Conduct"
+                >
+                Core Team
+                </a> 
+                {' '}
+                organizer know, either in person or via Twitter.</li>
+              <li>- Send an email to {contactInfo.email}</li>
+            </ul>
+          </section>
+        </Panel>
+      </main>
+    </Layout>
+  )
+}
+
+export default Report

From 03a023efe8fbfa8d1b7f7c5ffd70459e3bc49bca Mon Sep 17 00:00:00 2001
From: Sara <hey@iamsaravieira.com>
Date: Tue, 12 Nov 2019 00:33:18 +0100
Subject: [PATCH 2/5] omgad grid

---
 src/components/footer/elements.js |  3 +--
 src/components/header/elements.js |  1 -
 src/components/layout/elements.js |  3 +++
 src/pages/code-of-conduct.js      | 22 +++++++----------
 src/pages/report.js               | 39 ++++++++++++++-----------------
 5 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/src/components/footer/elements.js b/src/components/footer/elements.js
index 306328a9..b655e75b 100644
--- a/src/components/footer/elements.js
+++ b/src/components/footer/elements.js
@@ -1,6 +1,5 @@
 import styled from 'styled-components'
 
 export const FooterWrap = styled.div`
-  position:sticky;
-  bottom:0;
+  bottom: 0;
 `
diff --git a/src/components/header/elements.js b/src/components/header/elements.js
index 173c5e29..29df7948 100644
--- a/src/components/header/elements.js
+++ b/src/components/header/elements.js
@@ -4,7 +4,6 @@ import { Link } from 'gatsby'
 import styled, { css } from 'styled-components'
 
 export const Nav = styled.nav`
-  margin: auto;
   padding: 3em 0 1.5em;
   @media screen and (max-width: 38em) {
     padding: 0.5em 0 0;
diff --git a/src/components/layout/elements.js b/src/components/layout/elements.js
index 44770989..0f163c27 100644
--- a/src/components/layout/elements.js
+++ b/src/components/layout/elements.js
@@ -70,6 +70,9 @@ export const Wrapper = styled.main`
   width: 80%;
   max-width: 56em;
   margin: auto;
+  display: grid;
+  grid-template-rows: auto 1fr 100px;
+  height: 100%;
 `
 
 export const SubWrapper = styled.div``
diff --git a/src/pages/code-of-conduct.js b/src/pages/code-of-conduct.js
index 71cd18b0..b5c9d56d 100644
--- a/src/pages/code-of-conduct.js
+++ b/src/pages/code-of-conduct.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import SEO from '../components/seo'
+import { Link } from 'gatsby'
 import Layout from '../containers/layout'
 import Panel from '../components/Panel'
 
@@ -28,13 +29,10 @@ const CodeOfConduct = () => {
             </p>
             <p>
               {' '}
-              <a
-                href="/report"
-                rel="noopener noreferrer"
-                title="Code of Conduct"
-              >
+              <Link to="/report" title="Code of Conduct">
                 Report an Issue
-              </a>.
+              </Link>
+              .
             </p>
 
             <h2>The Quick Version</h2>
@@ -75,15 +73,11 @@ const CodeOfConduct = () => {
               please notify a QueerJS organizer as soon as possible.
             </p>
             <p>
-              If you can’t find the organizer, please
-              {' '}
-              <a
-                href="/report"
-                rel="noopener noreferrer"
-                title="Code of Conduct"
-              >
+              If you can’t find the organizer, please{' '}
+              <a href="/report" rel="noopener noreferrer" title="Code of Conduct">
                 Report an Issue
-              </a>.
+              </a>
+              .
             </p>
             <p>
               Conference staff will be happy to help participants and assist those experiencing
diff --git a/src/pages/report.js b/src/pages/report.js
index 419f263d..b4f11b21 100644
--- a/src/pages/report.js
+++ b/src/pages/report.js
@@ -2,6 +2,7 @@ import React from 'react'
 import SEO from '../components/seo'
 import Layout from '../containers/layout'
 import Panel from '../components/Panel'
+import { Link } from 'gatsby'
 
 const Report = () => {
   const contactInfo = {
@@ -24,32 +25,26 @@ const Report = () => {
             `}
           >
             <p>
-              We want QueerJS to be a safe and inclusive environment.  That’s why we ask our attendees to follow our
-              <a
-                href="/code-of-conduct"
-                rel="noopener noreferrer"
-                title="Code of Conduct"
-              >
-              Code of Conduct
-              </a>!
-              .
+              We want QueerJS to be a safe and inclusive environment. That’s why we ask our
+              attendees to follow our{' '}
+              <Link to="/code-of-conduct" title="Code of Conduct">
+                Code of Conduct
+              </Link>
+              ! .
             </p>
             <p>
-            In the unfortunate case that you see someone violating the code of conduct, here are some ways you can report it to us:
+              In the unfortunate case that you see someone violating the code of conduct, here are
+              some ways you can report it to us:
             </p>
             <ul>
-              <li>-  Send a DM to {contactInfo.twitterHandle}</li>
-              <li>- Let a
-                {' '}
-                <a
-                  href="/organizers"
-                  rel="noopener noreferrer"
-                  title="Code of Conduct"
-                >
-                Core Team
-                </a> 
-                {' '}
-                organizer know, either in person or via Twitter.</li>
+              <li>- Send a DM to {contactInfo.twitterHandle}</li>
+              <li>
+                - Let a{' '}
+                <a href="/organizers" rel="noopener noreferrer" title="Code of Conduct">
+                  Core Team
+                </a>{' '}
+                organizer know, either in person or via Twitter.
+              </li>
               <li>- Send an email to {contactInfo.email}</li>
             </ul>
           </section>

From d8e8a6fd1456d95f711fa2af964f76094cc7196a Mon Sep 17 00:00:00 2001
From: Sara <hey@iamsaravieira.com>
Date: Tue, 12 Nov 2019 00:36:35 +0100
Subject: [PATCH 3/5] space out

---
 src/pages/code-of-conduct.js | 6 +++++-
 src/pages/report.js          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/code-of-conduct.js b/src/pages/code-of-conduct.js
index b5c9d56d..463c3ee2 100644
--- a/src/pages/code-of-conduct.js
+++ b/src/pages/code-of-conduct.js
@@ -11,7 +11,11 @@ const CodeOfConduct = () => {
         title="QueerJS - Code Of Conduct"
         description="A meetup for everyone where Queer Speakers take the stage"
       />
-      <main>
+      <main
+        css={`
+          margin-bottom: 40px;
+        `}
+      >
         <h1 hidden>Welcome to QueerJS</h1>
         <Panel heading="Code of Conduct">
           <section
diff --git a/src/pages/report.js b/src/pages/report.js
index b4f11b21..ca89f8e0 100644
--- a/src/pages/report.js
+++ b/src/pages/report.js
@@ -30,7 +30,7 @@ const Report = () => {
               <Link to="/code-of-conduct" title="Code of Conduct">
                 Code of Conduct
               </Link>
-              ! .
+              !
             </p>
             <p>
               In the unfortunate case that you see someone violating the code of conduct, here are

From a0ad818d1a70c731aa26d49c2ee63df460a0f8a9 Mon Sep 17 00:00:00 2001
From: Sara <hey@iamsaravieira.com>
Date: Tue, 12 Nov 2019 00:39:26 +0100
Subject: [PATCH 4/5] change a to Link

---
 src/pages/code-of-conduct.js | 4 ++--
 src/pages/report.js          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/code-of-conduct.js b/src/pages/code-of-conduct.js
index 463c3ee2..499a0ac2 100644
--- a/src/pages/code-of-conduct.js
+++ b/src/pages/code-of-conduct.js
@@ -78,9 +78,9 @@ const CodeOfConduct = () => {
             </p>
             <p>
               If you can’t find the organizer, please{' '}
-              <a href="/report" rel="noopener noreferrer" title="Code of Conduct">
+              <Link to="/report" title="Code of Conduct">
                 Report an Issue
-              </a>
+              </Link>
               .
             </p>
             <p>
diff --git a/src/pages/report.js b/src/pages/report.js
index ca89f8e0..47e7747a 100644
--- a/src/pages/report.js
+++ b/src/pages/report.js
@@ -40,9 +40,9 @@ const Report = () => {
               <li>- Send a DM to {contactInfo.twitterHandle}</li>
               <li>
                 - Let a{' '}
-                <a href="/organizers" rel="noopener noreferrer" title="Code of Conduct">
+                <Link to="/organizers" title="Code of Conduct">
                   Core Team
-                </a>{' '}
+                </Link>{' '}
                 organizer know, either in person or via Twitter.
               </li>
               <li>- Send an email to {contactInfo.email}</li>

From 9dbfb510dbcd902b03a4487cb4b923c24d6553f4 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 12 Nov 2019 08:45:53 +0000
Subject: [PATCH 5/5] make coc email a mailto link

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

diff --git a/src/pages/report.js b/src/pages/report.js
index 47e7747a..fb34274d 100644
--- a/src/pages/report.js
+++ b/src/pages/report.js
@@ -45,7 +45,7 @@ const Report = () => {
                 </Link>{' '}
                 organizer know, either in person or via Twitter.
               </li>
-              <li>- Send an email to {contactInfo.email}</li>
+              <li>- Send an email to <a href={`mailto:${contactInfo.email}`}>{contactInfo.email}</a></li>
             </ul>
           </section>
         </Panel>