aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/mao-competitions.js57
-rw-r--r--src/components/mao-home.js10
2 files changed, 52 insertions, 15 deletions
diff --git a/src/components/mao-competitions.js b/src/components/mao-competitions.js
index e3601ca..3d3b117 100644
--- a/src/components/mao-competitions.js
+++ b/src/components/mao-competitions.js
@@ -175,8 +175,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
<div class="title">
<h2 class="underline">Upcoming Competition!</h2>
- <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>
+ <p><strong>The AMC</strong> is Thursday, February 7th or Wednesday, February 13th.</p>
+ <p>Also, please register for states and nationals early! We need these headcounts.</p>
</div>
</section>
@@ -196,10 +196,21 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
<div class="card-actions" hidden="${!props.signedIn}">
<paper-button
+ class = "info"
+ hidden = "${props.registeredComps.includes('states')}"
+ on-tap = "${() => this.registerStates()}"
raised
+ disabled = "${!props.signedIn}">
+ ${props.signedIn ? "Register" : "Sign In"}
+ </paper-button>
+
+ <paper-button
+ class = "success"
+ hidden = "${!props.registeredComps.includes('states')}"
disabled>
- Not Open for Registration
+ Already Registered
</paper-button>
+
</div>
</paper-card>
@@ -217,10 +228,21 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
<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>
- Not Open For Registration
+ Already Registered
</paper-button>
+
</div>
</paper-card>
@@ -260,7 +282,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
location="Dunbar, Fort Myers"
signedIn="${props.signedIn}"
isRegistered="${props.registeredComps.includes('January')}"
- on-register-comp="${() => store.dispatch(registerComp('January'))}">
+ on-register-comp="${() => store.dispatch(registerComp('January'))}"
+ closed="${true}">
</competition-element>
</div>
@@ -273,7 +296,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
location="Golden Gate"
signedIn="${props.signedIn}"
isRegistered="${props.registeredComps.includes('February')}"
- on-register-comp="${() => store.dispatch(registerComp('February'))}">
+ on-register-comp="${() => store.dispatch(registerComp('February'))}"
+ closed="${true}">
</competition-element>
</div>
@@ -299,7 +323,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
location="American Hertiage-Boca, Delray Beach"
signedIn="${props.signedIn}"
isRegistered="${props.registeredComps.includes('March2')}"
- on-register-comp="${() => store.dispatch(registerComp('March2'))}">
+ on-register-comp="${() => store.dispatch(registerComp('March2'))}"
+ closed="${true}">
</competition-element>
</div>
@@ -312,7 +337,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
location="Community School of Naples"
signedIn="${props.signedIn}"
isRegistered="${props.registeredComps.includes('CSN')}"
- on-register-comp="${() => store.dispatch(registerComp('CSN'))}">
+ on-register-comp="${() => store.dispatch(registerComp('CSN'))}"
+ closed="${true}">
</competition-element>
</div>
@@ -417,19 +443,30 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
</section>
`;
}
+
static get properties() { return {
// This is the data from the store.
registeredComps : Array,
signedIn : Boolean
}}
-
-
_stateChanged(state) {
this.signedIn = state.firebaseAuth .signedIn;
this.registeredComps = state.firebaseFirestore .registeredComps;
}
+ registerNationals() {
+ if(confirm('Are you sure you want to register for nationals?')) {
+ store.dispatch(registerComp('nationals'));
+ }
+ }
+
+ registerStates() {
+ if(confirm('Are you sure you want to register for states?')) {
+ store.dispatch(registerComp('states'));
+ }
+ }
+
}
window.customElements.define('mao-competitions', MaoCompetitions);
diff --git a/src/components/mao-home.js b/src/components/mao-home.js
index dbaeb3d..934928e 100644
--- a/src/components/mao-home.js
+++ b/src/components/mao-home.js
@@ -68,7 +68,7 @@ class MaoHome extends PageViewElement {
Announcements
</h2>
<p>
- Welcome to the beta release of the website. First release coming in January or Febrary.
+ Welcome to the beta release of the website. First release coming in March.
</p>
<p>
If you haven't yet, please add this website to your home screen. It will act like an app. Cool!
@@ -85,7 +85,7 @@ class MaoHome extends PageViewElement {
We meet once a week on <strong>D Day Flex</strong>.
</p>
<p>
- Math Madness after school Thrsday.
+ Math Madness after school Thursday.
</p>
</div>
@@ -93,8 +93,8 @@ class MaoHome extends PageViewElement {
<div>
<h3>Upcoming Dates</h3>
<ul>
- <li><strong>CSN Competition</strong>:\tJanuary 5th</li>
- <li><strong>Dunbar Competition</strong>:\tJanuary 19th</li>
+ <li><strong>Registration Deadline for March 2nd</strong>:\tFebruary 16th</li>
+ <li><strong>AMC Competition</strong>:\tFebruary 7th, February 13th</li>
</ul>
</div>
</div>
@@ -107,7 +107,7 @@ class MaoHome extends PageViewElement {
Competitions
</h2>
<p>
- Our January Competitions are coming up soon! Please register and have fun.
+ States competition comint up soon! Make sure you have met your requirements. Also, AMC and other funs tests are arriving. Please check the competition page.
</p>
</div>
</paper-card>