Added new competition.

1 files changed, 24 insertions, 23 deletions

diff --git a/src/components/mao-competitions.js b/src/components/mao-competitions.js
index ca5e1b3..e3601ca 100644
--- a/src/components/mao-competitions.js
+++ b/src/components/mao-competitions.js
@@ -47,8 +47,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
                         "test2"
                         "test3"
                         "test4"
-                        "test5"
-                        "test6";
+                        "test5";
       }
 
       .amcComp {
@@ -84,7 +83,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
                         "comp2"
                         "comp3"
                         "comp4"
-                        "comp5";
+                        "comp5"
+                        "comp6";
       }
 
       .regional-comp1 {
@@ -107,6 +107,10 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
         grid-area:  comp5;
       }
 
+      .regional-comp6 {
+        grid-area:  comp6;
+      }
+
       .title {
         grid-area:  title;
       }
@@ -140,14 +144,14 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
           grid-template-areas:
                           "title title title title title title"
                           "test1 test1 test2 test2 test3 test3"
-                          "test4 test4 test5 test5 test6 test6";
+                          "test4 test4 test4 test5 test5 test5";
         }
 
         .regional-competition-grid {
           grid-template-areas:
                           "title title title title title title"
                           "comp1 comp1 comp2 comp2 comp3 comp3"
-                          "comp4 comp4 comp4 comp5 comp5 comp5";
+                          "comp4 comp4 comp5 comp5 comp6 comp6";
         }
 
         section > paper-card {
@@ -171,9 +175,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
 
         <div class="title">
           <h2 class="underline">Upcoming Competition!</h2>
-          <p><strong>The Nunn Dostal Hiller Test</strong> is Wendsday, December 5.</p>
-          <p>It is similar to a MAO-style test. One hour with 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>
+          <p><strong>The CSN Competition</strong> is Saturday, January 5th.</p>
+          <p>We host this, and it counts as a full MAO competition. Please sign up for it in regional competitions!</p>
         </div>
 
       </section>
@@ -300,6 +303,19 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
             </competition-element>
           </div>
 
+          <div class="regional-comp6">
+            <competition-element
+            id="csn-competition-element"
+            name="CSN"
+            day=", Jan 5th"
+            information="This competition is held at our school! Please come."
+            location="Community School of Naples"
+            signedIn="${props.signedIn}"
+            isRegistered="${props.registeredComps.includes('CSN')}"
+            on-register-comp="${() => store.dispatch(registerComp('CSN'))}">
+            </competition-element>
+          </div>
+
         </div>
 
       </section>
@@ -396,21 +412,6 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
         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 and will be taken at CSN. One hour with 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>