Merge pull request #25 from TexasCamp/logo-venue

Add venue logo, fix layouts, fix sponsor images
TexasCamp · Aug 17, 2019 · ea8c1f9 · ea8c1f9
2 parents 2f047e5 + 6fd7100
commit ea8c1f9
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 76 deletions.
diff --git a/.lagoon.yml b/.lagoon.yml
@@ -24,11 +24,14 @@ environments:
         - backend2019.texascamp.org
       - frontend:
         - "texascamp.org":
-            tls-acme: 'false'
+            tls-acme: 'true'
+            insecure: Redirect
         - "www.texascamp.org":
-            tls-acme: 'false'
+            tls-acme: 'true'
+            insecure: Redirect
         - "2019.texascamp.org":
-            tls-acme: 'false'
+            tls-acme: 'true'
+            insecure: Redirect
     cronjobs:
       - name: drush cron
         schedule: "H/15 * * * *"

diff --git a/frontend/app/components/App/index.js b/frontend/app/components/App/index.js
@@ -5,7 +5,6 @@ import 'App/normalize.css';
 import React from 'react';
 import Helmet from 'react-helmet';
 import { Switch, Route } from 'react-router';
-import SplashPage from 'SplashPage';
 import Home from 'Home';
 import Sessions from 'Sessions';
 import ProposedSessions from 'Sessions/Proposed';
@@ -44,60 +43,26 @@ const App = (): React.Element<any> =>
       <link rel="shortcut icon" href={favicon} />
     </Helmet>
     <Typekit kitId="rgi7wxl" />
-    <Switch>
-      <Route exact path="/" component={SplashPage} />
-      <Route
-        path={['/sponsor', '/sponsors']}
-        render={() => {
-          if (global.window) {
-            global.window.location.replace(
-              'https://opencollective.com/drupalatx/events/texas-camp-2019-19178ev#tickets',
-            );
-          }
-
-          return (
-            <div>
-              Redirecting to{' '}
-              <a href="https://opencollective.com/drupalatx/events/texas-camp-2019-19178ev#tickets">
-                https://opencollective.com/drupalatx/events/texas-camp-2019-19178ev#tickets
-              </a>
-            </div>
-          );
-        }}
-      />
-      <Route
-        path="*"
-        render={() =>
-          (<div className={styles.wrapper}>
-            <Switch>
-              <Route exact path="/home" component={Home} />
-              <Route exact path="/schedule" component={Sessions} />
-              <Route
-                exact
-                path="/sessions/proposed"
-                component={ProposedSessions}
-              />
-              <Route exact path="/sessions/:sessionName/" component={Session} />
-              <Route exact path="/session-form" component={SubmitSession} />
-              <Route
-                exact
-                path="/session-update/:id/:editToken"
-                component={UpdateSession}
-              />
-              <Route
-                exact
-                path="/happenings/:happeningName/"
-                component={Happening}
-              />
-              <Route exact path={Humans} />
-              <Route exact path="/news" component={NewsOverview} />
-              <Route exact path="/news/:newsTitle/" component={News} />
-              <Route exact path="/sponsors-drupal" component={Sponsors} />
-              <Route path="*" component={SplatRouter} />
-            </Switch>
-          </div>)}
-      />
-    </Switch>
+    <div className={styles.wrapper}>
+      <Switch>
+        <Route exact path="/" component={Home} />
+        <Route exact path="/schedule" component={Sessions} />
+        <Route exact path="/sessions/proposed" component={ProposedSessions} />
+        <Route exact path="/sessions/:sessionName/" component={Session} />
+        <Route exact path="/session-form" component={SubmitSession} />
+        <Route
+          exact
+          path="/session-update/:id/:editToken"
+          component={UpdateSession}
+        />
+        <Route exact path="/happenings/:happeningName/" component={Happening} />
+        <Route exact path={Humans} />
+        <Route exact path="/news" component={NewsOverview} />
+        <Route exact path="/news/:newsTitle/" component={News} />
+        <Route exact path="/sponsors" component={Sponsors} />
+        <Route path="*" component={SplatRouter} />
+      </Switch>
+    </div>
   </div>);
 
 export default App;
diff --git a/frontend/app/components/Footer/index.js b/frontend/app/components/Footer/index.js
@@ -5,6 +5,7 @@ import Sponsor from 'Sponsor';
 import withSponsorsQuery from 'Sponsors/withSponsorsQuery';
 import styles from './styles.css';
 import logo from '../../shared/images/texas-camp-logo-blue.png';
+import logoCodeup from '../../shared/images/logo-codeup.png';
 import twitter from '../../shared/images/twitter-grey.png';
 import facebook from '../../shared/images/facebook-grey.png';
 import sponsorsHeading from '../../shared/images/sponsors-heading-grey.png';
@@ -20,7 +21,6 @@ const Footer = ({ loading, sponsors }): React.Element<any> | null =>
             &nbsp;&nbsp;&middot;&nbsp;&nbsp;
           </span>San Antonio, TX
         </div>
-        <div className={styles.venue}>CodeUp</div>
         <div className={styles.socialWrapper}>
           <span className={styles.social}>
             <Twitter />
@@ -32,6 +32,9 @@ const Footer = ({ loading, sponsors }): React.Element<any> | null =>
             <Facebook />
           </span>
         </div>
+        <div className={styles.venue}>
+          <LogoCodeup />
+        </div>
       </div>
       <div className={styles.sponsors}>
         <img
@@ -88,4 +91,17 @@ function Facebook() {
   );
 }
 
+function LogoCodeup() {
+  return (
+    <a
+      className={styles.venueLink}
+      href="https://codeup.com/"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      <img src={logoCodeup} alt="venue" />
+    </a>
+  );
+}
+
 export default withSponsorsQuery(Footer);
diff --git a/frontend/app/components/Footer/styles.css b/frontend/app/components/Footer/styles.css
@@ -11,7 +11,7 @@
 }
 .info {
   color: $grey;
-  margin: 20px 0 40px;
+  margin: 20px 0 20px;
   .social {
     img {
       height: 14px;
@@ -32,23 +32,32 @@
 .heading {
   width: 140px;
 }
-.sponsorsContainer {
-  display: flex;
-  justify-content: center;
-  img {
-    filter: grayscale(100%) brightness(240%);
-    -webkit-filter: grayscale(100%) brightness(240%);
-    margin: 20px 10px;
-    max-width: 160px;
+.sponsors {
+  .sponsorsContainer {
+    display: flex;
+    justify-content: center;
+    img {
+      filter: grayscale(100%) brightness(240%);
+      -webkit-filter: grayscale(100%) brightness(240%);
+      margin: 20px 0;
+      max-width: 160px;
+    }
   }
 }
 .credits {
   composes: calderDark from '../../shared/css/fonts.css';
   color: $blue;
   font-size: 10px;
   padding: 20px;
+  padding-top: 0;
+  margin-top: -1em;
   text-align: center;
   a {
     color: $blue;
   }
 }
+.venue {
+  img {
+    width: 160px;
+  }
+}
diff --git a/frontend/app/components/Header/index.js b/frontend/app/components/Header/index.js
@@ -58,7 +58,16 @@ const Header = ({ image = 'snake', isHome }) => {
               &nbsp;&nbsp;&middot;&nbsp;&nbsp;
             </span>San Antonio, TX
           </div>
-          <div className={styles.venue}>CodeUp</div>
+          <div className={styles.venue}>
+            <a
+              className={styles.venueLink}
+              href="https://codeup.com/"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              Codeup
+            </a>
+          </div>
           <div className={styles.socialWrapper}>
             <span className={styles.social}>
               <Twitter />

diff --git a/frontend/app/components/Header/styles.css b/frontend/app/components/Header/styles.css
@@ -93,6 +93,12 @@
       padding-top: 8px;
     }
   }
+  .venue {
+    a:hover {
+      border-bottom: 1px solid;
+      padding-top: 8px;
+    }
+  }
 }
 .logo {
   position: relative;
@@ -225,7 +231,7 @@
 :global .home {
   .snake {
     @media screen and (max-width: 500px) {
-      left: 50%;
+      left: 0;
       overflow: visible !important;
       position: absolute;
     }
@@ -235,11 +241,11 @@
     img {
       @media screen and (max-width: 500px) {
         background-color: $orange;
-        left: -50%;
+        left: 0;
         position: relative;
       }
       @media $tabletDown {
-        max-width: 500px !important;
+        max-width: 100vw !important;
         padding-top: 156px;
       }
       @media $tabletOnly {

diff --git a/frontend/app/screens/Sponsors/index.js b/frontend/app/screens/Sponsors/index.js
@@ -70,7 +70,7 @@ const Sponsors = ({
                   <li>
                     <p>
                       Join our{' '}
-                      <a href="https://opencollective.com/drupalatx">
+                      <a href="https://opencollective.com/drupalatx/events/texas-camp-2019-19178ev#tickets">
                         Open Collective
                       </a>{' '}
                       to submit funds

diff --git a/frontend/app/screens/SubmitSession/index.js b/frontend/app/screens/SubmitSession/index.js
@@ -36,7 +36,9 @@ const SubmitSession = ({
         <Header />
         <div className={styles.content}>
           <div className={styles.contentContainer}>
-            <h1 className={styles.title}>Submit a session</h1>
+            <h1 className={styles.title}>
+              Submit a Session, Panel, Lightning Talk, or Training!
+            </h1>
             {submitted &&
               <div>
                 <p className={styles.confirmationText}>
@@ -57,14 +59,21 @@ const SubmitSession = ({
             {!submitted &&
               <div>
                 <p className={styles.introText}>
-                  Now’s your chance! All you need is a big idea and enough
-                  content to fill 45 minutes.
+                  Now’s your chance! All you need is a big idea and content.
                   <br />
                   Be brave, be bold. Join the ranks of{' '}
                   <a href="https://www.youtube.com/channel/UCzgPOXiGFFAHJSSDunsVNJg/playlists">
                     those who have gone before.
                   </a>
                 </p>
+                <ul>
+                  <li>
+                    <a href="/submit-session">Session guidelines</a>
+                  </li>
+                  <li>
+                    <a href="/submit-training">Training guidelines</a>
+                  </li>
+                </ul>
                 <SessionForm
                   types={types}
                   tracks={tracks}

diff --git a/frontend/app/shared/css/global.css b/frontend/app/shared/css/global.css
@@ -26,6 +26,7 @@ body {
   }
   strong {
     font-weight: normal;
+    font-family: "calder-dark", sans-serif;
   }
   em {
     font-style: normal;
@@ -94,6 +95,11 @@ body {
     }
   }
 }
+#app {
+  position: relative;
+  overflow: hidden;
+  width: 100vw;
+}
 .title {
   font-size: 30px;
   line-height: 40px;

diff --git a/frontend/app/shared/images/logo-codeup.png b/frontend/app/shared/images/logo-codeup.png