+
+### Developing Locally
+
+
+First start by pulling down the git repo:
+```
+git clone https://github.com/lightninglabs/lightning-app.git
+```
+
+Then go inside the project folder and run the following commands (grab a coffee, this might take a while):
+```
+cd lightning-app
+npm run setup
+```
+
+### Development Mode
+
+You can run the app in development mode in lieu of using the packaged app:
+```
+npm start
+```
+
+You can pass extra arguments to be passed to lnd daemon (note the extra --):
+```
+npm run start -- --peerport=10019 --rpcport=10017 --datadir=test_lnd --logdir=test_lnd
+```
+
+In development mode, the app will look for an lnd.conf in the default location for your platform. See [`lnd.conf` details](https://github.com/lightningnetwork/lnd/blob/master/docs/INSTALL.md#creating-an-lndconf-optional). A typical lnd.conf for running on simnet will look like the following:
+
+```
+debuglevel=debug
+bitcoin.active=1
+bitcoin.simnet=1
+bitcoin.rpcuser=lnd
+bitcoin.rpcpass=lnd
+```
+
+Running in development mode can allow you to run in full node mode instead of the default neutrino mode, and will also allow you to run in simnet node for testing.
+
+Note that in order to run in simnet node, you will have also had to separately install and configure the [roasbeef fork of `btcd`](https://github.com/roasbeef/btcd). Additional instructions for running simnet can be found [here](https://gist.github.com/davecgh/2992ed85d41307e794f6).
+
+Also note that if you have installed and built [`lnd`](https://github.com/lightningnetwork/lnd) separately, if an instance is running when the app starts, the app will connect to the already running instance rather than attempt to start a new one.
+
+If you want your lnd.conf to replicate the configuration used by the packaged app, you can use the following:
+
+```
+debuglevel=info
+bitcoin.active=1
+bitcoin.testnet=1
+neutrino.active=1
+neutrino.connect=btcd0.lightning.computer:18333
+autopilot.active=1
+```
+
+### Building the Packaged App
+
+To build the packaged version of the app for your current platform, run:
+```
+npm run package-electron
+```
+
+The packaged app will then be available in the lightning-app/release directory. The packaged version of the app will run on Bitcoin testnet. To debug a packaged app, go to localhost:9997 in your browser.
+
+### Errors
+
+If the window doesn't load after running `npm start`: try clicking on dev tools window and hitting `cmd-r` to refresh the window.
+
+### Logs
+Logs are written to the following locations:
+
+* **Linux:** `~/.config/Lightning/log.log`
+* **OSX:** `~/Library/Logs/Lightning/log.log`
+* **Windows:** `%USERPROFILE%\AppData\Roaming\Lightning\log.log`
+
diff --git a/apps/desktop/app.dev.html b/apps/desktop/app.dev.html
new file mode 100644
index 000000000..473605121
--- /dev/null
+++ b/apps/desktop/app.dev.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
diff --git a/apps/desktop/app.html b/apps/desktop/app.html
new file mode 100644
index 000000000..a33d66de6
--- /dev/null
+++ b/apps/desktop/app.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/desktop/assets/ln-desktop.sketch b/apps/desktop/assets/ln-desktop.sketch
new file mode 100644
index 000000000..622d4f4b3
Binary files /dev/null and b/apps/desktop/assets/ln-desktop.sketch differ
diff --git a/apps/desktop/assets/ln-logo b/apps/desktop/assets/ln-logo
new file mode 100644
index 000000000..5bc12e7ce
--- /dev/null
+++ b/apps/desktop/assets/ln-logo
@@ -0,0 +1,22 @@
+How to use this icon:
+
+Step 1: Copy the icon to the clipboard
+a) Click on this file from the Finder
+b) Choose 'Get Info' from the 'File' menu.
+c) In the info window that pops up, click on the icon
+d) Choose 'Copy' from the 'Edit' menu.
+e) Close the info window
+
+Step 2: Paste the icon to the desired item
+a) Go to the item in the Finder that you want a custom icon
+b) Click the item (file, folder, disk, etc)
+b) Choose 'Get Info' from the 'File' menu.
+c) In the info window that pops up, click on the icon
+d) Choose 'Paste' from the 'Edit' menu.
+e) Close the info window
+
+Step 3:
+Enjoy your newly customized icon!
+
+For more thorough directions, see Apple's website at:
+http://www.apple.com/support/mac101/customize/6/
diff --git a/apps/desktop/assets/ln-logo.icns b/apps/desktop/assets/ln-logo.icns
new file mode 100644
index 000000000..dec953960
Binary files /dev/null and b/apps/desktop/assets/ln-logo.icns differ
diff --git a/apps/desktop/assets/ln-logo.ico b/apps/desktop/assets/ln-logo.ico
new file mode 100644
index 000000000..e95af6406
Binary files /dev/null and b/apps/desktop/assets/ln-logo.ico differ
diff --git a/apps/desktop/assets/ln-logo.png b/apps/desktop/assets/ln-logo.png
new file mode 100644
index 000000000..b3e786be7
Binary files /dev/null and b/apps/desktop/assets/ln-logo.png differ
diff --git a/apps/desktop/assets/ln-logo.sketch b/apps/desktop/assets/ln-logo.sketch
new file mode 100644
index 000000000..b89898526
Binary files /dev/null and b/apps/desktop/assets/ln-logo.sketch differ
diff --git a/apps/desktop/bin/darwin/lncli b/apps/desktop/bin/darwin/lncli
new file mode 100755
index 000000000..7834c6535
Binary files /dev/null and b/apps/desktop/bin/darwin/lncli differ
diff --git a/apps/desktop/bin/darwin/lnd b/apps/desktop/bin/darwin/lnd
new file mode 100755
index 000000000..3e088c179
Binary files /dev/null and b/apps/desktop/bin/darwin/lnd differ
diff --git a/apps/desktop/bin/linux/lnd b/apps/desktop/bin/linux/lnd
new file mode 100755
index 000000000..7934131c5
Binary files /dev/null and b/apps/desktop/bin/linux/lnd differ
diff --git a/apps/desktop/bin/win32/lnd.exe b/apps/desktop/bin/win32/lnd.exe
new file mode 100755
index 000000000..a871ed75c
Binary files /dev/null and b/apps/desktop/bin/win32/lnd.exe differ
diff --git a/apps/desktop/index.js b/apps/desktop/index.js
new file mode 100644
index 000000000..093d7de89
--- /dev/null
+++ b/apps/desktop/index.js
@@ -0,0 +1,22 @@
+import React from 'react'
+import { render } from 'react-dom'
+import { Provider } from 'react-redux'
+import { ConnectedRouter } from 'react-router-redux'
+import 'normalize.css'
+import { configureStore, history } from 'lightning-store'
+import { App } from 'lightning-app'
+import { remote } from 'electron'
+
+// Release the callbacks on app startup
+remote.getCurrentWindow().removeAllListeners()
+
+const store = configureStore()
+
+render(
+
+
+
+
+
+
+ ) : null
+}
+
+export default Popup
diff --git a/packages/lightning-components/QRCode/index.js b/packages/lightning-components/QRCode/index.js
new file mode 100644
index 000000000..a54b29e33
--- /dev/null
+++ b/packages/lightning-components/QRCode/index.js
@@ -0,0 +1,27 @@
+import React from 'react'
+import { format } from 'url'
+import qrImage from 'qr-image'
+
+export const QRCode = {
+ bitcoin: ({ address }) => {
+ const bitcoinURL = format({ protocol: 'bitcoin:', host: address })
+ const svg = qrImage.svgObject(bitcoinURL, { type: 'svg' })
+
+ return (
+
+ )
+ },
+ lightning: ({ paymentRequest }) => {
+ const svg = qrImage.svgObject(paymentRequest, { type: 'svg' })
+
+ return (
+
+ )
+ }
+}
+
+export default QRCode
diff --git a/packages/lightning-components/Select/index.js b/packages/lightning-components/Select/index.js
index 9d2046fb7..6192b2a8f 100644
--- a/packages/lightning-components/Select/index.js
+++ b/packages/lightning-components/Select/index.js
@@ -27,6 +27,12 @@ export const Media = (props) => {
color: '#777',
},
},
+ 'bare': {
+ select: {
+ boxShadow: 'none',
+ padding: 0,
+ },
+ },
...css.build('media', 'color', colors),
}, props)
diff --git a/packages/lightning-components/SidebarItem/index.js b/packages/lightning-components/SidebarItem/index.js
index 6ff0e3d24..a1ccfb1f9 100644
--- a/packages/lightning-components/SidebarItem/index.js
+++ b/packages/lightning-components/SidebarItem/index.js
@@ -25,7 +25,7 @@ export const SidebarItem = ({ color, hoverColor, hover, active, ellipsis,
},
'active': {
item: {
- color: 'teal',
+ color: 'blue',
},
},
'ellipsis': {
diff --git a/packages/lightning-components/Tab/index.js b/packages/lightning-components/Tab/index.js
index e56c7bb67..c85361a5d 100644
--- a/packages/lightning-components/Tab/index.js
+++ b/packages/lightning-components/Tab/index.js
@@ -1,7 +1,7 @@
import React from 'react'
import reactCSS, { hover as h } from 'reactcss'
-import { Link } from 'react-router'
+import { Link } from 'react-router-dom'
import { Box, Text } from '../'
diff --git a/packages/lightning-components/Tabs/story.js b/packages/lightning-components/Tabs/story.js
index 97746ad09..09afab92c 100644
--- a/packages/lightning-components/Tabs/story.js
+++ b/packages/lightning-components/Tabs/story.js
@@ -20,5 +20,5 @@ const tabs = [
storiesOf('Tabs', module)
.add('tabs', () => (
-
+ { children }
+
+
+ { _.map(channels, (channel, i) => (
+
+ )
+}
+
+export default ChannelList
diff --git a/packages/lightning-core/accounts/ChannelListItem.js b/packages/lightning-core/accounts/ChannelListItem.js
new file mode 100644
index 000000000..4365fd531
--- /dev/null
+++ b/packages/lightning-core/accounts/ChannelListItem.js
@@ -0,0 +1,186 @@
+import React from 'react'
+import reactCSS, { handleHover } from 'reactcss'
+import { remote } from 'electron'
+import { connect } from 'react-redux'
+import { actions as notificationActions } from 'lightning-notifications'
+import { actions as accountsActions } from '../accounts'
+import { Box, Icon } from 'lightning-components'
+import { Popup, actions as popupActions } from 'lightning-popup'
+import { actions } from './reducer'
+import { Prompt } from '../common'
+import { Money, MoneySign } from '../common'
+import { withRouter } from 'react-router'
+import { store } from 'lightning-store'
+
+const { Menu, MenuItem } = remote
+
+export const ChannelListItem = ({ id, capacity, currency, localBalance, remoteBalance,
+ active, status, hover, channelPoint, onShowPopup, onClosePopup, onCloseChannel,
+ onSuccess, onFetchChannels }) => {
+ const pending = status === 'pending-open'
+ || status === 'pending-closing'
+ || status === 'pending-force-closing'
+
+ const styles = reactCSS({
+ 'default': {
+ channel: {
+ borderBottom: '1px solid #ddd',
+ paddingTop: 20,
+ paddingBottom: 20,
+ },
+ split: {
+ display: 'flex',
+ justifyContent: 'space-between',
+ marginBottom: 7,
+ },
+ id: {
+ color: '#333',
+ fontSize: 20,
+ display: 'flex',
+ },
+ closeLabel: {
+ color: '#ce5c6a',
+ marginLeft: 10,
+ display: 'none',
+ height: 20,
+ cursor: 'pointer',
+ },
+ active: {
+ color: '#4990e2',
+ marginRight: 10,
+ },
+ status: {
+ fontSize: 13,
+ textTransform: 'uppercase',
+ color: '#999',
+ },
+ local: {
+ fontSize: 16,
+ color: '#4990E2',
+ },
+ remote: {
+ fontSize: 16,
+ color: '#666',
+ },
+ bar: {
+ borderRadius: 2,
+ background: 'lighter-gray',
+ marginTop: 10,
+ },
+ percent: {
+ background: 'blue',
+ height: 12,
+ borderRadius: 2,
+ },
+ },
+ 'hover': {
+ closeLabel: {
+ display: 'inline-block',
+ },
+ },
+ 'pending': {
+ id: {
+ color: '#999',
+ },
+ local: {
+ color: '#999',
+ },
+ remote: {
+ color: '#999',
+ },
+ percent: {
+ background: 'light-gray',
+ },
+ },
+ }, { hover, pending })
+
+ const PROMPT = `CHANNEL_LIST/PROMPT-${ channelPoint }`
+
+ // eslint-disable-next-line
+ const close = ({ channelPoint, force }) => {
+ const call = onCloseChannel({ channelPoint, force })
+ call.on('data', () => {
+ onSuccess('Channel Closed')
+ onFetchChannels()
+ })
+ call.on('error', err => onSuccess(err.message))
+ }
+
+ const showPopupOrClose = () =>
+ (active ? close({ channelPoint }) : onShowPopup(PROMPT))
+ const menu = new Menu()
+ menu.append(new MenuItem({ label: 'Close Channel', click() { showPopupOrClose() } }))
+ const handleMenu = () => menu.popup(remote.getCurrentWindow())
+ const handleClose = () => {
+ close({ channelPoint, force: true })
+ onClosePopup(PROMPT)
+ }
+ const handleCancel = () => onClosePopup(PROMPT)
+
+ const width = `${ (localBalance / capacity) * 100 }%`
+ const title = {
+ 'open': `CID: ${ id }`,
+ 'pending-open': 'OPENING',
+ 'pending-closing': 'CLOSING',
+ 'pending-force-closing': 'CLOSING',
+ }[status]
+
+ return (
+
+
+ ) : null }
+
+ { !channels.length && !loading ? (
+
+
+ ) : null }
+ No Channels Yet
+
+
+
+
+
+
+
+ )
+}
+
+export default connect(
+ state => ({
+ serverRunning: store.getServerRunning(state),
+ isSynced: store.getSyncedToChain(state),
+ pubkey: store.getAccountPubkey(state),
+ currency: store.getCurrency(state),
+ balances: store.getAccountBalances(state),
+ }), {
+ onShowPopup: popupActions.onOpen,
+ onClosePopup: popupActions.onClose,
+ onCloseChannel: actions.startCloseChannel,
+ onSuccess: notificationActions.addNotification,
+ onFetchChannels: accountsActions.fetchChannels,
+ onfetchAccount: accountsActions.fetchAccount,
+ onfetchBalances: accountsActions.fetchBalances,
+ },
+)(handleHover(ChannelListItem))
diff --git a/packages/lightning-core/accounts/CreateChannelPage.js b/packages/lightning-core/accounts/CreateChannelPage.js
new file mode 100644
index 000000000..817927694
--- /dev/null
+++ b/packages/lightning-core/accounts/CreateChannelPage.js
@@ -0,0 +1,64 @@
+import React from 'react'
+import { connect } from 'react-redux'
+import { Form } from 'lightning-forms'
+import { actions } from './reducer'
+import { remote } from 'electron'
+import { CurrencyInput, Head, Input, Page } from '../common'
+
+const { Menu, MenuItem } = remote
+
+export const CreateChannelPage = ({ createChannel, push }) => {
+ const fields = [
+ {
+ name: 'ip',
+ placeholder: 'Pubkey@HostIP',
+ required: true,
+ component: Input,
+ },
+ {
+ name: 'amount',
+ placeholder: 'Amount',
+ required: true,
+ component: CurrencyInput,
+ },
+ ]
+
+ const menu = new Menu()
+ menu.append(new MenuItem({ label: 'Paste', role: 'paste' }))
+ const handleMenu = () => menu.popup(remote.getCurrentWindow())
+
+ const handleSuccess = ({ ip, amount }, clear) => {
+ createChannel({ ip, amount })
+ .then(() => {
+ clear()
+ push('/accounts')
+ })
+ // eslint-disable-next-line no-console
+ .catch(console.error)
+ }
+
+ return (
+
+
+
+
+ { title }
+ { !pending && (
+
+
+
+ ) }
+
+ { active ? (
+ active
+ ) : null }
+ { status }
+
+
+
+
+ My Balance:
+ Available to Receive:
+
+
+
+
+ )
+}
+
+export default connect(
+ () => ({}), {
+ createChannel: actions.createChannel,
+ push: actions.push,
+ },
+)(CreateChannelPage)
diff --git a/packages/lightning-core/accounts/Wallet.js b/packages/lightning-core/accounts/Wallet.js
new file mode 100644
index 000000000..bdcd204fe
--- /dev/null
+++ b/packages/lightning-core/accounts/Wallet.js
@@ -0,0 +1,126 @@
+import React from 'react'
+import _ from 'lodash'
+import reactCSS from 'reactcss'
+import { connect } from 'react-redux'
+import { withRouter } from 'react-router'
+import { actions as accountActions } from '../accounts'
+import { store } from 'lightning-store'
+import { Money, MoneySign } from '../common'
+import { total } from '../helpers'
+import { Text } from 'lightning-components'
+
+export const Wallet = ({ pubkey, currency, balances }) => {
+ const styles = reactCSS({
+ 'default': {
+ bg: {
+ background: '#4990E2',
+ color: '#fff',
+ padding: 30,
+ paddingBottom: 20,
+ },
+ title: {
+ color: 'rgba(0,0,0,0.4)',
+ fontSize: 24,
+ userSelect: 'none',
+ cursor: 'default',
+ },
+ details: {
+ display: 'flex',
+ justifyContent: 'space-between',
+ alignItems: 'flex-end',
+ },
+ total: {
+
+ },
+ amount: {
+ fontSize: 32,
+ marginBottom: 10,
+ },
+ address: {
+ fontSize: 16,
+ color: 'rgba(0,0,0,0.4)',
+ minWidth: 300,
+ wordBreak: 'break-word',
+ marginRight: 20,
+ marginBottom: 10,
+ },
+ breakdown: {
+ fontSize: 16,
+ },
+ item: {
+ display: 'flex',
+ marginBottom: 10,
+ },
+ label: {
+ color: 'rgba(0,0,0,0.4)',
+ whiteSpace: 'nowrap',
+ marginRight: 10,
+ width: 90,
+ userSelect: 'none',
+ cursor: 'default',
+ },
+ count: {
+ flex: 1,
+ color: 'reba(255,255,255,0.9)',
+ whiteSpace: 'nowrap',
+ },
+ },
+ })
+
+ const breakdown = [
+ {
+ label: 'On Chain',
+ amount: balances.wallet,
+ }, {
+ label: 'In Channels',
+ amount: balances.channel,
+ },
+ ]
+
+ if (balances.limbo) {
+ breakdown.push({
+ label: 'In Limbo',
+ amount: balances.limbo,
+ })
+ }
+
+ return (
+
+
+ )
+}
+export default withRouter(connect(
+ state => ({
+ serverRunning: store.getServerRunning(state),
+ isSynced: store.getSyncedToChain(state),
+ pubkey: store.getAccountPubkey(state),
+ currency: store.getCurrency(state),
+ balances: store.getAccountBalances(state),
+ }), {
+ fetchAccount: accountActions.fetchAccount,
+ fetchBalances: accountActions.fetchBalances,
+ },
+)(Wallet))
diff --git a/packages/lightning-core/accounts/index.js b/packages/lightning-core/accounts/index.js
new file mode 100644
index 000000000..2a4a583d5
--- /dev/null
+++ b/packages/lightning-core/accounts/index.js
@@ -0,0 +1,73 @@
+import React from 'react'
+import reactCSS from 'reactcss'
+import { connect } from 'react-redux'
+import { store } from 'lightning-store'
+import { Link } from 'react-router-dom'
+import { actions } from './reducer'
+
+import { Head, Page } from '../common'
+import Wallet from './Wallet'
+import ChannelList from './ChannelList'
+
+export class Accounts extends React.Component {
+ componentDidMount() {
+ this.props.fetchBalances()
+ this.props.onMount()
+ }
+
+ render() {
+ const { pubkey, balances, channels, loading } = this.props
+ const styles = reactCSS({
+ default: {
+ page: {
+ display: 'flex',
+ flexDirection: 'column',
+ flex: 1,
+ },
+ link: {
+ fontSize: 12,
+ textTransform: 'uppercase',
+ textDecoration: 'none',
+ color: '#4990E2',
+ },
+ },
+ })
+ const createChannel = (
+ Create Channel
+ )
+ return (
+ Your Wallet
+
+
+
+ Pubkey: { pubkey }
+
+
+
+
+
+ { _.map(breakdown, (item, i) => (
+
+
+
+ )) }
+
+
+ { item.label }
+
+
+
+
+
+
+
+ )
+ }
+}
+
+export default connect(
+ state => ({
+ channels: store.getChannels(state),
+ loading: store.getChannelsLoading(state),
+ balances: store.getAccountBalances(state),
+ pubkey: store.getAccountPubkey(state),
+ }), {
+ onMount: actions.fetchChannels,
+ fetchBalances: actions.fetchBalances,
+ },
+)(Accounts)
+
+export { default as reducer, actions, selectors } from './reducer'
+export { default as CreateChannelPage } from './CreateChannelPage'
diff --git a/packages/lightning-core/accounts/reducer.js b/packages/lightning-core/accounts/reducer.js
new file mode 100644
index 000000000..0a5cc8364
--- /dev/null
+++ b/packages/lightning-core/accounts/reducer.js
@@ -0,0 +1,273 @@
+import _ from 'lodash'
+import { GRPC, SERVER_RUNNING } from 'redux-grpc-middleware'
+import { actions as notificationActions } from 'lightning-notifications'
+
+export const FETCH_ACCOUNT = 'ACCOUNTS/FETCH_ACCOUNT'
+export const FETCH_BALANCES = 'ACCOUNTS/FETCH_BALANCES'
+export const SET_BALANCES = 'ACCOUNTS/SET_BALANCES'
+export const REQUEST_CHANNELS = 'ACCOUNTS/REQUEST_CHANNELS'
+export const FETCH_CHANNELS = 'ACCOUNTS/FETCH_CHANNELS'
+export const FETCH_CHANNELS_FAILURE = 'ACCOUNTS/FETCH_CHANNELS_FAILURE'
+export const LIST_PEERS = 'ACCOUNTS/LIST_PEERS'
+export const OPEN_CHANNEL = 'ACCOUNTS/OPEN_CHANNEL'
+export const CONNECT_PEER = 'ACCOUNTS/CONNECT_PEER'
+export const START_CLOSING_CHANNEL = 'ACCOUNTS/START_CLOSING_CHANNEL'
+export const CLOSE_CHANNEL = 'ACCOUNTS/CLOSE_CHANNEL'
+export const PENDING_CHANNELS = 'ACCOUNTS/PENDING_CHANNELS'
+export const FETCH_ACCOUNT_FAILURE = 'ACCOUNTS/FETCH_ACCOUNT_ERROR'
+
+const initialState = {
+ pubkey: '',
+ isSynced: true,
+ serverRunning: false,
+ currency: 'satoshi',
+ balances: {
+ wallet: 0,
+ channel: 0,
+ },
+ channels: [],
+ pendingChannels: [],
+ loadingChannels: false,
+}
+
+export default (state = initialState, action) => {
+ switch (action.type) {
+ case SERVER_RUNNING:
+ return { ...state, serverRunning: true }
+ case REQUEST_CHANNELS:
+ return { ...state, loadingChannels: true }
+ case FETCH_ACCOUNT:
+ return { ...state, pubkey: action.pubkey, isSynced: action.isSynced }
+ case FETCH_ACCOUNT_FAILURE:
+ return { ...state, isSynced: false }
+ case SET_BALANCES:
+ return { ...state, balances: { ...state.balances, ...action.balances } }
+ case PENDING_CHANNELS:
+ return {
+ ...state,
+ pendingChannels: action.pendingChannels,
+ balances: {
+ ...state.balances,
+ limbo: action.limboBalance,
+ },
+ loadingChannels: false,
+ }
+ case FETCH_CHANNELS:
+ return {
+ ...state,
+ channels: action.channels,
+ loadingChannels: false,
+ }
+ case START_CLOSING_CHANNEL:
+ return {
+ ...state,
+ channels: _.map(state.channels, (c) => {
+ if (c.channelPoint === action.channelPoint) {
+ return {
+ ...c,
+ status: 'closing',
+ }
+ }
+ return c
+ }),
+ }
+ case FETCH_CHANNELS_FAILURE:
+ return { ...state, channels: [], loadingChannels: false }
+ default: return state
+ }
+}
+
+export const actions = {
+ fetchAccount: () => ({
+ [GRPC]: {
+ method: 'getInfo',
+ types: [null, FETCH_ACCOUNT, FETCH_ACCOUNT_FAILURE],
+ schema: account => ({
+ pubkey: account.identity_pubkey,
+ isSynced: account.synced_to_chain,
+ }),
+ },
+ }),
+ fetchBalances: () => (dispatch) => {
+ Promise.all([
+ dispatch({
+ [GRPC]: {
+ method: 'walletBalance',
+ schema: wallet => ({
+ wallet: parseInt(wallet.balance, 10), // To SAT,
+ }),
+ },
+ }),
+ dispatch({
+ [GRPC]: {
+ method: 'channelBalance',
+ schema: channel => ({
+ channel: parseInt(channel.balance, 10),
+ }),
+ },
+ }),
+ ])
+ .then((results) => {
+ const account = _.reduce(results, _.extend)
+ dispatch({
+ type: SET_BALANCES,
+ balances: {
+ wallet: account.wallet,
+ channel: account.channel,
+ },
+ })
+ })
+ // eslint-disable-next-line no-console
+ .catch(console.error)
+ },
+ pendingChannels: () => ({
+ [GRPC]: {
+ method: 'pendingChannels',
+ types: [null, PENDING_CHANNELS, FETCH_CHANNELS_FAILURE],
+ schema: (data) => {
+ const decorateChannels = (channels, transform) =>
+ _.map(channels, channel => ({
+ remotePubkey: channel.remote_node_pub,
+ capacity: channel.capacity,
+ localBalance: channel.local_balance,
+ remoteBalance: channel.remote_balance,
+ channelPoint: channel.channel_point,
+ ...transform(channel),
+ }))
+
+ return {
+ pendingChannels: [
+ ...decorateChannels(data.pending_open_channels, () => ({ status: 'pending-open' })),
+ ...decorateChannels(data.pending_closing_channels, () => ({ status: 'pending-closing' })),
+ ...decorateChannels(data.pending_force_closing_channels, () => ({ status: 'pending-force-closing' })),
+ ],
+ limboBalance: parseInt(data.total_limbo_balance, 0),
+ }
+ },
+ },
+ }),
+ listChannels: () => ({
+ [GRPC]: {
+ method: 'listChannels',
+ types: [REQUEST_CHANNELS, FETCH_CHANNELS, FETCH_CHANNELS_FAILURE],
+ schema: data => ({
+ channels: _.map(data.channels, channel => ({
+ remotePubkey: channel.remote_pubkey,
+ id: channel.chan_id,
+ capacity: channel.capacity,
+ localBalance: channel.local_balance,
+ remoteBalance: channel.remote_balance,
+ channelPoint: channel.channel_point,
+ active: channel.active,
+ status: 'open',
+ })),
+ }),
+ },
+ }),
+ fetchChannels: () => (dispatch) => {
+ dispatch(actions.listChannels())
+ dispatch(actions.pendingChannels())
+ },
+ listPeers: () => ({
+ [GRPC]: {
+ method: 'listPeers',
+ types: LIST_PEERS,
+ schema: list => ({
+ peers: list.peers || {},
+ }),
+ },
+ }),
+ openChannel: ({ pubkey, amount }) => ({
+ [GRPC]: {
+ method: 'openChannel',
+ types: OPEN_CHANNEL,
+ params: {
+ node_pubkey: new Buffer(pubkey, 'hex'),
+ local_funding_amount: amount,
+ num_confs: 1,
+ },
+ stream: true,
+ },
+ }),
+ connectPeer: ({ host, pubkey }) => ({
+ [GRPC]: {
+ method: 'connectPeer',
+ body: {
+ addr: { host, pubkey },
+ },
+ types: CONNECT_PEER,
+ },
+ }),
+ createChannel: ({ ip, amount }) => (dispatch) => {
+ return new Promise((resolve, reject) => {
+ const [pubkey, host] = ip && ip.split('@')
+
+ const rejectError = (err) => {
+ dispatch(notificationActions.addNotification(err.message))
+ reject(err.message)
+ }
+
+ const handleResolve = () => {
+ dispatch(notificationActions.addNotification('Opening Channel'))
+ resolve()
+ }
+
+ dispatch(actions.listPeers())
+ .then(({ peers }) => {
+ const peer = _.find(peers, { pub_key: pubkey })
+
+ if (peer) {
+ const call = dispatch(actions.openChannel({ pubkey, amount }))
+ call.on('data', handleResolve)
+ call.on('error', rejectError)
+ } else {
+ dispatch(actions.connectPeer({ host, pubkey }))
+ .then(() => {
+ const call = dispatch(actions.openChannel({ pubkey, amount }))
+ call.on('data', handleResolve)
+ call.on('error', rejectError)
+ })
+ .catch(rejectError)
+ }
+ })
+ .catch(rejectError)
+ })
+ },
+ startCloseChannel: params => (dispatch) => {
+ dispatch({ type: START_CLOSING_CHANNEL, channelPoint: params.channelPoint })
+ return dispatch(actions.closeChannel(params))
+ },
+ closeChannel: ({ channelPoint, force = false }) => {
+ const txid = channelPoint.split(':')[0]
+ const index = channelPoint.split(':')[1]
+ return {
+ [GRPC]: {
+ method: 'closeChannel',
+ types: CLOSE_CHANNEL,
+ params: {
+ channel_point: {
+ funding_txid: new Buffer(txid, 'hex').reverse(),
+ output_index: parseInt(index, 10),
+ },
+ force,
+ },
+ stream: true,
+ },
+ }
+ },
+ push: (...args) =>
+ ({ type: '@@router/CALL_HISTORY_METHOD', payload: { method: 'push', args } }),
+}
+
+export const selectors = {
+ getSyncedToChain: state => state.isSynced,
+ getServerRunning: state => state.serverRunning,
+ getAccountPubkey: state => state.pubkey,
+ getCurrency: state => state.currency,
+ getAccountBalances: state => state.balances,
+ getChannels: (state) => {
+ const channels = [...state.channels, ...state.pendingChannels]
+ return channels.length ? channels : []
+ },
+ getChannelsLoading: state => state.loadingChannels,
+}
diff --git a/packages/lightning-core/common/CurrencyInput.js b/packages/lightning-core/common/CurrencyInput.js
new file mode 100644
index 000000000..90271991b
--- /dev/null
+++ b/packages/lightning-core/common/CurrencyInput.js
@@ -0,0 +1,36 @@
+import React from 'react'
+import reactCSS from 'reactcss'
+
+import Input from './Input'
+import { enforceNumbers } from '../helpers/currencies'
+
+export const CurrencyInput = (props) => {
+ const styles = reactCSS({
+ 'default': {
+ changer: {
+ marginTop: 10,
+ marginBottom: 10,
+ borderLeft: '1px solid #ddd',
+ paddingLeft: 15,
+ paddingRight: 15,
+ display: 'flex',
+ alignItems: 'center',
+ color: '#999',
+ },
+ },
+ })
+
+ const changer = (
+ SAT
+ )
+
+ return (
+
+ )
+}
+
+export default CurrencyInput
diff --git a/packages/lightning-core/common/Head.js b/packages/lightning-core/common/Head.js
new file mode 100644
index 000000000..a0b337a0a
--- /dev/null
+++ b/packages/lightning-core/common/Head.js
@@ -0,0 +1,40 @@
+import React from 'react'
+import reactCSS from 'reactcss'
+
+export const Head = ({ title, body, right }) => {
+ const styles = reactCSS({
+ 'default': {
+ head: {
+ paddingBottom: 30,
+ paddingRight: 30,
+ userSelect: 'none',
+ cursor: 'default',
+ },
+ title: {
+ fontSize: 24,
+ color: '#666',
+ paddingBottom: 10,
+ display: 'flex',
+ justifyContent: 'space-between',
+ alignItems: 'center',
+ },
+ body: {
+ fontSize: 16,
+ lineHeight: '21px',
+ color: '#999',
+ },
+ },
+ })
+
+ return (
+
+
+ )
+}
+
+export default Head
diff --git a/packages/lightning-core/common/InfiniteScroll.js b/packages/lightning-core/common/InfiniteScroll.js
new file mode 100644
index 000000000..7de302639
--- /dev/null
+++ b/packages/lightning-core/common/InfiniteScroll.js
@@ -0,0 +1,52 @@
+import React from 'react'
+import reactCSS from 'reactcss'
+
+import Infinite from 'react-infinite'
+
+export class InfiniteScroll extends React.Component {
+ state = {
+ height: 300,
+ }
+
+ componentDidMount() {
+ // eslint-disable-next-line react/no-did-mount-set-state
+ this.setState({ height: this.outside.offsetHeight - 30 })
+ }
+
+ componentWillReceiveProps() {
+ this.setState({ height: this.outside.offsetHeight - 30 })
+ }
+
+ render() {
+ const { children, startAtBottom, insideStyles, elementHeight } = this.props
+
+ const styles = reactCSS({
+ default: {
+ wrap: {
+ flex: 1,
+ },
+ },
+ })
+
+ return (
+
+ { title }
+ { right }
+
+ { body }
+ (this.outside = wrap) }>
+
+ { children }
+
+
+ )
+ }
+}
+
+InfiniteScroll.defaultProps = {
+ startAtBottom: false,
+ insideStyles: {},
+ elementHeight: 15,
+}
diff --git a/packages/lightning-core/common/Input.js b/packages/lightning-core/common/Input.js
new file mode 100644
index 000000000..a672e7b27
--- /dev/null
+++ b/packages/lightning-core/common/Input.js
@@ -0,0 +1,93 @@
+import React from 'react'
+import reactCSS from 'reactcss'
+
+export class Input extends React.Component {
+ state = {
+ focused: false,
+ }
+
+ handleFocus = () => this.setState({ focused: true })
+ handleBlur = () => this.setState({ focused: false })
+ handleClick = () => {
+ const { selectOnClick, copyOnClick, onCopy, onClick } = this.props
+ if (copyOnClick) {
+ this.input.select()
+
+ try {
+ const wasCopied = document.execCommand('copy')
+ wasCopied && onCopy && onCopy()
+ } catch (error) {
+ // eslint-disable-next-line no-console
+ console.log('Error Copying to Clipboard:', error)
+ }
+ }
+ selectOnClick && this.input.select()
+ onClick && onClick()
+ }
+
+ render() {
+ const { name, right, left, type, placeholder, value, sanitizeReturn,
+ onChange, outlineColor, fullWidth, disabled } = this.props
+ const styles = reactCSS({
+ 'default': {
+ bg: {
+ backgroundColor: '#fff',
+ boxShadow: `0 0 2px ${ outlineColor }, 0 2px 4px ${ outlineColor }`,
+ borderRadius: 2,
+ height: 54,
+ display: 'flex',
+ alignItems: 'stretch',
+ maxWidth: fullWidth ? null : 350,
+ fontSize: 16,
+ flex: 1,
+
+ transition: 'box-shadow 100ms ease-out',
+ },
+ input: {
+ background: 'none',
+ flex: 1,
+ border: 'none',
+ outline: 'none',
+ fontSize: 16,
+ paddingLeft: 20,
+ color: '#333',
+ },
+ },
+ 'focused': {
+ bg: {
+ boxShadow: '0 0 2px rgba(0,0,0,0.2), 0 4px 8px rgba(0,0,0,0.2)',
+ },
+ },
+ }, { focused: this.state.focused })
+
+ const handleChange = ({ target }) => onChange({
+ [target.name]: sanitizeReturn ? sanitizeReturn(target.value) : target.value,
+ })
+
+ return (
+
+ { left || null }
+ (this.input = input) }
+ name={ name }
+ type={ type }
+ placeholder={ placeholder }
+ value={ value }
+ disabled={ disabled }
+ onChange={ handleChange }
+ onKeyPress= { this.props.onKeyPress }
+ onFocus={ this.handleFocus }
+ onBlur={ this.handleBlur }
+ />
+ { right || null }
+
+ )
+ }
+}
+
+Input.defaultProps = {
+ outlineColor: 'rgba(0, 0, 0, 0.12)',
+}
+
+export default Input
diff --git a/packages/lightning-core/common/LoadingIcon.js b/packages/lightning-core/common/LoadingIcon.js
new file mode 100644
index 000000000..b77bf52b2
--- /dev/null
+++ b/packages/lightning-core/common/LoadingIcon.js
@@ -0,0 +1,21 @@
+import React from 'react'
+
+export const LoadingIcon = () => {
+ return (
+
+
+
+ )
+}
diff --git a/packages/lightning-core/common/Money.js b/packages/lightning-core/common/Money.js
new file mode 100644
index 000000000..7ae236a39
--- /dev/null
+++ b/packages/lightning-core/common/Money.js
@@ -0,0 +1,26 @@
+import React from 'react'
+
+import { currencies } from '../helpers'
+
+export const Money = ({ currency, amount, sign }) => {
+ const money = currencies.find(currency)
+
+ return (
+
+ { sign ? `${ money.sign } ` : null }
+ { money.format(amount) }
+
+ )
+}
+
+export const MoneyCode = ({ currency }) => {
+ const money = currencies.find(currency)
+
+ return { money.code }
+}
+
+export const MoneySign = ({ currency }) => {
+ const money = currencies.find(currency)
+
+ return { money.sign }
+}
diff --git a/packages/lightning-core/components/nav/NavFooter.js b/packages/lightning-core/common/NavFooter.js
similarity index 56%
rename from packages/lightning-core/components/nav/NavFooter.js
rename to packages/lightning-core/common/NavFooter.js
index 4a6aa3ab6..6845ee7a5 100644
--- a/packages/lightning-core/components/nav/NavFooter.js
+++ b/packages/lightning-core/common/NavFooter.js
@@ -2,11 +2,11 @@ import React from 'react'
import { Box, Media, Text } from 'lightning-components'
import NavFooterAccount from './NavFooterAccount'
-import { Money, MoneySign } from '../common'
+import { Money, MoneySign } from './'
-import { total } from '../../helpers/wallet'
+import { total } from '../helpers/wallet'
-export const NavFooter = ({ currency, amount, identity, onClickAccount, account }) => {
+export const NavFooter = ({ pubkey, currency, balances, onClickAccount }) => {
return (
+ { children }
+
+
+export default Page
diff --git a/packages/lightning-core/common/Prompt.js b/packages/lightning-core/common/Prompt.js
new file mode 100644
index 000000000..3d8921c74
--- /dev/null
+++ b/packages/lightning-core/common/Prompt.js
@@ -0,0 +1,69 @@
+import React from 'react'
+import reactCSS from 'reactcss'
+
+export const Prompt = ({ title, prompt, acceptLabel, cancelLabel, onAccept,
+ onCancel }) => {
+ const styles = reactCSS({
+ default: {
+ prompt: {
+ background: '#fff',
+ borderRadius: 2,
+ width: 400,
+ padding: 20,
+ fontSize: 16,
+ lineHeight: '22px',
+ color: '#666',
+ },
+ promptTitle: {
+ fontSize: 24,
+ marginBottom: 15,
+ color: '#333',
+ },
+ promptActions: {
+ marginTop: 15,
+ display: 'flex',
+ justifyContent: 'flex-end',
+ },
+ button: {
+ height: 44,
+ display: 'flex',
+ alignItems: 'center',
+ paddingLeft: 15,
+ paddingRight: 15,
+ borderRadius: 3,
+ cursor: 'pointer',
+ textTransform: 'uppercase',
+ },
+ accept: {
+ background: '#DA7783',
+ marginRight: 15,
+ color: '#fff',
+ },
+ cancel: {
+ background: '#eee',
+ color: '#666',
+ },
+ },
+ })
+
+ return (
+
+ { title ?
+ )
+}
diff --git a/packages/lightning-core/common/Sidebar.js b/packages/lightning-core/common/Sidebar.js
new file mode 100644
index 000000000..fd9804e93
--- /dev/null
+++ b/packages/lightning-core/common/Sidebar.js
@@ -0,0 +1,102 @@
+/* eslint-disable no-console, react/no-danger */
+import React from 'react'
+import reactCSS from 'reactcss'
+import { connect } from 'react-redux'
+import { withRouter } from 'react-router'
+import { store } from 'lightning-store'
+
+import { Box, Text } from 'lightning-components'
+import { actions as accountActions } from '../accounts'
+import NavLinks from './NavLinks'
+import NavFooter from './NavFooter'
+
+export class Sidebar extends React.Component {
+ componentDidMount() {
+ this.props.fetchAccount()
+ .catch(console.error)
+ this.props.location.pathname !== '/accounts' && this.props.fetchBalances()
+ }
+
+ render() {
+ const { navigateToSubpage, currency, pubkey, balances, isSynced,
+ serverRunning } = this.props
+ const styles = reactCSS({
+ 'default': {
+ sidebar: {
+ direction: 'column',
+ spread: true,
+ flex: 1,
+ },
+ section: {
+ padding: 'small',
+ },
+ synced: {
+ background: 'blue',
+ direction: 'column',
+ align: 'center',
+ verticalAlign: 'center',
+ marginLeft: -7,
+ marginTop: 7,
+ marginRight: -7,
+ marginBottom: -7,
+ borderBottomLeftRadius: 4,
+ height: 34,
+ },
+ syncedText: {
+ color: 'black',
+ size: 'small',
+ },
+ },
+ })
+
+ return (
+ { title }
: null }
+ { prompt }
+
+
+
+ { acceptLabel }
+
+
+ { cancelLabel }
+
+
-
-
-
-
-
- )
-}
-
-export default Channels
diff --git a/packages/lightning-core/components/ChannelsCreate.js b/packages/lightning-core/components/ChannelsCreate.js
deleted file mode 100644
index d2b8cb074..000000000
--- a/packages/lightning-core/components/ChannelsCreate.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react'
-
-import { Box, Text, LiftedInput } from 'lightning-components'
-import { Link } from 'react-router'
-import { Header, LiftedCurrencyInput } from './common'
-
-export const ChannelsCreate = ({ fillCreateForm, host, amount, createChannel,
- navigateToChannels, currency, isSynced, onError }) => {
- const handleHostChange = e => fillCreateForm({ host: e.target.value, amount })
- const handleAmountChange = e => fillCreateForm({ host, amount: e.target.value })
- const handleCreate = () => (isSynced ? createChannel({ host, amount }) :
- onError('Wait Until Synced to Create a Channel'))
-
- return (
-
-
-
-
- Create
-
-
-
- Cancel
-
-
-
-
-
- )
-}
-
-export default ChannelsCreate
diff --git a/packages/lightning-core/components/Payment.js b/packages/lightning-core/components/Payment.js
deleted file mode 100644
index b7f510ed8..000000000
--- a/packages/lightning-core/components/Payment.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react'
-
-import { Redirect, Match } from 'react-router'
-import { Box } from 'lightning-components'
-import PaymentRequestTabs from './payment/PaymentRequestTabs'
-
-import PaymentLightningContainer from '../containers/PaymentLightningContainer'
-import PaymentBitcoinContainer from '../containers/PaymentBitcoinContainer'
-
-export const Payment = () => {
- return (
- -
- { log }
-
- )
- }) }
-
-
-
-
- Create a New Wallet
-
-
- Connect Wallet
-
-
-
- )
-}
-
-export default Channels
diff --git a/packages/lightning-core/components/Transactions.js b/packages/lightning-core/components/Transactions.js
deleted file mode 100644
index 84421c04c..000000000
--- a/packages/lightning-core/components/Transactions.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react'
-
-import TransactionsNavBar from './transactions/TransactionsNavBar'
-import TransactionsListContainer from '../containers/TransactionsListContainer'
-import { Header } from './common'
-
-
-export const Transactions = ({ params }) => {
- return (
-
-
- )
-}
-
-export default Transactions
diff --git a/packages/lightning-core/components/Wallet.js b/packages/lightning-core/components/Wallet.js
deleted file mode 100644
index 39375d602..000000000
--- a/packages/lightning-core/components/Wallet.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react'
-
-import { Box } from 'lightning-components'
-import WalletsList from './wallet/WalletsList'
-import { Header, CurrencyChanger } from './common'
-
-export const Wallet = ({ currency, changeCurrency, activeWallet, wallets,
- switchWallet, account }) => {
- const changer = (
-
-
-
-
- )
-}
-
-export default Wallet
diff --git a/packages/lightning-core/components/channels/ChannelAllocation.js b/packages/lightning-core/components/channels/ChannelAllocation.js
deleted file mode 100644
index 23f367cea..000000000
--- a/packages/lightning-core/components/channels/ChannelAllocation.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react'
-
-import { Box } from 'lightning-components'
-import ChannelAllocationBar from './ChannelAllocationBar'
-
-export const ChannelAllocation = ({ left, right, status }) => {
- const total = left + right
-
- return (
-
- { _.map(channels, (channel, i) => {
- return (
-
-
- No Channels Yet
- Create a Channel Below
-
-
- ) : null }
-
- )
-}
-
-export default ChannelsList
diff --git a/packages/lightning-core/components/channels/ChannelsListItem.js b/packages/lightning-core/components/channels/ChannelsListItem.js
deleted file mode 100644
index b2a949a1c..000000000
--- a/packages/lightning-core/components/channels/ChannelsListItem.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import React from 'react'
-import reactCSS from 'reactcss'
-
-import { Box, Text } from 'lightning-components'
-import { Money, Identity } from '../common'
-import ChannelAllocation from './ChannelAllocation'
-
-export const ChannelsListItem = ({ localAllocation, remoteAllocation, user,
- status, currency, remotePubKey, sendLightning }) => {
- const styles = reactCSS({
- 'default': {
- item: {
- direction: 'row',
- padding: 'small',
- verticalAlign: 'center',
- },
- left: {
- flex: 1,
- paddingLeft: 'small',
- },
- center: {
- flex: 3,
- height: 54,
- direction: 'row',
- },
- right: {
- flex: 2,
- textAlign: 'right',
- overflow: 'hidden',
- paddingRight: 'small',
- },
-
- headText: {
- fontSize: 'medium',
- color: 'black',
- display: 'block',
- overflow: 'hidden',
- },
- subText: {
- fontSize: 'small',
- display: 'block',
- color: 'gray',
- },
- },
- })
-
- const handleQuickPay = () => sendLightning(remotePubKey, 1000)
-
- return (
-
-
- )
- }) }
- { channels.length === 0 ? (
-
- { _.map(transactions, (transaction, i) => {
- return (
-
-
- { `No ${ idToLabel(sort) } Transactions` }
-
-
- ) : null }
-
- )
-}
-
-export default TransactionList
diff --git a/packages/lightning-core/components/transactions/TransactionsListItem.js b/packages/lightning-core/components/transactions/TransactionsListItem.js
deleted file mode 100644
index 654c869fa..000000000
--- a/packages/lightning-core/components/transactions/TransactionsListItem.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react'
-import reactCSS from 'reactcss'
-
-import { Box, Text } from 'lightning-components'
-import { Identity, Money } from '../common'
-
-export const TranscationListItem = ({ from, user, to, description, amount,
- currency, status }) => {
- const styles = reactCSS({
- 'default': {
- row: {
- direction: 'row',
- padding: 'medium',
- spread: true,
- background: 'white',
- },
- left: {
- direction: 'column',
- verticalAlign: 'center',
- minWidth: 0,
- size: 'medium',
- },
- right: {
- direction: 'column',
- verticalAlign: 'center',
- align: 'right',
- minWidth: 150,
- paddingLeft: 'medium',
- },
- focusText: {
- color: 'black',
- size: 'medium',
- },
- descText: {
- size: 'small',
- color: 'light-gray',
- paddingTop: 'xs',
- },
- },
- })
-
- return (
-
-
- )
- }) }
- { transactions.length === 0 ? (
-
- { _.map(wallets, (wallet, i) => {
- return (
-
- )
-}
-
-export default WalletsList
diff --git a/packages/lightning-core/components/wallet/WalletsListCompact.js b/packages/lightning-core/components/wallet/WalletsListCompact.js
deleted file mode 100644
index 1cf11dc55..000000000
--- a/packages/lightning-core/components/wallet/WalletsListCompact.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-
-import WalletsListCompactItem from './WalletsListCompactItem'
-
-export const WalletsListCompact = ({ wallets, currency, onSelect, selectedWallet }) => {
- return (
-
-
- )
- }) }
-
- { _.map(wallets, (wallet, i) => {
- return (
-
- )
-}
-
-export default WalletsListCompact
diff --git a/packages/lightning-core/components/wallet/WalletsListCompactItem.js b/packages/lightning-core/components/wallet/WalletsListCompactItem.js
deleted file mode 100644
index b0c541097..000000000
--- a/packages/lightning-core/components/wallet/WalletsListCompactItem.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import React from 'react'
-import reactCSS, { hover as h } from 'reactcss'
-
-import { Box, Icon, Media, Text } from 'lightning-components'
-import { Money } from '../common'
-
-import { total } from '../../helpers/wallet'
-
-export const WalletsListCompactItem = ({ active, onSelect, hover, amount, id,
- identity, currency }) => {
- const styles = reactCSS({
- 'default': {
- item: {
- cursor: 'pointer',
- display: 'block',
- marginBottom: 1,
- zDepth: 1,
- padding: 'medium',
- },
-
- radio: {
- name: 'radiobox-blank',
- color: 'light-gray',
- },
- },
- 'active': {
- wrap: {
- block: true,
- },
- switch: {
- display: 'none',
- },
-
- radio: {
- name: 'radiobox-marked',
- color: 'teal',
- },
- },
- 'active-false': {
- total: {
- 'black': false,
- 'light-gray': true,
- },
- identity: {
- 'light-gray': true,
- },
- },
- 'hover': {
- switch: {
- display: 'flex',
- },
- },
- }, { active, hover, 'active-false': active === false })
-
- const handleClick = () => onSelect(id)
-
- return (
-
+
+
+
+ )
+}
+
+export default connect(
+ () => ({}), {
+ onMakePayment: actions.makePayment,
+ onDecodePaymentRequest: actions.decodePaymentRequest,
+ onEditForm: formActions.editForm,
+ onFetchAccount: accountsActions.fetchAccount,
+ onFetchChannels: accountsActions.fetchChannels,
+ },
+)(Pay)
+
+export { default as reducer, actions, selectors } from './reducer'
diff --git a/packages/lightning-core/pay/reducer.js b/packages/lightning-core/pay/reducer.js
new file mode 100644
index 000000000..a7ab4a3d6
--- /dev/null
+++ b/packages/lightning-core/pay/reducer.js
@@ -0,0 +1,94 @@
+import { GRPC } from 'redux-grpc-middleware'
+import { actions as notificationActions } from 'lightning-notifications'
+import { actions as accountsActions } from '../accounts'
+import { sanitizePaymentRequest } from '../helpers'
+
+export const DECODE_PAYMENT_REQUEST = 'PAY/DECODE_PAYMENT_REQUEST'
+export const CHECK_PAYMENT_REQUEST = 'PAY/CHECK_PAYMENT_REQUEST'
+export const LIGHTNING_PAYMENT = 'PAY/LIGHTNING_PAYMENT'
+export const BITCOIN_PAYMENT = 'PAY/BITCOIN_PAYMENT'
+export const SUBSCRIBE_PAYMENT = 'PAY/SUBSCRIBE_PAYMENT'
+
+const initialState = {
+
+}
+
+export default (state = initialState, action) => {
+ switch (action.type) {
+ default: return state
+ }
+}
+
+export const actions = {
+ decodePaymentRequest: ({ paymentRequest }) => ({
+ [GRPC]: {
+ method: 'decodePayReq',
+ body: {
+ pay_req: paymentRequest,
+ },
+ types: DECODE_PAYMENT_REQUEST,
+ },
+ }),
+ makePayment: ({ address, amount }) => (dispatch) => {
+ return new Promise((resolve, reject) => {
+ const resolveSuccess = () => {
+ dispatch(notificationActions.addNotification('Payment Sent'))
+ dispatch(accountsActions.fetchChannels())
+ dispatch(accountsActions.fetchBalances())
+ dispatch(accountsActions.fetchAccount())
+ resolve('Payment Sent')
+ }
+ const rejectError = (err) => {
+ dispatch(notificationActions.addNotification(err.message))
+ reject(err.message)
+ }
+ const paymentRequest = sanitizePaymentRequest(address)
+
+ dispatch(actions.decodePaymentRequest({ paymentRequest }))
+ .then(() => {
+ const payments = dispatch(actions.sendPayment())
+ payments.on('data', (payment) => {
+ if (payment.payment_error === '') {
+ resolveSuccess()
+ } else {
+ // TODO(roasbeef): need to switch and properly display errors
+ rejectError({ message: 'Payment route failure' })
+ }
+ })
+ payments.on('error', rejectError)
+ payments.write({ payment_request: paymentRequest })
+ })
+ .catch(() => {
+ dispatch(actions.sendCoins({ address, amount }))
+ .then(resolve)
+ .catch(rejectError)
+ })
+ })
+ },
+ sendCoins: ({ address, amount }) => ({
+ [GRPC]: {
+ method: 'sendCoins',
+ body: {
+ addr: address,
+ amount,
+ },
+ types: BITCOIN_PAYMENT,
+ },
+ }),
+ sendPayment: () => ({
+ [GRPC]: {
+ method: 'sendPayment',
+ types: LIGHTNING_PAYMENT,
+ stream: true,
+ },
+ }),
+ subscribePayments: () => ({
+ [GRPC]: {
+ method: 'subscribePayments',
+ types: SUBSCRIBE_PAYMENT,
+ stream: true,
+ },
+ }),
+}
+
+export const selectors = {}
diff --git a/packages/lightning-core/reducer.js b/packages/lightning-core/reducer.js
new file mode 100644
index 000000000..208d6e14b
--- /dev/null
+++ b/packages/lightning-core/reducer.js
@@ -0,0 +1,17 @@
+import { combineReducers } from 'redux'
+
+import { reducer as accounts } from './accounts'
+import { reducer as pay } from './pay'
+import { reducer as request } from './request'
+import { reducer as settings } from './settings'
+import { reducer as transactions } from './transactions'
+
+export const reducer = combineReducers({
+ accounts,
+ pay,
+ request,
+ settings,
+ transactions,
+})
+
+export { selectors } from './selectors'
diff --git a/packages/lightning-core/reducers/channel.js b/packages/lightning-core/reducers/channel.js
deleted file mode 100644
index 260ec0ef7..000000000
--- a/packages/lightning-core/reducers/channel.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export const CREATE_CHANNEL = 'CHANNEL/CREATE_CHANNEL'
-
-export default function channels(state = {}, action) {
- switch (action.type) {
- case CREATE_CHANNEL:
- return {
- total: action.data.amount,
- localAllocation: action.data.amount,
- remoteAllocation: 0,
- remotePubKey: action.data.pubKey,
- status: 'pending',
- }
- default: return state
- }
-}
diff --git a/packages/lightning-core/reducers/channels.js b/packages/lightning-core/reducers/channels.js
deleted file mode 100644
index 9e11e3c41..000000000
--- a/packages/lightning-core/reducers/channels.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import _ from 'lodash'
-import { GRPC } from 'redux-grpc-middlware'
-import { actions as notificationsActions } from 'lightning-notifications'
-import channel, * as CHANNEL from './channel'
-
-export const GET_CHANNELS = 'CHANNELS/GET_CHANNELS'
-export const FILL_FORM = 'CHANNELS/FILL_FORM'
-export const LIST_PEERS = 'CHANNELS/LIST_PEERS'
-
-export const OPEN_CHANNEL_REQUEST = 'CHANNELS/OPEN_CHANNEL_REQUEST'
-export const OPEN_CHANNEL = 'CHANNELS/OPEN_CHANNEL'
-export const OPEN_CHANNEL_FAILURE = 'CHANNELS/OPEN_CHANNEL_FAILURE'
-
-export const CONNECT_PEER_REQUEST = 'CHANNELS/CONNECT_PEER_REQUEST'
-export const CONNECT_PEER = 'CHANNELS/CONNECT_PEER'
-export const CONNECT_PEER_FAILURE = 'CHANNELS/CONNECT_PEER_FAILURE'
-
-export default function channels(state = [], action) {
- switch (action.type) {
- case GET_CHANNELS:
- return _.map(action.listChannels.channels, c => ({
- total: parseInt(c.local_balance, 10) + parseInt(c.remote_balance, 10),
- localAllocation: parseInt(c.local_balance, 10),
- remoteAllocation: parseInt(c.remote_balance, 10),
- remotePubKey: c.remote_pubkey,
- status: 'open',
- }))
- case CHANNEL.CREATE_CHANNEL:
- return [...state, channel({}, action)]
- default: return state
- }
-}
-
-export const actions = {
- fillCreateForm: create => ({ type: FILL_FORM, create }),
-
- getChannels: () => ({
- [GRPC]: {
- method: 'listChannels',
- types: [null, GET_CHANNELS, null],
- },
- }),
-
- openChannel: (pubKey, amount) => ({
- [GRPC]: {
- method: 'openChannel',
- body: {
- node_pubkey_string: pubKey,
- local_funding_amount: amount,
- num_confs: 1,
- },
- types: [OPEN_CHANNEL_REQUEST, OPEN_CHANNEL, OPEN_CHANNEL_FAILURE],
- },
- }),
-
- listPeers: () => ({
- [GRPC]: {
- method: 'listPeers',
- types: [null, LIST_PEERS],
- },
- }),
-
- connectPeer: (host, pubkey) => ({
- [GRPC]: {
- method: 'connectPeer',
- body: {
- addr: { host, pubkey },
- },
- types: [CONNECT_PEER_REQUEST, CONNECT_PEER, CONNECT_PEER_FAILURE],
- },
- }),
-
- createChannel: data => (dispatch) => {
- const [pubkey, host] = data.host && data.host.split('@')
-
- dispatch(actions.listPeers())
- .then(({ listPeers }) => {
- const peer = _.find(listPeers.peers, { pub_key: pubkey })
-
- if (peer) {
- dispatch(actions.openChannel(pubkey, data.amount))
- } else {
- dispatch(actions.connectPeer(host, pubkey))
- .then(() => {
- dispatch(actions.openChannel(pubkey, data.amount))
- })
- .catch(err => dispatch(notificationsActions.addNotification(err.message)))
- }
- })
- .catch(err => dispatch(notificationsActions.addNotification(err.message)))
- },
-}
-
-export const selectors = {
- getChannels: state => state,
-}
diff --git a/packages/lightning-core/reducers/payment.js b/packages/lightning-core/reducers/payment.js
deleted file mode 100644
index 0aed8473c..000000000
--- a/packages/lightning-core/reducers/payment.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import { GRPC } from 'redux-grpc-middlware'
-
-export const SEND_BITCOIN = 'PAYMENT/SEND_BITCOIN'
-export const SET_BITCOIN_ADDRESS = 'PAYMENT/SET_BITCOIN_ADDRESS'
-
-export const CHANGE_BITCOIN_FORM = 'PAYMENT/CHANGE_BITCOIN_FORM'
-export const CHANGE_LIGHTNING_FORM = 'PAYMENT/CHANGE_LIGHTNING_FORM'
-export const CHANGE_LIGHTNING_SEND_URI = 'PAYMENT/CHANGE_LIGHTNING_SEND_URI'
-
-export const SEND_PAYMENT_REQUEST = 'CHANNELS/SEND_PAYMENT_REQUEST'
-export const SEND_PAYMENT = 'CHANNELS/SEND_PAYMENT'
-export const SEND_PAYMENT_FAILURE = 'CHANNELS/SEND_PAYMENT_FAILURE'
-
-export const CREATE_INVOICE_REQUEST = 'PAYMENT/CREATE_INVOICE_REQUEST'
-export const CREATE_INVOICE = 'PAYMENT/CREATE_INVOICE'
-export const CREATE_INVOICE_FAILURE = 'PAYMENT/CREATE_INVOICE_FAILURE'
-
-const initialState = {
- bitcoinAddress: '',
-}
-
-export default function payment(state = initialState, action) {
- switch (action.type) {
- case SET_BITCOIN_ADDRESS:
- return { ...state, bitcoinAddress: action.user.address }
- default: return state
- }
-}
-
-export const actions = {
- newWitnessAddress: () => ({
- [GRPC]: {
- method: 'newWitnessAddress',
- types: [null, SET_BITCOIN_ADDRESS],
- model: 'user',
- },
- }),
-
- sendCoins: ({ to, amount }) => ({
- [GRPC]: {
- method: 'sendCoins',
- body: {
- addr: to,
- amount,
- },
- types: [null, SEND_BITCOIN],
- model: 'transaction',
- },
- }),
-
- sendLightning: (remotePubKey, amount, paymentHash) => ({
- [GRPC]: {
- method: 'sendPayment',
- body: {
- amt: amount,
- dest_string: remotePubKey,
- payment_hash: paymentHash,
- },
- types: [SEND_PAYMENT_REQUEST, SEND_PAYMENT, SEND_PAYMENT_FAILURE],
- },
- }),
-
- requestLightning: (form, pubkey) => ({
- [GRPC]: {
- method: 'addInvoice',
- body: {
- memo: form.note,
- value: form.amount,
- },
- types: [CREATE_INVOICE_REQUEST, CREATE_INVOICE, CREATE_INVOICE_FAILURE],
- model: 'invoice',
- passthrough: { pubkey, amount: form.amount },
- },
- }),
-
- changeBitcoinForm: data => ({ type: CHANGE_BITCOIN_FORM, data }),
- changeLightningForm: data => ({ type: CHANGE_LIGHTNING_FORM, data }),
- changeSendURI: uri => ({ type: CHANGE_LIGHTNING_SEND_URI, uri }),
-}
-
-export const selectors = {
- getBitcoinAddress: state => state.bitcoinAddress,
-}
diff --git a/packages/lightning-core/reducers/transaction.js b/packages/lightning-core/reducers/transaction.js
deleted file mode 100644
index a4e148b79..000000000
--- a/packages/lightning-core/reducers/transaction.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import * as TRANSACTIONS from './transactions'
-
-export default function transaction(state, action) {
- switch (action.type) {
- case TRANSACTIONS.STREAMING_TRANSACTION:
- case TRANSACTIONS.GET_BITCOIN: {
- const fromYou = state.amount < 0
- return {
- id: state.tx_hash,
- from: fromYou ? 'You' : state.tx_hash,
- to: fromYou ? state.tx_hash : 'You',
- amount: state.amount * 1000000000,
- status: 'complete',
- date: parseInt(state.time_stamp, 10),
- }
- }
- case TRANSACTIONS.STREAMING_INVOICE:
- case TRANSACTIONS.GET_LIGHTNING: {
- const hash = new Buffer(state.r_preimage, 'base64').toString('hex')
- return {
- id: hash,
- from: hash,
- to: 'You',
- amount: state.value,
- status: state.settled ? 'complete' : 'in-progress',
- description: state.memo,
- date: parseInt(state.creation_date, 10),
- }
- }
- default: return state
- }
-}
diff --git a/packages/lightning-core/reducers/transactions.js b/packages/lightning-core/reducers/transactions.js
deleted file mode 100644
index 6c4b10c2c..000000000
--- a/packages/lightning-core/reducers/transactions.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/* eslint-disable no-param-reassign */
-import _ from 'lodash'
-import { GRPC } from 'redux-grpc-middlware'
-import transaction from './transaction'
-
-export const GET_TRANSACTIONS_REQUEST = 'TRANSACTIONS/GET_TRANSACTIONS_REQUEST'
-
-export const GET_BITCOIN = 'TRANSACTIONS/GET_BITCOIN'
-export const GET_LIGHTNING = 'TRANSACTIONS/GET_LIGHTNING'
-
-export const STREAMING_TRANSACTION = 'TRANSACTIONS/STREAMING_TRANSACTION'
-export const STREAMING_INVOICE = 'TRANSACTIONS/STREAMING_INVOICE'
-
-export default function transactions(state = {}, action) {
- switch (action.type) {
- case GET_BITCOIN:
- return _.reduce(action.bitcoin.transactions, (all, t) => {
- all[t.tx_hash] = transaction(t, action)
- return all
- }, { ...state })
-
- case GET_LIGHTNING:
- return _.reduce(action.lightning.invoices, (all, t) => {
- const id = new Buffer(t.r_preimage, 'base64').toString('hex')
- all[id] = transaction(t, action)
- return all
- }, { ...state })
-
- case STREAMING_TRANSACTION:
- return {
- ...state,
- [action.transaction.tx_hash]: transaction(action.transaction, action),
- }
- case STREAMING_INVOICE: {
- const id = new Buffer(action.invoice.r_preimage, 'base64').toString('hex')
- return {
- ...state,
- [id]: transaction(action.invoice, action),
- }
- }
- default: return state
- }
-}
-
-export const actions = {
- getBitcoinTransactions: () => ({
- [GRPC]: {
- method: 'getTransactions',
- types: [null, GET_BITCOIN],
- model: 'bitcoin',
- },
- }),
-
- getLightningTransactions: () => ({
- [GRPC]: {
- method: 'listInvoices',
- types: [null, GET_LIGHTNING],
- model: 'lightning',
- },
- }),
-
- getTransactions: () => (dispatch) => {
- dispatch(actions.getBitcoinTransactions())
- dispatch(actions.getLightningTransactions())
- },
-
- subscribeTransactions: () => ({
- [GRPC]: {
- method: 'subscribeTransactions',
- stream: true,
- },
- }),
-
- subscribeInvoices: () => ({
- [GRPC]: {
- method: 'subscribeInvoices',
- stream: true,
- },
- }),
-
- updateTransaction: transaction => ({ type: STREAMING_TRANSACTION, transaction }), // eslint-disable-line no-shadow, max-len
- updateInvoice: invoice => ({ type: STREAMING_INVOICE, invoice }),
-}
-
-export const selectors = {
- getRecentTransactions: (state) => {
- return _.orderBy(state, 'date', 'desc')
- },
- getRecentTransactionsByStatus: (state, status) => {
- const recent = selectors.getRecentTransactions(state)
- const filtered = status === 'recent' ? recent : _.filter(recent, { status })
- return _.take(filtered, 30)
- },
-}
diff --git a/packages/lightning-core/reducers/ui.js b/packages/lightning-core/reducers/ui.js
deleted file mode 100644
index cf3ab49bd..000000000
--- a/packages/lightning-core/reducers/ui.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import { GRPC } from 'redux-grpc-middlware'
-import * as PAYMENT from './payment'
-import * as CHANNELS from './channels'
-
-export const CHANGE_CURRENCY = 'UI/CHANGE_CURRENCY'
-
-export const GET_ACCOUNT_REQUEST = 'UI/GET_ACCOUNT_REQUEST'
-export const GET_ACCOUNT = 'UI/GET_ACCOUNT'
-export const GET_ACCOUNT_FAILURE = 'UI/GET_ACCOUNT_FAILURE'
-
-export const SUBSCRIBE_TRANSACTIONS = 'UI/SUBSCRIBE_TRANSACTIONS'
-
-export const initialState = {
- currency: 'satoshi',
- account: {
- pubKey: '',
- lnid: '',
- syncedToChain: true,
- },
- channelsCreateForm: {
- host: '',
- amount: '',
- },
- sendBitcoinForm: {
- to: '',
- amount: '',
- note: '',
- },
- sendLightningForm: {
- amount: 0,
- pubkey: '',
- rHash: '',
- },
- requestLightningForm: {
- amount: '',
- note: '',
- uri: '',
- },
- sendLightningURI: '',
-}
-
-export default function ui(state = initialState, action) {
- switch (action.type) {
- case PAYMENT.SEND_PAYMENT:
- case PAYMENT.SEND_BITCOIN:
- case 'ROUTE_CHANGE':
- return {
- ...state,
- requestLightningForm: initialState.requestLightningForm,
- sendLightningForm: initialState.sendLightningForm,
- sendBitcoinForm: initialState.sendBitcoinForm,
- channelsCreateForm: initialState.channelsCreateForm,
- sendLightningURI: initialState.sendLightningURI,
- }
- case CHANGE_CURRENCY:
- return { ...state, currency: action.currency }
- case CHANNELS.FILL_FORM:
- return { ...state, channelsCreateForm: action.create }
- case PAYMENT.CHANGE_BITCOIN_FORM:
- return { ...state, sendBitcoinForm: { ...state.sendBitcoinForm, ...action.data } }
- case PAYMENT.CHANGE_LIGHTNING_FORM:
- return { ...state, requestLightningForm: { ...state.requestLightningForm, ...action.data } }
- case PAYMENT.CHANGE_LIGHTNING_SEND_URI: {
- const [, amount, pubkey, rHash] = action.uri.split(',')
- return {
- ...state,
- requestLightningForm: initialState.requestLightningForm,
- sendLightningURI: action.uri,
- sendLightningForm: { amount, pubkey, rHash },
- }
- }
- case PAYMENT.CREATE_INVOICE: {
- const rHashHex = new Buffer(action.invoice.r_hash, 'base64').toString('hex')
- const uri = `lightning,${ action.amount },${ action.pubkey },${ rHashHex }`
- return {
- ...state,
- requestLightningForm: {
- amount: '',
- note: '',
- uri,
- },
- }
- }
- case GET_ACCOUNT:
- return {
- ...state,
- account: {
- pubKey: action.account.identity_pubkey,
- lnid: action.account.lightning_id,
- syncedToChain: true || action.account.synced_to_chain,
- },
- }
- case GET_ACCOUNT_FAILURE:
- return { ...state, account: { pubKey: 'No Pubkey' } }
- default: return state
- }
-}
-
-export const actions = {
- changeCurrency: currency => ({ type: CHANGE_CURRENCY, currency }),
-
- fetchAccount: () => ({
- [GRPC]: {
- method: 'getInfo',
- types: [GET_ACCOUNT_REQUEST, GET_ACCOUNT, GET_ACCOUNT_FAILURE],
- model: 'account',
- },
- }),
-
- subscribeTransactions: () => ({
- [GRPC]: {
- method: 'subscribeTransactions',
- types: [null, SUBSCRIBE_TRANSACTIONS, null],
- },
- }),
-}
-
-export const selectors = {
- getSyncedToChain: state => state.account.syncedToChain,
- getCurrency: state => state.currency,
- getAccountInfo: state => state.account,
- getSendLightningForm: state => state.sendLightningForm,
- getChannelsCreateForm: state => state.channelsCreateForm,
- getSendBitcoinForm: state => state.sendBitcoinForm,
- getRequestLightningForm: state => state.requestLightningForm,
- getSendLightningURI: state => state.sendLightningURI,
-}
diff --git a/packages/lightning-core/reducers/wallet.js b/packages/lightning-core/reducers/wallet.js
deleted file mode 100644
index 3d2a6621b..000000000
--- a/packages/lightning-core/reducers/wallet.js
+++ /dev/null
@@ -1,28 +0,0 @@
-export const FETCH_BALANCES = 'WALLET/FETCH_BALANCES'
-export const SET_AMOUNT = 'WALLET/SET_AMOUNT'
-
-export const initialState = {
- id: 0,
- identity: '',
- amount: {
- blockchain: 0,
- channels: 0,
- },
- address: '',
-}
-
-export default function wallet(state = initialState, action) {
- switch (action.type) {
- case SET_AMOUNT: {
- const amount = {
- blockchain: action.amount.walletBalance.balance * 100000000 || 0,
- channels: action.amount.channelBalance.balance || 0,
- }
- return {
- ...state,
- amount: { ...state.amount, ...amount },
- }
- }
- default: return state
- }
-}
diff --git a/packages/lightning-core/reducers/wallets.js b/packages/lightning-core/reducers/wallets.js
deleted file mode 100644
index e266768dc..000000000
--- a/packages/lightning-core/reducers/wallets.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { GRPC } from 'redux-grpc-middlware'
-import _ from 'lodash'
-import { combineReducers } from 'redux'
-import wallet, * as WALLET from './wallet'
-
-export const FETCH = 'WALLETS/FETCH'
-export const SWITCH_WALLET = 'WALLETS/SWITCH_WALLET'
-
-export function wallets(state = [WALLET.initialState], action) {
- switch (action.type) {
- case WALLET.SET_AMOUNT:
- return [
- wallet(state[0], action),
- ]
- default: return state
- }
-}
-
-const initialWalletState = {
- activeWalletIndex: 0,
-}
-
-export function ui(state = initialWalletState, action) {
- switch (action.type) {
- case SWITCH_WALLET:
- return { ...state, activeWalletIndex: action.activeWalletIndex }
- default: return state
- }
-}
-
-export default combineReducers({
- wallets,
- ui,
-})
-
-export const actions = {
- walletBalance: () => ({
- [GRPC]: {
- method: 'walletBalance',
- },
- }),
-
- channelBalance: () => ({
- [GRPC]: {
- method: 'channelBalance',
- },
- }),
-
- fetchBalances: () => (dispatch) => {
- Promise.all([
- dispatch(actions.walletBalance()),
- dispatch(actions.channelBalance()),
- ])
- .then((results) => {
- const amount = _.reduce(results, _.extend)
- dispatch({ type: WALLET.SET_AMOUNT, amount })
- })
- },
- switchWallet: activeWalletIndex => ({ type: SWITCH_WALLET, activeWalletIndex }),
-}
-
-export const selectors = {
- getWallets: state => state.wallets,
- getActiveWallet: state => state.wallets[state.ui.activeWalletIndex],
- getActiveWalletIndex: state => state.ui.activeWalletIndex,
-}
diff --git a/packages/lightning-core/request/BitcoinWallet.js b/packages/lightning-core/request/BitcoinWallet.js
new file mode 100644
index 000000000..61a161f90
--- /dev/null
+++ b/packages/lightning-core/request/BitcoinWallet.js
@@ -0,0 +1,90 @@
+import React from 'react'
+import reactCSS from 'reactcss'
+import { remote } from 'electron'
+import { Box, Text } from 'lightning-components'
+import { Popup } from 'lightning-popup'
+import { Icon, QRCode } from 'lightning-components'
+import { Input } from '../common'
+
+const QR_CODE = 'QR_CODE'
+
+const { Menu, MenuItem } = remote
+
+export class BitcoinWallet extends React.Component {
+ componentDidMount() { this.props.onFetchAddress() }
+
+ render() {
+ const { address, onSuccess, onShowQR } = this.props
+
+ const styles = reactCSS({
+ 'default': {
+ wrap: {
+ borderTop: '1px solid #ddd',
+ padding: 20,
+ display: 'flex',
+ alignItems: 'center',
+ },
+ label: {
+ marginTop: 10,
+ marginBottom: 10,
+ borderRight: '1px solid #ddd',
+ paddingLeft: 20,
+ paddingRight: 20,
+ display: 'flex',
+ alignItems: 'center',
+ color: '#999',
+ userSelect: 'none',
+ cursor: 'default',
+ },
+ icon: {
+ paddingLeft: 20,
+ cursor: 'pointer',
+ color: '#666',
+ },
+ qrPopup: {
+ background: '#fff',
+ borderRadius: 2,
+ width: 300,
+ height: 300,
+ },
+ },
+ })
+
+ const menu = new Menu()
+ menu.append(new MenuItem({ label: 'Copy', role: 'copy' }))
+ menu.append(new MenuItem({ label: 'Select All', role: 'selectall' }))
+ const handleMenu = () => menu.popup(remote.getCurrentWindow())
+
+ const handleCopy = () => onSuccess('Copied to Clipboard')
+ const handleClick = () => onShowQR(QR_CODE)
+
+ const label = (
+ Wallet Address
+ )
+
+ return (
+
+
+
+
+
+
+
+ )
+ }
+}
+
+export default BitcoinWallet
diff --git a/packages/lightning-core/request/PaymentRequestPopup.js b/packages/lightning-core/request/PaymentRequestPopup.js
new file mode 100644
index 000000000..649715126
--- /dev/null
+++ b/packages/lightning-core/request/PaymentRequestPopup.js
@@ -0,0 +1,79 @@
+import React from 'react'
+import reactCSS from 'reactcss'
+import { remote } from 'electron'
+import { Popup } from 'lightning-popup'
+import { QRCode } from 'lightning-components'
+import { Head, Input } from '../common'
+
+const { Menu, MenuItem } = remote
+
+export const POPUP_NAME = 'paymentRequest'
+
+export const PaymentRequestPopup = ({ paymentRequest, closePopup }) => {
+ const styles = reactCSS({
+ 'default': {
+ box: {
+ background: '#fff',
+ borderRadius: 2,
+ width: 390,
+ padding: 30,
+ boxShadow: '0 0 4px rgba(0,0,0,0.2), 0 8px 12px rgba(0,0,0,0.2)',
+ },
+ copy: {
+ marginTop: 10,
+ marginBottom: 10,
+ borderLeft: '1px solid #ddd',
+ paddingLeft: 20,
+ paddingRight: 20,
+ display: 'flex',
+ alignItems: 'center',
+ color: '#4990E2',
+ cursor: 'pointer',
+ },
+ qrPopup: {
+ background: '#fff',
+ borderRadius: 2,
+ width: 300,
+ height: 300,
+ marginLeft: 'auto',
+ marginRight: 'auto',
+ paddingBottom: 10,
+ }
+ },
+ })
+ const menu = new Menu()
+ menu.append(new MenuItem({ label: 'Copy', role: 'copy' }))
+ menu.append(new MenuItem({ label: 'Select All', role: 'selectall' }))
+ const handleMenu = () => menu.popup(remote.getCurrentWindow())
+
+ const handleCopied = () => closePopup(POPUP_NAME)
+
+ const copyButton = (
+
+
+
+
+ Copy
+ )
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default connect(
+ state => ({
+ paymentRequest: store.getPaymentRequest(state),
+ address: store.getAddress(state),
+ }), {
+ showPopup: popupActions.onOpen,
+ closePopup: popupActions.onClose,
+ onFetchAddress: actions.fetchAddress,
+ onGeneratePaymentRequest: actions.generatePaymentRequest,
+ onSuccess: notificationActions.addNotification,
+ },
+)(Pay)
+
+export { default as reducer, actions, selectors } from './reducer'
diff --git a/packages/lightning-core/request/reducer.js b/packages/lightning-core/request/reducer.js
new file mode 100644
index 000000000..1d1f65106
--- /dev/null
+++ b/packages/lightning-core/request/reducer.js
@@ -0,0 +1,60 @@
+import { GRPC } from 'redux-grpc-middleware'
+import { actions as POPUP } from 'lightning-popup'
+import { decoratePaymentRequest } from '../helpers'
+
+export const FETCH_ADDRESS_REQUEST = 'REQUEST/FETCH_ADDRESS_REQUEST'
+export const FETCH_ADDRESS = 'REQUEST/FETCH_ADDRESS'
+export const FETCH_ADDRESS_FAILURE = 'REQUEST/FETCH_ADDRESS_FAILURE'
+export const GENERATE_PAYMENT_REQUEST = 'REQUEST/GENERATE_PAYMENT_REQUEST'
+
+const initialState = {
+ paymentRequest: '',
+ address: '',
+}
+
+export default (state = initialState, action) => {
+ switch (action.type) {
+ case FETCH_ADDRESS_REQUEST:
+ return { ...state, address: 'Opening Wallet...' }
+ case FETCH_ADDRESS:
+ return { ...state, address: action.address }
+ case FETCH_ADDRESS_FAILURE:
+ return { ...state, address: 'Initializing Wallet' }
+ case POPUP.CLOSE_POPUP: {
+ if (action.name === 'paymentRequest') {
+ return { ...state, paymentRequest: '' }
+ }
+ return state
+ }
+ case GENERATE_PAYMENT_REQUEST:
+ return { ...state, paymentRequest: decoratePaymentRequest(action.paymentRequest) }
+ default: return state
+ }
+}
+
+export const actions = {
+ fetchAddress: () => ({
+ [GRPC]: {
+ method: 'newWitnessAddress',
+ types: [FETCH_ADDRESS_REQUEST, FETCH_ADDRESS, FETCH_ADDRESS_FAILURE],
+ },
+ }),
+ generatePaymentRequest: ({ amount, note }) => ({
+ [GRPC]: {
+ method: 'addInvoice',
+ body: {
+ memo: note,
+ value: amount,
+ },
+ schema: data => ({
+ paymentRequest: data.payment_request,
+ }),
+ types: GENERATE_PAYMENT_REQUEST,
+ },
+ }),
+}
+
+export const selectors = {
+ getPaymentRequest: state => state.paymentRequest,
+ getAddress: state => state.address,
+}
diff --git a/packages/lightning-core/selectors.js b/packages/lightning-core/selectors.js
new file mode 100644
index 000000000..c5b322619
--- /dev/null
+++ b/packages/lightning-core/selectors.js
@@ -0,0 +1,15 @@
+import { scopeStateToSelectors } from 'redux-selector'
+
+import { selectors as accounts } from './accounts'
+import { selectors as pay } from './pay'
+import { selectors as request } from './request'
+import { selectors as settings } from './settings'
+import { selectors as transactions } from './transactions'
+
+export const selectors = scopeStateToSelectors({
+ accounts,
+ pay,
+ request,
+ settings,
+ transactions,
+})
diff --git a/packages/lightning-core/settings/Terminal.js b/packages/lightning-core/settings/Terminal.js
new file mode 100644
index 000000000..7791e07f3
--- /dev/null
+++ b/packages/lightning-core/settings/Terminal.js
@@ -0,0 +1,41 @@
+import React, { Component } from 'react';
+import { Input } from '../common';
+import { ipcRenderer, ipcMain } from 'electron';
+import reactCSS from 'reactcss'
+
+export default class Terminal extends Component {
+ render() {
+ const styles = reactCSS({
+ 'default': {
+ changer: {
+ marginTop: 10,
+ marginBottom: 10,
+ borderLeft: '1px solid #ddd',
+ paddingLeft: 15,
+ paddingRight: 15,
+ display: 'flex',
+ alignItems: 'center',
+ color: '#999',
+ },
+ },
+ })
+
+ const handleKeyPress = (e) => {
+ if (e.key === 'Enter') {
+ ipcRenderer.send('terminal-command', e.target.value.split(' '));
+ e.target.value = '';
+ }
+
+ }
+ const changer = (
+ $ lncli
+ )
+
+ return (
+
+ )
+ }
+}
+
diff --git a/packages/lightning-core/settings/index.js b/packages/lightning-core/settings/index.js
new file mode 100644
index 000000000..4bf8b0636
--- /dev/null
+++ b/packages/lightning-core/settings/index.js
@@ -0,0 +1,107 @@
+import React from 'react'
+import _ from 'lodash'
+import reactCSS from 'reactcss'
+import { connect } from 'react-redux'
+import { store } from 'lightning-store'
+import { remote } from 'electron'
+import { Box, Text } from 'lightning-components'
+import { Head, Page } from '../common'
+import { InfiniteScroll } from '../common'
+import Terminal from './terminal'
+
+const { Menu, MenuItem } = remote
+
+const SettingsLogs = ({ logs }) => {
+ const insideStyles = {
+ padding: 15,
+ overflowX: 'scroll',
+ }
+ return (
+
+ { log }
+
+ )
+ }) }
+
+
+
+ { pubkey ? (
+
+ Pubkey: { pubkey }
+ ) : null }
+ lncli Access
+
+
+ Logs
+
+
+
+
+ )
+}
+
+export default connect(
+ state => ({
+ logs: store.getRecentLogs(state),
+ pubkey: store.getAccountPubkey(state),
+ }),
+)(SettingsPage)
+
+export { default as reducer, actions, selectors } from './reducer'
diff --git a/packages/lightning-core/reducers/lnd.js b/packages/lightning-core/settings/reducer.js
similarity index 89%
rename from packages/lightning-core/reducers/lnd.js
rename to packages/lightning-core/settings/reducer.js
index 747092f25..cfccf098b 100644
--- a/packages/lightning-core/reducers/lnd.js
+++ b/packages/lightning-core/settings/reducer.js
@@ -19,5 +19,5 @@ export const actions = {
}
export const selectors = {
- getRecentLogs: state => _.take(state.logs, 40),
+ getRecentLogs: state => _.takeRight(state.logs, 500),
}
diff --git a/packages/lightning-core/transactions/TransactionsList.js b/packages/lightning-core/transactions/TransactionsList.js
new file mode 100644
index 000000000..869489fe9
--- /dev/null
+++ b/packages/lightning-core/transactions/TransactionsList.js
@@ -0,0 +1,56 @@
+import React from 'react'
+import _ from 'lodash'
+import reactCSS from 'reactcss'
+
+import { Icon } from 'lightning-components'
+import { LoadingIcon } from '../common'
+import TransactionsListItem from './TransactionsListItem'
+
+export const TransactionsList = ({ transactions, loading }) => {
+ const styles = reactCSS({
+ 'default': {
+ list: {
+ borderTop: '1px solid #ddd',
+ display: 'flex',
+ flexDirection: 'column',
+ flex: 1,
+ },
+ empty: {
+ display: 'flex',
+ flexDirection: 'column',
+ flex: 1,
+ alignItems: 'center',
+ justifyContent: 'center',
+ color: '#bbb',
+ userSelect: 'none',
+ cursor: 'default',
+ },
+ emptyLabel: {
+ fontSize: 24,
+ paddingTop: 10,
+ },
+ },
+ })
+ return (
+
+ { _.map(transactions, transaction => (
+
+ )
+}
+
+export default TransactionsList
diff --git a/packages/lightning-core/transactions/TransactionsListItem.js b/packages/lightning-core/transactions/TransactionsListItem.js
new file mode 100644
index 000000000..c3f365a92
--- /dev/null
+++ b/packages/lightning-core/transactions/TransactionsListItem.js
@@ -0,0 +1,90 @@
+import React from 'react'
+import reactCSS from 'reactcss'
+import { Text, Icon } from 'lightning-components'
+import { Money, MoneySign } from '../common'
+import { connect } from 'react-redux'
+import { withRouter } from 'react-router'
+import { actions as accountActions } from '../accounts'
+import { store } from 'lightning-store'
+
+export const TransactionsListItem = ({ type, hash, memo, currency, amount, status }) => {
+ const styles = reactCSS({
+ 'default': {
+ item: {
+ paddingTop: 20,
+ paddingBottom: 20,
+ borderBottom: '1px solid #ddd',
+ display: 'flex',
+ flexShrink: 0,
+ },
+ icon: {
+ paddingRight: 13,
+ color: '#bbb',
+ },
+ column: {
+ display: 'flex',
+ flexDirection: 'column',
+ justifyContent: 'center',
+ },
+ details: {
+ textAlign: 'right',
+ whiteSpace: 'nowrap',
+ },
+ text: {
+ flex: 1,
+ marginRight: 20,
+ },
+ big: {
+ fontSize: 16,
+ color: '#333',
+ fontWeight: 500,
+ },
+ sent: {
+ fontWeight: 400,
+ color: '#999',
+ },
+ small: {
+ marginTop: 4,
+ fontSize: 13,
+ color: '#999',
+ userSelect: 'none',
+ cursor: 'default',
+ },
+ overflow: {
+ minWidth: 330,
+ wordBreak: 'break-word',
+ },
+ },
+ })
+ return (
+
+
+ ) : null }
+
+ { !transactions.length && !loading ? (
+
+
+ ) : null }
+ No Transactions Yet
+
+
+ )
+}
+
+export default withRouter(connect(
+ state => ({
+ serverRunning: store.getServerRunning(state),
+ isSynced: store.getSyncedToChain(state),
+ pubkey: store.getAccountPubkey(state),
+ currency: store.getCurrency(state),
+ balances: store.getAccountBalances(state),
+ }), {
+ fetchAccount: accountActions.fetchAccount,
+ fetchBalances: accountActions.fetchBalances,
+ },
+)(TransactionsListItem))
diff --git a/packages/lightning-core/transactions/index.js b/packages/lightning-core/transactions/index.js
new file mode 100644
index 000000000..0f924bea2
--- /dev/null
+++ b/packages/lightning-core/transactions/index.js
@@ -0,0 +1,36 @@
+import React from 'react'
+import { connect } from 'react-redux'
+import { store } from 'lightning-store'
+import { Head, Page } from '../common'
+import { actions } from './reducer'
+
+import TransactionsList from './TransactionsList'
+
+export class Transactions extends React.Component {
+ componentDidMount() { this.props.onFetchTransactions() }
+
+ render() {
+ const { loading, transactions } = this.props
+ return (
+
+
+
+
+
+
+ TxID: { hash }
+
+ {memo && Note: { memo }
}
+
+
+ { status }
+
-
-
-
diff --git a/packages/lightning-electron/main.development.js b/packages/lightning-electron/main.development.js
deleted file mode 100644
index 2cd479cd7..000000000
--- a/packages/lightning-electron/main.development.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/* eslint-disable global-require, no-console */
-
-import { app, BrowserWindow } from 'electron'
-import windowStateKeeper from 'electron-window-state'
-import _ from 'lodash'
-import observe from 'observe'
-import cp from 'child_process'
-import ps from 'ps-node'
-import './lnd'
-
-let mainWindow = null
-
-const isProcessRunning = command => new Promise((resolve, reject) => {
- ps.lookup({ command },
- (err, resultList) => {
- if (err) { throw new Error(err) }
- resultList[0] ? resolve(resultList[0]) : reject()
- }
- )
-})
-
-const runProcesses = (processes, logs) => {
- _.map(processes, (process) => {
- isProcessRunning(process.name)
- .then((p) => {
- console.log(`${ process.name } Already Running`, p)
- })
- .catch(() => {
- const prefix = `${ process.name }: `
- const instance = cp.execFile(process.name, process.args, { cwd: './bin' }, (error) => {
- if (error) { logs.push(`${ error.code }: ${ error.errno }`); return }
- })
- instance.stdout.on('data', data => logs.push(prefix + data))
- instance.stderr.on('data', data => logs.push(prefix + data))
- })
- })
-}
-
-const logBuffer = []
-const logs = observe(logBuffer)
-
-const processes = [
- {
- name: 'lnd',
- args: [
- '--btcdhost=127.0.0.1',
- '--rpcuser=kek',
- '--rpcpass=kek',
- '--simnet',
- '--debuglevel=trace',
- '--debughtlc',
- ],
- }, {
- name: 'btcd',
- args: [
- '--rpcuser=kek',
- '--rpcpass=kek',
- '--simnet',
- '--miningaddr=4NyWssGkW6Nbwj3nXrJU54U2ijHgWaKZ1N19w',
- ],
- },
-]
-
-runProcesses(processes, logs)
-
-const createWindow = () => {
- const mainWindowState = windowStateKeeper({
- defaultWidth: 750,
- defaultHeight: 500,
- })
-
- const { x, y, width, height } = mainWindowState
- mainWindow = new BrowserWindow({
- x,
- y,
- width,
- height,
- show: false,
- transparent: true,
- frame: false,
- title: 'Lightning',
- })
-
- mainWindowState.manage(mainWindow)
- mainWindow.loadURL(`file://${ __dirname }/app/app.html`)
-
- mainWindow.webContents.on('did-finish-load', () => {
- mainWindow.show()
- mainWindow.focus()
-
- mainWindow.webContents.send('logs', logBuffer)
- })
-
- logs.on('change', (change) => {
- const log = logBuffer[change.index]
- mainWindow && mainWindow.webContents.send('log', log)
- })
-
- if (process.env.NODE_ENV === 'development') {
- mainWindow.openDevTools()
- }
-
- mainWindow.on('closed', () => {
- mainWindow = null
- })
-}
-
-if (process.env.NODE_ENV === 'development') {
- require('electron-debug')()
-}
-
-app.on('window-all-closed', () => {
- if (process.platform !== 'darwin') app.quit()
-})
-
-// if (process.platform === 'darwin') {
-// const template = [
-// {
-// label: app.getName(),
-// },
-// ]
-// const menu = Menu.buildFromTemplate(template)
-// Menu.setApplicationMenu(menu)
-// }
-
-app.on('ready', createWindow)
diff --git a/packages/lightning-electron/package.js b/packages/lightning-electron/package.js
deleted file mode 100644
index 039b3779a..000000000
--- a/packages/lightning-electron/package.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/* eslint-disable no-console, consistent-return */
-/* eslint generator-star-spacing: 0 */
-
-import 'babel-polyfill'
-import os from 'os'
-import webpack from 'webpack'
-import packager from 'electron-packager'
-import del from 'del'
-import minimist from 'minimist'
-import { exec } from 'child_process'
-import cfg from './webpack.config.production'
-import pkg from './package.json'
-
-import electronCfg from './webpack.config.electron'
-
-
-/**
- * First two values are node path and current script path
- * https://nodejs.org/docs/latest/api/process.html#process_process_argv
- */
-const argv = minimist(process.argv.slice(2))
-
-/**
- * Do not package node modules from 'devDependencies'
- * and 'dependencies' that are set as external
- */
-const toNodePath = name => `/node_modules/${ name }($|/)`
-const devDeps = Object
- .keys(pkg.devDependencies)
- .map(toNodePath)
-
-const depsExternal = Object
- .keys(pkg.dependencies)
- .filter(name => !electronCfg.externals.includes(name))
- .map(toNodePath)
-
-
-const appName = argv.name || argv.n || pkg.productName
-const shouldUseAsar = argv.asar || argv.a || false
-const shouldBuildAll = argv.all || false
-
-
-const DEFAULT_OPTS = {
- dir: './',
- name: appName,
- asar: shouldUseAsar,
- ignore: [
- '^/test($|/)',
- '^/release($|/)',
- '^/main.development.js',
- ]
- .concat(devDeps)
- .concat(depsExternal),
-}
-
-const icon = argv.icon || argv.i || 'app/app'
-if (icon) DEFAULT_OPTS.icon = icon
-
-
-/**
- * @desc Execute the webpack build process on given config object
- * @param {Object} cfg
- * @return {Promise}
- */
-function build(config) {
- return new Promise((resolve, reject) => {
- webpack(config, (err, stats) => {
- if (err) return reject(err)
- resolve(stats)
- })
- })
-}
-
-function pack(plat, arch, cb) {
- // there is no darwin ia32 electron
- if (plat === 'darwin' && arch === 'ia32') return
-
- const iconObj = {
- icon: DEFAULT_OPTS.icon + (() => {
- let extension = '.png'
- if (plat === 'darwin') extension = '.icns'
- if (plat === 'win32') extension = '.ico'
-
- return extension
- })(),
- }
-
- const opts = Object.assign({}, DEFAULT_OPTS, iconObj, {
- 'platform': plat,
- arch,
- 'prune': true,
- 'app-version': pkg.version || DEFAULT_OPTS.version,
- 'out': `release/${ plat }-${ arch }`,
- })
-
- packager(opts, cb)
-}
-
-
-function log(plat, arch) {
- return (err, filepath) => {
- if (err) return console.error(err, filepath)
- console.log(`${ plat }-${ arch } finished!`)
- }
-}
-
-
-/** @desc Build, clear previous releases and pack new versions */
-async function startPack() {
- console.log('start pack...')
-
- try {
- /**
- * - Build the 'Main process' and 'Renderer Process' files.
- * - Clear the ./release directory
- */
- await build(electronCfg)
- await build(cfg)
- await del('release')
-
- // Start the packing process
- if (shouldBuildAll) {
- // build for all platforms
- const archs = ['ia32', 'x64']
- const platforms = ['linux', 'win32', 'darwin']
-
- platforms.forEach((plat) => {
- archs.forEach((arch) => {
- pack(plat, arch, log(plat, arch))
- })
- })
- } else {
- // build for current platform only
- pack(os.platform(), os.arch(), log(os.platform(), os.arch()))
- }
- } catch (error) {
- console.error(error)
- }
-}
-
-
-const version = argv.version || argv.v
-if (version) {
- DEFAULT_OPTS.version = version
- startPack()
-} else {
- // use the same version as the currently-installed electron-prebuilt
- exec('npm list electron --dev', (err, stdout) => {
- if (err) {
- DEFAULT_OPTS.version = '1.2.0'
- } else {
- DEFAULT_OPTS.version = stdout.split('electron@')[1].replace(/\s/g, '')
- }
-
- startPack()
- })
-}
diff --git a/packages/lightning-electron/package.json b/packages/lightning-electron/package.json
deleted file mode 100644
index 2aea7e83e..000000000
--- a/packages/lightning-electron/package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "lightning-electron",
- "version": "0.1.0",
- "description": "",
- "main": "main.development.js",
- "scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
- },
- "author": "case
-
-
-
+
+ )
+}
+
+Field.defaultProps = {
+ type: 'text',
+ value: '',
+}
+
+Field.propTypes = {
+ name: React.PropTypes.string.isRequired,
+ type: React.PropTypes.string,
+ placeholder: React.PropTypes.string,
+ value: React.PropTypes.string,
+ // component: React.PropTypes.element,
+ // required: React.PropTypes.bool,
+ // requiredMessage: React.PropTypes.string,
+ // validate: React.PropTypes.func,
+}
+
+export default Field
diff --git a/packages/lightning-forms/components/Form.js b/packages/lightning-forms/components/Form.js
new file mode 100644
index 000000000..06ca03f4b
--- /dev/null
+++ b/packages/lightning-forms/components/Form.js
@@ -0,0 +1,158 @@
+/* eslint-disable react/forbid-prop-types */
+
+import React from 'react'
+import _ from 'lodash'
+import reactCSS from 'reactcss'
+import { connect } from 'react-redux'
+import { actions, selectors } from '../reducer'
+
+import Field from './Field'
+
+const validate = fields => new Promise((resolve, reject) => {
+ const errors = {}
+ _.map(fields, (field) => {
+ if (field.required && field.value === '') {
+ errors[field.name] = { error: true, errorText: `${ field.name } is empty` }
+ }
+ })
+
+ const values = _.reduce(fields, (all, field) => {
+ // eslint-disable-next-line no-param-reassign
+ all[field.name] = field.value
+ return all
+ }, {})
+
+ _.isEmpty(errors) ? resolve(values) : reject(errors)
+})
+
+class Form extends React.Component {
+ componentDidMount() {
+ const { name, fields, initForm } = this.props
+ const data = _.reduce(fields, (all, field) => {
+ // eslint-disable-next-line no-param-reassign
+ all[field.name] = field.value || ''
+ return all
+ }, {})
+ initForm(name, data)
+ }
+
+ render() {
+ const { submitLabel, clearLabel, name, combinedFields, spacing,
+ onError, onSuccess, editForm, clearForm, setFormErrors, onChange } = this.props
+
+ const wasEdited = _.some(combinedFields, 'value')
+ const canSubmit = _(combinedFields).filter('required').every('value')
+
+ const styles = reactCSS({
+ 'default': {
+ form: {
+ userSelect: 'none',
+ cursor: 'default',
+ },
+ field: {
+ paddingBottom: spacing,
+ },
+ controls: {
+ display: 'flex',
+ alignItems: 'stretch',
+ height: 54,
+ },
+ button: {
+ display: 'flex',
+ alignItems: 'center',
+ paddingLeft: 20,
+ paddingRight: 20,
+ fontSize: 16,
+ },
+ submit: {
+ backgroundColor: '#ddd',
+ borderRadius: 2,
+ color: '#fff',
+
+ transition: 'background-color 100ms ease-out',
+ },
+ clear: {
+ color: '#999',
+ cursor: 'pointer',
+ },
+ },
+ 'canSubmit': {
+ submit: {
+ cursor: 'pointer',
+ backgroundColor: '#4990E2',
+ boxShadow: '0 2px 4px rgba(89, 217, 164, 0.3)',
+ },
+ },
+ }, { canSubmit })
+
+ const handleSubmit = () => {
+ validate(combinedFields)
+ .then((values) => {
+ const clear = () => clearForm(name)
+ onSuccess(values, clear)
+ })
+ .catch((errors) => {
+ setFormErrors(name, errors)
+ onError(errors)
+ })
+ }
+
+ const handleClear = () => clearForm(name)
+
+ const handleFieldChange = (change) => {
+ onChange && onChange(change)
+ editForm(name, change)
+ }
+
+ return (
+ { errorText }
: null }
+
+
+ { _.map(combinedFields, field => (
+
+ )
+ }
+}
+
+Form.defaultProps = {
+ submitLabel: 'Submit',
+ clearLabel: 'Clear',
+ onSuccess: () => {},
+ onError: () => {},
+ spacing: 20,
+}
+
+Form.propTypes = {
+ name: React.PropTypes.string.isRequired,
+ fields: React.PropTypes.array.isRequired,
+}
+
+export default connect(
+ (state, ownProps) => {
+ const values = selectors.getFormFields(state.forms, ownProps.name)
+ const errors = selectors.getFormErrors(state.forms, ownProps.name)
+ return {
+ combinedFields: _.map(ownProps.fields, (field) => {
+ return { ...field, ...errors[field.name], value: values[field.name] }
+ }),
+ }
+ },
+ actions,
+)(Form)
diff --git a/packages/lightning-forms/index.js b/packages/lightning-forms/index.js
new file mode 100644
index 000000000..b5a5b9483
--- /dev/null
+++ b/packages/lightning-forms/index.js
@@ -0,0 +1,3 @@
+export { default as Form } from './components/Form'
+
+export { reducer, actions, selectors } from './reducer'
diff --git a/packages/lightning-forms/package.json b/packages/lightning-forms/package.json
new file mode 100644
index 000000000..fa79b0fa7
--- /dev/null
+++ b/packages/lightning-forms/package.json
@@ -0,0 +1,18 @@
+{
+ "name": "lightning-forms",
+ "version": "0.1.0",
+ "description": "",
+ "main": "index.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "author": "",
+ "license": "MIT",
+ "dependencies": {
+ "lodash": "^4.16.2",
+ "react": "^15.4.2",
+ "react-redux": "^4.4.6",
+ "reactcss": "^1.1.1",
+ "redux": "^3.6.0"
+ }
+}
diff --git a/packages/lightning-forms/reducer.js b/packages/lightning-forms/reducer.js
new file mode 100644
index 000000000..48f75ef40
--- /dev/null
+++ b/packages/lightning-forms/reducer.js
@@ -0,0 +1,43 @@
+import _ from 'lodash'
+
+export const INIT_FORM = 'LIGHTNING_FORMS/INIT_FORM'
+export const EDIT_FORM = 'LIGHTNING_FORMS/EDIT_FORM'
+export const CLEAR_FORM = 'LIGHTNING_FORMS/CLEAR_FORM'
+export const SET_FORM_ERRORS = 'LIGHTNING_FORMS/SET_FORM_ERRORS'
+
+const formReducer = (state = {}, action) => {
+ switch (action.type) {
+ case INIT_FORM:
+ case EDIT_FORM:
+ return { ...state, fields: { ...state.fields, ...action.form.data } }
+ case CLEAR_FORM:
+ return { ...state, fields: _.mapValues(state.fields, () => ''), errors: {} }
+ case SET_FORM_ERRORS:
+ return { ...state, errors: action.errors }
+ default: return state
+ }
+}
+
+export const reducer = (state = {}, action) => {
+ switch (action.type) {
+ case INIT_FORM:
+ case EDIT_FORM:
+ case CLEAR_FORM:
+ case SET_FORM_ERRORS:
+ return { ...state, [action.form.name]: formReducer(state[action.form.name], action) }
+ default: return state
+ }
+}
+
+export const actions = {
+ initForm: (name, data) => ({ type: INIT_FORM, form: { name, data } }),
+ editForm: (name, data) => ({ type: EDIT_FORM, form: { name, data } }),
+ clearForm: name => ({ type: CLEAR_FORM, form: { name } }),
+ setFormErrors: (name, errors) => ({ type: SET_FORM_ERRORS, form: { name }, errors }),
+}
+
+export const selectors = {
+ getForm: (state, name) => state[name] || {},
+ getFormFields: (state, name) => (state[name] && state[name].fields) || {},
+ getFormErrors: (state, name) => (state[name] && state[name].errors) || {},
+}
diff --git a/packages/lightning-notifications/helpers.js b/packages/lightning-notifications/helpers.js
new file mode 100644
index 000000000..18864983e
--- /dev/null
+++ b/packages/lightning-notifications/helpers.js
@@ -0,0 +1,8 @@
+export const guid = () => {
+ const s4 = () =>
+ Math.floor((1 + Math.random()) * 0x10000)
+ .toString(16)
+ .substring(1)
+
+ return `${ s4() + s4() }-${ s4() }-${ s4() }-${ s4() }-${ s4() }${ s4() }${ s4() }`
+}
diff --git a/packages/lightning-notifications/index.js b/packages/lightning-notifications/index.js
index 10a8d26e3..be0479924 100644
--- a/packages/lightning-notifications/index.js
+++ b/packages/lightning-notifications/index.js
@@ -1,4 +1,5 @@
import _ from 'lodash'
+import { guid } from './helpers'
export { default as Notifications } from './Notifications'
@@ -6,15 +7,6 @@ export const ADD = 'NOTIFICATIONS/ADD'
export const REMOVE = 'NOTIFICATIONS/REMOVE'
export const NOTIFICATION = 'NOTIFICATIONS/NOTIFICATION'
-function guid() {
- function s4() {
- return Math.floor((1 + Math.random()) * 0x10000)
- .toString(16)
- .substring(1)
- }
- return `${ s4() + s4() }-${ s4() }-${ s4() }-${ s4() }-${ s4() }${ s4() }${ s4() }`
-}
-
export default function notifications(state = [], action) {
const data = {
[ADD]: () => {
diff --git a/packages/lightning-notifications/package.json b/packages/lightning-notifications/package.json
index 544a58b4f..756a395a3 100644
--- a/packages/lightning-notifications/package.json
+++ b/packages/lightning-notifications/package.json
@@ -1,6 +1,6 @@
{
"name": "lightning-notifications",
- "version": "0.1.0",
+ "version": "0.1.1",
"description": "",
"main": "index.js",
"scripts": {
@@ -9,11 +9,12 @@
"author": "case
+
+ ))}
+
+
+
+
+ { submitLabel }
+
+ { wasEdited ? (
+
+ { clearLabel }
+
+ ) : null }
+
+
+
+ ) : null
+}
+
+export default connect(
+ (state, ownProps) => ({
+ visible: store.getPopupVisibility(state, ownProps.name),
+ }),
+ actions,
+)(Popup)
diff --git a/packages/lightning-popup/index.js b/packages/lightning-popup/index.js
new file mode 100644
index 000000000..b269cb89d
--- /dev/null
+++ b/packages/lightning-popup/index.js
@@ -0,0 +1,2 @@
+export { default as Popup } from './Popup'
+export { reducer, actions, selectors } from './reducer'
diff --git a/packages/lightning-popup/package.json b/packages/lightning-popup/package.json
new file mode 100644
index 000000000..d2ee64d8a
--- /dev/null
+++ b/packages/lightning-popup/package.json
@@ -0,0 +1,20 @@
+{
+ "name": "lightning-popup",
+ "version": "0.1.0",
+ "description": "",
+ "main": "index.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "author": "",
+ "license": "MIT",
+ "dependencies": {
+ "lightning-components": "^0.1.1",
+ "lightning-store": "^0.1.1",
+ "lodash": "^4.17.2",
+ "react": "^15.4.1",
+ "react-redux": "^4.4.6",
+ "reactcss": "^1.1.1",
+ "redux": "^3.6.0"
+ }
+}
diff --git a/packages/lightning-popup/reducer.js b/packages/lightning-popup/reducer.js
new file mode 100644
index 000000000..14a641118
--- /dev/null
+++ b/packages/lightning-popup/reducer.js
@@ -0,0 +1,21 @@
+export const OPEN_POPUP = 'LIGHTNING_POPUP/OPEN_POPUP'
+export const CLOSE_POPUP = 'LIGHTNING_POPUP/CLOSE_POPUP'
+
+export const reducer = (state = {}, action) => {
+ switch (action.type) {
+ case OPEN_POPUP:
+ return { ...state, [action.name]: true }
+ case CLOSE_POPUP:
+ return { ...state, [action.name]: false }
+ default: return state
+ }
+}
+
+export const actions = {
+ onClose: name => ({ type: CLOSE_POPUP, name }),
+ onOpen: name => ({ type: OPEN_POPUP, name }),
+}
+
+export const selectors = {
+ getPopupVisibility: (state, name) => state[name] || false,
+}
diff --git a/packages/lightning-store/index.js b/packages/lightning-store/index.js
index 9afc3a10a..fda20939e 100644
--- a/packages/lightning-store/index.js
+++ b/packages/lightning-store/index.js
@@ -1,17 +1,13 @@
/* eslint-disable import/no-named-as-default-member */
import { createStore } from 'redux'
-import storage from './local-storage'
-import middleware from './middleware'
+import middleware, { history } from './middleware'
import reducers from './reducers'
-const state = { ...storage.load(), transactions: [] }
-
-export function configureStore(initialState = state) {
- const store = createStore(reducers, initialState, middleware)
- storage.save(store)
-
- return store
+export function configureStore(initialState = {}) {
+ return createStore(reducers, initialState, middleware)
}
+export { history }
+
export { default as store } from './selectors'
diff --git a/packages/lightning-store/local-storage.js b/packages/lightning-store/local-storage.js
deleted file mode 100644
index c5f92c5d2..000000000
--- a/packages/lightning-store/local-storage.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import _ from 'lodash'
-
-const STATE = 'LIGHTNING_STATE'
-
-export const save = (store) => {
- // const saveState = _.debounce(() => {
- // localStorage.setItem(STATE, JSON.stringify(store.getState()))
- // }, 5000)
-
- // store.subscribe(saveState)
-}
-
-export const load = () => {
- return JSON.parse(localStorage.getItem(STATE)) || {}
-}
-
-export default exports
diff --git a/packages/lightning-store/middleware.js b/packages/lightning-store/middleware.js
index 3664bf835..6472bce8b 100644
--- a/packages/lightning-store/middleware.js
+++ b/packages/lightning-store/middleware.js
@@ -1,17 +1,19 @@
import { applyMiddleware } from 'redux'
-import { hashHistory } from 'react-router'
import { routerMiddleware } from 'react-router-redux'
import thunk from 'redux-thunk'
import createLogger from 'redux-logger'
import createIpc from 'redux-electron-ipc'
-import createGrpc from 'redux-grpc-middlware'
-import { actions as logActions } from 'lightning-core/src/reducers/lnd'
+import createGrpc from 'redux-grpc-middleware'
+import { actions as logActions } from 'lightning-core/settings'
+
+import { createHashHistory } from 'history'
const ipc = createIpc(logActions)
-const grpc = createGrpc({ path: './lnd' })
+const grpc = createGrpc()
const logger = createLogger({ level: 'info', collapsed: true })
-const router = routerMiddleware(hashHistory)
+export const history = createHashHistory()
+const router = routerMiddleware(history)
export default applyMiddleware(
grpc,
diff --git a/packages/lightning-store/package.json b/packages/lightning-store/package.json
index f40811bb6..afe83717a 100644
--- a/packages/lightning-store/package.json
+++ b/packages/lightning-store/package.json
@@ -1,6 +1,6 @@
{
"name": "lightning-store",
- "version": "0.1.0",
+ "version": "0.1.1",
"description": "",
"main": "index.js",
"scripts": {
@@ -9,12 +9,18 @@
"author": "case
+ { children }
+
+