Merge branch 'master' into ct-temp

gatsby-config.js

@@ -1,12 +1,13 @@
-const ipfsPrefix = process.argv.find(val=> val === '--prefix-paths')
+const ipfsPrefix = process.argv.find(val => val === "--prefix-paths")
+console.log("DEBUG >> IM HERE")
 
-const ipfsConfig =[
-  'gatsby-plugin-ipfs',
+const ipfsConfig = [
+  "gatsby-plugin-ipfs",
   `gatsby-plugin-react-helmet`,
   {
     resolve: `gatsby-source-filesystem`,
     options: {
-      start_url: '__GATSBY_IPFS_PATH_PREFIX__',
+      start_url: "__GATSBY_IPFS_PATH_PREFIX__",
       name: `images`,
       path: `${__dirname}/src/images`,
     },
@@ -18,7 +19,7 @@ const ipfsConfig =[
     options: {
       name: `gatsby-starter-default`,
       short_name: `starter`,
-      start_url: '__GATSBY_IPFS_PATH_PREFIX__',
+      start_url: "__GATSBY_IPFS_PATH_PREFIX__",
       background_color: `#663399`,
       theme_color: `#663399`,
       display: `minimal-ui`,
@@ -31,12 +32,12 @@ const ipfsConfig =[
   // `gatsby-plugin-offline`,
 ]
 
-const normalConfig=[
+const normalConfig = [
   `gatsby-plugin-react-helmet`,
   {
     resolve: `gatsby-source-filesystem`,
     options: {
-      start_url: '/',
+      start_url: "/",
       name: `images`,
       path: `${__dirname}/src/images`,
     },
@@ -48,11 +49,11 @@ const normalConfig=[
     options: {
       name: `gatsby-starter-default`,
       short_name: `starter`,
-      start_url: '/',
+      start_url: "/",
       background_color: `#663399`,
       theme_color: `#663399`,
       display: `minimal-ui`,
-      icon: `src/images/gatsby-icon.png`, // This path is relative to the root of the site.
+  //    icon: `src/images/gatsby-icon.png`, // This path is relative to the root of the site.
     },
   },
 
@@ -67,6 +68,6 @@ module.exports = {
     description: `A gatsbyjs app with adminlte2 integration.`,
     author: `@gatsbyjs`,
   },
-  pathPrefix: '__GATSBY_IPFS_PATH_PREFIX__',
+  pathPrefix: "__GATSBY_IPFS_PATH_PREFIX__",
   plugins: ipfsPrefix ? ipfsConfig : normalConfig,
 }

index.js

@@ -0,0 +1 @@
+// noop

package.json

@@ -1,30 +1,53 @@
 {
   "name": "gatsby-ipfs-web-wallet",
   "description": "A gatsbyjs app with adminlte2 integration and basic Bitcoin Cash wallet functionality.",
-  "version": "1.0.0",
+  "version": "1.0.3",
+  "main": "index.js",
   "author": "Chris Troutner <chris.troutner@gmail.com>",
   "dependencies": {
     "adminlte-2-react": "^0.1.27",
-    "gatsby": "^2.22.15",
+    "gatsby": "^2.23.7",
     "gatsby-image": "^2.4.5",
     "gatsby-plugin-ipfs": "^2.0.2",
     "gatsby-plugin-manifest": "^2.4.9",
     "gatsby-plugin-offline": "^3.2.7",
     "gatsby-plugin-react-helmet": "^3.3.2",
-    "gatsby-plugin-sharp": "^2.6.9",
+    "gatsby-plugin-sharp": "^2.6.17",
     "gatsby-source-filesystem": "^2.3.8",
-    "gatsby-transformer-sharp": "^2.5.3",
-    "minimal-slp-wallet": "1.3.4",
+    "gatsby-transformer-sharp": "2.5.3",
     "prop-types": "^15.7.2",
     "qrcode.react": "^1.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
+    "minimal-slp-wallet": "1.3.4",
+    "@loadable/component": "^5.12.0",
+    "adminlte-2-react": "^0.1.27",
     "react-helmet": "^6.0.0",
     "react-jdenticon": "0.0.8",
     "react-qr-reader": "^2.2.1",
     "react-redux": "^7.2.0"
   },
   "devDependencies": {
+    "gatsby": "^2.23.7",
+    "gatsby-image": "^2.4.12",
+    "gatsby-plugin-ipfs": "^2.0.2",
+    "gatsby-plugin-manifest": "^2.4.9",
+    "gatsby-plugin-offline": "^3.2.7",
+    "gatsby-plugin-react-helmet": "^3.3.2",
+    "gatsby-plugin-sharp": "^2.6.17",
+    "gatsby-source-filesystem": "^2.3.8",
+    "gatsby-transformer-sharp": "2.5.3",
+    "prop-types": "^15.7.2",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "qrcode.react": "^1.0.0",
+    "minimal-slp-wallet": "1.3.4",
+    "@loadable/component": "^5.12.0",
+    "adminlte-2-react": "^0.1.27",
+    "react-helmet": "^6.0.0",
+    "react-jdenticon": "0.0.8",
+    "react-qr-reader": "^2.2.1",
+    "react-redux": "^7.2.0",
     "prettier": "2.0.5"
   },
   "keywords": [

src/components/admin-lte/index.js

@@ -71,8 +71,19 @@ class AdminLTEPage extends React.Component {
           </Navbar.Core>
           <Layout path="/">
             <div className="components-container">
-              {_this.state.section === "Send/Receive" && (
-                <SendReceive
+
+            {_this.state.section === "Send/Receive" && (
+                    <SendReceive
+                      setWalletInfo={_this.props.setWalletInfo}
+                      walletInfo={_this.props.walletInfo}
+                      updateBalance={_this.props.updateBalance}
+                      setBchWallet={_this.props.setBchWallet}
+                      bchWallet={_this.props.bchWallet}
+                    />
+                  )}
+                  
+              {_this.state.section === "Wallet" && (
+                <Wallet
                   setWalletInfo={_this.props.setWalletInfo}
                   walletInfo={_this.props.walletInfo}
                   updateBalance={_this.props.updateBalance}
@@ -106,6 +117,7 @@ class AdminLTEPage extends React.Component {
               )}
 
               {_this.renderNewViewItems()}
+
             </div>
           </Layout>
         </AdminLTE>
@@ -297,15 +309,3 @@ AdminLTEPage.propTypes = {
 
 export default AdminLTEPage
 
-/*
-CT 6/20/2020 storing code here for future reference
-
-<Item icon="fa-tablet-alt" key="Audit" text="Audit" />,
-<Item icon="fa-link" key="Link" text="Link">
-  <Item key="Send" text="Send BCH by Email" />
-  <Item key="Faucet" text="Faucet (Free BCH)" />
-  <Item key="Exchange" text="Exchange" />
-  <Item key="Games" text="Games" />
-  <Item key="trade" text="Trade Locally" />
-</Item>,
-*/

src/components/menuComponents.js

@@ -0,0 +1,6 @@
+const MenuComponents = () => {
+
+}
+
+export default MenuComponents;
+

src/pages/index.js

@@ -2,6 +2,7 @@ import React from "react"
 import { connect } from "react-redux"
 
 let AdminLTE =
+
   typeof window !== `undefined`
     ? require("../components/admin-lte").default
     : null
@@ -27,13 +28,13 @@ let ConnectedDashboard = AdminLTE
   ? connect(mapStateToProps, mapDispatchToProps)(AdminLTE)
   : null
 
-class AdminLTEPage extends React.Component {
-  state = {}
-
-  render() {
-    return <>{ConnectedDashboard && <ConnectedDashboard />}</>
-  }
-}
+const AdminLTEPage = props => (
+  <>
+    {ConnectedDashboard && (
+      <ConnectedDashboard menuComponents={props.pageContext.menuComponents} />
+    )}
+  </>
+)
 
 // const AdminLTEPage = props => {
 //   <>

yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+