From 5758a664821e00a0bdefacd9c8121e41339f9f73 Mon Sep 17 00:00:00 2001 From: Michael Foiani Date: Mon, 26 Nov 2018 16:33:59 -0500 Subject: Updated info and added new competition for sign up --- src/components/competition-element.js | 39 ++++++++++++------- src/components/mao-competitions.js | 70 ++++++++++++++++++++++++++++++----- src/components/mao-home.js | 21 ++++++----- src/components/test-element.js | 41 ++++++++++++-------- 4 files changed, 123 insertions(+), 48 deletions(-) (limited to 'src') diff --git a/src/components/competition-element.js b/src/components/competition-element.js index b3a34f5..c8c8c09 100644 --- a/src/components/competition-element.js +++ b/src/components/competition-element.js @@ -38,20 +38,29 @@ class CompetitionElement extends LitElement { `; @@ -64,7 +73,8 @@ class CompetitionElement extends LitElement { location: String, infoTabOpen: Boolean, signedIn: Boolean, - isRegistered: Boolean + isRegistered: Boolean, + closed: Boolean }}; constructor() { @@ -77,6 +87,7 @@ class CompetitionElement extends LitElement { this.infoTabOpen = false; this.signedIn = false; this.isRegistered = false; + this.closed = false; } toggleTab() { 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) { } +
+ +
+

Upcoming Competition: Nunn Dostal Hiller Test

+

It is Wendsday, December 5.

+

It is similar to a MAO-style test. One hour and 30 questions. This is great practice for the future MAO competitions.

+

Please log in and sign up as soon as possible in the "Other Tests" section!

+
+ +
+ +
+ + + +
+

States

+

April 11-14

+
+ + + + + -
- -
- + on-register-comp="${() => store.dispatch(registerComp('December'))}" + closed="${true}"> @@ -294,7 +330,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
-

Non-MAO Tests

+

Other Tests

All students must register and complete two of the tests to be qualified for national and/or state competitions

For members of the Mu Alpha Theta Honors Society, they must take at least one of these tests.

@@ -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'))}"> + + + +
diff --git a/src/components/mao-home.js b/src/components/mao-home.js index cf78825..8d5110a 100644 --- a/src/components/mao-home.js +++ b/src/components/mao-home.js @@ -68,7 +68,7 @@ class MaoHome extends PageViewElement { Announcements

- Welcome to the beta release of the website. We have high hopes for this website. + Welcome to the beta release of the website. First release coming in January.

If you haven't yet, please add this to your home screen. It will act like an app. Cool! @@ -79,21 +79,22 @@ class MaoHome extends PageViewElement {

- Important Dates + Reoccuring Dates

We will meet once a week on D Day Flex.

+

+ Math Madness after school Thrsday. +

-

Upcoming Dates

+

Dates

    -
  • T-shirt Designs Due:\tNovember 9th (emailed to Mrs. Coombs)
    • -
  • ARML:\tNovember 9th (during Lunch and Flex)
    • -
  • FGCU Registration Due:\tNovember 20th
    • -
  • 1st LOGS Test Date:\tNovember 30th
    • +
  • Nunn Dostal Hiller Test:\tDecember 5th
    • +
  • FGCU Competition:\tDecember 14th
@@ -103,13 +104,13 @@ class MaoHome extends PageViewElement {

- Competitions Starting Soon + Competitions Soon

- The FGCU competition marks the beginning of competitions. Now is the time to figure out your schedules and register here online. Earlier the better! + First Competition is on the horizon (Nunn Dostal Hiller Test)! Sign up on the compete page.

- The ARML competition is this Friday, and we need a team! There is no limit on how many people can come, so we need everyone we can get. It is during lunch and flex in Mrs. Gardener's Room. + The FGCU competition marks the beginning of competitions. Now is the time to figure out your schedules and register here online. Earlier the better!

diff --git a/src/components/test-element.js b/src/components/test-element.js index 6367691..ba023de 100644 --- a/src/components/test-element.js +++ b/src/components/test-element.js @@ -44,20 +44,29 @@ class TestElement extends LitElement { `; @@ -69,7 +78,8 @@ class TestElement extends LitElement { dates: Array, image: String, signedIn: Boolean, - isRegistered: Boolean + isRegistered: Boolean, + closed: Boolean }}; constructor() { @@ -81,6 +91,7 @@ class TestElement extends LitElement { this.image = "Image Path"; this.signedIn = false; this.isRegistered = false; + this.closed = false; } registerComp() { -- cgit v1.2.3-70-g09d2