1 files changed, 61 insertions, 9 deletions

diff --git a/src/components/mao-competitions.js b/src/components/mao-competitions.js
index 7ed5907..afe38fa 100644
--- a/src/components/mao-competitions.js
+++ b/src/components/mao-competitions.js
@@ -47,7 +47,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
                         "test2"
                         "test3"
                         "test4"
-                        "test5";
+                        "test5"
+                        "test6";
       }
 
       .amcComp {
@@ -70,6 +71,10 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
         grid-area:  test5;
       }
 
+      .nunnComp {
+        grid-area: test6;
+      }
+
       .regional-competition-grid {
         display:  grid;
         grid-gap: 10px;
@@ -135,7 +140,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
           grid-template-areas:
                           "title title title title title title"
                           "test1 test1 test2 test2 test3 test3"
-                          "test4 test4 test4 test5 test5 test5";
+                          "test4 test4 test5 test5 test6 test6";
         }
 
         .regional-competition-grid {
@@ -161,7 +166,41 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
       }
       </style>
 
+
       <section>
+
+        <div class="title">
+          <h2 class="underline">Upcoming Competition: Nunn Dostal Hiller Test</h2>
+          <p>It is Wendsday, December 5.</p>
+          <p>It is similar to a MAO-style test. One hour and 30 questions. This is great practice for the future MAO competitions.</p>
+          <p>Please log in and sign up as soon as possible in the "Other Tests" section!</p>
+        </div>
+
+      </section>
+
+      <section>
+
+        <paper-card
+        image="http://a57.foxnews.com/images.foxnews.com/content/fox-news/travel/2018/02/24/universal-theme-parks-hike-ticket-prices-following-disney-resorts/_jcr_content/par/featured_image/media-0.img.jpg/931/524/1519489441149.jpg?ve=1&tl=1&text=big-top-image"
+        heading="Orlando, Florida"
+        class="states-comp-card"
+        elevation="0">
+
+          <div class="card-content">
+            <h2 class="underline">States</h2>
+            <p  class="footer-comp">April 11-14</p>
+          </div>
+
+          <div class="card-actions" hidden="${!props.signedIn}">
+            <paper-button
+            raised
+            disabled>
+            Not Open for Registration
+            </paper-button>
+          </div>
+
+        </paper-card>
+
         <paper-card
         image="http://res.cloudinary.com/simpleview/image/upload/v1497480003/clients/lasvegas/strip_b86ddbea-3add-4995-b449-ac85d700b027.jpg"
         heading="Las Vegas, Nevada"
@@ -183,10 +222,6 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
 
         </paper-card>
 
-      </section>
-
-      <section>
-
         <paper-card
         image="http://a57.foxnews.com/images.foxnews.com/content/fox-news/travel/2018/02/24/universal-theme-parks-hike-ticket-prices-following-disney-resorts/_jcr_content/par/featured_image/media-0.img.jpg/931/524/1519489441149.jpg?ve=1&tl=1&text=big-top-image"
         heading="Orlando, Florida"
@@ -229,7 +264,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
             location="FGCU, Fort Myers"
             signedIn="${props.signedIn}"
             isRegistered="${props.registeredComps.includes('December')}"
-            on-register-comp="${() => store.dispatch(registerComp('December'))}">
+            on-register-comp="${() => store.dispatch(registerComp('December'))}"
+            closed="${true}">
             </competition-element>
           </div>
 
@@ -294,7 +330,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
       <div class="non-mao-test-grid">
 
         <div class="title">
-          <h2 class="underline">Non-MAO Tests</h2>
+          <h2 class="underline">Other Tests</h2>
           <p>All students must register and complete two of the tests to be qualified for national and/or state competitions</p>
           <p>For members of the Mu Alpha Theta Honors Society, they must take at least one of these tests.</p>
         </div>
@@ -375,11 +411,27 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
 
         name        = "Math_Madness"
         information = "Math Madness is an online competition where CSN faces other schools. Most of these problems base from AMC or other competitions."
-        dates = ${["Compete weekly on an undetermined date after school."]}
+        dates = ${["Every Thursday after school"]}
         signedIn="${props.signedIn}"
         isRegistered="${props.registeredComps.includes('Math_Madness')}"
         on-register-comp="${() => store.dispatch(registerComp('Math_Madness'))}">
         </test-element>
+
+
+        <test-element
+        id="nunn-test-element"
+
+        class="nunnComp"
+        image="https://lh3.googleusercontent.com/-K0fnq-sUkuA/VkjqDKohRBI/AAAAAAAAAAA/Uk595liBzVo/w940-h280-n/event_theme.jpg"
+        elevation="0"
+
+        name        = "Nunn/Dostal/Hiller_Test"
+        information = "The Nunn Dostal Hiller Test is similar to a MAO-style test taken at CSN. One hour and 30 questions."
+        dates = ${["December 5th"]}
+        signedIn="${props.signedIn}"
+        isRegistered="${props.registeredComps.includes('Nunn_Dostal_Hiller_Test')}"
+        on-register-comp="${() => store.dispatch(registerComp('Nunn_Dostal_Hiller_Test'))}">
+        </test-element>
       </div>
 
     </section>