fullstack/wallet.fullstack.cash
1
0
Fork 0
mirror of https://github.com/fullstack-cash/wallet.fullstack.cash.git synced 2026-09-21 16:52:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixing merge conflicts

Browse Source
This commit is contained in:
Chris Troutner
2022-02-19 07:48:05 -08:00
parent 94e3127208 c29c1258b4
commit a09a74bfe1
3 changed files with 39 additions and 63516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
-63476
View File
File diff suppressed because it is too large Load Diff
package.json
+1 -2
View File
@@ -27,8 +27,7 @@
"adminlte-2-react": "0.2.0-beta.10", "adminlte-2-react": "0.2.0-beta.10",
"fullstack-gatsby-plugin-bch-sweep": "1.0.0", "fullstack-gatsby-plugin-bch-sweep": "1.0.0",
"fullstack-gatsby-theme-bch-wallet": "1.0.4", "fullstack-gatsby-theme-bch-wallet": "1.0.4",
"gatsby": "4.4.0", "gatsby": "4.4.0"
"gatsby-plugin-bch-create-token": "1.1.2"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
src/fullstack-gatsby-theme-bch-wallet/components/menu-components.js
+38 -38
View File
@@ -6,65 +6,65 @@
It over-rides he default file in the gatsby-ipfs-web-wallet Theme. It over-rides he default file in the gatsby-ipfs-web-wallet Theme.
*/ */
import React from 'react' import React from "react"
import { Sidebar } from 'adminlte-2-react' import { Sidebar } from "adminlte-2-react"
import Wallet from 'fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/wallet' import Wallet from "fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/wallet"
import Tokens from 'fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/tokens' import Tokens from "fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/tokens"
import Configure from 'fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/configure' import Configure from "fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/configure"
import SendReceive from 'fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/send-receive' import SendReceive from "fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/send-receive"
import About from '../../about' import About from "../../about"
import Sweep from 'fullstack-gatsby-plugin-bch-sweep/src/components/sweep/index' import Sweep from "fullstack-gatsby-plugin-bch-sweep/src/components/sweep/index"
import CreateToken from 'gatsby-plugin-bch-create-token/src/components/create-token' // import CreateToken from "gatsby-plugin-bch-create-token/src/components/create-token"
const { Item } = Sidebar const { Item } = Sidebar
const MenuComponents = props => { const MenuComponents = props => {
return [ return [
{ {
key: 'Tokens', key: "Tokens",
component: <Tokens key='Tokens' {...props} />, component: <Tokens key="Tokens" {...props} />,
menuItem: <Item icon='fas-coins' key='Tokens' text='Tokens' /> menuItem: <Item icon="fas-coins" key="Tokens" text="Tokens" />
}, },
{ {
key: 'Send/Receive BCH', key: "Send/Receive BCH",
component: <SendReceive key='Send/Receive BCH' {...props} />, component: <SendReceive key="Send/Receive BCH" {...props} />,
menuItem: ( menuItem: (
<Item <Item
icon='fa-exchange-alt' icon="fa-exchange-alt"
key='Send/Receive BCH' key="Send/Receive BCH"
text='Send/Receive BCH' text="Send/Receive BCH"
/> />
) )
}, },
{ {
key: 'Sweep', key: "Sweep",
component: <Sweep key='Sweep' {...props} />, component: <Sweep key="Sweep" {...props} />,
menuItem: <Item icon='fas-arrow-circle-up' key='Sweep' text='Sweep' /> menuItem: <Item icon="fas-arrow-circle-up" key="Sweep" text="Sweep" />
}, },
{ {
key: 'Wallet', key: "Wallet",
component: <Wallet key='Wallet' interface='rest-api' {...props} />, component: <Wallet key="Wallet" interface="rest-api" {...props} />,
// component: <Wallet key="Wallet" interface="consumer-api" {...props} />, // component: <Wallet key="Wallet" interface="consumer-api" {...props} />,
menuItem: <Item icon='fa-wallet' key='Wallet' text='Wallet' /> menuItem: <Item icon="fa-wallet" key="Wallet" text="Wallet" />
},
// {
// key: 'Create Token',
// component: <CreateToken key='Create Token' {...props} />,
// menuItem: (
// <Item icon='fas-plus-square' key='Create Token' text='Create Token' />
// )
// },
{
key: "Configure",
component: <Configure key="Configure" {...props} />,
menuItem: <Item icon="fas-cog" key="Configure" text="Configure" />
}, },
{ {
key: 'Create Token', key: "About",
component: <CreateToken key='Create Token' {...props} />, component: <About key="About" {...props} />,
menuItem: ( menuItem: <Item icon="fas-question" key="About" text="About" />
<Item icon='fas-plus-square' key='Create Token' text='Create Token' />
)
},
{
key: 'Configure',
component: <Configure key='Configure' {...props} />,
menuItem: <Item icon='fas-cog' key='Configure' text='Configure' />
},
{
key: 'About',
component: <About key='About' {...props} />,
menuItem: <Item icon='fas-question' key='About' text='About' />
} }
] ]
} }