Merge pull request #967 from Wimsy113/con_page_revamp

revamped the con page

Author: jjhampton

package.json

@@ -16,7 +16,7 @@
     "axios": "^0.16.1",
     "classnames": "^2.2.5",
     "dateformat": "^2.0.0",
-    "express": "^4.15.2",
+    "express": "^4.16.3",
     "history": "^4.6.1",
     "husky": "^0.14.3",
     "jwt-decode": "^2.2.0",

src/scenes/home/opCodeCon/opCodeCon.css

@@ -1,37 +1,41 @@
 .hero {
-  background-image: url('./raleigh.jpg');
+  background-image: url('https://s3.amazonaws.com/operationcode-assets/heroBanners/op_code_con_raleigh.png');
+  background-repeat: no-repeat;
+  background-position: bottom;
 }
 
-@media screen and (min-width: 1200px) {
+@media screen and (min-width: 1100px) {
   .hero {
     background-size: 100%;
   }
 }
 
-@media screen and (max-width: 768px) {
+@media screen and (min-width: 500px) and (max-width: 1100px) {
   .hero {
-    background-size: auto 150%;
+    background-size: 100%;
+    background-position: bottom;
   }
 }
 
-.heading {
-  color: #47566b;
-  padding: 3rem;
-  height: 600px;
+@media screen and (max-width: 499px) {
+  .hero {
+    background: none;
+  }
 }
 
-@media screen and (max-width: 768px) {
-.heading {
-    height: 450px;
-  }
+.red {
+  color:#D1665A;
 }
 
-.textLink {
-  color: #47566b;
-  font-size: 1.2em;
+.heading {
+  color: #249cbc;
+  padding-top: 15px;
+  text-align: center;
+  height: 800px;
 }
 
-.textLink:hover {
-  color: #d1665a;
-  font-size: 1.2em;
+@media screen and (max-width: 768px) {
+  .heading {
+    height: 600px;
+  }
 }

src/scenes/home/opCodeCon/opCodeCon.js

@@ -7,23 +7,39 @@ const OpCodeCon = () => (
   <div className={styles.hero}>
     <div className={styles.heading}>
       <h1>OpCodeCon</h1>
-      <h3>Join us for our inaugural Operation Code Convention!</h3>
-      <p>September 19th-20th, 2018</p>
-      <p>Raleigh Convention Center, Raleigh, NC</p>
-      <p>
-        <a href="mailto:[email protected]" className={styles.textLink}>
-          Contact us
-        </a>{' '}
-        for sponsorship information.
-      </p>
+      <h2>Raleigh, NC</h2>
+      <h3 className={styles.red}> Sept 19-20</h3>
+      <p>Join us for our inaugural Operation Code Convention!</p>
+      <p>Get your tickets and book your room here!</p>
       <LinkButton
         role="button"
-        text="Donate"
+        text="Tickets"
+        theme="blue"
+        link="https://secure.lglforms.com/form_engine/s/tzrVCEdOmZXtQmjkAS63AA?t=1526603770"
+        isExternal
+      />
+
+      <LinkButton
+        role="button"
+        text="Rooms"
+        theme="blue"
+        link="https://www.starwoodmeeting.com/events/start.action?id=1805071198&key=23F9CD12"
+        isExternal
+      />
+      <p>Not able to attend but want to help?</p>
+      <p>Contact us for sponsorship information or make a donation!</p>
+      <LinkButton
+        role="button"
+        text="Sponsor"
         theme="red"
-        link={commonUrl.donateLink}
+        link="mailto:[email protected]"
+        isExternal
+      />
+
+      <LinkButton
+        role="button" text="Donate" theme="red" link={commonUrl.donateLink}
         isExternal
       />
-      {/* <p>Check back for more information.</p> */}
     </div>
   </div>
 );

src/scenes/home/opCodeCon/raleigh.jpg

@@ -3856,7 +3856,7 @@ expect@^22.4.0:
     jest-message-util "^22.4.0"
     jest-regex-util "^22.1.0"
 
-express@^4.15.2, express@^4.16.2:
+express@^4.16.2, express@^4.16.3:
   version "4.16.3"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
   dependencies: