From cb3dfb0d388689fabdd7e42cd4892316083dc451 Mon Sep 17 00:00:00 2001
From: Jack Mallers <jimmymowschess@gmail.com>
Date: Fri, 29 Sep 2017 20:00:04 -0500
Subject: [PATCH] feature(requestform): setup and hooked up request form +
 successfully created invoice

---
 app/components/Form/PayForm.js              |   1 +
 app/components/Form/RequestForm.js          |  54 ++++++++++
 app/components/Form/RequestForm.scss        | 110 ++++++++++++++++++++
 app/reducers/index.js                       |   2 +
 app/reducers/invoice.js                     |  15 ++-
 app/reducers/payform.js                     |   3 +-
 app/reducers/payment.js                     |   5 +-
 app/reducers/requestform.js                 |  58 +++++++++++
 app/reducers/transaction.js                 |   5 +-
 app/routes/app/components/App.js            |   3 +
 app/routes/app/components/components/Nav.js |   4 +-
 app/routes/app/containers/AppContainer.js   |  18 ++++
 12 files changed, 269 insertions(+), 9 deletions(-)
 create mode 100644 app/components/Form/RequestForm.scss

diff --git a/app/components/Form/PayForm.js b/app/components/Form/PayForm.js
index ef10e966..a3bf6b02 100644
--- a/app/components/Form/PayForm.js
+++ b/app/components/Form/PayForm.js
@@ -40,6 +40,7 @@ class PayForm extends Component {
     return (
       <div className={styles.container}>
         {showPayLoadingScreen && <LoadingBolt />}
+        
         <section className={`${styles.amountContainer} ${isLn ? styles.ln : ''}`}>
           <label htmlFor='amount'>
             <CurrencyIcon currency={currency} crypto={crypto} />
diff --git a/app/components/Form/RequestForm.js b/app/components/Form/RequestForm.js
index e69de29b..b609aaf6 100644
--- a/app/components/Form/RequestForm.js
+++ b/app/components/Form/RequestForm.js
@@ -0,0 +1,54 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import CurrencyIcon from 'components/CurrencyIcon'
+import styles from './RequestForm.scss'
+
+const RequestForm = ({
+  requestform: { amount, memo },
+  currency,
+  crypto,
+
+  setRequestAmount,
+  setRequestMemo,
+
+  onRequestSubmit
+}) => {
+  return (
+    <div className={styles.container}>
+      <section className={styles.amountContainer}>
+        <label htmlFor='amount'>
+          <CurrencyIcon currency={currency} crypto={crypto} />
+        </label>
+        <input
+          type='text'
+          size=''
+          style={{ width: `${amount.length > 1 ? (amount.length * 15) - 5 : 25}%`, fontSize: `${190 - (amount.length ** 2)}px` }}
+          value={amount}
+          onChange={event => setRequestAmount(event.target.value)}
+          id='amount'
+        />
+      </section>
+      <section className={styles.inputContainer}>
+        <label htmlFor='memo'>Request:</label>
+        <input
+          type='text'
+          placeholder='Dinner, Rent, etc'
+          value={memo}
+          onChange={event => setRequestMemo(event.target.value)}
+          id='memo'
+        />
+      </section>
+      <section className={styles.buttonGroup}>
+        <div className={styles.button} onClick={onRequestSubmit}>
+          Request
+        </div>
+      </section>
+    </div>
+  )
+}
+
+RequestForm.propTypes = {
+
+}
+
+export default RequestForm
diff --git a/app/components/Form/RequestForm.scss b/app/components/Form/RequestForm.scss
new file mode 100644
index 00000000..373ac924
--- /dev/null
+++ b/app/components/Form/RequestForm.scss
@@ -0,0 +1,110 @@
+@import '../../variables.scss';
+
+.container {
+  margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  height: 75vh;
+  justify-content: center;
+  align-items: center;
+}
+
+.amountContainer {
+  color: $main;
+  display: flex;
+  justify-content: center;
+  min-height: 120px;
+  margin-bottom: 20px;
+  
+  label, input[type=text] {
+    color: inherit;
+    display: inline-block;
+    vertical-align: top;
+    padding: 0;
+  }
+
+  label {
+    svg {
+      width: 85px;
+      height: 85px;
+    }
+
+    svg[data-icon='ltc'] {
+      margin-right: 10px;
+
+      g {
+        transform: scale(1.75) translate(-5px, -5px);
+      }
+    }
+  }
+  
+  input[type=text] {
+    width: 100px;
+    font-size: 180px;
+    border: none;
+    outline: 0;
+    -webkit-appearance: none;
+  }
+}
+
+.inputContainer {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  font-size: 18px;
+  height: auto;
+  min-height: 55px;
+  margin-bottom: 20px;
+  border: 1px solid $traditionalgrey;
+  border-radius: 6px;
+  position: relative;
+  padding: 0 20px;
+
+  label, input[type=text] {
+    font-size: inherit;
+  }
+
+  label {
+    padding-top: 19px;
+    padding-bottom: 12px;
+    color: $traditionalgrey;
+  }
+
+  input[type=text] {
+    width: 100%;
+    border: none;
+    outline: 0;
+    -webkit-appearance: none;
+    height: 55px;
+    padding: 0 10px;
+  }
+}
+
+.buttonGroup {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  border-radius: 6px;
+  overflow: hidden;
+
+  .button {
+    cursor: pointer;
+    height: 55px;
+    min-height: 55px;
+    text-transform: none;
+    font-size: 18px;
+    transition: opacity .2s ease-out;
+    background: $main;
+    color: $white;
+    border: none;
+    font-weight: 500;
+    padding: 0;
+    width: 100%;
+    text-align: center;
+    line-height: 55px;
+
+    &:first-child {
+      border-right: 1px solid lighten($main, 20%);
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/reducers/index.js b/app/reducers/index.js
index be2248f0..8f167646 100644
--- a/app/reducers/index.js
+++ b/app/reducers/index.js
@@ -10,6 +10,7 @@ import channels from './channels'
 
 import form from './form'
 import payform from './payform'
+import requestform from './requestform'
 
 import invoice from './invoice'
 import modal from './modal'
@@ -28,6 +29,7 @@ const rootReducer = combineReducers({
   
   form,
   payform,
+  requestform,
 
   invoice,
   modal,
diff --git a/app/reducers/invoice.js b/app/reducers/invoice.js
index 24674b20..33161913 100644
--- a/app/reducers/invoice.js
+++ b/app/reducers/invoice.js
@@ -1,6 +1,10 @@
 import { createSelector } from 'reselect'
 import { ipcRenderer } from 'electron'
+
+import { setFormType } from './form'
 import { setPayInvoice } from './payform'
+import { resetRequestForm } from './requestform'
+
 import { showNotification } from '../notifications'
 import { btc, usd } from '../utils'
 // ------------------------------------
@@ -98,7 +102,16 @@ export const createInvoice = (amount, memo, currency, rate) => (dispatch) => {
 }
 
 // Receive IPC event for newly created invoice
-export const createdInvoice = (event, invoice) => dispatch => dispatch({ type: INVOICE_SUCCESSFUL, invoice })
+export const createdInvoice = (event, invoice) => dispatch => {
+  // Close the form modal once the payment was succesful
+  dispatch(setFormType(null))
+
+  // Add new invoice to invoices list
+  dispatch({ type: INVOICE_SUCCESSFUL, invoice })
+
+  // Reset the payment form
+  dispatch(resetRequestForm())
+}
 
 // Listen for invoice updates pushed from backend from subscribeToInvoices 
 export const invoiceUpdate = (event, { invoice }) => (dispatch) => {
diff --git a/app/reducers/payform.js b/app/reducers/payform.js
index bd66eb01..488dc986 100644
--- a/app/reducers/payform.js
+++ b/app/reducers/payform.js
@@ -47,7 +47,7 @@ export function setPayInvoice(invoice) {
   }
 }
 
-export function resetForm() {
+export function resetPayForm() {
   return {
     type: RESET_FORM
   }
@@ -137,7 +137,6 @@ payFormSelectors.showPayLoadingScreen = createSelector(
   sendingTransactionSelector,
   sendingPaymentSelector,
   (sendingTransaction, sendingPayment) => sendingTransaction || sendingPayment
-
 )
 
 export { payFormSelectors }
diff --git a/app/reducers/payment.js b/app/reducers/payment.js
index de69b0b6..909e8504 100644
--- a/app/reducers/payment.js
+++ b/app/reducers/payment.js
@@ -1,6 +1,7 @@
 import { createSelector } from 'reselect'
 import { ipcRenderer } from 'electron'
-import { setForm, setFormType, resetForm } from './form'
+import { setFormType } from './form'
+import { resetPayForm } from './payform'
 
 // ------------------------------------
 // Constants
@@ -74,7 +75,7 @@ export const paymentSuccessful = () => (dispatch) => {
   dispatch(fetchPayments())
 
   // Reset the payment form
-  dispatch(resetForm())
+  dispatch(resetPayForm())
 }
 
 
diff --git a/app/reducers/requestform.js b/app/reducers/requestform.js
index e69de29b..e12f5dc8 100644
--- a/app/reducers/requestform.js
+++ b/app/reducers/requestform.js
@@ -0,0 +1,58 @@
+import { createSelector } from 'reselect'
+import bitcoin from 'bitcoinjs-lib'
+
+// Initial State
+const initialState = {
+  amount: '0',
+  memo: ''
+}
+
+// Constants
+// ------------------------------------
+export const SET_REQUEST_AMOUNT = 'SET_REQUEST_AMOUNT'
+export const SET_REQUEST_MEMO = 'SET_REQUEST_MEMO'
+export const SET_PAY_INVOICE = 'SET_PAY_INVOICE'
+
+export const RESET_FORM = 'RESET_FORM'
+
+// ------------------------------------
+// Actions
+// ------------------------------------
+export function setRequestAmount(amount) {
+  return {
+    type: SET_REQUEST_AMOUNT,
+    amount
+  }
+}
+
+export function setRequestMemo(memo) {
+  return {
+    type: SET_REQUEST_MEMO,
+    memo
+  }
+}
+
+export function resetRequestForm() {
+  return {
+    type: RESET_FORM
+  }
+}
+
+// ------------------------------------
+// Action Handlers
+// ------------------------------------
+const ACTION_HANDLERS = {
+  [SET_REQUEST_AMOUNT]: (state, { amount }) => ({ ...state, amount }),
+  [SET_REQUEST_MEMO]: (state, { memo }) => ({ ...state, memo }),
+  
+  [RESET_FORM]: () => (initialState)
+}
+
+// ------------------------------------
+// Reducer
+// ------------------------------------
+export default function payFormReducer(state = initialState, action) {
+  const handler = ACTION_HANDLERS[action.type]
+
+  return handler ? handler(state, action) : state
+}
diff --git a/app/reducers/transaction.js b/app/reducers/transaction.js
index ebf6b9b6..949df4ca 100644
--- a/app/reducers/transaction.js
+++ b/app/reducers/transaction.js
@@ -1,7 +1,8 @@
 import { ipcRenderer } from 'electron'
 import { showNotification } from '../notifications'
 import { btc, usd } from '../utils'
-import { setFormType, resetForm } from './form'
+import { setFormType } from './form'
+import { resetPayForm } from './payform'
 import { showModal } from './modal'
 
 // ------------------------------------
@@ -60,7 +61,7 @@ export const transactionSuccessful = (event, { amount, addr, txid }) => (dispatc
   // dispatch({ type: PAYMENT_SUCCESSFULL, payment: { amount, addr, txid, pending: true } })
   dispatch({ type: TRANSACTION_SUCCESSFULL })
   // Reset the payment form
-  dispatch(resetForm())
+  dispatch(resetPayForm())
 }
 
 export const transactionError = () => (dispatch) => {
diff --git a/app/routes/app/components/App.js b/app/routes/app/components/App.js
index f85794f8..0a739652 100644
--- a/app/routes/app/components/App.js
+++ b/app/routes/app/components/App.js
@@ -41,6 +41,7 @@ class App extends Component {
       isLn,
 
       openPayForm,
+      openRequestForm,
       formProps,
 
       closeForm,
@@ -72,7 +73,9 @@ class App extends Component {
           setCurrency={setCurrency}
           formClicked={formType => setForm({ modalOpen: true, formType })}
           currentTicker={currentTicker}
+
           openPayForm={openPayForm}
+          openRequestForm={openRequestForm}
         />
         <div className={styles.content}>
           {children}
diff --git a/app/routes/app/components/components/Nav.js b/app/routes/app/components/components/Nav.js
index 11b6d76f..e679b531 100644
--- a/app/routes/app/components/components/Nav.js
+++ b/app/routes/app/components/components/Nav.js
@@ -9,7 +9,7 @@ import CurrencyIcon from 'components/CurrencyIcon'
 import { btc, usd } from 'utils'
 import styles from './Nav.scss'
 
-const Nav = ({ ticker, balance, setCurrency, formClicked, currentTicker, openPayForm }) => (
+const Nav = ({ ticker, balance, setCurrency, formClicked, currentTicker, openPayForm, openRequestForm }) => (
   <nav className={styles.nav}>
     <ul className={styles.info}>
       <li className={`${styles.currencies} ${styles.link}`}>
@@ -75,7 +75,7 @@ const Nav = ({ ticker, balance, setCurrency, formClicked, currentTicker, openPay
       <div className={styles.button} onClick={openPayForm}>
         <span>Pay</span>
       </div>
-      <div className={styles.button} onClick={() => formClicked('request')}>
+      <div className={styles.button} onClick={openRequestForm}>
         <span>Request</span>
       </div>
     </div>
diff --git a/app/routes/app/containers/AppContainer.js b/app/routes/app/containers/AppContainer.js
index fcd32f42..e897acf9 100644
--- a/app/routes/app/containers/AppContainer.js
+++ b/app/routes/app/containers/AppContainer.js
@@ -21,6 +21,7 @@ import {
 } from 'reducers/form'
 
 import { setPayAmount, setPayInput, payFormSelectors } from 'reducers/payform'
+import { setRequestAmount, setRequestMemo } from 'reducers/requestform'
 
 
 import App from '../components/App'
@@ -48,6 +49,8 @@ const mapDispatchToProps = {
   setPayAmount,
   setPayInput,
 
+  setRequestAmount,setRequestMemo,
+
   setFormType
 }
 
@@ -59,6 +62,7 @@ const mapStateToProps = state => ({
   
   form: state.form,
   payform: state.payform,
+  requestform: state.requestform,
 
   invoice: state.invoice,
   modal: state.modal,
@@ -107,7 +111,21 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
   }
 
   const requestFormProps = {
+    requestform: stateProps.requestform,
+    currency: stateProps.ticker.currency,
+    crypto: stateProps.ticker.crypto,
 
+    setRequestAmount: dispatchProps.setRequestAmount,
+    setRequestMemo: dispatchProps.setRequestMemo,
+
+    onRequestSubmit: () => {
+      dispatchProps.createInvoice(
+        stateProps.requestform.amount,
+        stateProps.requestform.memo,
+        stateProps.ticker.currency,
+        stateProps.currentTicker.price_usd
+      )
+    }
   }
 
   const formProps = (formType) => {