From b51622356ca505ae8413c00075c45aa91a1e05be Mon Sep 17 00:00:00 2001 From: Michael Foiani Date: Sat, 28 Jul 2018 02:00:07 -0400 Subject: Working on requesting tutoring hours frontend. --- src/actions/firebase.js | 9 +++-- src/components/mao-tutoring.js | 91 ++++++++++++++++++++++++++++++++++-------- src/reducers/firebase.js | 5 ++- 3 files changed, 83 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/actions/firebase.js b/src/actions/firebase.js index fe3ddb0..ab2e28e 100644 --- a/src/actions/firebase.js +++ b/src/actions/firebase.js @@ -74,17 +74,18 @@ export const getHours = () => (dispatch, getState) => { if(currentState.initialized) { var docRef = firestore.collection('users').doc(currentState.uid); docRef.onSnapshot((doc) => { - dispatch(updateHours(doc.data().hours)); + dispatch(updateHours(doc.data().hours, doc.data().requestedHours)); }); } } -export const updateHours = (hours) => { +export const updateHours = (hours, reqHours) => { return { - type: 'UPDATE_HOURS', - payload: hours + type: 'UPDATE_HOURS', + approvedHours: hours, + requestedHours: reqHours } } diff --git a/src/components/mao-tutoring.js b/src/components/mao-tutoring.js index c4d2911..c9840a0 100644 --- a/src/components/mao-tutoring.js +++ b/src/components/mao-tutoring.js @@ -31,8 +31,14 @@ import { ButtonSharedStyles } from './button-shared-styles.js' // Import paper elements import '@polymer/paper-input/paper-input.js'; +import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js'; +import '@polymer/paper-item/paper-item.js'; +import '@polymer/paper-slider/paper-slider.js'; import '@polymer/paper-button/paper-button.js'; +// Import other customElements +import '@vaadin/vaadin-date-picker/vaadin-date-picker.js'; + class MaoTutoring extends connect(store)(PageViewElement) { _render(props) { return html` @@ -103,6 +109,10 @@ class MaoTutoring extends connect(store)(PageViewElement) { text-align: center; } + #datePicker { + margin-top: 10px; + } + @media (min-width: 460px) { .tutoring-grid { grid-template-areas: @@ -125,13 +135,13 @@ class MaoTutoring extends connect(store)(PageViewElement) {
-
+