aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/competition-element.js39
-rw-r--r--src/components/mao-competitions.js70
-rw-r--r--src/components/mao-home.js21
-rw-r--r--src/components/test-element.js41
4 files changed, 123 insertions, 48 deletions
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 {
<p hidden="${!props.infoTabOpen}"> ${props.information}</p>
</div>
<div hidden="${!props.infoTabOpen || !props.signedIn}" class="card-actions">
- <paper-button
- class="info"
- hidden="${props.isRegistered}"
- raised
- disabled= "${!props.signedIn}"
- on-tap= "${() => this.registerComp()}">
- ${props.signedIn? "Register" : "Sign In"}
- </paper-button>
+ <div hidden="${props.closed}">
+ <paper-button
+ class="info"
+ hidden="${props.isRegistered}"
+ raised
+ disabled= "${!props.signedIn}"
+ on-tap= "${() => this.registerComp()}">
+ ${props.signedIn? "Register" : "Sign In"}
+ </paper-button>
- <paper-button class="success"
- disabled
- hidden="${!props.isRegistered}">
- Already Registered
- </paper-button>
+ <paper-button class="success"
+ disabled
+ hidden="${!props.isRegistered}">
+ Already Registered
+ </paper-button>
+ </div>
+
+ <div hidden="${!props.closed}">
+ <paper-button
+ disabled>
+ Registration Closed
+ </paper-button>
+ </div>
</div>
</paper-card>
`;
@@ -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) {
}
</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>
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
</h2>
<p>
- 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.
</p>
<p>
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 {
<paper-card elevation=0>
<div class="card-content">
<h2 class="underline">
- Important Dates
+ Reoccuring Dates
</h2>
<p>
We will meet once a week on <strong>D Day Flex</strong>.
</p>
+ <p>
+ Math Madness after school Thrsday.
+ </p>
</div>
<div class="card-actions">
<div>
- <h3>Upcoming Dates</h3>
+ <h3>Dates</h3>
<ul>
- <li><strong>T-shirt Designs Due</strong>:\tNovember 9th (emailed to Mrs. Coombs)</li>
- <li><strong>ARML</strong>:\tNovember 9th (during Lunch and Flex)</li>
- <li><strong>FGCU Registration Due</strong>:\tNovember 20th</li>
- <li><strong>1st LOGS Test Date</strong>:\tNovember 30th</li>
+ <li><strong>Nunn Dostal Hiller Test</strong>:\tDecember 5th</li>
+ <li><strong>FGCU Competition</strong>:\tDecember 14th</li>
</ul>
</div>
</div>
@@ -103,13 +104,13 @@ class MaoHome extends PageViewElement {
<paper-card elevation=0 class='welcomeCard'>
<div class="card-content">
<h2 class="underline">
- Competitions Starting Soon
+ Competitions Soon
</h2>
<p>
- 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.
</p>
<p>
- 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!
</p>
</div>
</paper-card>
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 {
</ol>
</div>
<div class="card-actions" hidden="${!props.signedIn}">
- <paper-button
- class="info"
- hidden="${props.isRegistered}"
- raised
- disabled= "${!props.signedIn}"
- on-tap= "${() => this.registerComp()}">
- ${props.signedIn? "Register" : "Sign In"}
- </paper-button>
-
- <paper-button class="success"
- disabled
- hidden="${!props.isRegistered}">
- Already Registered
- </paper-button>
+ <div hidden="${props.closed}">
+ <paper-button
+ class="info"
+ hidden="${props.isRegistered}"
+ raised
+ disabled= "${!props.signedIn}"
+ on-tap= "${() => this.registerComp()}">
+ ${props.signedIn? "Register" : "Sign In"}
+ </paper-button>
+
+ <paper-button class="success"
+ disabled
+ hidden="${!props.isRegistered}">
+ Already Registered
+ </paper-button>
+ </div>
+
+ <div hidden="${!props.closed}">
+ <paper-button
+ disabled>
+ Registration Closed
+ </paper-button>
+ </div>
</div>
</paper-card>
`;
@@ -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() {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-06 10:59:42 +0000