aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/mao-account.js72
-rw-r--r--src/components/mao-app.js1
-rw-r--r--src/components/mao-fourms.js4
-rw-r--r--src/components/mao-tutoring.js22
4 files changed, 78 insertions, 21 deletions
diff --git a/src/components/mao-account.js b/src/components/mao-account.js
index f6f32c6..72eb8b8 100644
--- a/src/components/mao-account.js
+++ b/src/components/mao-account.js
@@ -16,7 +16,7 @@ import { connect } from 'pwa-helpers/connect-mixin.js';
import { store } from '../store.js';
//These are the actions needed by this element.
-import { signIn, signOut, requestHours } from '../actions/firebase.js';
+import { signIn, signOut, requestHours, createAccount } from '../actions/firebase.js';
// We are lazy loading its reducer.
import firebase from '../reducers/firebase.js';
@@ -43,7 +43,7 @@ class MaoAccount extends connect(store)(PageViewElement) {
<style>
- .sign-in-card, .acc-info-card {
+ .sign-in-card, .acc-info-card, .create-acc-card {
display: block;
}
@@ -54,7 +54,7 @@ class MaoAccount extends connect(store)(PageViewElement) {
width: 50%;
}
- .account-email {
+ .account-email, span {
word-break: break-all;
}
@@ -62,6 +62,10 @@ class MaoAccount extends connect(store)(PageViewElement) {
text-align: center;
}
+ .create-acc-card {
+ --paper-card-background-color: #f7f7f7;
+ }
+
</style>
@@ -113,6 +117,29 @@ class MaoAccount extends connect(store)(PageViewElement) {
</paper-card>
</section>
+
+ <section hidden="${props.signedIn}">
+
+ <paper-card class="create-acc-card" elevation="0">
+
+ <div class="card-content">
+ <h2 class="underline">Create Account</h2>
+
+ <paper-input label="email" id="createEmailField">
+ <span slot="suffix">@communityschoolnaples.org</span>
+ </paper-input>
+
+ <paper-input type="password" label="password" id="createPasswordField">
+ </paper-input>
+ </div>
+
+ <div class="card-actions">
+ <paper-button class="info" hidden="${props.signedIn}" raised on-tap="${() => this.makeAccount()}">Create Account</paper-button>
+ </div>
+
+ </paper-card>
+
+ </section>
`;
}
@@ -134,17 +161,19 @@ class MaoAccount extends connect(store)(PageViewElement) {
}
logIn() {
- var emailElement = this.shadowRoot.getElementById('emailField');
- var passwordElement = this.shadowRoot.getElementById('passwordField');
+ if(this.shadowRoot) {
+ var emailElement = this.shadowRoot.getElementById('emailField');
+ var passwordElement = this.shadowRoot.getElementById('passwordField');
- const email = emailElement.value
- + "@communityschoolnaples.org";
- const password = passwordElement.value;
+ const email = emailElement.value
+ + "@communityschoolnaples.org";
+ const password = passwordElement.value;
- store.dispatch(signIn(email,password));
+ store.dispatch(signIn(email,password));
- emailElement.value = "";
- passwordElement.value = "";
+ emailElement.value = "";
+ passwordElement.value = "";
+ }
}
createCompetitionList(comps) {
@@ -166,6 +195,27 @@ class MaoAccount extends connect(store)(PageViewElement) {
}
}
+ makeAccount() {
+ var emailElement = this.shadowRoot.getElementById('createEmailField');
+ var passwordElement = this.shadowRoot.getElementById('createPasswordField');
+
+ if( emailElement.value.includes('2019') ||
+ emailElement.value.includes('2020')
+ )
+ {
+ const email = emailElement.value
+ + "@communityschoolnaples.org";
+ const password = passwordElement.value;
+
+ store.dispatch(createAccount(email,password));
+ } else {
+ alert('Please use a validated email.');
+ }
+
+ emailElement.value = "";
+ passwordElement.value = "";
+ }
+
}
window.customElements.define('mao-account', MaoAccount);
diff --git a/src/components/mao-app.js b/src/components/mao-app.js
index 5a02542..55e27b6 100644
--- a/src/components/mao-app.js
+++ b/src/components/mao-app.js
@@ -210,7 +210,6 @@ class MaoApp extends connect(store)(LitElement) {
<a selected?="${_page === 'home'}" href="/home">Home</a>
<a selected?="${_page === 'tutor'}" href="/tutor">Tutoring</a>
<a selected?="${_page === 'compete'}" href="/compete">Compete</a>
- <a selected?="${_page === 'compete'}" href="/compete">Compete</a>
<a selected?="${_page === 'fourms'}" href="/fourms">Fourms</a>
<a selected?="${_page === 'account'}" href="/account">Account</a>
</nav>
diff --git a/src/components/mao-fourms.js b/src/components/mao-fourms.js
index 78f0192..4aa9873 100644
--- a/src/components/mao-fourms.js
+++ b/src/components/mao-fourms.js
@@ -170,13 +170,13 @@ class MaoFourms extends connect(store)(PageViewElement) {
var postsGrid = this.shadowRoot.getElementById('posts-grid');
postsGrid.innerHTML = "";
- for(var i = 0; i < this.fourmPosts.length; i++) {
+ for(var i = this.fourmPosts.length-1; i >=0; i--) {
var paperCard = document.createElement('paper-card');
var cardContent = document.createElement('div');
var fourmAuthor = document.createElement('h4');
var fourmSubject = document.createElement('h3');
var fourmContent = document.createElement('p');
-
+
fourmAuthor.innerHTML = this.fourmPosts[i].email .replace('@communityschoolnaples.org', '');
fourmSubject.innerHTML = this.fourmPosts[i].subject;
fourmContent.innerHTML = this.fourmPosts[i].content;
diff --git a/src/components/mao-tutoring.js b/src/components/mao-tutoring.js
index 3a833c6..bca76c1 100644
--- a/src/components/mao-tutoring.js
+++ b/src/components/mao-tutoring.js
@@ -95,8 +95,8 @@ class MaoTutoring extends connect(store)(PageViewElement) {
display: block;
}
- .hopeCard {
- --paper-card-background-color: #58d68d;
+ .subjectCard, .hopeCard {
+ --paper-card-background-color: #ffffff;
}
paper-item {
@@ -147,12 +147,11 @@ class MaoTutoring extends connect(store)(PageViewElement) {
</style>
- <section>
+ <section hidden="${!props.signedIn}">
<paper-card
elevation="0"
- class="hoursCard"
- hidden="${!props.signedIn}">
+ class="hoursCard">
<div class="card-content">
@@ -235,10 +234,19 @@ class MaoTutoring extends connect(store)(PageViewElement) {
</div>
<div class="tutoring-grid">
- <paper-card class="hopeCard">
+ <paper-card class="subjectCard">
<div class="card-actions">
<h3>Our Hope</h3>
- <p>We want to encourage an enviornment of help.</p>
+ <p>
+ We want to encourage an enviornment of learnin through peer-to-peer tutoring.
+ We offer all tutoring in all subjects for mao competitions and school subjects:
+ </p>
+ <ul>
+ <li>Algebra (1 & 2)</li>
+ <li>Geometry</li>
+ <li>Pre-calculus</li>
+ <li>Calculus (AB & BC)</li>
+ </ul>
</div>
</paper-card>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-22 15:04:31 +0000