diff --git a/app/scripts/pages/bitswap.js b/app/scripts/pages/bitswap.js index 7f461d481..3f30b0392 100644 --- a/app/scripts/pages/bitswap.js +++ b/app/scripts/pages/bitswap.js @@ -40,7 +40,7 @@ default class Bitswap extends Component {

{i18n.t('Bitswap')}

-
+

{i18n.t('Wantlist')}  @@ -50,7 +50,7 @@ default class Bitswap extends Component {

-
+
) diff --git a/app/scripts/pages/logs.js b/app/scripts/pages/logs.js index 0d408bc88..a5778498e 100644 --- a/app/scripts/pages/logs.js +++ b/app/scripts/pages/logs.js @@ -94,7 +94,7 @@ default class Logs extends Component {

{i18n.t('Event Log')}

{buttons}
-
+
{this.state.log.map((event) => ( 
@@ -103,7 +103,7 @@ default class Logs extends Component {
             ))}
{buttons}
-
+
) diff --git a/app/scripts/pages/objects.js b/app/scripts/pages/objects.js index 08207bea6..7fb37e108 100644 --- a/app/scripts/pages/objects.js +++ b/app/scripts/pages/objects.js @@ -117,7 +117,7 @@ default class Objects extends React.Component { onChange={(event) => this.setState({pathInput: event.target.value.trim()})} onKeyPress={this._update} value={this.state.pathInput} - placeholder={i18n.t('Enter hash or path: /ipfs/QmBpath...')}/> + placeholder={i18n.t('Enter hash or path: /ipfs/QmBpath...')} /> -
+
) @@ -107,7 +107,7 @@ default class ConfigView extends Component { return (

{i18n.t('Config')}

-
+
{error} {buttons}
@@ -123,7 +123,7 @@ default class ConfigView extends Component { {error} {buttons}
-
+
) } diff --git a/app/scripts/views/connection.js b/app/scripts/views/connection.js index 3944693d8..00145310a 100644 --- a/app/scripts/views/connection.js +++ b/app/scripts/views/connection.js @@ -50,7 +50,7 @@ default class Connection extends Component {
  • diff --git a/app/scripts/views/dhtgraph.js b/app/scripts/views/dhtgraph.js index 81e461a25..444919fcc 100644 --- a/app/scripts/views/dhtgraph.js +++ b/app/scripts/views/dhtgraph.js @@ -88,6 +88,6 @@ default class DHTGraph extends Component { render () { if (this.state.initialized) this.update() - return
    + return
    } } diff --git a/app/scripts/views/icon.js b/app/scripts/views/icon.js index ba80e5d9e..8cf2b1842 100644 --- a/app/scripts/views/icon.js +++ b/app/scripts/views/icon.js @@ -12,6 +12,6 @@ default class Icon extends Component { const className = classNames('icon', 'fa', `fa-${this.props.glyph}`, { 'fa-lg': this.props.large }) - return
    • ) }) diff --git a/app/scripts/views/object.js b/app/scripts/views/object.js index 70e1170ef..b91f7b0b8 100644 --- a/app/scripts/views/object.js +++ b/app/scripts/views/object.js @@ -28,11 +28,11 @@ default class ObjectView extends Component {

    {i18n.t('Object')}

    -
    +
      - +
    diff --git a/app/scripts/views/page.js b/app/scripts/views/page.js index 63b844bc1..48b27bdca 100644 --- a/app/scripts/views/page.js +++ b/app/scripts/views/page.js @@ -86,7 +86,7 @@ default class Page extends React.Component {
    - IPFS + IPFS {i18n.t('IPFS')}
    @@ -105,19 +105,19 @@ default class Page extends React.Component {
    • - Help + Help {i18n.t('Help')}
    • - Github + Github {i18n.t('Github')}
    • - Report a bug + Report a bug {i18n.t('Report a bug')}
      • @@ -131,7 +131,7 @@ default class Page extends React.Component {
      -
      {/* end row */}
      {/* end navbar collapse */}
      diff --git a/package.json b/package.json index 5bc46b0b3..370d0ebf0 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "i18next-localstorage-cache": "^0.2.2", "i18next-sprintf-postprocessor": "^0.2.2", "i18next-xhr-backend": "^0.5.3", - "ipfs-api": "github:ipfs/js-ipfs-api#feat/files-api", + "ipfs-api": "^3.0.2", "ipfs-geoip": "^2.0.0", "lodash": "^4.2.0", "react": "^0.14.7", @@ -42,7 +42,7 @@ "css-loader": "^0.23.0", "debug": "^2.2.0", "enzyme": "^2.1.0", - "eslint": "2.2.0", + "eslint": "^2.9.0", "eslint-config-standard": "^5.1.0", "eslint-config-standard-react": "^2.3.0", "eslint-plugin-promise": "^1.1.0", @@ -51,7 +51,6 @@ "file-loader": "^0.8.5", "hjs-webpack": "^7.0.0", "https-browserify": "0.0.1", - "ipfs-api": "^2.10.1", "json-loader": "^0.5.4", "karma": "^0.13.19", "karma-chrome-launcher": "^0.2.2", diff --git a/test/views/config.spec.js b/test/views/config.spec.js index 7946672d2..0dc948a31 100644 --- a/test/views/config.spec.js +++ b/test/views/config.spec.js @@ -7,7 +7,7 @@ import ConfigView from '../../app/scripts/views/config' describe('ConfigView', () => { it('renders the given config', () => { const config = {a: true, b: {c: 'hello'}} - const el = shallow() + const el = shallow() expect(el.find('textarea')).to.have.prop('value', JSON.stringify(config, null, 2)) }) diff --git a/test/views/icon.spec.js b/test/views/icon.spec.js index 149e599fb..0cbe5e17d 100644 --- a/test/views/icon.spec.js +++ b/test/views/icon.spec.js @@ -6,12 +6,12 @@ import Icon from '../../app/scripts/views/icon' describe('Icon', () => { it('renders the given glyph', () => { - const el = shallow() + const el = shallow() expect(el).to.have.className('icon fa fa-list') }) it('renders the given glyph with a large option', () => { - const el = shallow() + const el = shallow() expect(el).to.have.className('icon fa fa-list fa-lg') }) }) diff --git a/test/views/nav-item.spec.js b/test/views/nav-item.spec.js index 07a9a0e61..fae765ee4 100644 --- a/test/views/nav-item.spec.js +++ b/test/views/nav-item.spec.js @@ -6,7 +6,7 @@ import NavItem from '../../app/scripts/views/nav-item' describe('NavItem', () => { it('renders', () => { - const el = shallow() + const el = shallow() expect(el).to.have.prop('to', '/list') expect(el.find('Icon')).to.be.present() diff --git a/test/views/object/object-link.spec.js b/test/views/object/object-link.spec.js index af694d32e..be97edbc2 100644 --- a/test/views/object/object-link.spec.js +++ b/test/views/object/object-link.spec.js @@ -8,7 +8,7 @@ import ObjectLink from '../../../app/scripts/views/object/object-link' describe('ObjectLink', () => { it('renders the given link', () => { const path = parse('/ipfs/hello/world') - const el = shallow() + const el = shallow() expect(el.find('Link')).to.have.length(2) expect(el.find('Link').at(0)).to.have.prop('to', 'objects/\\ipfs\\hello\\world\\hi') @@ -17,7 +17,7 @@ describe('ObjectLink', () => { it('renders links without a name', () => { const path = parse('/ipfs/hello/world') - const el = shallow() + const el = shallow() expect(el.find('Link').at(0)).to.have.prop('to', 'objects/\\ipfs\\Qm') }) diff --git a/test/views/object/object-links.spec.js b/test/views/object/object-links.spec.js index ddf0938a1..c03ee9a93 100644 --- a/test/views/object/object-links.spec.js +++ b/test/views/object/object-links.spec.js @@ -17,7 +17,7 @@ describe('ObjectLinks', () => { Hash: 'Qp', Size: 3 }] - const el = shallow() + const el = shallow() expect(el.find('strong')).to.have.text('Object links') expect(el.find('th').first()).to.have.text('Name') diff --git a/test/views/object/parent-link.spec.js b/test/views/object/parent-link.spec.js index 7e7e9ae88..87d477d87 100644 --- a/test/views/object/parent-link.spec.js +++ b/test/views/object/parent-link.spec.js @@ -8,7 +8,7 @@ import ParentLink from '../../../app/scripts/views/object/parent-link' describe('ParentLink', () => { it('renders with a url', () => { const path = parse('/ipfs/hi/hello/world') - const el = shallow() + const el = shallow() expect(el.find('LinkContainer')).to.have.prop('to', '/objects/\\ipfs\\hi\\hello\\world') }) diff --git a/test/views/object/raw-data.spec.js b/test/views/object/raw-data.spec.js index 062bda235..25c04f51a 100644 --- a/test/views/object/raw-data.spec.js +++ b/test/views/object/raw-data.spec.js @@ -6,7 +6,7 @@ import RawData from '../../../app/scripts/views/object/raw-data' describe('RawData', () => { it('renders the given data', () => { - const el = shallow() + const el = shallow() const buf = new Buffer('Hello World', 'utf-8') const dataString = `data:text/plain;charset=utf8;base64,${buf.toString('base64')}` @@ -15,7 +15,7 @@ describe('RawData', () => { it('limits the data to 10000 characters by default', () => { const data = Array(15000).fill('a').join('') - const el = shallow() + const el = shallow() const buf = new Buffer(data.substr(0, 10000), 'utf-8') const dataString = `data:text/plain;charset=utf8;base64,${buf.toString('base64')}` expect(el.find('iframe')).to.have.attr('src', dataString) @@ -23,7 +23,7 @@ describe('RawData', () => { it('uses a custom limit', () => { const data = 'Hello World' - const el = shallow() + const el = shallow() const buf = new Buffer('He', 'utf-8') const dataString = `data:text/plain;charset=utf8;base64,${buf.toString('base64')}` diff --git a/test/views/table.spec.js b/test/views/table.spec.js index bd0aa8a0c..0aa835021 100644 --- a/test/views/table.spec.js +++ b/test/views/table.spec.js @@ -8,7 +8,7 @@ describe('TableView', () => { it('renders a table with multiple rows and children', () => { const table = [1, 2, 3] const children = [foo] - const el = shallow() + const el = shallow() expect(el.find('tr').length).to.equal(3) expect(el.find('span').length).to.equal(1)