aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Foiani <mfoiani2019@communiyschoolnaples.org>2018-11-06 19:04:18 -0500
committerMichael Foiani <mfoiani2019@communiyschoolnaples.org>2018-11-06 19:04:18 -0500
commit7af9d162ab82c6e6eb38a1e3cd1b06afd884d93a (patch)
treed64eb1373318c77703df03cdcfa45f2e8ae94c98
parentfd2cae2643663d67f2677da676e800fe1f91aefd (diff)
Made multiple changes, fixing typos and a major bug with showing divisons.
-rw-r--r--.firebase/hosting.YnVpbGQvZXM1LWJ1bmRsZWQ.cache92
-rw-r--r--src/actions/firebaseAdmin.js7
-rw-r--r--src/components/mao-account.js2
-rw-r--r--src/components/mao-admin.js3
-rw-r--r--src/components/mao-forums.js3
-rw-r--r--src/components/mao-tutoring.js2
-rw-r--r--src/components/registry-element.js24
7 files changed, 111 insertions, 22 deletions
diff --git a/.firebase/hosting.YnVpbGQvZXM1LWJ1bmRsZWQ.cache b/.firebase/hosting.YnVpbGQvZXM1LWJ1bmRsZWQ.cache
new file mode 100644
index 0000000..74ede76
--- /dev/null
+++ b/.firebase/hosting.YnVpbGQvZXM1LWJ1bmRsZWQ.cache
@@ -0,0 +1,92 @@
+manifest.json,1532748264732,48be121a31c10943ba072492d82077532ea6bd267ce11e7674095b952bf170f0
+push-manifest.json,1532748264736,b2716f9e251743f49dcecb89579da4383facda94d2e8cdba09444f669f0e5960
+images/manifest/icon-144x144.png,1532748264731,ed9d0ec1b0ce6dcbe89d8264482ba5b8349db2e054932c3dd882d29b1fdd6742
+images/manifest/icon-192x192.png,1532748264731,85ff27c28c135b202144a89437522b459608d4c03646e9e797360043d81ed435
+images/favicon.ico,1532748264731,9cadf7f12db623faedfdc99e1185edb76072915fa96ddc081e93e484a146d997
+images/manifest/icon-48x48.png,1532748264731,cc9e0b045dc1b388f046b6e37647f5a83adb276ef25295abb02bea214a1787d7
+images/manifest/icon-72x72.png,1532748264731,455b0c5a2187bbd04a17763b798c48a572f9210f1f70bd0f334abc64aa8e1ff8
+images/manifest/icon-96x96.png,1532748264731,ea18ec549fd56bbac8462fd909a591c43b83e01be10ec80a46f075faba7a2ca6
+node_modules/@webcomponents/webcomponentsjs/CONTRIBUTING.md,1524612962000,d23c47a2942c34a9cd787c9846f72a02858fe22e60b1bb6c08799455911cc5a6
+node_modules/@webcomponents/webcomponentsjs/LICENSE.md,1517878164000,2ebf7ac7493b75329f6ed779a964f089ff7131636c1b0c700bb338dc0970a9e7
+index.html,1541544402211,793330be0a3b38330dfb6a6f895d74e52d8d066ad863e90b310079248f32f5d8
+node_modules/@webcomponents/webcomponentsjs/closure-output.txt,1518822177000,faf7c0d5cce9b9b91604f3cf29ecc96d248a38d335f81e3ab4031d0a02acef16
+node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js,1528955835000,5a0239bdd9e6be4964b8cb5af1d05e6b9832e96496026837b91d617d7f1706f4
+node_modules/@webcomponents/webcomponentsjs/gulpfile.js,1528954740000,ec8e5097d7e699dc5b0bd1cf2f3f9fa522d6258f7baccf46cdf576406d7ed27b
+node_modules/@webcomponents/webcomponentsjs/license-header.txt,1528954733000,b0b06f499f78844c83d2df9874ff49fd916def568146cf8d16f2b11fe3a3b044
+node_modules/@webcomponents/webcomponentsjs/wct.conf.json,1525892526000,94c1e64b5138764aed77852130694cdb20213d516634b8260e4ebd91d63f3a7e
+node_modules/@webcomponents/webcomponentsjs/package.json,1532748353624,9daf04f2bdcec37f6c203f3352883d8fd3bc915aca6057f2396a1defda9ff7c5
+node_modules/@webcomponents/webcomponentsjs/README.md,1528151642000,a28f2918f08444f4640c18336748705e39e97e0ec74cfca2c53549704d0a7b49
+service-worker.js,1541544402312,5819218aa6ffebba7067f85356ec056ed0e5d51e4389c0f170f330af554f4b66
+node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js,1525892541000,4f6a8a16ec38128cd597539f2dfcc895e35b661b5ab2a54d686a5edcaf460326
+node_modules/@webcomponents/webcomponentsjs/bundles/webcomponents-ce.js,1528955799000,b17b7f8dc951ab6ec2a2c835f5a079ef54c72a0c6c8c2fb9bc1aa829e1493719
+node_modules/@webcomponents/webcomponentsjs/entrypoints/custom-elements-es5-adapter-index.js,1517878164000,dd6f2f458c5fb5ebcb9dd5d2cdf2299382cef6937717095feaf31dc452702dab
+node_modules/@webcomponents/webcomponentsjs/entrypoints/webcomponents-bundle-index.js,1525892526000,0d50ebf82ad257ab3e5322841e2332267c45325e808b5f23f95dee510c87fe76
+node_modules/@webcomponents/webcomponentsjs/entrypoints/webcomponents-ce-index.js,1525892526000,28f206c23cacf1c997e4ba5633b755b7f5067a4aa884d2e883289f11b96f22ec
+node_modules/@webcomponents/webcomponentsjs/entrypoints/webcomponents-sd-ce-index.js,1525892526000,96cef5dfa81ea2848c25fef85749d8268903fed2285cee75e0d7ea134e1a4ef8
+node_modules/@webcomponents/webcomponentsjs/entrypoints/webcomponents-sd-ce-pf-index.js,1529013284000,7644c418de00d0722a77ea69243e94fab7dcd3495167a735052fd85767a58721
+node_modules/@webcomponents/webcomponentsjs/entrypoints/webcomponents-sd-index.js,1525892526000,44766a75eeb04c1d003464c0809b5681736f29c5c7d36bad9fef009ebcea9b29
+node_modules/@webcomponents/webcomponentsjs/externs/webcomponents.js,1525892526000,3c24797878fd127d03c274ef40ad3167b884ddd7bc8572930546838d880b013d
+node_modules/@webcomponents/webcomponentsjs/src/flag-parser.js,1525892526000,7831917b18dc08c55d876d9791cdb67187bf3a9308329bda1ed8fd1ca1e1e8b9
+node_modules/@webcomponents/webcomponentsjs/src/promise.js,1528954733000,f7a62940c478992d8183a06e49e27d97faf6ff1864ffe5acef95964a16173019
+node_modules/@webcomponents/webcomponentsjs/src/symbol.js,1529013284000,377e281b4e83530da2349d79a866b7c867e2d119bccf64d76a74ee0b97beda1f
+node_modules/@webcomponents/webcomponentsjs/src/unresolved.js,1517878164000,0a2fbec6b2341a0f5ce6d1a280498102925629bf0cb040bbad6a53bd44bd3eea
+node_modules/@webcomponents/webcomponentsjs/tests/async-loader-with-modules.html,1541544402260,22142f7413f74a01622d0c11a38eae4f3c749a8a2a1f8df41c41b136136a3feb
+node_modules/@webcomponents/webcomponentsjs/tests/bundle-after-load.html,1541544402262,ec6d1710a2d890fcf9a72a1104474aee4261fb5878f65f691671b71c1f7537a3
+node_modules/@webcomponents/webcomponentsjs/tests/dev-loader-swizzled.html,1541544402268,1c46b88173b9e81c364173b60a68e07c1cb7959b906b114b6002733bac9af684
+node_modules/@webcomponents/webcomponentsjs/tests/bundle-with-modules.html,1541544402267,96f69c6a80cffc2f30eab67596c365e18c4cb97b1559599fadb3696259ea7eb7
+node_modules/@webcomponents/webcomponentsjs/tests/dev-loader.html,1541544402268,772db43c2fbec47861598c81619ff25a364c254dd4e0b22c40e31baf836e3a82
+node_modules/@webcomponents/webcomponentsjs/tests/force-polyfills.html,1541544402269,592317627190c23a6c071edabd1980c6a1e9fdcf4cb314d8b28e4a81fc11c551
+node_modules/@webcomponents/webcomponentsjs/tests/integration.html,1541544402269,ab7ef1b4b99abe3197737b6832380eeb8e0f8a2b83d1974f55bda38dc0c2a788
+node_modules/@webcomponents/webcomponentsjs/tests/integration-es5.html,1541544402270,43a28459b60741e03c13baecd80c6befd49821a0bbfb935eb43bdaa62d9d9e12
+images/manifest/icon-512x512.png,1532748264731,e6a244422f62786b99e8652859a4f513fd45a9a90c0fff20e95a93b3240fc695
+node_modules/@webcomponents/webcomponentsjs/bundles/webcomponents-sd.js,1528955810000,b53d1165e0223c30d9dafe766c63fad9098a80755c393f8996117f795f3b9d79
+node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js,1529013284000,9ac09a07f8ce7252e66f81726bc4ea08b582ed88b3f5f0c7ddb71869202610c3
+node_modules/@webcomponents/webcomponentsjs/bundles/webcomponents-sd-ce-pf.js,1529013284000,c002756962dc4beb668c4fd056787a5682b2459fc3841dc2a26abdf1211259bc
+node_modules/@webcomponents/webcomponentsjs/bundles/webcomponents-sd-ce.js,1528955818000,05f46fdef12300e2129bdfa19592f64e50131970af6d787742c3061c41942e93
+node_modules/@webcomponents/webcomponentsjs/bundles/webcomponents-ce.js.map,1528955799000,1a153764e3b76ea2bb84bf4f05ec4a1ba7e6a7baa7f93ef00d6206e945e076b3
+node_modules/@webcomponents/webcomponentsjs/tests/load.html,1541544402270,d3b48bb667854da5333530549eb3f0e67d9884a991773d679e1e24279ed4ca00
+node_modules/@webcomponents/webcomponentsjs/tests/loader-after-load.html,1541544402271,807b16994248ca85dedeafc88c6b32c101b9956ecbdf6b646ec750a5737ca651
+node_modules/@webcomponents/webcomponentsjs/tests/loader-with-modules.html,1541544402271,afe8ff43fc9637096d2a8522fdb3a2d7121c9a75db2b0ca812b3d049fc3c09a8
+node_modules/@webcomponents/webcomponentsjs/tests/promise.html,1541544402271,09d16151b0b8edc6efa82f57b297821b1db1bb405cb6cce7413e3a9869f7a712
+node_modules/@webcomponents/webcomponentsjs/tests/runner.html,1541544402271,59ff87e76bc7a61be4ab07afe1128d58e72c0e437d222fb526b2d858598aac36
+node_modules/@webcomponents/webcomponentsjs/tests/symbol.html,1541544402272,4db65b593c4b0fd4276c141213f12a6753fb8efa336abe6f3a01f80223062251
+node_modules/@webcomponents/webcomponentsjs/tests/template-and-CE.html,1541544402272,faa5d9be90ec668b375761859e643982b365153b8e1971e85449890be1929a92
+node_modules/@webcomponents/webcomponentsjs/tests/url.html,1541544402273,d5f9a10afdedb1473ffec47a2650a440eb49225bf2bd114054789553bae73186
+node_modules/@webcomponents/webcomponentsjs/tests/wct-config.js,1525892526000,1724db7a694ab35aa7d27a891abe27b524152d904a6010a68567657db7a792fb
+node_modules/@webcomponents/webcomponentsjs/tests/imports/a1-define.html,1541544402275,a5e8e88bfb16d06f3870daac445c414f811ecd38a7c7c29d3e95d902242df0d1
+node_modules/@webcomponents/webcomponentsjs/tests/imports/a1-import.html,1541544402280,d0d547a3b8105b77632323f00a8376153edf65828c9c3a74e33b1c9882c7f79c
+node_modules/@webcomponents/webcomponentsjs/tests/imports/a1-instance.html,1541544402281,cc9e8fa7680c6dc740ea3177b26a140ae95e7f2ea250af7f597a3a932898ceed
+node_modules/@webcomponents/webcomponentsjs/tests/imports/a1-reference.html,1541544402281,012d7896aa3d97e0548a1f66260bd0818b31a957f6f18ab7b4254e16a0a0d34c
+node_modules/@webcomponents/webcomponentsjs/tests/imports/csp-import-1.html,1541544402283,9a5e9e964c67e38575216512b685e812225c05b0d03e37417ae737c8cb508037
+node_modules/@webcomponents/webcomponentsjs/tests/imports/csp-import-2.html,1541544402282,ce273053e046540333c4968a27ccc912093d176cfc49fe59cbf99db94ab145d6
+node_modules/@webcomponents/webcomponentsjs/tests/imports/csp-script-1.js,1517878164000,5a82a4025b140fdd18c6646468eca781cb52f44432fc028659e40f92fba473dc
+node_modules/@webcomponents/webcomponentsjs/tests/imports/csp-script-2.js,1517878164000,60d1106242233e1789adbb9b54548a13ce4eee6aee9dc2564fea826cc01606b9
+node_modules/@webcomponents/webcomponentsjs/tests/imports/current-script.js,1517878164000,1f0ffde4ed8fdadb14912033cb2b627f806695f016e8df982fe11b5d35a4b31d
+node_modules/@webcomponents/webcomponentsjs/tests/imports/element-import-a.html,1541544402286,14eb98e1b47d87f88ddc4781ed1c4294224fb796f12e7dec461d153adc99c128
+node_modules/@webcomponents/webcomponentsjs/tests/imports/element-import-b.html,1541544402286,a0992d65061c593d0dfccad9254103ca7589d8268f6ec508e1756a223d0a3b27
+node_modules/@webcomponents/webcomponentsjs/tests/imports/element-import.html,1541544402287,3448d3acdb004d1e52aa81f89f75576f14cb4a31f26dc4764c2f882fd6bd365f
+node_modules/@webcomponents/webcomponentsjs/tests/imports/import-file.html,1541544402287,42e9b681ae4d1fcce62f252b5ad7fe54cfddb0ac12204f3cf66d4ecedfba7153
+node_modules/@webcomponents/webcomponentsjs/tests/imports/import-upgrade-order.html,1541544402288,7839adf2bc34ca325a0dad3e1a82101ad78bd47aa1d1c58508c4d65e2b4003f6
+node_modules/@webcomponents/webcomponentsjs/tests/imports/script-1.html,1541544402287,42dc76de05bd6fd4b3d3a6dea9e526c1a03ba5d143731aa274f90d484b4c2397
+node_modules/@webcomponents/webcomponentsjs/tests/imports/script-2.html,1541544402288,25f4b745032fc73cc2fd02c6195f78e48de4a8a6750e96247a3aff2189fb4323
+node_modules/@webcomponents/webcomponentsjs/tests/imports/simple-element-2.js,1525892526000,e5d42e43fd0663e80f4cfd7aeae5e4dac2d3f14ea3f654edf4b0aad450c320a3
+node_modules/@webcomponents/webcomponentsjs/tests/imports/simple-element-es5.html,1541544402289,78b021268a2b608afd689e2181ce8127279ac3a3aa806533d9c301c526829d83
+node_modules/@webcomponents/webcomponentsjs/tests/imports/simple-element-es5.js,1525892526000,719f5f9f8dfa6adaeab3999aa57b90d092eca6ebe836090132075ec6d0fe8e76
+node_modules/@webcomponents/webcomponentsjs/tests/imports/simple-element.html,1541544402294,e9f6ba12ef9a5d131d0c760674e18f2dd01e54dea72a70111b57b2b96fb4b071
+node_modules/@webcomponents/webcomponentsjs/tests/imports/simple-element.js,1525892526000,49c8b714499af3a9596a84f61b269fb77b1cd2ff175dbf6765be02bf6fdc625a
+node_modules/@webcomponents/webcomponentsjs/tests/modules/common-subclass.js,1525892526000,8f01e3919a8c3b0eceb40fd3ca96744c6e0291f7079f395dd626f4821f37df8f
+node_modules/@webcomponents/webcomponentsjs/tests/modules/module-a-sub.js,1525892526000,6fdc8c9f87d5ebb90df0f451c59a9eee906a3fbaa8d7666ce32dda3a2bb4c8b5
+node_modules/@webcomponents/webcomponentsjs/tests/modules/module-a.js,1525892526000,66bf6d6db7ccc7ff82c1894d85fbab1efa252c7189d372cc29507ed8a0ccfe20
+node_modules/@webcomponents/webcomponentsjs/tests/modules/module-b.js,1525892526000,93dac4e5ded624427322abd0ae768f3eb509a1ab5578e2e4c0c60a9bba7a7d8a
+src/components/mao-account.js,1541544402257,e02b6f6d0d70f693bbf77a028cbceb18d51e173f547edc0dcf6f16cf46fab055
+src/components/mao-admin.js,1541544402258,0105ee8f6e5c940260fdd987120b5dede7be0ce53d76959cf62aeb2691d28030
+src/components/mao-home.js,1541544402255,384b5c2468c041d32077bf84f022010d4d79412326aab35b30a87107198ff1fc
+src/components/mao-tutoring.js,1541544402256,9d51442b464c50d048924c35800032335bae3097c26e972af10a829d3dc3b16f
+src/components/my-view404.js,1541544402259,4ca9a7b0188795b567618ea058c0edde3f3c0317b4375d112dd4e6ab8f7e41d8
+src/components/mao-competitions.js,1541544402256,a70a795c957a9440dd1d4ae83fa97390e2eba29a439e79f520401467424a6c3b
+src/components/mao-forums.js,1541544402257,934bfd2ebe11db511c6e48f2cd3b173c422a5dc0e47cccb78029c867fc7bf875
+node_modules/@webcomponents/webcomponentsjs/bundles/webcomponents-sd.js.map,1528955810000,004fa604de560bf3a66aebc76232bd038fe6b1000d552af6c20761e4cbb36cd0
+src/components/mao-app.js,1541544402293,38ff9280613f24a6778173dde9952f440ece6ec73a69e3422c14ba8eb56f3a28
+node_modules/@webcomponents/webcomponentsjs/bundles/webcomponents-sd-ce.js.map,1528955818000,b526af98a57a2e1950244ade2044fcdaf01b2056adb31189828dc3b39fd2657f
+node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js.map,1529013284000,1db01b6f395a634a9aaa9878dafa7af85489a06cbdd351abe4889541f0b3dfb7
+node_modules/@webcomponents/webcomponentsjs/bundles/webcomponents-sd-ce-pf.js.map,1529013284000,69cc7d3e7652fc6c2becaa21deb79c84cff1a2b75902a7da82e9b1f74fd47d72
diff --git a/src/actions/firebaseAdmin.js b/src/actions/firebaseAdmin.js
index 0171fc3..549c93c 100644
--- a/src/actions/firebaseAdmin.js
+++ b/src/actions/firebaseAdmin.js
@@ -61,17 +61,16 @@ export const snapshotAdminCompList = () => (dispatch) => {
docRef.onSnapshot((querySnapshot) => {
var compList = [];
querySnapshot.forEach((doc) => {
- var divisonData = [];
+ var userData = [];
for(var i = 0; i < doc.data().uids.length; i++) {
var docRefDivison = firestore.collection('users').doc(doc.data().uids[i]);
docRefDivison.get().then((docUser) => {
- divisonData.push(docUser.data().divison);
+ userData.push([docUser.data().username, docUser.data().divison]);
});
}
compList.push({
- ...doc.data(),
name: doc.id,
- divisons: divisonData
+ divisons: userData
});
});
dispatch(updateAdminCompList(compList));
diff --git a/src/components/mao-account.js b/src/components/mao-account.js
index 3b47f66..75a54f1 100644
--- a/src/components/mao-account.js
+++ b/src/components/mao-account.js
@@ -190,7 +190,7 @@ class MaoAccount extends connect(store)(PageViewElement) {
for(var i = 0; i < comps.length; i++) {
var competitionElement = document.createElement('p');
- competitionElement.innerHTML = comps[i];
+ competitionElement.innerHTML = comps[i].replace('_', ' ');
competitionElement.class = "center";
mainDiv.appendChild( competitionElement);
}
diff --git a/src/components/mao-admin.js b/src/components/mao-admin.js
index 0873e75..70b84be 100644
--- a/src/components/mao-admin.js
+++ b/src/components/mao-admin.js
@@ -212,11 +212,10 @@ class MaoAdmin extends connect(store)(PageViewElement) {
var registryGrid = this.shadowRoot.getElementById('registry-grid');
registryGrid.innerHTML = "";
- for(var i = 0; i<this.registry.length; i++) {
+ for(var i = 0; i < this.registry.length; i++) {
var registryElement = document.createElement('registry-element');
registryElement.name = this.registry[i].name;
- registryElement.emails = this.registry[i].emails;
registryElement.divisons = this.registry[i].divisons;
registryGrid.appendChild(registryElement);
diff --git a/src/components/mao-forums.js b/src/components/mao-forums.js
index cf58bc4..b6ed193 100644
--- a/src/components/mao-forums.js
+++ b/src/components/mao-forums.js
@@ -151,9 +151,6 @@ class MaoForums extends connect(store)(PageViewElement) {
}
}
- _firstRendered() {
- }
-
submitForum() {
if(this.shadowRoot) {
var subjectElement = this.shadowRoot.getElementById('subject-field');
diff --git a/src/components/mao-tutoring.js b/src/components/mao-tutoring.js
index 61a2104..6293c38 100644
--- a/src/components/mao-tutoring.js
+++ b/src/components/mao-tutoring.js
@@ -266,7 +266,7 @@ class MaoTutoring extends connect(store)(PageViewElement) {
<paper-card class="hopeCard">
<div class="card-actions">
- <h3>Need Help Findiding A Tutor?</h3>
+ <h3>Need Help Finding A Tutor?</h3>
<p>Please meet with your friends to create tutring sessions.</p>
<p>Also, you can try the forum page.</p>
<p>Otherwise, contact our tutoring coordinator <em>Mike Binkowski</em>.</p>
diff --git a/src/components/registry-element.js b/src/components/registry-element.js
index c54bd43..cbca5bf 100644
--- a/src/components/registry-element.js
+++ b/src/components/registry-element.js
@@ -103,14 +103,16 @@ class RegistryElement extends LitElement {
super();
this.name = "";
- this.emails = [];
this.divisons = [];
this.infoTabOpen = false;
}
+ _firstRendered() {
+ this.fillNames();
+ }
+
toggleTabOpen() {
- this.sortNames();
this.infoTabOpen = true;
}
@@ -118,7 +120,7 @@ class RegistryElement extends LitElement {
this.infoTabOpen = false;
}
- sortNames() {
+ fillNames() {
var thetas = this.shadowRoot.getElementById('name-list-theta');
var alphas = this.shadowRoot.getElementById('name-list-alpha');
var mus = this.shadowRoot.getElementById('name-list-mu');
@@ -131,21 +133,21 @@ class RegistryElement extends LitElement {
stats .innerHTML = "";
other .innerHTML = "";
- for(var i=0; i<this.emails.length; i++) {
- var listElement = document .createElement('li');
- listElement.innerHTML = this.emails[i] .replace('@communityschoolnaples.org', '');
- if (this.divisons[i].includes('Mu')) {
+ this.divisons.forEach((d) => {
+ var listElement = document .createElement('li');
+ listElement.innerHTML = d[0];
+ if (d[1].includes('Mu')) {
mus .appendChild(listElement);
- } else if (this.divisons[i].includes('Alpha')) {
+ } else if (d[1].includes('Alpha')) {
alphas .appendChild(listElement)
- } else if (this.divisons[i].includes('Theta')) {
+ } else if (d[1].includes('Theta')) {
thetas .appendChild(listElement)
- } else if (this.divisons[i].includes('Stats')) {
+ } else if (d[1].includes('Stats')) {
stats .appendChild(listElement)
} else {
other .appendChild(listElement);
}
- }
+ });
}