diff options
author | Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu> | 2019-09-05 22:06:52 -0400 |
---|---|---|
committer | Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu> | 2019-09-05 22:06:52 -0400 |
commit | 87dd2d25e23b660c71742a97a39e210a154eca6e (patch) | |
tree | f1d4856629d398eb5cfa19e6e35e8a412d267e0e | |
parent | 756a3eff2bdb28499287bd9795875be854d12f3c (diff) |
Updated all the dated text for the new year. Also allowed new class of 2023 to sign up.
-rw-r--r-- | src/components/mao-account.js | 2 | ||||
-rw-r--r-- | src/components/mao-app.js | 2 | ||||
-rw-r--r-- | src/components/mao-competitions.js | 127 | ||||
-rw-r--r-- | src/components/mao-home.js | 13 |
4 files changed, 19 insertions, 125 deletions
diff --git a/src/components/mao-account.js b/src/components/mao-account.js index 75a54f1..0c3066d 100644 --- a/src/components/mao-account.js +++ b/src/components/mao-account.js @@ -207,7 +207,7 @@ class MaoAccount extends connect(store)(PageViewElement) { if( emailElement.value.includes('2022') || emailElement.value.includes('2021') || emailElement.value.includes('2020') || - emailElement.value.includes('2019') + emailElement.value.includes('2023') ) { if(divisonElement.value == "") { diff --git a/src/components/mao-app.js b/src/components/mao-app.js index 65a1841..034982b 100644 --- a/src/components/mao-app.js +++ b/src/components/mao-app.js @@ -231,7 +231,7 @@ class MaoApp extends connect(store)(LitElement) { </main> <footer> - <p>Designed with ♥ by John Neumann.</p> + <p>created by Michael Foiani: maintained by Jordan Hochman.</p> </footer> <snack-bar active?="${_snackbarOpened}"> diff --git a/src/components/mao-competitions.js b/src/components/mao-competitions.js index cd8e659..ddd433c 100644 --- a/src/components/mao-competitions.js +++ b/src/components/mao-competitions.js @@ -112,7 +112,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) { } .regional-comp6 { - grid-area: comp6; + grid-area: comp1; } .title { @@ -154,7 +154,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) { .regional-competition-grid { grid-template-areas: "title title title title title title" - "comp1 comp1 comp2 comp2 comp3 comp3" + "comp1 comp1 comp1 comp1 comp1 comp1" "comp4 comp4 comp5 comp5 comp6 comp6"; } @@ -178,8 +178,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) { <section> <div class="title"> - <h2 class="underline">Last competition.</h2> - <p>States is next week! Only thing lieft is nationals!</p> + <h2 class="underline">Competitions</h2> + <p>Competition season is far away, but when it comes, this page will be updated with the newest information.</p> </div> </section> @@ -194,7 +194,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) { <div class="card-content"> <h2 class="underline">States</h2> - <p class="footer-comp">April 11-14</p> + <p class="footer-comp">Date TBD</p> </div> <div class="card-actions" hidden="${!props.signedIn}"> @@ -215,39 +215,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) { </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" - class="national-comp-card" - elevation="0"> - - <div class="card-content"> - <h2 class="underline">Nationals</h2> - <p class="footer-comp">July</p> - </div> - - <div class="card-actions" hidden="${!props.signedIn}"> - <paper-button - class = "info" - hidden = "${props.registeredComps.includes('nationals')}" - on-tap = "${() => this.registerNationals()}" - raised - disabled = "${!props.signedIn}"> - ${props.signedIn ? "Register" : "Sign In"} - </paper-button> - - <paper-button - class = "success" - hidden = "${!props.registeredComps.includes('nationals')}" - disabled> - Already Registered - </paper-button> - - </div> - - </paper-card> + </paper-card> </section> @@ -261,82 +229,11 @@ class MaoCompetitions extends connect(store)(PageViewElement) { <p>To be elgible for the state or national competiton, one must participate in at least 3 regional competitons.</p> </div> - <div class="regional-comp1"> - <competition-element - id="dec-competition-element" - name="December" - day=" 14th" - information="This is the first competition and is close. So everyone, please come." - location="FGCU, Fort Myers" - signedIn="${props.signedIn}" - isRegistered="${props.registeredComps.includes('December')}" - on-register-comp="${() => store.dispatch(registerComp('December'))}" - closed="${true}"> - </competition-element> - </div> - - <div class="regional-comp2"> - <competition-element - id="jan-competition-element" - name="January" - day=" 19th" - information="This is not too far away." - location="Dunbar, Fort Myers" - signedIn="${props.signedIn}" - isRegistered="${props.registeredComps.includes('January')}" - on-register-comp="${() => store.dispatch(registerComp('January'))}" - closed="${true}"> - </competition-element> - </div> - - <div class="regional-comp3"> - <competition-element - id="feb-competition-element" - name="February" - day=" 2nd" - information="This is close and fun." - location="Golden Gate" - signedIn="${props.signedIn}" - isRegistered="${props.registeredComps.includes('February')}" - on-register-comp="${() => store.dispatch(registerComp('February'))}" - closed="${true}"> - </competition-element> - </div> - - <div class="regional-comp4"> - <competition-element - id="mar1-competition-element" - name="March1" - day=" 2nd" - information="This is a bit of a drive, but the cypress competition is always fun." - location="Cypress Bay, Weston" - signedIn="${props.signedIn}" - isRegistered="${props.registeredComps.includes('March1')}" - on-register-comp="${() => store.dispatch(registerComp('March1'))}" - closed="${true}"> - - </competition-element> - </div> - - <div class="regional-comp5"> - <competition-element - id="mar2-competition-element" - name="March2" - day=" 16th" - information="This competition is rough. We may not participate depending on interest." - location="American Hertiage-Boca, Delray Beach" - signedIn="${props.signedIn}" - isRegistered="${props.registeredComps.includes('March2')}" - on-register-comp="${() => store.dispatch(registerComp('March2'))}" - closed="#${true}"> - </competition-element> - </div> - <div class="regional-comp6"> <competition-element id="csn-competition-element" name="CSN" - day=", Jan 5th" + day=", Date TBD" information="This competition is held at our school! Please come." location="Community School of Naples" signedIn="${props.signedIn}" @@ -372,7 +269,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) { it is a 25 multiple-choice question, 40 minute test for middle schoolers designed to promote the development and enhancement of problem solving skills." - dates = ${["February 7th", "February 13th"]} + dates = ${[]} signedIn="${props.signedIn}" isRegistered="${props.registeredComps.includes('Amc')}" @@ -391,7 +288,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) { information = "The Florida Math Leauge is a state-wide exam. It has six parts, each being 30 minutes long." - dates = ${["October 16th", "November 13th", "December 11th", "January 8th", "February 12th", "March 19th"]} + dates = ${[]} signedIn="${props.signedIn}" isRegistered="${props.registeredComps.includes('Fml')}" on-register-comp="${() => store.dispatch(registerComp('Fml'))}"> @@ -406,7 +303,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) { name = "Logs" information = "The LOGS test is a 3 part exam that compares your statewide and nationally based on your math subject. With registration, you must be able to attend all test dates." - dates = ${["November 30!", "To Be Determined", "To Be Determined"]} + dates = ${[]} signedIn="${props.signedIn}" isRegistered="${props.registeredComps.includes('Logs')}" on-register-comp="${() => store.dispatch(registerComp('Logs'))}"> @@ -421,7 +318,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) { name = "Mathcon" information = "The MathCon test has only one part, which varies in difficulty depending on your grade." - dates = ${["To Be Determined"]} + dates = ${[]} signedIn="${props.signedIn}" isRegistered="${props.registeredComps.includes('Mathcon')}" on-register-comp="${() => store.dispatch(registerComp('Mathcon'))}"> @@ -436,7 +333,7 @@ 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 = ${["Every Thursday after school"]} + dates = ${[]} signedIn="${props.signedIn}" isRegistered="${props.registeredComps.includes('Math_Madness')}" on-register-comp="${() => store.dispatch(registerComp('Math_Madness'))}"> diff --git a/src/components/mao-home.js b/src/components/mao-home.js index 20bcac9..4147f52 100644 --- a/src/components/mao-home.js +++ b/src/components/mao-home.js @@ -73,10 +73,6 @@ class MaoHome extends PageViewElement { </li> <br> <li> - T-shirts are in! See Mrs. Coombs to claim yours. - </li> - <br> - <li> If you haven't yet, please add this website to your home screen. It will act like an app. Cool! </li> </ol> @@ -89,10 +85,10 @@ class MaoHome extends PageViewElement { Dates </h2> <p> - We meet once a week on <strong>D Day Flex</strong>. + We plan to meet once a week on <strong>D Day Flex</strong>. </p> <p> - Math Madness during lunch on Thursday. + Math Madness will start soon after the club fair. </p> </div> @@ -100,7 +96,7 @@ class MaoHome extends PageViewElement { <div> <h3>Upcoming Dates</h3> <ul> - <li><strong>States</strong>:\t April 11th</li> + <li><strong>Club Fair</strong>:\t September 13th</li> </ul> </div> </div> @@ -113,7 +109,8 @@ class MaoHome extends PageViewElement { Competitions </h2> <p> - States and nationals are the last competitions. + Regional competitions begin in December, + but some locally held ones may begin before then (such as math madness). </p> </div> </paper-card> |