defautl borkerip

Author: MattDHill

.gitignore

@@ -5,7 +5,7 @@
 
 # testing
 /coverage
-config.ts
+borkerconfig.json
 
 # production
 /build

src/app/App.tsx

@@ -7,6 +7,7 @@ import { AppContext } from './contexts/app-context'
 import './App.scss'
 import { JsWallet, JsChildWallet } from 'borker-rs-browser'
 import * as CryptoJS from 'crypto-js'
+import * as config from '../borkerconfig.json'
 
 export interface AppState {
   isLoading: boolean
@@ -25,6 +26,7 @@ class App extends React.Component<{}, AppState> {
   }
 
   async componentDidMount () {
+    await Storage.set('borkerip', config.borkerip)
     this.setState({
       address: await Storage.get<string>('address'),
       isLoading: false,

src/app/pages/auth-routes.tsx

@@ -81,7 +81,7 @@ class AuthRoutes extends React.Component<AppProps, AuthRoutesState> {
 
   getBalance = async () => {
     this.setState({
-      balance: await this.webService.getBalance(),
+      balance: await this.webService.getBalance(this.props.address),
     })
   }
 

src/app/pages/settings/settings.tsx

@@ -5,15 +5,12 @@ import * as Storage from 'idb-keyval'
 import '../../App.scss'
 import './settings.scss'
 
-export interface BorkerConfig {
-  externalip: string
-}
 
 export interface SettingsProps extends AuthProps {}
 
 export interface SettingsState {
   submitEnabled: boolean
-  config: BorkerConfig
+  borkerip: string
 }
 
 class SettingsPage extends React.Component<SettingsProps, SettingsState> {
@@ -23,9 +20,7 @@ class SettingsPage extends React.Component<SettingsProps, SettingsState> {
     super(props)
     this.state = {
       submitEnabled: false,
-      config: {
-        externalip: '',
-      },
+      borkerip: '',
     }
     this.webService = new WebService()
   }
@@ -34,18 +29,15 @@ class SettingsPage extends React.Component<SettingsProps, SettingsState> {
     this.props.setShowFab(false)
     this.props.setTitle('Settings')
 
-    const config = await Storage.get<BorkerConfig>('borkerconfig')
+    const borkerip = await Storage.get<string>('borkerip')
 
-    if (config) { this.setState({ config }) }
+    if (borkerip) { this.setState({ borkerip }) }
   }
 
   handleIpChange = (e: React.BaseSyntheticEvent) => {
     this.setState({
       submitEnabled: true,
-      config: {
-        ...this.state.config,
-        externalip: e.target.value,
-      },
+      borkerip: e.target.value,
     })
   }
 
@@ -54,25 +46,25 @@ class SettingsPage extends React.Component<SettingsProps, SettingsState> {
     this.setState({
       submitEnabled: false,
     })
-    await Storage.set('borkerconfig', this.state.config)
-    if (!this.state.config.externalip) { return }
+    await Storage.set('bokerip', this.state.borkerip)
+    if (!this.state.borkerip) { return }
     try {
       await this.props.getBalance()
       alert('Success! Happy Borking')
     } catch (err) {
       alert('invalid borker IP')
-      await Storage.set('borkerconfig', { ...this.state.config, externalip: '' })
+      await Storage.set('borkerip', { borkerip: '' })
     }
   }
 
   render () {
-    const { submitEnabled, config } = this.state
+    const { submitEnabled, borkerip } = this.state
 
     return (
       <div className="page-content">
         <form onSubmit={this.saveConfig} className="profile-edit-form">
           <label>Borker IP Address</label>
-          <input type="text" value={config.externalip} maxLength={40} onChange={this.handleIpChange} />
+          <input type="text" value={borkerip} maxLength={40} onChange={this.handleIpChange} />
           <input type="submit" value="Save" disabled={!submitEnabled} />
         </form>
         <br />

src/app/web-service.ts

@@ -3,13 +3,10 @@ import * as Storage from 'idb-keyval'
 import BigNumber from 'bignumber.js'
 import { User, Bork, BorkType, OrderBy, Utxo, Tag } from '../types/types'
 import { FollowsType } from './pages/user-list/user-list'
-import { BorkerConfig } from './pages/settings/settings'
 
 class WebService {
 
-  async getBalance (): Promise<BigNumber> {
-    const address = await Storage.get<string>('address')
-
+  async getBalance (address: string): Promise<BigNumber> {
     const res = await this.request({
       method: 'GET',
       url: `/users/${address}/balance`,
@@ -114,19 +111,19 @@ class WebService {
 
   private async request (options: rp.OptionsWithUrl) {
 
-    const [config, address] = await Promise.all([
-      Storage.get<BorkerConfig>('borkerconfig'),
+    const [borkerip, address] = await Promise.all([
+      Storage.get<string>('borkerip'),
       Storage.get<string>('address'),
     ])
 
-    if (!config || !config.externalip) {
+    if (!borkerip) {
       alert('please go to "Settings" and provide an IP address of a Borker node.')
       return
     }
 
     Object.assign(options, {
       json: true,
-      url: config.externalip + options.url,
+      url: borkerip + options.url,
       headers: { 'my-address': address },
     })
 

src/borkerconfig-sample.json

@@ -0,0 +1,3 @@
+{
+  "borkerip": ""
+}